From 85ab01a17a6bf26124124ef0ed55de13f077dca9 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Wed, 1 Feb 2012 15:40:05 +0000 Subject: [PATCH] remove content from unused sidebar --- Netdisco/public/css/netdisco.css | 65 +++++++++----------- Netdisco/public/images/crystalclear_mag.png | Bin 0 -> 1001 bytes Netdisco/public/javascripts/netdisco.js | 21 +++---- Netdisco/views/search.tt | 14 ++--- 4 files changed, 44 insertions(+), 56 deletions(-) create mode 100644 Netdisco/public/images/crystalclear_mag.png diff --git a/Netdisco/public/css/netdisco.css b/Netdisco/public/css/netdisco.css index f7e527dc..0bfe1db0 100644 --- a/Netdisco/public/css/netdisco.css +++ b/Netdisco/public/css/netdisco.css @@ -25,16 +25,6 @@ body { margin-bottom: 0px; } -/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -/* change highlighting for form fields which are being used in a search */ - -form .clearfix.success select { - background-color: #A9DBA9; -} -form .clearfix.success input { - background-color: #A9DBA9; -} - /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* results table links */ @@ -120,6 +110,25 @@ form .clearfix.success input { text-align: center; } +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +/* tabs */ + +#search_results { + margin-bottom: 10px; +} + +/* right hand side device label */ +.device_label_right { + float: right !important; + margin-bottom: -7px !important; + display: none; +} + +/* take a block element and force it inline */ +.inline { + display: inline !important; +} + /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* style customization for many items which appear in the sidebar */ @@ -144,16 +153,6 @@ form .clearfix.success input { margin-left: -2px !important; } -/* search/filter button placement */ -.nd_search { - margin-top: 15px; -} - -/* placement of the search/filter bookmark link icon */ -.nd_bookmark { - vertical-align: top; -} - /* nudge the port name/vlan filter over a little */ .nd_port_query { margin-left: -2px !important; @@ -172,6 +171,14 @@ so that its tooltip takes prescedence over the field tooltip */ padding: 6px; } +/* change highlighting for form fields which are being used in a search */ +form .clearfix.success select { + background-color: #A9DBA9; +} +form .clearfix.success input { + background-color: #A9DBA9; +} + /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* device and ip label in sidebar */ @@ -186,27 +193,13 @@ h3.device_label { color: #660033; } -/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -/* right hand side device label */ - -.device_label_right { - float: right !important; - margin-bottom: -7px !important; - display: none; -} - -/* take a block element and force it inline */ -.inline { - display: inline !important; -} - /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* sidebar collapser */ /* for placing the sidebar toggle icons */ #sidebar_toggle_img_in { float: left; - margin-top: -6px; + margin-top: -9px; margin-left: -18px; cursor: pointer; } @@ -241,7 +234,7 @@ h3.device_label { /* nudge content in the sidebar closer to the left */ .nd_sidesearchform { padding-left: 0px; - margin-top: -7px; + margin-top: -9px; margin-bottom: 0px; } diff --git a/Netdisco/public/images/crystalclear_mag.png b/Netdisco/public/images/crystalclear_mag.png new file mode 100644 index 0000000000000000000000000000000000000000..0773220bd76e33af99d32c4b55f437802bf7eb3d GIT binary patch literal 1001 zcmV6g}EEfmIod5s-3u7|?Ab^+{7?`vF z$QUsE6%hRO`W*w~n{NyZuYWQyzW%|$^!7Ug!%I%F?_W6tHP~1fL;n5y$MEmpe-sQ5 zKrBE0v*{jsAan7%1cS(bIR@chzZe)GWm{m1a@B9o(|DN0Y{PlY# z6C)#v3jhL$<E<-CicI77(RXd{{I&0hTqBxE&j>uE4BYRWP&3vx3seEz|} zASBH2m;L{D5$U%Nx!-;Ivx)1^Lk8}DuNeL@GDCC&%>f7?mY;wAcXK>D?ay*c!cD@` zai69D>n{nQJ#SbU{(pG$RpRrzV{R}^Y|0+?eZJZ%-As6!^kh~boZ_3DYV3{sO}P z0tEm60RjO300IC4h|$3z6=)PAC~!pBSXsh3IXSI4IN1a_*g0;ov9WIY`s3$)o)5>T z6ohhmDqF}iJYKVK_Rmj0GnrYK|AJfq5I`)jz+hx#d;{c9{r%_9ROa8zKm&g>uyS%U z2)*0HAoA|`Db8oYp3L0F3{s(Ksn1r;Wcc~{R|YdP^FM$9VpdQvhPi+ND8RtN!otAH z3c{=mY;5cdJg@gN{P^w z0S#b(e~y9W*M~nJf3xkp_wbvT{P%MvLM9Fj{HkikpKe`Y1qdJ_3^>EU^y32q(9i$A z{AAg2_u)5jx$hTEzWo(pIQhltA3y-HFpvO%KKt|TJ6q1e%^yEJ<$t61UCewAK!5=N X4=huN1%kC?00000NkvXXu0mjf*W~4) literal 0 HcmV?d00001 diff --git a/Netdisco/public/javascripts/netdisco.js b/Netdisco/public/javascripts/netdisco.js index 95b2dee9..3840d64a 100644 --- a/Netdisco/public/javascripts/netdisco.js +++ b/Netdisco/public/javascripts/netdisco.js @@ -3,7 +3,6 @@ function do_search (event, tab) { var form = '#' + tab + '_form'; var target = '#' + tab + '_pane'; - var mark = '#' + tab + '_bookmark'; // stop form from submitting normally event.preventDefault(); @@ -48,8 +47,6 @@ function do_search (event, tab) { '

No matching records.

' ); } - // looks good, update the bookmark for this search - $(mark).attr('href', uri_base + '/' + path + '?' + query); inner_view_processing(); } @@ -146,22 +143,22 @@ $(document).ready(function() { var from_li = $('.tabs').find('> .active').first(); var to_li = $(this).parent('li') - from_li.removeClass('active'); - to_li.addClass('active'); + from_li.toggleClass('active'); + to_li.toggleClass('active'); - var from = from_li.find('a').attr('href'); - var to = $(this).attr('href'); + var from_id = from_li.find('a').attr('href'); + var to_id = $(this).attr('href'); - if (from == to) { + if (from_id == to_id) { return; } - $(from).toggleClass('active'); - $(to).toggleClass('active'); + $(from_id).toggleClass('active'); + $(to_id).toggleClass('active'); update_content( - from.replace(/^#/,"").replace(/_pane$/,""), - to.replace(/^#/,"").replace(/_pane$/,"") + from_id.replace(/^#/,"").replace(/_pane$/,""), + to_id.replace(/^#/,"").replace(/_pane$/,"") ); }); }); diff --git a/Netdisco/views/search.tt b/Netdisco/views/search.tt index 4042d346..7e424211 100644 --- a/Netdisco/views/search.tt +++ b/Netdisco/views/search.tt @@ -11,16 +11,14 @@ [% FOREACH tab IN vars.tabs %] [% END %]