- user profiles available from admin page

- user creation from admin page with email (bug 514)
- some language cleanup
- small template enhancements
- php syntax corrections (my mistake)

git-svn-id: http://piwigo.org/svn/trunk@1753 68402e56-0260-453c-a942-63ccdbb3a9ee

5 files changed, 135 insertions, 125 deletions

diff --git a/template/yoga/admin/profile.tpl b/template/yoga/admin/profile.tpl
new file mode 100644
index 000000000..5de3efd5a
--- /dev/null
+++ b/template/yoga/admin/profile.tpl
@@ -0,0 +1,5 @@
+<div class="titrePage">
+  <h2>{lang:Profile}</h2>
+</div>
+
+{PROFILE_CONTENT}
diff --git a/template/yoga/admin/user_list.tpl b/template/yoga/admin/user_list.tpl
index fc7c26a04..08b981882 100644
--- a/template/yoga/admin/user_list.tpl
+++ b/template/yoga/admin/user_list.tpl
@@ -10,6 +10,7 @@
     <legend>{lang:Add a user}</legend>
     <label>{lang:Username} <input type="text" name="login" maxlength="50" size="20" /></label>
     <label>{lang:Password} <input type="text" name="password" /></label>
+    <label>{lang:Email address} <input type="text" name="email" /></label>
     <input type="submit" name="submit_add" value="{lang:submit}" {TAG_INPUT_ENABLED} />
   </fieldset>
 </form>
@@ -69,11 +70,11 @@
   <tr class="throw">
     <th>&nbsp;</th>
     <th>{lang:Username}</th>
-    <th>{L_STATUS}</th>
+    <th>{lang:user_status}</th>
     <th>{lang:Email address}</th>
     <th>{lang:Groups}</th>
-    <th>{L_PROPERTIES}</th>
-    <th>{L_ACTIONS}</th>
+    <th>{lang:properties}</th>
+    <th>{lang:actions}</th>
   </tr>
   <!-- BEGIN user -->
   <tr class="{user.CLASS}">
@@ -84,7 +85,8 @@
     <td>{user.GROUPS}</td>
     <td>{user.PROPERTIES}</td>
     <td style="text-align:center;">
-      <a href="{user.U_PERM}"><img src="{themeconf:icon_dir}/permissions.png" class="button" style="border:none" alt="{L_PERMISSIONS}" title="{L_PERMISSIONS}" /></a>
+      <a href="{user.U_PERM}"><img src="{themeconf:icon_dir}/permissions.png" class="button" style="border:none" alt="{lang:permissions}" title="{lang:permissions}" /></a>
+      <a href="{user.U_PROFILE}"><img src="{themeconf:icon_dir}/edit_s.png" class="button" style="border:none" alt="{lang:Profile}" title="{lang:Profile}" /></a>
     </td>
   </tr>
   <!-- END user -->
@@ -104,7 +106,7 @@
 
   <table>
     <tr>
-      <td>{L_STATUS}</td>
+      <td>{lang:Status}</td>
       <td>
         <label><input type="radio" name="status_action" value="leave" checked="checked" /> {lang:leave}</label>
         <label><input type="radio" name="status_action" value="set" id="status_action_set" /> {lang:set to}</label>
@@ -165,7 +167,7 @@
 
 <!-- Properties -->
 <fieldset>
-  <legend>{L_PROPERTIES}</legend>
+  <legend>{lang:properties}</legend>
 
   <table>
 
@@ -190,7 +192,7 @@
 <table>
 
   <tr>
-    <td>{L_NB_IMAGE_LINE}</td>
+    <td>{lang:nb_image_per_row}</td>
     <td>
       <label><input type="radio" name="nb_image_line_action" value="leave" checked="checked" /> {lang:leave}</label>
       <label><input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set" /> {lang:set to}</label>
@@ -200,7 +202,7 @@
   </tr>
 
   <tr>
-    <td>{L_NB_LINE_PAGE}</td>
+    <td>{lang:nb_row_per_page}</td>
     <td>
       <label><input type="radio" name="nb_line_page_action" value="leave" checked="checked" /> {lang:leave}</label>
       <label><input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set" /> {lang:set to}</label>
@@ -210,7 +212,7 @@
   </tr>
 
   <tr>
-    <td>{L_TEMPLATE}</td>
+    <td>{lang:theme}</td>
     <td>
       <label><input type="radio" name="template_action" value="leave" checked="checked" /> {lang:leave}</label>
       <label><input type="radio" name="template_action" value="set" id="template_action_set" /> {lang:set to}</label>
@@ -236,7 +238,7 @@
   </tr>
 
   <tr>
-    <td>{L_RECENT_PERIOD}</td>
+    <td>{lang:recent_period}</td>
     <td>
       <label><input type="radio" name="recent_period_action" value="leave" checked="checked" /> {lang:leave}</label>
       <label><input type="radio" name="recent_period_action" value="set" id="recent_period_action_set" /> {lang:set to}</label>
@@ -246,7 +248,7 @@
   </tr>
 
   <tr>
-    <td>{L_EXPAND}</td>
+    <td>{lang:auto_expand}</td>
     <td>
       <label><input type="radio" name="expand" value="leave" checked="checked" /> {lang:leave}</label>
       / {lang:set to}
@@ -256,7 +258,7 @@
   </tr>
 
   <tr>
-    <td>{L_SHOW_NB_COMMENTS}</td>
+    <td>{lang:show_nb_comments}</td>
     <td>
       <label><input type="radio" name="show_nb_comments" value="leave" checked="checked" /> {lang:leave}</label>
       / {lang:set to}
@@ -266,7 +268,7 @@
   </tr>
 
   <tr>
-    <td>{L_MAXWIDTH}</td>
+    <td>{lang:maxwidth}</td>
     <td>
       <label><input type="radio" name="maxwidth_action" value="leave" checked="checked" /> {lang:leave}</label>
       <label><input type="radio" name="maxwidth_action" value="unset" /> {lang:unset}</label>
@@ -278,7 +280,7 @@
 
 
   <tr>
-    <td>{L_MAXHEIGHT}</td>
+    <td>{lang:maxheight}</td>
     <td>
       <label><input type="radio" name="maxheight_action" value="leave" checked="checked" /> {lang:leave}</label>
       <label><input type="radio" name="maxheight_action" value="unset" /> {lang:unset}</label>
diff --git a/template/yoga/icon/edit_s.png b/template/yoga/icon/edit_s.png
new file mode 100644
index 000000000..e4951d22f
--- /dev/null
+++ b/template/yoga/icon/edit_s.png
diff --git a/template/yoga/profile.tpl b/template/yoga/profile.tpl
index 1b2037d71..f48a711c1 100644
--- a/template/yoga/profile.tpl
+++ b/template/yoga/profile.tpl
@@ -17,115 +17,5 @@
     <h2>{lang:Profile}</h2>
   </div>
 
-<form method="post" name="profile" action="{F_ACTION}" id="profile" class="properties">
-
-  <fieldset>
-    <legend>{lang:register_title}</legend>
-    <input type="hidden" name="userid" value="{USERID}" />
-    <ul>
-      <li>
-        <span class="property">{lang:Username}</span>
-        {USERNAME}
-      </li>
-      <li>
-        <span class="property">
-          <label for="mail_address">{lang:Email address}</label>
-        </span>
-        <input type="text" name="mail_address" id="mail_address" value="{EMAIL}">
-      </li>
-      <li>
-        <span class="property">
-          <label for="password">{lang:Password}</label>
-        </span>
-        <input type="password" name="password" id="password" value="">
-      </li>
-      <li>
-        <span class="property">
-          <label for="use_new_pwd">{lang:new_password}</label>
-        </span>
-        <input type="password" name="use_new_pwd" id="use_new_pwd" value="">
-      </li>
-      <li>
-        <span class="property">
-          <label for="passwordConf">{lang:Confirm Password}</label>
-        </span>
-        <input type="password" name="passwordConf" id="passwordConf" value="">
-      </li>
-    </ul>
-  </fieldset>
-
-  <fieldset>
-    <legend>{lang:preferences}</legend>
-
-    <ul>
-      <li>
-        <span class="property">
-          <label for="nb_image_line">{lang:nb_image_per_row}</label>
-        </span>
-        <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{NB_IMAGE_LINE}">
-      </li>
-      <li>
-        <span class="property">
-          <label for="nb_line_page">{lang:nb_row_per_page}</label>
-        </span>
-        <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{NB_ROW_PAGE}" >
-      </li>
-      <li>
-        <span class="property">
-          <label for="template">{lang:theme}</label>
-        </span>
-        <select name="template" id="template">
-          <!-- BEGIN template_option -->
-          <option value="{template_option.VALUE}" {template_option.SELECTED}>{template_option.CONTENT}</option>
-          <!-- END template_option -->
-        </select>
-      </li>
-      <li>
-        <span class="property">
-          <label for="language">{lang:language}</label>
-        </span>
-        <select name="language" id="language">
-          <!-- BEGIN language_option -->
-          <option value="{language_option.VALUE}" {language_option.SELECTED}>{language_option.CONTENT}</option>
-          <!-- END language_option -->
-        </select>
-      </li>
-      <li>
-        <span class="property">
-          <label for="recent_period">{lang:recent_period}</label>
-        </span>
-        <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{RECENT_PERIOD}">
-      </li>
-      <li>
-        <span class="property">{lang:auto_expand}</span>
-        <label><input type="radio" name="expand" value="true" {EXPAND_TREE_YES}> {lang:yes}</label>
-        <label><input type="radio" name="expand" value="false" {EXPAND_TREE_NO}> {lang:no}</label>
-      </li>
-      <li>
-        <span class="property">{lang:show_nb_comments}</span>
-        <label><input type="radio" name="show_nb_comments" value="true" {NB_COMMENTS_YES}> {lang:yes}</label>
-        <label><input type="radio" name="show_nb_comments" value="false" {NB_COMMENTS_NO}> {lang:no}</label>
-      </li>
-      <li>
-        <span class="property">
-          <label for="maxwidth">{lang:maxwidth}</label>
-        </span>
-        <input type="text" size="4" maxlength="4" name="maxwidth" id="maxwidth" value="{MAXWIDTH}">
-      </li>
-      <li>
-        <span class="property">
-          <label for="maxheight">{lang:maxheight}</label>
-        </span>
-        <input type="text" size="4" maxlength="4" name="maxheight" id="maxheight" value="{MAXHEIGHT}">
-      </li>
-    </ul>
-  </fieldset>
-
-  <p class="bottomButtons">
-    <input type="submit" name="validate" value="{lang:submit}">
-    <input type="reset" name="reset" value="{lang:reset}" class="reset">
-  </p>
-
-</form>
-
+{PROFILE_CONTENT}
 </div> <!-- content -->
diff --git a/template/yoga/profile_content.tpl b/template/yoga/profile_content.tpl
new file mode 100644
index 000000000..e738e59c6
--- /dev/null
+++ b/template/yoga/profile_content.tpl
@@ -0,0 +1,113 @@
+<form method="post" name="profile" action="{F_ACTION}" id="profile" class="properties">
+
+  <fieldset>
+    <legend>{lang:register_title}</legend>
+    <input type="hidden" name="userid" value="{USERID}" />
+    <input type="hidden" name="redirect" value="{REDIRECT}" />
+    <ul>
+      <li>
+        <span class="property">{lang:Username}</span>
+        {USERNAME}
+      </li>
+      <li>
+        <span class="property">
+          <label for="mail_address">{lang:Email address}</label>
+        </span>
+        <input type="text" name="mail_address" id="mail_address" value="{EMAIL}">
+      </li>
+<!-- BEGIN not_admin -->
+      <li>
+        <span class="property">
+          <label for="password">{lang:Password}</label>
+        </span>
+        <input type="password" name="password" id="password" value="">
+      </li>
+<!-- END not_admin -->
+      <li>
+        <span class="property">
+          <label for="use_new_pwd">{lang:new_password}</label>
+        </span>
+        <input type="password" name="use_new_pwd" id="use_new_pwd" value="">
+      </li>
+      <li>
+        <span class="property">
+          <label for="passwordConf">{lang:Confirm Password}</label>
+        </span>
+        <input type="password" name="passwordConf" id="passwordConf" value="">
+      </li>
+    </ul>
+  </fieldset>
+
+  <fieldset>
+    <legend>{lang:preferences}</legend>
+
+    <ul>
+      <li>
+        <span class="property">
+          <label for="nb_image_line">{lang:nb_image_per_row}</label>
+        </span>
+        <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{NB_IMAGE_LINE}">
+      </li>
+      <li>
+        <span class="property">
+          <label for="nb_line_page">{lang:nb_row_per_page}</label>
+        </span>
+        <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{NB_ROW_PAGE}" >
+      </li>
+      <li>
+        <span class="property">
+          <label for="template">{lang:theme}</label>
+        </span>
+        <select name="template" id="template">
+          <!-- BEGIN template_option -->
+          <option value="{template_option.VALUE}" {template_option.SELECTED}>{template_option.CONTENT}</option>
+          <!-- END template_option -->
+        </select>
+      </li>
+      <li>
+        <span class="property">
+          <label for="language">{lang:language}</label>
+        </span>
+        <select name="language" id="language">
+          <!-- BEGIN language_option -->
+          <option value="{language_option.VALUE}" {language_option.SELECTED}>{language_option.CONTENT}</option>
+          <!-- END language_option -->
+        </select>
+      </li>
+      <li>
+        <span class="property">
+          <label for="recent_period">{lang:recent_period}</label>
+        </span>
+        <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{RECENT_PERIOD}">
+      </li>
+      <li>
+        <span class="property">{lang:auto_expand}</span>
+        <label><input type="radio" name="expand" value="true" {EXPAND_TREE_YES}> {lang:yes}</label>
+        <label><input type="radio" name="expand" value="false" {EXPAND_TREE_NO}> {lang:no}</label>
+      </li>
+      <li>
+        <span class="property">{lang:show_nb_comments}</span>
+        <label><input type="radio" name="show_nb_comments" value="true" {NB_COMMENTS_YES}> {lang:yes}</label>
+        <label><input type="radio" name="show_nb_comments" value="false" {NB_COMMENTS_NO}> {lang:no}</label>
+      </li>
+      <li>
+        <span class="property">
+          <label for="maxwidth">{lang:maxwidth}</label>
+        </span>
+        <input type="text" size="4" maxlength="4" name="maxwidth" id="maxwidth" value="{MAXWIDTH}">
+      </li>
+      <li>
+        <span class="property">
+          <label for="maxheight">{lang:maxheight}</label>
+        </span>
+        <input type="text" size="4" maxlength="4" name="maxheight" id="maxheight" value="{MAXHEIGHT}">
+      </li>
+    </ul>
+  </fieldset>
+
+  <p class="bottomButtons">
+    <input type="submit" name="validate" value="{lang:submit}">
+    <input type="reset" name="reset" value="{lang:reset}" class="reset">
+  </p>
+
+</form>