*** empty log message ***

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

8 files changed, 189 insertions, 7 deletions

diff --git a/template/default/admin/cat.vtp b/template/default/admin/cat_list.vtp
index 4c0aca7e9..681e63023 100644
--- a/template/default/admin/cat.vtp
+++ b/template/default/admin/cat_list.vtp
@@ -4,7 +4,7 @@
   <{#td} style="width:40%;text-align:left;">
     {#indent}<img src="./images/puce.gif" alt="&gt;" />
     &nbsp;{#name} [ dir : {#dir} ]
-    <span style="color:red;font-weight:normal;"> {#invisible}</span>
+    <span style="color:red;font-weight:normal;"> {#invisible} <span style="font-weight:bold;">{#private}</span></span>
   </{#td}>
   <{#td} style="text-align:center;">
     <div style="margin-left:3px;margin-right:3px;">{#nb_picture}</div>
@@ -42,7 +42,12 @@
   </{#td}>
   <{#td} class="{#class}"
          style="width:10%;white-space:nowrap;text-align:center;">
-    <a href="{#permission_url}">{#cat_permission}</a>
+    <!--VTP_permission-->
+    <a href="{#url}">{#cat_permission}</a>
+    <!--/VTP_permission-->
+    <!--VTP_no_permission-->
+    <span style="color:darkgray;">{#cat_permission}</span>
+    <!--/VTP_no_permission-->
   </{#td}>
   <{#td} class="{#class}"
          style="width:10%;white-space:nowrap;text-align:center;">
diff --git a/template/default/admin/edit_cat.vtp b/template/default/admin/cat_modify.vtp
index 4bafd765b..90dcc093f 100644
--- a/template/default/admin/edit_cat.vtp
+++ b/template/default/admin/cat_modify.vtp
@@ -29,16 +29,15 @@
       <td style="width:20%;">{#editcat_status}</td>
       <td class="row2">
         <!--VTP_status_option-->
-        <input type="radio" name="status" value="{#option}"{#checked} />{#option}
+        <input type="radio" name="status" value="{#value}"{#checked} />{#option}
         <!--/VTP_status_option-->
-	{#editcat_status_info}
       </td>
     </tr>
     <tr>
       <td style="width:20%;">{#editcat_visible}</td>
       <td class="row2">
         <!--VTP_visible_option-->
-        <input type="radio" name="visible" value="{#option}"{#checked} />{#option}
+        <input type="radio" name="visible" value="{#value}"{#checked} />{#option}
         <!--/VTP_visible_option-->
 	{#editcat_status_info}
       </td>
diff --git a/template/default/admin/cat_perm.vtp b/template/default/admin/cat_perm.vtp
new file mode 100644
index 000000000..cf8fab094
--- /dev/null
+++ b/template/default/admin/cat_perm.vtp
@@ -0,0 +1,47 @@
+<form action="{#action}" method="post">
+  <!--VTP_groups-->
+  <table style="width:100%;">
+    <tr>
+      <th colspan="2">{#menu_groups}</th>
+    </tr>
+    <!--VTP_group-->
+    <tr>
+      <td><a href="{#group_perm_link}"><span style="color:{#color}">{#groupname}</span></a></td>
+      <td style="text-align:right;">
+        <input type="radio" name="groupaccess-{#id}" value="0"{#authorized_checked}/>{#permuser_authorized}
+        <input type="radio" name="groupaccess-{#id}" value="1"{#forbidden_checked}/>{#permuser_forbidden}
+      </td>
+    </tr>
+    <!--/VTP_group-->
+  </table>
+  <!--/VTP_groups-->
+  <table style="width:100%;">
+    <tr>
+      <th colspan="2">{#menu_users}</th>
+    </tr>
+    <!--VTP_user-->
+    <tr>
+      <td>
+        <a href="{#user_perm_link}"><span style="color:{#color}">{#username}</span></a>
+        <!--VTP_usergroups-->
+        [
+        <!--VTP_usergroup-->
+        <span style="color:{#color};">{#name}</span>{#separation}
+        <!--/VTP_usergroup-->
+        ]
+        <!--/VTP_usergroups-->
+      </td>
+      <td style="text-align:right;">
+        <!--VTP_parent_forbidden-->
+        <a href="{#url}">{#permuser_parent_forbidden}</a>
+        <!--/VTP_parent_forbidden-->
+        <input type="radio" name="useraccess-{#id}" value="0"{#authorized_checked}/>{#permuser_authorized}
+        <input type="radio" name="useraccess-{#id}" value="1"{#forbidden_checked}/>{#permuser_forbidden}
+      </td>
+    </tr>
+    <!--/VTP_user-->
+    <tr>
+      <td colspan="2" align="center"><input type="submit" name="submit" value="{#submit}"/></td>
+    </tr>
+  </table>
+</form>
\ No newline at end of file
diff --git a/template/default/admin/group_list.vtp b/template/default/admin/group_list.vtp
new file mode 100644
index 000000000..a02d8ad8d
--- /dev/null
+++ b/template/default/admin/group_list.vtp
@@ -0,0 +1,49 @@
+<!--VTP_errors-->
+<div class="errors">
+  <ul>
+    <!--VTP_li-->
+    <li>{#li}</li>
+    <!--/VTP_li-->
+  </ul>
+</div>
+<!--/VTP_errors-->
+<!--VTP_deletion-->
+<table style="width:100%;">
+  <tr>
+    <th colspan="2">{#group_confirm} "{#name}" ?</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_groups-->
+<table width="100%">
+  <tr>
+    <th colspan="3">{#group_list_title}</th>
+  </tr>
+  <!--VTP_group-->
+  <tr>
+    <td style="width:25%;">
+      <div style="margin-left:10px;color:{#color}"><img src="./images/puce.gif" alt="&gt;" /> {#name}</div>
+    </td>
+    <td class="row2" style="text-align:center;width:25%;">
+      <a href="{#permission_url}">{#listuser_permission}</a>
+    </td>
+    <td class="row2" style="text-align:center;width:25%;">
+      <a href="{#deletion_url}">{#delete}</a>
+    </td>
+  </tr>
+  <!--/VTP_group-->
+</table>
+<!--/VTP_groups-->
+<form method="post" action="{#form_action}">
+  <div style="text-align:center;margin:10px;">
+    {#group_add} <input type="text" name="name" />
+    <input type="submit" value="{#add}" name="submit" />
+  </div>
+</form>
\ No newline at end of file
diff --git a/template/default/admin/group_perm.vtp b/template/default/admin/group_perm.vtp
new file mode 100644
index 000000000..89beae782
--- /dev/null
+++ b/template/default/admin/group_perm.vtp
@@ -0,0 +1,24 @@
+<!--VTP_confirmation-->
+<div class="info">{#permuser_info_message} [ <a href="{#back_url}">{#adduser_info_back}</a> ]</div>
+<!--/VTP_confirmation-->
+<form action="{#action}" method="post">
+  <table style="width:100%;">
+    <!--VTP_category-->
+    <tr>
+      <td>
+        <img src="./images/puce.gif" alt="&gt;" /> <a href="{#cat_perm_link}"><span style="color:{#color}">{#name}</span></a>
+      </td>
+      <td style="text-align:right;">
+        <!--VTP_parent_forbidden-->
+        {#permuser_parent_forbidden}
+        <!--/VTP_parent_forbidden-->
+        <input type="radio" name="access-{#id}" value="0"{#authorized_checked}/>{#permuser_authorized}
+        <input type="radio" name="access-{#id}" value="1"{#forbidden_checked}/>{#permuser_forbidden}
+      </td>
+    </tr>
+    <!--/VTP_category-->
+    <tr>
+      <td colspan="2" align="center"><input type="submit" name="submit" value="{#submit}"/></td>
+    </tr>
+  </table>
+</form>
\ No newline at end of file
diff --git a/template/default/admin/user_modify.vtp b/template/default/admin/user_modify.vtp
index 53844d64f..49d2f1358 100644
--- a/template/default/admin/user_modify.vtp
+++ b/template/default/admin/user_modify.vtp
@@ -34,7 +34,7 @@
           </tr>
           <tr>
             <td>{#new} {#password}<input type="checkbox" name="use_new_pwd" value="1" /></td>
-            <td><input type="text" name="password" value="{#user:password}" /></td>
+            <td><input type="text" name="password" value="" /></td>
           </tr>
           <tr>
             <td>{#mail_address}</td>
@@ -50,6 +50,31 @@
               </select>
             </td>
           </tr>
+          <!--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}" />
diff --git a/template/default/admin/user_perm.vtp b/template/default/admin/user_perm.vtp
new file mode 100644
index 000000000..aebdff9d5
--- /dev/null
+++ b/template/default/admin/user_perm.vtp
@@ -0,0 +1,31 @@
+<!--VTP_confirmation-->
+<div class="info">{#permuser_info_message} [ <a href="{#back_url}">{#adduser_info_back}</a> ]</div>
+<!--/VTP_confirmation-->
+<form action="{#action}" method="post">
+  <table style="width:100%;">
+    <!--VTP_category-->
+    <tr>
+      <td>
+        <img src="./images/puce.gif" alt="&gt;" /> <a href="{#cat_perm_link}"><span style="color:{#color}">{#name}</span></a>
+        <!--VTP_usergroups-->
+        [
+        <!--VTP_usergroup-->
+        <span style="color:{#color};">{#name}</span>{#separation}
+        <!--/VTP_usergroup-->
+        ]
+        <!--/VTP_usergroups-->
+      </td>
+      <td style="text-align:right;">
+        <!--VTP_parent_forbidden-->
+        {#permuser_parent_forbidden}
+        <!--/VTP_parent_forbidden-->
+        <input type="radio" name="access-{#id}" value="0"{#authorized_checked}/>{#permuser_authorized}
+        <input type="radio" name="access-{#id}" value="1"{#forbidden_checked}/>{#permuser_forbidden}
+      </td>
+    </tr>
+    <!--/VTP_category-->
+    <tr>
+      <td colspan="2" align="center"><input type="submit" name="submit" value="{#submit}"/></td>
+    </tr>
+  </table>
+</form>
\ No newline at end of file
diff --git a/template/default/picture.vtp b/template/default/picture.vtp
index 2e20a4949..66fe213ac 100644
--- a/template/default/picture.vtp
+++ b/template/default/picture.vtp
@@ -1,6 +1,6 @@
 <html>
   <head>
-    {#page_style}
+    {#style}
     <!-- Specific style to picture.php-->
     <style type="text/css">
       .commentsAuthor,.commentsTitle,.commentsInfos,.commentsContent,.commentsNavigationBar {
@@ -44,6 +44,7 @@
     <title>{#page_title}</title>        
   </head>
   <body>
+    {#header}
     <table style="width:100%;height:100%;">
       <tr align="center" valign="middle">
         <td>
@@ -162,5 +163,6 @@
       </tr>
       <!--/VTP_comments-->
     </table>
+    {#footer}
   </body>
 </html>
\ No newline at end of file