From 383e2f423399714a168ad5c76e30a6b73e0d0b8b Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Wed, 9 Oct 2013 16:38:35 -0400
Subject: [PATCH] VIVO-333 External-auth login button should be
 language-sensitive.

Don't specify the text in the runtime.properties. Instead, get it from all.properties. Show the button if externalAuth.netIdHeaderName is specified.
---
 doc/install.html           | 28 ++++++++++++++--------------
 doc/upgrade-1.6.html       |  6 ++++++
 example.runtime.properties |  8 +++-----
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/doc/install.html b/doc/install.html
index c91ac292..b94cfe7d 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -363,7 +363,7 @@
                 <em>External authentication:</em>
                 If you want to use an external 
                 authentication system like Shibboleth or CUWebAuth, you will need to 
-                set additional properties in this file. See the step below  
+                set an additional property in this file. See the step below  
                 entitled <a href="#external_auth">Using an External Authentication
                     System with VIVO</a>. 
             </p>
@@ -615,21 +615,16 @@
                     <tr>
                         <td colspan="2">
                             If an external authentication system like Shibboleth or CUWebAuth is to be 
-                            used, these properties say how the login button should be labeled, and which  
-                            HTTP header will contain the user ID from the authentication system. If such 
-                            a system is not to be used, leave these commented out. Consult the installation  
-                            instructions for more details. 
+                            used, this property says which HTTP header will contain the user ID from 
+                            the authentication system. If such a system is not to be used, 
+                            leave this commented out.
                         </td>
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            externalAuth.buttonText
-                            <br/>
                             externalAuth.netIdHeaderName
                         </td>
                         <td>
-                            Log in using BearCat Shibboleth
-                            <br/>
                             remote_userID 
                         </td>
                     </tr>
@@ -1219,14 +1214,19 @@
                     the VIVO login form. You need to tell VIVO what text should appear in
                     that button.
                     <p>
-                        Put a line like this in the runtime.properties file:
-                        externalAuth.buttonText = [the text for your login button] For example:
-                    </p>
-                    <pre>externalAuth.buttonText = Log in using BearCat Shibboleth</pre>
-                    <p>
+                        In your theme, add a line to the <code>all.properties</code> file,
+                        like this one: 
+                        <pre>external_login_text = <em>[the text for your login button]</em></pre>
+                        For example:
+                        <pre>external_login_text = Log in using BearCat Shibboleth</pre>
                         The VIVO login form will display a button labelled "Log in 
                         using BearCat Shibboleth". 
                     </p>
+                    <p>
+                    	If your site supports additional languages, add lines to the corresponding files.
+                    	For example, <code>all_es.properties</code> might contain this line:
+                    	<pre>external_login_text = Entrar usando Shibboleth GatoOso</pre>
+                    </p>
                 </li>
                 <li>
                     <h5>Associating a User with a profile page.</h5>
diff --git a/doc/upgrade-1.6.html b/doc/upgrade-1.6.html
index b6ef4ecd..fb0fefad 100644
--- a/doc/upgrade-1.6.html
+++ b/doc/upgrade-1.6.html
@@ -742,6 +742,12 @@ rdf/tbox/filegraph/tbox/vivo-skos-1.5.owl</pre>
                     
                 </tbody>
             </table>
+                <p>
+                    Note that the property named <code>externalAuth.buttonText</code> is no longer used.
+                    You can specify the text of the external login button by adding a property to
+                    <code>all.properties</code> like this:
+                    <pre>external_login_text = Log in using BearCat Shibboleth</pre>
+                </p>
 
                 <p>
                     3. Apply any previous changes you have made to the new source 
diff --git a/example.runtime.properties b/example.runtime.properties
index 5f8021fa..a25e5922 100644
--- a/example.runtime.properties
+++ b/example.runtime.properties
@@ -101,12 +101,10 @@ selfEditing.idMatchingProperty = http://vivo.mydomain.edu/ns#networkId
 
 #
 # If an external authentication system like Shibboleth or CUWebAuth is to be
-# used, these properties say how the login button should be labeled, and which
-# HTTP header will contain the user ID from the authentication system. If such
-# a system is not to be used, leave these commented out. Consult the 
-# installation instructions for more details. 
+# used, this property says which HTTP header will contain the user ID from 
+# the authentication system. If such a system is not to be used, leave this 
+# commented out. Consult the installation instructions for more details. 
 #
-#externalAuth.buttonText = Log in using BearCat Shibboleth
 #externalAuth.netIdHeaderName = remote_userID 
 
 #