mango r184 - in trunk: . www

[ovitters svn gnome org]

Author: ovitters
Date: Sun Jun  1 14:28:55 2008
New Revision: 184
URL: http://svn.gnome.org/viewvc/mango?rev=184&view=rev

Log:
	Try to avoid unknown people from requesting an account by hiding the
	new account link. Also ensure the examples refer to RSA, not DSA.
	* www/index.xsl:
	* www/login.xsl:
	* www/new_account.xsl:
	* www/new_user.xsl:
	* www/update_user.xsl:



Modified:
   trunk/ChangeLog
   trunk/www/index.xsl
   trunk/www/login.xsl
   trunk/www/new_account.xsl
   trunk/www/new_user.xsl
   trunk/www/update_user.xsl

Modified: trunk/www/index.xsl
==============================================================================
--- trunk/www/index.xsl	(original)
+++ trunk/www/index.xsl	Sun Jun  1 14:28:55 2008
@@ -43,9 +43,9 @@
         <p>This site hosts Mango, a system to assist GNOME administrative
           volunteers to maintain the data held in our LDAP and MySQL
           database (users, groups, mirrors etc).</p>
-        <p>To access protected services on this website, please log in to
-          identify yourself. If you want to request a new account click
-          on the '<a href="new_account.php">new account</a>' link.</p>
+        <p>To access the services on this website, please log in to
+          identify yourself. If you want to request a new account see
+	  the <a href="http://live.gnome.org/NewAccounts";>instructions on the wiki</a>.</p>
         <form method="post" action="login.php" name="f">
           <input type="hidden" name="action" value="login"/>
           <input type="hidden" name="mango_token" value="{/page/@token}"/>
@@ -59,8 +59,7 @@
               <td><input type="password" name="password"/></td>
             </tr>
             <tr>
-              <th><small>(<a href="new_account.php?reload=true">new account</a>)</small></th>
-              <td align="right"><input type="submit" value="Login" /></td>
+              <td colspan="2" align="right"><input type="submit" value="Login" /></td>
             </tr>
             </table>
         </form>

Modified: trunk/www/login.xsl
==============================================================================
--- trunk/www/login.xsl	(original)
+++ trunk/www/login.xsl	Sun Jun  1 14:28:55 2008
@@ -24,7 +24,9 @@
      <p class="error">Login failed</p>
     </xsl:when>
     <xsl:otherwise>
-     <p>To access protected services on this website, please log in to identify yourself. If you want to request a new account click on the <a href="new_account.php">new account</a> link.</p>
+      <p>To access the services on this website, please log in to
+        identify yourself. If you want to request a new account see
+        the <a href="http://live.gnome.org/NewAccounts";>instructions on the wiki</a>.</p>
     </xsl:otherwise>
    </xsl:choose>
 
@@ -44,8 +46,7 @@
       <td><input type="password" name="password"/></td>
      </tr>
     <tr>
-      <th><small>(<a href="new_account.php?reload=true">new account</a>)</small></th>
-      <td align="right"><input type="submit" value="Login" /></td>
+      <td colspan="2" align="right"><input type="submit" value="Login" /></td>
     </tr>
     </table>
    </form>

Modified: trunk/www/new_account.xsl
==============================================================================
--- trunk/www/new_account.xsl	(original)
+++ trunk/www/new_account.xsl	Sun Jun  1 14:28:55 2008
@@ -106,7 +106,7 @@
        SSH key(s)
       </th>
       <td>
-       <div>Upload public key file (e.g. id_dsa.pub):</div>
+       <div>Upload public key file (e.g. id_rsa.pub):</div>
        <input type="file" name="keyfile"/>
        <div>Or, cut'n'paste here:</div>
        <textarea name="newkeys" rows="3" cols="70"><xsl:apply-templates select="newkeys"/><xsl:value-of select="authorizationkeys" /></textarea>

Modified: trunk/www/new_user.xsl
==============================================================================
--- trunk/www/new_user.xsl	(original)
+++ trunk/www/new_user.xsl	Sun Jun  1 14:28:55 2008
@@ -73,7 +73,7 @@
          <span> <xsl:value-of select="concat(substring(., 0, 20), '...', substring(., string-length(.) - 40))"/></span>
         </div>
        </xsl:for-each>
-       <div>Upload public key file (e.g. id_dsa.pub):</div>
+       <div>Upload public key file (e.g. id_rsa.pub):</div>
        <input type="file" name="keyfile"/>
        <div>Or, cut'n'paste here:</div>
        <textarea name="newkeys" rows="5"><xsl:apply-templates select="newkeys"/></textarea>

Modified: trunk/www/update_user.xsl
==============================================================================
--- trunk/www/update_user.xsl	(original)
+++ trunk/www/update_user.xsl	Sun Jun  1 14:28:55 2008
@@ -94,7 +94,7 @@
          </label>
         </div>
        </xsl:for-each>
-       <div>Upload additional public keys in a file (e.g. id_dsa.pub):</div>
+       <div>Upload additional public keys in a file (e.g. id_rsa.pub):</div>
        <input type="file" name="keyfile"/>
        <div>Or, cut'n'paste here:</div>
        <textarea name="newkeys" rows="5"><xsl:apply-templates select="newkeys"/></textarea>