#319: Styling

joomlatools · May 23, 2017 · caa2697 · caa2697
1 parent 6e3c368
commit caa2697
Show file tree

Hide file tree

Showing 20 changed files with 559 additions and 214 deletions.
diff --git a/config/environment.php b/config/environment.php
@@ -21,7 +21,7 @@
 	'offset'     => 'UTC',
 
     /* Session */
-	'lifetime'        => '15',
+	'lifetime'        => '999',
 	'session_handler' => 'database',
 
 	/* Mail */
@@ -40,7 +40,7 @@
 	'cache_handler' => 'file',
 
 	/* Debug */
-    'debug'      => '0',
+    'debug'      => '1',
 	'debug_lang' => '0',
 
     /* SEO */

diff --git a/config/environments/production.php b/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',

diff --git a/config/environments/staging.php b/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'

diff --git a/web/administrator/log/jcontroller.log.php b/web/administrator/log/jcontroller.log.php
@@ -62,3 +62,14 @@
 2017-05-22T15:13:30+00:00	INFO 127.0.0.1	controller	Holding edit ID com_modules.edit.module.17 Array (     [0] => 17 ) 
 2017-05-22T15:13:30+00:00	INFO 127.0.0.1	controller	Checking edit ID com_modules.edit.module.17: 1 Array (     [0] => 17 ) 
 2017-05-22T15:13:42+00:00	INFO 127.0.0.1	controller	Releasing edit ID com_modules.edit.module.17 Array ( ) 
+2017-05-23T09:41:38+00:00	INFO 127.0.0.1	controller	Holding edit ID com_users.edit.user.951 Array (     [0] => 951 ) 
+2017-05-23T09:41:38+00:00	INFO 127.0.0.1	controller	Checking edit ID com_users.edit.user.951: 1 Array (     [0] => 951 ) 
+2017-05-23T09:41:41+00:00	INFO 127.0.0.1	controller	Releasing edit ID com_users.edit.user.951 Array ( ) 
+2017-05-23T11:18:11+00:00	INFO 127.0.0.1	controller	Holding edit ID com_menus.edit.item.2 Array (     [0] => 2 ) 
+2017-05-23T11:33:30+00:00	INFO 127.0.0.1	controller	Releasing edit ID com_menus.edit.item.2 Array ( ) 
+2017-05-23T11:35:59+00:00	INFO 127.0.0.1	controller	Holding edit ID com_menus.edit.item.2 Array (     [0] => 2 ) 
+2017-05-23T12:33:17+00:00	INFO 127.0.0.1	controller	Releasing edit ID com_menus.edit.item.2 Array ( ) 
+2017-05-23T12:33:20+00:00	INFO 127.0.0.1	controller	Holding edit ID com_menus.edit.item.2 Array (     [0] => 2 ) 
+2017-05-23T12:34:10+00:00	INFO 127.0.0.1	controller	Releasing edit ID com_menus.edit.item.2 Array ( ) 
+2017-05-23T12:52:14+00:00	INFO 127.0.0.1	controller	Holding edit ID com_menus.edit.item.2 Array (     [0] => 2 ) 
+2017-05-23T13:31:02+00:00	INFO 127.0.0.1	controller	Releasing edit ID com_menus.edit.item.2 Array ( ) 
diff --git a/web/administrator/templates/elysio/css/admin.css b/web/administrator/templates/elysio/css/admin.css
@@ -8186,6 +8186,40 @@ body.koowa > .koowa { min-height: 100%; overflow: hidden; }
 
 .k-ui-namespace .accordion-inner .nav-tabs > li > a:focus, .k-ui-namespace .accordion-inner .nav-tabs > li > a:hover { border: none; background: transparent; text-decoration: underline; }
 
+.k-ui-namespace .tabs-left:before, .k-ui-namespace .tabs-left:after, .k-ui-namespace .tabs-right:before, .k-ui-namespace .tabs-right:after { content: " "; display: table; }
+
+.k-ui-namespace .tabs-left:after, .k-ui-namespace .tabs-right:after { clear: both; }
+
+.k-ui-namespace .tabs-left .nav-tabs.nav-tabs, .k-ui-namespace .tabs-right .nav-tabs.nav-tabs { margin: 0 -1px 0 0; border-bottom: 0; background: transparent; }
+
+.k-ui-namespace .tabs-left .tab-content, .k-ui-namespace .tabs-right .tab-content { padding: 20px; border: 1px solid #ddd; }
+
+.k-ui-namespace .tabs-left > .nav-tabs > li, .k-ui-namespace .tabs-right > .nav-tabs > li { float: none; }
+
+.k-ui-namespace .tabs-left > .nav-tabs > li > a, .k-ui-namespace .tabs-right > .nav-tabs > li > a { min-width: 74px; margin-right: 0; margin-bottom: 3px; }
+
+.k-ui-namespace .tabs-left > .nav-tabs { float: left; margin-right: 19px; border-right: 1px solid #ddd; }
+
+.k-ui-namespace .tabs-left > .nav-tabs > li > a { margin-right: -1px; border-radius: 4px 0 0 4px; }
+
+.k-ui-namespace .tabs-left > .nav-tabs > li:last-child > a { margin-bottom: 0; }
+
+.k-ui-namespace .tabs-left > .nav-tabs > li > a:hover, .k-ui-namespace .tabs-left > .nav-tabs > li > a:focus { border-color: #ddd; }
+
+.k-ui-namespace .tabs-left > .nav-tabs .active.active > a, .k-ui-namespace .tabs-left > .nav-tabs .active > a:hover, .k-ui-namespace .tabs-left > .nav-tabs .active > a:focus { background: white; border-color: #ddd transparent #ddd #ddd; }
+
+.k-ui-namespace .tabs-right > .nav-tabs { float: right; margin-left: 19px; border-left: 1px solid #ddd; }
+
+.k-ui-namespace .tabs-right > .nav-tabs > li > a { margin-left: -1px; border-radius: 0 4px 4px 0; }
+
+.k-ui-namespace .tabs-right > .nav-tabs > li > a:hover, .k-ui-namespace .tabs-right > .nav-tabs > li > a:focus { border-color: #ddd; }
+
+.k-ui-namespace .tabs-right > .nav-tabs .active > a, .k-ui-namespace .tabs-right > .nav-tabs .active > a:hover, .k-ui-namespace .tabs-right > .nav-tabs .active > a:focus { background: white; border-color: #ddd #ddd #ddd transparent; }
+
+.k-ui-namespace .nav > .disabled > a { color: red; }
+
+.k-ui-namespace .nav > .disabled > a:hover, .k-ui-namespace .nav > .disabled > a:focus { text-decoration: none; background-color: transparent; cursor: default; }
+
 .k-ui-namespace .k-login-container { background: #3071a9; text-align: center; /* 1 */ white-space: nowrap; /* 1 */ padding-top: 50px; /* 2 */ /** Psuedo element for vertical centering 1. Adjusts for spacing */ /* Use flexbox when available */ }
 
 .k-ui-namespace .k-login-container:before { content: ' '; display: inline-block; height: 100%; vertical-align: middle; margin-right: -0.25em; /* 1 */ }
@@ -8225,6 +8259,30 @@ body.koowa > .koowa { min-height: 100%; overflow: hidden; }
 
 .k-ui-namespace .readonly { display: block; min-height: 32px; }
 
+.k-ui-namespace form legend:first-child { padding-top: 0; }
+
+.k-ui-namespace .k-tabs-container { overflow: hidden; width: 100%; margin: 0 auto -20px; padding: 20px 0; /* When flexbox is in use */ /* When resizing */ }
+
+.k-ui-namespace .k-tabs-container:before, .k-ui-namespace .k-tabs-container:after { content: " "; display: table; }
+
+.k-ui-namespace .k-tabs-container:after { clear: both; }
+
+@media (min-width: 300px) and (min-height: 391px) { .k-flexbox .k-ui-namespace .k-tabs-container, .k-flexboxlegacy .k-ui-namespace .k-tabs-container { -webkit-box-flex: 0; -ms-flex: 0 0 auto; flex: 0 0 auto; } }
+
+.k-is-resizing .k-ui-namespace .k-tabs-container { overflow: hidden; }
+
+.k-ui-namespace .k-tabs-container > .nav-tabs { /* Rename to k-tabs if this goes into KUI */ padding-top: 20px; padding-left: 20px; padding-right: 20px; background: white; border-top: 1px solid #ddd; }
+
+.k-ui-namespace .k-tabs-container .tab-content { /* Rename to k-tabs-content if this goes into KUI */ padding: 20px; }
+
+.k-ui-namespace .nav-tabs > li.active.active > a { background: #fbfafa; color: #222222; }
+
+.k-ui-namespace .k-form-block { margin-bottom: 1.5em; }
+
+.k-ui-namespace .k-form-block:last-child { margin-bottom: 0; }
+
+.k-ui-namespace .label-important { background: red; }
+
 .popover.popover { margin: 0; padding: 0; border: none; border-radius: 0; background: transparent; font-family: inherit; box-shadow: none; white-space: normal; }
 
 .popover.popover .popover-title.popover-title { display: none; }

diff --git a/web/administrator/templates/elysio/html/com_config/application/default.php b/web/administrator/templates/elysio/html/com_config/application/default.php
@@ -28,21 +28,12 @@
 
 <div class="k-container">
 
-	<form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm">
-
-		<ul class="nav nav-tabs">
-			<li class="active"><a href="#page-permissions" data-toggle="tab"><?php echo JText::_('COM_CONFIG_PERMISSIONS'); ?></a></li>
-		</ul>
-
-		<div id="config-document" class="tab-content">
-			<div id="page-permissions" class="tab-pane active">
-				<div class="row-fluid">
-					<?php echo $this->loadTemplate('permissions'); ?>
-				</div>
-			</div>
-			<input type="hidden" name="task" value="" />
-			<?php echo JHtml::_('form.token'); ?>
-		</div>
+	<form class="k-container__full" action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm">
+
+        <?php echo $this->loadTemplate('permissions'); ?>
+
+        <input type="hidden" name="task" value="" />
+        <?php echo JHtml::_('form.token'); ?>
 
 	</form>
 

diff --git a/web/administrator/templates/elysio/html/com_config/component/default.php b/web/administrator/templates/elysio/html/com_config/component/default.php
@@ -29,23 +29,22 @@
 <?php JFactory::getDocument()->setBuffer($this->loadTemplate('navigation'), 'modules', 'sidebar'); ?>
 
 <div class="k-container">
-
-    <form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="component-form" method="post" name="adminForm" autocomplete="off" class="form-validate form-horizontal">
-        <ul class="nav nav-tabs" id="configTabs">
-            <?php $fieldSets = $this->form->getFieldsets(); ?>
+    <form class="k-container__full" action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="component-form" method="post" name="adminForm" autocomplete="off">
+        <?php $fieldSets = $this->form->getFieldsets(); ?>
+        <ul class="nav nav-tabs<?php echo count($fieldSets) == 1 ? ' k-hidden' : '';?>" id="configTabs">
             <?php foreach ($fieldSets as $name => $fieldSet) : ?>
                 <?php $label = empty($fieldSet->label) ? 'COM_CONFIG_' . $name . '_FIELDSET_LABEL' : $fieldSet->label; ?>
                 <li><a href="#<?php echo $name; ?>" data-toggle="tab"><?php echo JText::_($label); ?></a></li>
             <?php endforeach; ?>
         </ul>
-        <div class="tab-content">
-            <?php $fieldSets = $this->form->getFieldsets(); ?>
+        <?php echo count($fieldSets) > 1 ? '<div class="tab-content">' : '';?>
             <?php foreach ($fieldSets as $name => $fieldSet) : ?>
-                <div class="tab-pane" id="<?php echo $name; ?>">
+                <?php echo count($fieldSets) > 1 ? '<div class="tab-pane" id="'.$name.'">' : '';?>
+                    <div class="k-heading"><?php echo JText::_($fieldSet->label); ?></div>
                     <?php
                     if (isset($fieldSet->description) && !empty($fieldSet->description))
                     {
-                        echo '<p class="tab-description">' . JText::_($fieldSet->description) . '</p>';
+                        echo '<p class="k-alert k-alert--info">' . JText::_($fieldSet->description) . '</p>';
                     }
                     ?>
                     <?php foreach ($this->form->getFieldset($name) as $field) : ?>
@@ -73,9 +72,9 @@
                             </div>
                         </div>
                     <?php endforeach; ?>
-                </div>
+                <?php echo count($fieldSets) > 1 ? '</div>' : '';?>
             <?php endforeach; ?>
-        </div>
+        <?php echo count($fieldSets) > 1 ? '</div>' : '';?>
         <input type="hidden" name="id" value="<?php echo $this->component->id; ?>" />
         <input type="hidden" name="component" value="<?php echo $this->component->option; ?>" />
         <input type="hidden" name="return" value="<?php echo $this->return; ?>" />

diff --git a/web/administrator/templates/elysio/html/com_menus/item/edit.php b/web/administrator/templates/elysio/html/com_menus/item/edit.php
@@ -98,25 +98,24 @@
 
 	<!-- Container -->
 	<div class="k-container">
-
         <div class="k-container__main">
             <?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
         </div>
     </div>
 
-    <div class="k-container">
+    <div class="k-tabs-container">
 
 		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
         <?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', JText::_('COM_MENUS_ITEM_DETAILS')); ?>
 
-        <div class="k-container__content">
-
             <!-- Main information -->
             <div class="k-container__main">
 
                 <?php
                 echo $this->form->renderField('type');
 
+                echo $this->form->renderField('menutype');
+
                 if ($this->item->type == 'alias')
                 {
                     echo $this->form->renderFieldset('aliasoptions');
@@ -143,26 +142,63 @@
 
             <!-- Sub information -->
             <div class="k-container__sub">
-				<?php
-				// Set main fields.
-				$this->fields = array(
-					'menutype',
-					'parent_id',
-					'menuordering',
-					'published',
-					'home',
-					'access',
-					'language',
-					'note'
-				);
-				if ($this->item->type != 'component')
-				{
-					$this->fields = array_diff($this->fields, array('home'));
-				}
-				?>
-				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+
+                <fieldset class="k-form-block">
+                    <div class="k-form-block__header">Header</div>
+                    <div class="k-form-block__content">
+                        <?php
+                        // Set main fields.
+                        $this->fields = array(
+                            'parent_id',
+                            'menuordering',
+                        );
+                        if ($this->item->type != 'component')
+                        {
+                            $this->fields = array_diff($this->fields, array('home'));
+                        }
+                        ?>
+                        <?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+                    </div>
+                </fieldset>
+
+                <fieldset class="k-form-block">
+                    <div class="k-form-block__header">Header</div>
+                    <div class="k-form-block__content">
+                        <?php
+                        // Set main fields.
+                        $this->fields = array(
+                            'published',
+                            'home',
+                            'access',
+                            'language',
+                        );
+                        if ($this->item->type != 'component')
+                        {
+                            $this->fields = array_diff($this->fields, array('home'));
+                        }
+                        ?>
+                        <?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+                    </div>
+                </fieldset>
+
+                <fieldset class="k-form-block">
+                    <div class="k-form-block__header">Extra</div>
+                    <div class="k-form-block__content">
+                        <?php
+                        // Set main fields.
+                        $this->fields = array(
+                            'note'
+                        );
+                        if ($this->item->type != 'component')
+                        {
+                            $this->fields = array_diff($this->fields, array('home'));
+                        }
+                        ?>
+                        <?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+                    </div>
+                </fieldset>
+
 			</div><!-- .k-container__sub -->
-		</div><!-- .k-container__content -->
 
 		<?php echo JHtml::_('bootstrap.endTab'); ?>
 
@@ -174,22 +210,18 @@
 
 		<?php if ($assoc) : ?>
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'associations', JText::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
-                <div class="k-container__content">
-                    <!-- Main information -->
-                    <div class="k-container__main">
-            			<?php echo $this->loadTemplate('associations'); ?>
-                    </div>
+                <!-- Main information -->
+                <div class="k-container__main">
+                    <?php echo $this->loadTemplate('associations'); ?>
                 </div>
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 		<?php endif; ?>
 
 		<?php if (!empty($this->modules)) : ?>
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'modules', JText::_('COM_MENUS_ITEM_MODULE_ASSIGNMENT')); ?>
-                <div class="k-container__content">
-                    <!-- Main information -->
-                    <div class="k-container__main">
-                        <?php echo $this->loadTemplate('modules'); ?>
-                    </div>
+                <!-- Main information -->
+                <div class="k-container__main">
+                    <?php echo $this->loadTemplate('modules'); ?>
                 </div>
             <?php echo JHtml::_('bootstrap.endTab'); ?>
 		<?php endif; ?>