diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml index 3890b7f8e946e..89db6627a10d5 100644 --- a/administrator/components/com_content/config.xml +++ b/administrator/components/com_content/config.xml @@ -1,495 +1,423 @@ -
- - - - - - - - - +
+ + + + + + - - + - - + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - +
-
- +
+ - + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
- - - - - + label="JCATEGORY" + description="COM_CONTENT_CONFIG_CATEGORY_SETTINGS_DESC" + > + + + + - - + type="radio" + class="btn-group btn-group-yesno" + label="JGLOBAL_SHOW_CATEGORY_TITLE" + description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC" + default="1" + > + + - - - - - + type="radio" + class="btn-group btn-group-yesno" + default="1" + label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL" + description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"> + + + - - - - - + type="radio" + class="btn-group btn-group-yesno" + default="0" + label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL" + description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"> + + + + @@ -498,83 +426,77 @@ - + type="radio" + class="btn-group btn-group-yesno" + label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL" + description="COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC" + default="0" + > - + type="radio" + class="btn-group btn-group-yesno" + label="COM_CONTENT_NO_ARTICLES_LABEL" + description="COM_CONTENT_NO_ARTICLES_DESC" + default="1" + > - + type="radio" + class="btn-group btn-group-yesno" + label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL" + description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC" + default="1" + > - + type="radio" + class="btn-group btn-group-yesno" + label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL" + description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC" + default="1" + > - - + -
-
- + - - + @@ -582,99 +504,92 @@ - + type="radio" + class="btn-group btn-group-yesno" + default="0" + label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL" + description="COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC" + > - + type="radio" + class="btn-group btn-group-yesno" + default="1" + label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL" + description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC" + > - + type="radio" + class="btn-group btn-group-yesno" + default="1" + label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL" + description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC" + > -
-
- + label="COM_CONTENT_CONFIG_BLOG_SETTINGS_LABEL" + description="COM_CONTENT_CONFIG_BLOG_SETTINGS_DESC" + > + type="text" + default="1" + label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL" + description="JGLOBAL_NUM_LEADING_ARTICLES_DESC"> - + type="text" + default="4" + label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL" + description="JGLOBAL_NUM_INTRO_ARTICLES_DESC"> - + type="text" + default="2" + label="JGLOBAL_NUM_COLUMNS_LABEL" + description="JGLOBAL_NUM_COLUMNS_DESC"> - + type="text" + default="4" + label="JGLOBAL_NUM_LINKS_LABEL" + description="JGLOBAL_NUM_LINKS_DESC"> - + type="list" + default="0" + label="JGLOBAL_MULTI_COLUMN_ORDER_LABEL" + description="JGLOBAL_MULTI_COLUMN_ORDER_DESC"> + value="0">JGLOBAL_DOWN + + value="1">JGLOBAL_ACROSS + - - - - + type="spacer" + hr="true" + /> + + @@ -684,213 +599,202 @@
-
- + label="JGLOBAL_LIST_LAYOUT_OPTIONS" + description="COM_CONTENT_CONFIG_LIST_SETTINGS_DESC" + > - - - - + type="radio" + class="btn-group btn-group-yesno" + default="1" + label="JGLOBAL_DISPLAY_SELECT_LABEL" + description="JGLOBAL_DISPLAY_SELECT_DESC"> + + + - - - - - - + type="list" + default="hide" + label="JGLOBAL_FILTER_FIELD_LABEL" + description="JGLOBAL_FILTER_FIELD_DESC"> + + + + + - - - - + type="radio" + class="btn-group btn-group-yesno" + default="1" + label="JGLOBAL_SHOW_HEADINGS_LABEL" + description="JGLOBAL_SHOW_HEADINGS_DESC"> + + + - - - - - - + type="list" + default="0" + label="JGLOBAL_SHOW_DATE_LABEL" + description="JGLOBAL_SHOW_DATE_DESC"> + + + + + - + type="text" + size="15" + label="JGLOBAL_DATE_FORMAT_LABEL" + description="JGLOBAL_DATE_FORMAT_DESC"/> - - - - + type="radio" + class="btn-group btn-group-yesno" + default="1" + label="JGLOBAL_LIST_HITS_LABEL" + description="JGLOBAL_LIST_HITS_DESC"> + + + - - - - + type="radio" + class="btn-group btn-group-yesno" + default="1" + label="JGLOBAL_LIST_AUTHOR_LABEL" + description="JGLOBAL_LIST_AUTHOR_DESC"> + + +
-
- + label="COM_CONTENT_SHARED_LABEL" + description="COM_CONTENT_SHARED_DESC" + > + + value="none">JGLOBAL_NO_ORDER + + value="alpha">JGLOBAL_TITLE_ALPHABETICAL + + value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL + + value="order">JGLOBAL_CATEGORY_MANAGER_ORDER + - + type="list" + default="rdate" + label="JGLOBAL_Article_Order_Label" + description="JGLOBAL_Article_Order_Desc"> + value="rdate">JGLOBAL_MOST_RECENT_FIRST + + value="date">JGLOBAL_OLDEST_FIRST + + value="alpha">JGLOBAL_TITLE_ALPHABETICAL + + value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL + + value="author">JGLOBAL_AUTHOR_ALPHABETICAL + + value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL + + value="hits">JGLOBAL_MOST_HITS + + value="rhits">JGLOBAL_LEAST_HITS + + value="order">JGLOBAL_ARTICLE_MANAGER_ORDER + + + + + + - - - - - - - - - - - - + type="list" + default="2" + label="JGLOBAL_Pagination_Label" + description="JGLOBAL_Pagination_Desc"> + + + + - - - - + type="radio" + class="btn-group btn-group-yesno" + default="1" + label="JGLOBAL_PAGINATION_RESULTS_LABEL" + description="JGLOBAL_PAGINATION_RESULTS_DESC"> + + +
-
- - - - - - - + label="JGLOBAL_INTEGRATION_LABEL" + description="COM_CONTENT_CONFIG_INTEGRATION_SETTINGS_DESC" + > + + + + + + value="0">JGLOBAL_INTRO_TEXT + - - - + value="1">JGLOBAL_FULL_TEXT + + + -
- -
- - +
+
diff --git a/components/com_content/views/article/tmpl/default.php b/components/com_content/views/article/tmpl/default.php index 2054975795932..aaed48ce1a648 100644 --- a/components/com_content/views/article/tmpl/default.php +++ b/components/com_content/views/article/tmpl/default.php @@ -12,73 +12,71 @@ JHtml::addIncludePath(JPATH_COMPONENT . '/helpers'); // Create shortcuts to some parameters. -$params = $this->item->params; -$images = json_decode($this->item->images); -$urls = json_decode($this->item->urls); -$canEdit = $params->get('access-edit'); -$user = JFactory::getUser(); -$info = $params->get('info_block_position', 0); -JHtml::_('behavior.caption'); -$useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date') - || $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author')); +$params = $this->item->params; +$images = json_decode($this->item->images); +$urls = json_decode($this->item->urls); +$canEdit = $params->get('access-edit'); +$user = JFactory::getUser(); +$info = $params->get('info_block_position', 0); +$useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date') || $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author')); +JHtml::_('behavior.caption'); ?> -
+
params->get('show_page_heading', 1)) : ?> -
-

escape($this->params->get('page_heading')); ?>

-
- item->pagination) && $this->item->pagination && !$this->item->paginationposition && $this->item->paginationrelative) -{ - echo $this->item->pagination; -} -?> +
+

escape($this->params->get('page_heading')); ?>

+
+ + item->pagination) && $this->item->pagination && !$this->item->paginationposition && $this->item->paginationrelative) : ?> + item->pagination; ?> + print) : ?>
item, $params); ?>
-
+
get('show_title') || $params->get('show_author')) : ?> -
-

- get('show_title')) : ?> - get('link_titles') && !empty($this->item->readmore_link)) : ?> - escape($this->item->title); ?> - - escape($this->item->title); ?> +
+

+ get('show_title')) : ?> + get('link_titles') && !empty($this->item->readmore_link)) : ?> + escape($this->item->title); ?> + + escape($this->item->title); ?> + +

+ item->state == 0) : ?> + -

- item->state == 0) : ?> - - - item->publish_up) > strtotime(JFactory::getDate())) : ?> - - - item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00') : ?> - - -
+ item->publish_up) > strtotime(JFactory::getDate())) : ?> + + + item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00') : ?> + + +
print) : ?> get('show_print_icon') || $params->get('show_email_icon')) : ?> -
- - -
    - get('show_print_icon')) : ?> -
  • item, $params); ?>
    • - - get('show_email_icon')) : ?> - - - -
  • item, $params); ?>
    • - -
-
+
+ + + +
    + get('show_print_icon')) : ?> +
  • item, $params); ?>
    • + + get('show_email_icon')) : ?> + + + +
  • item, $params); ?>
    • + +
+
@@ -87,112 +85,11 @@
-
-
- - get('show_author') && !empty($this->item->author )) : ?> -
- item->created_by_alias ? $this->item->created_by_alias : $this->item->author; ?> - item->contact_link) && $params->get('link_author') == true) : ?> - item->contact_link, $author)); ?> - - - -
- - get('show_parent_category') && !empty($this->item->parent_slug)) : ?> -
- escape($this->item->parent_title); - $url = ''.$title.'';?> - get('link_parent_category') && !empty($this->item->parent_slug)) : ?> - - - - -
- - get('show_category')) : ?> -
- escape($this->item->category_title); - $url = '' . $title . '';?> - get('link_category') && $this->item->catslug) : ?> - - - - -
- - - get('show_publish_date')) : ?> -
- item->publish_up, JText::_('DATE_FORMAT_LC3'))); ?> -
- - - - get('show_modify_date')) : ?> -
- item->modified, JText::_('DATE_FORMAT_LC3'))); ?> -
- - get('show_create_date')) : ?> -
- item->created, JText::_('DATE_FORMAT_LC3'))); ?> -
- - - get('show_hits')) : ?> -
- item->hits); ?> -
- - -
-
- - - get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?> - item->tagLayout = new JLayoutFile('joomla.content.tags'); ?> - - item->tagLayout->render($this->item->tags->itemTags); ?> - - - get('show_intro')) : echo $this->item->event->afterDisplayTitle; endif; ?> - item->event->beforeDisplayContent; ?> - - urls_position) && ($urls->urls_position == '0')) || ($params->get('urls_position') == '0' && empty($urls->urls_position))) - || (empty($urls->urls_position) && (!$params->get('urls_position')))) : ?> - loadTemplate('links'); ?> - - get('access-view')):?> - image_fulltext) && !empty($images->image_fulltext)) : ?> - float_fulltext)) ? $params->get('float_fulltext') : $images->float_fulltext; ?> -
image_fulltext_caption): - echo 'class="caption"'.' title="' .htmlspecialchars($images->image_fulltext_caption) . '"'; - endif; ?> - src="image_fulltext); ?>" alt="image_fulltext_alt); ?>"/>
- - item->pagination) && $this->item->pagination && !$this->item->paginationposition && !$this->item->paginationrelative): - echo $this->item->pagination; - endif; - ?> - item->toc)) : - echo $this->item->toc; - endif; ?> - item->text; ?> - - -
-
-
- - - get('show_author') && !empty($this->item->author )) : ?> +
+ get('show_author') && !empty($this->item->author)) : ?>
item->created_by_alias ? $this->item->created_by_alias : $this->item->author; ?> item->contact_link) && $params->get('link_author') == true) : ?> @@ -204,9 +101,9 @@ get('show_parent_category') && !empty($this->item->parent_slug)) : ?>
- escape($this->item->parent_title); - $url = '' . $title . '';?> - get('link_parent_category') && $this->item->parent_slug) : ?> + escape($this->item->parent_title); + $url = '' . $title . ''; ?> + get('link_parent_category') && !empty($this->item->parent_slug)) : ?> @@ -215,8 +112,8 @@ get('show_category')) : ?>
- escape($this->item->category_title); - $url = '' . $title . '';?> + escape($this->item->category_title); ?> + item->catslug)) . '">' . $title . ''; ?> get('link_category') && $this->item->catslug) : ?> @@ -226,72 +123,164 @@ get('show_publish_date')) : ?>
- - item->publish_up, JText::_('DATE_FORMAT_LC3'))); ?> + item->publish_up, JText::_('DATE_FORMAT_LC3'))); ?>
- - - get('show_create_date')) : ?> -
- - item->created, JText::_('DATE_FORMAT_LC3'))); ?> -
- - get('show_modify_date')) : ?> -
- - item->modified, JText::_('DATE_FORMAT_LC3'))); ?> -
- - get('show_hits')) : ?> -
- item->hits); ?> -
- + + get('show_modify_date')) : ?> +
+ item->modified, JText::_('DATE_FORMAT_LC3'))); ?> +
+ + get('show_create_date')) : ?> +
+ item->created, JText::_('DATE_FORMAT_LC3'))); ?> +
+ + get('show_hits')) : ?> +
+ item->hits); ?> +
+ +
- - item->pagination) && $this->item->pagination && $this->item->paginationposition && !$this->item->paginationrelative): - echo $this->item->pagination; -?> + get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?> + item->tagLayout = new JLayoutFile('joomla.content.tags'); ?> + item->tagLayout->render($this->item->tags->itemTags); ?> - urls_position) && ($urls->urls_position == '1')) || ($params->get('urls_position') == '1'))) : ?> - loadTemplate('links'); ?> + get('show_intro')) : echo $this->item->event->afterDisplayTitle; endif; ?> + item->event->beforeDisplayContent; ?> + urls_position) && ($urls->urls_position == '0')) || ($params->get('urls_position') == '0' && empty($urls->urls_position))) + || (empty($urls->urls_position) && (!$params->get('urls_position'))) + ) : ?> + loadTemplate('links'); ?> - + get('access-view')): ?> + image_fulltext) && !empty($images->image_fulltext)) : ?> + float_fulltext)) ? $params->get('float_fulltext') : $images->float_fulltext; ?> +
image_fulltext_caption) : ?> + image_fulltext_caption) . '"'; ?> + + src="image_fulltext); ?>" alt="image_fulltext_alt); ?>" /> +
+ + item->pagination) && $this->item->pagination && !$this->item->paginationposition && !$this->item->paginationrelative) : ?> + item->pagination; ?> + + item->toc)) : ?> + item->toc; ?> + + item->text; ?> + +
+
+
+ + get('show_author') && !empty($this->item->author)) : ?> +
+ item->created_by_alias ? $this->item->created_by_alias : $this->item->author; ?> + item->contact_link) && $params->get('link_author') == true) : ?> + item->contact_link, $author)); ?> + + + +
+ + get('show_parent_category') && !empty($this->item->parent_slug)) : ?> +
+ escape($this->item->parent_title); + $url = '' . $title . ''; ?> + get('link_parent_category') && $this->item->parent_slug) : ?> + + + + +
+ + get('show_category')) : ?> +
+ escape($this->item->category_title); ?> + item->catslug)) . '">' . $title . ''; ?> + get('link_category') && $this->item->catslug) : ?> + + + + +
+ + get('show_publish_date')) : ?> +
+ + item->publish_up, JText::_('DATE_FORMAT_LC3'))); ?> +
+ + + get('show_create_date')) : ?> +
+ + item->created, JText::_('DATE_FORMAT_LC3'))); ?> +
+ + get('show_modify_date')) : ?> +
+ + item->modified, JText::_('DATE_FORMAT_LC3'))); ?> +
+ + get('show_hits')) : ?> +
+ item->hits); ?> +
+ +
+ get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?> + item->tagLayout = new JLayoutFile('joomla.content.tags'); ?> + item->tagLayout->render($this->item->tags->itemTags); ?> + +
+ + get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?> + item->tagLayout = new JLayoutFile('joomla.content.tags'); ?> + item->tagLayout->render($this->item->tags->itemTags); ?> + + item->pagination) && $this->item->pagination && $this->item->paginationposition && !$this->item->paginationrelative) : ?> + item->pagination; ?> + + urls_position) && ($urls->urls_position == '1')) || ($params->get('urls_position') == '1'))) : ?> + loadTemplate('links'); ?> + + get('show_noauth') == true && $user->get('guest')) : ?> - item->introtext; ?> - - get('show_readmore') && $this->item->fulltext != null) : - $link1 = JRoute::_('index.php?option=com_users&view=login'); - $link = new JUri($link1);?> -

- - item->attribs); ?> - alternative_readmore == null) : - echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE'); - elseif ($readmore = $this->item->alternative_readmore) : - echo $readmore; - if ($params->get('show_readmore_title', 0) != 0) : - echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit')); - endif; - elseif ($params->get('show_readmore_title', 0) == 0) : - echo JText::sprintf('COM_CONTENT_READ_MORE_TITLE'); - else : - echo JText::_('COM_CONTENT_READ_MORE'); - echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit')); - endif; ?> - -

- + item->introtext; ?> + + get('show_readmore') && $this->item->fulltext != null) : ?> + + +

+ + item->attribs); ?> + alternative_readmore == null) : ?> + + item->alternative_readmore) : ?> + + get('show_readmore_title', 0) != 0) : ?> + item->title), $params->get('readmore_limit')); ?> + + get('show_readmore_title', 0) == 0) : ?> + + + + item->title), $params->get('readmore_limit')); ?> + + +

+ - item->pagination) && $this->item->pagination && $this->item->paginationposition && $this->item->paginationrelative) : - echo $this->item->pagination; -?> + item->pagination) && $this->item->pagination && $this->item->paginationposition && $this->item->paginationrelative) : ?> + item->pagination; ?> - item->event->afterDisplayContent; ?> + item->event->afterDisplayContent; ?> + diff --git a/components/com_content/views/article/tmpl/default.xml b/components/com_content/views/article/tmpl/default.xml index bc9bc0c808146..dc2e321ebe45d 100644 --- a/components/com_content/views/article/tmpl/default.xml +++ b/components/com_content/views/article/tmpl/default.xml @@ -1,288 +1,253 @@ - + + key="JHELP_MENUS_MENU_ITEM_ARTICLE_SINGLE_ARTICLE" + /> -
- - + addfieldpath="/administrator/components/com_content/models/fields"> +
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + label="COM_CONTENT_ATTRIBS_ARTICLE_SETTINGS_LABEL"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/components/com_content/views/category/tmpl/blog.php b/components/com_content/views/category/tmpl/blog.php index 090b5a0d8b054..f3a8df1383a3b 100644 --- a/components/com_content/views/category/tmpl/blog.php +++ b/components/com_content/views/category/tmpl/blog.php @@ -19,7 +19,6 @@

escape($this->params->get('page_heading')); ?>

- params->get('show_category_title', 1) or $this->params->get('page_subheading')) : ?>

escape($this->params->get('page_subheading')); ?> params->get('show_category_title')) : ?> @@ -27,12 +26,10 @@

- - params->get('show_tags', 1) && !empty($this->category->tags->itemTags)) : ?> + params->get('show_cat_tags', 1) && !empty($this->category->tags->itemTags)) : ?> category->tagLayout = new JLayoutFile('joomla.content.tags'); ?> category->tagLayout->render($this->category->tags->itemTags); ?> - params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
params->get('show_description_image') && $this->category->getParams()->get('image')) : ?> @@ -43,64 +40,52 @@
- lead_items) && empty($this->link_items) && empty($this->intro_items)) : ?> params->get('show_no_articles', 1)) : ?>

- lead_items)) : ?>
lead_items as &$item) : ?>
- item = & $item; - echo $this->loadTemplate('item'); - ?> + item = & $item; ?> + loadTemplate('item'); ?>
- - intro_items)); - $counter = 0; - ?> - + intro_items)); ?> + intro_items)) : ?> intro_items as $key => &$item) : ?> columns) + 1; ?> columns; ?>
- -
-
- item = & $item; - echo $this->loadTemplate('item'); - ?> -
- - -
- columns) or ($counter == $introcount)) : ?> + +
+
+ item = & $item; ?> + loadTemplate('item'); ?> +
+ + +
+ columns) or ($counter == $introcount)) : ?>
- link_items)) : ?>
loadTemplate('links'); ?>
- children[$this->category->id]) && $this->maxLevel != 0) : ?>
params->get('show_category_heading_title_text', 1) == 1) : ?> diff --git a/components/com_content/views/category/tmpl/blog.xml b/components/com_content/views/category/tmpl/blog.xml index 33ba7f865fbfa..2605f5638ce2e 100644 --- a/components/com_content/views/category/tmpl/blog.xml +++ b/components/com_content/views/category/tmpl/blog.xml @@ -1,76 +1,76 @@ - + + key="JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORY_BLOG" + /> -
- - + > +
- - -
- + +
- + type="hidden" + default="blog" + /> + - - + + - - + - - + - - + @@ -80,99 +80,109 @@ - - + - - + - - + - - + - - - -
- -
- - - - - - - - - - - - - + + + + + + +
+
+ + + + + + - + + + description="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_DESC" + label="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL" + > @@ -182,28 +192,27 @@ - - - + name="spacer1" + type="spacer" + hr="true" + /> + - - + @@ -216,287 +225,292 @@ - - + - - + - - + - -
- -
- +
+
+ - - + - - + - + name="info_block_position" + type="list" + default="" + label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL" + description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC"> - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - - - - - + name="show_vote" + type="list" + label="JGLOBAL_SHOW_VOTE_LABEL" + description="JGLOBAL_SHOW_VOTE_DESC" + > + + + + + + name="show_readmore" + type="list" + description="JGLOBAL_SHOW_READMORE_DESC" + label="JGLOBAL_SHOW_READMORE_LABEL" + > - + name="show_readmore_title" + type="list" + label="JGLOBAL_SHOW_READMORE_TITLE_LABEL" + description="JGLOBAL_SHOW_READMORE_TITLE_DESC" + > - - + - - + - - + - - + - - + + + + + + - -
-
- - +
+
+ - - +
- + diff --git a/components/com_content/views/category/tmpl/blog_item.php b/components/com_content/views/category/tmpl/blog_item.php index 144160fa50600..14df31a5f4005 100644 --- a/components/com_content/views/category/tmpl/blog_item.php +++ b/components/com_content/views/category/tmpl/blog_item.php @@ -7,79 +7,71 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -defined('_JEXEC') or die;?> -item->params; -JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); -$canEdit = $this->item->params->get('access-edit'); +defined('_JEXEC') or die; + +JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); + JHtml::_('behavior.framework'); + +// Create a shortcut for params. +$params = $this->item->params; +$canEdit = $this->item->params->get('access-edit'); ?> item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate()) - || ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00' )) : ?> +|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00')) : ?>
- item); ?> - $params, 'item' => $this->item, 'print' => false)); ?> - +get('show_tags') && !empty($this->item->tags->itemTags)) : ?> + item->tags->itemTags); ?> + get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date') - || $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author') ); ?> - +|| $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author')); ?> $this->item, 'params' => $params, 'position' => 'above')); ?> - item); ?> - - get('show_intro')) : ?> item->event->afterDisplayTitle; ?> item->event->beforeDisplayContent; ?> item->introtext; ?> - $this->item, 'params' => $params, 'position' => 'below')); ?> - - -get('show_readmore') && $this->item->readmore) : - if ($params->get('access-view')) : - $link = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid)); - else : - $menu = JFactory::getApplication()->getMenu(); - $active = $menu->getActive(); - $itemId = $active->id; - $link1 = JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId); - $returnURL = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid)); - $link = new JUri($link1); - $link->setVar('return', base64_encode($returnURL)); - endif; ?> - -

- - get('access-view')) : - echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE'); - elseif ($readmore = $this->item->alternative_readmore) : - echo $readmore; - if ($params->get('show_readmore_title', 0) != 0) : - echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit')); - endif; - elseif ($params->get('show_readmore_title', 0) == 0) : - echo JText::sprintf('COM_CONTENT_READ_MORE_TITLE'); - else : - echo JText::_('COM_CONTENT_READ_MORE'); - echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit')); - endif; ?> - -

- - +get('show_readmore') && $this->item->readmore) : ?> + get('access-view')) : ?> + item->slug, $this->item->catid)); ?> + + getMenu(); ?> + getActive(); ?> + id; ?> + + item->slug, $this->item->catid)); ?> + + setVar('return', base64_encode($returnURL)); ?> + +

+ + get('access-view')) : ?> + + item->alternative_readmore) : ?> + + get('show_readmore_title', 0) != 0) : ?> + item->title), $params->get('readmore_limit')); ?> + + get('show_readmore_title', 0) == 0) : ?> + + + + item->title), $params->get('readmore_limit')); ?> + + +

+ item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate()) - || ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00' )) : ?> -
+|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00')) : ?> +
- item->event->afterDisplayContent; ?> diff --git a/components/com_content/views/category/tmpl/default.xml b/components/com_content/views/category/tmpl/default.xml index d0efa10184dfa..89ecea7b3ffa5 100644 --- a/components/com_content/views/category/tmpl/default.xml +++ b/components/com_content/views/category/tmpl/default.xml @@ -1,63 +1,63 @@ - + + key="JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORY_LIST" + /> -
- - + > +
- - -
- - + +
+ - - + - - + - - + @@ -67,154 +67,152 @@ - - + - - + - - - + type="list" + label="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_LABEL" + description="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_DESC"> + + + - + - - + - - + - - - -
- -
- - + +
+
+ - - + - - + - - + - - - - + + - - + - - - - + + - - + @@ -227,39 +225,39 @@ - - + - - + - - - + - - + + @@ -269,224 +267,221 @@ - - -
- -
- + +
+
+ - - + - - + - - + - - + - - + - - + - - + - - + - - + + + + + + - - + - - + - - + - - - - - - - + - - + - - + - - + - - + - - + - - + -
-
- - +
+
+ - - +
- + diff --git a/components/com_content/views/featured/tmpl/default.xml b/components/com_content/views/featured/tmpl/default.xml index b69822f4c746b..8b46b6df877b3 100644 --- a/components/com_content/views/featured/tmpl/default.xml +++ b/components/com_content/views/featured/tmpl/default.xml @@ -1,85 +1,86 @@ - + + key="JHELP_MENUS_MENU_ITEM_ARTICLE_FEATURED" + /> - - - -
- - + + +
+ + - - - - - - - - - - - - + type="hidden" + default="blog" + /> + + + + + + - - + - - + @@ -92,286 +93,288 @@ - - + - - + - - + - - -
- -
- +
+
+ - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - - - - - - + + - - + - - + + + + + + - - + - - + - - + - - + + + + + + -
-
- - +
+
+ - - +
- + diff --git a/components/com_content/views/featured/tmpl/default_item.php b/components/com_content/views/featured/tmpl/default_item.php index 05b443abf02a2..c3039a7c1f242 100644 --- a/components/com_content/views/featured/tmpl/default_item.php +++ b/components/com_content/views/featured/tmpl/default_item.php @@ -10,28 +10,27 @@ defined('_JEXEC') or die; // Create a shortcut for params. -$params = &$this->item->params; -$images = json_decode($this->item->images); -$canEdit = $this->item->params->get('access-edit'); -$info = $this->item->params->get('info_block_position', 0); - +$params = $this->item->params; +$images = json_decode($this->item->images); +$canEdit = $this->item->params->get('access-edit'); +$info = $this->item->params->get('info_block_position', 0); ?> item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate()) - || ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00' )) : ?> -
+|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00' )) : ?> +
- get('show_title')) : ?>

- get('link_titles') && $params->get('access-view')) : ?> - escape($this->item->title); ?> - - escape($this->item->title); ?> - + get('link_titles') && $params->get('access-view')) : ?> + + escape($this->item->title); ?> + + + escape($this->item->title); ?> +

- item->state == 0) : ?> @@ -41,33 +40,29 @@ item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00') : ?> - get('show_print_icon') || $params->get('show_email_icon') || $canEdit) : ?>
    - get('show_print_icon')) : ?> -
  • item, $params); ?>
    • - - get('show_email_icon')) : ?> - - - -
  • item, $params); ?>
    • - + get('show_print_icon')) : ?> +
  • item, $params); ?>
    • + + get('show_email_icon')) : ?> + + + +
  • item, $params); ?>
    • +
- get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date') || $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author') ); ?> -
- +
- get('show_author') && !empty($this->item->author )) : ?>
item->author; ?> @@ -79,11 +74,10 @@
- get('show_parent_category') && !empty($this->item->parent_slug)) : ?>
- escape($this->item->parent_title); - $url = ''.$title.'';?> + escape($this->item->parent_title); ?> + item->parent_slug)).'">'.$title.''; ?> get('link_parent_category') && !empty($this->item->parent_slug)) : ?> @@ -91,11 +85,10 @@
- get('show_category')) : ?>
- escape($this->item->category_title); - $url = ''.$title.'';?> + escape($this->item->category_title); ?> + item->catslug)).'">'.$title.''; ?> get('link_category') && $this->item->catslug) : ?> @@ -103,54 +96,51 @@
- get('show_publish_date')) : ?>
item->publish_up, JText::_('DATE_FORMAT_LC3'))); ?>
- get('show_modify_date')) : ?>
- - item->modified, JText::_('DATE_FORMAT_LC3'))); ?> + + item->modified, JText::_('DATE_FORMAT_LC3'))); ?>
- get('show_create_date')) : ?>
item->created, JText::_('DATE_FORMAT_LC3'))); ?>
- get('show_hits')) : ?>
item->hits); ?>
- + params->get('show_tags', 1)) : ?> + item->tagLayout = new JLayoutFile('joomla.content.tags'); ?> + item->tagLayout->render($this->item->tags->itemTags); ?> +
- image_intro) && !empty($images->image_intro)) : ?> float_intro)) ? $params->get('float_intro') : $images->float_intro; ?>
image_intro_caption): - echo 'class="caption"'.' title="' .htmlspecialchars($images->image_intro_caption) .'"'; - endif; ?> - src="image_intro); ?>" alt="image_intro_alt); ?>"/>
+ image_intro_caption): ?> + image_intro_caption) .'"'; ?> + + src="image_intro); ?>" alt="image_intro_alt); ?>"/> +
- get('show_intro')) : ?> item->event->afterDisplayTitle; ?> item->event->beforeDisplayContent; ?> item->introtext; ?> - - +
@@ -167,11 +157,10 @@ - get('show_parent_category') && !empty($this->item->parent_slug)) : ?>
- escape($this->item->parent_title); - $url = ''.$title.'';?> + escape($this->item->parent_title); ?> + item->parent_slug)).'">'.$title.''; ?> get('link_parent_category') && $this->item->parent_slug) : ?> @@ -179,11 +168,10 @@
- get('show_category')) : ?>
- escape($this->item->category_title); - $url = ''.$title.'';?> + escape($this->item->category_title); ?> + item->catslug)).'">'.$title.''; ?> get('link_category') && $this->item->catslug) : ?> @@ -191,77 +179,66 @@
- get('show_publish_date')) : ?>
item->publish_up, JText::_('DATE_FORMAT_LC3'))); ?>
- get('show_create_date')) : ?>
item->created, JText::_('DATE_FORMAT_LC3'))); ?>
- get('show_modify_date')) : ?>
item->modified, JText::_('DATE_FORMAT_LC3'))); ?>
- get('show_hits')) : ?>
item->hits); ?>
- params->get('show_tags', 1)) : ?> item->tagLayout = new JLayoutFile('joomla.content.tags'); ?> item->tagLayout->render($this->item->tags->itemTags); ?> - - -get('show_readmore') && $this->item->readmore) : - if ($params->get('access-view')) : - $link = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid)); - else : - $menu = JFactory::getApplication()->getMenu(); - $active = $menu->getActive(); - $itemId = $active->id; - $link1 = JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId); - $returnURL = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid)); - $link = new JUri($link1); - $link->setVar('return', base64_encode($returnURL)); - endif; ?> - -

- - get('access-view')) : - echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE'); - elseif ($readmore = $this->item->alternative_readmore) : - echo $readmore; - if ($params->get('show_readmore_title', 0) != 0) : - echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit')); - endif; - elseif ($params->get('show_readmore_title', 0) == 0) : - echo JText::sprintf('COM_CONTENT_READ_MORE_TITLE'); - else : - echo JText::_('COM_CONTENT_READ_MORE'); - echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit')); - endif; ?> - -

- +get('show_readmore') && $this->item->readmore) : ?> + get('access-view')) : ?> + item->slug, $this->item->catid)); ?> + + getMenu(); ?> + getActive(); ?> + id; ?> + + item->slug, $this->item->catid)); ?> + + setVar('return', base64_encode($returnURL)); ?> + +

+ + get('access-view')) : ?> + + item->alternative_readmore) : ?> + + get('show_readmore_title', 0) != 0) : ?> + item->title), $params->get('readmore_limit')); ?> + + get('show_readmore_title', 0) == 0) : ?> + + + + item->title), $params->get('readmore_limit')); ?> + + +

- item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate()) - || ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00' )) : ?> -
+|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00' )) : ?> + - item->event->afterDisplayContent; ?> diff --git a/layouts/joomla/content/category_default.php b/layouts/joomla/content/category_default.php index fe27e0c27ee0f..2a20517760458 100644 --- a/layouts/joomla/content/category_default.php +++ b/layouts/joomla/content/category_default.php @@ -11,52 +11,52 @@ // Note that this layout opens a div with the page class suffix. If you do not use the category children // layout you need to close this div either by overriding this file or in your main layout. -$params = $displayData->params; -$extension = $displayData->get('category')->extension; -$canEdit = $params->get('access-edit'); -$className = substr($extension, 4); +$params = $displayData->params; +$extension = $displayData->get('category')->extension; +$canEdit = $params->get('access-edit'); +$className = substr($extension, 4); + // This will work for the core components but not necessarily for other components // that may have different pluralisation rules. if (substr($className, -1) == 's') { $className = rtrim($className, 's'); } -$tagsData = $displayData->get('category')->tags->itemTags; + +$tagsData = $displayData->get('category')->tags->itemTags; ?>
-
+
get('show_page_heading')) : ?>

escape($params->get('page_heading')); ?>

- get('show_category_title', 1)) : ?> + get('show_category_title', 1)) : ?>

- get('category')->title, '', $extension.'.category.title'); ?> + get('category')->title, '', $extension . '.category.title'); ?>

- get('show_tags', 1)) : ?> + get('show_cat_tags', 1)) : ?> get('show_description', 1) || $params->def('show_description_image', 1)) : ?>
get('show_description_image') && $displayData->get('category')->getParams()->get('image')) : ?> - + get('show_description') && $displayData->get('category')->description) : ?> - get('category')->description, '', $extension .'.category'); ?> + get('category')->description, '', $extension . '.category'); ?>
loadTemplate($displayData->subtemplatename); ?> - get('children') && $displayData->maxLevel != 0) : ?>

- loadTemplate('children'); ?>