[open-ils-commits] [GIT] Evergreen ILS branch master updated. 144dc798cafb4773201c1a3b625618f1822e23d0

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  144dc798cafb4773201c1a3b625618f1822e23d0 (commit)
      from  bfa4b6e5d07fd3941119b7070babe06d23c3624b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 144dc798cafb4773201c1a3b625618f1822e23d0
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Sun Apr 14 00:38:53 2013 -0400

    Approximate number of search results
    
    The number of results listed on the search results page is often an
    estimate when working with a large set. Let's add the word "about" to
    reflect the fact that it is indeed an estimate.
    
    At the same time, I moved the <strong> tags out of the code, adding a CSS
    class in its place, moved the HTML tags out of the translatable
    string (as recommended by Pasi Kallinen), and fixed a typo in the
    stylesheet.
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 587e62a..959609d 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -692,8 +692,12 @@ tr.result_table_row > td.result_table_pic_header {
     padding-left: 1em;
 }
 
-.result_numbers {
-    font-size: [% css_fonts.size_small %]; padding-left:15px; white-space: nowrap; width: 320px;
+.result_number {
+    padding-left:15px; white-space: nowrap; width: 320px;
+}
+
+.result_count_number {
+   font-weight: bold;
 }
 
 .result_table_subtable {
diff --git a/Open-ILS/src/templates/opac/parts/result/paginate.tt2 b/Open-ILS/src/templates/opac/parts/result/paginate.tt2
index edcc817..34c092b 100644
--- a/Open-ILS/src/templates/opac/parts/result/paginate.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/paginate.tt2
@@ -2,11 +2,16 @@
 <div class="results_header_nav1">
     <span class="h1">[% ctx.bookbag ? l('List Contents') : l('Search Results') %]</span>
     <span nowrap="nowrap" class="result_number">
-                [% |l(ctx.result_start, ctx.result_stop, ctx.hit_count) %]
-                Results <strong>[_1]</strong> - <strong>[_2]</strong> of <strong>[_3]</strong>
-                [% END %]
+                [% |l('<span class="result_count_number">' _ ctx.result_start _'</span>',
+                '<span class="result_count_number">' _ ctx.result_stop _ '</span>',
+                '<span class="result_count_number">' _ ctx.hit_count _ '</span>')  -%]
+                Results [_1] - [_2] of about [_3]
+                [%- END %]
                 <span style='padding-left: 6px;'>
-                    [% |l(page + 1, page_count) %](page <strong>[_1]</strong> of <strong>[_2]</strong>)[% END %]
+                    [% |l('<span class="result_count_number">' _ (page + 1) _ '</span>',
+                    '<span class="result_count_number">' _ page_count _ '</span>') -%]
+                    (page [_1] of [_2])
+                    [%- END %]
                 </span>
     </span>
     [%- INCLUDE "opac/parts/pref_lib_display.tt2" %]

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/opac/css/style.css.tt2      |    8 ++++++--
 .../src/templates/opac/parts/result/paginate.tt2   |   13 +++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Evergreen ILS