From 0c454c95b78a2e3f6e766a212d31556f32d02b6d Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 11 Oct 2007 15:52:22 -0500 Subject: [PATCH] Tweaking holds screen, trying to get additional patron information to show up in holds sidebar; Tweaks to serials interface, including overhaul of subscription-add screen Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../intranet-tmpl/prog/en/css/staff-global.css | 7 +- .../intranet-tmpl/prog/en/includes/hold-menu.inc | 2 + .../prog/en/includes/serials-toolbar.inc | 4 +- .../prog/en/modules/reserve/request.tmpl | 2 +- .../en/modules/serials/acqui-search-result.tmpl | 2 +- .../prog/en/modules/serials/serials-home.tmpl | 39 ++-- .../prog/en/modules/serials/subscription-add.tmpl | 245 ++++++++++----------- .../en/modules/serials/subscription-detail.tmpl | 2 +- reserve/request.pl | 3 + 9 files changed, 151 insertions(+), 155 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 4ce6a94d51..ee919eb579 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -512,8 +512,6 @@ padding: 0; width: 100%; } - - fieldset.rows legend { margin-left: 1em; font-weight: bold; @@ -597,6 +595,11 @@ fieldset.rows fieldset.action { padding : 0 0 1em 1em; } +fieldset.rows .inputnote { + float : left; + margin : .5em 0 0 10em; +} + .tabs-nav li { list-style : none; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc index 343c060a6e..efff613d23 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc @@ -16,6 +16,8 @@ No phone stored. +
    • +
  • ">
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc index 8fa89edc97..a95ec869ef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc @@ -1,10 +1,10 @@ \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl index a2300fd24d..c865cd0870 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl @@ -111,7 +111,7 @@ if (alreadyreserved > "0"){
    (type card number or part of a name)
    - + " />
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl index a4beae7176..57ecb46dc8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl @@ -29,7 +29,7 @@ function GetIt(aqbooksellerid,name) - ,'')">Get It ! + ,'')">Choose diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl index 024dc1553f..62585e0b45 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl @@ -13,7 +13,8 @@
    - + + Serials updated : @@ -86,8 +87,7 @@ Serials updated : @@ -95,11 +95,11 @@ Serials updated : + + - - @@ -143,14 +143,7 @@ Serials updated :
    - - " title="Issues history"> + - - - - | - + + " class="button" title="subscription detail"> + --- + + @@ -115,6 +115,13 @@ Serials updated : + + + + ">Issue History + @@ -129,13 +136,6 @@ Serials updated : - " class="button" title="subscription detail">Detail - - - - &serstatus=1,3">Serial receive
    - - - - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl index 0660217b8d..736788f2b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl @@ -313,15 +313,15 @@ document.getElementById("more_options").innerHTML = ''; var textbox = ''; // alert("X: "+x+"Y: "+y+"Z: "+z); if(x){ - textbox +="\n
     <\/td>"+x+"<\/td>"; + textbox +="\n
     <\/th>"+x+"<\/th>"; if(y){ - textbox +=""+y+"<\/td>"; + textbox +=""+y+"<\/th>"; if(z){ - textbox +=""+z+"<\/td>"; + textbox +=""+z+"<\/th>"; } } textbox +="<\/tr>\n"; - textbox +="
    "+text[5]+"<\/td><\/td>\n"; + textbox +="
    "+text[5]+"<\/td><\/td>\n"; if(y){ textbox +="<\/td>\n"; if(z){ @@ -330,7 +330,7 @@ var textbox = ''; } textbox +="<\/tr>\n"; if(y){ - textbox +="
    "+text[6]+"<\/td>"; + textbox +="
    "+text[6]+"<\/th>"; textbox +=""+_('Irregularity?')+"<\/a><\/td>\n"; textbox +="<\/td>\n"; if(z){ @@ -379,7 +379,7 @@ var textbox = ''; // alert("X: "+x+"Year: "+y); if(x){ var hemi_select = parseInt(''); - textbox +="\n
    "+ text[7] +"<\/td>"; for(var i = 1; i <= 2; i++){ textbox +="
     <\/td>"+x+"<\/td>"; - textbox +=""+text[16]+"<\/td>"; + textbox +="<\/li>\n"; + textbox +=" - + @@ -1198,13 +1195,11 @@ window.onload = irregular_order(); + + -
    - -
    - \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl index 0262e7d501..2f58c6b06e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl @@ -106,7 +106,7 @@ function popup(subscriptionid) {

    Subscription #

    -
    Subscription is by its end. It should be renewed now.
    +
    Subscription is near its end. It should be renewed now.

    Subscription information

    diff --git a/reserve/request.pl b/reserve/request.pl index d372175cfc..310957ab71 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -126,6 +126,9 @@ if ($cardnumber) { borrowerstreetaddress => $borrowerinfo->{'address'}, borrowercity => $borrowerinfo->{'city'}, borrowerphone => $borrowerinfo->{'phone'}, + borrowermobile => $borrowerinfo->{'mobile'}, + borrowerfax => $borrowerinfo->{'fax'}, + borrowerphonepro => $borrowerinfo->{'phonepro'}, borroweremail => $borrowerinfo->{'email'}, borroweremailpro => $borrowerinfo->{'emailpro'}, borrowercategory => $borrowerinfo->{'category'}, -- 2.11.0
     <\/th>"+x+"<\/th>"; + textbox +=""+text[16]+"<\/th>"; textbox +="<\/tr>\n"; - textbox +="
    "+text[5]+"<\/td>
    "+text[5]+"<\/th>
    "+text[6]+"<\/td>"; + textbox +="
    "+text[6]+"<\/th>"; textbox +=""+_('Irregularity?')+"<\/a><\/td>\n"; textbox +="<\/td>\n"; textbox +="<\/tr><\/table>\n"; @@ -735,9 +735,10 @@ function check_input(e){ } } -function Create_biblio(f) -{ - window.open('/cgi-bin/koha/cataloguing/addbiblio.pl?mode=popup','FindABibIndex','width=1024,height=768,toolbar=no,scrollbars=yes'); +function addbiblioPopup(biblionumber) { + var destination = "/cgi-bin/koha/cataloguing/addbiblio.pl?mode=popup"; + if(biblionumber){ destination += "&biblionumber="+biblionumber; } + window.open(destination,'AddBiblioPopup','width=1024,height=768,toolbar=no,scrollbars=yes'); } function Plugin(f) @@ -762,13 +763,13 @@ function Check(f) { document.f.submit(); } else { if(f.numbering_pattern.value == ''){ - alert(_("need to choose a numbering pattern")); + alert(_("Please choose a numbering pattern")); } else { - alert(_("need to check for irregularity by clicking 'Irregularity?'")); + alert(_("Please check for irregularity by clicking 'Irregularity?'")); } } } else { - alert(_('field marked with * are mandatory')); + alert(_('Fields marked with * are mandatory')); } return false; } @@ -791,13 +792,10 @@ window.onload = irregular_order(); -
    +
    -
    -
    - - +

    Modify a subscription

    @@ -813,33 +811,34 @@ window.onload = irregular_order(); -

    Subscription information for subscription #

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Librarian:
    " size="8" /> (" disabled="disabled" readonly="readonly" />) Search for a Supplier
    - " size="8" /> +
    +
    + Subscription information for subscription # +
      +
    1. + Librarian: +
      2. +
    2. + + " size="8" /> (" disabled="disabled" readonly="readonly" />)
      Search for a Supplier
      +
      3. +
    3. + + + " size="8" /> (" disabled="disabled" readonly="readonly" />) - Search for Biblio | - Create Biblio -
    " size="20" />
    Branch - " size="20" /> + +
  • + + + (select a branch) -
    • Patron alert with - + +
  • + + +
    • +
  • + + + (select a letter & patrons will be able to "follow" this subscription and recieve a mail on every new issue) -
    • Warning: +
    (select a letter & patrons will be able to "follow" this subscription and recieve a mail on every new issue)
    + + + + +
    Warning: +
    • Remember you must have created a biblio before creating a subscription
    • You also must have selected a supplier if you want to ask for late issues
      • -
    -
    +
    + + + +
    + +
    -

    Planning

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    First Issue ETA: - /lib/calendar/cal.gif" id="button2" style="cursor: pointer;" alt=""/> - " size=13 maxlength=10 id="acqui_date" style="border-width: 0px;" /> +
    + Planning +
      +
    1. + + + /lib/calendar/cal.gif" id="button2" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" /> + " size="13" maxlength="10" id="acqui_date" style="border-width: 0px;" /> -
    		-
    -
    Frequency: (*) - @@ -1000,13 +1001,11 @@ window.onload = irregular_order(); - - Manual History : -
    Numbering Pattern: + +
    • +
  • + + -
    -
    -
    • Begins On: (*) - /lib/calendar/cal.gif" id="button1" style="cursor: pointer;" alt="" /> + +
  • +
  • +
  • +
  • + + + /lib/calendar/cal.gif" id="button1" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" /> " size="13" maxlength="10" id="beginning_date" /> -
    • Subscription length -
    Numbering calculationNumbering formula: " />
    -
    + + +
    @@ -1175,7 +1172,7 @@ window.onload = irregular_order();
    		" />(if empty : subscription still active)
    Recieved issuesReceived issues