From 0dcd876e6ab069f0f9bf5fb82fc5809356b6b0c2 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 9 Sep 2008 14:53:49 -0500 Subject: [PATCH] Trying again: Standardizing styling of error messages; other markup corrections. Signed-off-by: Galen Charlton --- .../prog/en/css/staff-global.css | 8 ++++--- .../prog/en/modules/acqui/basket.tmpl | 6 ++--- .../prog/en/modules/acqui/lateorders.tmpl | 2 ++ .../prog/en/modules/acqui/orderreceive.tmpl | 2 +- .../prog/en/modules/acqui/parcel.tmpl | 7 +++--- .../prog/en/modules/admin/branches.tmpl | 14 +++++------ .../prog/en/modules/admin/currency.tmpl | 2 +- .../prog/en/modules/cataloguing/addbooks.tmpl | 4 ++-- .../prog/en/modules/labels/label-manager.tmpl | 2 +- .../en/modules/reports/catalogue_out.tmpl | 7 +++--- .../prog/en/modules/tags/review.tmpl | 8 +++---- .../prog/en/includes/opac-facets.inc | 6 ++--- .../prog/en/modules/opac-reserve.tmpl | 24 +++++++++---------- .../prog/en/modules/opac-results-grouped.tmpl | 2 +- .../prog/en/modules/opac-results.tmpl | 20 ++++++++-------- .../prog/en/modules/opac-review.tmpl | 8 +++---- 16 files changed, 63 insertions(+), 59 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 cad023413c..af7f857b17 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -861,9 +861,11 @@ fieldset.rows .inputnote { padding-left : 15px; } -.error { - background-color : #FFFF99; - color: red; +.error, +.error a, +.error a:link, +.error a:visited { + color: #cc0000; } div.error { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl index 91e890c8d4..8c3216f971 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl @@ -52,10 +52,10 @@ -
ERROR: Illegal sort requested by "". -
You will need to use valid sort criteria to return valid results.
+
ERROR: Illegal sort requested by "". +
Please use valid sort criteria. ">Return to default results.
-
Sorted by "".
+
Sorted by "".
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl index 16788baf34..a0ba87586e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl @@ -90,6 +90,7 @@
+

Filter Results:

@@ -108,6 +109,7 @@
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl index 4d32af4c00..a1b1fbc7df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl @@ -41,7 +41,7 @@
  1. -
+
  • " />
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl index 6db1616438..e4585d494c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl @@ -20,12 +20,13 @@
    -
    +

    Error adding items:

      -
    • : Duplicate Barcode
      • +
    • Duplicate Barcode
      • +

    @@ -132,7 +133,7 @@
    author :
    Publisher : - " title="MARC" rel="gb_page_center[600,500]">MARC | " title="MARC" rel="gb_page_center[600,500]">Card + " title="MARC" rel="gb_page_center[600,500]">MARC | " title="MARC" rel="gb_page_center[600,500]">Card 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 3b16826daf..7a43013903 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl @@ -82,16 +82,16 @@ " /> 

    • -
  • Group(s): +
  • Group(s):
    1. " name="" />
      2. -
    + -
    • -
  • " />
    • +
    • +
  • " />
  • " />
  • " />
  • " />
    • @@ -113,7 +113,7 @@ --> -
    +
    Cancel
    @@ -191,10 +191,10 @@ --> - ?op=edit&branchcode=">Edit + ?op=edit&branchcode=">Edit - ?branchcode=&branchname=&op=delete">Delete + ?branchcode=&branchname=&op=delete">Delete 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 d1fa60da2c..73cefe122c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl @@ -136,7 +136,7 @@ -
    +
    Cancel
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl index 6fe30dbbe2..2da5c1d828 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl @@ -109,9 +109,9 @@
    - No results found +
    No results found - Error: + Error:
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl index 056a6393fc..58ca5ced8b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl @@ -64,7 +64,7 @@ - Error: Unknown Batch Type "" +
    Error: Unknown Batch Type ""
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl index 2b762d693e..e9f565ef5e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl @@ -50,11 +50,11 @@ TOTAL -
    + -

    "> - Table - +

    "> +

    @@ -80,7 +80,6 @@
    -
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl index c8678b8266..32bd03480a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl @@ -85,7 +85,7 @@ td input,td input[type="submit"] { font-size: 85%; padding: 1px; } } $(document).ready(function() { $('.ajax_buttons' ).css({visibility:"visible"}); - $("p.check").html("Select: All Pending None"); + $("p.check").html("Select: <\/strong>All<\/a> Pending<\/a> None<\/a>"); $("#CheckAll").click(function(){ $(".checkboxed").checkCheckboxes(); return false; @@ -242,10 +242,10 @@ Calendar.setup({
    -
    +
    - ERROR: Date from is not a legal value (). - ERROR: Date to is not a legal value (). + ERROR: Date from is not a legal value (""). + ERROR: Date to is not a legal value (""). ERROR: Failed to approve term (). ERROR: Failed to reject term (). ERROR: No match for user (). FILTER REQUIRES BORROWERNUMBER (not name). diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc index aba1e3bc1f..9b4f83ae48 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc @@ -3,7 +3,7 @@

    Refine your search

    -

    +

    Sorry, you cannot place holds because your account has been frozen.
    Usually the reason for freezing an account is old overdues or damage fees. If your account page shows your account to be clear, please consult a librarian. @@ -93,8 +93,8 @@
    - - "> + + " />

    Place a hold on ">, by

    @@ -128,7 +128,7 @@
  • - +
    • @@ -136,7 +136,7 @@
    " /> -

    +
    @@ -214,28 +214,28 @@ - -">

    Confirm Reservation

    + +" />

    Confirm Reservation

    - + - "> + " /> - +
    Title:
    Item Type: Any
    Item Type: Any
    Item Types: -">; +" />;
    Pick up From: ">
    Pick up From: " />
    -

    +

    diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl index ff7d064d91..4571863fda 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl @@ -77,7 +77,7 @@ $(document).ready(function(){ -
    +

    Error:

    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 8279eac7b6..f44383e2d6 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl @@ -13,14 +13,14 @@