From b065affd4785d2febab01e1d551a3940ae397bc1 Mon Sep 17 00:00:00 2001 From: chmst Date: Fri, 23 Jul 2021 20:17:49 +0200 Subject: [PATCH 1/8] Adapt weblink.xml to J4 --- src/components/com_weblinks/forms/weblink.xml | 33 +++---------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/src/components/com_weblinks/forms/weblink.xml b/src/components/com_weblinks/forms/weblink.xml index 93ee1af..aae32f6 100644 --- a/src/components/com_weblinks/forms/weblink.xml +++ b/src/components/com_weblinks/forms/weblink.xml @@ -7,7 +7,6 @@ label="WEBLINK_ID_LABEL" readonly="true" required="true" - size="10" default="0" /> @@ -23,9 +22,7 @@ name="title" type="text" label="JGLOBAL_TITLE" - description="COM_WEBLINKS_FIELD_TITLE_DESC" required="true" - size="30" /> @@ -64,7 +60,6 @@ name="catid" type="categoryedit" label="JCATEGORY" - description="COM_WEBLINKS_FIELD_CATEGORY_DESC" extension="com_weblinks" required="true" /> @@ -73,18 +68,14 @@ name="url" type="url" label="COM_WEBLINKS_FIELD_URL_LABEL" - description="COM_WEBLINKS_FIELD_URL_DESC" filter="url" required="true" - size="45" /> @@ -100,17 +91,13 @@ name="version_note" type="text" label="JGLOBAL_FIELD_VERSION_NOTE_LABEL" - description="JGLOBAL_FIELD_VERSION_NOTE_DESC" - class="inputbox" - size="45" - labelclass="control-label" + maxlength="255" /> @@ -125,9 +112,7 @@ name="robots" type="hidden" label="JFIELD_METADATA_ROBOTS_LABEL" - description="JFIELD_METADATA_ROBOTS_DESC" filter="unset" - labelclass="control-label" > @@ -140,31 +125,21 @@ name="author" type="hidden" label="JAUTHOR" - description="JFIELD_METADATA_AUTHOR_DESC" filter="unset" - size="20" - labelclass="control-label" /> From be8e34e76a96eddacc2849e04b5badc56922516b Mon Sep 17 00:00:00 2001 From: chmst Date: Sun, 25 Jul 2021 22:32:09 +0200 Subject: [PATCH 2/8] adapt categories default.xml --- .../com_weblinks/tmpl/categories/default.xml | 452 +++++++++--------- 1 file changed, 234 insertions(+), 218 deletions(-) diff --git a/src/components/com_weblinks/tmpl/categories/default.xml b/src/components/com_weblinks/tmpl/categories/default.xml index 396c898..e267f66 100644 --- a/src/components/com_weblinks/tmpl/categories/default.xml +++ b/src/components/com_weblinks/tmpl/categories/default.xml @@ -1,11 +1,11 @@ - + - + @@ -13,8 +13,8 @@
- - -
- - - - + +
+ + + + - + - - - - - - - + + + + + + + - + - - - - + + + + - - - - + + + + - - - - -
+ + + + +
-
- - - - +
+ + + + - - - - + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + -
+
-
- - - - +
+ + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - -
+ + + + +
- + From f4bc69f6c65788ed84612b4d86bef9153f6770fb Mon Sep 17 00:00:00 2001 From: chmst Date: Sun, 25 Jul 2021 23:12:01 +0200 Subject: [PATCH 3/8] indent with tabs --- .../tmpl/categories/default_items.php | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/components/com_weblinks/tmpl/categories/default_items.php b/src/components/com_weblinks/tmpl/categories/default_items.php index 374999a..d32f762 100644 --- a/src/components/com_weblinks/tmpl/categories/default_items.php +++ b/src/components/com_weblinks/tmpl/categories/default_items.php @@ -18,39 +18,39 @@ if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) : ?> items[$this->parent->id] as $id => $item) : ?> params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) : ?> -
-

- +
+

+ escape($item->title); ?> params->get('show_cat_items_cat') == 1) :?> - +   numitems; ?> maxLevelcat > 1 && count($item->getChildren()) > 0) : ?> - + -

+

params->get('show_subcat_desc_cat') == 1) : ?> description) : ?> -
+
description, '', 'com_weblinks.categories'); ?> -
+
maxLevelcat > 1 && count($item->getChildren()) > 0) : ?> -
+
items[$item->id] = $item->getChildren(); $this->parent = $item; @@ -59,9 +59,9 @@ if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) : $this->parent = $item->getParent(); $this->maxLevelcat++; ?> -
+
-
+ - \ No newline at end of file + From d822541c7e787ace1adcc173ff940d01e9a89a39 Mon Sep 17 00:00:00 2001 From: chmst Date: Sun, 25 Jul 2021 23:28:28 +0200 Subject: [PATCH 4/8] Remove tab layout from menu item type categories --- .../com_weblinks/tmpl/categories/default.xml | 84 ------------------- 1 file changed, 84 deletions(-) diff --git a/src/components/com_weblinks/tmpl/categories/default.xml b/src/components/com_weblinks/tmpl/categories/default.xml index e267f66..4860656 100644 --- a/src/components/com_weblinks/tmpl/categories/default.xml +++ b/src/components/com_weblinks/tmpl/categories/default.xml @@ -192,89 +192,5 @@
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- From e5251bf473fdae738e6c870d50c3708d1ca81888 Mon Sep 17 00:00:00 2001 From: chmst Date: Sun, 25 Jul 2021 23:52:10 +0200 Subject: [PATCH 5/8] revert last change --- .../com_weblinks/tmpl/categories/default.xml | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/src/components/com_weblinks/tmpl/categories/default.xml b/src/components/com_weblinks/tmpl/categories/default.xml index 4860656..e267f66 100644 --- a/src/components/com_weblinks/tmpl/categories/default.xml +++ b/src/components/com_weblinks/tmpl/categories/default.xml @@ -192,5 +192,89 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ From 43145030c7c9a85ec6472858832c60e81a712103 Mon Sep 17 00:00:00 2001 From: chmst Date: Mon, 26 Jul 2021 21:14:51 +0200 Subject: [PATCH 6/8] Layout Weblinks Category - first attempt --- .../com_weblinks/tmpl/category/default.xml | 66 ++-- .../tmpl/category/default_items.php | 283 ++++++++++-------- 2 files changed, 188 insertions(+), 161 deletions(-) diff --git a/src/components/com_weblinks/tmpl/category/default.xml b/src/components/com_weblinks/tmpl/category/default.xml index 486e8f8..f0a0ec4 100644 --- a/src/components/com_weblinks/tmpl/category/default.xml +++ b/src/components/com_weblinks/tmpl/category/default.xml @@ -1,19 +1,19 @@ - + - +
- - JSHOW - JSHOW - JSHOW - - JSHOW - JSHOW - JSHOW - JSHOW - JSHOW - JSHOW - JSHOW - JGLOBAL_AUTO -
- - +
diff --git a/src/components/com_weblinks/tmpl/category/default_items.php b/src/components/com_weblinks/tmpl/category/default_items.php index 9f38c7d..28cee18 100644 --- a/src/components/com_weblinks/tmpl/category/default_items.php +++ b/src/components/com_weblinks/tmpl/category/default_items.php @@ -13,9 +13,10 @@ use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\FileLayout; +use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Uri\Uri; -// HTMLHelper::_('behavior.framework'); +HTMLHelper::_('behavior.core'); // Create a shortcut for params. $params = &$this->category->params; @@ -36,140 +37,166 @@ $listDirn = $this->escape($this->state->get('list.direction')); items)) : ?>

+
+
+ params->get('filter_field')) : ?> +
+ + + + +
+ + params->get('show_pagination_limit')) : ?> +
+ + pagination->getLimitBox(); ?> +
+ - - params->get('filter_field') != 'hide' || $this->params->get('show_pagination_limit')) : ?> -
- params->get('filter_field') != 'hide') : ?> -
- - -
- +
    - params->get('show_pagination_limit')) : ?> -
    - - pagination->getLimitBox(); ?> -
    - -
- -
    - items as $i => $item) : ?> - access, $this->user->getAuthorisedViewLevels())) : ?> - items[$i]->state == 0) : ?> -
  • - -
  • - - params->get('show_link_hits', 1)) : ?> - - hits); ?> - - + items as $i => $item) : ?> - - - - - - -
    - params->get('icons', 1) == 0) : ?> - - params->get('icons', 1) == 1) : ?> - params->get('link_icons')) : ?> - - - params->get('link_icons') . '" alt="' . Text::_('COM_WEBLINKS_LINK') . '" />'; ?> - - - - pageclass_sfx; ?> - link; ?> - params->get('width'); ?> - params->get('height'); ?> - - - - - items[$i]->state == 0) : ?> - - + access, $this->user->getAuthorisedViewLevels())) : ?> params->get('target', $this->params->get('target'))) - { - case 1: - // Open in a new window - echo '' . - $this->escape($item->title) . ''; - break; - - case 2: - // Open in a popup window - $attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=' . $this->escape($width) . ',height=' . $this->escape($height) . ''; - echo "" . - $this->escape($item->title) . ''; - break; - case 3: - // Open in a modal window - HTMLHelper::_('behavior.modal', 'a.modal'); - echo '' . - $this->escape($item->title) . ' '; - break; - - default: - // Open in parent window - echo '' . - $this->escape($item->title) . ' '; - break; - } - ?> -
    - tags->getItemTags('com_weblinks.weblink', $item->id); ?> - params->get('show_tags', 1)) : ?> - category->tagLayout = new FileLayout('joomla.content.tags'); ?> - category->tagLayout->render($tagsData); ?> + // Shouldn't this be only for users with admin rights? + if ($item->state == 0) : ?> +
  • + +
  • - params->get('show_link_description')) and ($item->description != '')) : ?> - images); ?> - image_first) and !empty($images->image_first)) : ?> - float_first)) ? $this->params->get('float_first') : $images->float_first; ?> -
    image_first_caption) : ?> - image_first_caption) . '"'; ?> + + params->get('show_link_hits', 1)) : ?> + + hits); ?> + + + + + $params, 'item' => $item)); ?> + + +
    + params->get('icons', 1)) : ?> + + + + params->get('link_icons')) : ?> + + + params->get('link_icons') . '" alt="' . Text::_('COM_WEBLINKS_LINK') . '" />'; ?> + - src="image_first); ?>" alt="image_first_alt); ?>"/>
    - - image_second) and !empty($images->image_second)) : ?> - float_second)) ? $this->params->get('float_second') : $images->float_second; ?> -
    image_second_caption) : ?> - image_second_caption) . '"'; ?> - - src="image_second); ?>" alt="image_second_alt); ?>"/>
    - - description; ?> - -
    • - - -
- - params->get('show_pagination')) : ?> - + + params->get('show_tags', 1)) : ?> + tags->getItemTags('com_weblinks.weblink', $item->id); ?> + category->tagLayout = new FileLayout('joomla.content.tags'); ?> + category->tagLayout->render($tagsData); ?> + + + params->get('show_link_description')) && ($item->description != '')) : ?> + images); ?> + image_first) and !empty($images->image_first)) : ?> + float_first)) ? $this->params->get('float_first') : $images->float_first; ?> +
+ image_first_caption) : ?> + image_first_caption) . '"'; ?> + + src="image_first); ?>" + alt="image_first_alt); ?>"/> +
+ + + image_second) and !empty($images->image_second)) : ?> + float_second)) ? $this->params->get('float_second') : $images->float_second; ?> +
+ image_second_caption) : ?> + image_second_caption) . '"'; ?> + + src="image_second); ?>" + alt="image_second_alt); ?>"/>
+ + + description; ?> + + + + + + + + params->get('show_pagination')) : ?> + - pagination->getPagesLinks(); ?> -
- - + + + From 83b37e469930e1004aab1daad229418dc9f8ec82 Mon Sep 17 00:00:00 2001 From: chmst Date: Thu, 29 Jul 2021 09:03:32 +0200 Subject: [PATCH 7/8] cs --- src/components/com_weblinks/tmpl/category/default_items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/com_weblinks/tmpl/category/default_items.php b/src/components/com_weblinks/tmpl/category/default_items.php index 28cee18..1e8c5fc 100644 --- a/src/components/com_weblinks/tmpl/category/default_items.php +++ b/src/components/com_weblinks/tmpl/category/default_items.php @@ -77,7 +77,7 @@ $listDirn = $this->escape($this->state->get('list.direction')); if ($item->state == 0) : ?>
  • -
  • +
  • params->get('show_link_hits', 1)) : ?> From 54e3d39a5cc51f602a7ef1afcbd3ae11d3f38515 Mon Sep 17 00:00:00 2001 From: chmst Date: Thu, 29 Jul 2021 09:03:53 +0200 Subject: [PATCH 8/8] default-children --- .../tmpl/category/default_children.php | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/components/com_weblinks/tmpl/category/default_children.php b/src/components/com_weblinks/tmpl/category/default_children.php index 6cb5b97..cb18799 100644 --- a/src/components/com_weblinks/tmpl/category/default_children.php +++ b/src/components/com_weblinks/tmpl/category/default_children.php @@ -16,25 +16,25 @@ use Joomla\Component\Weblinks\Site\Helper\RouteHelper; if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) : ?> -
      +
        children[$this->category->id] as $id => $child) : ?> params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) : ?> -
      • -

        - +
      • +
        + escape($child->title); ?> - + params->get('show_cat_items') == 1) : ?> - numitems; ?> + numitems; ?> -

        • + params->get('show_subcat_desc') == 1) : ?> description) : ?> -
        +
        description, '', 'com_weblinks.category'); ?> -
        +
        @@ -46,8 +46,8 @@ if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) : $this->category = $child->getParent(); $this->maxLevel++; endif; ?> -
        • + -
      +