From b3ba743bbeb4f9a745954b3147ebd81bf8eecbd3 Mon Sep 17 00:00:00 2001 From: gruenkaeppchen Date: Fri, 26 Mar 2021 17:37:39 +0100 Subject: [PATCH 1/2] added copyright information and linking to gallery items - added optional copyright information to images/items in gallery - added optional linking to menu items to the title of a gallery item --- .../framework/forms/galleryitem.xml | 16 ++++++++++++-- .../framework/frontend/blog/gallery.php | 14 +++++++++++-- .../language/en-GB/en-GB.astroid.ini | 16 ++++++++------ .../scss/one/components/_blog.scss | 21 +++++++++++++++++-- 4 files changed, 55 insertions(+), 12 deletions(-) diff --git a/astroid/astroid-framework/framework/forms/galleryitem.xml b/astroid/astroid-framework/framework/forms/galleryitem.xml index ba9d87ef..15bfd217 100644 --- a/astroid/astroid-framework/framework/forms/galleryitem.xml +++ b/astroid/astroid-framework/framework/forms/galleryitem.xml @@ -6,14 +6,26 @@ type="text" description="ASTROID_GALLERY_ITEM_CAPTION_DESC" /> + + + + + type="textarea" + /> - \ No newline at end of file + diff --git a/astroid/astroid-framework/framework/frontend/blog/gallery.php b/astroid/astroid-framework/framework/frontend/blog/gallery.php index 2c6daeef..37f6a653 100644 --- a/astroid/astroid-framework/framework/frontend/blog/gallery.php +++ b/astroid/astroid-framework/framework/frontend/blog/gallery.php @@ -58,13 +58,23 @@
-
+
+ + + + +

+ +
+ +
+ - \ No newline at end of file + diff --git a/astroid/astroid-framework/language/en-GB/en-GB.astroid.ini b/astroid/astroid-framework/language/en-GB/en-GB.astroid.ini index 5336041f..7a03dd49 100644 --- a/astroid/astroid-framework/language/en-GB/en-GB.astroid.ini +++ b/astroid/astroid-framework/language/en-GB/en-GB.astroid.ini @@ -117,13 +117,13 @@ TPL_ASTROID_COLOURS_HEADER_TITLE_LABEL="Header" TPL_ASTROID_COLOURS_HEADER_TITLE_DESC="Select colors for the Header" TPL_ASTROID_COLOURS_STICKY_HEADER_TITLE_LABEL="Sticky Header" TPL_ASTROID_COLOURS_STICKY_HEADER_TITLE_DESC="Select colors for the Sticky Header" -TPL_ASTROID_COLOURS_MAIN_MENU_TITLE_LABEL="Main Menu" +TPL_ASTROID_COLOURS_MAIN_MENU_TITLE_LABEL="Main Menu" TPL_ASTROID_COLOURS_MAIN_MENU_TITLE_DESC="Select colors for the Main Menu" TPL_ASTROID_COLOURS_MAIN_DROPDWON_MENU_TITLE_LABEL="Dropdown Menu" TPL_ASTROID_COLOURS_MAIN_DROPDWON_MENU_TITLE_DESC="Select colors for the Dropdown Menu" -TPL_ASTROID_COLOURS_OFF_CANVAS_TITLE_LABEL="Off-Canvas Menu" +TPL_ASTROID_COLOURS_OFF_CANVAS_TITLE_LABEL="Off-Canvas Menu" TPL_ASTROID_COLOURS_OFF_CANVAS_TITLE_DESC="Select colors for the Off-Canvas Menu" -TPL_ASTROID_COLOURS_MOBILEMENU_TITLE_LABEL="Mobile Menu" +TPL_ASTROID_COLOURS_MOBILEMENU_TITLE_LABEL="Mobile Menu" TPL_ASTROID_COLOURS_MOBILEMENU_TITLE_DESC="Select colors for the Mobile Menu" TPL_ASTROID_COLOURS_MAIN_FOOTER_TITLE_LABEL="Footer" TPL_ASTROID_COLOURS_MAIN_FOOTER_TITLE_DESC="Select colors preferences for the Footer" @@ -574,7 +574,7 @@ ASTROID_COLUMN_SIZE_LABEL="Column Size" ASTROID_COLUMN_BREAKPOINT="Column Breakpoint" ASTROID_ELEMENT_CUSTOM_BACKGROUND_LABEL="Custom Background" ASTROID_ELEMENT_CUSTOM_COLORS_LABEL="

Custom Colors

" -ASTROID_ELEMENT_LAYOUT_CUSTOM_CLASS_LABEL="Layout Custom Class" +ASTROID_ELEMENT_LAYOUT_CUSTOM_CLASS_LABEL="Layout Custom Class" ASTROID_ELEMENT_LAYOUT_SECTION_LAYOUT_LABEL="Section Layout" ASTROID_CONTAINER="Container" ASTROID_CONTAINER_FLUID="Container Fluid" @@ -774,7 +774,7 @@ ASTROID_VIDEO_TYPE_DESC="Select between YouTube and Vimeo to use video on an art ASTROID_YOUTUBE="YouTube" ASTROID_VIMEO="Vimeo" ASTROID_VIDEO_ID="Video URL" -ASTROID_VIDEO_ID_DESC="Enter the video URL." +ASTROID_VIDEO_ID_DESC="Enter the video URL." ASTROID_ARTICLE_BADGE="Article Badge" ASTROID_ARTICLE_BADGE_DESC="Article badge will appear on the top right corner of the respective article." ASTROID_SELECT_BADGE="Select Badge" @@ -799,8 +799,12 @@ ASTROID_GALLERY_THUMBNAIL_DESC="Select Yes to display thumbnail of an article in ASTROID_AUDIO_SOURCE="Audio Source" ASTROID_GALLERY_ITEM_CAPTION_LBL="Title" ASTROID_GALLERY_ITEM_CAPTION_DESC="Add a title for an image." +ASTROID_GALLERY_ITEM_LINK_LBL="Link title to menu" +ASTROID_GALLERY_ITEM_LINK_DESC="Add an optional link to the title linking to a menu entry." ASTROID_GALLERY_ITEM_IMAGE_LBL="Image" ASTROID_GALLERY_ITEM_IMAGE_DESC="Upload an image for the single article display." +ASTROID_GALLERY_ITEM_COPYRIGHT_LBL="Copyright text" +ASTROID_GALLERY_ITEM_COPYRIGHT_DESC="Add a copyright text to an image." ASTROID_GALLERY_ITEM_DESCRIPTION_LBL="Short Description" ASTROID_GALLERY_ITEM_DESCRIPTION_DESC="Add a short decription for an image." @@ -934,4 +938,4 @@ COM_PLUGINS_ASTROID-TABS-VISIBILITY_FIELDSET_LABEL="Tabs Visibility" ASTROID_TABS_FRONTEND_VISIBILTY="Frontend Visibility of Astroid tabs" TPL_ASTROID_MINIFYJS_EXCLUDES_LABEL="Exclude JS Files" -TPL_ASTROID_MINIFYJS_EXCLUDES_DESC="Add comma separated filesnames to exclude files from JS minification. You can add filename directly or use available filename patterns:
*.min.js
jquery.*
*bootstrap*" \ No newline at end of file +TPL_ASTROID_MINIFYJS_EXCLUDES_DESC="Add comma separated filesnames to exclude files from JS minification. You can add filename directly or use available filename patterns:
*.min.js
jquery.*
*bootstrap*" diff --git a/astroid/astroid-template-one/scss/one/components/_blog.scss b/astroid/astroid-template-one/scss/one/components/_blog.scss index e79bae81..cfd850fd 100644 --- a/astroid/astroid-template-one/scss/one/components/_blog.scss +++ b/astroid/astroid-template-one/scss/one/components/_blog.scss @@ -28,7 +28,7 @@ font-size: 20px; &[class*="article-icon-"] { color: #fff; - background-color: $primary; + background-color: $primary; } &:before, &:after { @@ -69,4 +69,21 @@ .article-wraper .card-body:not(.has-image) { padding-top: 50px; -} \ No newline at end of file +} + +.carousel-caption a { + color: white; +} + +.carousel-copyright { + position: absolute; + bottom: 0; + right: 0; + background-image: linear-gradient(to right, rgba(0,0,0,0.0), rgba(0, 0, 0, 0.5)); + color: lightgrey; + padding: 0px 1.0em; + font-size: smaller; + line-height: 1.5em; + width: 66%; + text-align: right; +} From d778276c8e4630a431deac5a4894ede8f06c1439 Mon Sep 17 00:00:00 2001 From: gruenkaeppchen Date: Thu, 15 Apr 2021 12:40:11 +0200 Subject: [PATCH 2/2] updated linking for gallery items - added optional linking to url to the title of a gallery item --- .../framework/forms/galleryitem.xml | 24 ++++++++++++++++--- .../framework/frontend/blog/gallery.php | 17 +++++++++---- .../language/en-GB/en-GB.astroid.ini | 8 +++++-- 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/astroid/astroid-framework/framework/forms/galleryitem.xml b/astroid/astroid-framework/framework/forms/galleryitem.xml index 15bfd217..61fbf5a1 100644 --- a/astroid/astroid-framework/framework/forms/galleryitem.xml +++ b/astroid/astroid-framework/framework/forms/galleryitem.xml @@ -6,12 +6,30 @@ type="text" description="ASTROID_GALLERY_ITEM_CAPTION_DESC" /> - + + + + + + label="ASTROID_GALLERY_ITEM_LINKMENUITEM_LBL" + description="ASTROID_GALLERY_ITEM_LINKMENUITEM_DESC" + showon="linktype:menuitem" > +
-
- - - - +
+ ' . $item['title'] . ''; + break; + case 'url': + echo '' . $item['title'] . ''; + break; + default: + echo $item['title']; + } + ?>
diff --git a/astroid/astroid-framework/language/en-GB/en-GB.astroid.ini b/astroid/astroid-framework/language/en-GB/en-GB.astroid.ini index 7a03dd49..8c4eda00 100644 --- a/astroid/astroid-framework/language/en-GB/en-GB.astroid.ini +++ b/astroid/astroid-framework/language/en-GB/en-GB.astroid.ini @@ -799,8 +799,12 @@ ASTROID_GALLERY_THUMBNAIL_DESC="Select Yes to display thumbnail of an article in ASTROID_AUDIO_SOURCE="Audio Source" ASTROID_GALLERY_ITEM_CAPTION_LBL="Title" ASTROID_GALLERY_ITEM_CAPTION_DESC="Add a title for an image." -ASTROID_GALLERY_ITEM_LINK_LBL="Link title to menu" -ASTROID_GALLERY_ITEM_LINK_DESC="Add an optional link to the title linking to a menu entry." +ASTROID_GALLERY_ITEM_LINKTYPE_LBL="Title link" +ASTROID_GALLERY_ITEM_LINKTYPE_DESC="Add an optional link to the title." +ASTROID_GALLERY_ITEM_LINKMENUITEM_LBL="Menu Item" +ASTROID_GALLERY_ITEM_LINKMENUITEM_DESC="Add an optional link to the title linking to a menu entry." +ASTROID_GALLERY_ITEM_LINKURL_LBL="URL" +ASTROID_GALLERY_ITEM_LINKURL_DESC="Add an optional link to the title linking to an URL or anchor." ASTROID_GALLERY_ITEM_IMAGE_LBL="Image" ASTROID_GALLERY_ITEM_IMAGE_DESC="Upload an image for the single article display." ASTROID_GALLERY_ITEM_COPYRIGHT_LBL="Copyright text"