diff --git a/README.md b/README.md index 8222c88..c1a101c 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Just a basic demo of the most basic implementations of the [Joomla](http://www.j + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Demo](https://www.vdm.io/) + *First Build*: 18th October, 2016 -+ *Last Build*: 6th January, 2021 ++ *Last Build*: 8th February, 2021 + *Version*: 2.0.3 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -23,11 +23,11 @@ due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > never making one mistake or taking any coffee break.) -+ *Line count*: **16679** -+ *File count*: **154** ++ *Line count*: **16831** ++ *File count*: **156** + *Folder count*: **57** -**30 Hours** or **4 Eight Hour Days** (the actual time the author spent) +**31 Hours** or **4 Eight Hour Days** (the actual time the author spent) > (with the following break down: > **debugging @12hours** = codingtime / 4; @@ -35,7 +35,7 @@ due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder > **mapping @5hours** = codingtime / 10; > **office @8hours** = codingtime / 6;) -**77 Hours** or **10 Eight Hour Days** +**78 Hours** or **10 Eight Hour Days** (a total of the realistic time frame for this project) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, diff --git a/admin/README.txt b/admin/README.txt index 8222c88..c1a101c 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -10,7 +10,7 @@ Just a basic demo of the most basic implementations of the [Joomla](http://www.j + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Demo](https://www.vdm.io/) + *First Build*: 18th October, 2016 -+ *Last Build*: 6th January, 2021 ++ *Last Build*: 8th February, 2021 + *Version*: 2.0.3 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -23,11 +23,11 @@ due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > never making one mistake or taking any coffee break.) -+ *Line count*: **16679** -+ *File count*: **154** ++ *Line count*: **16831** ++ *File count*: **156** + *Folder count*: **57** -**30 Hours** or **4 Eight Hour Days** (the actual time the author spent) +**31 Hours** or **4 Eight Hour Days** (the actual time the author spent) > (with the following break down: > **debugging @12hours** = codingtime / 4; @@ -35,7 +35,7 @@ due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder > **mapping @5hours** = codingtime / 10; > **office @8hours** = codingtime / 6;) -**77 Hours** or **10 Eight Hour Days** +**78 Hours** or **10 Eight Hour Days** (a total of the realistic time frame for this project) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index e92abe3..19714a1 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage admin.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 8b2242b..359dba6 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage dashboard.css diff --git a/admin/assets/css/look.css b/admin/assets/css/look.css index c9bc968..74b5952 100644 --- a/admin/assets/css/look.css +++ b/admin/assets/css/look.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage look.css diff --git a/admin/assets/css/looks.css b/admin/assets/css/looks.css index 0e70b6a..2a7428e 100644 --- a/admin/assets/css/looks.css +++ b/admin/assets/css/looks.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage looks.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index d59919c..754d51a 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage admin.js diff --git a/admin/controller.php b/admin/controller.php index 01e5ebf..dd8a022 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage controller.php diff --git a/admin/controllers/demo.php b/admin/controllers/demo.php index dd371cc..20666a0 100644 --- a/admin/controllers/demo.php +++ b/admin/controllers/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage demo.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 17cfe28..9e8d212 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage import.php diff --git a/admin/controllers/look.php b/admin/controllers/look.php index e330f2b..7122719 100644 --- a/admin/controllers/look.php +++ b/admin/controllers/look.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage look.php diff --git a/admin/controllers/looks.php b/admin/controllers/looks.php index afca8dc..4c10da9 100644 --- a/admin/controllers/looks.php +++ b/admin/controllers/looks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage looks.php diff --git a/admin/demo.php b/admin/demo.php index 98233eb..53a6e52 100644 --- a/admin/demo.php +++ b/admin/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage demo.php diff --git a/admin/helpers/demo.php b/admin/helpers/demo.php index 3a9eb3b..49e13e6 100644 --- a/admin/helpers/demo.php +++ b/admin/helpers/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage demo.php diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index cc6ed6e..3cb683a 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 904dd69..609b4b6 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage batch_.php diff --git a/admin/language/en-GB/en-GB.com_demo.ini b/admin/language/en-GB/en-GB.com_demo.ini index 2d38250..dc97b35 100644 --- a/admin/language/en-GB/en-GB.com_demo.ini +++ b/admin/language/en-GB/en-GB.com_demo.ini @@ -1,5 +1,6 @@ COM_DEMO="Demo" COM_DEMO_ARCHIVED="Archived" +COM_DEMO_ARE_YOU_SURE_YOU_WANT_TO_DELETE_CONFIRMING_WILL_PERMANENTLY_DELETE_THE_SELECTED_ITEMS="Are you sure you want to delete? Confirming will permanently delete the selected item(s)!" COM_DEMO_AUTHOR="Author" COM_DEMO_BACK="Back" COM_DEMO_CLOSE_NEW="Close & New" @@ -51,9 +52,20 @@ COM_DEMO_EDIT_CREATED_DATE_DESC="Allows users in this group to edit created date COM_DEMO_EDIT_S="Edit %s" COM_DEMO_EDIT_VERSIONS="Edit Version" COM_DEMO_EDIT_VERSIONS_DESC="Allows users in this group to edit versions." +COM_DEMO_EMPTY_TRASH="Empty trash" +COM_DEMO_EXIT_TRASH="Exit trash" COM_DEMO_EXPORT_DATA="Export Data" COM_DEMO_EXPORT_DATA_DESC="Allows users in this group to export data." COM_DEMO_EXPORT_FAILED="Export Failed" +COM_DEMO_FILTER_DESCRIPTION_ASCENDING="Description ascending" +COM_DEMO_FILTER_DESCRIPTION_DESCENDING="Description descending" +COM_DEMO_FILTER_NAME_ASCENDING="Name ascending" +COM_DEMO_FILTER_NAME_DESCENDING="Name descending" +COM_DEMO_FILTER_PUBLISHED="Status" +COM_DEMO_FILTER_PUBLISHED_LOOKS="Status options for looks" +COM_DEMO_FILTER_SEARCH="Searchlooks" +COM_DEMO_FILTER_SEARCH_LOOKS="Search the look items. Prefix with ID: to search for an item by ID." +COM_DEMO_FILTER_SELECT_ACCESS="Select Access" COM_DEMO_HELP_MANAGER="Help" COM_DEMO_IMPORT_CONTINUE="Continue" COM_DEMO_IMPORT_DATA="Import Data" @@ -157,34 +169,27 @@ COM_DEMO_LOOKS_PRIVACY_DELETE="Looks Privacy Delete" COM_DEMO_LOOKS_PRIVACY_DELETE_DESC="Allows the users in this group to remove their personal data in Looks via the Joomla privacy suite." COM_DEMO_LOOKS_SUBMENU="Looks Submenu" COM_DEMO_LOOKS_SUBMENU_DESC="Allows the users in this group to submenu of look" -COM_DEMO_LOOK_ADD="Add" COM_DEMO_LOOK_ADD_LABEL="Add More" -COM_DEMO_LOOK_ALIAS="Alias" COM_DEMO_LOOK_ALIAS_HINT="Auto-generated from name" COM_DEMO_LOOK_ALIAS_LABEL="Alias" COM_DEMO_LOOK_CREATED_BY_DESC="The user that created this Look." COM_DEMO_LOOK_CREATED_BY_LABEL="Created By" COM_DEMO_LOOK_CREATED_DATE_DESC="The date this Look was created." COM_DEMO_LOOK_CREATED_DATE_LABEL="Created Date" -COM_DEMO_LOOK_DATEOFBIRTH="Dateofbirth" COM_DEMO_LOOK_DATEOFBIRTH_DESCRIPTION="Your date of birth" COM_DEMO_LOOK_DATEOFBIRTH_LABEL="Date of Birth" -COM_DEMO_LOOK_DESCRIPTION="Description" COM_DEMO_LOOK_DESCRIPTION_DESCRIPTION="Add Description Here" COM_DEMO_LOOK_DESCRIPTION_HINT="Add Description Here" COM_DEMO_LOOK_DESCRIPTION_LABEL="Description" COM_DEMO_LOOK_DETAILS="Details" COM_DEMO_LOOK_EDIT="Editing the Look" -COM_DEMO_LOOK_EMAIL="Email" COM_DEMO_LOOK_EMAIL_DESCRIPTION="Enter Email" COM_DEMO_LOOK_EMAIL_HINT="demo@example.com" COM_DEMO_LOOK_EMAIL_LABEL="Email" COM_DEMO_LOOK_EMAIL_MESSAGE="Error! Please add email address here." COM_DEMO_LOOK_ERROR_UNIQUE_ALIAS="Another Look has the same alias." COM_DEMO_LOOK_ID="Id" -COM_DEMO_LOOK_IMAGE="Image" COM_DEMO_LOOK_IMAGE_LABEL="Image" -COM_DEMO_LOOK_MOBILE_PHONE="Mobile Phone" COM_DEMO_LOOK_MOBILE_PHONE_DESCRIPTION="Enter Mobile Phone Number" COM_DEMO_LOOK_MOBILE_PHONE_HINT="Mobile Phone Here" COM_DEMO_LOOK_MOBILE_PHONE_LABEL="Mobile Phone" @@ -194,7 +199,6 @@ COM_DEMO_LOOK_MODIFIED_BY_LABEL="Modified By" COM_DEMO_LOOK_MODIFIED_DATE_DESC="The date this Look was modified." COM_DEMO_LOOK_MODIFIED_DATE_LABEL="Modified Date" COM_DEMO_LOOK_MORE="More" -COM_DEMO_LOOK_NAME="Name" COM_DEMO_LOOK_NAME_DESCRIPTION="Enter Name Here" COM_DEMO_LOOK_NAME_HINT="Name Here" COM_DEMO_LOOK_NAME_LABEL="Name" @@ -209,7 +213,6 @@ COM_DEMO_LOOK_SAVE_WARNING="Alias already existed so a number was added at the e COM_DEMO_LOOK_STATUS="Status" COM_DEMO_LOOK_VERSION_DESC="A count of the number of times this Look has been revised." COM_DEMO_LOOK_VERSION_LABEL="Version" -COM_DEMO_LOOK_WEBSITE="Website" COM_DEMO_LOOK_WEBSITE_DESCRIPTION="Enter website address" COM_DEMO_LOOK_WEBSITE_HINT="http://www.example.com" COM_DEMO_LOOK_WEBSITE_LABEL="Website" @@ -226,8 +229,12 @@ COM_DEMO_SUBMENU_LOOKS="Looks" COM_DEMO_SUBMENU_LOOKS_FIELDS="Looks Fields" COM_DEMO_SUBMENU_LOOKS_FIELDS_GROUPS="Looks Field Groups" COM_DEMO_TRASHED="Trashed" +COM_DEMO_TRASHED_ITEMS="Trashed items" +COM_DEMO_TRASH_AREA="Trash Area" COM_DEMO_TYPE_LOOK="Look" COM_DEMO_USE_BATCH="Use Batch" COM_DEMO_USE_BATCH_DESC="Allows users in this group to use batch copy/update method." COM_DEMO_VERSION="Version" -COM_DEMO_WEBSITE="Website" \ No newline at end of file +COM_DEMO_WEBSITE="Website" +COM_DEMO_YOU_ARE_CURRENTLY_VIEWING_THE_TRASHED_ITEMS="You are currently viewing the trashed items." +COM_DEMO_YOU_ARE_CURRENTLY_VIEWING_THE_TRASH_AREA_AND_YOU_DONT_HAVE_ANY_ITEMS_IN_TRASH_AT_THE_MOMENT="You are currently viewing the trash area, and you don't have any items in trash at the moment!" \ No newline at end of file diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index b2e0851..18ea8cc 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage batchselection.php diff --git a/admin/layouts/look/details_above.php b/admin/layouts/look/details_above.php index d7e6486..b928e41 100644 --- a/admin/layouts/look/details_above.php +++ b/admin/layouts/look/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage details_above.php diff --git a/admin/layouts/look/details_fullwidth.php b/admin/layouts/look/details_fullwidth.php index fec77af..8241be9 100644 --- a/admin/layouts/look/details_fullwidth.php +++ b/admin/layouts/look/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage details_fullwidth.php diff --git a/admin/layouts/look/details_under.php b/admin/layouts/look/details_under.php index 4751e53..8bb743d 100644 --- a/admin/layouts/look/details_under.php +++ b/admin/layouts/look/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage details_under.php diff --git a/admin/layouts/look/metadata.php b/admin/layouts/look/metadata.php index 2e9643c..67df7bd 100644 --- a/admin/layouts/look/metadata.php +++ b/admin/layouts/look/metadata.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage metadata.php diff --git a/admin/layouts/look/more_left.php b/admin/layouts/look/more_left.php index f15f140..0c17e82 100644 --- a/admin/layouts/look/more_left.php +++ b/admin/layouts/look/more_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage more_left.php diff --git a/admin/layouts/look/more_right.php b/admin/layouts/look/more_right.php index b7c633c..9d0588b 100644 --- a/admin/layouts/look/more_right.php +++ b/admin/layouts/look/more_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage more_right.php diff --git a/admin/layouts/look/publishing.php b/admin/layouts/look/publishing.php index ca6fdf4..29efb62 100644 --- a/admin/layouts/look/publishing.php +++ b/admin/layouts/look/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage publishing.php diff --git a/admin/layouts/trashhelper.php b/admin/layouts/trashhelper.php new file mode 100644 index 0000000..c8491c0 --- /dev/null +++ b/admin/layouts/trashhelper.php @@ -0,0 +1,82 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + ____ _____ _____ __ __ __ __ ___ _____ __ __ ____ _____ _ _ ____ _ _ ____ + (_ _)( _ )( _ )( \/ )( ) /__\ / __)( _ )( \/ )( _ \( _ )( \( )( ___)( \( )(_ _) +.-_)( )(_)( )(_)( ) ( )(__ /(__)\ ( (__ )(_)( ) ( )___/ )(_)( ) ( )__) ) ( )( +\____) (_____)(_____)(_/\/\_)(____)(__)(__) \___)(_____)(_/\/\_)(__) (_____)(_)\_)(____)(_)\_) (__) + +/------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('JPATH_BASE') or die('Restricted access'); + + + +?> +state->get('filter.published') == -2 && ($displayData->canState && $displayData->canDelete)) : ?> + +
+ items)): ?> +

+ + +

+

+ +

+ + +

+

+ + + +
+ diff --git a/admin/models/demo.php b/admin/models/demo.php index dd3df21..00c9056 100644 --- a/admin/models/demo.php +++ b/admin/models/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage demo.php diff --git a/admin/models/forms/filter_looks.xml b/admin/models/forms/filter_looks.xml new file mode 100644 index 0000000..fa4243c --- /dev/null +++ b/admin/models/forms/filter_looks.xml @@ -0,0 +1,69 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/admin/models/forms/look.js b/admin/models/forms/look.js index 2796c28..fa29450 100644 --- a/admin/models/forms/look.js +++ b/admin/models/forms/look.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage look.js diff --git a/admin/models/import.php b/admin/models/import.php index 8e2a2a3..129bdde 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage import.php diff --git a/admin/models/look.php b/admin/models/look.php index ad3309f..0f43c6b 100644 --- a/admin/models/look.php +++ b/admin/models/look.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage look.php diff --git a/admin/models/looks.php b/admin/models/looks.php index 6ee9985..77c408e 100644 --- a/admin/models/looks.php +++ b/admin/models/looks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage looks.php @@ -68,8 +68,15 @@ class DemoModelLooks extends JModelList $this->context .= '.' . $layout; } + // Check if the form was submitted + $formSubmited = $app->input->post->get('form_submited'); + $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int'); - $this->setState('filter.access', $access); + if ($formSubmited) + { + $access = $app->input->post->get('access'); + $this->setState('filter.access', $access); + } $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); $this->setState('filter.published', $published); @@ -87,10 +94,18 @@ class DemoModelLooks extends JModelList $this->setState('filter.search', $search); $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name'); - $this->setState('filter.name', $name); + if ($formSubmited) + { + $name = $app->input->post->get('name'); + $this->setState('filter.name', $name); + } $description = $this->getUserStateFromRequest($this->context . '.filter.description', 'filter_description'); - $this->setState('filter.description', $description); + if ($formSubmited) + { + $description = $app->input->post->get('description'); + $this->setState('filter.description', $description); + } // List state information. parent::populateState($ordering, $direction); @@ -439,7 +454,18 @@ class DemoModelLooks extends JModelList $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); - $id .= ':' . $this->getState('filter.access'); + // Check if the value is an array + $_access = $this->getState('filter.access'); + if (DemoHelper::checkArray($_access)) + { + $id .= ':' . implode(':', $_access); + } + // Check if this is only an number or string + elseif (is_numeric($_access) + || DemoHelper::checkString($_access)) + { + $id .= ':' . $_access; + } $id .= ':' . $this->getState('filter.ordering'); $id .= ':' . $this->getState('filter.created_by'); $id .= ':' . $this->getState('filter.modified_by'); diff --git a/admin/tables/look.php b/admin/tables/look.php index 784050f..adf28a1 100644 --- a/admin/tables/look.php +++ b/admin/tables/look.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage look.php diff --git a/admin/views/demo/tmpl/default.php b/admin/views/demo/tmpl/default.php index a056aac..09db4ac 100644 --- a/admin/views/demo/tmpl/default.php +++ b/admin/views/demo/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage default.php diff --git a/admin/views/demo/tmpl/default_main.php b/admin/views/demo/tmpl/default_main.php index c15ec9c..9963c5f 100644 --- a/admin/views/demo/tmpl/default_main.php +++ b/admin/views/demo/tmpl/default_main.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage default_main.php diff --git a/admin/views/demo/tmpl/default_vdm.php b/admin/views/demo/tmpl/default_vdm.php index ca66481..7af8e8b 100644 --- a/admin/views/demo/tmpl/default_vdm.php +++ b/admin/views/demo/tmpl/default_vdm.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage default_vdm.php diff --git a/admin/views/demo/view.html.php b/admin/views/demo/view.html.php index bf073b1..6df3764 100644 --- a/admin/views/demo/view.html.php +++ b/admin/views/demo/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage view.html.php diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index 138c882..edddca8 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 86fcec2..64f01e8 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage view.html.php diff --git a/admin/views/look/submitbutton.js b/admin/views/look/submitbutton.js index 30231e9..71a34de 100644 --- a/admin/views/look/submitbutton.js +++ b/admin/views/look/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage submitbutton.js diff --git a/admin/views/look/tmpl/edit.php b/admin/views/look/tmpl/edit.php index 707b092..e776779 100644 --- a/admin/views/look/tmpl/edit.php +++ b/admin/views/look/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage edit.php diff --git a/admin/views/look/view.html.php b/admin/views/look/view.html.php index 6ef4483..e0e127f 100644 --- a/admin/views/look/view.html.php +++ b/admin/views/look/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage view.html.php diff --git a/admin/views/looks/tmpl/default.php b/admin/views/looks/tmpl/default.php index d11580e..13e875c 100644 --- a/admin/views/looks/tmpl/default.php +++ b/admin/views/looks/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage default.php @@ -24,6 +24,7 @@ defined('_JEXEC') or die('Restricted access'); JHtml::_('behavior.tooltip'); JHtml::_('behavior.multiselect'); JHtml::_('dropdown.init'); +JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_DEMO_FILTER_SELECT_ACCESS') . ' -')); JHtml::_('formbehavior.chosen', 'select'); if ($this->saveOrder) { @@ -31,23 +32,6 @@ if ($this->saveOrder) JHtml::_('sortablelist.sortable', 'lookList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl); } ?> -
sidebar)): ?>
@@ -57,13 +41,17 @@ if ($this->saveOrder)
+ $this)); +?> items)): ?> - loadTemplate('toolbar');?>
- loadTemplate('toolbar');?> loadTemplate('head');?>loadTemplate('foot');?> @@ -81,8 +69,6 @@ if ($this->saveOrder) $this->loadTemplate('batch_body') ); ?> - - diff --git a/admin/views/looks/tmpl/default_batch_body.php b/admin/views/looks/tmpl/default_batch_body.php index 9ee1d9f..ef6aa24 100644 --- a/admin/views/looks/tmpl/default_batch_body.php +++ b/admin/views/looks/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage default_batch_body.php diff --git a/admin/views/looks/tmpl/default_batch_footer.php b/admin/views/looks/tmpl/default_batch_footer.php index 11e5cb9..7d01bcc 100644 --- a/admin/views/looks/tmpl/default_batch_footer.php +++ b/admin/views/looks/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage default_batch_footer.php diff --git a/admin/views/looks/tmpl/default_body.php b/admin/views/looks/tmpl/default_body.php index a4f41c4..05ba3ed 100644 --- a/admin/views/looks/tmpl/default_body.php +++ b/admin/views/looks/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage default_body.php diff --git a/admin/views/looks/tmpl/default_foot.php b/admin/views/looks/tmpl/default_foot.php index 4c8993e..27cfae5 100644 --- a/admin/views/looks/tmpl/default_foot.php +++ b/admin/views/looks/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage default_foot.php diff --git a/admin/views/looks/tmpl/default_head.php b/admin/views/looks/tmpl/default_head.php index ba98d16..bb0bfb4 100644 --- a/admin/views/looks/tmpl/default_head.php +++ b/admin/views/looks/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage default_head.php @@ -25,7 +25,7 @@ defined('_JEXEC') or die('Restricted access'); canEdit&& $this->canState): ?> canState): ?> \ No newline at end of file diff --git a/admin/views/looks/tmpl/default_toolbar.php b/admin/views/looks/tmpl/default_toolbar.php index 0b18dbf..1af1adf 100644 --- a/admin/views/looks/tmpl/default_toolbar.php +++ b/admin/views/looks/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage default_toolbar.php diff --git a/admin/views/looks/view.html.php b/admin/views/looks/view.html.php index afee04e..43a2687 100644 --- a/admin/views/looks/view.html.php +++ b/admin/views/looks/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage view.html.php @@ -43,6 +43,10 @@ class DemoViewLooks extends JViewLegacy $this->pagination = $this->get('Pagination'); $this->state = $this->get('State'); $this->user = JFactory::getUser(); + // Load the filter form from xml. + $this->filterForm = $this->get('FilterForm'); + // Load the active filters. + $this->activeFilters = $this->get('ActiveFilters'); // Add the list ordering clause. $this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id')); $this->listDirn = $this->escape($this->state->get('list.direction', 'DESC')); @@ -163,22 +167,6 @@ class DemoViewLooks extends JViewLegacy JToolBarHelper::preferences('com_demo'); } - // Only load publish filter if state change is allowed - if ($this->canState) - { - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_PUBLISHED'), - 'filter_published', - JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true) - ); - } - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_ACCESS'), - 'filter_access', - JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')) - ); - // Only load published batch if state and batch is allowed if ($this->canState && $this->canBatch) { diff --git a/demo.xml b/demo.xml index 1735358..4bd4272 100644 --- a/demo.xml +++ b/demo.xml @@ -1,7 +1,7 @@ COM_DEMO - 6th January, 2021 + 8th February, 2021 Llewellyn van der Merwe joomla@vdm.io https://www.vdm.io/ diff --git a/script.php b/script.php index e901d17..a1d19ca 100644 --- a/script.php +++ b/script.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage script.php diff --git a/site/assets/css/look.css b/site/assets/css/look.css index c9bc968..74b5952 100644 --- a/site/assets/css/look.css +++ b/site/assets/css/look.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage look.css diff --git a/site/assets/css/looking.css b/site/assets/css/looking.css index 40642b9..55ac4d8 100644 --- a/site/assets/css/looking.css +++ b/site/assets/css/looking.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage looking.css diff --git a/site/assets/css/looks.css b/site/assets/css/looks.css index 0e70b6a..2a7428e 100644 --- a/site/assets/css/looks.css +++ b/site/assets/css/looks.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage looks.css diff --git a/site/assets/css/site.css b/site/assets/css/site.css index bb0e79d..7b71fb5 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage site.css diff --git a/site/assets/js/site.js b/site/assets/js/site.js index 7b3b9c1..3cd883d 100644 --- a/site/assets/js/site.js +++ b/site/assets/js/site.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage site.js diff --git a/site/controller.php b/site/controller.php index 785ce88..29d6e56 100644 --- a/site/controller.php +++ b/site/controller.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage controller.php diff --git a/site/controllers/look.php b/site/controllers/look.php index 29f7e58..007d4aa 100644 --- a/site/controllers/look.php +++ b/site/controllers/look.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage look.php diff --git a/site/demo.php b/site/demo.php index 9eb4dc1..c6e84d2 100644 --- a/site/demo.php +++ b/site/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage demo.php diff --git a/site/helpers/category.php b/site/helpers/category.php index b57ad87..ea125a2 100644 --- a/site/helpers/category.php +++ b/site/helpers/category.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage category.php diff --git a/site/helpers/demo.php b/site/helpers/demo.php index 3ef5e78..248f330 100644 --- a/site/helpers/demo.php +++ b/site/helpers/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage demo.php diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index cc6ed6e..3cb683a 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index 92ed59f..38a3681 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage route.php diff --git a/site/language/en-GB/en-GB.com_demo.ini b/site/language/en-GB/en-GB.com_demo.ini index a63e1ac..1b9634a 100644 --- a/site/language/en-GB/en-GB.com_demo.ini +++ b/site/language/en-GB/en-GB.com_demo.ini @@ -6,6 +6,10 @@ COM_DEMO_DESCRIPTION="Description" COM_DEMO_EDIT_LOOK="Edit Look" COM_DEMO_EDIT_S="Edit %s" COM_DEMO_EMAIL="Email" +COM_DEMO_FILTER_DESCRIPTION_ASCENDING="Description ascending" +COM_DEMO_FILTER_DESCRIPTION_DESCENDING="Description descending" +COM_DEMO_FILTER_NAME_ASCENDING="Name ascending" +COM_DEMO_FILTER_NAME_DESCENDING="Name descending" COM_DEMO_HITS="Hits" COM_DEMO_LIST_OF_ALL_LOOKS="List of all looks" COM_DEMO_LOOK="Look" @@ -34,33 +38,26 @@ COM_DEMO_LOOKS_N_ITEMS_UNFEATURED="%s Looks unfeatured." COM_DEMO_LOOKS_N_ITEMS_UNFEATURED_1="%s Look unfeatured." COM_DEMO_LOOKS_N_ITEMS_UNPUBLISHED="%s Looks unpublished." COM_DEMO_LOOKS_N_ITEMS_UNPUBLISHED_1="%s Look unpublished." -COM_DEMO_LOOK_ADD="Add" COM_DEMO_LOOK_ADD_LABEL="Add More" -COM_DEMO_LOOK_ALIAS="Alias" COM_DEMO_LOOK_ALIAS_HINT="Auto-generated from name" COM_DEMO_LOOK_ALIAS_LABEL="Alias" COM_DEMO_LOOK_CREATED_BY_DESC="The user that created this Look." COM_DEMO_LOOK_CREATED_BY_LABEL="Created By" COM_DEMO_LOOK_CREATED_DATE_DESC="The date this Look was created." COM_DEMO_LOOK_CREATED_DATE_LABEL="Created Date" -COM_DEMO_LOOK_DATEOFBIRTH="Dateofbirth" COM_DEMO_LOOK_DATEOFBIRTH_DESCRIPTION="Your date of birth" COM_DEMO_LOOK_DATEOFBIRTH_LABEL="Date of Birth" -COM_DEMO_LOOK_DESCRIPTION="Description" COM_DEMO_LOOK_DESCRIPTION_DESCRIPTION="Add Description Here" COM_DEMO_LOOK_DESCRIPTION_HINT="Add Description Here" COM_DEMO_LOOK_DESCRIPTION_LABEL="Description" COM_DEMO_LOOK_DETAILS="Details" COM_DEMO_LOOK_EDIT="Editing the Look" -COM_DEMO_LOOK_EMAIL="Email" COM_DEMO_LOOK_EMAIL_DESCRIPTION="Enter Email" COM_DEMO_LOOK_EMAIL_HINT="demo@example.com" COM_DEMO_LOOK_EMAIL_LABEL="Email" COM_DEMO_LOOK_EMAIL_MESSAGE="Error! Please add email address here." COM_DEMO_LOOK_ERROR_UNIQUE_ALIAS="Another Look has the same alias." -COM_DEMO_LOOK_IMAGE="Image" COM_DEMO_LOOK_IMAGE_LABEL="Image" -COM_DEMO_LOOK_MOBILE_PHONE="Mobile Phone" COM_DEMO_LOOK_MOBILE_PHONE_DESCRIPTION="Enter Mobile Phone Number" COM_DEMO_LOOK_MOBILE_PHONE_HINT="Mobile Phone Here" COM_DEMO_LOOK_MOBILE_PHONE_LABEL="Mobile Phone" @@ -70,7 +67,6 @@ COM_DEMO_LOOK_MODIFIED_BY_LABEL="Modified By" COM_DEMO_LOOK_MODIFIED_DATE_DESC="The date this Look was modified." COM_DEMO_LOOK_MODIFIED_DATE_LABEL="Modified Date" COM_DEMO_LOOK_MORE="More" -COM_DEMO_LOOK_NAME="Name" COM_DEMO_LOOK_NAME_DESCRIPTION="Enter Name Here" COM_DEMO_LOOK_NAME_HINT="Name Here" COM_DEMO_LOOK_NAME_LABEL="Name" @@ -84,7 +80,6 @@ COM_DEMO_LOOK_PUBLISHING="Publishing" COM_DEMO_LOOK_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Look to customise the alias." COM_DEMO_LOOK_VERSION_DESC="A count of the number of times this Look has been revised." COM_DEMO_LOOK_VERSION_LABEL="Version" -COM_DEMO_LOOK_WEBSITE="Website" COM_DEMO_LOOK_WEBSITE_DESCRIPTION="Enter website address" COM_DEMO_LOOK_WEBSITE_HINT="http://www.example.com" COM_DEMO_LOOK_WEBSITE_LABEL="Website" diff --git a/site/layouts/look/details_above.php b/site/layouts/look/details_above.php index d7e6486..b928e41 100644 --- a/site/layouts/look/details_above.php +++ b/site/layouts/look/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage details_above.php diff --git a/site/layouts/look/details_fullwidth.php b/site/layouts/look/details_fullwidth.php index fec77af..8241be9 100644 --- a/site/layouts/look/details_fullwidth.php +++ b/site/layouts/look/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage details_fullwidth.php diff --git a/site/layouts/look/details_under.php b/site/layouts/look/details_under.php index 4751e53..8bb743d 100644 --- a/site/layouts/look/details_under.php +++ b/site/layouts/look/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage details_under.php diff --git a/site/layouts/look/metadata.php b/site/layouts/look/metadata.php index 2e9643c..67df7bd 100644 --- a/site/layouts/look/metadata.php +++ b/site/layouts/look/metadata.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage metadata.php diff --git a/site/layouts/look/more_left.php b/site/layouts/look/more_left.php index f15f140..0c17e82 100644 --- a/site/layouts/look/more_left.php +++ b/site/layouts/look/more_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage more_left.php diff --git a/site/layouts/look/more_right.php b/site/layouts/look/more_right.php index b7c633c..9d0588b 100644 --- a/site/layouts/look/more_right.php +++ b/site/layouts/look/more_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage more_right.php diff --git a/site/layouts/look/publishing.php b/site/layouts/look/publishing.php index ca6fdf4..29efb62 100644 --- a/site/layouts/look/publishing.php +++ b/site/layouts/look/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage publishing.php diff --git a/site/models/forms/look.js b/site/models/forms/look.js index 2796c28..fa29450 100644 --- a/site/models/forms/look.js +++ b/site/models/forms/look.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage look.js diff --git a/site/models/look.php b/site/models/look.php index ad3309f..0f43c6b 100644 --- a/site/models/look.php +++ b/site/models/look.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage look.php diff --git a/site/models/looking.php b/site/models/looking.php index 4eccf85..53b05bb 100644 --- a/site/models/looking.php +++ b/site/models/looking.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage looking.php diff --git a/site/models/looks.php b/site/models/looks.php index bde94c8..0500239 100644 --- a/site/models/looks.php +++ b/site/models/looks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage looks.php diff --git a/site/router.php b/site/router.php index bfc1b06..a762362 100644 --- a/site/router.php +++ b/site/router.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage router.php diff --git a/site/views/look/submitbutton.js b/site/views/look/submitbutton.js index 30231e9..71a34de 100644 --- a/site/views/look/submitbutton.js +++ b/site/views/look/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage submitbutton.js diff --git a/site/views/look/tmpl/edit.php b/site/views/look/tmpl/edit.php index c4c406e..a1853dd 100644 --- a/site/views/look/tmpl/edit.php +++ b/site/views/look/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage edit.php diff --git a/site/views/look/view.html.php b/site/views/look/view.html.php index 3fb3552..d27a705 100644 --- a/site/views/look/view.html.php +++ b/site/views/look/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage view.html.php diff --git a/site/views/looking/tmpl/default.php b/site/views/looking/tmpl/default.php index 20aa70e..90dc8ab 100644 --- a/site/views/looking/tmpl/default.php +++ b/site/views/looking/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage default.php diff --git a/site/views/looking/view.html.php b/site/views/looking/view.html.php index f9e02c4..7687568 100644 --- a/site/views/looking/view.html.php +++ b/site/views/looking/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage view.html.php diff --git a/site/views/looks/tmpl/default.php b/site/views/looks/tmpl/default.php index 3317943..6900589 100644 --- a/site/views/looks/tmpl/default.php +++ b/site/views/looks/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage default.php diff --git a/site/views/looks/view.html.php b/site/views/looks/view.html.php index 8863b07..439b709 100644 --- a/site/views/looks/view.html.php +++ b/site/views/looks/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.3 - @build 6th January, 2021 + @build 8th February, 2021 @created 18th October, 2016 @package Demo @subpackage view.html.php
- ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?> @@ -39,14 +39,14 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> @@ -54,6 +54,6 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?>