From b6b07d377192665e00b0f016bdc56d8d5d33b92e Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Wed, 07 Jan 2015 09:52:38 -0500 Subject: [PATCH] - Layout fixes - Responsive fixes --- interface/web/dns/templates/dns_soa_edit.htm | 4 interface/web/dns/templates/dns_wizard.htm | 4 interface/web/themes/default/assets/stylesheets/responsive.css | 2 interface/web/dns/templates/dns_slave_edit.htm | 4 interface/web/sites/templates/database_edit.htm | 2 interface/web/themes/default/assets/stylesheets/themes/default/theme.css | 4 + interface/web/themes/default/templates/main.tpl.htm | 15 ++- interface/web/themes/default/templates/topnav.tpl.htm | 2 interface/web/dashboard/dashlets/templates/modules.htm | 2 interface/web/dns/templates/dns_aaaa_edit.htm | 2 interface/web/themes/default/templates/sidenav.tpl.htm | 6 interface/web/themes/default/assets/stylesheets/themes/dark/theme.css | 3 interface/web/themes/default/assets/javascripts/responsive.min.js | 2 interface/web/themes/default/assets/stylesheets/responsive.min.css | 2 interface/web/themes/default/assets/stylesheets/ispconfig.min.css | 2 interface/web/themes/default/assets/javascripts/responsive.js | 24 +++++- interface/web/themes/default/assets/stylesheets/themes/default/theme.min.css | 2 interface/web/themes/default/assets/stylesheets/ispconfig.css | 86 +++++++++++++++++++++ interface/web/dns/templates/dns_a_edit.htm | 2 interface/web/themes/default/assets/stylesheets/themes/dark/theme.min.css | 2 interface/web/js/jquery.ispconfigsearch.js | 11 +- interface/web/js/scrigo.js.php | 2 22 files changed, 148 insertions(+), 37 deletions(-) diff --git a/interface/web/dashboard/dashlets/templates/modules.htm b/interface/web/dashboard/dashlets/templates/modules.htm index 442e102..0f60b1b 100644 --- a/interface/web/dashboard/dashlets/templates/modules.htm +++ b/interface/web/dashboard/dashlets/templates/modules.htm @@ -10,7 +10,7 @@ </div> </div> <div class='btn btn-default button'> - <a href='#' data-capp='{tmp_var name="modules_name"}'>Go to {tmpl_var name='modules_title'}</a> + <a href='#' data-capp='{tmpl_var name="modules_name"}'>Go to {tmpl_var name='modules_title'}</a> </div> </li> </tmpl_loop> diff --git a/interface/web/dns/templates/dns_a_edit.htm b/interface/web/dns/templates/dns_a_edit.htm index 01a70bd..acc577e 100644 --- a/interface/web/dns/templates/dns_a_edit.htm +++ b/interface/web/dns/templates/dns_a_edit.htm @@ -46,6 +46,6 @@ fillSearchField: true, fillSearchFieldWith: 'fill_text', searchFieldWatermark: '', - resultBoxPosition: 'e' + resultBoxPosition: '' }); </script> \ No newline at end of file diff --git a/interface/web/dns/templates/dns_aaaa_edit.htm b/interface/web/dns/templates/dns_aaaa_edit.htm index b9981ad..7c9ca9f 100644 --- a/interface/web/dns/templates/dns_aaaa_edit.htm +++ b/interface/web/dns/templates/dns_aaaa_edit.htm @@ -46,6 +46,6 @@ fillSearchField: true, fillSearchFieldWith: 'fill_text', searchFieldWatermark: '', - resultBoxPosition: 'e' + resultBoxPosition: '' }); </script> \ No newline at end of file diff --git a/interface/web/dns/templates/dns_slave_edit.htm b/interface/web/dns/templates/dns_slave_edit.htm index f3b06e4..90676f1 100644 --- a/interface/web/dns/templates/dns_slave_edit.htm +++ b/interface/web/dns/templates/dns_slave_edit.htm @@ -86,7 +86,7 @@ fillSearchField: true, fillSearchFieldWith: 'fill_text', searchFieldWatermark: '', - resultBoxPosition: 'e' + resultBoxPosition: '' }); jQuery('#xfer').ispconfigSearch({ dataSrc: '/dns/ajax_get_json.php?type=get_ipv4', @@ -99,6 +99,6 @@ fillSearchField: true, fillSearchFieldWith: 'fill_text', searchFieldWatermark: '', - resultBoxPosition: 'e' + resultBoxPosition: '' }); </script> diff --git a/interface/web/dns/templates/dns_soa_edit.htm b/interface/web/dns/templates/dns_soa_edit.htm index 1b42591..3f91854 100644 --- a/interface/web/dns/templates/dns_soa_edit.htm +++ b/interface/web/dns/templates/dns_soa_edit.htm @@ -139,7 +139,7 @@ fillSearchField: true, fillSearchFieldWith: 'fill_text', searchFieldWatermark: '', - resultBoxPosition: 'e' + resultBoxPosition: '' }); jQuery('#also_notify').ispconfigSearch({ dataSrc: '/dns/ajax_get_json.php?type=get_ipv4', @@ -152,6 +152,6 @@ fillSearchField: true, fillSearchFieldWith: 'fill_text', searchFieldWatermark: '', - resultBoxPosition: 'e' + resultBoxPosition: '' }); </script> diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm index db09b82..aeaa456 100644 --- a/interface/web/dns/templates/dns_wizard.htm +++ b/interface/web/dns/templates/dns_wizard.htm @@ -119,7 +119,7 @@ fillSearchField: true, fillSearchFieldWith: 'fill_text', searchFieldWatermark: '', - resultBoxPosition: 'e' + resultBoxPosition: '' }); </script> <script language="JavaScript" type="text/javascript"> @@ -134,6 +134,6 @@ fillSearchField: true, fillSearchFieldWith: 'fill_text', searchFieldWatermark: '', - resultBoxPosition: 'e' + resultBoxPosition: '' }); </script> diff --git a/interface/web/js/jquery.ispconfigsearch.js b/interface/web/js/jquery.ispconfigsearch.js index 7a8115c..a26dc12 100644 --- a/interface/web/js/jquery.ispconfigsearch.js +++ b/interface/web/js/jquery.ispconfigsearch.js @@ -131,15 +131,14 @@ //resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top+searchField.outerHeight(), 'right' : '0'}).fadeIn(); if(settings.resultBoxPosition == 'n'){ resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top-resultBox.outerHeight(), 'left' : searchField.position().left+searchField.outerWidth()-resultBox.outerWidth()}).fadeIn(); - } - if(settings.resultBoxPosition == 'e'){ + } else if(settings.resultBoxPosition == 'e'){ resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top, 'left' : searchField.position().left+searchField.outerWidth()}).fadeIn(); - } - if(settings.resultBoxPosition == 's'){ + } else if(settings.resultBoxPosition == 's'){ resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top+searchField.outerHeight(), 'left' : searchField.position().left+searchField.outerWidth()-resultBox.outerWidth()}).fadeIn(); - } - if(settings.resultBoxPosition == 'w'){ + } else if(settings.resultBoxPosition == 'w'){ resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top, 'left' : searchField.position().left-resultBox.outerWidth()}).fadeIn(); + } else { + resultBox.html(output).fadeIn(); } searchField.removeClass(settings.cssPrefix+'loading'); diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php index 1445353..0c79fc4 100644 --- a/interface/web/js/scrigo.js.php +++ b/interface/web/js/scrigo.js.php @@ -423,6 +423,7 @@ success: function(data, textStatus, jqXHR) { hideLoadIndicator(); jQuery('#sidebar').html(jqXHR.responseText); + loadPushyMenu(); }, error: function() { hideLoadIndicator(); @@ -440,6 +441,7 @@ success: function(data, textStatus, jqXHR) { hideLoadIndicator(); jQuery('#topnav-container').html(jqXHR.responseText); + loadPushyMenu(); }, error: function(o) { hideLoadIndicator(); diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm index 4958e05..84cc1bf 100644 --- a/interface/web/sites/templates/database_edit.htm +++ b/interface/web/sites/templates/database_edit.htm @@ -148,6 +148,6 @@ fillSearchField: true, fillSearchFieldWith: 'fill_text', searchFieldWatermark: '', - resultBoxPosition: 'e' + resultBoxPosition: '' }); </script> diff --git a/interface/web/themes/default/assets/javascripts/responsive.js b/interface/web/themes/default/assets/javascripts/responsive.js index 9bd49fa..dd64ff9 100644 --- a/interface/web/themes/default/assets/javascripts/responsive.js +++ b/interface/web/themes/default/assets/javascripts/responsive.js @@ -1,15 +1,23 @@ -$(document).on('ready', function () { +function loadPushyMenu() { // Off-Canvas Menü var $mainNavigation = $('#main-navigation'); - var $subNavigation = $('.subnavigation'); + var $subNavigation = $('#sidebar'); var $responsiveNavigation = $('nav.pushy'); + $responsiveNavigation.html(''); + // Hauptnavigation $('<ul />').appendTo($responsiveNavigation); $($mainNavigation).find('a').each(function () { var $item = $(this); var $activeClass = $item.hasClass('active') ? ' class="active"' : ''; + + var capp = $item.attr('data-capp'); + if(capp) $activeClass += ' data-capp="' + capp + '"'; + + capp = $item.attr('data-load-content'); + if(capp) $activeClass += ' data-load-content="' + capp + '"'; $responsiveNavigation.find('ul').append($('<li><a href="' + $item.attr('href') + '"' + $activeClass + '><i class="icon ' + $item.data('icon-class') + '"></i>' + $item.text() + '</a></li>')); }); @@ -19,6 +27,14 @@ $($subNavigation).find('a').each(function () { var $item = $(this); - $responsiveNavigation.find('ul.subnavi').append($('<li><a href="' + $item.attr('href') + '">' + $item.text() + '</a></li>')); + + var addattr = ''; + var capp = $item.attr('data-capp'); + if(capp) addattr += ' data-capp="' + capp + '"'; + + capp = $item.attr('data-load-content'); + if(capp) addattr += ' data-load-content="' + capp + '"'; + + $responsiveNavigation.find('ul.subnavi').append($('<li><a href="' + $item.attr('href') + '"' + addattr + '>' + $item.text() + '</a></li>')); }); -}); +}; diff --git a/interface/web/themes/default/assets/javascripts/responsive.min.js b/interface/web/themes/default/assets/javascripts/responsive.min.js index 4e88780..51b621b 100644 --- a/interface/web/themes/default/assets/javascripts/responsive.min.js +++ b/interface/web/themes/default/assets/javascripts/responsive.min.js @@ -1 +1 @@ -$(document).on("ready",function(){var $mainNavigation=$("#main-navigation");var $subNavigation=$(".subnavigation");var $responsiveNavigation=$("nav.pushy");$("<ul />").appendTo($responsiveNavigation);$($mainNavigation).find("a").each(function(){var $item=$(this);var $activeClass=$item.hasClass("active")?' class="active"':"";$responsiveNavigation.find("ul").append($('<li><a href="'+$item.attr("href")+'"'+$activeClass+'><i class="icon '+$item.data("icon-class")+'"></i>'+$item.text()+"</a></li>"))});$('<ul class="subnavi" />').appendTo($responsiveNavigation);$($subNavigation).find("a").each(function(){var $item=$(this);$responsiveNavigation.find("ul.subnavi").append($('<li><a href="'+$item.attr("href")+'">'+$item.text()+"</a></li>"))})}); \ No newline at end of file +function loadPushyMenu(){var a=$("#main-navigation");var c=$("#sidebar");var b=$("nav.pushy");b.html("");$("<ul />").appendTo(b);$(a).find("a").each(function(){var d=$(this);var f=d.hasClass("active")?' class="active"':"";var e=d.attr("data-capp");if(e){f+=' data-capp="'+e+'"'}e=d.attr("data-load-content");if(e){f+=' data-load-content="'+e+'"'}b.find("ul").append($('<li><a href="'+d.attr("href")+'"'+f+'><i class="icon '+d.data("icon-class")+'"></i>'+d.text()+"</a></li>"))});$('<ul class="subnavi" />').appendTo(b);$(c).find("a").each(function(){var d=$(this);var e="";var f=d.attr("data-capp");if(f){e+=' data-capp="'+f+'"'}f=d.attr("data-load-content");if(f){e+=' data-load-content="'+f+'"'}b.find("ul.subnavi").append($('<li><a href="'+d.attr("href")+'"'+e+">"+d.text()+"</a></li>"))})}; \ No newline at end of file diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css index 37a1549..cb33002 100644 --- a/interface/web/themes/default/assets/stylesheets/ispconfig.css +++ b/interface/web/themes/default/assets/stylesheets/ispconfig.css @@ -225,6 +225,9 @@ border-top-style: solid; border-top-width: 1px; } +.pagination { + margin: 10px 0; } + .progress { display: inline-block; margin-bottom: 0; @@ -273,6 +276,89 @@ display: none; cursor: pointer; } +.df-container, +.gs-container { + position: relative; } + +.gs-container:after { + content: ""; + display: table; + clear: both; } + +ul.df-resultbox, +ul.gs-resultbox { + display: block; + position: absolute; + left: 0; + top: 100%; + margin: 0; + padding: 0 0 10px; + min-width: 250px; + max-width: 500px; + z-index: 999999; + background: #fff; + list-style: none; + box-shadow: 2px 2px 5px #c5c5c5; + border-radius: 5px; } + +ul.df-resultbox li, +ul.gs-resultbox li { + float: none; + display: block; + cursor: pointer; + padding: 0 10px; } + +ul.gs-resultbox li { + padding: 3px 10px; + line-height: 1.1; + font-size: 0.9em; } + +ul.df-resultbox li:nth-child(even), +ul.gs-resultbox li:nth-child(even) { + background: #f2f5f7; } + +ul.df-resultbox li.df-cheader, +ul.gs-resultbox li.gs-cheader { + background: #fff; + padding-top: 10px; + margin-bottom: 10px; + } + +ul.df-resultbox li p, +ul.gs-resultbox li p { + margin-bottom: 0; + color: inherit; } + +ul.df-resultbox li.df-cheader p.df-cheader-title, +ul.gs-resultbox li.gs-cheader p.gs-cheader-title { + font-weight: bold; + margin-bottom: 0; } + +ul.df-resultbox li.df-cheader p.df-cheader-limit, +ul.gs-resultbox li.gs-cheader p.gs-cheader-limit { + font-weight: normal; } + +ul.df-resultbox li.df-cdata img, +ul.gs-resultbox li.gs-cdata img { + margin-right: 12px; } + +ul.df-resultbox li.df-cdata p span.df-cdata-title, +ul.gs-resultbox li.gs-cdata p span.gs-cdata-title { + font-weight: bold; } + +ul.gs-resultbox li.gs-cdata p span.gs-cdata-title { + display: block; } + +ul.df-resultbox li:first-child, +ul.gs-resultbox li:first-child { + border-top-left-radius: 5px; + border-top-right-radius: 5px; } + +ul.df-resultbox li:last-child, +ul.gs-resultbox li:last-child { + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px; } + @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { #logo { background-image: url("../images/logo@2x.png"); diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.min.css b/interface/web/themes/default/assets/stylesheets/ispconfig.min.css index f81e1ad..cfa1c35 100644 --- a/interface/web/themes/default/assets/stylesheets/ispconfig.min.css +++ b/interface/web/themes/default/assets/stylesheets/ispconfig.min.css @@ -1 +1 @@ -body{overflow-y:scroll}.left{float:left}.right{float:right}.clear:after{content:"";display:table;clear:both}.marginTop15{margin-top:15px}.paddingX5{padding-left:5px!important;padding-right:5px!important}.width65{width:65px}.form-group input[type='checkbox']{margin-top:10px}.control-label{font-weight:normal}.control-label:after{content:":"}.formbutton-default{padding:6px 30px;border-bottom-style:solid;border-bottom-width:2px;font-size:12px;font-weight:bold;transition:all ease 500ms}.formbutton-success,.formbutton-danger{padding:6px 30px;border-style:solid;border-width:1px;border-bottom-width:solid;font-size:12px;font-weight:bold;transition:all ease 500ms}.formbutton-narrow{padding:6px 8px;margin-left:2px;margin-right:2px}.formbutton-narrower{padding:4px 6px}#main-wrapper{margin:0 auto;width:95%;max-width:1260px}#logo{float:left;width:200px;height:65px;background:url("../images/logo.png") no-repeat}#logo a{display:block;width:100%;height:100%}#headerbar{float:right}#searchform{float:right;margin-top:16px}#searchform>div{position:relative;display:table}#searchform>div>div{display:table-cell;padding-right:8px;vertical-align:top}#searchform .icon{padding:0 2px;font-size:16px}#logout-button{float:right;margin-top:16px;margin-left:25px;border-bottom-style:solid;border-bottom-width:2px;transition:all ease 500ms}#main-navigation{margin-top:24px}#main-navigation a{padding:0 12px;height:70px;border-bottom-style:solid;botder-bottom-width:2px;transition:all ease 500ms}#main-navigation .icon{font-size:32px}#main-navigation .title{margin-top:2px;font-weight:bold}.btn-group-justified .btn{border-right-width:0}.btn-group-justified .btn:last-of-type{border-right-width:1px}#content{width:78%}#sidebar{margin-top:27px;width:18%;border-style:solid;border-width:1px;border-radius:4px}#sidebar header{margin:1px;padding:0 10px;height:40px;line-height:40px;font-weight:bold;border-top-left-radius:2px;border-top-right-radius:2px}#sidebar ul{margin:0;padding:0;list-style:none}#sidebar li{padding:10px;border-top-style:solid;border-top-width:1px;font-size:12px}#sidebar a{text-decoration:none;transition:color ease 500ms}.page-header{margin:20px 0;padding:0}.alert-notification a{font-weight:bold;text-decoration:none;transition:color ease 500ms}.alert-label,.alert-content{display:inline-block;vertical-align:top}.alert-label{width:60px}.modules{margin:0;padding:0;list-style:none}.modules li{float:left;margin-right:15px;margin-bottom:15px;padding:8px;width:200px;border-radius:4px;border-style:solid;border-width:1px}.modules .icon{float:left;margin-right:15px;font-size:50px}.modules .left{margin-top:5px}.modules .title{margin-top:6px;margin-left:20px;font-size:16px;font-weight:bold}.modules .button{margin-top:10px;width:100%;border-bottom-style:solid;border-bottom-width:2px;font-size:12px;font-weight:bold;transition:all ease 500ms}.modules a{text-decoration:none}.table-wrapper{margin-bottom:20px;border-radius:4px;border-style:solid;border-width:1px}.table{table-layout:fixed;margin-bottom:1px}.table caption{padding:5px 10px;text-align:left;font-weight:bold;font-size:18px;border-bottom-style:solid;border-bottom-width:1px}.table tbody tr{border-top-style:solid;border-top-width:1px;transition:background ease 500ms}.table tbody tr:last-child{border-radius:4px}.tfooter{margin-top:-1px;height:40px;border-top-style:solid;border-top-width:1px}.progress{display:inline-block;margin-bottom:0;width:150px;height:10px}.content-tab-wrapper{border-style:solid;border-width:1px;border-radius:4px}.content-tab-wrapper .nav-tabs>li>a{border-radius:0;border:none!important;border-right-style:solid!important;border-right-width:1px!important;outline:0;font-weight:bold;transition:background ease 500ms}.content-tab-wrapper .nav-tabs li:not(:first-child) a{margin-left:-2px}.tab-content{padding:25px 10px}.input-group-btn .icon-calendar{font-size:18px}thead.dark th{height:40px;line-height:40px;font-weight:normal}thead.dark td input,thead.dark td select{width:100%}#footer{margin:20px 0;padding-top:20px;border-top-style:solid;border-top-width:1px;text-align:center;font-size:10px}.menu-btn{display:none;cursor:pointer}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#logo{background-image:url("../images/logo@2x.png");background-size:200px 65px}} \ No newline at end of file +body{overflow-y:scroll}.left{float:left}.right{float:right}.clear:after{content:"";display:table;clear:both}.marginTop15{margin-top:15px}.paddingX5{padding-left:5px!important;padding-right:5px!important}.width65{width:65px}.form-group input[type='checkbox']{margin-top:10px}.control-label{font-weight:normal}.control-label:after{content:":"}.formbutton-default{padding:6px 30px;border-bottom-style:solid;border-bottom-width:2px;font-size:12px;font-weight:bold;transition:all ease 500ms}.formbutton-success,.formbutton-danger{padding:6px 30px;border-style:solid;border-width:1px;border-bottom-width:solid;font-size:12px;font-weight:bold;transition:all ease 500ms}.formbutton-narrow{padding:6px 8px;margin-left:2px;margin-right:2px}.formbutton-narrower{padding:4px 6px}#main-wrapper{margin:0 auto;width:95%;max-width:1260px}#logo{float:left;width:200px;height:65px;background:url("../images/logo.png") no-repeat}#logo a{display:block;width:100%;height:100%}#headerbar{float:right}#searchform{float:right;margin-top:16px}#searchform>div{position:relative;display:table}#searchform>div>div{display:table-cell;padding-right:8px;vertical-align:top}#searchform .icon{padding:0 2px;font-size:16px}#logout-button{float:right;margin-top:16px;margin-left:25px;border-bottom-style:solid;border-bottom-width:2px;transition:all ease 500ms}#main-navigation{margin-top:24px}#main-navigation a{padding:0 12px;height:70px;border-bottom-style:solid;botder-bottom-width:2px;transition:all ease 500ms}#main-navigation .icon{font-size:32px}#main-navigation .title{margin-top:2px;font-weight:bold}.btn-group-justified .btn{border-right-width:0}.btn-group-justified .btn:last-of-type{border-right-width:1px}#content{width:78%}#sidebar{margin-top:27px;width:18%;border-style:solid;border-width:1px;border-radius:4px}#sidebar header{margin:1px;padding:0 10px;height:40px;line-height:40px;font-weight:bold;border-top-left-radius:2px;border-top-right-radius:2px}#sidebar ul{margin:0;padding:0;list-style:none}#sidebar li{padding:10px;border-top-style:solid;border-top-width:1px;font-size:12px}#sidebar a{text-decoration:none;transition:color ease 500ms}.page-header{margin:20px 0;padding:0}.alert-notification a{font-weight:bold;text-decoration:none;transition:color ease 500ms}.alert-label,.alert-content{display:inline-block;vertical-align:top}.alert-label{width:60px}.modules{margin:0;padding:0;list-style:none}.modules li{float:left;margin-right:15px;margin-bottom:15px;padding:8px;width:200px;border-radius:4px;border-style:solid;border-width:1px}.modules .icon{float:left;margin-right:15px;font-size:50px}.modules .left{margin-top:5px}.modules .title{margin-top:6px;margin-left:20px;font-size:16px;font-weight:bold}.modules .button{margin-top:10px;width:100%;border-bottom-style:solid;border-bottom-width:2px;font-size:12px;font-weight:bold;transition:all ease 500ms}.modules a{text-decoration:none}.table-wrapper{margin-bottom:20px;border-radius:4px;border-style:solid;border-width:1px}.table{table-layout:fixed;margin-bottom:1px}.table caption{padding:5px 10px;text-align:left;font-weight:bold;font-size:18px;border-bottom-style:solid;border-bottom-width:1px}.table tbody tr{border-top-style:solid;border-top-width:1px;transition:background ease 500ms}.table tbody tr:last-child{border-radius:4px}.tfooter{margin-top:-1px;height:40px;border-top-style:solid;border-top-width:1px}.pagination{margin:10px 0}.progress{display:inline-block;margin-bottom:0;width:150px;height:10px}.content-tab-wrapper{border-style:solid;border-width:1px;border-radius:4px}.content-tab-wrapper .nav-tabs>li>a{border-radius:0;border:none!important;border-right-style:solid!important;border-right-width:1px!important;outline:0;font-weight:bold;transition:background ease 500ms}.content-tab-wrapper .nav-tabs li:not(:first-child) a{margin-left:-2px}.tab-content{padding:25px 10px}.input-group-btn .icon-calendar{font-size:18px}thead.dark th{height:40px;line-height:40px;font-weight:normal}thead.dark td input,thead.dark td select{width:100%}#footer{margin:20px 0;padding-top:20px;border-top-style:solid;border-top-width:1px;text-align:center;font-size:10px}.menu-btn{display:none;cursor:pointer}.df-container,.gs-container{position:relative}.gs-container:after{content:"";display:table;clear:both}ul.df-resultbox,ul.gs-resultbox{display:block;position:absolute;left:0;top:100%;margin:0;padding:0 0 10px;min-width:250px;max-width:500px;z-index:999999;background:#fff;list-style:none;box-shadow:2px 2px 5px #c5c5c5;border-radius:5px}ul.df-resultbox li,ul.gs-resultbox li{float:none;display:block;cursor:pointer;padding:0 10px}ul.gs-resultbox li{padding:3px 10px;line-height:1.1;font-size:.9em}ul.df-resultbox li:nth-child(even),ul.gs-resultbox li:nth-child(even){background:#f2f5f7}ul.df-resultbox li.df-cheader,ul.gs-resultbox li.gs-cheader{background:#fff;padding-top:10px;margin-bottom:10px}ul.df-resultbox li p,ul.gs-resultbox li p{margin-bottom:0;color:inherit}ul.df-resultbox li.df-cheader p.df-cheader-title,ul.gs-resultbox li.gs-cheader p.gs-cheader-title{font-weight:bold;margin-bottom:0}ul.df-resultbox li.df-cheader p.df-cheader-limit,ul.gs-resultbox li.gs-cheader p.gs-cheader-limit{font-weight:normal}ul.df-resultbox li.df-cdata img,ul.gs-resultbox li.gs-cdata img{margin-right:12px}ul.df-resultbox li.df-cdata p span.df-cdata-title,ul.gs-resultbox li.gs-cdata p span.gs-cdata-title{font-weight:bold}ul.gs-resultbox li.gs-cdata p span.gs-cdata-title{display:block}ul.df-resultbox li:first-child,ul.gs-resultbox li:first-child{border-top-left-radius:5px;border-top-right-radius:5px}ul.df-resultbox li:last-child,ul.gs-resultbox li:last-child{border-bottom-left-radius:5px;border-bottom-right-radius:5px}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#logo{background-image:url("../images/logo@2x.png");background-size:200px 65px}} \ No newline at end of file diff --git a/interface/web/themes/default/assets/stylesheets/responsive.css b/interface/web/themes/default/assets/stylesheets/responsive.css index b296a8b..e72ebfc 100644 --- a/interface/web/themes/default/assets/stylesheets/responsive.css +++ b/interface/web/themes/default/assets/stylesheets/responsive.css @@ -48,7 +48,7 @@ #main-navigation .btn:first-child { margin-left: -1px; } } @media screen and (max-width: 670px) { - #main-navigation, .subnavigation { + #main-navigation, #sidebar { display: none; } .menu-btn { diff --git a/interface/web/themes/default/assets/stylesheets/responsive.min.css b/interface/web/themes/default/assets/stylesheets/responsive.min.css index 558838e..5f8c238 100644 --- a/interface/web/themes/default/assets/stylesheets/responsive.min.css +++ b/interface/web/themes/default/assets/stylesheets/responsive.min.css @@ -1 +1 @@ -html,body{height:100%}.pushy ul{padding-left:0;list-style:none}.pushy ul.subnavi li{font-size:12px}.pushy ul.subnavi li a{padding:2px 10px}.pushy a{padding:10px;transition:color ease 500ms}.pushy i{font-size:22px;vertical-align:sub}@media screen and (max-width:970px){#main-wrapper,#content,#sidebar{width:100%}#inner-wrapper{margin:0 10px}#sidebar.news-sidebar{margin-top:0}}@media screen and (max-width:860px){#main-navigation{display:block}#main-navigation a{float:left;display:block;margin-top:-1px;padding-top:6px;width:60px;height:50px;border-bottom:0;border-right-style:solid;border-right-width:1px;border-bottom-style:solid;border-bottom-width:1px}#main-navigation .icon{font-size:16px}#main-navigation .title{font-size:10px}#main-navigation .btn{border-radius:0}#main-navigation .btn:first-child{margin-left:-1px}}@media screen and (max-width:670px){#main-navigation,.subnavigation{display:none}.menu-btn{display:block;margin-top:8px;margin-right:10px;font-size:30px}}@media screen and (max-width:600px){#headerbar{float:left;width:100%}#searchform{float:left;margin-top:0}#logout-button{margin-top:0;margin-left:0}#sidebar{margin-top:10px}.table,.table thead,.table tbody,.table tr,.table th,.table td{display:block}.table caption{width:100%}.table thead tr{position:absolute;top:-9999px;left:-9999px}.table tbody tr{border-top:0}.progress{width:100%}}@media screen and (max-width:350px){#searchform input{width:130px}} \ No newline at end of file +html,body{height:100%}.pushy ul{padding-left:0;list-style:none}.pushy ul.subnavi li{font-size:12px}.pushy ul.subnavi li a{padding:2px 10px}.pushy a{padding:10px;transition:color ease 500ms}.pushy i{font-size:22px;vertical-align:sub}@media screen and (max-width:970px){#main-wrapper,#content,#sidebar{width:100%}#inner-wrapper{margin:0 10px}#sidebar.news-sidebar{margin-top:0}}@media screen and (max-width:860px){#main-navigation{display:block}#main-navigation a{float:left;display:block;margin-top:-1px;padding-top:6px;width:60px;height:50px;border-bottom:0;border-right-style:solid;border-right-width:1px;border-bottom-style:solid;border-bottom-width:1px}#main-navigation .icon{font-size:16px}#main-navigation .title{font-size:10px}#main-navigation .btn{border-radius:0}#main-navigation .btn:first-child{margin-left:-1px}}@media screen and (max-width:670px){#main-navigation,#sidebar{display:none}.menu-btn{display:block;margin-top:8px;margin-right:10px;font-size:30px}}@media screen and (max-width:600px){#headerbar{float:left;width:100%}#searchform{float:left;margin-top:0}#logout-button{margin-top:0;margin-left:0}#sidebar{margin-top:10px}.table,.table thead,.table tbody,.table tr,.table th,.table td{display:block}.table caption{width:100%}.table thead tr{position:absolute;top:-9999px;left:-9999px}.table tbody tr{border-top:0}.progress{width:100%}}@media screen and (max-width:350px){#searchform input{width:130px}} \ No newline at end of file diff --git a/interface/web/themes/default/assets/stylesheets/themes/dark/theme.css b/interface/web/themes/default/assets/stylesheets/themes/dark/theme.css index af60b97..47a0285 100644 --- a/interface/web/themes/default/assets/stylesheets/themes/dark/theme.css +++ b/interface/web/themes/default/assets/stylesheets/themes/dark/theme.css @@ -144,6 +144,9 @@ background: linear-gradient(to bottom, #2b556d, #1c394e) !important; color: #dfdfdf; } +thead.dark tr:nth-child(2) { + background: linear-gradient(to bottom, white, #b9bbbd) !important; } + #footer { border-top-color: #d3d7da; } diff --git a/interface/web/themes/default/assets/stylesheets/themes/dark/theme.min.css b/interface/web/themes/default/assets/stylesheets/themes/dark/theme.min.css index 63f79fa..4fbe95a 100644 --- a/interface/web/themes/default/assets/stylesheets/themes/dark/theme.min.css +++ b/interface/web/themes/default/assets/stylesheets/themes/dark/theme.min.css @@ -1 +1 @@ -html,body{-webkit-tap-highlight-color:black}body{background:#101a22;color:#dfdfdf}.green{color:#3cb355}.form-control:focus{border-color:#f9f1c9}.formbutton-default{background:linear-gradient(to bottom,white,#b9bbbd);color:#101a22}.formbutton-default:hover{background:linear-gradient(to bottom,#f2f2f2,#acaeb1)}.formbutton-success{background:linear-gradient(to bottom,#7bcc89,#6ab977);border-color:#5aab68;border-bottom-color:#5aab68;color:#101a22}.formbutton-success:hover{background:linear-gradient(to bottom,#69c579,#59b167)}.formbutton-success:hover,.formbutton-success.active{border-bottom-color:#509b5a;color:#101a22}.formbutton-danger{background:linear-gradient(to bottom,#c70f19,#b60008);border-color:#980b13;border-bottom-color:#980b13;color:white}.formbutton-danger:hover{background:linear-gradient(to bottom,#c30b15,#b20004)}.formbutton-danger:hover,.formbutton-danger.active{border-bottom-color:#8f0209;color:white}#searchform button{background:linear-gradient(to bottom,white,#b9bbbd)}#searchform button:hover{background:linear-gradient(to bottom,#f2f2f2,#acaeb1)}#logout-button{background:#c70f19;border-bottom-color:#980b13}#logout-button:hover{background:#df111c;border-bottom-color:#800a10}#main-navigation a{background:linear-gradient(to bottom,white,#b9bbbd);border-bottom-color:#878787}#main-navigation a:hover{background:linear-gradient(to bottom,#f2f2f2,#acaeb1)}#main-navigation a:hover,#main-navigation a.active{border-bottom-color:#6b6b6b;color:#c70f19}#main-navigation .icon{text-shadow:1px 1px 1px #101a22}#sidebar{border-color:#cedded;background:#101a22}#sidebar header{background:#00313d;color:#f9f1c9}#sidebar li{border-top-color:#cedded}#sidebar a{color:inherit}#sidebar a:hover{color:#f2eaca}.page-header{border-color:#878787}.alert-notification{background:#00313d;border-color:#cedded;color:#f9f1c9}.alert-notification a{color:#e8d9a1}.alert-notification a:hover{color:#f2eaca}.alert-danger{background:#f7dfdf;border-color:#dcb2b3;color:#af797d}.modules li{background:#101a22;border-color:#d3d7da;box-shadow:inset 1px 3px 8px -5px rgba(0,0,0,0.2)}.modules .button{background:linear-gradient(to bottom,white,#b9bbbd);border-bottom-color:#878787}.modules .button:hover{background:linear-gradient(to bottom,#f2f2f2,#acaeb1)}.modules .button:hover,.modules .button.active{border-bottom-color:#6b6b6b}.modules a{color:inherit}.table-wrapper{background:#101a22;border-color:#d3d7da}.table caption{border-bottom-color:#d3d7da}.table tbody tr{border-top-color:#d3d7da}.table tbody tr:nth-child(odd){background:#101a22}.table tbody tr:nth-child(even){background:#101a22}.table tbody tr:hover{background:#00313d}.tfooter{border-top-color:#d3d7da}.content-tab-wrapper{background:#101a22;border-color:#d3d7da}.content-tab-wrapper .nav-tabs{background:#243b55;box-shadow:inset -1px -2px 6px -5px rgba(0,0,0,0.2)}.content-tab-wrapper .nav-tabs>li>a{border-right-color:#d3d7da!important;color:inherit}.content-tab-wrapper .nav-tabs>li>a:hover{background:#1c2f43}.content-tab-wrapper .nav-tabs .active a{background:#101a22!important}.content-tab-wrapper .nav-tabs .active a:focus{color:inherit}thead.dark{background:linear-gradient(to bottom,#2b556d,#1c394e)!important;color:#dfdfdf}#footer{border-top-color:#d3d7da}.pushy{background:#101a22}.pushy ul.subnavi li a:hover{background:0}.pushy a:hover,.pushy a.active{background:#101a22;color:inherit}@media screen and (max-width:860px){#main-navigation a{border-right-color:#d3d7da;border-bottom-color:#d3d7da}#main-navigation a.active{border-right-color:#d3d7da;border-bottom-color:#d3d7da}#main-navigation a:hover{border-bottom-color:#d3d7da}} \ No newline at end of file +html,body{-webkit-tap-highlight-color:black}body{background:#101a22;color:#dfdfdf}.green{color:#3cb355}.form-control:focus{border-color:#f9f1c9}.formbutton-default{background:linear-gradient(to bottom,white,#b9bbbd);color:#101a22}.formbutton-default:hover{background:linear-gradient(to bottom,#f2f2f2,#acaeb1)}.formbutton-success{background:linear-gradient(to bottom,#7bcc89,#6ab977);border-color:#5aab68;border-bottom-color:#5aab68;color:#101a22}.formbutton-success:hover{background:linear-gradient(to bottom,#69c579,#59b167)}.formbutton-success:hover,.formbutton-success.active{border-bottom-color:#509b5a;color:#101a22}.formbutton-danger{background:linear-gradient(to bottom,#c70f19,#b60008);border-color:#980b13;border-bottom-color:#980b13;color:white}.formbutton-danger:hover{background:linear-gradient(to bottom,#c30b15,#b20004)}.formbutton-danger:hover,.formbutton-danger.active{border-bottom-color:#8f0209;color:white}#searchform button{background:linear-gradient(to bottom,white,#b9bbbd)}#searchform button:hover{background:linear-gradient(to bottom,#f2f2f2,#acaeb1)}#logout-button{background:#c70f19;border-bottom-color:#980b13}#logout-button:hover{background:#df111c;border-bottom-color:#800a10}#main-navigation a{background:linear-gradient(to bottom,white,#b9bbbd);border-bottom-color:#878787}#main-navigation a:hover{background:linear-gradient(to bottom,#f2f2f2,#acaeb1)}#main-navigation a:hover,#main-navigation a.active{border-bottom-color:#6b6b6b;color:#c70f19}#main-navigation .icon{text-shadow:1px 1px 1px #101a22}#sidebar{border-color:#cedded;background:#101a22}#sidebar header{background:#00313d;color:#f9f1c9}#sidebar li{border-top-color:#cedded}#sidebar a{color:inherit}#sidebar a:hover{color:#f2eaca}.page-header{border-color:#878787}.alert-notification{background:#00313d;border-color:#cedded;color:#f9f1c9}.alert-notification a{color:#e8d9a1}.alert-notification a:hover{color:#f2eaca}.alert-danger{background:#f7dfdf;border-color:#dcb2b3;color:#af797d}.modules li{background:#101a22;border-color:#d3d7da;box-shadow:inset 1px 3px 8px -5px rgba(0,0,0,0.2)}.modules .button{background:linear-gradient(to bottom,white,#b9bbbd);border-bottom-color:#878787}.modules .button:hover{background:linear-gradient(to bottom,#f2f2f2,#acaeb1)}.modules .button:hover,.modules .button.active{border-bottom-color:#6b6b6b}.modules a{color:inherit}.table-wrapper{background:#101a22;border-color:#d3d7da}.table caption{border-bottom-color:#d3d7da}.table tbody tr{border-top-color:#d3d7da}.table tbody tr:nth-child(odd){background:#101a22}.table tbody tr:nth-child(even){background:#101a22}.table tbody tr:hover{background:#00313d}.tfooter{border-top-color:#d3d7da}.content-tab-wrapper{background:#101a22;border-color:#d3d7da}.content-tab-wrapper .nav-tabs{background:#243b55;box-shadow:inset -1px -2px 6px -5px rgba(0,0,0,0.2)}.content-tab-wrapper .nav-tabs>li>a{border-right-color:#d3d7da!important;color:inherit}.content-tab-wrapper .nav-tabs>li>a:hover{background:#1c2f43}.content-tab-wrapper .nav-tabs .active a{background:#101a22!important}.content-tab-wrapper .nav-tabs .active a:focus{color:inherit}thead.dark{background:linear-gradient(to bottom,#2b556d,#1c394e)!important;color:#dfdfdf}thead.dark tr:nth-child(2){background:linear-gradient(to bottom,white,#b9bbbd)!important}#footer{border-top-color:#d3d7da}.pushy{background:#101a22}.pushy ul.subnavi li a:hover{background:0}.pushy a:hover,.pushy a.active{background:#101a22;color:inherit}@media screen and (max-width:860px){#main-navigation a{border-right-color:#d3d7da;border-bottom-color:#d3d7da}#main-navigation a.active{border-right-color:#d3d7da;border-bottom-color:#d3d7da}#main-navigation a:hover{border-bottom-color:#d3d7da}} \ No newline at end of file diff --git a/interface/web/themes/default/assets/stylesheets/themes/default/theme.css b/interface/web/themes/default/assets/stylesheets/themes/default/theme.css index b0bedb1..4ddf824 100644 --- a/interface/web/themes/default/assets/stylesheets/themes/default/theme.css +++ b/interface/web/themes/default/assets/stylesheets/themes/default/theme.css @@ -146,6 +146,10 @@ background: linear-gradient(to bottom, #57646d, #3e474e) !important; color: white; } +thead.dark tr:nth-child(2) { + background: linear-gradient(to bottom, #FAFAFA, #E8EBEE) !important; } + + #footer { border-top-color: #d3d7da; } diff --git a/interface/web/themes/default/assets/stylesheets/themes/default/theme.min.css b/interface/web/themes/default/assets/stylesheets/themes/default/theme.min.css index 1cc932c..d168603 100644 --- a/interface/web/themes/default/assets/stylesheets/themes/default/theme.min.css +++ b/interface/web/themes/default/assets/stylesheets/themes/default/theme.min.css @@ -1 +1 @@ -html,body{-webkit-tap-highlight-color:black}body{background:#f2f5f7;color:#3c444b}.green{color:#3cb355}.form-control:focus{border-color:#698296}.formbutton-default{background:linear-gradient(to bottom,white,#eef0f2);border-bottom-color:#ccc;color:#3c444b}.formbutton-default:hover{background:linear-gradient(to bottom,#fafafa,#e8ebee)}.formbutton-default:hover,.formbutton-default.active{border-bottom-color:#adadad}.formbutton-success{background:linear-gradient(to bottom,#7bcc89,#6ab977);border-color:#5aab68;border-bottom-color:#5aab68;color:white}.formbutton-success:hover{background:linear-gradient(to bottom,#74c982,#63b671)}.formbutton-success:hover,.formbutton-success.active{border-bottom-color:#509b5a;color:white}.formbutton-danger{background:linear-gradient(to bottom,#c70f19,#b60008);border-color:#980b13;border-bottom-color:#980b13;color:white}.formbutton-danger:hover{background:linear-gradient(to bottom,#c30b15,#b20004)}.formbutton-danger:hover,.formbutton-danger.active{border-bottom-color:#8f0209;color:white}#searchform button{background:linear-gradient(to bottom,white,#eef0f2)}#searchform button:hover{background:linear-gradient(to bottom,#fafafa,#e8ebee)}#logout-button{background:#c70f19;border-bottom-color:#980b13}#logout-button:hover{background:#df111c;border-bottom-color:#800a10}#main-navigation a{background:linear-gradient(to bottom,white,#eef0f2);border-bottom-color:#ccc}#main-navigation a:hover{background:linear-gradient(to bottom,#fafafa,#e8ebee)}#main-navigation a:hover,#main-navigation a.active{border-bottom-color:#adadad;color:#c70f19}#main-navigation .icon{text-shadow:1px 1px 1px white}#sidebar{border-color:#cedded;background:white}#sidebar header{background:#dfeaf6;color:#698296}#sidebar li{border-top-color:#cedded}#sidebar a{color:inherit}#sidebar a:hover{color:#428bde}.page-header{border-color:#ccc}.alert-notification{background:#dfeaf6;border-color:#cedded;color:#698296}.alert-notification a{color:#2371ca}.alert-notification a:hover{color:#428bde}.alert-danger{background:#f7dfdf;border-color:#dcb2b3;color:#95686b}.modules li{background:#e1e4e9;border-color:#d3d7da;box-shadow:inset 1px 3px 8px -5px rgba(0,0,0,0.2)}.modules .button{background:linear-gradient(to bottom,white,#eef0f2);border-bottom-color:#ccc}.modules .button:hover{background:linear-gradient(to bottom,#fafafa,#e8ebee)}.modules .button:hover,.modules .button.active{border-bottom-color:#adadad}.modules a{color:inherit}.table-wrapper{background:white;border-color:#d3d7da}.table caption{border-bottom-color:#d3d7da}.table tbody tr{border-top-color:#d3d7da}.table tbody tr:nth-child(odd){background:#f2f5f7}.table tbody tr:nth-child(even){background:white}.table tbody tr:hover{background:#dfeaf6}.tfooter{background:linear-gradient(to bottom,white,#eef0f2);border-top-color:#d3d7da}.content-tab-wrapper{background:white;border-color:#d3d7da}.content-tab-wrapper .nav-tabs{background:#eef0f2;box-shadow:inset -1px -2px 6px -5px rgba(0,0,0,0.2)}.content-tab-wrapper .nav-tabs>li>a{border-right-color:#d3d7da!important;color:inherit}.content-tab-wrapper .nav-tabs>li>a:hover{background:#e0e3e7}.content-tab-wrapper .nav-tabs .active a{background:white!important}thead.dark{background:linear-gradient(to bottom,#57646d,#3e474e)!important;color:white}#footer{border-top-color:#d3d7da}.pushy{background:#f2f5f7}.pushy ul.subnavi li a:hover{background:0}.pushy a:hover,.pushy a.active{background:#f2f5f7;color:inherit}@media screen and (max-width:860px){#main-navigation a{border-right-color:#d3d7da;border-bottom-color:#d3d7da}#main-navigation a.active{border-right-color:#d3d7da;border-bottom-color:#d3d7da}#main-navigation a:hover{border-bottom-color:#d3d7da}} \ No newline at end of file +html,body{-webkit-tap-highlight-color:black}body{background:#f2f5f7;color:#3c444b}.green{color:#3cb355}.form-control:focus{border-color:#698296}.formbutton-default{background:linear-gradient(to bottom,white,#eef0f2);border-bottom-color:#ccc;color:#3c444b}.formbutton-default:hover{background:linear-gradient(to bottom,#fafafa,#e8ebee)}.formbutton-default:hover,.formbutton-default.active{border-bottom-color:#adadad}.formbutton-success{background:linear-gradient(to bottom,#7bcc89,#6ab977);border-color:#5aab68;border-bottom-color:#5aab68;color:white}.formbutton-success:hover{background:linear-gradient(to bottom,#74c982,#63b671)}.formbutton-success:hover,.formbutton-success.active{border-bottom-color:#509b5a;color:white}.formbutton-danger{background:linear-gradient(to bottom,#c70f19,#b60008);border-color:#980b13;border-bottom-color:#980b13;color:white}.formbutton-danger:hover{background:linear-gradient(to bottom,#c30b15,#b20004)}.formbutton-danger:hover,.formbutton-danger.active{border-bottom-color:#8f0209;color:white}#searchform button{background:linear-gradient(to bottom,white,#eef0f2)}#searchform button:hover{background:linear-gradient(to bottom,#fafafa,#e8ebee)}#logout-button{background:#c70f19;border-bottom-color:#980b13}#logout-button:hover{background:#df111c;border-bottom-color:#800a10}#main-navigation a{background:linear-gradient(to bottom,white,#eef0f2);border-bottom-color:#ccc}#main-navigation a:hover{background:linear-gradient(to bottom,#fafafa,#e8ebee)}#main-navigation a:hover,#main-navigation a.active{border-bottom-color:#adadad;color:#c70f19}#main-navigation .icon{text-shadow:1px 1px 1px white}#sidebar{border-color:#cedded;background:white}#sidebar header{background:#dfeaf6;color:#698296}#sidebar li{border-top-color:#cedded}#sidebar a{color:inherit}#sidebar a:hover{color:#428bde}.page-header{border-color:#ccc}.alert-notification{background:#dfeaf6;border-color:#cedded;color:#698296}.alert-notification a{color:#2371ca}.alert-notification a:hover{color:#428bde}.alert-danger{background:#f7dfdf;border-color:#dcb2b3;color:#95686b}.modules li{background:#e1e4e9;border-color:#d3d7da;box-shadow:inset 1px 3px 8px -5px rgba(0,0,0,0.2)}.modules .button{background:linear-gradient(to bottom,white,#eef0f2);border-bottom-color:#ccc}.modules .button:hover{background:linear-gradient(to bottom,#fafafa,#e8ebee)}.modules .button:hover,.modules .button.active{border-bottom-color:#adadad}.modules a{color:inherit}.table-wrapper{background:white;border-color:#d3d7da}.table caption{border-bottom-color:#d3d7da}.table tbody tr{border-top-color:#d3d7da}.table tbody tr:nth-child(odd){background:#f2f5f7}.table tbody tr:nth-child(even){background:white}.table tbody tr:hover{background:#dfeaf6}.tfooter{background:linear-gradient(to bottom,white,#eef0f2);border-top-color:#d3d7da}.content-tab-wrapper{background:white;border-color:#d3d7da}.content-tab-wrapper .nav-tabs{background:#eef0f2;box-shadow:inset -1px -2px 6px -5px rgba(0,0,0,0.2)}.content-tab-wrapper .nav-tabs>li>a{border-right-color:#d3d7da!important;color:inherit}.content-tab-wrapper .nav-tabs>li>a:hover{background:#e0e3e7}.content-tab-wrapper .nav-tabs .active a{background:white!important}thead.dark{background:linear-gradient(to bottom,#57646d,#3e474e)!important;color:white}thead.dark tr:nth-child(2){background:linear-gradient(to bottom,#fafafa,#e8ebee)!important}#footer{border-top-color:#d3d7da}.pushy{background:#f2f5f7}.pushy ul.subnavi li a:hover{background:0}.pushy a:hover,.pushy a.active{background:#f2f5f7;color:inherit}@media screen and (max-width:860px){#main-navigation a{border-right-color:#d3d7da;border-bottom-color:#d3d7da}#main-navigation a.active{border-right-color:#d3d7da;border-bottom-color:#d3d7da}#main-navigation a:hover{border-bottom-color:#d3d7da}} \ No newline at end of file diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm index d6c6977..8a9646c 100644 --- a/interface/web/themes/default/templates/main.tpl.htm +++ b/interface/web/themes/default/templates/main.tpl.htm @@ -47,10 +47,10 @@ <form action='#' method='get' id='searchform' role='form'> <div> <div> - <div class='input-group input-group-sm'> - <div class="col-sm-9"><input type="text" id='globalsearch' class="form-control" placeholder='Search' /> - </div><span class='input-group-btn'> - <button class='btn btn-default btn-sm' title='Search…'> + <div class='input-group'> + <input id='globalsearch' type='text' class='form-control' placeholder='Search' /> + <span class='input-group-btn'> + <button class='btn btn-default' title='Search…'> <span class='icon icon-lens'></span> </button> </span> @@ -112,14 +112,15 @@ } }); - /*$('#globalsearch').ispconfigSearch({ + $('#globalsearch').ispconfigSearch({ dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch', resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">', noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">', noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">', - searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">' + searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">', + resultBoxPosition: '' }); - */ + //$('.ttip').tipsy({live: true, gravity: 'ne', html: true}); tabChangeDiscard = '<tmpl_var name="tabchange_discard_enabled">'; diff --git a/interface/web/themes/default/templates/sidenav.tpl.htm b/interface/web/themes/default/templates/sidenav.tpl.htm index 7f59602..b2fda81 100644 --- a/interface/web/themes/default/templates/sidenav.tpl.htm +++ b/interface/web/themes/default/templates/sidenav.tpl.htm @@ -1,13 +1,13 @@ <tmpl_loop name="nav_left"> - <header><tmpl_if name="startpage"><a href="#" onclick="loadContent('<tmpl_var name='startpage'>')"></tmpl_if><tmpl_var name="title"><tmpl_if name="startpage"></a></tmpl_if></header> - <ul> + <header><tmpl_if name="startpage"><a href="#" data-load-content="<tmpl_var name='startpage'>"></tmpl_if><tmpl_var name="title"><tmpl_if name="startpage"></a></tmpl_if></header> + <ul id="sub-navigation"> <tmpl_loop name="items"> <li<tmpl_if name="html_id"> id='<tmpl_var name="html_id">' </tmpl_if>> <tmpl_if name="link"> <tmpl_if name="target" op="==" value="_blank"> <a href="<tmpl_var name='link'>" target="_blank"> <tmpl_else> - <a href="#" onclick="loadContent('<tmpl_var name='link'>')"> + <a href="#" data-load-content="<tmpl_var name='link'>"> </tmpl_if> <tmpl_else> <a href="#"> diff --git a/interface/web/themes/default/templates/topnav.tpl.htm b/interface/web/themes/default/templates/topnav.tpl.htm index cdb64fc..8637eaf 100644 --- a/interface/web/themes/default/templates/topnav.tpl.htm +++ b/interface/web/themes/default/templates/topnav.tpl.htm @@ -1,7 +1,7 @@ <!-- main navigation --> <nav id='main-navigation' class='btn-group btn-group-justified'> <tmpl_loop name="nav_top"> - <a href="#" class="btn btn-default <tmpl_if name="active">active"<tmpl_else>" onclick="capp('<tmpl_var name='module'>')"</tmpl_if> data-icon-class="icon-<tmpl_var name='module'>"> + <a href="#" class="btn btn-default <tmpl_if name="active">active"<tmpl_else>" data-capp="<tmpl_var name='module'>"</tmpl_if> data-icon-class="icon-<tmpl_var name='module'>"> <div class="icon icon-<tmpl_var name='module'>"></div> <div class="title"><tmpl_var name="title"></div> </a> -- Gitblit v1.9.1