From c3fb5ba3a332141de11f8658310ee0fe96ff7460 Mon Sep 17 00:00:00 2001 From: Oreolek Date: Fri, 17 Jan 2014 14:37:23 +0700 Subject: [PATCH] debug toolbar styling --- .../assets/stylesheets/debug-toolbar.less | 220 ++++++++++++++++++ application/assets/stylesheets/main.less | 1 + application/classes/Controller/Client.php | 8 + application/classes/Form.php | 8 + application/config/debug_toolbar.php | 1 + application/config/less.php | 2 +- application/templates/layout.mustache | 2 +- modules/debug-toolbar | 2 +- modules/less | 2 +- 9 files changed, 242 insertions(+), 4 deletions(-) create mode 100644 application/assets/stylesheets/debug-toolbar.less diff --git a/application/assets/stylesheets/debug-toolbar.less b/application/assets/stylesheets/debug-toolbar.less new file mode 100644 index 0000000..4727fed --- /dev/null +++ b/application/assets/stylesheets/debug-toolbar.less @@ -0,0 +1,220 @@ +div#kohana-debug-toolbar :focus { outline: 0; } + +/* Global */ +div#kohana-debug-toolbar { + font-family: Arial, "Open Sans", sans-serif; + color: #333; + text-align: left; +} +div#kohana-debug-toolbar h1 { + .h3; +} +div#kohana-debug-toolbar a, +div#kohana-debug-toolbar a:hover { + text-decoration: none; + color: #222; +} +div#kohana-debug-toolbar pre { + line-height: 1.3; +} + +/* Tables */ +div#kohana-debug-toolbar table { + border-collapse: collapse; + border-spacing: 0; + .table; + .table-condensed; + font-family: monospace; +} +div#kohana-debug-toolbar td { + padding: 3px 3px; + vertical-align: top; + background-color: #eee; + // break long lines + white-space: pre; + white-space: pre-wrap; + white-space: pre-line; + word-break: break-all; + word-wrap: break-word; +} +div#kohana-debug-toolbar tr.odd td { + background-color: #ddd; +} +div#kohana-debug-toolbar th { + padding: 3px 5px; + vertical-align: top; + background-color: #999; + color: #eee; + white-space: nowrap; +} +div#kohana-debug-toolbar td, +div#kohana-debug-toolbar th { + border: 1px solid #efefef; +} +div#kohana-debug-toolbar tr.current { + font-weight: bold; +} + +/* Toolbar */ +#kohana-debug-toolbar { + float: right; + width: 250px; + height: 100%; + overflow-y: auto; + z-index: 1000; + transition: all 0.4s ease 0s; + ul { + width: 250px; + list-style: none; + margin: 0; + padding: 0; + img { + display: inline-block; + } + } + .top { + position: absolute; + right: 275px; + top: 0px; + width: 960px; + z-index: 999; + border-bottom: 1px solid #aaa; + background-color: #efefef; + padding: 10px; + } +} + + + +/* +div#kohana-debug-toolbar div#debug-toolbar { + position: absolute; + top: 0px; + width: 100%; + padding: 0 0 3px 0; + line-height: 16px; + background-color: #ccc; +} +html { + position: absolute; + top: 16px; +} +div#kohana-debug-toolbar .top { + position: absolute; + left: 0px; + top: 20px; + width: 100%; + z-index: 9999; + border-bottom: 1px solid #aaa; + background-color: #efefef; + padding: 10px; +} + +div#kohana-debug-toolbar div#debug-toolbar img { + display: inline; +} +div#kohana-debug-toolbar div#debug-toolbar ul.menu { + padding: 5px; + display: inline; +} +div#kohana-debug-toolbar div#debug-toolbar ul.menu li { + display: inline-block; + list-style: none; + padding: 0 5px; + border-right: 1px solid #aaa; + cursor: pointer; + line-height: 16px; +} +div#kohana-debug-toolbar div#debug-toolbar ul.menu li.last { + border: none; +} +*/ + +/* Benchmarks */ +div#kohana-debug-toolbar div#debug-benchmarks { padding: 3px 0px; } + +/* SQL queries */ +div#kohana-debug-toolbar div#debug-database { padding: 3px 0px; } + +/* Vars & Config */ +div#kohana-debug-toolbar div#debug-vars { + padding: 3px 0px; +} +div#kohana-debug-toolbar div#debug-vars pre { + background-color: #ddd; + padding: 5px; + color: #333; +} +div#kohana-debug-toolbar div#debug-vars .varmenu { + margin: 20px 0 0 0; + height: 23px; +} +div#kohana-debug-toolbar div#debug-vars .varmenu li { + float: left; + display: block; + padding: 5px; + margin: 0 6px 0 0; + border-top: 1px solid #999; + border-left: 1px solid #999; + border-right: 1px solid #999; + cursor: pointer; +} +div#kohana-debug-toolbar div#debug-vars .varmenu li.active { + background-color: #ddd; + color: #000; +} +div#kohana-debug-toolbar div#debug-vars .configmenu { background-color: #ddd; } +div#kohana-debug-toolbar div#debug-vars .configmenu li { + display: block; + padding: 5px; + cursor: pointer; +} +div#kohana-debug-toolbar div#debug-vars .configmenu li.odd { background-color: #eee; } +div#kohana-debug-toolbar div#debug-vars .configmenu li.even { background-color: #fff; } +div#kohana-debug-toolbar div#debug-vars .configmenu li.odd pre { background-color: #eee; } +div#kohana-debug-toolbar div#debug-vars .configmenu li.even pre { background-color: #fff; } +div#kohana-debug-toolbar div#debug-vars .configmenu li:hover.odd { background-color: #ddd; } +div#kohana-debug-toolbar div#debug-vars .configmenu li:hover.even { background-color: #ddd; } +div#kohana-debug-toolbar div#debug-vars .configmenu li:hover.odd pre { background-color: #ddd; } +div#kohana-debug-toolbar div#debug-vars .configmenu li:hover.even pre { background-color: #ddd; } + +/* Logs & Msgs */ +div#kohana-debug-toolbar div#debug-log { + padding: 3px 0px; + font-size: 11px; +} + +/* Ajax */ +div#kohana-debug-toolbar div#debug-ajax { + padding: 3px 0px; + font-size: 11px; +} + +/* Custom data */ +div#kohana-debug-toolbar div#debug-customs { + padding: 3px 0px; +} +div#kohana-debug-toolbar div#debug-customs pre { + background-color: #ddd; + padding: 5px; + color: #333; +} +div#kohana-debug-toolbar div#debug-customs .sectionmenu { + margin: 20px 0 0 0; + height: 23px; +} +div#kohana-debug-toolbar div#debug-customs .sectionmenu li { + float: left; + display: block; + padding: 5px; + margin: 0 6px 0 0; + border-top: 1px solid #999; + border-left: 1px solid #999; + border-right: 1px solid #999; + cursor: pointer; +} +div#kohana-debug-toolbar div#debug-customs .sectionmenu li.active { + background-color: #ddd; + color: #000; +} + diff --git a/application/assets/stylesheets/main.less b/application/assets/stylesheets/main.less index 7151648..b09fcd4 100644 --- a/application/assets/stylesheets/main.less +++ b/application/assets/stylesheets/main.less @@ -3,4 +3,5 @@ @import 'layout'; @import 'variables'; @import 'bootswatch'; +@import 'debug-toolbar'; @fa-font-path: "../../assets/fonts"; diff --git a/application/classes/Controller/Client.php b/application/classes/Controller/Client.php index b23bcd8..f07beb9 100644 --- a/application/classes/Controller/Client.php +++ b/application/classes/Controller/Client.php @@ -18,4 +18,12 @@ class Controller_Client extends Controller_Layout { { $this->template = new View_Client_Search; } + + public function action_subscribe() + { + } + + public function action_unsubscribe() + { + } } diff --git a/application/classes/Form.php b/application/classes/Form.php index 282b4ab..e7c31f0 100644 --- a/application/classes/Form.php +++ b/application/classes/Form.php @@ -73,6 +73,14 @@ class Form extends Kohana_Form { $template->value = $model->$name; return self::render_control($template); } + public static function password($name, $value = NULL, array $attributes = NULL) + { + $template = new View_Form_Password; + $template->name = $name; + $template->label = __(Arr::get($attributes, 'label')); + $template->value = $value; + return self::render_control($template); + } public static function orm_textinput_inline($model, $name) { $template = new View_Form_Input; diff --git a/application/config/debug_toolbar.php b/application/config/debug_toolbar.php index 117f579..1d73547 100644 --- a/application/config/debug_toolbar.php +++ b/application/config/debug_toolbar.php @@ -4,6 +4,7 @@ * Log toolbar data to FirePHP */ $config['firephp_enabled'] = FALSE; +$config['styles'] = FALSE; /** * Exclude configs diff --git a/application/config/less.php b/application/config/less.php index a22a9ff..784be25 100644 --- a/application/config/less.php +++ b/application/config/less.php @@ -2,7 +2,7 @@ return array( - 'compress' => false, + 'compress' => TRUE, 'path' => 'application/cache/css/', 'vendor_internal' => FALSE diff --git a/application/templates/layout.mustache b/application/templates/layout.mustache index ab51785..bf84c8d 100644 --- a/application/templates/layout.mustache +++ b/application/templates/layout.mustache @@ -8,7 +8,7 @@ {{{stylesheet}}} -
+
{{{get_paging}}}
diff --git a/modules/debug-toolbar b/modules/debug-toolbar index eadeaad..c24008b 160000 --- a/modules/debug-toolbar +++ b/modules/debug-toolbar @@ -1 +1 @@ -Subproject commit eadeaad31f4aa781fbf178618fad267e80a4ad9d +Subproject commit c24008b2e251004183adc145b814a687b0ae481a diff --git a/modules/less b/modules/less index 716e5cf..aaffc1b 160000 --- a/modules/less +++ b/modules/less @@ -1 +1 @@ -Subproject commit 716e5cf00bc2c55efeb74b7e22a98a2e6d34c0c6 +Subproject commit aaffc1b4eaf878e975f8ce9933cf4b34e72b42e3