Skip to content

added copyright information and linking to gallery items #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

added copyright information and linking to gallery items #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3ba743
added copyright information and linking to gallery items
gruenkaeppchen Mar 26, 2021
d778276
updated linking for gallery items
gruenkaeppchen Apr 15, 2021
e60e4d7
Merge remote-tracking branch 'upstream/master'
gruenkaeppchen Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions astroid/astroid-framework/framework/forms/galleryitem.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,44 @@
type="text"
description="ASTROID_GALLERY_ITEM_CAPTION_DESC"
/>
<field name="linktype"
label="ASTROID_GALLERY_ITEM_LINKTYPE_LBL"
type="radio"
description="ASTROID_GALLERY_ITEM_LINKTYPE_DESC"
default="0"
class="btn-group">
<option value="0">None</option>
<option value="menuitem">MenuItem</option>
<option value="url">URL</option>
</field>
<field name="linkmenuitem"
type="menuitem"
label="ASTROID_GALLERY_ITEM_LINKMENUITEM_LBL"
description="ASTROID_GALLERY_ITEM_LINKMENUITEM_DESC"
showon="linktype:menuitem" >
<option value=""></option>
</field>
<field name="linkurl"
type="url"
label="ASTROID_GALLERY_ITEM_LINKURL_LBL"
description="ASTROID_GALLERY_ITEM_LINKURL_DESC"
relative="true"
showon="linktype:url"
/>
<field name="image"
label="ASTROID_GALLERY_ITEM_IMAGE_LBL"
description="ASTROID_GALLERY_ITEM_IMAGE_DESC"
type="media"
/>
<field name="copyright"
label="ASTROID_GALLERY_ITEM_COPYRIGHT_LBL"
type="text"
description="ASTROID_GALLERY_ITEM_COPYRIGHT_DESC"
/>
<field name="description"
label="ASTROID_GALLERY_ITEM_DESCRIPTION_LBL"
description="ASTROID_GALLERY_ITEM_DESCRIPTION_DESC"
type="textarea" />
type="textarea"
/>
</fieldset>
</form>
</form>
21 changes: 19 additions & 2 deletions astroid/astroid-framework/framework/frontend/blog/gallery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,30 @@
<?php if (!empty($item['title']) || !empty($item['description'])) { ?>
<div class="carousel-caption d-none d-md-block">
<?php if (!empty($item['title'])) { ?>
<h5><?php echo $item['title']; ?></h5>
<h5>
<?php switch($item['linktype']) {
case 'menuitem':
echo '<a href="' . JRoute::_("index.php?Itemid=" . $item['linkmenuitem']) . '">' . $item['title'] . '</a>';
break;
case 'url':
echo '<a href="'. $item['linkurl'] . '">' . $item['title'] . '</a>';
break;
default:
echo $item['title'];
}
?>
</h5>
<?php } ?>
<?php if (!empty($item['description'])) { ?>
<p><?php echo $item['description']; ?></p>
<?php } ?>
</div>
<?php } ?>
<?php if (!empty($item['copyright'])) { ?>
<div class="carousel-copyright d-none d-md-block">
<?php echo $item['copyright']; ?>
</div>
<?php } ?>
</div>
<?php
$active = false;
Expand All @@ -81,4 +98,4 @@
<span class="sr-only"><?php echo JText::_('JNEXT'); ?></span>
</a>
<?php } ?>
</div>
</div>
20 changes: 14 additions & 6 deletions astroid/astroid-framework/language/en-GB/en-GB.astroid.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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="<h3>Custom Colors</h3>"
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"
Expand Down Expand Up @@ -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"
Expand All @@ -799,8 +799,16 @@ 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_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"
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."

Expand Down Expand Up @@ -934,4 +942,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: <br/> <code>*.min.js</code><br/> <code>jquery.*</code><br/> <code>*bootstrap*</code>"
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: <br/> <code>*.min.js</code><br/> <code>jquery.*</code><br/> <code>*bootstrap*</code>"
21 changes: 19 additions & 2 deletions astroid/astroid-template-one/scss/one/components/_blog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
font-size: 20px;
&[class*="article-icon-"] {
color: #fff;
background-color: $primary;
background-color: $primary;
}
&:before,
&:after {
Expand Down Expand Up @@ -69,4 +69,21 @@

.article-wraper .card-body:not(.has-image) {
padding-top: 50px;
}
}

.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;
}