From 5df04f26f240644cdb3094554cdbe03e43b9f16f Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 26 Feb 2008 10:34:29 +1300 Subject: [PATCH] Markup corrections for label templates Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../prog/en/css/staff-global.css | 5 +- .../modules/labels/label-create-layout.tmpl | 46 ++++----- .../modules/labels/label-create-profile.tmpl | 49 ++++------ .../modules/labels/label-create-template.tmpl | 8 +- .../en/modules/labels/label-edit-layout.tmpl | 95 ++++++++++--------- .../prog/en/modules/labels/result.tmpl | 43 +++++---- .../prog/en/modules/labels/search.tmpl | 16 ++-- 7 files changed, 129 insertions(+), 133 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 b4ac3e3b39..aca700b4f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -441,7 +441,7 @@ fieldset.rows label, fieldset.rows span.label { fieldset.rows fieldset { border-width : 1px; - margin : 0; + margin : 0 0 .5em 0; padding : .3em; } @@ -507,8 +507,9 @@ fieldset.rows ol.radio label.radio { } fieldset.rows table { + font-size : 105%; clear : both; - margin : 1em 0 0 1em; + margin : 1em 0 1em 1em; } fieldset.rows td label { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl index e705d82340..351a7abbed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl @@ -39,10 +39,10 @@ - + - @@ -55,11 +55,11 @@ - + - @@ -72,12 +72,12 @@ - + - @@ -90,11 +90,11 @@ - + - @@ -107,11 +107,11 @@ - + - @@ -124,14 +124,14 @@ - + - @@ -144,11 +144,11 @@ - + - @@ -161,11 +161,11 @@ - + - @@ -178,12 +178,12 @@ - + - @@ -196,10 +196,10 @@ - + - @@ -212,7 +212,7 @@ - + @@ -242,8 +242,8 @@
    • -

    -

    +
    + Cancel
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-profile.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-profile.tmpl index 6ef542a106..ee8261cf31 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-profile.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-profile.tmpl @@ -28,22 +28,20 @@ function confirm_deletion(biblionumber,itemnumber) {
    -
    -
    +

    Create Printer Profile

    -
    -
    Error Creating Profile -
      -
    1. +
      +

      Error Creating Profile

      +

      -

      2. -
    -
    +

    - -
    +
    + +
    +
    Profile Settings
      @@ -55,28 +53,25 @@ function confirm_deletion(biblionumber,itemnumber) {
    1. - - +
    2. - -
      3. -
    3. - -
      4. -
    4. - -
      5. -
    5. - +
      Offset: +
        2. +
    6. +
      Creep: +
      2. +
      +
    7. - - -
    - + Cancel +
    -
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl index d5dd9f993f..405304488d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl @@ -59,13 +59,13 @@ -
    • -
    • +
    • +
    • - +
    - + Cancel
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl index d2a2d7b2a9..fbe889438e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl @@ -1,4 +1,4 @@ -Koha -- Labels +Koha › Labels @@ -14,12 +14,14 @@
    +
    +Edit Label Layout +
      +
    1. +" />
      2. -

      Layout Name

      -" /> - -

      Choose Barcode Type (encoding)

      - @@ -27,11 +29,11 @@ - + -

      Choose Layout Type

      - @@ -39,16 +41,16 @@ - - + -

      +
    2. + Choose Order Of Text Fields to Print -

      3. +
      - - -
      - - -
      - - -
      - -  
      +
    +
  • " />
    • -

    - Start printing from Label number: " /> -

    -

    Draw Guide Boxes +
  • - + - - -

    • + + -

    - + + +

    + Cancel " /> -

    +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl index 1cec888eee..c16081e106 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl @@ -1,7 +1,8 @@ -Koha -- Barcodes and Labels: Search Results - -
    -

    Search results

    + +
    +
    +

    Search results

    - + &=&resultsperpage=&type=intranet&op=do_search&batch_id="> << - - + + =&resultsperpage=&type=intranet&op=do_search&batch_id="> - + &=&&resultsperpage=&type=intranet&op=do_search&batch_id=">>>

    - +  Results to of

      No results found

    -
    - « Back     [ Done ] + + « Back     [ Done ] ); return false" /> @@ -88,7 +90,7 @@ function add_item3(itemnumber){
    " value="" /> -

       +

    [ ] - @@ -114,21 +116,20 @@ function add_item3(itemnumber){

    - + &=&resultsperpage=&type=intranet&op=do_search>&batch_id="><< - - + + =&resultsperpage=&type=intranet&op=do_search&batch_id="> - + &=&&resultsperpage=&type=intranet&op=do_search&batch_id=">>>

    -
    - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl index eec992df8a..be9344ed9a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl @@ -3,7 +3,7 @@ - +
    @@ -14,12 +14,12 @@ -
    + " />
    1. - @@ -34,9 +34,9 @@ - +
    2. - @@ -51,7 +51,7 @@ - +
    @@ -117,7 +117,7 @@ -->
    Document Type - @@ -133,7 +133,7 @@

    -

    +
    Cancel
    -- 2.39.5