Merge pull request #343 from joomlatools/feature/319-joomlatools-ui

Redesign administrator template to Joomlatools UI

.gitignore

@@ -8,6 +8,7 @@
 # Joomla #
 /cache
 /log
+/administrator/log
 
 # phpDocumentor Logs #
 phpdoc-*
@@ -27,3 +28,4 @@ node_modules
 # Vendor (e.g. Composer)
 vendor/*
 !vendor/.gitkeep
+/web/administrator/log/jcontroller.log.php

app/administrator/components/com_modules/views/module/tmpl/edit.php

@@ -214,7 +214,7 @@
 						</div>
 					<?php endif; ?>
 				<?php else : ?>
-					<div class="alert alert-error"><?php echo JText::_('COM_MODULES_ERR_XML'); ?></div>
+					<div class="k-alert k-alert--error"><?php echo JText::_('COM_MODULES_ERR_XML'); ?></div>
 				<?php endif; ?>
 				<?php
 				if ($hasContent)

app/administrator/components/com_templates/views/styles/tmpl/default.php

@@ -31,6 +31,7 @@
 <?php else : ?>
 	<div id="j-main-container">
 <?php endif;?>
+        test
 		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 		<div class="clear"> </div>
 		<?php if (empty($this->items)) : ?>

app/administrator/components/com_users/models/forms/group.xml

@@ -19,7 +19,7 @@
 			description="COM_USERS_GROUP_FIELD_PARENT_DESC"
 			label="COM_USERS_GROUP_FIELD_PARENT_LABEL"
 			required="true"
-		    class="fom-control"
+		    class="form-control"
 		/>
 
 		<field name="actions" type="hidden"

app/administrator/components/com_users/views/user/tmpl/edit_groups.php

@@ -12,4 +12,5 @@
 // Include the component HTML helpers.
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 ?>
-<?php echo JHtml::_('access.usergroups', 'jform[groups]', $this->groups, true); ?>
+
+<?php echo replaceControlGroup(JHtml::_('access.usergroups', 'jform[groups]', $this->groups, true)); ?>

app/administrator/language/en-GB/en-GB.tpl_elysio.ini

@@ -0,0 +1,23 @@
+TPL_ELYSIO_CLIENT="Client";
+TPL_ELYSIO_DESCRIPTION="Description";
+TPL_ELYSIO_EDIT_ACCOUNT="Edit account";
+TPL_ELYSIO_LOGOUT="Logout";
+TPL_ELYSIO_DEBUG="Debug";
+TPL_ELYSIO_MENU="Menu";
+
+COM_CATEGORIES_FILTER_PUBLISHED="Published";
+
+COM_CONTENT_FILTER_PUBLISHED="Published";
+COM_CONTENT_FILTER_AUTHOR="Author";
+
+COM_MENUS_FILTER_PUBLISHED="Published";
+COM_MENUS_FILTER_CATEGORY="Menu type";
+
+COM_USERS_FILTER_GROUP="- Select Group -";
+
+JOPTION_FILTER_ACCESS="Access";
+JOPTION_FILTER_LANGUAGE="Language";
+JOPTION_FILTER_LEVEL="Filter";
+JOPTION_FILTER_CATEGORY="Category";
+JOPTION_FILTER_TAG="Tag";
+

app/administrator/modules/mod_menu/menu.php

@@ -188,6 +188,11 @@ public function renderLevel($depth)
 		{
 			$linkClass[] = 'dropdown-toggle';
 			$dataToggle = ' data-toggle="dropdown"';
+
+			if (!$this->_current->getParent()->hasParent())
+			{
+				$dropdownCaret = ' <span class="caret"></span>';
+			}
 		}
 		else
 		{

app/administrator/modules/mod_menu/tmpl/default.php

@@ -15,6 +15,12 @@
 $direction = JFactory::getDocument()->direction == 'rtl' ? 'pull-right' : '';
 $shownew    = (boolean) $params->get('shownew', 1);
 
+/*
+* Dashboard Submenu
+*/
+
+$menu->addChild(new JMenuNode(JText::_('MOD_MENU_CONTROL_PANEL'), 'index.php', $enabled ? 'class:cpanel' : 'disabled'));
+
 /*
  * Components Submenu
  */
@@ -194,4 +200,4 @@
 
 $menu->getParent();
 
-$menu->renderMenu('menu', $enabled ? 'nav navbar-nav' . $direction : 'nav navbar-nav disabled ' . $direction);
+$menu->renderMenu('menu', $enabled ? 'nav ' . $direction : 'nav disabled ' . $direction);

config/environment.php

@@ -22,7 +22,7 @@
 	'offset'     => 'UTC',
 
     /* Session */
-	'lifetime'        => '15',
+	'lifetime'        => '999',
 	'session_handler' => 'database',
 
 	/* Mail */
@@ -41,7 +41,7 @@
 	'cache_handler' => 'file',
 
 	/* Debug */
-    'debug'      => '0',
+    'debug'      => '1',
 	'debug_lang' => '0',
 
     /* SEO */

config/environments/production.php

@@ -1,9 +1,9 @@
 <?php
 /* Production */
-ini_set('display_errors', 0);
+ini_set('display_errors', 1);
 
 return [
-    'debug'      => 0,
+    'debug'      => 1,
     'debug_lang' => 0,
     'caching'    => 1,
     'cachetime'  => '60',

config/environments/staging.php

@@ -1,9 +1,9 @@
 <?php
 /* Staging */
-ini_set('display_errors', 0);
+ini_set('display_errors', 1);
 
 return [
-    'debug'      => 0,
+    'debug'      => 1,
     'debug_lang' => 0,
     'caching'    => 1,
     'cachetime'  => '15'

install/mysql/migrations/v1.1.0/20160303172718_install_elysio_template.php

@@ -17,7 +17,7 @@ public function up()
             'client_id' => 1,
             'home'      => 1,
             'title'     => 'elysio - Default',
-            'params'    => '{"logo":"templates/elysio/images/joomla-logo"}'
+            'params'    => '{}'
         );
 
         $table = $this->table('templates');

overrides.md

@@ -0,0 +1,62 @@
+- [ x ] com_config / application / default.php
+- [ x ] com_config / application / default_navigation.php
+- [ - ] com_config / application / default_permissions.php
+- [ x ] com_config / component / default.php
+- [ x ] com_config / component / default_navigation.php
+- [ x ] com_cpanel / cpanel / default.php
+- [ x ] com_languages / installed / default.php
+- [ x ] com_languages / language / edit.php
+- [ x ] com_languages / languages / default.php
+- [ ? ] com_languages / multilangstatus / default.php
+- [ x ] com_menus / item / edit.php
+- [ - ] com_menus / item / edit_associations.php
+- [ x ] com_menus / item / edit_modules.php
+- [ ? ] com_menus / item / edit_options.php
+- [ x ] com_menus / items / default.php
+- [ x ] com_menus / items / default_batch.php
+- [ x ] com_menus / items / default_batch_body.php
+- [ x ] com_menus / items / default_batch_footer.php
+- [ x ] com_menus / menu / edit.php
+- [ x ] com_menus / menus / default.php
+- [ - ] com_menus / menutypes / default.php
+- [ x ] com_modules / module / edit.php
+- [ x ] com_modules / module / edit_assignment.php
+- [ x ] com_modules / module / edit_options.php
+- [ - ] com_modules / module / edit_positions.php
+- [ x ] com_modules / module / modal.php
+- [ x ] com_modules / modules / default.php
+- [ x ] com_modules / modules / default_batch.php
+- [ x ] com_modules / modules / default_batch_body.php
+- [ x ] com_modules / modules / default_batch_footer.php
+- [ ? ] com_modules / positions / modal.php
+- [ ? ] com_modules / preview / default.php
+- [ x ] com_modules / select / default.php
+- [ x ] com_plugins / plugin / edit.php
+- [ x ] com_plugins / plugin / edit_options.php
+- [ x ] com_plugins / plugins / default.php
+- [ x ] com_templates / style / edit.php
+- [ x ] com_templates / style / edit_assignment.php
+- [ x ] com_templates / style / edit_options.php
+- [ x ] com_templates / styles / default.php
+- [ x ] com_templates / templates / default.php
+- [ x ] com_users / debuggroup / default.php
+- [ x ] com_users / debuguser / default.php
+- [ x ] com_users / group / edit.php
+- [ x ] com_users / groups / default.php
+- [ x ] com_users / level / edit.php
+- [ x ] com_users / levels / default.php
+- [ x ] com_users / login / default.php
+- [ x ] com_users / profile / edit.php
+- [ x ] com_users / user / edit.php
+- [ - ] com_users / user / edit_groups.php
+- [ x ] com_users / users / default.php
+- [ x ] com_users / users / default_batch.php
+- [ x ] com_users / users / default_batch_body.php
+- [ x ] com_users / users / default_batch_footer.php
+- [ ? ] com_users / users / modal.php
+
+Legend:
+x: done
+-: not needed
+?: not sure if we need it
+ : old

web/administrator/log/error.php

@@ -0,0 +1,38 @@
+#
+#<?php die('Forbidden.'); ?>
+#Date: 2017-05-15 14:07:39 UTC
+#Software: Joomla Platform 13.1.0 Stable [ Curiosity ] 24-Apr-2013 00:00 GMT
+
+#Fields: datetime	priority clientip	category	message
+2017-05-15T14:07:39+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:42:13+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:48:20+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:48:53+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:50:20+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:50:36+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:51:31+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:51:32+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:51:47+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:52:12+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:52:39+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:52:48+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:52:59+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:53:22+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:53:53+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:55:08+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:55:22+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:55:30+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:58:32+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:58:34+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:58:47+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T14:59:02+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T15:01:35+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T15:02:45+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T15:03:14+00:00	INFO 127.0.0.1	joomlafailure	Username and password do not match or you do not have an account yet.
+2017-05-15T15:03:34+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T15:03:38+00:00	INFO 127.0.0.1	joomlafailure	Username and password do not match or you do not have an account yet.
+2017-05-15T15:04:31+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T15:04:40+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T15:04:46+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.
+2017-05-15T15:05:13+00:00	INFO 127.0.0.1	joomlafailure	Username and password do not match or you do not have an account yet.
+2017-05-15T15:05:43+00:00	INFO 127.0.0.1	joomlafailure	Empty password not allowed.

web/administrator/templates/elysio/bower.json

@@ -8,13 +8,10 @@
     "svg-injector": "https://github.com/iconic/SVGInjector.git#1.1.3",
     "bootstrap": "~3.3.5",
     "jqtree": "https://github.com/mbraak/jqTree.git#1.2.1",
-    "select2": "https://github.com/select2/select2.git#4.0.0",
-    "select2-bootstrap": "https://github.com/select2/select2-bootstrap-theme.git#0.1.0-beta.4",
     "bootstrap-chosen": "https://github.com/alxlit/bootstrap-chosen.git#1.0.1",
-    "bootstrap-sass": "3.3.4",
+    "bootstrap-sass": "3.3.6",
     "neat": "1.7.2",
     "footable": "2.0.3",
-    "floatThead": "1.3.0",
     "modernizr": "https://github.com/Modernizr/Modernizr.git#2.8.3",
     "magnific-popup": "1.0.0"
   }

web/administrator/templates/elysio/component.php

@@ -36,24 +36,35 @@
 $doc->setMetaData('apple-mobile-web-app-title', 'Elysio');
 $doc->setMetaData('X-UA-Compatible', 'IE=edge', true);
 
-// Set links
-$doc->addHeadLink($params->get('logo').'.ico', 'shortcut icon', 'rel', array('type' => 'image/ico'));
-$doc->addHeadLink($params->get('logo').'.png', 'shortcut icon', 'rel', array('type' => 'image/png', "sizes" => "192x192"));
+// Unset Mootools
+unset($this->_scripts['/joomlatools-platform/web/media/system/js/mootools-core-uncompressed.js']);
+unset($this->_scripts['/joomlatools-platform/web/media/system/js/mootools-more-uncompressed.js']);
 
-// Add Stylesheets
+// Unset CSS
+unset($this->_stylesheets[JURI::root(true).'media/jui/css/jquery.searchtools.css']);
+unset($this->_stylesheets[JURI::root(true).'media/jui/css/chosen.css']);
+
+// Add Stylesheet
 $doc->addStyleSheet('templates/' . $this->template . '/css/admin.css');
 
-// Add Script
+// Add Modernizr
 $doc->addScript('templates/'.$this->template.'/js/modernizr.js', 'text/javascript');
+
+// Add JavaScript Frameworks
+JHtml::_('bootstrap.framework');
+
+// Add KUI scripts
+$doc->addScript('templates/'.$this->template.'/js/koowa.kquery.js', 'text/javascript');
 $doc->addScript('templates/'.$this->template.'/js/admin.js', 'text/javascript');
+
 ?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
 <head>
 	<jdoc:include type="head" />
 </head>
-<body class="contentpane component koowa">
-	<div id="koowa" class="koowa koowa-container">
+<body class="contentpane component">
+    <div class="k-ui-namespace k-ui-container">
 		<jdoc:include type="message" />
 		<jdoc:include type="component" />
 	</div>