[open-ils-commits] [GIT] Evergreen ILS branch master updated. 45399b8fe258e0b141aedf9453abe737ffb8b9af

Evergreen Git git at git.evergreen-ils.org
Thu Feb 21 17:57:46 EST 2013 

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  45399b8fe258e0b141aedf9453abe737ffb8b9af (commit)
       via  cb238428af6bf5d35994f66529d5cf31e71669cf (commit)
      from  dde1d0e14ef7d13eb66797208ff34917df926d44 (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 45399b8fe258e0b141aedf9453abe737ffb8b9af
Author: Dan Scott <dan at coffeecode.net>
Date:   Mon Feb 18 17:48:44 2013 -0500

    TPAC: Avoid leading / trailing space on pages
    
    Use the [%- -%] whitespace-chomping directives to remove the leading
    space on pages.
    
    Signed-off-by: Dan Scott <dan at coffeecode.net>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/templates/opac/cnbrowse.tt2 b/Open-ILS/src/templates/opac/cnbrowse.tt2
index a290b64..f4d7e78 100644
--- a/Open-ILS/src/templates/opac/cnbrowse.tt2
+++ b/Open-ILS/src/templates/opac/cnbrowse.tt2
@@ -1,4 +1,4 @@
-[%  # This is the stand-alone call-number browser.  This mainly wraps around
+[%- # This is the stand-alone call-number browser.  This mainly wraps around
     # the same guts as the "shelf browser" part of a record results page.
 
     PROCESS "opac/parts/header.tt2";
diff --git a/Open-ILS/src/templates/opac/home.tt2 b/Open-ILS/src/templates/opac/home.tt2
index 19dfc58..8ede2cf 100644
--- a/Open-ILS/src/templates/opac/home.tt2
+++ b/Open-ILS/src/templates/opac/home.tt2
@@ -1,4 +1,4 @@
-[%  PROCESS "opac/parts/header.tt2";
+[%- PROCESS "opac/parts/header.tt2";
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l("Home") %]
@@ -12,4 +12,4 @@
             <div class="common-full-pad"></div>	
         </div>
     </div>
-[% END %]
+[%- END %]
diff --git a/Open-ILS/src/templates/opac/login.tt2 b/Open-ILS/src/templates/opac/login.tt2
index f6892bb..1c7d41a 100644
--- a/Open-ILS/src/templates/opac/login.tt2
+++ b/Open-ILS/src/templates/opac/login.tt2
@@ -1,4 +1,4 @@
-[%  PROCESS "opac/parts/header.tt2";
+[%- PROCESS "opac/parts/header.tt2";
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     basic_search = "f";
@@ -12,4 +12,4 @@
             <div class="clear-both very-big-height"></div>	
         </div>
     </div>
-[% END %]
+[%- END %]
diff --git a/Open-ILS/src/templates/opac/mylist.tt2 b/Open-ILS/src/templates/opac/mylist.tt2
index b77eeae..1da9914 100644
--- a/Open-ILS/src/templates/opac/mylist.tt2
+++ b/Open-ILS/src/templates/opac/mylist.tt2
@@ -1,4 +1,4 @@
-[%  PROCESS "opac/parts/header.tt2";
+[%- PROCESS "opac/parts/header.tt2";
     PROCESS "opac/parts/misc_util.tt2";
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
@@ -16,4 +16,4 @@
             <div class="common-full-pad"></div>	
         </div>
     </div>
-[% END %]
+[%- END %]
diff --git a/Open-ILS/src/templates/opac/password_reset.tt2 b/Open-ILS/src/templates/opac/password_reset.tt2
index bbf9418..27f079e 100644
--- a/Open-ILS/src/templates/opac/password_reset.tt2
+++ b/Open-ILS/src/templates/opac/password_reset.tt2
@@ -1,8 +1,8 @@
-[%  PROCESS "opac/parts/header.tt2";
+[%- PROCESS "opac/parts/header.tt2";
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l('Library system password reset request form');
-%]
+-%]
 <div id="search-wrapper">
     [% INCLUDE "opac/parts/searchbar.tt2" %]
 </div>
@@ -67,5 +67,4 @@
         [% END %]
     </div>
 </div>
-[% END %]
-
+[%- END %]
diff --git a/Open-ILS/src/templates/opac/place_hold.tt2 b/Open-ILS/src/templates/opac/place_hold.tt2
index 3c8d89e..423198c 100644
--- a/Open-ILS/src/templates/opac/place_hold.tt2
+++ b/Open-ILS/src/templates/opac/place_hold.tt2
@@ -1,4 +1,4 @@
-[%  PROCESS "opac/parts/header.tt2";
+[%- PROCESS "opac/parts/header.tt2";
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l("Place Hold") %]
@@ -16,4 +16,4 @@
             <div class="common-full-pad"></div>	
         </div>
     </div>
-[% END %]
+[%- END %]
diff --git a/Open-ILS/src/templates/opac/record.tt2 b/Open-ILS/src/templates/opac/record.tt2
index 374cca4..4576493 100644
--- a/Open-ILS/src/templates/opac/record.tt2
+++ b/Open-ILS/src/templates/opac/record.tt2
@@ -1,4 +1,4 @@
-[%  PROCESS "opac/parts/header.tt2";
+[%- PROCESS "opac/parts/header.tt2";
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l("Record Detail");
@@ -22,4 +22,4 @@
         </div>
         <br class="clear-both" />
     </div>
-[% END %]
+[%- END %]
diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2
index cdbdc19..639ebc4 100644
--- a/Open-ILS/src/templates/opac/results.tt2
+++ b/Open-ILS/src/templates/opac/results.tt2
@@ -1,5 +1,4 @@
-[%  PROCESS "opac/parts/header.tt2";
-
+[%- PROCESS "opac/parts/header.tt2";
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
 
@@ -16,7 +15,7 @@
 
     PROCESS "opac/parts/misc_util.tt2";
     PROCESS get_library;
-%]
+-%]
     <form action="[% ctx.opac_root %]/results" method="get">
     <div id="search-wrapper">
         [% INCLUDE "opac/parts/searchbar.tt2" took_care_of_form=1 %]
@@ -47,8 +46,7 @@
 
                     <div class='results_header_sel' id='simple-detail-view-links'>
                         [% IF CGI.param('detail_record_view') %]
-                        <a href="[% mkurl('', {detail_record_view => ''}) %]">[% l('Show Fewer Details') %]</a>
-                        [% ELSE %]
+                        <a href="[% mkurl('', {detail_record_view => ''}) %]">[% l('Show Fewer Details') %]</a> [% ELSE %]
                         <a href="[% mkurl('', {detail_record_view => 1}) %]">[% l('Show More Details') %]</a>
                         [% END %]
                     </div>
@@ -77,4 +75,4 @@
         </div>
         <br class="clear-both" />
     </div>
-[% END %]
+[%- END %]
diff --git a/Open-ILS/src/templates/opac/sms_cn.tt2 b/Open-ILS/src/templates/opac/sms_cn.tt2
index 4281d5d..b3d554f 100644
--- a/Open-ILS/src/templates/opac/sms_cn.tt2
+++ b/Open-ILS/src/templates/opac/sms_cn.tt2
@@ -1,4 +1,4 @@
-[%  PROCESS "opac/parts/header.tt2";
+[%- PROCESS "opac/parts/header.tt2";
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l("Send Call Number via Text/SMS") %]
@@ -46,4 +46,4 @@
             <div class="common-full-pad"></div>
         </div>
     </div>
-[% END %]
+[%- END %]
diff --git a/Open-ILS/src/templates/opac/temp_warn.tt2 b/Open-ILS/src/templates/opac/temp_warn.tt2
index 4747f6c..525db1f 100644
--- a/Open-ILS/src/templates/opac/temp_warn.tt2
+++ b/Open-ILS/src/templates/opac/temp_warn.tt2
@@ -1,4 +1,4 @@
-[%  PROCESS "opac/parts/header.tt2";
+[%- PROCESS "opac/parts/header.tt2";
     PROCESS "opac/parts/misc_util.tt2";
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
@@ -25,4 +25,4 @@
             <div class="common-full-pad"></div>	
         </div>
     </div>
-[% END %]
+[%- END %]

commit cb238428af6bf5d35994f66529d5cf31e71669cf
Author: Dan Scott <dan at coffeecode.net>
Date:   Mon Feb 18 17:44:28 2013 -0500

    TPAC: Let there be HTML5
    
    Stop living the lie that we're pretending to be XHTML Transitional and
    embrace HTML5. And save a whole bunch of bytes right off the bat!
    
    Also, use a valid language/locale identifier--we need hyphens instead of
    underscores.
    
    Signed-off-by: Dan Scott <dan at coffeecode.net>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/templates/opac/parts/base.tt2 b/Open-ILS/src/templates/opac/parts/base.tt2
index c7175b6..f1a5ee0 100644
--- a/Open-ILS/src/templates/opac/parts/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/base.tt2
@@ -1,7 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' lang='[% ctx.locale %]' xml:lang='[% ctx.locale %]'>
+<!DOCTYPE html>
+<html lang='[% ctx.locale.replace('_', '-') %]'>
     <head>
-        <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+        <meta charset="utf-8" />
         [% IF ctx.refresh %]
         <meta http-equiv="refresh" content="[% ctx.refresh %]">
         [% ELSIF ctx.authtime %]

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

Summary of changes:
 Open-ILS/src/templates/opac/cnbrowse.tt2       |    2 +-
 Open-ILS/src/templates/opac/home.tt2           |    4 ++--
 Open-ILS/src/templates/opac/login.tt2          |    4 ++--
 Open-ILS/src/templates/opac/mylist.tt2         |    4 ++--
 Open-ILS/src/templates/opac/parts/base.tt2     |    6 +++---
 Open-ILS/src/templates/opac/password_reset.tt2 |    7 +++----
 Open-ILS/src/templates/opac/place_hold.tt2     |    4 ++--
 Open-ILS/src/templates/opac/record.tt2         |    4 ++--
 Open-ILS/src/templates/opac/results.tt2        |   10 ++++------
 Open-ILS/src/templates/opac/sms_cn.tt2         |    4 ++--
 Open-ILS/src/templates/opac/temp_warn.tt2      |    4 ++--
 11 files changed, 25 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
Evergreen ILS

More information about the open-ils-commits mailing list