[open-ils-commits] [GIT] Evergreen ILS branch master updated. 829462a97d2c28d698c43adc01897e5946ed581f

[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  829462a97d2c28d698c43adc01897e5946ed581f (commit)
       via  6fe4ddc7153117f30196b5013c4ed02de927dfc8 (commit)
      from  cc0542584c924e53ab312633ea13ca69cd5bd16e (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 829462a97d2c28d698c43adc01897e5946ed581f
Author: Ben Shum <bshum at biblio.org>
Date:   Sun Jan 20 01:16:13 2013 -0500

    TPAC - new CSS for login help elements
    
    Instead of having everything hard coded into the page, move important
    pieces into the style.css.tt2.
    
    Signed-off-by: Ben Shum <bshum at biblio.org>
    Signed-off-by: Dan Scott <dan at coffeecode.net>

diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 8661011..3da8ea4 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -579,6 +579,18 @@ div.format_icon {
     height:29px;
 }
 
+.login-help-box {
+    float: right;
+    width: 200px;
+    text-align: center;
+    margin-right: 25%;
+}
+
+.login-help-button {
+    font-size: [% css_fonts.size_biggest %];
+    padding: 1.5em;
+}
+
 #login-failed-message {
     font-size: [% css_fonts.size_bigger %];
     font-weight: bold;
diff --git a/Open-ILS/src/templates/opac/parts/login/form.tt2 b/Open-ILS/src/templates/opac/parts/login/form.tt2
index 1e23a98..6a5dc5d 100644
--- a/Open-ILS/src/templates/opac/parts/login/form.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/form.tt2
@@ -62,4 +62,4 @@
         </table>
     </form>
 </div>
-<div style='float:right; max-width: 200px; text-align: center; margin-right: 25%;'>[% INCLUDE "opac/parts/login/help.tt2" %]</div>
+[% INCLUDE "opac/parts/login/help.tt2" %]
diff --git a/Open-ILS/src/templates/opac/parts/login/help.tt2 b/Open-ILS/src/templates/opac/parts/login/help.tt2
index 470f8f4..4bac233 100644
--- a/Open-ILS/src/templates/opac/parts/login/help.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/help.tt2
@@ -1,14 +1,15 @@
-<td class="login_boxes right_brain" align="center" valign="top" width="291">
+<div class="login-help-box">
 
-    <div style="padding: 25px; font-size: 1.5em;">
+    <div class="login-help-button">
         <a href="http://example.com" class="opac-button">[% l('Questions?') %]</a>
     </div>
 
-    <div style="width:182px;color:black;padding:5px 25px;">
+    <div>
         [% l('Visit our FAQs section for answers to common questions about how to use your account.') %]
     </div>
 
-    <div style="padding: 25px; font-size: 1.5em;">
+    <div class="login-help-button">
         <a href="http://example.com" class="opac-button">[% l('FAQs') %]</a>
     </div>
-</td>
+
+</div>

commit 6fe4ddc7153117f30196b5013c4ed02de927dfc8
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Fri Dec 21 16:10:09 2012 -0500

    TPAC - Remove images from login help page
    
    Because images are hard to translate.
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>
    Signed-off-by: Dan Scott <dan at coffeecode.net>

diff --git a/Open-ILS/src/templates/opac/parts/login/help.tt2 b/Open-ILS/src/templates/opac/parts/login/help.tt2
index 16db31f..470f8f4 100644
--- a/Open-ILS/src/templates/opac/parts/login/help.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/help.tt2
@@ -1,12 +1,14 @@
 <td class="login_boxes right_brain" align="center" valign="top" width="291">
 
-    <a href="http://example.com"><img 
-        src="[% ctx.media_prefix %]/images/questions.png" alt="[% l('Questions?') %]" style="margin-top:29px;" /></a>
+    <div style="padding: 25px; font-size: 1.5em;">
+        <a href="http://example.com" class="opac-button">[% l('Questions?') %]</a>
+    </div>
 
     <div style="width:182px;color:black;padding:5px 25px;">
         [% l('Visit our FAQs section for answers to common questions about how to use your account.') %]
     </div>
 
-    <a href="http://example.com"><img
-        alt="[% l('FAQs') %]" src="[% ctx.media_prefix %]/images/faqs-btn.png" style="margin-top:13px;" /></a>
+    <div style="padding: 25px; font-size: 1.5em;">
+        <a href="http://example.com" class="opac-button">[% l('FAQs') %]</a>
+    </div>
 </td>
diff --git a/Open-ILS/web/images/faqs-btn.png b/Open-ILS/web/images/faqs-btn.png
deleted file mode 100644
index 38134ec..0000000
Binary files a/Open-ILS/web/images/faqs-btn.png and /dev/null differ
diff --git a/Open-ILS/web/images/questions.png b/Open-ILS/web/images/questions.png
deleted file mode 100644
index 9be69b2..0000000
Binary files a/Open-ILS/web/images/questions.png and /dev/null differ

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

Summary of changes:
 Open-ILS/src/templates/opac/css/style.css.tt2    |   12 ++++++++++++
 Open-ILS/src/templates/opac/parts/login/form.tt2 |    2 +-
 Open-ILS/src/templates/opac/parts/login/help.tt2 |   17 ++++++++++-------
 Open-ILS/web/images/faqs-btn.png                 |  Bin 1783 -> 0 bytes
 Open-ILS/web/images/questions.png                |  Bin 5444 -> 0 bytes
 5 files changed, 23 insertions(+), 8 deletions(-)
 delete mode 100644 Open-ILS/web/images/faqs-btn.png
 delete mode 100644 Open-ILS/web/images/questions.png


hooks/post-receive
-- 
Evergreen ILS