From e439ec429880ffc2df0dc918b3ffb7eb8b261bf7 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 15 Oct 2008 10:18:14 -0500 Subject: [PATCH] Markup corrections, style fixes, and other minor bugs, including fix for Bug 2679 ("Dates Changing on Funds When Editing") Signed-off-by: Galen Charlton --- acqui/neworderempty.pl | 1 - admin/aqbudget.pl | 4 +- admin/authorised_values.pl | 1 - .../prog/en/includes/authorities-search.inc | 12 +-- .../en/includes/bookfund-admin-search.inc | 10 +-- .../prog/en/includes/cities-admin-search.inc | 4 +- .../prog/en/includes/dictionary-toolbar.inc | 2 +- .../prog/en/includes/guided-reports-view.inc | 8 +- .../en/includes/roadtype-admin-search.inc | 4 +- .../prog/en/modules/acqui/neworderempty.tmpl | 6 +- .../prog/en/modules/admin/aqbudget.tmpl | 4 +- .../prog/en/modules/admin/branches.tmpl | 14 ++-- .../prog/en/modules/admin/currency.tmpl | 10 ++- .../en/modules/admin/patron-attr-types.tmpl | 2 +- .../en/modules/authorities/authorities.tmpl | 31 +++----- .../en/modules/reports/borrowers_out.tmpl | 2 +- .../en/modules/reports/cat_issues_top.tmpl | 4 +- .../modules/reports/guided_reports_start.tmpl | 8 +- .../prog/en/modules/reports/itemslost.tmpl | 2 +- .../en/modules/serials/member-search.tmpl | 6 +- .../prog/en/modules/serials/routing.tmpl | 8 +- .../modules/serials/serials-collection.tmpl | 2 +- .../en/modules/serials/subscription-add.tmpl | 78 ++++++++++--------- .../modules/serials/subscription-detail.tmpl | 4 +- 24 files changed, 112 insertions(+), 115 deletions(-) diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index 1340543d3b..8baa60b7af 100755 --- a/acqui/neworderempty.pl +++ b/acqui/neworderempty.pl @@ -189,7 +189,6 @@ my $CGIbookfund = CGI::scrolling_list( -default => ($data->{'bookfundid'} ? $data->{'bookfundid'} : $select_bookfund[0]), -labels => \%select_bookfunds, #-size => 1, - -tabindex =>'', -multiple => 0 ); diff --git a/admin/aqbudget.pl b/admin/aqbudget.pl index 5ad9e1e501..fccedae079 100755 --- a/admin/aqbudget.pl +++ b/admin/aqbudget.pl @@ -168,8 +168,8 @@ SELECT branchcode, $template->param( dateformat => C4::Dates->new()->visual(), aqbudgetid => $dataaqbudget->{'aqbudgetid'}, - startdate => $dataaqbudget->{'startdate'}, - enddate => $dataaqbudget->{'enddate'}, + startdate => format_date($dataaqbudget->{'startdate'}), + enddate => format_date($dataaqbudget->{'enddate'}), budgetamount => $dataaqbudget->{'budgetamount'}, branches => \@branches, ); diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl index ee57abd5bf..a183c8f4cb 100755 --- a/admin/authorised_values.pl +++ b/admin/authorised_values.pl @@ -227,7 +227,6 @@ sub default_form { -values=> \@category_list, -default=>"", -size=>1, - -tabindex=>'', -multiple=>0, ); if (!$searchfield) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc index 1aa10a2f2d..adc09ada62 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc @@ -3,11 +3,11 @@

Budget deleted

-
" method="get">
+ " method="get"> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl index 7a43013903..d973c21dc5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl @@ -82,7 +82,9 @@ " />  -
  • Group(s): + +
    +
    Group(s):
    1. @@ -90,8 +92,10 @@
    -
    • -
  • " />
    • + +
    +
      +
    1. " />
    2. " />
    3. " />
    4. " />
      5. @@ -220,9 +224,9 @@ - ?op=editcategory&categorycode=">Edit + ?op=editcategory&categorycode=">Edit - ?op=delete_category&categorycode=">Delete + ?op=delete_category&categorycode=">Delete No PropertiesSearch Domain Defined diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl index 73cefe122c..bfe3623e9a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl @@ -142,9 +142,11 @@ +

      Data Recorded

      -
      " method="post"> +" method="post">
      +
      @@ -180,10 +182,10 @@ -

      Currency Deleted

      +

      Currency Deleted

      " method="post"> - -
      + +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl index 0ec126a2e9..486cc7a832 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl @@ -127,7 +127,7 @@ this feature on.
    5. _indicator1_" size="1" maxlength="1" value="" /> - _indicator2_" @@ -548,15 +546,13 @@ function searchauthority() { maxlength="1" value="" /> - _indicator1_" size="1" maxlength="1" value="" /> - _indicator2_" size="1" @@ -565,21 +561,17 @@ function searchauthority() { - - _indicator1_" value="" /> - _indicator2_" value="" /> - _indicator1_" value="" /> - _indicator2_" value="" /> @@ -619,7 +611,7 @@ function searchauthority() { size="1" maxlength="1" class="flat" - tabindex="-1" /> + tabindex="0" /> " /> " /> -
      +
      -
      -
    + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl index c80d9b2858..fd0a67e530 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl @@ -17,7 +17,7 @@ -

    Patrons with No Checkouts

    +

    Patrons with no Checkouts

    Filtered on

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl index 3191e9995d..13896e8647 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl @@ -34,10 +34,10 @@ function Dopop(link) { - + - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl index 38fa9af6cc..a0450e31ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl @@ -108,7 +108,7 @@ reports

    - +
    Rank/Biblioitemnumbers
    Rank/Biblioitemnumbers
      &phase=Show%20SQL">Show SQL &phase=Run%20this%20report">Run this Report ">Schedule this Report&phase=Delete%20Saved">Delete
    &phase=Delete%20Saved">Delete
    @@ -358,7 +358,7 @@ NAME="name" -->">

    -

    +

    @@ -457,9 +457,9 @@ Sub report: + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl index 78462bbbff..2e61e024b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl @@ -12,7 +12,7 @@ function add_member(subscriptionid,borrowernumber){ //--> @@ -41,7 +41,7 @@ function add_member(subscriptionid,borrowernumber){ -
    " title=""> -
    ,); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=&borrowernumber=&op=add">Add
    @@ -52,7 +52,7 @@ NAME="subscriptionid" -->,); return false -

    Close

    +

    Close

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl index 0bd4edd69f..3b41a59be5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl @@ -1,5 +1,5 @@ -Koha › Serials › Edit Routing List +Koha › Serials › <!-- TMPL_VAR NAME="title" escape="html" --> › Edit Routing List - +
    -

    Modify subscription for Add a new subscription

    +

    Modify subscription for Add a new subscription

    @@ -1037,7 +1037,8 @@ $('#numberpattern').change( function() { /lib/calendar/cal.gif" id="next_acqui_button" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" /> " size="13" maxlength="10" id="next_acqui_date" style="border-width: 0px;" /> - + +
  • -
  • " />

    Hint : you can update the serial history manually. This can be useful for an old subscription or to clean the existing history. Modify these fields with care, as future serial receive will continue to update them automatically.

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    Subscription start date" /> (start date of the 1st subscription)
    Subscription end date" />(if empty, subscription is still active)
    Received issues
    Missing issues
    Note for OPAC
    Note for staff
    - +
    +
      +
    1. + + " />
      (start date of the 1st subscription)
      +
      2. +
    2. + + " />
      (if empty, subscription is still active)
      +
      3. +
    3. + + +
      4. +
    4. + + +
      5. +
    5. + + +
      6. +
    6. + + +
      7. +
    +
    +
    • 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 2c2c041986..8f78e73fe5 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 @@ -59,7 +59,7 @@ function popup(subscriptionid) {
  • Subscription ID:
  • Librarian identity:
  • Vendor: "> 
    • -
  • Biblio: () ">

    • +
  • Biblio: () ">
  • Library:  
  • Serial receipt creates an item record.
    • @@ -70,7 +70,7 @@ function popup(subscriptionid) {
  • Patron alert with:  
  • Notes:
  • Management Notes:
    • - +

    Planning

    -- 2.39.5