From cc8245ea8b8153db3b360d0a95e4c5bf4630b574 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Mon, 30 Jan 2012 18:58:32 +0000
Subject: [PATCH 01/15] ignore logs which appear

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index fdd66ca4..11380624 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 Netdisco/environments/development.yml
+Netdisco/logs/development.yml
 test.pl

From f03f907168ef8f5a4a233562ffac1a007d8a65a2 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Mon, 30 Jan 2012 19:03:02 +0000
Subject: [PATCH 02/15] change text in navbar search

---
 Netdisco/views/layouts/main.tt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Netdisco/views/layouts/main.tt b/Netdisco/views/layouts/main.tt
index 38a8d13d..02ff9ab1 100644
--- a/Netdisco/views/layouts/main.tt
+++ b/Netdisco/views/layouts/main.tt
@@ -58,7 +58,7 @@
         [% END %]
       </ul>
       <form method="get" action="[% uri_for('/search') %]">
-        <input placeholder="Device, Node or VLAN Search" class="span5" name="q" type="text"/>
+        <input placeholder="Find Anything" class="span5" name="q" type="text"/>
       </form>
       <ul class="nav secondary-nav">
         <li class="menu">

From 9eb4b5331f9725c8137eaa2b2e2f650cb820040a Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Mon, 30 Jan 2012 19:27:11 +0000
Subject: [PATCH 03/15] rename and reorganise stylesheeets

---
 .../public/css/{print.css => nd_print.css}    |   0
 .../public/css/{style.css => netdisco.css}    | 197 ++++++++++--------
 Netdisco/views/layouts/main.tt                |   4 +-
 3 files changed, 114 insertions(+), 87 deletions(-)
 rename Netdisco/public/css/{print.css => nd_print.css} (100%)
 rename Netdisco/public/css/{style.css => netdisco.css} (76%)

diff --git a/Netdisco/public/css/print.css b/Netdisco/public/css/nd_print.css
similarity index 100%
rename from Netdisco/public/css/print.css
rename to Netdisco/public/css/nd_print.css
diff --git a/Netdisco/public/css/style.css b/Netdisco/public/css/netdisco.css
similarity index 76%
rename from Netdisco/public/css/style.css
rename to Netdisco/public/css/netdisco.css
index b0e5d1a3..e0f98a54 100644
--- a/Netdisco/public/css/style.css
+++ b/Netdisco/public/css/netdisco.css
@@ -1,28 +1,13 @@
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* for the fixed navbar make sure content stops short of page top*/
+
 body {
   padding-top: 50px;
 }
 
-/* the bootstrap style is only set for input so set for select too*/
-/* also make the green a little more visible */
-form .clearfix.success select {
-  border-color: green;
-}
-form .clearfix.success input {
-  border-color: green;
-}
-
-/* make the sidebar less wide */
-.well {
-  margin-right: 15px;
-}
-
-/* make the content start more to the left now the sidebar is narrower */
-.nd_content {
-  margin-left: 225px !important;
-}
-
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* various styles to adjust the hero box used for homepage + login */
+
 .nd_loginalert {
   margin-top: -40px;
 }
@@ -40,17 +25,19 @@ form .clearfix.success input {
   margin-bottom: 0px;
 }
 
-/* nudge content closer to the header labels in the sidebar */
-.inputs-list:first-child {
-  padding-top: 4px !important;
-}
-
-/* colour for device name and ip in sidebar */
-.device_label {
-  color: #660033;
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* 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;
 }
 
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* right hand side device label */
+
 .device_label_right {
   float: right !important;
   margin-bottom: -7px !important;
@@ -62,45 +49,9 @@ form .clearfix.success input {
   display: inline !important;
 }
 
-/* nudge content in the sidebar closer to the left */
-.nd_sidesearchform {
-  padding-left: 0px;
-  margin-bottom: 0px;
-  /* margin-top: 8px; */
-}
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* results table links */
 
-/* fixups for prepended checkbox in sidebar */
-.nd_searchcheckbox {
-  width: 120px;
-  padding-left: 35px;
-  cursor: pointer;
-}
-
-/* placement of the search/filter bookmark link icon */
-.nd_bookmark {
-  vertical-align: top;
-}
-
-/* fixups for placing the Archived "A" inside the prepended checkbox */
-.nd_legendlabel {
-  float: right;
-  line-height: 1.2;
-  margin-top: 2px;
-  margin-right: 3px;
-}
-
-/* somewhere between span1 and span2 is desirable */
-.nd_days_select {
-  width: 56px;
-  margin-left: -2px !important;
-}
-
-/* search/filter button placement */
-.nd_search {
-  margin-top: 15px;
-}
-
-/* results table links with no decoration */
 .nd_stealthlink {
   text-decoration: none !important;
   color: #404040;
@@ -113,6 +64,9 @@ form .clearfix.success input {
   height: 100%;
 }
 
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* many styles for the collapsing lists */
+
 /* mouse-over should be pointer to show JS collapser is clickable */
 .nd_collapser {
   cursor: pointer;
@@ -148,6 +102,11 @@ form .clearfix.success input {
   border-top: 8px solid #F89406;
 }
 
+/* for the tagged vlans total when hiding the full list */
+.vlan_total {
+  float: right;
+}
+
 /* draw little up arrow to the right of a label for collapsed list */
 .cell-arrow-up {
   float: left;
@@ -168,21 +127,82 @@ form .clearfix.success input {
   border-top: 8px solid #F89406;
 }
 
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* for table to center cell content */
+
+.center_cell {
+  text-align: center;
+}
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* style customization for many items which appear in the sidebar */
+
+/* fixups for prepended checkbox in sidebar */
+.nd_searchcheckbox {
+  width: 120px;
+  padding-left: 35px;
+  cursor: pointer;
+}
+
+/* fixups for placing the Archived "A" inside the prepended checkbox */
+.nd_legendlabel {
+  float: right;
+  line-height: 1.2;
+  margin-top: 2px;
+  margin-right: 3px;
+}
+
+/* somewhere between span1 and span2 is desirable */
+.nd_days_select {
+  width: 56px;
+  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;
 }
 
-/* for ports table to center cell content */
-.center_cell {
-  text-align: center;
+/* little sweep brush inside of port filter input field */
+.field_clear_icon {
+  position: absolute;
+  margin-left: 132px;
+  z-index: 1;
 }
 
-/* for the tagged vlans total when hiding the full list */
-.vlan_total {
-  float: right;
+/* make the sweep icon fill the height of the input field
+so that its tooltip takes prescedence over the field tooltip */
+.field_clear_icon > img {
+  padding: 6px;
 }
 
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* device and ip label in sidebar */
+
+/* pull the device label closer to the top of the sidebar
+to reduce the useless gap */
+h3.device_label {
+  margin-top: -12px;
+}
+
+/* colour for device name and ip in sidebar */
+.device_label {
+  color: #660033;
+}
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* sidebar collapser */
+
 /* for placing the sidebar toggle icons */
 #sidebar_toggle_img_in {
   margin-top: -10px;
@@ -200,11 +220,8 @@ form .clearfix.success input {
   display: none;
 }
 
-/* pull the device label closer to the top of the sidebar
-to reduce the useless gap */
-h3.device_label {
-  margin-top: -12px;
-}
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* sidebar placement and sizing */
 
 /* make the sidebar fixed on the screen */
 .sidebar {
@@ -212,15 +229,25 @@ h3.device_label {
   margin-top: 50px;
 }
 
-/* little sweep brush inside of port filter input field */
-.field_clear_icon {
-  position: absolute;
-  margin-left: 132px;
-  z-index: 1;
+/* make the sidebar less wide */
+.well {
+  margin-right: 15px;
 }
 
-/* make the sweep icon fill the height of the input field
-so that its tooltip takes prescedence over the field tooltip */
-.field_clear_icon > img {
-  padding: 6px;
+/* make the content start more to the left now the sidebar is narrower */
+.nd_content {
+  margin-left: 225px !important;
 }
+
+/* nudge content closer to the header labels in the sidebar */
+.inputs-list:first-child {
+  padding-top: 4px !important;
+}
+
+/* nudge content in the sidebar closer to the left */
+.nd_sidesearchform {
+  padding-left: 0px;
+  margin-bottom: 0px;
+}
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Netdisco/views/layouts/main.tt b/Netdisco/views/layouts/main.tt
index 02ff9ab1..3dc65f17 100644
--- a/Netdisco/views/layouts/main.tt
+++ b/Netdisco/views/layouts/main.tt
@@ -25,8 +25,8 @@
   <script type="text/javascript" src="[% uri_base %]/javascripts/netdisco.js"></script>
 
   <link rel="stylesheet" href="[% uri_base %]/css/bootstrap.min.css">
-  <link rel="stylesheet" href="[% uri_base %]/css/style.css">
-  <link rel="stylesheet" href="[% uri_base %]/css/print.css" media="print">
+  <link rel="stylesheet" href="[% uri_base %]/css/netdisco.css">
+  <link rel="stylesheet" href="[% uri_base %]/css/nd_print.css" media="print">
 </head>
 
 <body>

From e7b390dca54bc50c8daf1c2dd8a4b23992c87ffa Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Tue, 31 Jan 2012 15:44:07 +0000
Subject: [PATCH 04/15] fix filename

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 11380624..ab21a5e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 Netdisco/environments/development.yml
-Netdisco/logs/development.yml
+Netdisco/logs/development.log
 test.pl

From c7bae9b6385e744f7c77a3f68b4d934bf590f8fb Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Tue, 31 Jan 2012 16:59:55 +0000
Subject: [PATCH 05/15] first impl. of RHS sidebar

---
 Netdisco/bin/netdisco-web.pl                  |   5 ++
 Netdisco/public/css/netdisco.css              |  65 +++++++++---------
 Netdisco/public/images/diagona_settings.png   | Bin 0 -> 819 bytes
 .../public/images/dusseldorf_settings.png     | Bin 0 -> 671 bytes
 Netdisco/public/javascripts/netdisco.js       |   4 +-
 Netdisco/views/device.tt                      |   9 +--
 Netdisco/views/search.tt                      |  15 ++--
 Netdisco/views/sidebar/device/ports.tt        |   8 +--
 Netdisco/views/sidebar/search/device.tt       |  16 ++---
 9 files changed, 64 insertions(+), 58 deletions(-)
 create mode 100644 Netdisco/public/images/diagona_settings.png
 create mode 100644 Netdisco/public/images/dusseldorf_settings.png

diff --git a/Netdisco/bin/netdisco-web.pl b/Netdisco/bin/netdisco-web.pl
index 114ae861..68be4634 100755
--- a/Netdisco/bin/netdisco-web.pl
+++ b/Netdisco/bin/netdisco-web.pl
@@ -1,4 +1,9 @@
 #!/usr/bin/env perl
+
+# use lib '/root/perl-profiles/netdisco-web/lib/perl5';
+use local::lib '/srv/www/vhosts/netdisco.ecmwf.int/perl-profiles/netdisco-web';
+use lib '/srv/www/vhosts/netdisco.ecmwf.int/Netdisco/lib';
+
 use Dancer;
 use Netdisco::Web;
 dance;
diff --git a/Netdisco/public/css/netdisco.css b/Netdisco/public/css/netdisco.css
index e0f98a54..5cec14ae 100644
--- a/Netdisco/public/css/netdisco.css
+++ b/Netdisco/public/css/netdisco.css
@@ -35,20 +35,6 @@ form .clearfix.success input {
   background-color: #A9DBA9;
 }
 
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-/* 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;
-}
-
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* results table links */
 
@@ -200,13 +186,28 @@ 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 {
-  margin-top: -10px;
-  margin-left: 164px;
+  float: right;
+  margin-top: -7px;
+  margin-right: -16px;
   cursor: pointer;
 }
 
@@ -214,7 +215,7 @@ h3.device_label {
 #sidebar_toggle_img_out {
   position: fixed;
   top: 60px;
-  left: 4px;
+  right: 7px;
   z-index: 1;
   cursor: pointer;
   display: none;
@@ -224,19 +225,25 @@ h3.device_label {
 /* sidebar placement and sizing */
 
 /* make the sidebar fixed on the screen */
-.sidebar {
-  position: fixed !important;
+.container-fluid > .sidebar {
+  position: fixed;
   margin-top: 50px;
-}
-
-/* make the sidebar less wide */
-.well {
-  margin-right: 15px;
+  right: 20px;
+  width: 200px;
+  left: auto;
 }
 
 /* make the content start more to the left now the sidebar is narrower */
-.nd_content {
-  margin-left: 225px !important;
+.container-fluid > .content {
+  margin-right: 220px;
+  margin-left: 0px;
+}
+
+/* nudge content in the sidebar closer to the left */
+.nd_sidesearchform {
+  padding-left: 0px;
+  margin-top: -7px;
+  margin-bottom: 0px;
 }
 
 /* nudge content closer to the header labels in the sidebar */
@@ -244,10 +251,4 @@ h3.device_label {
   padding-top: 4px !important;
 }
 
-/* nudge content in the sidebar closer to the left */
-.nd_sidesearchform {
-  padding-left: 0px;
-  margin-bottom: 0px;
-}
-
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Netdisco/public/images/diagona_settings.png b/Netdisco/public/images/diagona_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..6587d5bc382a253d526c8cc0668ddefc275e87cc
GIT binary patch
literal 819
zcmV-31I+x1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!)k#D_RCwBKQ(Z_DQ4~Hiv+Inzv$?xw
zth$!wL%L?JzZHaQJq0}^NGA4B5|vPz^jJs)6&6ZK5LC4Nkm8euMcYgMfLQ2;{i#px
z8e5{4yH>jF|8&l+T}r%g=FYv}`Of{$Irnnke2cJllowYR)k*3lffpbei$XXQP9L8b
zn_ug<QJ)5?_@b=1ypZF#bBdz0RP3xMoOREFD2fma1|c^$w+!(i#BU+q>6{pU7w4(|
zo@kY2d4T76Lo62CyYg#gK$0XNLlXG?{u;zP5#OrBl!NGRLq#7G0W!^*mr$l5Nlb!B
zB(lZp^)^VN1Q-l>j)#SXg<}{1)M_<^f+2%$gRTu}2Z+nl=fNZUO4jBqP^nZ*HW|lr
zEC9{4CN+fPVPJoF-yctbGn>sOYq52kwZ!^#cyL&cGC^<9!^u-8Am5S?(^J!M_s%_7
z_ARr3He2P-Pm`0?&N1h-$K#pja&mGMQ4&FutN|%mVo@)&p8t-8JdVF3XnRISM(x+y
zuBQ?f2n47m5DWyt<#KVnMymm>RtthkU?+q^AuyRtMD9oP(k$!bX4)rQ5CrB=JXQnB
zi;SdWi>Qcjy7A0^{l0SfD%&TV{Nfx|1GmSm%*}m;!B<1j*W1S&!{P9v&+9w-Ve0+M
z9hRc~##G~DB%~3k=1>jTswyEPBNMXC*&Hv+TK(#(zsm8#;Uh8)JZTeF-BD6hs$g9l
zC_Rn#34h-I%uD{nV+!ah?<(Kjh0*I-`?x>ti$<eNGOa1^c#3p0BjHH*8|UjIbd}jX
z=(y3YOG!y#L@XfG)z>9*rMdQSE!!uY{5o#7>k<Vb1!$$iBSSx$TbdNt=b4$l{$6`t
zex6dWy+EP4yQk~P>=*Y8;p9jD#3M!V$Mn`xVA+Ru7XO=2w-xhkAo-Lxwzvmd*VuZo
x^)}+2<e#{S>pf>2Mzp1W*6C>LKIh*83;@qaL3_RFF0%jt002ovPDHLkV1n@Liedl&

literal 0
HcmV?d00001

diff --git a/Netdisco/public/images/dusseldorf_settings.png b/Netdisco/public/images/dusseldorf_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..92692173f2f90048e34c576185e563e8bae76cf8
GIT binary patch
literal 671
zcmV;Q0$}}#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!F-b&0RCwB?
zQ@M&FQ53!9)*>qI7`QZu3L-RuilCqkhUWf&m>L?Y|6pR+p_zf9;0y|_C`e=Gnkb07
zk+@Hthsq2y9nFJVb?V-8Ufp`<7FQ?~=$n=0BXh^O`}1E*aJ^nB8jTWv&+<_PzCUNa
z!BueYn7DjC|9qRz=cD0pNE(fX)M_<pwOYE}ZnR#nX|vg|yUk{!R;%^wN_4qg@DTQT
zy`<CWNU2mZ;$pF27z-F1TCG-+NF?O(c&OcOhuJ4!gIFx~-tYHmzu%KUAYf#>-A-b$
zm<2F$sDT46G|-C9=QDeYLZP7fd`^13o?c#FsL^Opy<TUvP$)!!K!6U11M3D{ENBJ%
zC0i^OZ%Cpj6bjKE;zv52<`BThq4wAS8fdXWCLWKI(P$*I*-Rplh`QY_rBbQ)hgHDH
zp#~1P&_F9XolZ2FO#blp(c-^y;KLCFurL@5a)ZGjf)k%kr(`e~NG_Mt=jUg{;c$FF
zR4$jRZnyhYDwVSCaCo&^4RerVXOKuFxaD%mguC62+2wM%B9%(zh5$wmHE_U%2HK|!
zI2@D7#2lE-X3REB8y4C{P9~GF4PfKL1)<;Xr)INRbvm7|7^cx^#K^r~kB-M9v-a!j
zi&==)`A?zkc1xvFDZ)?b$72$I@-{_)$Kx@3yGo^^-)CgCS`mL%to=@>!!*xH42Q#6
z{+@&1Z*Om$#bSZ?>}Np$BZnF|;NCUFC6mej`kj9XFaSwhX{AU2>Rtc<002ovPDHLk
FV1ixiH`D+C

literal 0
HcmV?d00001

diff --git a/Netdisco/public/javascripts/netdisco.js b/Netdisco/public/javascripts/netdisco.js
index 25cc2a5d..7ae94887 100644
--- a/Netdisco/public/javascripts/netdisco.js
+++ b/Netdisco/public/javascripts/netdisco.js
@@ -120,7 +120,7 @@ $(document).ready(function() {
       $('.sidebar').toggle(
         function() {
           $('#sidebar_toggle_img_out').toggle();
-          $('.nd_content').animate({'margin-left': '5px !important'}, 100);
+          $('.content').animate({'margin-right': '10px !important'}, 100);
           $('.device_label_right').toggle();
         }
       );
@@ -129,7 +129,7 @@ $(document).ready(function() {
   $('#sidebar_toggle_img_out').click(
     function() {
       $('#sidebar_toggle_img_out').toggle();
-      $('.nd_content').animate({'margin-left': '225px !important'}, 200,
+      $('.content').animate({'margin-right': '220px !important'}, 200,
         function() {
           $('.device_label_right').toggle();
           $('.sidebar').toggle(200);
diff --git a/Netdisco/views/device.tt b/Netdisco/views/device.tt
index a072abe7..ac78aad8 100644
--- a/Netdisco/views/device.tt
+++ b/Netdisco/views/device.tt
@@ -1,11 +1,12 @@
 <img class="sidebar_toggle" id="sidebar_toggle_img_out"
-  src="[% uri_base %]/images/splashyfish_right.png"/>
+  src="[% uri_base %]/images/dusseldorf_settings.png"
+  rel="twipsy" data-placement="left" data-offset="5" title="Show Options"/>
 <div class="container-fluid">
   <div class="sidebar">
     <div class="well">
       <img class="sidebar_toggle" id="sidebar_toggle_img_in"
-        src="[% uri_base %]/images/splashyfish_left.png"
-        rel="twipsy" data-placement="below" data-offset="5" title="Hide Sidebar"/>
+        src="[% uri_base %]/images/splashyfish_right.png"
+        rel="twipsy" data-placement="left" data-offset="5" title="Hide"/>
       <h3 class="device_label">[% d.ip %]</h3>
       [% IF d.dns %]
       <p class="device_label">[% d.dns.remove(settings.domain_suffix) %]</p>
@@ -20,7 +21,7 @@
     </div>
   </div>
 
-  <div class="nd_content content">
+  <div class="content">
     <ul id="search_results" class="tabs" data-tabs="on">
       [% FOREACH tab IN vars.tabs %]
       <li[% ' class="active"' IF params.tab == tab.id %]><a id="[% tab.id %]_link" href="#[% tab.id %]_pane">[% tab.label %]</a></li>
diff --git a/Netdisco/views/search.tt b/Netdisco/views/search.tt
index 1c092c4f..17183a31 100644
--- a/Netdisco/views/search.tt
+++ b/Netdisco/views/search.tt
@@ -1,24 +1,23 @@
 <img class="sidebar_toggle" id="sidebar_toggle_img_out"
-  src="[% uri_base %]/images/splashyfish_right.png"/>
+  src="[% uri_base %]/images/dusseldorf_settings.png"
+  rel="twipsy" data-placement="left" data-offset="5" title="Show Search Options"/>
 <div class="container-fluid">
   <div class="sidebar">
     <div class="well">
       <img class="sidebar_toggle" id="sidebar_toggle_img_in"
-        src="[% uri_base %]/images/splashyfish_left.png"
-        rel="twipsy" data-placement="below" data-offset="5" title="Hide Sidebar"/>
+        src="[% uri_base %]/images/splashyfish_right.png"
+        rel="twipsy" data-placement="left" data-offset="5" title="Hide"/>
       <div class="tab-content">
         [% FOREACH tab IN vars.tabs %]
         <div id="[% tab.id %]_search" class="tab-pane [% 'active' IF params.tab == tab.id %]">
           <form id="[% tab.id %]_form" class="nd_sidesearchform form-stacked" method="get" action="[% uri_for('/search') %]">
-            <div class="clearfix">
-              <input class="span3" name="q" value="[% params.q %]" type="text"/>
-            </div>
             [%+ TRY %][% INCLUDE "sidebar/search/${tab.id}.tt" %][% CATCH %]<!-- no "[% tab.id %]" search options -->[% END %]
+            <input name="q" value="[% params.q %]" type="hidden"/>
             <input name="tab" value="[% tab.id %]" type="hidden"/>
             <div class="nd_search clearfix">
               <button id="[% tab.id %]_submit" type="submit" class="btn info">Search Again</button>
               <a id="[% tab.id %]_bookmark" href="#"
-                rel="twipsy" data-placement="right" data-offset="5" title="Bookmark this Search">
+                rel="twipsy" data-placement="left" data-offset="5" title="Bookmark this Search">
                 <img class="nd_bookmark" src="[% uri_base %]/images/glyphicons_072_bookmark.png">
               </a>
             </div>
@@ -29,7 +28,7 @@
     </div>
   </div>
 
-  <div class="nd_content content">
+  <div class="content">
     <ul id="search_results" class="tabs" data-tabs="on">
       [% FOREACH tab IN vars.tabs %]
       <li[% ' class="active"' IF params.tab == tab.id %]><a id="[% tab.id %]_link" href="#[% tab.id %]_pane">[% tab.label %]</a></li>
diff --git a/Netdisco/views/sidebar/device/ports.tt b/Netdisco/views/sidebar/device/ports.tt
index 650a037b..e043b191 100644
--- a/Netdisco/views/sidebar/device/ports.tt
+++ b/Netdisco/views/sidebar/device/ports.tt
@@ -4,11 +4,11 @@
             <input name="ip" value="[% params.ip %]" type="hidden"/>
             <div class="clearfix">
               <a class="field_clear_icon" href="#"
-                rel="twipsy" data-placement="right" data-offset="3" title="Show all Ports">
+                rel="twipsy" data-placement="left" data-offset="3" title="Show all Ports">
                 <img src="[% uri_base %]/images/tango_sweep.png"/></a>
               <input class="nd_port_query span3" placeholder="Port, Name or VLAN"
                 name="q" value="[% params.q %]" type="text"
-                rel="twipsy" data-placement="right" data-offset="5" title="Filter by Port, Name or VLAN"/>
+                rel="twipsy" data-placement="left" data-offset="5" title="Filter by Port, Name or VLAN"/>
             </div>
             <div class="clearfix">
               <a href="#" id="nd_collapse_legend"><label>Legend</label></a>
@@ -63,7 +63,7 @@
                   </li>
                   <p></p>
                   <li>
-                    <span rel="twipsy" data-placement="right" data-offset="5" title="Free if Down for this period of time">
+                    <span rel="twipsy" data-placement="left" data-offset="5" title="Free if Down for this period of time">
                     <select class="nd_days_select" name="age_num"/>
                       [% SET count = 1 %]
                       [% WHILE count < 32 %]
@@ -99,7 +99,7 @@
             <div class="nd_search clearfix">
               <button id="[% tab.id %]_submit" type="submit" class="btn info">Update View</button>
               <a id="[% tab.id %]_bookmark" href="#"
-                rel="twipsy" data-placement="right" data-offset="5" title="Bookmark these Settings">
+                rel="twipsy" data-placement="left" data-offset="5" title="Bookmark these Settings">
                 <img class="nd_bookmark" src="[% uri_base %]/images/glyphicons_072_bookmark.png"></a>
             </div>
           </form>
diff --git a/Netdisco/views/sidebar/search/device.tt b/Netdisco/views/sidebar/search/device.tt
index 329c08c4..cf636208 100644
--- a/Netdisco/views/sidebar/search/device.tt
+++ b/Netdisco/views/sidebar/search/device.tt
@@ -3,32 +3,32 @@
             <div class="clearfix">
               <input class="span3" placeholder="System Name"
                 type="text" name="name" value="[% params.name %]"
-                rel="twipsy" data-placement="right" data-offset="5" title="System Name"/>
+                rel="twipsy" data-placement="left" data-offset="5" title="System Name"/>
             </div>
             <div class="clearfix">
               <input class="span3" placeholder="Location"
                 type="text" name="location" value="[% params.location %]"
-                rel="twipsy" data-placement="right" data-offset="5" title="Location"/>
+                rel="twipsy" data-placement="left" data-offset="5" title="Location"/>
             </div>
             <div class="clearfix">
               <input class="span3" placeholder="DNS"
                 type="text" name="dns" value="[% params.dns %]"
-                rel="twipsy" data-placement="right" data-offset="5" title="DNS"/>
+                rel="twipsy" data-placement="left" data-offset="5" title="DNS"/>
             </div>
             <div class="clearfix">
               <input class="span3" placeholder="IP Address"
                 type="text" name="ip" value="[% params.ip %]"
-                rel="twipsy" data-placement="right" data-offset="5" title="IP Address"/>
+                rel="twipsy" data-placement="left" data-offset="5" title="IP Address"/>
             </div>
             <div class="clearfix">
               <input class="span3" placeholder="Description"
                 type="text" name="description" value="[% params.description %]"
-                rel="twipsy" data-placement="right" data-offset="5" title="Description"/>
+                rel="twipsy" data-placement="left" data-offset="5" title="Description"/>
             </div>
             <div class="clearfix">
               <select class="span3" size="[% vars.model_list.size > 5 ? 5 : vars.model_list.size %]"
                 multiple="on" name="model"
-                rel="twipsy" data-placement="right" data-offset="5" title="Model"/>
+                rel="twipsy" data-placement="left" data-offset="5" title="Model"/>
                 [% FOREACH opt IN vars.model_list %]
                 <option[% ' selected="selected"' IF vars.model_lkp.exists(opt) %]>[% opt %]</option>
                 [% END %]
@@ -37,7 +37,7 @@
             <div class="clearfix">
               <select class="span3" size="[% vars.os_ver_list.size > 5 ? 5 : vars.os_ver_list.size %]"
                 multiple="on" name="os_ver"
-                rel="twipsy" data-placement="right" data-offset="5" title="OS Release"/>
+                rel="twipsy" data-placement="left" data-offset="5" title="OS Release"/>
                 [% FOREACH opt IN vars.os_ver_list %]
                 <option[% ' selected="selected"' IF vars.os_ver_lkp.exists(opt) %]>[% opt %]</option>
                 [% END %]
@@ -46,7 +46,7 @@
             <div class="clearfix">
               <select class="span3" size="[% vars.vendor_list.size > 5 ? 5 : vars.vendor_list.size %]"
                 multiple="on" name="vendor"
-                rel="twipsy" data-placement="right" data-offset="5" title="Vendor"/>
+                rel="twipsy" data-placement="left" data-offset="5" title="Vendor"/>
                 [% FOREACH opt IN vars.vendor_list %]
                 <option[% ' selected="selected"' IF vars.vendor_lkp.exists(opt) %]>[% opt %]</option>
                 [% END %]

From 74c8443d9f798f7d05298e989414be5a8a304dfe Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Wed, 1 Feb 2012 13:37:17 +0000
Subject: [PATCH 06/15] style fixes for sidebar in/out

---
 Netdisco/public/css/netdisco.css        | 9 ++++-----
 Netdisco/public/javascripts/netdisco.js | 5 +++--
 Netdisco/views/device.tt                | 4 ++--
 Netdisco/views/search.tt                | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Netdisco/public/css/netdisco.css b/Netdisco/public/css/netdisco.css
index 5cec14ae..f7e527dc 100644
--- a/Netdisco/public/css/netdisco.css
+++ b/Netdisco/public/css/netdisco.css
@@ -205,9 +205,9 @@ h3.device_label {
 
 /* for placing the sidebar toggle icons */
 #sidebar_toggle_img_in {
-  float: right;
-  margin-top: -7px;
-  margin-right: -16px;
+  float: left;
+  margin-top: -6px;
+  margin-left: -18px;
   cursor: pointer;
 }
 
@@ -226,8 +226,7 @@ h3.device_label {
 
 /* make the sidebar fixed on the screen */
 .container-fluid > .sidebar {
-  position: fixed;
-  margin-top: 50px;
+  position: absolute;
   right: 20px;
   width: 200px;
   left: auto;
diff --git a/Netdisco/public/javascripts/netdisco.js b/Netdisco/public/javascripts/netdisco.js
index 7ae94887..95b2dee9 100644
--- a/Netdisco/public/javascripts/netdisco.js
+++ b/Netdisco/public/javascripts/netdisco.js
@@ -120,7 +120,7 @@ $(document).ready(function() {
       $('.sidebar').toggle(
         function() {
           $('#sidebar_toggle_img_out').toggle();
-          $('.content').animate({'margin-right': '10px !important'}, 100);
+          $('.content').animate({'margin-right': '10px !important'}, 50);
           $('.device_label_right').toggle();
         }
       );
@@ -129,10 +129,11 @@ $(document).ready(function() {
   $('#sidebar_toggle_img_out').click(
     function() {
       $('#sidebar_toggle_img_out').toggle();
-      $('.content').animate({'margin-right': '220px !important'}, 200,
+      $('.content').animate({'margin-right': '220px !important'}, 100,
         function() {
           $('.device_label_right').toggle();
           $('.sidebar').toggle(200);
+          $(window).scrollTop(0);
         }
       );
     }
diff --git a/Netdisco/views/device.tt b/Netdisco/views/device.tt
index ac78aad8..d9d276bd 100644
--- a/Netdisco/views/device.tt
+++ b/Netdisco/views/device.tt
@@ -1,12 +1,12 @@
 <img class="sidebar_toggle" id="sidebar_toggle_img_out"
-  src="[% uri_base %]/images/dusseldorf_settings.png"
+  src="[% uri_base %]/images/diagona_settings.png"
   rel="twipsy" data-placement="left" data-offset="5" title="Show Options"/>
 <div class="container-fluid">
   <div class="sidebar">
     <div class="well">
       <img class="sidebar_toggle" id="sidebar_toggle_img_in"
         src="[% uri_base %]/images/splashyfish_right.png"
-        rel="twipsy" data-placement="left" data-offset="5" title="Hide"/>
+        rel="twipsy" data-placement="left" data-offset="5" title="Hide Sidebar"/>
       <h3 class="device_label">[% d.ip %]</h3>
       [% IF d.dns %]
       <p class="device_label">[% d.dns.remove(settings.domain_suffix) %]</p>
diff --git a/Netdisco/views/search.tt b/Netdisco/views/search.tt
index 17183a31..4042d346 100644
--- a/Netdisco/views/search.tt
+++ b/Netdisco/views/search.tt
@@ -1,12 +1,12 @@
 <img class="sidebar_toggle" id="sidebar_toggle_img_out"
-  src="[% uri_base %]/images/dusseldorf_settings.png"
+  src="[% uri_base %]/images/diagona_settings.png"
   rel="twipsy" data-placement="left" data-offset="5" title="Show Search Options"/>
 <div class="container-fluid">
   <div class="sidebar">
     <div class="well">
       <img class="sidebar_toggle" id="sidebar_toggle_img_in"
         src="[% uri_base %]/images/splashyfish_right.png"
-        rel="twipsy" data-placement="left" data-offset="5" title="Hide"/>
+        rel="twipsy" data-placement="left" data-offset="5" title="Hide Sidebar"/>
       <div class="tab-content">
         [% FOREACH tab IN vars.tabs %]
         <div id="[% tab.id %]_search" class="tab-pane [% 'active' IF params.tab == tab.id %]">

From 85ab01a17a6bf26124124ef0ed55de13f077dca9 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Wed, 1 Feb 2012 15:40:05 +0000
Subject: [PATCH 07/15] 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
zcmV<F0~Y*=P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#dr3q=RCwBA
zjE}Ep;Njt6;OFHE6cOc56%iLT;};ZQ{Qv9c=bt}*ZDn9$n8d`ye3OCUKLa)Z5I`&-
zf|Z%El2=TmP0recK}AL8pD-uW|G&Tf2tBy}GVANJXTIOQ{fGoAJBrN!fB<4*{QozA
zg-4)`$JFH?zoz2XKOC$-zA!TX{LaDtjZ;nT8>6g}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)<m>GWm{m1a<?_UPa*Pns>@B9o(|DN0Y{PlY#
z6C)#v3jhL$<<Ea6=IeJDE`9v-`{!E?W>E<-CicI77(RXd{{I&<GlLj2E2FCDUuHR(
z|Gxx&{rt_q#Dr=9Kmf7){Pg;piqu;PekrjV0{je5#e^6b_;?r?zI|t8eDs{*<E<wQ
zcLmtrhW_IG@#xzxppO|r;f{zAfB<6o_4V^k>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<Je=snAfBeAgLkj~x^B0D{3<v`N0suh(zW)Os
zAv5m%`~AuI=-o^2-{C>}^Y|0+?eZJZ%-As6!^kh~<Ky@N2oePa>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^<u<lTqgMdiPqGZr$oXW&xTGyZ<}qU67yzjguy5Sjr@P(z>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) {
           '<div class="span3 alert-message info"><p>No matching records.</p></div>'
         );
       }
-      // 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 %]
         <div id="[% tab.id %]_search" class="tab-pane [% 'active' IF params.tab == tab.id %]">
           <form id="[% tab.id %]_form" class="nd_sidesearchform form-stacked" method="get" action="[% uri_for('/search') %]">
-            [%+ TRY %][% INCLUDE "sidebar/search/${tab.id}.tt" %][% CATCH %]<!-- no "[% tab.id %]" search options -->[% END %]
             <input name="q" value="[% params.q %]" type="hidden"/>
             <input name="tab" value="[% tab.id %]" type="hidden"/>
-            <div class="nd_search clearfix">
-              <button id="[% tab.id %]_submit" type="submit" class="btn info">Search Again</button>
-              <a id="[% tab.id %]_bookmark" href="#"
-                rel="twipsy" data-placement="left" data-offset="5" title="Bookmark this Search">
-                <img class="nd_bookmark" src="[% uri_base %]/images/glyphicons_072_bookmark.png">
-              </a>
-            </div>
+            [% TRY %]
+            [% INCLUDE "sidebar/search/${tab.id}.tt" %]
+            <button id="[% tab.id %]_submit" type="submit" class="btn info span3">Search Again</button>
+            [% CATCH %]
+            <!-- no "[% tab.id %]" search options -->
+            [% END %]
           </form>
         </div> <!-- /tab-pane -->
         [% END %]

From cf1dd009ba538f9a3be4a8c23892dd96cba6d561 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Wed, 1 Feb 2012 20:42:14 +0000
Subject: [PATCH 08/15] revert changes to startup script

---
 Netdisco/bin/netdisco-web.pl | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Netdisco/bin/netdisco-web.pl b/Netdisco/bin/netdisco-web.pl
index 68be4634..114ae861 100755
--- a/Netdisco/bin/netdisco-web.pl
+++ b/Netdisco/bin/netdisco-web.pl
@@ -1,9 +1,4 @@
 #!/usr/bin/env perl
-
-# use lib '/root/perl-profiles/netdisco-web/lib/perl5';
-use local::lib '/srv/www/vhosts/netdisco.ecmwf.int/perl-profiles/netdisco-web';
-use lib '/srv/www/vhosts/netdisco.ecmwf.int/Netdisco/lib';
-
 use Dancer;
 use Netdisco::Web;
 dance;

From fe1f1fa2fda56f4a1ad5f18241f9d05d676ff4ab Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Wed, 1 Feb 2012 22:18:02 +0000
Subject: [PATCH 09/15] smart show/hide of sidebar if it has content

---
 Netdisco/public/javascripts/netdisco.js | 22 ++++++++++++++++++++++
 Netdisco/views/device.tt                |  8 +++++++-
 Netdisco/views/search.tt                |  2 ++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/Netdisco/public/javascripts/netdisco.js b/Netdisco/public/javascripts/netdisco.js
index 3840d64a..e7025392 100644
--- a/Netdisco/public/javascripts/netdisco.js
+++ b/Netdisco/public/javascripts/netdisco.js
@@ -12,6 +12,22 @@ function do_search (event, tab) {
     $(this).val( $(form).find("input[name=q]").val() );
   });
 
+  // hide or show sidebars depending on previous state,
+  // and whether the sidebar contains any content (detected by TT)
+  if (has_sidebar[tab] == 0) {
+    $('.sidebar, #sidebar_toggle_img_out').hide();
+    $('.content').css('margin-right', '10px !important');
+  }
+  else {
+    if (sidebar_hidden) {
+      $('#sidebar_toggle_img_out').show();
+    }
+    else {
+      $('.content').css('margin-right', '220px !important');
+      $('.sidebar').show();
+    }
+  }
+
   // get the form params
   var query = $(form).serialize();
 
@@ -53,6 +69,10 @@ function do_search (event, tab) {
   );
 }
 
+// keep track of which tabs have a sidebar, for when switching tab
+var has_sidebar = {};
+var sidebar_hidden = 0;
+
 // the history.js plugin is great, but fires statechange at pushState
 // so we have these semaphpores to help avoid messing the History.
 
@@ -121,6 +141,7 @@ $(document).ready(function() {
           $('.device_label_right').toggle();
         }
       );
+      sidebar_hidden = 1;
     }
   );
   $('#sidebar_toggle_img_out').click(
@@ -133,6 +154,7 @@ $(document).ready(function() {
           $(window).scrollTop(0);
         }
       );
+      sidebar_hidden = 0;
     }
   );
 
diff --git a/Netdisco/views/device.tt b/Netdisco/views/device.tt
index d9d276bd..34c3fa0d 100644
--- a/Netdisco/views/device.tt
+++ b/Netdisco/views/device.tt
@@ -14,7 +14,13 @@
       <div class="tab-content">
         [% FOREACH tab IN vars.tabs %]
         <div id="[% tab.id %]_search" class="tab-pane [% 'active' IF params.tab == tab.id %]">
-          [%+ TRY %][% INCLUDE "sidebar/device/${tab.id}.tt" %][% CATCH %]<!-- no "[% tab.id %]" search options -->[% END %]
+          [% TRY %]
+          [% INCLUDE "sidebar/device/${tab.id}.tt" %]
+          <script type="text/javascript">has_sidebar["[% tab.id %]"] = 1;</script>
+          [% CATCH %]
+          <!-- no "[% tab.id %]" search options -->
+          <script type="text/javascript">has_sidebar["[% tab.id %]"] = 0;</script>
+          [% END %]
         </div> <!-- /tab-pane -->
         [% END %]
       </div> <!-- /tab-content -->
diff --git a/Netdisco/views/search.tt b/Netdisco/views/search.tt
index 7e424211..05d76b55 100644
--- a/Netdisco/views/search.tt
+++ b/Netdisco/views/search.tt
@@ -16,8 +16,10 @@
             [% TRY %]
             [% INCLUDE "sidebar/search/${tab.id}.tt" %]
             <button id="[% tab.id %]_submit" type="submit" class="btn info span3">Search Again</button>
+            <script type="text/javascript">has_sidebar["[% tab.id %]"] = 1;</script>
             [% CATCH %]
             <!-- no "[% tab.id %]" search options -->
+            <script type="text/javascript">has_sidebar["[% tab.id %]"] = 0;</script>
             [% END %]
           </form>
         </div> <!-- /tab-pane -->

From fc9b86e8525e646b61b4804a6b4a2b5d91ab11ad Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Thu, 2 Feb 2012 15:06:52 +0000
Subject: [PATCH 10/15] refactor sidebar inclusion

---
 Netdisco/bin/netdisco-web.pl               |  5 +++++
 Netdisco/views/device.tt                   | 23 +++++++++++-----------
 Netdisco/views/search.tt                   |  3 +--
 Netdisco/views/sidebar/device/addresses.tt |  6 ------
 Netdisco/views/sidebar/device/details.tt   |  6 ------
 Netdisco/views/sidebar/device/modules.tt   |  6 ------
 Netdisco/views/sidebar/device/ports.tt     | 13 +++---------
 Netdisco/views/sidebar/search/device.tt    |  2 ++
 Netdisco/views/sidebar/search/node.tt      |  2 ++
 9 files changed, 25 insertions(+), 41 deletions(-)
 delete mode 100644 Netdisco/views/sidebar/device/addresses.tt
 delete mode 100644 Netdisco/views/sidebar/device/details.tt
 delete mode 100644 Netdisco/views/sidebar/device/modules.tt

diff --git a/Netdisco/bin/netdisco-web.pl b/Netdisco/bin/netdisco-web.pl
index 114ae861..68be4634 100755
--- a/Netdisco/bin/netdisco-web.pl
+++ b/Netdisco/bin/netdisco-web.pl
@@ -1,4 +1,9 @@
 #!/usr/bin/env perl
+
+# use lib '/root/perl-profiles/netdisco-web/lib/perl5';
+use local::lib '/srv/www/vhosts/netdisco.ecmwf.int/perl-profiles/netdisco-web';
+use lib '/srv/www/vhosts/netdisco.ecmwf.int/Netdisco/lib';
+
 use Dancer;
 use Netdisco::Web;
 dance;
diff --git a/Netdisco/views/device.tt b/Netdisco/views/device.tt
index 34c3fa0d..fa91beb9 100644
--- a/Netdisco/views/device.tt
+++ b/Netdisco/views/device.tt
@@ -7,20 +7,21 @@
       <img class="sidebar_toggle" id="sidebar_toggle_img_in"
         src="[% uri_base %]/images/splashyfish_right.png"
         rel="twipsy" data-placement="left" data-offset="5" title="Hide Sidebar"/>
-      <h3 class="device_label">[% d.ip %]</h3>
-      [% IF d.dns %]
-      <p class="device_label">[% d.dns.remove(settings.domain_suffix) %]</p>
-      [% END %]
       <div class="tab-content">
         [% FOREACH tab IN vars.tabs %]
         <div id="[% tab.id %]_search" class="tab-pane [% 'active' IF params.tab == tab.id %]">
-          [% TRY %]
-          [% INCLUDE "sidebar/device/${tab.id}.tt" %]
-          <script type="text/javascript">has_sidebar["[% tab.id %]"] = 1;</script>
-          [% CATCH %]
-          <!-- no "[% tab.id %]" search options -->
-          <script type="text/javascript">has_sidebar["[% tab.id %]"] = 0;</script>
-          [% END %]
+          <form id="[% tab.id %]_form" class="nd_sidesearchform form-stacked" method="get" action="[% uri_for('/device') %]">
+            <input name="tab" value="[% tab.id %]" type="hidden"/>
+            [% TRY %]
+            [% INCLUDE "sidebar/device/${tab.id}.tt" %]
+            <script type="text/javascript">has_sidebar["[% tab.id %]"] = 1;</script>
+            [% CATCH %]
+            <!-- no "[% tab.id %]" search options -->
+            <input name="ip" value="[% params.ip %]" type="hidden"/>
+            <input name="q" value="[% params.q %]" type="hidden"/>
+            <script type="text/javascript">has_sidebar["[% tab.id %]"] = 0;</script>
+            [% END %]
+          </form>
         </div> <!-- /tab-pane -->
         [% END %]
       </div> <!-- /tab-content -->
diff --git a/Netdisco/views/search.tt b/Netdisco/views/search.tt
index 05d76b55..86837e1a 100644
--- a/Netdisco/views/search.tt
+++ b/Netdisco/views/search.tt
@@ -11,14 +11,13 @@
         [% FOREACH tab IN vars.tabs %]
         <div id="[% tab.id %]_search" class="tab-pane [% 'active' IF params.tab == tab.id %]">
           <form id="[% tab.id %]_form" class="nd_sidesearchform form-stacked" method="get" action="[% uri_for('/search') %]">
-            <input name="q" value="[% params.q %]" type="hidden"/>
             <input name="tab" value="[% tab.id %]" type="hidden"/>
             [% TRY %]
             [% INCLUDE "sidebar/search/${tab.id}.tt" %]
-            <button id="[% tab.id %]_submit" type="submit" class="btn info span3">Search Again</button>
             <script type="text/javascript">has_sidebar["[% tab.id %]"] = 1;</script>
             [% CATCH %]
             <!-- no "[% tab.id %]" search options -->
+            <input name="q" value="[% params.q %]" type="hidden"/>
             <script type="text/javascript">has_sidebar["[% tab.id %]"] = 0;</script>
             [% END %]
           </form>
diff --git a/Netdisco/views/sidebar/device/addresses.tt b/Netdisco/views/sidebar/device/addresses.tt
deleted file mode 100644
index c63fb507..00000000
--- a/Netdisco/views/sidebar/device/addresses.tt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-          <form id="[% tab.id %]_form" class="nd_sidesearchform form-stacked" method="get" action="[% uri_for('/device') %]">
-            <input name="tab" value="[% tab.id %]" type="hidden"/>
-            <input name="ip" value="[% params.ip %]" type="hidden"/>
-            <input name="q" value="[% params.q %]" type="hidden"/>
-          </form>
diff --git a/Netdisco/views/sidebar/device/details.tt b/Netdisco/views/sidebar/device/details.tt
deleted file mode 100644
index c63fb507..00000000
--- a/Netdisco/views/sidebar/device/details.tt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-          <form id="[% tab.id %]_form" class="nd_sidesearchform form-stacked" method="get" action="[% uri_for('/device') %]">
-            <input name="tab" value="[% tab.id %]" type="hidden"/>
-            <input name="ip" value="[% params.ip %]" type="hidden"/>
-            <input name="q" value="[% params.q %]" type="hidden"/>
-          </form>
diff --git a/Netdisco/views/sidebar/device/modules.tt b/Netdisco/views/sidebar/device/modules.tt
deleted file mode 100644
index c63fb507..00000000
--- a/Netdisco/views/sidebar/device/modules.tt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-          <form id="[% tab.id %]_form" class="nd_sidesearchform form-stacked" method="get" action="[% uri_for('/device') %]">
-            <input name="tab" value="[% tab.id %]" type="hidden"/>
-            <input name="ip" value="[% params.ip %]" type="hidden"/>
-            <input name="q" value="[% params.q %]" type="hidden"/>
-          </form>
diff --git a/Netdisco/views/sidebar/device/ports.tt b/Netdisco/views/sidebar/device/ports.tt
index e043b191..080a4533 100644
--- a/Netdisco/views/sidebar/device/ports.tt
+++ b/Netdisco/views/sidebar/device/ports.tt
@@ -1,10 +1,9 @@
 
-          <form id="[% tab.id %]_form" class="nd_sidesearchform form-stacked" method="get" action="[% uri_for('/device') %]">
-            <input name="tab" value="[% tab.id %]" type="hidden"/>
+            <p><em>Port Filter Options</em></p>
             <input name="ip" value="[% params.ip %]" type="hidden"/>
             <div class="clearfix">
               <a class="field_clear_icon" href="#"
-                rel="twipsy" data-placement="left" data-offset="3" title="Show all Ports">
+                rel="twipsy" data-placement="above" data-offset="3" title="Show all Ports">
                 <img src="[% uri_base %]/images/tango_sweep.png"/></a>
               <input class="nd_port_query span3" placeholder="Port, Name or VLAN"
                 name="q" value="[% params.q %]" type="text"
@@ -96,10 +95,4 @@
                 </ul>
               </div>
             </div>
-            <div class="nd_search clearfix">
-              <button id="[% tab.id %]_submit" type="submit" class="btn info">Update View</button>
-              <a id="[% tab.id %]_bookmark" href="#"
-                rel="twipsy" data-placement="left" data-offset="5" title="Bookmark these Settings">
-                <img class="nd_bookmark" src="[% uri_base %]/images/glyphicons_072_bookmark.png"></a>
-            </div>
-          </form>
+            <button id="[% tab.id %]_submit" type="submit" class="btn info span3">Update View</button>
diff --git a/Netdisco/views/sidebar/search/device.tt b/Netdisco/views/sidebar/search/device.tt
index cf636208..0e3ce656 100644
--- a/Netdisco/views/sidebar/search/device.tt
+++ b/Netdisco/views/sidebar/search/device.tt
@@ -1,5 +1,6 @@
 
             <p><em>Device Search Options</em></p>
+            <input name="q" value="[% params.q %]" type="hidden"/>
             <div class="clearfix">
               <input class="span3" placeholder="System Name"
                 type="text" name="name" value="[% params.name %]"
@@ -60,3 +61,4 @@
                 <span class="nd_searchcheckbox uneditable-input">Match All Options</span>
               </label>
             </div>
+            <button id="[% tab.id %]_submit" type="submit" class="btn info span3">Search Again</button>
diff --git a/Netdisco/views/sidebar/search/node.tt b/Netdisco/views/sidebar/search/node.tt
index dcb6d857..2247e934 100644
--- a/Netdisco/views/sidebar/search/node.tt
+++ b/Netdisco/views/sidebar/search/node.tt
@@ -1,5 +1,6 @@
 
             <p><em>Node Search Options</em></p>
+            <input name="q" value="[% params.q %]" type="hidden"/>
             <div class="clearfix input-prepend">
               <label class="add-on">
                 <input type="checkbox" id="stamps" name="stamps"[% ' checked="checked"' IF params.stamps %]/>
@@ -34,3 +35,4 @@
               </label>
             </div>
             [% END %]
+            <button id="[% tab.id %]_submit" type="submit" class="btn info span3">Search Again</button>

From e943a52bc4be34f92f195489b4cb6a40c78b522d Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Thu, 2 Feb 2012 20:10:13 +0000
Subject: [PATCH 11/15] Update Netdisco/bin/netdisco-web.pl

---
 Netdisco/bin/netdisco-web.pl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Netdisco/bin/netdisco-web.pl b/Netdisco/bin/netdisco-web.pl
index 68be4634..bdb63acf 100755
--- a/Netdisco/bin/netdisco-web.pl
+++ b/Netdisco/bin/netdisco-web.pl
@@ -1,9 +1,5 @@
 #!/usr/bin/env perl
 
-# use lib '/root/perl-profiles/netdisco-web/lib/perl5';
-use local::lib '/srv/www/vhosts/netdisco.ecmwf.int/perl-profiles/netdisco-web';
-use lib '/srv/www/vhosts/netdisco.ecmwf.int/Netdisco/lib';
-
 use Dancer;
 use Netdisco::Web;
 dance;

From 2246405fbf3d66e9f1e70e039086b9cfea8f75ba Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Fri, 3 Feb 2012 10:23:40 +0000
Subject: [PATCH 12/15] no need for device labels

---
 Netdisco/public/css/netdisco.css        | 26 -------------------------
 Netdisco/public/javascripts/netdisco.js |  2 --
 Netdisco/views/device.tt                |  6 ------
 3 files changed, 34 deletions(-)

diff --git a/Netdisco/public/css/netdisco.css b/Netdisco/public/css/netdisco.css
index 0bfe1db0..37eb9720 100644
--- a/Netdisco/public/css/netdisco.css
+++ b/Netdisco/public/css/netdisco.css
@@ -117,18 +117,6 @@ body {
     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 */
 
@@ -179,20 +167,6 @@ form .clearfix.success input {
   background-color: #A9DBA9;
 }
 
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-/* device and ip label in sidebar */
-
-/* pull the device label closer to the top of the sidebar
-to reduce the useless gap */
-h3.device_label {
-  margin-top: -12px;
-}
-
-/* colour for device name and ip in sidebar */
-.device_label {
-  color: #660033;
-}
-
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* sidebar collapser */
 
diff --git a/Netdisco/public/javascripts/netdisco.js b/Netdisco/public/javascripts/netdisco.js
index e7025392..9e335209 100644
--- a/Netdisco/public/javascripts/netdisco.js
+++ b/Netdisco/public/javascripts/netdisco.js
@@ -138,7 +138,6 @@ $(document).ready(function() {
         function() {
           $('#sidebar_toggle_img_out').toggle();
           $('.content').animate({'margin-right': '10px !important'}, 50);
-          $('.device_label_right').toggle();
         }
       );
       sidebar_hidden = 1;
@@ -149,7 +148,6 @@ $(document).ready(function() {
       $('#sidebar_toggle_img_out').toggle();
       $('.content').animate({'margin-right': '220px !important'}, 100,
         function() {
-          $('.device_label_right').toggle();
           $('.sidebar').toggle(200);
           $(window).scrollTop(0);
         }
diff --git a/Netdisco/views/device.tt b/Netdisco/views/device.tt
index fa91beb9..8dd5f277 100644
--- a/Netdisco/views/device.tt
+++ b/Netdisco/views/device.tt
@@ -33,12 +33,6 @@
       [% FOREACH tab IN vars.tabs %]
       <li[% ' class="active"' IF params.tab == tab.id %]><a id="[% tab.id %]_link" href="#[% tab.id %]_pane">[% tab.label %]</a></li>
       [% END %]
-      <li class="device_label_right">
-        <h3 class="inline device_label">[% d.ip %]</h3>
-        [% IF d.dns %]
-        <h5 class="inline device_label">([% d.dns.remove(settings.domain_suffix) %])</h5>
-        [% END %]
-      </li>
     </ul>
     <div class="tab-content">
       [% FOREACH tab IN vars.tabs %]

From c2213e7cfa6be09c00105c774e544c190e45a690 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Fri, 3 Feb 2012 11:03:13 +0000
Subject: [PATCH 13/15] rename fields to keep main query in navbar

---
 Netdisco/lib/Netdisco/Web/Device.pm       | 10 +++++-----
 Netdisco/views/ajax/device/addresses.tt   |  2 +-
 Netdisco/views/ajax/device/ports.tt       |  2 +-
 Netdisco/views/ajax/search/device.tt      |  2 +-
 Netdisco/views/ajax/search/node_by_ip.tt  |  2 +-
 Netdisco/views/ajax/search/node_by_mac.tt |  4 ++--
 Netdisco/views/ajax/search/port.tt        |  2 +-
 Netdisco/views/ajax/search/vlan.tt        | 12 ++++++------
 Netdisco/views/device.tt                  |  2 +-
 Netdisco/views/js/device.js               |  2 +-
 Netdisco/views/sidebar/device/ports.tt    |  4 ++--
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Netdisco/lib/Netdisco/Web/Device.pm b/Netdisco/lib/Netdisco/Web/Device.pm
index 6eed5c1d..b736fd0b 100644
--- a/Netdisco/lib/Netdisco/Web/Device.pm
+++ b/Netdisco/lib/Netdisco/Web/Device.pm
@@ -54,7 +54,7 @@ ajax '/ajax/content/device/:thing' => sub {
 
 # device interface addresses
 ajax '/ajax/content/device/addresses' => sub {
-    my $ip = param('ip');
+    my $ip = param('q');
     return unless $ip;
 
     my $set = schema('netdisco')->resultset('DeviceIp')->search({ip => $ip}, { order_by => 'alias' });
@@ -68,13 +68,13 @@ ajax '/ajax/content/device/addresses' => sub {
 
 # device ports with a description (er, name) matching
 ajax '/ajax/content/device/ports' => sub {
-    my $ip = param('ip');
+    my $ip = param('q');
     return unless $ip;
 
     my $set = schema('netdisco')->resultset('DevicePort')->by_ip($ip);
 
     # refine by ports if requested
-    my $q = param('q');
+    my $q = param('f');
     if ($q) {
         if ($q =~ m/^\d+$/) {
             $set = $set->by_vlan($q);
@@ -107,7 +107,7 @@ ajax '/ajax/content/device/ports' => sub {
 
 # device details table
 ajax '/ajax/content/device/details' => sub {
-    my $ip = param('ip');
+    my $ip = param('q');
     return unless $ip;
 
     my $device = schema('netdisco')->resultset('Device')->find($ip);
@@ -120,7 +120,7 @@ ajax '/ajax/content/device/details' => sub {
 };
 
 get '/device' => sub {
-    my $ip = NetAddr::IP::Lite->new(param('ip'));
+    my $ip = NetAddr::IP::Lite->new(param('q'));
     if (! $ip) {
         redirect uri_for('/', {nosuchdevice => 1});
         return;
diff --git a/Netdisco/views/ajax/device/addresses.tt b/Netdisco/views/ajax/device/addresses.tt
index 5d6e55d8..6bfbe499 100644
--- a/Netdisco/views/ajax/device/addresses.tt
+++ b/Netdisco/views/ajax/device/addresses.tt
@@ -14,7 +14,7 @@
       <td>[% row.alias %]</a>
       <td>[% row.dns.remove(settings.domain_suffix) %]</a>
       <td class="center_cell"><a class="nd_linkcell"
-        href="[% uri_for('/device') %]?tab=ports&ip=[% row.ip %]&q=[% row.port %]">[% row.port %]</a></td>
+        href="[% uri_for('/device') %]?tab=ports&q=[% row.ip %]&f=[% row.port %]">[% row.port %]</a></td>
       <td>[% row.device_port.name %]</td>
       <td><a class="nd_linkcell"
         href="[% uri_for('/search') %]?tab=device&ip=[% row.subnet %]">[% row.subnet %]</a></td>
diff --git a/Netdisco/views/ajax/device/ports.tt b/Netdisco/views/ajax/device/ports.tt
index bfa023e8..6db3b375 100644
--- a/Netdisco/views/ajax/device/ports.tt
+++ b/Netdisco/views/ajax/device/ports.tt
@@ -85,7 +85,7 @@
       <td>
         [% IF row.remote_ip %]
           [% IF row.neighbor %]
-          <a href="[% uri_for('/device') %]?tab=ports&ip=[% row.neighbor.ip | uri %]&q=[% row.remote_port | uri %]">
+          <a href="[% uri_for('/device') %]?tab=ports&q=[% row.neighbor.ip | uri %]&f=[% row.remote_port | uri %]">
             [% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip %]
             ([% row.remote_port | html_entity %])</a>
           [% ELSE %]
diff --git a/Netdisco/views/ajax/search/device.tt b/Netdisco/views/ajax/search/device.tt
index 995a05af..df074841 100644
--- a/Netdisco/views/ajax/search/device.tt
+++ b/Netdisco/views/ajax/search/device.tt
@@ -14,7 +14,7 @@
   </tbody>
     [% WHILE (row = results.next) %]
     <tr>
-      <td><a href="[% uri_for('/device') %]?ip=[% row.ip %]">[% row.dns.remove(settings.domain_suffix) %]</a></td>
+      <td><a href="[% uri_for('/device') %]?q=[% row.ip %]">[% row.dns.remove(settings.domain_suffix) %]</a></td>
       <td>[% row.contact %]</td>
       <td>[% row.location %]</td>
       <td>[% row.name %]</td>
diff --git a/Netdisco/views/ajax/search/node_by_ip.tt b/Netdisco/views/ajax/search/node_by_ip.tt
index e25a939a..2ad75a90 100644
--- a/Netdisco/views/ajax/search/node_by_ip.tt
+++ b/Netdisco/views/ajax/search/node_by_ip.tt
@@ -38,7 +38,7 @@
       <td>&nbsp;</td>
       [% END %]
       <td>Switch Port</td>
-      <td><a href="[% uri_for('/device') %]?tab=ports&ip=[% node.switch | url %]&q=[% node.port | url %]">[% node.switch %] [ [% node.port %] ]</a>
+      <td><a href="[% uri_for('/device') %]?tab=ports&q=[% node.switch | url %]&f=[% node.port | url %]">[% node.switch %] [ [% node.port %] ]</a>
         [% ' (' _ node.device.dns.remove(settings.domain_suffix) _ ')' IF node.device.dns %]
         [% ' <span class="label warning">a</span>' IF NOT node.active %]
       </td>
diff --git a/Netdisco/views/ajax/search/node_by_mac.tt b/Netdisco/views/ajax/search/node_by_mac.tt
index b57775a4..da7850eb 100644
--- a/Netdisco/views/ajax/search/node_by_mac.tt
+++ b/Netdisco/views/ajax/search/node_by_mac.tt
@@ -66,7 +66,7 @@
       </td>
       [% END %]
       <td>Switch Port</td>
-      <td><a href="[% uri_for('/device') %]?tab=ports&ip=[% node.switch | url %]&q=[% node.port | url %]">[% node.switch %] [ [% node.port %] ]</a>
+      <td><a href="[% uri_for('/device') %]?tab=ports&q=[% node.switch | url %]&f=[% node.port | url %]">[% node.switch %] [ [% node.port %] ]</a>
         [% ' (' _ node.device.dns.remove(settings.domain_suffix) _ ')' IF node.device.dns %]
         [% ' <span class="label warning">a</span>' IF NOT node.active %]
       </td>
@@ -97,7 +97,7 @@
       </td>
       [% END %]
       <td>Switch Port</td>
-      <td><a href="[% uri_for('/device') %]?tab=ports&ip=[% port.ip | url %]&q=[% port.port | url %]">[% port.ip %] [ [% port.port %] ]</a>
+      <td><a href="[% uri_for('/device') %]?tab=ports&q=[% port.ip | url %]&f=[% port.port | url %]">[% port.ip %] [ [% port.port %] ]</a>
         [% ' (' _ port.device.dns.remove(settings.domain_suffix) _ ')' IF port.device.dns %]
       </td>
       [% IF params.stamps %]
diff --git a/Netdisco/views/ajax/search/port.tt b/Netdisco/views/ajax/search/port.tt
index abcdb4ee..74581600 100644
--- a/Netdisco/views/ajax/search/port.tt
+++ b/Netdisco/views/ajax/search/port.tt
@@ -11,7 +11,7 @@
     [% WHILE (row = results.next) %]
     <tr>
       <td>[% row.name %]</td>
-      <td><a href="[% uri_for('/device') %]?tab=ports&ip=[% row.ip %]&q=[% row.port %]">[% row.ip %] [ [% row.port %] ]</a>
+      <td><a href="[% uri_for('/device') %]?tab=ports&q=[% row.ip %]&f=[% row.port %]">[% row.ip %] [ [% row.port %] ]</a>
         [% ' (' _ row.device.dns.remove(settings.domain_suffix) _ ')' IF row.device.dns %]
       </td>
       <td>[% row.descr %]</td>
diff --git a/Netdisco/views/ajax/search/vlan.tt b/Netdisco/views/ajax/search/vlan.tt
index d01f90b2..59b8151d 100644
--- a/Netdisco/views/ajax/search/vlan.tt
+++ b/Netdisco/views/ajax/search/vlan.tt
@@ -13,17 +13,17 @@
     [% WHILE (row = results.next) %]
     <tr>
       <td><a class="nd_linkcell nd_stealthlink"
-        href="[% uri_for('/device') %]?tab=ports&ip=[% row.ip %]&q=[% row.vlan.vlan %]">[% row.vlan.vlan %]</a></td>
+        href="[% uri_for('/device') %]?tab=ports&q=[% row.ip %]&f=[% row.vlan.vlan %]">[% row.vlan.vlan %]</a></td>
       <td><a class="nd_linkcell"
-        href="[% uri_for('/device') %]?tab=ports&ip=[% row.ip %]&q=[% row.vlan.vlan %]">[% row.dns %]</a></td>
+        href="[% uri_for('/device') %]?tab=ports&q=[% row.ip %]&f=[% row.vlan.vlan %]">[% row.dns %]</a></td>
       <td><a class="nd_linkcell nd_stealthlink"
-        href="[% uri_for('/device') %]?tab=ports&ip=[% row.ip %]&q=[% row.vlan.vlan %]">[% row.vlan.description %]</a></td>
+        href="[% uri_for('/device') %]?tab=ports&q=[% row.ip %]&f=[% row.vlan.vlan %]">[% row.vlan.description %]</a></td>
       <td><a class="nd_linkcell nd_stealthlink"
-        href="[% uri_for('/device') %]?tab=ports&ip=[% row.ip %]&q=[% row.vlan.vlan %]">[% row.model %]</a></td>
+        href="[% uri_for('/device') %]?tab=ports&q=[% row.ip %]&f=[% row.vlan.vlan %]">[% row.model %]</a></td>
       <td><a class="nd_linkcell nd_stealthlink"
-        href="[% uri_for('/device') %]?tab=ports&ip=[% row.ip %]&q=[% row.vlan.vlan %]">[% row.os %]</a></td>
+        href="[% uri_for('/device') %]?tab=ports&q=[% row.ip %]&f=[% row.vlan.vlan %]">[% row.os %]</a></td>
       <td><a class="nd_linkcell nd_stealthlink"
-        href="[% uri_for('/device') %]?tab=ports&ip=[% row.ip %]&q=[% row.vlan.vlan %]">[% row.vendor %]</a></td>
+        href="[% uri_for('/device') %]?tab=ports&q=[% row.ip %]&f=[% row.vlan.vlan %]">[% row.vendor %]</a></td>
     </tr>
     [% END %]
   </tbody>
diff --git a/Netdisco/views/device.tt b/Netdisco/views/device.tt
index 8dd5f277..b9d58b5e 100644
--- a/Netdisco/views/device.tt
+++ b/Netdisco/views/device.tt
@@ -17,8 +17,8 @@
             <script type="text/javascript">has_sidebar["[% tab.id %]"] = 1;</script>
             [% CATCH %]
             <!-- no "[% tab.id %]" search options -->
-            <input name="ip" value="[% params.ip %]" type="hidden"/>
             <input name="q" value="[% params.q %]" type="hidden"/>
+            <input name="f" value="[% params.f %]" type="hidden"/>
             <script type="text/javascript">has_sidebar["[% tab.id %]"] = 0;</script>
             [% END %]
           </form>
diff --git a/Netdisco/views/js/device.js b/Netdisco/views/js/device.js
index 94e0fb99..0f725d8f 100644
--- a/Netdisco/views/js/device.js
+++ b/Netdisco/views/js/device.js
@@ -47,7 +47,7 @@
     });
 
     // show or hide sweeping brush icon when field has content
-    var sweep = $('#ports_form').find("input[name=q]");
+    var sweep = $('#ports_form').find("input[name=f]");
 
     if (sweep.val() === "") {
       $('.field_clear_icon').hide();
diff --git a/Netdisco/views/sidebar/device/ports.tt b/Netdisco/views/sidebar/device/ports.tt
index 080a4533..e96e471f 100644
--- a/Netdisco/views/sidebar/device/ports.tt
+++ b/Netdisco/views/sidebar/device/ports.tt
@@ -1,12 +1,12 @@
 
             <p><em>Port Filter Options</em></p>
-            <input name="ip" value="[% params.ip %]" type="hidden"/>
+            <input name="q" value="[% params.q %]" type="hidden"/>
             <div class="clearfix">
               <a class="field_clear_icon" href="#"
                 rel="twipsy" data-placement="above" data-offset="3" title="Show all Ports">
                 <img src="[% uri_base %]/images/tango_sweep.png"/></a>
               <input class="nd_port_query span3" placeholder="Port, Name or VLAN"
-                name="q" value="[% params.q %]" type="text"
+                name="f" value="[% params.f %]" type="text"
                 rel="twipsy" data-placement="left" data-offset="5" title="Filter by Port, Name or VLAN"/>
             </div>
             <div class="clearfix">

From 7dee307161a49ec60ef7243b2ad3b84132a91d50 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Fri, 3 Feb 2012 15:07:21 +0000
Subject: [PATCH 14/15] srikethrough nav search when using device_form

---
 Netdisco/views/js/search.js    | 49 +++++++++++++---------------------
 Netdisco/views/layouts/main.tt |  2 +-
 2 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/Netdisco/views/js/search.js b/Netdisco/views/js/search.js
index 960f6c46..73777f06 100644
--- a/Netdisco/views/js/search.js
+++ b/Netdisco/views/js/search.js
@@ -6,36 +6,25 @@
   var path = 'search';
 
   $(document).ready(function() {
-    // highlight active search filters in green
-    // there must be a way to factor this out to a func but my JS is weak :-/
+    // highlight active search filters in green.
+    // strikethrough the navbar search if using device_form instead.
 
-    $("form .clearfix input").not("[name=q]").each(function() {
-      if ($(this).val() === "") {
-        $(this).parent(".clearfix").removeClass('success');
-      } else {
-        $(this).parent(".clearfix").addClass('success');
-      }
-    });
-    $("form .clearfix input").not("[name=q]").change(function() {
-      if ($(this).val() === "") {
-        $(this).parent(".clearfix").removeClass('success');
-      } else {
-        $(this).parent(".clearfix").addClass('success');
-      }
-    });
-    $("form .clearfix select").each(function() {
-      if ($(this).find(":selected").length === 0) {
-        $(this).parent(".clearfix").removeClass('success');
-      } else {
-        $(this).parent(".clearfix").addClass('success');
-      }
-    });
-    $("form .clearfix select").change(function() {
-      if ($(this).find(":selected").length === 0) {
-        $(this).parent(".clearfix").removeClass('success');
-      } else {
-        $(this).parent(".clearfix").addClass('success');
-      }
-    });
+    var d_inputs = $("#device_form .clearfix input").not('[type="checkbox"]')
+        .add("#device_form .clearfix select");
 
+    function device_form_state(e) {
+      if (e.is('[value!=""]')) {
+        e.parent(".clearfix").addClass('success');
+        $('#nq').css('text-decoration', 'line-through');
+      }
+      else {
+        e.parent(".clearfix").removeClass('success');
+        if (! d_inputs.is('[value!=""]') ) {
+          $('#nq').css('text-decoration', 'none');
+        }
+      }
+    }
+
+    d_inputs.each(function() {device_form_state($(this))});
+    d_inputs.change(function() {device_form_state($(this))});
   });
diff --git a/Netdisco/views/layouts/main.tt b/Netdisco/views/layouts/main.tt
index 3dc65f17..855c3eee 100644
--- a/Netdisco/views/layouts/main.tt
+++ b/Netdisco/views/layouts/main.tt
@@ -58,7 +58,7 @@
         [% END %]
       </ul>
       <form method="get" action="[% uri_for('/search') %]">
-        <input placeholder="Find Anything" class="span5" name="q" type="text"/>
+        <input placeholder="Find Anything" class="span5" id="nq" name="q" type="text"/>
       </form>
       <ul class="nav secondary-nav">
         <li class="menu">

From acde618a721abc361556f2b67b797b8206d05cba Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Fri, 3 Feb 2012 16:02:45 +0000
Subject: [PATCH 15/15] add navbar search icon

---
 Netdisco/public/css/netdisco.css        | 5 +++++
 Netdisco/public/javascripts/netdisco.js | 5 +++++
 Netdisco/views/layouts/main.tt          | 1 +
 3 files changed, 11 insertions(+)

diff --git a/Netdisco/public/css/netdisco.css b/Netdisco/public/css/netdisco.css
index 37eb9720..b5583a34 100644
--- a/Netdisco/public/css/netdisco.css
+++ b/Netdisco/public/css/netdisco.css
@@ -5,6 +5,11 @@ body {
   padding-top: 50px;
 }
 
+.navbar_icon {
+  vertical-align: middle;
+  cursor: pointer;
+}
+
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* various styles to adjust the hero box used for homepage + login */
 
diff --git a/Netdisco/public/javascripts/netdisco.js b/Netdisco/public/javascripts/netdisco.js
index 9e335209..c2819084 100644
--- a/Netdisco/public/javascripts/netdisco.js
+++ b/Netdisco/public/javascripts/netdisco.js
@@ -124,6 +124,11 @@ $(document).ready(function() {
   // activate tooltips
   $("[rel=twipsy]").twipsy({live: true});
 
+  // bind submission to the navbar go icon
+  $('#navsearchgo').click(function() {
+    $('#navsearchgo').parent('form').submit();
+  });
+
   // fix green background on search checkboxes
   // https://github.com/twitter/bootstrap/issues/742
   syncCheckBox = function() {
diff --git a/Netdisco/views/layouts/main.tt b/Netdisco/views/layouts/main.tt
index 855c3eee..8cbe72b3 100644
--- a/Netdisco/views/layouts/main.tt
+++ b/Netdisco/views/layouts/main.tt
@@ -59,6 +59,7 @@
       </ul>
       <form method="get" action="[% uri_for('/search') %]">
         <input placeholder="Find Anything" class="span5" id="nq" name="q" type="text"/>
+        <img id="navsearchgo" class="navbar_icon" src="[% uri_base %]/images/crystalclear_mag.png"/>
       </form>
       <ul class="nav secondary-nav">
         <li class="menu">