Add subtab support

vpietri · Jun 29, 2015 · 8dbee8d · 8dbee8d
1 parent 85df874
commit 8dbee8d
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 21 deletions.
diff --git a/Controller/Log/Reset.php b/Controller/Log/Reset.php
@@ -15,8 +15,8 @@ public function execute()
 
         $file = $this->_qdbHelper->getLogFiles($fileKey);
         if ($file) {
-            if(!empty($file['is_empty'])) {
-                if (!unlink($file['is_empty'])) {
+            if(!empty($file['size'])) {
+                if (!unlink($file['path'])) {
                     $output = 'Cannot reset file.';
                 } else {
                     $output = 'File empty.';

diff --git a/README.md b/README.md
@@ -42,6 +42,9 @@ In order to install it run the below command on the root directory:
 
 # Changelog
 
+0.1.2
+* Add sub-tab and reorganize existing tabs
+
 0.1.1
 * Javascript cleaning to meet coding standards
 * Add [sunnywalker/filterTable](https://github.com/sunnywalker/jQuery.FilterTable)

diff --git a/view/frontend/layout/quickdevbar.xml b/view/frontend/layout/quickdevbar.xml
@@ -14,12 +14,12 @@
                       <argument name="is_ajax" xsi:type="string">1</argument>
                     </action>
                     -->
+                    <block class="ADM\QuickDevBar\Block\Tab\Content\Request" name="qdb.tab.request" as="qdb.tab.request" template="tab/info/request.phtml"/>
                     <block class="ADM\QuickDevBar\Block\Tab\DefaultContent" name="qdb.tab.store" as="qdb.tab.store" template="tab/info/store.phtml">
                         <action method="setTitle">
                           <argument name="title" xsi:type="string">Store</argument>
                         </action>                    
                     </block>
-                    <block class="ADM\QuickDevBar\Block\Tab\Content\Request" name="qdb.tab.request" as="qdb.tab.request" template="tab/info/request.phtml"/>
                     <block class="ADM\QuickDevBar\Block\Tab\Content\Layout" name="qdb.tab.layout" as="qdb.tab.layout" template="tab/info/layout.phtml"/>
                     <block class="ADM\QuickDevBar\Block\Tab\DefaultContent" name="qdb.tab.profiler" as="qdb.tab.profiler" template="tab/info/profiler.phtml">
                         <!-- Set a title with the basic class  Content -->

diff --git a/view/frontend/templates/tab/info/store.phtml b/view/frontend/templates/tab/info/store.phtml
@@ -3,7 +3,7 @@ $_website = $block->getWebsite();
 $_store = $this->getStore();
 ?>
 
-<table border="0" cellpadding="0" cellspacing="0">
+<table class="qdn_table_2col">
   <tr>
     <th><?php echo __('Website Id'); ?></th>
     <td><?php echo $_website->getId(); ?></td>

diff --git a/view/frontend/web/css/quickdevbar.css b/view/frontend/web/css/quickdevbar.css
@@ -31,24 +31,34 @@
     padding-left: 5px;
 }
 
+
+/**
+  * Tabs
+  * ---------------
+  */
 div.qdb-container {
-    width: 1200px;
+     width: 1200px;
+}
+
+div.qdb-panel  div.qdb-container {
+     width: 1165px;
 }
 
 div.qdb-container ul {
     margin: 0px;
 }
 
-div.qdb-panel {
+div.qdb-ui-tabs > div.qdb-panel, div.qdb-ui-subtabs > div.qdb-panel {
+    background: none repeat scroll 0 0 #fff
+}
+
+
+div.qdb-ui-tabs > div.qdb-panel {
     max-height: 600px;
     overflow: auto;
-    background: none repeat scroll 0 0 #fff
 }
 
-/**
-  * Tabs
-  * ---------------
-  */
+
 div.qdb-ui-tabs, div.qdb-ui-subtabs {
     padding: 0 0 20px 0;
 }
@@ -61,6 +71,7 @@ div.qdb-ui-tabs > ul > li, div.qdb-ui-subtabs > ul > li {
     z-index: 98;
     display:inline-block;
     background-color: #f7f7f7;
+    border: 1px solid #ccc;
 }
 
 div.qdb-ui-tabs > ul > li {
@@ -69,20 +80,12 @@ div.qdb-ui-tabs > ul > li {
     -webkit-border-radius: 10px;
     -moz-border-radius: 10px;
     border-radius: 10px;    
-    border: 1px solid #ccc;
     box-shadow: none;
 }
 
 
 div.qdb-ui-subtabs > ul > li {
-    margin: 0 3px;
-    padding: 7px 10px;
-    -webkit-border-top-left-radius: 4px;
-    -webkit-border-top-right-radius: 4px;
-    -moz-border-radius-topleft: 4px;
-    -moz-border-radius-topright: 4px;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
+    margin: 0px;
 }
 
 
@@ -93,6 +96,7 @@ div.qdb-ui-tabs li.ui-tabs-active, div.qdb-ui-subtabs li.ui-tabs-active {
 
 div.qdb-ui-subtabs li.ui-tabs-active {
     border-bottom: 1px solid #fff;
+
 }
 
 div.qdb-ui-tabs > ul a, div.qdb-ui-subtabs > ul a  {
@@ -103,15 +107,26 @@ div.qdb-ui-tabs > ul a, div.qdb-ui-subtabs > ul a  {
     box-shadow: none;
 }
 
+div.qdb-ui-subtabs > ul a  {
+    padding: 7px 10px;
+    display: block;
+}
+
 div.qdb-ui-tabs .ui-state-hover > a, div.qdb-ui-subtabs .ui-state-hover > a {
     box-shadow: none;
 }
 
 div.qdb-ui-tabs .ui-tabs-active > a, div.qdb-ui-subtabs .ui-tabs-active > a {
-    color: #cc0000;
+    color: #eb5202;
     box-shadow: none;
 }
 
+div.qdb-ui-subtabs .ui-tabs-active > a {
+    border-top: 2px solid #eb5202;
+    padding-top: 5px;
+}
+
+
 div.qdb-ui-tabs > div, div.qdb-ui-subtabs > div {
     position: relative;
     border: 1px solid #CCC;
@@ -126,8 +141,11 @@ div.qdb-ui-tabs > div {
 
 div.qdb-ui-subtabs > div {
     padding: 10px;
+    margin-top: -1px;
 }
 
+
+
 /**
   * Loader
   * ---------------