From 4662f0f3f93f23df623fe7db472c252ed2441285 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 19 May 2008 09:34:59 -0500 Subject: [PATCH] Template restructuring to allow option of styling OPAC with fixed-width layout. This commit doesn't change the default OPAC appearance. Signed-off-by: Joshua Ferraro --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 43 +++++++++++++------ .../opac-tmpl/prog/en/includes/masthead.inc | 17 +++----- .../prog/en/modules/maintenance.tmpl | 6 +-- .../prog/en/modules/opac-ISBDdetail.tmpl | 8 ++-- .../prog/en/modules/opac-MARCdetail.tmpl | 7 +-- .../prog/en/modules/opac-account.tmpl | 4 +- .../prog/en/modules/opac-advsearch.tmpl | 6 +-- .../opac-tmpl/prog/en/modules/opac-auth.tmpl | 12 +++--- .../en/modules/opac-authorities-home.tmpl | 12 +++--- .../opac-authoritiessearchresultlist.tmpl | 21 ++++----- .../prog/en/modules/opac-browser.tmpl | 8 ++-- .../prog/en/modules/opac-detail.tmpl | 8 ++-- .../prog/en/modules/opac-dictionary.tmpl | 4 +- .../en/modules/opac-full-serial-issues.tmpl | 8 ++-- .../opac-tmpl/prog/en/modules/opac-main.tmpl | 19 +++++--- .../prog/en/modules/opac-passwd.tmpl | 4 +- .../prog/en/modules/opac-readingrecord.tmpl | 4 +- .../prog/en/modules/opac-reserve.tmpl | 20 ++++----- .../prog/en/modules/opac-results.tmpl | 20 +++++---- .../prog/en/modules/opac-serial-issues.tmpl | 16 +++---- .../prog/en/modules/opac-shelves.tmpl | 7 +-- .../opac-tmpl/prog/en/modules/opac-tags.tmpl | 4 +- .../prog/en/modules/opac-tags_subject.tmpl | 9 ++-- .../prog/en/modules/opac-topissues.tmpl | 8 ++-- .../opac-tmpl/prog/en/modules/opac-user.tmpl | 4 +- .../prog/en/modules/opac-userdetails.tmpl | 4 +- .../prog/en/modules/opac-userupdate.tmpl | 4 +- 27 files changed, 154 insertions(+), 133 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 4b25c75860..edc7c078af 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -334,18 +334,20 @@ p.availability { color : #006600; } -.inwait { - background-color : #33CC99; +.waiting,.intransit,.notforloan,.checkedout,.lost,.notonhold { + display : block; } - -/* css styles for reserves color alerts */ -.onloan { - background-color : #eeeeee; +.notforloan { + color : #900; } - -.other { - background-color : #ffcccc; +.lost { + color : #666; } +.waiting { + +} + + /* "problem" enhancement */ .problem { @@ -353,10 +355,6 @@ p.availability { background-color : red; } -.reserved { - background-color : #8EBAFF; -} - /* style for search terms in catalogsearch */ .term { color : blue; @@ -499,9 +497,17 @@ a .term { background-color: #FFF; } +#holds,#opac-auth { + min-width : 750px; + width : 57.69em; + margin : auto; +} + #members { background-color: #fff; font-size : 85%; + margin-left : -10px; + margin-right : -10px; padding : 4px 0 4px 0; color : #000066; } @@ -540,6 +546,8 @@ a .term { background-color : #739ACF; border-top : 1px solid #335599; border-bottom : 1px solid #335599; + margin-left : -10px; + margin-right : -10px; padding : .7em 0 .4em .5em; font-size : 108%; line-height : 116%; @@ -1122,6 +1130,11 @@ div.message { text-decoration : none; } +#news th { + text-align : left; + padding : 3px 5px; +} + #opac-main-search #listsmenu a, #opac-main-search #listsmenu h4 { color : #000; font-weight : normal; @@ -1619,6 +1632,7 @@ ul.ui-tabs-nav li.ui-tabs-selected a, ul.ui-tabs-nav li.ui-tabs-selected span.a } #bibliodescriptions { + clear : left; margin-top : .5em; } @@ -1732,4 +1746,7 @@ input.tagbutton { } table#items th { padding : 2px; +} +#action { + margin-top: 0; } \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index 09949576f5..329c09d6d0 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -114,22 +114,15 @@ - + +

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl index 287d30c8fd..f3854e414f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl @@ -2,11 +2,11 @@ Koha Online -- Library Catalog - +
+
-
-
+ System Maintenance ... we'll be back soon! If you have any questions, please contact the ">Site Administrator diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl index 44867eb563..cb8142232d 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl @@ -9,10 +9,10 @@ +
+
-
-
@@ -183,11 +183,11 @@
-
+
-
+
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl index 2a921bed84..615e3a16e0 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl @@ -2,10 +2,10 @@ - -
+ +
@@ -144,10 +144,11 @@
+
-
+
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl index 1c1bad333b..3108055e48 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl @@ -2,10 +2,10 @@ - -
+ +
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl index ba2eb598e6..d1836aeb6e 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl @@ -3,10 +3,10 @@ Catalog › Advanced Search - - -
+
+ +
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl index a1a9db87c1..21d5afe866 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl @@ -7,12 +7,13 @@ +
+
-
-
-
+
+
@@ -50,8 +51,8 @@ -
Don't have a password yet?

If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.

-
Don't have a library card?

If you don't have a library card, stop by your local library to sign up.

+
Don't have a password yet?

If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.

+
Don't have a library card?

If you don't have a library card, stop by your local library to sign up.

@@ -66,5 +67,6 @@
+
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl index 66316219a4..8107665fbd 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl @@ -2,13 +2,13 @@ +
+
-
-
- +
@@ -70,15 +70,15 @@
-
+ +
- -
+
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl index 0cedc3137a..cf002faf45 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl @@ -2,17 +2,17 @@ +
+
-
-
\ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl index 92624f3325..726d218369 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl @@ -2,10 +2,10 @@ +
+
-
-
@@ -45,11 +45,11 @@
+
- -
+
\ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl index 1cf4ab56e3..2a67dabcc4 100755 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl @@ -35,13 +35,13 @@ - - -
+ + +
-
+
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl index 12fe6d3452..dbf01aecc9 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl @@ -1,7 +1,7 @@ Koha Online Catalog › Dictionary Search
-

Dictionary Search

+

Dictionary Search

@@ -11,7 +11,7 @@ " /> " /> -
+
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl index 0ae76ec866..3e5348539f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl @@ -2,10 +2,10 @@ +
+
-
-
@@ -76,11 +76,11 @@ function showlayer(numlayer)
+
- -
+
\ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl index 95ed4174b8..e317d272da 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl @@ -3,13 +3,18 @@ - -
+ +
+
+ +
+ +
@@ -77,10 +82,10 @@ -
- +
+
@@ -94,17 +99,17 @@
+
-
-
+
-
+
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl index 2b31cb82fb..3ce76d9080 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl @@ -2,10 +2,10 @@ - -
+ +
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl index e1055a1879..6dd9ebaaf0 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl @@ -2,10 +2,10 @@ - -
+ +
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl index f4eabd5f3b..04898c00a4 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl @@ -2,9 +2,9 @@ +
-
@@ -134,7 +134,7 @@ " /> - +
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl index 06a09ade8a..7200482f74 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl @@ -59,14 +59,16 @@ $(document).ready(function(){ +
+
+ -
-
-
+
+
Did you mean:
    @@ -144,7 +146,7 @@ $(document).ready(function(){ -
    +
    @@ -294,16 +296,16 @@ $(document).ready(function(){
    Not finding what you're looking for?
    Make a purchase suggestion
    Not finding what you're looking for?
    Make a purchase suggestion
    - +
-
- +
+ - -
+
+
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl index b8e1e55293..56b5cdbe75 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl @@ -2,10 +2,10 @@ +
+
-
-
@@ -119,11 +119,11 @@
-
-
- - -
-
+ +
+
+ +
+
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl index a603215b38..f9c781d4f0 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl @@ -37,10 +37,10 @@ $.tablesorter.addParser({ +
+
-
-
@@ -276,12 +276,13 @@ $.tablesorter.addParser({
+
-
+
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl index f83b61be43..ae962c5f6a 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl @@ -2,10 +2,10 @@ - -
+ +
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl index f9d1faa9b6..f7b5141cbc 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl @@ -2,10 +2,10 @@ +
+
-
-
@@ -25,12 +25,11 @@ subject below to see the items in our collection.

-
+
- -
+
\ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl index bad59a4f40..eec1ad1cf3 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl @@ -27,10 +27,10 @@ function Dopop(link) { +
+
-
-
@@ -122,11 +122,11 @@ function Dopop(link) {
-
+
-
+
\ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl index 0d0bd0ca4a..92f1faed25 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl @@ -47,10 +47,10 @@ $.tablesorter.addParser({ - -
+ +
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl index 852c5b0d23..89b7a7b432 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl @@ -2,10 +2,10 @@ - -
+ +
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl index 86cb8b4253..3036ddc186 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl @@ -2,10 +2,10 @@ - -
+ +
-- 2.20.1
  " alt="" title=""> @@ -160,27 +160,27 @@ Due - In transit from , - to , since + In transit from , + to , since - Unavailable (lost or missing) + Unavailable (lost or missing) - Not for loan () + Not for loan () - WaitingOn hold for patron + WaitingOn hold for patron atexpected at since - . + . - Not on hold - + Not on hold +