Skip to content

[4.0] Blog layout ux #32943

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

Merged
rdeutz merged 30 commits into from
Apr 24, 2021
Merged

[4.0] Blog layout ux #32943

Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
97c08b4
Re-add fields for coumns and order direction
chmst Mar 25, 2021
16854b3
Choose Blog Layout, blog.xml and language strings
chmst Mar 30, 2021
a53aa8c
Global option
chmst Mar 30, 2021
f256671
useglobal for style
chmst Mar 30, 2021
ce5b22e
parentclasses for the whole blog layout
chmst Mar 30, 2021
17cacac
revert changes in config.xml, default style = 4
chmst Mar 30, 2021
e8a85b0
Update administrator/language/en-GB/joomla.ini
chmst Mar 31, 2021
a9ea358
Suggested change for select options
chmst Mar 31, 2021
b35e4f8
Rename across and down option
chmst Mar 31, 2021
c28ca80
Change J4 to GRID, J3 to FIXED
chmst Apr 1, 2021
feed2af
Capitalisation in labels
chmst Apr 1, 2021
f12a037
Fix description for columns
chmst Apr 2, 2021
51ff1c7
fix description
chmst Apr 2, 2021
48f8f65
Add spaces and descriptions, change ordering of fields
chmst Apr 2, 2021
b2fd75b
Merge branch '4.0-dev' into blog-layout-ux
chmst Apr 2, 2021
8089c5f
Update components/com_content/tmpl/category/blog.xml
chmst Apr 3, 2021
6344855
adapt blog layout featured
chmst Apr 4, 2021
cc331e6
Remove unused language key
chmst Apr 4, 2021
d439fdc
revert last change in language
chmst Apr 4, 2021
46910c8
fix spacer in featured layout
chmst Apr 4, 2021
78ea550
remove param for blog_style
chmst Apr 5, 2021
4e8078b
Update components/com_content/tmpl/category/blog.xml
chmst Apr 9, 2021
20db6cf
Update administrator/components/com_content/config.xml
chmst Apr 9, 2021
86937a6
fix false deletion
chmst Apr 9, 2021
11c8dd1
Merge branch '4.0-dev' into blog-layout-ux
chmst Apr 12, 2021
a341c57
order > direction
chmst Apr 12, 2021
e2b7e19
Merge branch '4.0-dev' into blog-layout-ux
chmst Apr 18, 2021
e4b885d
Fix conflict
chmst Apr 18, 2021
d236a2e
Fix conflict
chmst Apr 18, 2021
4ef5eee
Improve description.
Apr 23, 2021
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
70 changes: 44 additions & 26 deletions administrator/components/com_content/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,47 +717,69 @@
label="COM_CONTENT_CONFIG_BLOG_SETTINGS_LABEL"
description="COM_CONTENT_CONFIG_BLOG_SETTINGS_DESC"
>

<field
name="num_leading_articles"
type="number"
label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
default="1"
parentclass="stack span-1"
/>

<field
name="blog_class_leading"
type="text"
label="JGLOBAL_BLOG_CLASS_LEADING"
size="3"
validate="CssIdentifier"
parentclass="stack span-2-inline"
/>

<field
name="blog_class"
type="text"
label="JGLOBAL_BLOG_CLASS"
size="3"
validate="CssIdentifier"
name="num_intro_articles"
type="number"
label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
default="4"
parentclass="stack span-1"
/>

<field
name="num_leading_articles"
type="number"
label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
name="num_columns"
type="list"
label="JGLOBAL_NUM_COLUMNS_LABEL"
default="1"
/>
parentclass="stack span-1-inline"
>
<option value="1">J1</option>
<option value="2">J2</option>
<option value="3">J3</option>
<option value="4">J4</option>
</field>

<field
name="num_intro_articles"
type="number"
label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
default="4"
name="multi_column_order"
type="list"
label="JGLOBAL_MULTI_COLUMN_ORDER_LABEL"
default="0"
parentclass="stack span-1-inline"
>
<option value="0">JGLOBAL_BLOG_DOWN_OPTION</option>
<option value="1">JGLOBAL_BLOG_ACROSS_OPTION</option>
</field>

<field
name="blog_class"
type="text"
label="JGLOBAL_BLOG_CLASS"
validate="CssIdentifier"
parentclass="stack span-2 offset-1"
/>

<field
name="num_links"
type="number"
label="JGLOBAL_NUM_LINKS_LABEL"
default="4"
/>

<field
name="spacer1"
type="spacer"
hr="true"
parentclass="stack span-1"
/>

<field
Expand All @@ -766,6 +788,7 @@
label="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL"
default="0"
validate="options"
parentclass="span-2"
>
<option value="0">JNONE</option>
<option value="-1">JALL</option>
Expand All @@ -776,18 +799,13 @@
<option value="5">J5</option>
</field>

<field
name="spacer2"
type="spacer"
hr="true"
/>

<field
name="link_intro_image"
type="radio"
label="JGLOBAL_LINKED_INTRO_IMAGE_LABEL"
layout="joomla.form.field.radio.switcher"
default="0"
parentclass="span-2"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
Expand Down
9 changes: 7 additions & 2 deletions administrator/language/en-GB/joomla.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,11 @@ JGLOBAL_BATCH_MOVE_ROW_NOT_FOUND="Can't find the destination row for this move."
JGLOBAL_BATCH_PROCESS="Process"
JGLOBAL_BATCH_WORKFLOW_STATE_ROW_NOT_FOUND="Can't find the destination row for this state change."
JGLOBAL_BLOG="Blog"
JGLOBAL_BLOG_CLASS="Blog Class"
JGLOBAL_BLOG_CLASS_LEADING="Blog Class (Leading Articles)"
JGLOBAL_BLOG_ACROSS_OPTION="Across"
JGLOBAL_BLOG_CLASS="Article Class"
JGLOBAL_BLOG_CLASS_LEADING="Leading Article Class"
JGLOBAL_BLOG_CLASS_NOTE_DESC ="You can add any css class for your own styling ideas.<br>Add a border on top with class boxed<br>For image position use for example image-left, image-right. Add image-alternate for alternative ordering of intro-images."
Comment thread
Quy marked this conversation as resolved.
Outdated
JGLOBAL_BLOG_DOWN_OPTION="Down"
JGLOBAL_BLOG_LAYOUT_OPTIONS="Blog Layout"
JGLOBAL_CATEGORIES_OPTIONS="Categories"
JGLOBAL_CATEGORY_LAYOUT_DESC="Layout"
Expand Down Expand Up @@ -511,6 +514,7 @@ JGLOBAL_MODIFIED="Modified"
JGLOBAL_MODIFIED_DATE="Modified Date"
JGLOBAL_MOST_HITS="Most Hits"
JGLOBAL_MOST_RECENT_FIRST="Most Recent First"
JGLOBAL_MULTI_COLUMN_ORDER_LABEL="Multi Column Direction"
JGLOBAL_MULTI_LEVEL="Multi Level"
JGLOBAL_NAME_ASC="Name ascending"
JGLOBAL_NAME_DESC="Name descending"
Expand All @@ -520,6 +524,7 @@ JGLOBAL_NO_ITEM_SELECTED="No items selected"
JGLOBAL_NO_MATCHING_RESULTS="No Matching Results"
JGLOBAL_NO_ORDER="No Order"
JGLOBAL_NONAPPLICABLE="N/A"
JGLOBAL_NUM_COLUMNS_LABEL="# Columns"
JGLOBAL_NUM_INTRO_ARTICLES_DESC="Number of articles to show after the leading article. Articles will be shown in columns."
JGLOBAL_NUM_INTRO_ARTICLES_LABEL="# Intro Articles"
JGLOBAL_NUM_LEADING_ARTICLES_DESC="Number of leading articles to display as full-width at the beginning of the page."
Expand Down
7 changes: 6 additions & 1 deletion components/com_content/tmpl/category/blog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,12 @@
?>

<?php if (!empty($this->intro_items)) : ?>
<div class="com-content-category-blog__items blog-items <?php echo $this->params->get('blog_class'); ?>">
<?php $blogClass = $this->params->get('blog_class', ''); ?>
<?php if ((int) $this->params->get('num_columns') > 1) : ?>
<?php $blogClass .= (int) $this->params->get('multi_column_order', 0) === 0 ? ' masonry-' : ' columns-'; ?>
<?php $blogClass .= (int) $this->params->get('num_columns'); ?>
<?php endif; ?>
<div class="com-content-category-blog__items blog-items <?php echo $blogClass; ?>">
<?php foreach ($this->intro_items as $key => &$item) : ?>
<div class="com-content-category-blog__item blog-item"
itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
Expand Down
Loading