early stuff

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
index 0838a29..f7437a2 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
@@ -119,6 +119,9 @@ sub load {
     return $self->load_simple("advanced") if
         $path =~ m:opac/(advanced|numeric|expert):;
 
+    # XXX TODO make ->load_browse()
+    return $self->load_simple("browse") if $path =~ m|opac/browse|;
+
     return $self->load_rresults if $path =~ m|opac/results|;
     return $self->load_print_record if $path =~ m|opac/record/print|;
     return $self->load_record if $path =~ m|opac/record/\d|;

diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2
index 220c56f..5c5a2c9 100644 (file)
--- a/Open-ILS/src/templates/opac/advanced.tt2
+++ b/Open-ILS/src/templates/opac/advanced.tt2
@@ -6,11 +6,14 @@
     loc = ctx.search_ou;
 -%]
     <div id="search-wrapper">
-        <div id="search-box">
+        <div id="search-tools">
             <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
-            <a href="[% mkurl(ctx.opac_root _ '/home') %]"
-                id="home_adv_search_link"><span
-                class="adv_search_font">[%l('Basic Search')%]</span></a>
+            <span><a href="[% mkurl(ctx.opac_root _ '/home') %]"
+                    id="home_adv_search_link">[%l('Basic Search')%]</a></span>
+
+            <span><a href="[% mkurl(ctx.opac_root _ '/browse') %]">[%
+                    l('Browse the Catalog')%]</a></span>
+
         </div>
         <div id="adv_search_parent">
             <div id="adv_search_tabs">

diff --git a/Open-ILS/src/templates/opac/browse.tt2 b/Open-ILS/src/templates/opac/browse.tt2
new file mode 100644 (file)
index 0000000..b66664a
--- /dev/null
+++ b/Open-ILS/src/templates/opac/browse.tt2
@@ -0,0 +1,25 @@
+[%- # This is the bib and authority combined record browser.
+
+    PROCESS "opac/parts/header.tt2";
+    PROCESS "opac/parts/misc_util.tt2";
+    WRAPPER "opac/parts/base.tt2";
+    INCLUDE "opac/parts/topnav.tt2";
+    ctx.page_title = l("Browse the Catalog"); %]
+    <div id="search-wrapper">
+        [%# XXX TODO Give searchbar smarts # INCLUDE "opac/parts/searchbar.tt2" %]
+        <div id="search-tools">
+            <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
+            <span><a href="[% mkurl(ctx.opac_root _ '/advanced') %]"
+                    id="home_adv_search_link">[%l('Advanced Search')%]</a></span>
+            <span>[% l('Browse the Catalog') %]</span>
+        </div>
+    </div>
+    <div id="content-wrapper">
+        <div id="main-content">
+            <div id="browse-the-catalog">
+                blah blah blah [%# INCLUDE "opac/parts/browse.tt2" %]
+            </div>
+            <div class="common-full-pad"></div>        
+        </div>
+    </div>
+[% END %]

diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 959609d..12c92cb 100644 (file)
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -870,10 +870,6 @@ table.acct_notes th {
     padding-right: 5px;
 }
 
-.adv_search_font {
-    font-size: [% css_fonts.size_smaller %];
-}
-
 .search_catalog_lbl {
     font-size: [% css_fonts.size_bigger %];
 }
@@ -1515,3 +1511,7 @@ a.preflib_change {
 .record_author {
     font-style: italic;
 }
+
+#search-tools > span {
+    margin: 0 1em;
+}

diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 0359c83..2034a97 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -3,11 +3,11 @@
     [% UNLESS took_care_of_form -%]
     <form action="[% ctx.opac_root %]/results" method="get">
     [%- END %]
-    <div>
+    <div id="search-tools">
         <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
         <a href="[% mkurl(ctx.opac_root _ '/advanced') %]"
-            id="home_adv_search_link"><span
-            class="adv_search_font">[% l('Advanced Search') %]</span></a>
+            id="home_adv_search_link">[% l('Advanced Search') %]</a>
+        <span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse') %]">[% l('Browse the Catalog') %]</a></span>
     </div>
     <div class="searchbar">[%- l('Search ');
         IF search.basic_config.type == 'attr';

diff --git a/Open-ILS/web/css/skin/default/opac/semiauto.css b/Open-ILS/web/css/skin/default/opac/semiauto.css
index 88f3284..dfe8a6f 100644 (file)
--- a/Open-ILS/web/css/skin/default/opac/semiauto.css
+++ b/Open-ILS/web/css/skin/default/opac/semiauto.css
@@ -19,7 +19,6 @@
 #new_cat_link_holder a { display: block; width: 675px; height: 213px; }
 .pos-rel { position: relative; }
 #search-box table { position: relative; left: -10px; }
-#home_adv_search_link { position: relative; top: -1px; left: 10px; }
 #util_back_btn { position: relative; top: 1px; left: 10px; }
 #util_help_btn { position: relative; top: 2px; left: 40px; }
 #util_forw_btn { position: relative; top: 2px; left: 50px; }