merge branch og-portcontrol

2012-11-24 23:29:00 +00:00
parent 3724e3ed37
commit 083f3a51ed
31 changed files with 1368 additions and 377 deletions
--- a/Netdisco/views/sidebar/search/node.tt
+++ b/Netdisco/views/sidebar/search/node.tt
@@ -1,5 +1,5 @@

-            <p><em>Node Search Options</em></p>
+            <p class="nd_sidebar_title"><em>Node Search Options</em></p>
            <input name="q" value="[% params.q %]" type="hidden"/>
            <div class="clearfix input-prepend">
              <label class="add-on">