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)) : ?> + +
= JText::_("COM_DEMO_YOU_ARE_CURRENTLY_VIEWING_THE_TRASH_AREA_AND_YOU_DONT_HAVE_ANY_ITEMS_IN_TRASH_AT_THE_MOMENT") ?>
+ += JText::_("COM_DEMO_YOU_ARE_CURRENTLY_VIEWING_THE_TRASHED_ITEMS") ?>
+ + + +