- Category upload admin control panel

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

6 files changed, 101 insertions, 118 deletions

diff --git a/template/default/admin.tpl b/template/default/admin.tpl
index 696f43072..f8493b420 100644
--- a/template/default/admin.tpl
+++ b/template/default/admin.tpl
@@ -60,7 +60,7 @@
 	<td style="padding:10px;width:99%;" valign="top">
 <div class="home">
   <div class="titrePage">{PAGE_TITLE}</div>
-  {ADMIN_CONTENT}
+  <div align="center">{ADMIN_CONTENT}</div>
 </div>
 	</td>
   </tr>
diff --git a/template/default/admin/admin_upload.tpl b/template/default/admin/admin_upload.tpl
new file mode 100644
index 000000000..045324455
--- /dev/null
+++ b/template/default/admin/admin_upload.tpl
@@ -0,0 +1,22 @@
+<div class="admin">{L_UPLOAD_TITLE}</div>
+<form name="form1" method="post" action="" style="text-align:center;width:80%;">
+<div style="clear:both;"></div>
+  <div style="float:left;padding:10px;">
+  {L_AUTHORIZED}<br />
+  <select style="width:280px" name="cat_data[]" multiple="multiple" size="5">
+    {UPLOADABLE_CATEGORIES}
+  </select><br />
+  <input type="submit" name="delete" value="{L_DELETE}" class="bouton" />
+  </div>
+  <div style="float:right;padding:10px;">
+  {L_FORBIDDEN}<BR />
+  <select style="width:280px" name="cat_data[]" multiple="multiple" size="5">
+    {PRIVATE_CATEGORIES}
+  </select>
+  <br>
+  <input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" /> &nbsp;
+  <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
+  </div>
+<div style="clear:both;"></div>
+</form>
+<div class="infoCat">{L_UPLOAD_INFO}</div>
\ No newline at end of file
diff --git a/template/default/admin/cat_modify.tpl b/template/default/admin/cat_modify.tpl
new file mode 100644
index 000000000..4aa8ee032
--- /dev/null
+++ b/template/default/admin/cat_modify.tpl
@@ -0,0 +1,72 @@
+<!-- BEGIN confirmation -->
+<div style="color:red;text-align:center;">
+  {L_EDIT_CONFIRM} <a href="{U_PERMISSIONS}">{L_HERE}</a></div>
+<!-- END confirmation -->
+<div class="admin">{CATEGORIES_NAV}</div>
+<form action="{F_ACTION}" method="POST">
+<table style="width:100%;">
+    <!-- BEGIN server -->
+    <tr>
+      <td style="width:50%;">{L_REMOTE_SITE}</td>
+      <td class="row1">{SITE_URL}</td>
+    </tr>
+    <!-- END server -->
+    <tr>
+      <td style="width:50%;"><strong>{L_EDIT_NAME}</strong></td>
+      <td class="row1">
+        <input type="text" name="name" value="{CAT_NAME}" maxlength="60"/>
+      </td>
+    </tr>
+	<!-- BEGIN storage -->
+	<tr>
+      <td><strong>{L_STORAGE}</strong></td>
+      <td class="row1">{CATEGORY_DIR}</td>
+    </tr>
+	<!-- END storage -->
+    <tr>
+      <td><strong>{L_EDIT_COMMENT}</strong></td>
+      <td class="row1">
+        <textarea name="comment" rows="3" cols="50" >{CAT_COMMENT}</textarea>
+      </td>
+    </tr>
+    <tr>
+      <td><strong>{L_EDIT_STATUS}&nbsp;:</strong><br /><span class="small">{L_EDIT_STATUS_INFO}</span></td>
+      <td class="row1">
+	  <input type="radio" class="radio" name="status" value="public" {ACCESS_FREE} />{L_ACCESS_FREE}&nbsp;&nbsp;
+	  <input type="radio" class="radio" name="status" value="private" {ACCESS_RESTRICTED} />{L_ACCESS_RESTRICTED}
+      </td>
+    </tr>
+	<tr>
+      <td><strong>{L_EDIT_LOCK}&nbsp;:</strong><br /><span class="small">{L_EDIT_LOCK_INFO}</span></td>
+      <td class="row1">
+	  <input type="radio" class="radio" name="visible" value="false" {LOCKED} />{L_YES}&nbsp;&nbsp;
+	  <input type="radio" class="radio" name="visible" value="true" {UNLOCKED} />{L_NO}
+      </td>
+    </tr>
+    <!-- BEGIN parent -->
+    <tr>
+      <td>{#cat_parent}</td>
+      <td class="row1">
+        <!-- BEGIN associate_LOV -->
+        <select name="associate">
+          <!-- BEGIN associate_cat -->
+          <option value="{#value}">{#content}</option>
+          <!-- END associate_cat -->
+        </select>
+        <!-- END associate_LOV -->
+        <!-- BEGIN associate_text -->
+        <input type="text" name="associate" value="{#value}" />
+        <!-- END associate_text -->
+      </td>
+    </tr>
+    <!-- END parent -->
+    <tr>
+      <td colspan="2">&nbsp;</td>
+    </tr>
+    <tr>
+      <td colspan="2" align="center">
+        <input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" />
+      </td>
+    </tr>
+  </table>
+</form>
\ No newline at end of file
diff --git a/template/default/admin/cat_modify.vtp b/template/default/admin/cat_modify.vtp
deleted file mode 100644
index 5436ff220..000000000
--- a/template/default/admin/cat_modify.vtp
+++ /dev/null
@@ -1,89 +0,0 @@
-<!--VTP_confirmation-->
-<div style="color:red;text-align:center;">
-  {#editcat_confirm} [ <a href="{#back_url}">{#editcat_back}</a> ]</div>
-<!--/VTP_confirmation-->
-<form action="{#form_action}" method="post">
-  <table style="width:100%;">
-    <tr>
-      <th colspan="2">{#editcat_title1} "{#cat:name}" [
-        <!--VTP_storage-->
-        dir : {#dir}
-        <!--/VTP_storage-->
-        <!--VTP_virtual-->
-        <span style="color:blue;">{#cat_virtual}</span>
-        <!--/VTP_virtual-->
-        ]
-      </th>
-    </tr>
-    <!--VTP_server-->
-    <tr>
-      <td style="width:20%;">{#remote_site}</td>
-      <td class="row2">{#url}</td>
-    </tr>
-    <!--/VTP_server-->
-    <tr>
-      <td style="width:20%;">{#editcat_name}</td>
-      <td class="row2">
-        <input type="text" name="name" value="{#name}" maxlength="255"/>
-      </td>
-    </tr>
-    <tr>
-      <td>{#editcat_comment}</td>
-      <td class="row2">
-        <textarea name="comment" rows="5" cols="50" style="overflow:auto">{#comment}</textarea>
-      </td>
-    </tr>
-    <tr>
-      <td>{#editcat_status}</td>
-      <td class="row2">
-        <!--VTP_status_option-->
-        <input type="radio" name="status" value="{#value}"{#checked} />{#option}
-        <!--/VTP_status_option-->
-      </td>
-    </tr>
-    <tr>
-      <td>{#editcat_visible}</td>
-      <td class="row2">
-        <!--VTP_visible_option-->
-        <input type="radio" name="visible" value="{#value}"{#checked} />{#option}
-        <!--/VTP_visible_option-->
-	{#editcat_visible_info}
-      </td>
-    </tr>
-    <!--VTP_uploadable-->
-    <tr>
-      <td>{#editcat_uploadable}</td>
-      <td class="row2">
-        <!--VTP_uploadable_option-->
-        <input type="radio" name="uploadable" value="{#value}"{#checked} />{#option}
-        <!--/VTP_uploadable_option-->
-      </td>
-    </tr>
-    <!--/VTP_uploadable-->
-    <!--VTP_parent-->
-    <tr>
-      <td>{#cat_parent}</td>
-      <td class="row2">
-        <!--VTP_associate_LOV-->
-        <select name="associate">
-          <!--VTP_associate_cat-->
-          <option value="{#value}">{#content}</option>
-          <!--/VTP_associate_cat-->
-        </select>
-        <!--/VTP_associate_LOV-->
-        <!--VTP_associate_text-->
-        <input type="text" name="associate" value="{#value}" />
-        <!--/VTP_associate_text-->
-      </td>
-    </tr>
-    <!--/VTP_parent-->
-    <tr>
-      <td colspan="2">&nbsp;</td>
-    </tr>
-    <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/category.tpl b/template/default/category.tpl
index 449ac30e4..a48097a5e 100644
--- a/template/default/category.tpl
+++ b/template/default/category.tpl
@@ -99,7 +99,7 @@
 			  <div class="navigationBar">{cat_infos.navigation.NAV_BAR}</div>
 			  <!-- END navigation -->
 			  <!-- BEGIN comment -->
-			  <div class="comments">{cat_infos.comment.COMMENTS}</div>
+			  <div class="info">{cat_infos.comment.COMMENTS}</div>
 			  <!-- END comment -->
 			  <div class="infoCat">
 			  {L_NB_IMG} "{TITLE}" : {cat_infos.NB_IMG_CAT}
diff --git a/template/default/default.css b/template/default/default.css
index 704add92a..fdf1d576f 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -221,7 +221,7 @@ form{
   margin-top:10px;
 }
 
-input,select {
+input,select,textarea {
  text-indent:2px;
  background-color:#505050;
  border: 1px solid #797979;
@@ -262,13 +262,11 @@ color : #FFF48E;
 
 /* Other styles */
 .info {
-  color:#E0E0E0;
-  background-color:#444444;
-  margin-bottom:5px;
+  color:#FFF48E;
+  margin:5px 0px 5px 0px
   white-space:nowrap;
-  margin-left:5px;
-  margin-right:5px;
-  text-align:right;
+  text-align:center;
+  font-size:16px;
 }
 .menuInfoCat {
   font-family:sans-serif;
@@ -309,23 +307,3 @@ div.information {
   margin:10px;
   padding:5px;
 }
-
-.tableComment,.cellAuthor,.cellInfo {
-  border-color:#E0E0E0;
-  border-style:solid;
-}
-.tableComment {
-  width:100%;
-  border-width:2px;
-  text-align:left;
-  padding: 10px;
-}
-.cellAuthor {
-  border-width:0px;
-  border-right-width:1px;
-  width:20%;
-}
-.cellInfo {
-  border-width:0px;
-  border-bottom-width:1px;
-}