From 1a3660405a6856bca55932900e18edd5b5e6d20b Mon Sep 17 00:00:00 2001
From: rub <rub@piwigo.org>
Date: Fri, 16 Mar 2007 18:49:19 +0000
Subject: Add the last (before 1.8) tabsheet on administration menu (Waiting
 elements). Small change way mail function.

git-svn-id: http://piwigo.org/svn/trunk@1915 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 template/yoga/admin/comments.tpl |  8 ++++++-
 template/yoga/admin/upload.tpl   | 50 ++++++++++++++++++++++++++++++++++++++++
 template/yoga/admin/waiting.tpl  | 45 ------------------------------------
 3 files changed, 57 insertions(+), 46 deletions(-)
 create mode 100644 template/yoga/admin/upload.tpl
 delete mode 100644 template/yoga/admin/waiting.tpl

(limited to 'template/yoga/admin')

diff --git a/template/yoga/admin/comments.tpl b/template/yoga/admin/comments.tpl
index 39c18bd5c..88c86bd88 100644
--- a/template/yoga/admin/comments.tpl
+++ b/template/yoga/admin/comments.tpl
@@ -1,4 +1,10 @@
-<h2>{lang:User comments validation}</h2>
+<!-- $Id$ -->
+<div class="titrePage">
+  <h2>{lang:waiting} {TABSHEET_TITLE}</h2>
+  {TABSHEET}
+</div>
+
+<h3>{lang:User comments validation}</h3>
 
 <form method="post" action="{F_ACTION}">
   <!-- BEGIN comment -->
diff --git a/template/yoga/admin/upload.tpl b/template/yoga/admin/upload.tpl
new file mode 100644
index 000000000..3bba80602
--- /dev/null
+++ b/template/yoga/admin/upload.tpl
@@ -0,0 +1,50 @@
+<!-- $Id$ -->
+<div class="titrePage">
+  <h2>{lang:waiting} {TABSHEET_TITLE}</h2>
+  {TABSHEET}
+</div>
+
+<h3>{lang:title_upload}</h3>
+
+<form action="{F_ACTION}" method="post" id="waiting">
+  <table style="width:100%;" >
+    <tr class="throw">
+      <th style="width:20%;">{lang:category}</th>
+      <th style="width:20%;">{lang:date}</th>
+      <th style="width:20%;">{lang:file}</th>
+      <th style="width:20%;">{lang:thumbnail}</th>
+      <th style="width:20%;">{lang:Author}</th>
+      <th style="width:1px;">&nbsp;</th>
+    </tr>
+    <!-- BEGIN picture -->
+    <tr>
+      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">{picture.CATEGORY_IMG}</td>
+      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">{picture.DATE_IMG}</td>
+      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
+        <a href="{picture.PREVIEW_URL_IMG}" title="{picture.FILE_TITLE}">{picture.FILE_IMG}</a>
+      </td>
+      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
+        <!-- BEGIN thumbnail -->
+        <a href="{picture.thumbnail.PREVIEW_URL_TN_IMG}" title="{picture.thumbnail.FILE_TN_TITLE}">{picture.thumbnail.FILE_TN_IMG}</a>
+        <!-- END thumbnail -->
+      </td>
+      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
+        <a href="mailto:{picture.UPLOAD_EMAIL}">{picture.UPLOAD_USERNAME}</a>
+      </td>
+      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
+        <label><input type="radio" name="action-{picture.ID_IMG}" value="validate" /> {lang:Validate}</label>
+        <label><input type="radio" name="action-{picture.ID_IMG}" value="reject" /> {lang:Reject}</label>
+      </td>
+    </tr>
+    <!-- END picture -->
+  </table>
+
+  <p class="bottomButtons">
+    <input type="hidden" name="list" value="{LIST}" />
+    <input class="submit" type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED}/>
+    <input class="submit" type="submit" name="validate-all" value="{lang:Validate All}" {TAG_INPUT_ENABLED}/>
+    <input class="submit" type="submit" name="reject-all" value="{lang:Reject All}" {TAG_INPUT_ENABLED}/>
+    <input class="submit" type="reset" value="{lang:Reset}" />
+  </p>
+
+</form>
diff --git a/template/yoga/admin/waiting.tpl b/template/yoga/admin/waiting.tpl
deleted file mode 100644
index 2732ad621..000000000
--- a/template/yoga/admin/waiting.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<!-- $Id$ -->
-<h2>{lang:title_waiting}</h2>
-
-<form action="{F_ACTION}" method="post" id="waiting">
-  <table style="width:100%;" >
-    <tr class="throw">
-      <th style="width:20%;">{lang:category}</th>
-      <th style="width:20%;">{lang:date}</th>
-      <th style="width:20%;">{lang:file}</th>
-      <th style="width:20%;">{lang:thumbnail}</th>
-      <th style="width:20%;">{lang:Author}</th>
-      <th style="width:1px;">&nbsp;</th>
-    </tr>
-    <!-- BEGIN picture -->
-    <tr>
-      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">{picture.CATEGORY_IMG}</td>
-      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">{picture.DATE_IMG}</td>
-      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
-        <a href="{picture.PREVIEW_URL_IMG}" title="{picture.FILE_TITLE}">{picture.FILE_IMG}</a>
-      </td>
-      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
-        <!-- BEGIN thumbnail -->
-        <a href="{picture.thumbnail.PREVIEW_URL_TN_IMG}" title="{picture.thumbnail.FILE_TN_TITLE}">{picture.thumbnail.FILE_TN_IMG}</a>
-        <!-- END thumbnail -->
-      </td>
-      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
-        <a href="mailto:{picture.UPLOAD_EMAIL}">{picture.UPLOAD_USERNAME}</a>
-      </td>
-      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
-        <label><input type="radio" name="action-{picture.ID_IMG}" value="validate" /> {lang:Validate}</label>
-        <label><input type="radio" name="action-{picture.ID_IMG}" value="reject" /> {lang:Reject}</label>
-      </td>
-    </tr>
-    <!-- END picture -->
-  </table>
-
-  <p class="bottomButtons">
-    <input type="hidden" name="list" value="{LIST}" />
-    <input class="submit" type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED}/>
-    <input class="submit" type="submit" name="validate-all" value="{lang:Validate All}" {TAG_INPUT_ENABLED}/>
-    <input class="submit" type="submit" name="reject-all" value="{lang:Reject All}" {TAG_INPUT_ENABLED}/>
-    <input class="submit" type="reset" value="{lang:Reset}" />
-  </p>
-
-</form>
-- 
cgit v1.2.3