- User control panel update (user side)

- User control panel update (admin side)
- Add of registration link on the main page
- Minor bug correction for group management


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

5 files changed, 47 insertions, 204 deletions

diff --git a/template/default/admin/user_list.tpl b/template/default/admin/user_list.tpl
deleted file mode 100644
index 562ef8c42..000000000
--- a/template/default/admin/user_list.tpl
+++ /dev/null
@@ -1,101 +0,0 @@
-<!--VTP_deletion-->
-<table style="width:100%;">
-  <tr>
-    <th colspan="2">{#listuser_confirm} "{#login}" ?</th>
-  </tr>
-  <tr>
-    <td align="center"><a href="{#yes_url}">{#yes}</a></td>
-    <td align="center" class="row2"><a href="{#no_url}">{#no}</a></td>
-  </tr>
-</table>
-<!--/VTP_deletion-->
-
-<!--VTP_confirmation-->
-<div class="{#class}">{#info}</div>
-<!--/VTP_confirmation-->
-
-<!--VTP_errors-->
-<div class="errors">
-  <div class="errors_title">{#errors_title}</div>
-  <ul>
-    <!--VTP_li-->
-    <li>{#li}</li>
-    <!--/VTP_li-->
-  </ul>
-</div>
-<!--/VTP_errors-->
-
-<!--VTP_add_user-->
-<form method="post" action="{#form_action}">
-  <div style="text-align:center;margin:10px;">
-    <span style="font-weight:bold;">{#title_add}</span> -&gt;
-    {#login} : <input type="text" name="username" value="{#f_username}" />
-    {#password} : <input type="text" name="password" value="{#f_password}" />
-    <input type="submit" value="{#add}" name="submit_add_user" />
-  </div>
-</form>
-<!--/VTP_add_user-->
-
-<!--VTP_users-->
-<form method="post" action="{#form_action}">
-<table width="100%">
-  <!--VTP_category-->
-  <tr>
-    <th colspan="5">{#title}</th>
-  </tr>
-  <!--VTP_user-->
-  <tr>
-    <td style="width:0px;">
-      <div style="margin-left:2px;margin-right:2px;">
-      <!--VTP_checkbox-->
-        <input type="checkbox" name="{#name}" value="1" />
-      <!--/VTP_checkbox-->
-      </div>
-    </td>
-    <td style="width:25%;">
-      <div style="margin-left:10px;color:{#color}">{#login}</div>
-    </td>
-    <td class="row2" style="text-align:center;width:25%;">
-      <!--VTP_modify-->
-      <a href="{#url}" title="{#listuser_modify_hint} {#login}">{#listuser_modify}</a>
-      <!--/VTP_modify-->
-      <!--VTP_not_modify-->
-      <span style="color:darkgray;">{#listuser_modify}</span>
-      <!--/VTP_not_modify-->
-    </td>
-    <td class="row2" style="text-align:center;width:25%;">
-      <!--VTP_permission-->
-      <a href="{#url}" title="{#listuser_permission_hint} {#login}">{#listuser_permission}</a>
-      <!--/VTP_permission-->
-      <!--VTP_not_permission-->
-      <span style="color:darkgray;">{#listuser_permission}</span>
-      <!--/VTP_not_permission-->
-    </td>
-    <td class="row2" style="text-align:center;width:25%;">
-      <!--VTP_delete-->
-      <a href="{#url}" title="{#listuser_delete_hint} {#login}">{#listuser_delete}</a>
-      <!--/VTP_delete-->
-      <!--VTP_not_delete-->
-      <span style="color:darkgray;">{#listuser_delete}</span>
-      <!--/VTP_not_delete-->
-    </td>
-  </tr>
-  <!--/VTP_user-->
-  <!--/VTP_category-->
-  <tr>
-    <td colspan="5">&nbsp;</td>
-  </tr>
-  <tr>
-    <td colspan="5">
-      <img src="./template/{#user_template}/admin/images/arrow_select.gif" alt="&lt;" />
-      <input type="button" value="{#listuser_button_all}" onClick="SelectAll(this.form)" style="margin-left:5px;margin-right:5px;" />
-      <input type="button" value="{#listuser_button_invert}" onClick="Inverser(this.form)" style="margin-left:5px;margin-right:5px;" />
-      <input type="submit" value="{#listuser_button_create_address}" name="submit_generate_mail" style="margin-left:5px;margin-right:5px;" />
-      <!--VTP_mail_link-->
-      <a href="mailto:{#mailto}">mailto:{#mail_address_start}...</a>
-      <!--/VTP_mail_link-->
-    </td>
-  </tr>
-</table>
-</form>
-<!--/VTP_users-->
\ No newline at end of file
diff --git a/template/default/admin/user_modify.tpl b/template/default/admin/user_modify.tpl
deleted file mode 100644
index 475a0eff3..000000000
--- a/template/default/admin/user_modify.tpl
+++ /dev/null
@@ -1,95 +0,0 @@
-<!--VTP_errors-->
-<div class="errors">
-  <ul>
-    <!--VTP_li-->
-    <li>{#li}</li>
-    <!--/VTP_li-->
-  </ul>
-</div>
-<!--/VTP_errors-->
-<!--VTP_confirmation-->
-<div class="info">
-  {#adduser_info_message} "{#username}"
-  <!--VTP_password_updated-->
-  {#adduser_info_password_updated}
-  <!--/VTP_password_updated-->
-  [ <a href="{#url}">{#adduser_info_back}</a> ]
-</div>
-<!--/VTP_confirmation-->
-<!--VTP_form-->
-<form method="post" action="{#form_action}">
-  <table style="width:100%;">
-    <tr align="center" valign="middle">
-      <td>
-        <table style="margin-left:auto;margin-right:auto;">
-          <tr>
-            <th colspan="2">{#adduser_fill_form}</th>
-          </tr>
-          <tr>
-            <td colspan="2"><div style="margin-bottom:0px;">&nbsp;</div></td>
-          </tr>
-          <tr>
-            <td>{#login}</td>
-            <td style="color:red;text-align:center;">{#user:username}</td>
-          </tr>
-          <tr>
-            <td>{#new} {#password}<input type="checkbox" name="use_new_pwd" value="1" /></td>
-            <td><input type="text" name="password" value="" /></td>
-          </tr>
-          <tr>
-            <td>{#mail_address}</td>
-            <td><input type="text" name="mail_address" value="{#user:mail_address}" /></td>
-          </tr>
-
-          <!--VTP_status-->
-          <tr>
-            <td>{#adduser_status}</td>
-            <td>
-              <select name="status">
-                <!--VTP_status_option-->
-                <option value="{#value}"{#selected}>{#option}</option>
-                <!--/VTP_status_option-->
-              </select>
-            </td>
-          </tr>
-          <!--/VTP_status-->
-
-          <!--VTP_groups-->
-          <tr>
-            <td valign="top">{#menu_groups}</td>
-            <td>
-              <table>
-                <!--VTP_group-->
-                <tr>
-                  <td>{#name}</td>
-                  <td><input type="checkbox" name="dissociate-{#dissociate_id}" value="1" /> {#dissociate}</td>
-                </tr>
-                <!--/VTP_group-->
-              </table>
-            </td>
-          </tr>
-          <!--/VTP_groups-->
-          <tr>
-            <td>{#adduser_associate}</td>
-            <td>
-              <select name="associate">
-                <!--VTP_associate_group-->
-                <option value="{#value}">{#option}</option>
-                <!--/VTP_associate_group-->
-              </select>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2" align="center">
-              <input type="submit" name="submit" value="{#submit}" />
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</form>
-<div class="info">
-  [ <a href="{#url_back}">{#adduser_info_back}</a> ]
-</div>
-<!--/VTP_form-->
\ No newline at end of file
diff --git a/template/default/category.tpl b/template/default/category.tpl
index 681d30102..00f95181d 100644
--- a/template/default/category.tpl
+++ b/template/default/category.tpl
@@ -32,6 +32,11 @@
 		<div class="titreMenu">{L_IDENTIFY}</div>
 		 <div class="menu">
 		 <!-- BEGIN login -->
+		<ul class="menu">
+		  <li><a href="{U_REGISTER}">{L_REGISTER}</a></li>
+			<li><a href="{F_IDENTIFY}">{L_LOGIN}</a></li>
+		</ul>
+		<hr />
 		<form method="post" action="{F_IDENTIFY}">
 		<input type="hidden" name="redirect" value="{U_REDIRECT}">
 		{L_USERNAME}<br />
diff --git a/template/default/identification.tpl b/template/default/identification.tpl
index d180676fc..c048e0d0f 100644
--- a/template/default/identification.tpl
+++ b/template/default/identification.tpl
@@ -49,9 +49,9 @@
   <td colspan="3" align="center">
 	<!-- BEGIN free_access -->
 	  <p><a href="./category.php">[ {L_GUEST} ]</a></p>
-	  <a href="register.php"><img src="./template/{T_STYLE}/theme/register.gif" style="border:0;" alt=""/>&nbsp;{L_REGISTER}</a>&nbsp;&nbsp;-&nbsp;&nbsp;
+	  <a href="register.php"><img src="template/default/theme/register.gif" style="border:0;" alt=""/>&nbsp;{L_REGISTER}</a>&nbsp;&nbsp;-&nbsp;&nbsp;
 	<!-- END free_access -->
-	  <a href="mailto:{MAIL_ADMIN}?subject=[PhpWebGallery] {L_FORGET}"><img src="./template/{T_STYLE}/theme/lost.gif" style="border:0;" alt=""/>&nbsp;{L_FORGET}</a>
+	  <a href="mailto:{MAIL_ADMIN}?subject=[PhpWebGallery] {L_FORGET}"><img src="template/default/theme/lost.gif" style="border:0;" alt=""/>&nbsp;{L_FORGET}</a>
   </td>
 </tr>
 </table>
diff --git a/template/default/profile.tpl b/template/default/profile.tpl
index 1c0aa9edb..b672e566f 100644
--- a/template/default/profile.tpl
+++ b/template/default/profile.tpl
@@ -1,30 +1,44 @@
+<!-- BEGIN select_user -->
+<div class="admin">{L_SELECT_USERNAME}</div>
+<form method="post" name="post" action="{F_SEARCH_USER_ACTION}">
+  <input type="text" name="username" maxlength="50" size="20" />
+  <input type="submit" name="submituser" value="{L_LOOKUP_USER}" class="bouton" /> 
+  <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="bouton" onClick="window.open('{U_SEARCH_USER}', '_phpwgsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />
+</form>
+<!-- END select_user -->
+<!-- BEGIN modify -->
+<!-- BEGIN profile -->
 <div class="titrePage">{L_TITLE}</div>
-<form method="post" action="{F_ACTION}">
+<!-- END profile -->
 <!-- BEGIN errors -->
-  <div class="errors">
+<div class="errors">
 	<ul>
 	  <!-- BEGIN error -->
-	  <li>{errors.error.ERROR}</li>
+	  <li>{modify.errors.error.ERROR}</li>
 	  <!-- END error -->
 	</ul>
-  </div>
+</div>
 <!-- END errors -->
+<form method="post" action="{F_ACTION}">
 <table width="70%" align="center">
   <tr class="admin">
     <th colspan="2">{L_REGISTRATION_INFO}</th>
   </tr>
 	<tr>
 	  <td width="50%">{L_USERNAME}</td>
-	  <td><input type="text" name="username" value="{USERNAME}" /></td>
+	  <td><input type="text" name="username" value="{USERNAME}" />
+		<input type="hidden" name="userid" value="{USERID}" /></td>
   </tr>
 	<tr>
 	  <td>{L_EMAIL}</td>
 	  <td><input type="text" name="mail_address" value="{EMAIL}" /></td>
   </tr>
+	<!-- BEGIN profile -->
   <tr>
 	<td>{L_CURRENT_PASSWORD} : <br /><span class="small">{L_CURRENT_PASSWORD_HINT}</span></td>
 	<td><input type="password" name="password" value="" /></td>
   </tr>
+	<!-- END profile -->
 	<tr>
 	<td>{L_NEW_PASSWORD} : <br /><span class="small">{L_NEW_PASSWORD_HINT}</span></td>
 	<td><input type="password" name="use_new_pwd" value="" /></td>
@@ -76,12 +90,32 @@
 	<td><input type="text" size="4" maxlength="4" name="maxheight" value="{MAXHEIGHT}" />
 	</td>
   </tr>
+<!-- BEGIN admin -->
+	<tr class="admin">
+    <th colspan="2">{modify.admin.L_ADMIN_USER}</th>
+  </tr>
+	<tr>
+    <td>{modify.admin.L_STATUS}</td>
+	<td>{modify.admin.STATUS}
+	</td>
+  </tr>
+	<tr>
+    <td>{modify.admin.L_DELETE}<br />
+		<span class="small">{modify.admin.L_DELETE_HINT}</span></td>
+	<td><input name="user_delete" type="checkbox" value="1">
+	</td>
+  </tr>
+<!-- END admin -->
+<tr>
 	<td colspan="2" align="center">
 	  <input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" />
 	</td>
   </tr>
 </table>
 </form>
+<!-- BEGIN profile -->
 <div style="text-align:center;margin:5px;">
 <a href="{U_RETURN}" title="{L_RETURN_HINT}">[{L_RETURN}]</a>
-</div>
\ No newline at end of file
+</div>
+<!-- END profile -->
+<!-- END modify -->
\ No newline at end of file