From 520bbb6cda9f0a2e4392ed7458139006ca277f33 Mon Sep 17 00:00:00 2001 From: senator Date: Fri, 4 Feb 2011 11:33:21 -0500 Subject: [PATCH] kill a lot of inline styling, add some more js stubs, fix a bug in advanced.tt2 --- .../web/opac/skin/kcls-wire/css/semiauto.css | 23 ++++----- Open-ILS/web/opac/skin/kcls-wire/js/misc.js | 3 ++ .../templates/default/kcls-wire/advanced.tt2 | 1 - .../default/kcls-wire/parts/cn_browse.tt2 | 13 ++--- .../default/kcls-wire/parts/homesearch.tt2 | 48 +++++++------------ .../default/kcls-wire/parts/libselect.tt2 | 2 +- .../default/kcls-wire/parts/searchbar.tt2 | 17 ++++--- .../default/kcls-wire/parts/tips.tt2 | 2 +- .../default/kcls-wire/parts/topnav.tt2 | 6 +-- 9 files changed, 52 insertions(+), 63 deletions(-) diff --git a/Open-ILS/web/opac/skin/kcls-wire/css/semiauto.css b/Open-ILS/web/opac/skin/kcls-wire/css/semiauto.css index f8009cf8ff..8e01ae1eb8 100644 --- a/Open-ILS/web/opac/skin/kcls-wire/css/semiauto.css +++ b/Open-ILS/web/opac/skin/kcls-wire/css/semiauto.css @@ -27,7 +27,7 @@ .red { color: red; } .bold-red { color: red; font-weight: bold } .pointer { cursor: pointer; } -.no-display { display: none } +#lib_selector_span { display: none } .float-left { float: left; } .opac-auto-039 { float: left; font-weight: bold; padding-top: 5px; } .opac-auto-040 { float: left; padding: 5px 0px 0px 10px; } @@ -38,7 +38,7 @@ .opac-auto-046 { float: right; width: 214px; } .opac-auto-047 { float: right; width: 353px; background: #ccc; padding: 10px; margin-top: 7px; } .opac-auto-048 { float: right; width: 65px; } -.opac-auto-049 { float: right; width: 675px; height: 213px; color: green; overflow: hidden; } +#they_said_dont_touch { float: right; width: 675px; height: 213px; color: green; overflow: hidden; } .opac-auto-050 { float: right; width: 85px; } .ten-px { font-size: 10px; } .eleven-px { font-size: 11px; } @@ -54,7 +54,7 @@ .normal-height { height: 15px; } .big-height { height: 20px; } .very-big-height { height: 30px; } -.opac-auto-066 { height: 24px; background: #252525; } +#gold-links-holder { height: 24px; background: #252525; } .opac-auto-067 { margin: 3px; width: 100%; } .big-block { margin: auto; width: 974px; height: 0px; } .opac-auto-069 { margin-bottom: 10px; } @@ -62,7 +62,7 @@ .opac-auto-071 { margin-bottom: 5px; } .opac-auto-072 { margin-left: 20px; } .opac-auto-073 { margin-left: 5px; margin-top: 5px; } -.opac-auto-074 { margin-left: 6px; } +#cn_browse_where { margin-left: 6px; } .opac-auto-075 { margin-right: 20px; } .opac-auto-076 { margin-right: 3px; } .opac-auto-077 { margin-right: 4px; position: relative; top: -10px; } @@ -113,9 +113,10 @@ .opac-auto-122 { padding-top: 7px; } .opac-auto-123 { padding-top: 8px; } .pos-abs { position: absolute; } -.opac-auto-126 { position: absolute; z-index: 101; } +#new_cat_link_holder { position: absolute; z-index: 101; } +#new_cat_link_holder a { display: block; width: 675px; height: 213px; } .pos-rel { position: relative; } -.opac-auto-128 { position: relative; left: -10px; } +#search-box table { position: relative; left: -10px; } .opac-auto-129 { position: relative; left: -19px; } .opac-auto-130 { position: relative; left: 80px; } .opac-auto-131 { position: relative; top: 0px; left: 55px; } @@ -125,7 +126,7 @@ .opac-auto-135 { position: relative; top: -15px; left: -23px; } .opac-auto-136 { position: relative; top: 161px; left: 172px; } .opac-auto-137 { position: relative; top: 161px; left: -23px; } -.opac-auto-138 { position: relative; top: -1px; left: 10px; } +#home_adv_search_link { position: relative; top: -1px; left: 10px; } #util_back_btn { position: relative; top: 1px; left: 10px; } .opac-auto-140 { position: relative; top: -2px; } #util_help_btn { position: relative; top: 2px; left: 40px; } @@ -135,7 +136,7 @@ .opac-auto-145 { position: relative; top: -3px; left: 3px; } .opac-auto-146 { position: relative; top: -3px; left: -5px; } .opac-auto-147 { position: relative; top: -5px; } -.opac-auto-148 { position: relative; top: 5px; } +#learn_more { position: relative; top: 5px; } .opac-auto-149 { position: relative; top: 5px; left: 25px; } #util_print_btn { position: relative; top: 5px; left: 30px; } .opac-auto-151 { position: relative; top: 75px; } @@ -162,7 +163,7 @@ .opac-auto-174 { width: 111px; height: 25px; } .opac-auto-175 { width: 125px; height: 21px; } .opac-auto-176 { width: 129px; } -.opac-auto-177 { width: 162px; } +#search_box { width: 162px; } .opac-auto-178 { width: 174px; } .opac-auto-179 { width: 175px; margin-right: 11px; } .opac-auto-180 { width: 182px; color: black; padding: 5px 25px; } @@ -177,7 +178,7 @@ .opac-auto-189 { width: 742px; float: left; } .opac-auto-190 { width: 88px; } .opac-auto-191 { width: 90px; } -.opac-auto-192 { width: 90%; text-align: center; margin: 10px; } +#cn_browse_div > div { width: 90%; text-align: center; margin: 10px; } .opac-auto-193 { width: 91px; } -.opac-auto-194 { width: 95%; text-align: center; padding: 15px; } +#cn_browse { width: 95%; text-align: center; padding: 15px; } .opac-auto-195 { width: 99%; text-align: center } diff --git a/Open-ILS/web/opac/skin/kcls-wire/js/misc.js b/Open-ILS/web/opac/skin/kcls-wire/js/misc.js index 8ca55fd0c7..aa76a3870c 100644 --- a/Open-ILS/web/opac/skin/kcls-wire/js/misc.js +++ b/Open-ILS/web/opac/skin/kcls-wire/js/misc.js @@ -137,6 +137,9 @@ function advAddGblRow() { $n(newrow, 'type').focus(); } +var rdetailShowExtra = _stub; /* XXX TODO reimplement without JS? */ +var cnBrowsePrev = _stub; +var cnBrowseNext = _stub; var rdetailNewBookbag = _stub; /* XXX TODO reimplement without JS? */ var addMyList = _stub; /* XXX TODO we probably still need this one */ var listSaveAction = _stub; /* XXX TODO we probably still need this one */ diff --git a/Open-ILS/web/templates/default/kcls-wire/advanced.tt2 b/Open-ILS/web/templates/default/kcls-wire/advanced.tt2 index 3cd4ced6fe..654a84b777 100644 --- a/Open-ILS/web/templates/default/kcls-wire/advanced.tt2 +++ b/Open-ILS/web/templates/default/kcls-wire/advanced.tt2 @@ -1,7 +1,6 @@ [% WRAPPER "default/kcls-wire/parts/base.tt2"; INCLUDE "default/kcls-wire/parts/topnav.tt2"; ctx.page_title = "Advanced Search" %] -[% END -%]
[% INCLUDE "default/kcls-wire/parts/utils.tt2" %]
diff --git a/Open-ILS/web/templates/default/kcls-wire/parts/cn_browse.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/cn_browse.tt2 index b1043911f9..ce652362ed 100644 --- a/Open-ILS/web/templates/default/kcls-wire/parts/cn_browse.tt2 +++ b/Open-ILS/web/templates/default/kcls-wire/parts/cn_browse.tt2 @@ -1,11 +1,12 @@ -
-
&common.cn.loading;
+
+
+ &common.cn.loading; +
-
+
&common.cn.browsing; - +
@@ -26,7 +27,7 @@
-
+
diff --git a/Open-ILS/web/templates/default/kcls-wire/parts/homesearch.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/homesearch.tt2 index acb738ea08..7e70e6cc8a 100644 --- a/Open-ILS/web/templates/default/kcls-wire/parts/homesearch.tt2 +++ b/Open-ILS/web/templates/default/kcls-wire/parts/homesearch.tt2 @@ -3,14 +3,12 @@

Welcome to the
New Library Catalog!

Featuring enhanced holds, management
tools, improved self checkout, and more.

- Learn more »

- + Learn more » +

- - + @@ -20,19 +18,11 @@ - - -
-
-
- - - - - +
+
@@ -67,14 +57,7 @@
- - - - - -
- -
- New catalog - - - -
+ + New catalog +
-
-
+
+ +
+
- +
Browse for:
Browse for:
booksmoviesdownloadswebsites
musicmagazinesdatabasesanswers
diff --git a/Open-ILS/web/templates/default/kcls-wire/parts/libselect.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/libselect.tt2 index 984c999f3f..8e1df13672 100644 --- a/Open-ILS/web/templates/default/kcls-wire/parts/libselect.tt2 +++ b/Open-ILS/web/templates/default/kcls-wire/parts/libselect.tt2 @@ -2,7 +2,7 @@ -