git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@61 6d9bc8c9-1ec2-4278...

diff --git a/conifer/static/main.css b/conifer/static/main.css
index e23b7f8..6d4366a 100644 (file)
--- a/conifer/static/main.css
+++ b/conifer/static/main.css
@@ -17,6 +17,15 @@ body {
     background-color: #448;
 }
 
+#header div#search {
+    position: relative;
+    top: -5px;
+    float: right;
+    margin:0.2em 0 1em;
+    padding:0 0.2em 0 0.5em;
+    color: #ccc;
+}
+
 #brandheader { background-color: white; padding: 8; }
 
 #header a { color: #fff; font-weight: bold;  }
@@ -46,6 +55,7 @@ a:hover {  text-decoration: underline;  }
 #tabbar li { display: inline; }
 #tabbar li a { padding: 18 18 4 18; background-color: #ddf; color: black; text-decoration: none; }
 #tabbar li a:hover { background-color: #fc8; }
+
 /* 
 #tabbar li.active a { background-color: #fa6; font-weight: bold; }
 */
@@ -66,4 +76,4 @@ a:hover {  text-decoration: underline;  }
 
 .metalinks { padding-left: 12; color: gray; }
 .metalinks a { color: navy; }
-.metalinks { position: absolute; left: 300; }
\ No newline at end of file
+.metalinks { position: absolute; left: 300; }

diff --git a/conifer/templates/master.xhtml b/conifer/templates/master.xhtml
index 3d91814..df7ce76 100644 (file)
--- a/conifer/templates/master.xhtml
+++ b/conifer/templates/master.xhtml
@@ -23,15 +23,28 @@ app_name = 'Syrup E-Reserve System'
        </div>
        <img src="/static/institution-logo.png" style="height: 50;"/>
       </div>
+        <!--
       <div id="header" py:if="user.is_authenticated()">
+        trying to keep the search box consistent for now
+        -->
+      <div id="header">
+        <div id="search">
+            <form method="get" action="search">
+            <input id="q" name="q" maxlength="100" size="25" type="text" 
+                value="search..." onblur="if(this.value=='') this.value='search...';" 
+                onfocus="if(this.value=='search...') this.value='';"/>
+            </form>
+        </div>
+      <span py:if="user.is_authenticated()">
        <strong style="padding-right: 18;">Welcome, ${user.first_name or user.username}!</strong>
        <a href="/accounts/logout">Log Out</a>
        &bull; <a href="/user/prefs">Preferences</a>
        &bull; <a href="/admin/">Admin UI</a>
-      </div>
-      <div id="header" py:if="not user.is_authenticated()">
+      </span>
+      <span py:if="not user.is_authenticated()">
        <strong style="padding-right: 18;">Welcome!</strong>
-      </div>
+      </span>
+    </div>
       <xi:include py:if="user.is_authenticated()" href="tabbar.xhtml"/>
       <div id="mainpanel">
        ${select('*|text()')}