From 14488354a8c1daf5f59bf8e7f0b8cc2be01235bc Mon Sep 17 00:00:00 2001 From: tipaul Date: Thu, 4 Aug 2005 13:48:31 +0000 Subject: [PATCH] synch'ing 2.2 and head --- .../en/authorities/authorities-home.tmpl | 16 ++ .../en/authorities/searchresultlist-auth.tmpl | 12 +- .../default/en/bull/bull-home.tmpl | 30 ++-- .../default/en/bull/full-serial-issues.tmpl | 68 +++++++++ .../default/en/bull/serial-issues.tmpl | 77 ++++++---- .../default/en/bull/statecollection.tmpl | 4 +- .../default/en/bull/subscription-detail.tmpl | 25 ++- .../default/en/catalogue/detail.tmpl | 100 +++++++----- .../en/help/bull/subscription-add.tmpl | 7 +- .../default/en/help/import/breeding.tmpl | 13 ++ .../default/en/help/members/memberentry.tmpl | 1 + .../default/en/includes/about-top.inc | 20 +-- .../default/en/includes/acquisitions-top.inc | 22 +-- .../default/en/includes/auth-top.inc | 47 +----- .../default/en/includes/bull-top.inc | 26 +--- .../default/en/includes/cat-top.inc | 27 +--- .../default/en/includes/circulation-top.inc | 27 +--- .../default/en/includes/common-style.css | 143 +++++++++++------- .../default/en/includes/favicon.ico | Bin 0 -> 1406 bytes 19 files changed, 368 insertions(+), 297 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/default/en/bull/full-serial-issues.tmpl create mode 100644 koha-tmpl/intranet-tmpl/default/en/help/import/breeding.tmpl create mode 100644 koha-tmpl/intranet-tmpl/default/en/includes/favicon.ico diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl index 4380a27cea..8c97dfc575 100644 --- a/koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl @@ -44,6 +44,22 @@

+
+

Add authority

+
+

Authority type + + +

+
+
+ diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl index 8b7f41abcf..8eb369e5ec 100644 --- a/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl @@ -45,7 +45,7 @@

- &=&resultsperpage=&authtypecode=&op=do_search&type=intranet"> + &&authtypecode=&=&op=do_search&type=intranet&index="> @@ -53,12 +53,12 @@ -highlight.gif"> - &=&resultsperpage=&authtypecode=&op=do_search&type=intranet"> + &authtypecode=&=&op=do_search&type=intranet&index="> .gif" border="0"> - &=&resultsperpage=&authtypecode=&op=do_search&type=intranet"> + &&authtypecode=&=&op=do_search&type=intranet&index=">

@@ -100,7 +100,7 @@

- &&authtypecode=&and_or=and&operator=contains&value=&op=do_search&type=intranet"> + &=&resultsperpage=&authtypecode=&op=do_search&type=intranet"> @@ -108,12 +108,12 @@ -highlight.gif"> - &authtypecode=&and_or=and&operator=contains&value=&op=do_search&type=intranet"> + &=&resultsperpage=&authtypecode=&op=do_search&type=intranet"> .gif" border="0"> - &&authtypecode=&and_or=and&operator=contains&value=&op=do_search&type=intranet"> + &=&resultsperpage=&authtypecode=&op=do_search&type=intranet">

diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl index 0f68fad5f3..b9f0594c9a 100644 --- a/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl @@ -4,33 +4,45 @@

Serials subscriptions

- + + - + + diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/full-serial-issues.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/full-serial-issues.tmpl new file mode 100644 index 0000000000..68d4cd9695 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/default/en/bull/full-serial-issues.tmpl @@ -0,0 +1,68 @@ + + + + +

Subscription information for biblio # with title :

+

+ " class="button bull">Back to biblio + + + + )"> + + + &selectview=small">Compact view +

+ +
" id="" style="position:absolute; visibility:hidden; margin-top:0px; border:4px;" style="visibility:visible"> +
Title ISSNTitle + Note +  
- "> + " title="type ISSN here to filter subscription"> - "> + " title="type a title -complete or partial- to filter subscription"> - + +   + +
- () + + " class="button bull" title="Issues history"> + + + + - + () - " class="button bull">Detail - " class="button bull">Recieve + " class="button bull" title="subscription detail">Detail + " class="button bull" title="receive issues for this subscription">Receive
+ + + + + + + + + + + + + + +
Information + Date + Number + Status +
+ + + + + + + Arrived + Waited + Late + Missing +
+
+ + + + diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl index 7135381e3d..ca1116726c 100644 --- a/koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl @@ -1,12 +1,15 @@ - +
-

Issues for a subscription

-" class="button catalogue">Biblio - -
-

Subscription information

-

For that began on and is issued every +

Issues for a subscription

+ " class="button bull">Back to subscriptions + " class="button bull">Back to biblio + &selectview=full">Complete view + + +
+

Subscription information for

+

It began on and is issued every day @@ -24,10 +27,10 @@ month - 2 monthes + 2 months - 3 Monthes + 3 months quarter @@ -42,46 +45,58 @@ 2 years - on - - Monday + on monday - Tuesday + on tuesday - Wednesday + on wednesday - Thursday + on thursday - Friday + on friday - Saturday + on saturday - Sunday + on sunday - -

-

(subscription for + for issues weeks months - ) +

+

Last renewal of subscription was

+

This subscription is now ended. The last issue was recieved on

+

-
-
-

Issues summary

-

- -

-
- + +

Issues summary

+

+ +

+ + +

Recieved issues

+

+ +

+ + +

Missing issues

+

+ +

+ +
+ +
- \ No newline at end of file + diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl index d4e41f51ac..5defdf30e1 100644 --- a/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl @@ -3,7 +3,9 @@

Subscription for

-" class="button bull">Subscription +" class="button bull" title="detail of the subscription">Subscription +" class="button bull" title="all subscriptions on ">Subscriptions +" class="button bull" title="go to ">Back to biblio

waited or late numbers

diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl index 31fd5c12d0..474da4ad35 100644 --- a/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl @@ -2,9 +2,11 @@

Subscription

-" class="button bull">Edit -" class="button bull">Issues -" class="button bull">Biblio +" class="button bull" title="Modify subscription">Edit +" class="button bull" title="Recieve issues">Receive +" class="button bull" title="All issues on this title">Issue history +" class="button bull" title="all subscriptions on ">Subscriptions +" class="button bull" title="go to ">Back to biblio delete @@ -14,18 +16,11 @@

Subscription information

Librarian identity :

-

-

-

-

()

-

-

- - - - - -

+

+

+

+

()

+

Planning

diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl index 5e0f615ce1..5508124670 100644 --- a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl @@ -53,40 +53,72 @@ - +

; -
+

-
-
-
- - , - ,
-
-
-
- - - ">, -
-
-
-
-
- ">
- +

+

+

+

+ +

+

+

+ + , +

+

+

+

vol.

+ +

+

+ + "> + +
+ +

+ +

+ +

">,

+ + +

+ +

+

+ +

-

+ +

+ +

+ +

+

+

+ +

+ + ">  + +

+ +

-
- -

Total Number of Items:

- +

+ +

Total Number of Items:

+ @@ -126,24 +158,18 @@ - - - - Website - Online - Available - - - &bib=&bi=">http:// - - -
diff --git a/koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl index 2cbc61b301..d50db0b749 100644 --- a/koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl @@ -2,7 +2,12 @@

Serials subscription add & modify help

    Subscription information bloc

    -

    it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.

    +

    It contains :

    +
      +
    • The name of the librarian that created the subscription, and the name of the supplier providing the subscription.
      • +
    • The title of the biblio managed by the subscription.
      • +
    • The name of the letter for issue alert. Letters are defined in parameters section. If you choose one, then every identified borrower will be able to subscribe to "issue alert" for this subscription : every time you issue something, he will recieve the "letter" as mail
      • +

    Planning information bloc

    it contains various information to calculate arrival dates.

    Subscription length

    diff --git a/koha-tmpl/intranet-tmpl/default/en/help/import/breeding.tmpl b/koha-tmpl/intranet-tmpl/default/en/help/import/breeding.tmpl new file mode 100644 index 0000000000..1e845facb0 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/default/en/help/import/breeding.tmpl @@ -0,0 +1,13 @@ + +

    Import iso2709 file

    +

    This is one of the screens you will see frequently if you are starting from scratch.

    +

    It is useful to import a bunch of iso2709 biblios that can be used later for a quick cataloguing

    +

    First, you need to browse your computer to find the MARC record that you grabbed for your item. Click on

    +

    Choose File to browse.

    +

    If you aren't sure if you've already imported a record, keep the radio button set to

    +

    Ignore this one, keep the existing one.

    +

    You can "name" the import to help you when you need to choose between more than 1 imported biblio (or just want to keep trace on where the biblios comes from)

    +

    You can also change char encoding between MARC21 and UNIMARC

    +

    You don't need to actually name every import, so you don't need to fill in this box if you don't want to. It is useful for telling imports apart if you've more than one of the same record.

    +

    IMPORTANT : This tool is NOT intended to import iso2709 in your ACTIVE DB. If you need to migrate datas from another ILS, then you must consider $kohaInstall/scripts/misc/bulkmarcimport.pl

    + diff --git a/koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl index eff5dee22f..87766312eb 100644 --- a/koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl @@ -1,6 +1,7 @@

    Add member help

    +

    sort1 and sort2 may now be related to a list of Authorized Values. All you have to do is define a Bsort1 or Bsort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Member Page

    Add Member, person

    diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc index c87077a318..5db9f8a449 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc @@ -17,34 +17,20 @@ function Help() { background-color: #86c268; color: #FFFFFF; text-decoration: normal; - font-weight: bold; } a.about:hover { background-color: #86c268; color: #FFFFFF; text-decoration: normal; - font-weight: bold; } - - + -

    Logged in as: [Log Out]

    +

    Logged in as: [Log Out]

    -

    Log In to Koha

    +

    Log In to Koha

    diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc index 010bc6d34d..f450663335 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc @@ -28,33 +28,21 @@ function Help() { color:#000000; background-image:none; text-decoration: normal; - font-weight: bold; } a.acquisition:hover { background-color: #ffdf61; color: #000000; text-decoration: normal; - font-weight: bold; } - - + + -

    Logged in as: [Log Out]

    +

    Logged in as: [Log Out]

    -

    Log In to Koha

    +

    Log In to Koha

    + diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc index 4fe3f32fb8..de6b538e0e 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc @@ -36,60 +36,21 @@ function searchauthority() { background-color: #6b7cbe; color:#FFFFFF; text-decoration: normal; - font-weight: bold; background-image:none; } a.authority:hover { background-color: #6b7cbe; color: #FFFFFF; text-decoration: normal; - font-weight: bold; } - - - - - + + -

    Logged in as: [Log Out]

    +

    Logged in as: [Log Out]

    -

    Log In to Koha

    +

    Log In to Koha

    diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc index 0b5d5a61d5..bfced7fc40 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc @@ -16,40 +16,20 @@ function Help() { background-color: #803010; color:#FFFFFF; text-decoration: normal; - font-weight: bold; background-image:none; } a.bull:hover { background-color: #803010; color: #FFFFFF; text-decoration: normal; - font-weight: bold; } - - - - + -

    Logged in as: [Log Out]

    +

    Logged in as: [Log Out]

    -

    Log In to Koha

    +

    Log In to Koha

    diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc index 0e7c2f9bc7..630fc1b9cc 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc @@ -33,28 +33,11 @@ a.catalogue:hover { - - - + + -

    Logged in as: [Log Out]

    +

    Logged in as: [Log Out]

    -

    Log In to Koha

    +

    Log In to Koha

    + diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc index 1fd3aa22b5..11cdfd318f 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc @@ -31,41 +31,20 @@ function Help() { color:#FFFFFF; background-image:none; text-decoration: normal; - font-weight: bold; } a.circulation:hover { background-color: #be6170; color: #FFFFFF; text-decoration: normal; - font-weight: bold; } - - - - + -

    Logged in as: [Log Out]

    +

    Logged in as: [Log Out]

    -

    Log In to Koha

    +

    Log In to Koha

    diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css b/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css index e76da14349..e2f4282321 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css +++ b/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css @@ -24,6 +24,10 @@ p { clear:left; } +textarea { + font-size:10pt; + font-family:arial,sans-serif; +} .center { text-align:center; } @@ -47,23 +51,26 @@ label { .button { text-align: center; - font: 1.2em sans-serif; + font-family: Arial; + font-size:12px; padding: 0px 5px 0px 5px; margin:2px; display:inline; position:static; - border-style: solid; - border-width: 1px; - border-color: black; + border : 1px solid black; +/* border-width: 1px; + border-color: black;*/ text-decoration: none; - color: black; cursor:pointer; vertical-align:middle; - -moz-border-radius: 6px; background-color:#FFFFFF; background-image:url("/intranet-tmpl/default/images/background-mem.gif"); } +.button:hover { + background-image:url("/intranet-tmpl/default/images/background-mem.gif"); +} + /* TABLES */ table { border:1px solid #000000; @@ -140,7 +147,7 @@ h1 { font-size: 150%; text-align:center; padding: 4px; - border: 4px inset #666666; +/* border: 1px solid #666666; */ } h2 { @@ -188,6 +195,10 @@ h3 { background-color:red; } +tr.hilighted td.problem { + background-color : #ff9999; +} + #mainbloc { float:left; width:90%; @@ -196,6 +207,7 @@ h3 { border-right:3px solid #000000; border-bottom:3px solid #000000; background-color:#FFFFFF; + margin-top:10px; margin-left:10px; margin-right:10px; padding-bottom:100px; @@ -277,62 +289,91 @@ a:hover { text-decoration: none; } -a.submenu { - text-decoration: none; - cursor : pointer; - color:#777777; - background-color:#EEEEEE; - font-weight: bold; - margin:0; -} -a.submenu:hover { - text-decoration: none; - cursor:pointer; - color:#777777; - background-color:#EEEEEE; - font-weight: bold; - margin:0; - background-image:url("/intranet-tmpl/default/images/background-mem.gif"); -} - -a.submenu2 { - text-decoration: none; - cursor:pointer; - color:#777777; - background-color:#CCCCCC; - font-weight: bold; - margin:0; -} -a.submenu2:hover { - text-decoration: none; - cursor:pointer; - color:#777777; - background-color:#CCCCCC; - font-weight: bold; - background-image:url("/intranet-tmpl/default/images/background-mem.gif"); - margin:0; -} - #menubar { + z-index:2; + position:absolute; + top:0px; + left:0px; border-top:1px solid #666666; - font: 125% bold sans-serif; + font-size: 14px; background-color:#DDDDDD; padding-bottom:5px; } -#submenu { - background-color:#EEEEEE; - border-left:1px solid #000000; - padding-bottom:5px; - font-size:110%; +html>body #menubar { +position: fixed; } #menubar a { padding:5px; } -#submenu a { - padding:5px; + +a.submenu { + padding:0px 10px 0px 10px; + display:block; + background-color:#FFFFFF; + color:#000000; +} +a.submenu:hover { + padding:0px 10px 0px 10px; + display:block; + background-color:#DDDDDD; + color:#000000; +} +#Subm1 { + z-index: 11; left: 75px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black; +} +html>body #Subm1 { +position: fixed; +} +#Subm2 { + z-index: 12; left: 150px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black; +} +html>body #Subm2 { +position: fixed; +} +#Subm3 { + z-index: 12; left: 250px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black; +} +html>body #Subm3 { +position: fixed; +} +#Subm4 { + z-index: 12; left: 320px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black; +} +html>body #Subm4 { +position: fixed; +} +#Subm5 { + z-index: 12; left: 400px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black; +} +html>body #Subm5 { +position: fixed; +} +#Subm6 { + z-index: 12; left: 480px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black; +} +html>body #Subm6 { +position: fixed; } +#Subm7 { + z-index: 12; left: 550px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black; +} +html>body #Subm7 { +position: fixed; +} + +.user { + padding-top: 30px; + padding-bottom:0px; + text-align:right; +} + +.user { + padding-top: 30px; + padding-bottom:0px; + text-align:right; +} .koha { text-align:center; background-image:url("/intranet-tmpl/default/images/background-mem.gif"); diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/favicon.ico b/koha-tmpl/intranet-tmpl/default/en/includes/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..586bd559d9cd6d67a69a1e0f5b96cc7a1b95ca46 GIT binary patch literal 1406 zcmeH`J&#gB6o#Mcdf62fk=5&>a$VQ2tDr8dvVLy@KZ1gW4ht&6KOlqvJ&84;0ct8b zLT5stAc2AcC`f4dNFYGM^)3Qon{DjOzLPUK&zUos%sUwnv|%)&&3pV5K>`#lv=WC} zoYybY$?souyIp)fAHiUd;c&=cFu-cH5{X2Z&*v-_3!>2|Hk*xHF2`&(V=|dAolXgd z!?@jUMxzm}R*O_BMKYPB)9GNh+i5nN`2BuFQN&;{P%f9z>2zc=8H&Xsi9~{YK2N1m zp-?Cg2n1-i+lDddNRoss%cRq3JRT46c$|8@j??M9%$BRQD+m5-2UJx(|1%e*6}Kb^8hrb% z*Z(*;+t<=1?>J9SKYjl4bw{_2Zgt^4oXsjT)``Un#HOSeN*Bzy3KdUT(2! zk)IqsJ$kn8S05Zm=7*0SZ`gR(w14luv|;_tTenrioeitH-Mt$ct