From 669c41114f60a5a31253bed766f52e1840e00599 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 22:28:21 +0200
Subject: Show indications for username and password formats

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/views/auth/register.phtml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'app/views/auth/register.phtml')

diff --git a/app/views/auth/register.phtml b/app/views/auth/register.phtml
index ada654b15..306679601 100644
--- a/app/views/auth/register.phtml
+++ b/app/views/auth/register.phtml
@@ -1,19 +1,14 @@
-<?php
-    /* TODO list
-     *   - Show help for username and password formats
-    */
-?>
 <div class="prompt">
     <h1><?php echo _t('gen.auth.registration'); ?></h1>
 
     <form method="post" action="<?php echo _url('user', 'create'); ?>">
         <div>
-            <label class="group-name" for="new_user_name"><?php echo _t('gen.auth.username'); ?></label>
+            <label class="group-name" for="new_user_name"><?php echo _t('gen.auth.username'), '<br />', _i('help'), ' ', _t('gen.auth.username.format'); ?></label>
             <input id="new_user_name" name="new_user_name" type="text" size="16" required="required" maxlength="16" autocomplete="off" pattern="[0-9a-zA-Z]{1,16}" />
         </div>
 
         <div>
-            <label class="group-name" for="new_user_passwordPlain"><?php echo _t('gen.auth.password'); ?></label>
+            <label class="group-name" for="new_user_passwordPlain"><?php echo _t('gen.auth.password'), '<br />', _i('help'), ' ', _t('gen.auth.password.format'); ?></label>
             <div class="stick">
                 <input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" required="required" autocomplete="off" pattern=".{7,}" />
                 <a class="btn toggle-password" data-toggle="new_user_passwordPlain"><?php echo _i('key'); ?></a>
-- 
cgit v1.2.3