waiting tpl migration

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

3 files changed, 134 insertions, 146 deletions

diff --git a/template/default/admin/waiting.tpl b/template/default/admin/waiting.tpl
new file mode 100644
index 000000000..ccdbfd5e7
--- /dev/null
+++ b/template/default/admin/waiting.tpl
@@ -0,0 +1,41 @@
+<form action="{F_ACTION}" method="post">
+  <!-- BEGIN confirmation -->
+  <div class="info">{L_WAITING_CONFIRMATION}</div>
+  <!-- END confirmation -->
+  <table style="width:100%;" >
+    <tr class="throw">
+      <th style="width:20%;">{L_CATEGORY}</th>
+      <th style="width:20%;">{L_DATE}</th>
+      <th style="width:20%;">{L_FILE}</th>
+      <th style="width:20%;">{L_THUMBNAIL}</th>
+      <th style="width:20%;">{L_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 target="_blank" href="{picture.PREVIEW_URL_IMG}">{picture.FILE_IMG}</a>
+      </td>
+      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
+        <!-- BEGIN thumbnail -->
+        <a target="_blank" href="{picture.thumbnail.PREVIEW_URL_TN_IMG}">{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;">
+        <input type="radio" name="validate-{picture.ID_IMG}" value="true" />{L_SUBMIT}
+        <input type="radio" name="validate-{picture.ID_IMG}" value="false" />{L_DELETE}
+      </td>
+    </tr>
+    <!-- END picture -->
+    <tr>
+      <td colspan="5" 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/waiting.vtp b/template/default/admin/waiting.vtp
deleted file mode 100644
index b04ab2cff..000000000
--- a/template/default/admin/waiting.vtp
+++ /dev/null
@@ -1,42 +0,0 @@
-<form action="{#action}" method="post">
-  <!--VTP_confirmation-->
-  <div class="info">{#waiting_update}</div>
-  <!--/VTP_confirmation-->
-  <table style="width:100%;">
-    <tr>
-      <th style="width:20%;">{#category}</th>
-      <th style="width:20%;">{#date}</th>
-      <th style="width:20%;">{#file}</th>
-      <th style="width:20%;">{#thumbnail}</th>
-      <th style="width:20%;">{#author}</th>
-      <th style="width:1px;">&nbsp;</th>
-    </tr>
-    <!--VTP_picture-->
-    <tr>
-      <td class="{#class}" style="white-space:nowrap;">{#cat_name}</td>
-      <td class="{#class}" style="white-space:nowrap;">{#date}</td>
-      <td class="{#class}" style="white-space:nowrap;">
-        <a target="_blank" href="{#preview_url}">{#file}</a>
-      </td>
-      <td class="{#class}" style="white-space:nowrap;">
-        <!--VTP_thumbnail-->
-        <a target="_blank" href="{#preview_url}">{#file}</a>
-        <!--/VTP_thumbnail-->
-        <!--VTP_no_thumbnail-->
-        &nbsp;
-        <!--/VTP_no_thumbnail-->
-      </td>
-      <td class="{#class}" style="white-space:nowrap;">
-        <a href="mailto:{#mail_address}">{#username}</a>
-      </td>
-      <td class="{#class}" style="white-space:nowrap;">
-        <input type="radio" name="validate-{#id}" value="true" />{#submit}
-        <input type="radio" name="validate-{#id}" value="false" />{#delete}
-      </td>
-    </tr>
-    <!--/VTP_picture-->
-    <tr>
-      <td colspan="5" align="center"><input type="submit" name="submit" value="{#submit}" style="margin:5px;" /></td>
-    </tr>
-  </table>
-</form>
\ No newline at end of file
diff --git a/template/default/upload.tpl b/template/default/upload.tpl
index e65714dce..b82537218 100644
--- a/template/default/upload.tpl
+++ b/template/default/upload.tpl
@@ -1,104 +1,93 @@
-    <table style="width:100%;height:100%">
-      <tr align="center" valign="middle">
-        <td>
-          {T_START}1px{T_BEGIN}
-            <div class="titrePage">{L_TITLE}</div>
-          {T_END}
-          <div style="margin-bottom:5px;">&nbsp;</div>
-          {T_START}50%{T_BEGIN}
-            <!-- BEGIN upload_not_successful -->
-            <form enctype="multipart/form-data" method="post" action="{F_ACTION}">
-              <table style="width:80%;margin-left:auto;margin-right:auto;">
-                <!-- BEGIN errors -->
-                      <tr>
-                        <td colspan="2">
-                          <div class="errors">
-                            <ul>
-                              <!-- BEGIN error -->
-                              <li>{upload_not_successful.errors.error.ERROR}</li>
-                              <!-- END error -->
-                            </ul>
-                          </div>
-                        </td>
-                      </tr>
-                      <!-- END errors -->
-                <tr>
-                  <td colspan="2" class="menu">
-                    <div style="text-align:center;">{ADVISE_TITLE}</div>
-                    <ul>
-                      <!-- BEGIN advise -->
-                      <li>{upload_not_successful.advise.ADVISE}</li>
-                      <!-- END advise -->
-                    </ul>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" align="center" style="padding:10px;">
-                    <input name="picture" type="file" value="" />
-                  </td>
-                </tr>
-                <!-- BEGIN fields -->
-                <!-- username  -->
-                <tr>
-                  <td class="menu">{L_USERNAME} <span style="color:red;">*</span></td>
-                  <td align="center" style="padding:10px;">
-                    <input name="username" type="text" value="{NAME}" />
-                  </td>
-                </tr>
-                <!-- mail address  -->
-                <tr>
-                  <td class="menu">{L_EMAIL} <span style="color:red;">*</span></td>
-                  <td align="center" style="padding:10px;">
-                    <input name="mail_address" type="text" value="{EMAIL}" />
-                  </td>
-                </tr>
-                <!-- name of the picture  -->
-                <tr>
-                  <td class="menu">{L_NAME_IMG}</td>
-                  <td align="center" style="padding:10px;">
-                    <input name="name" type="text" value="{NAME_IMG}" />
-                  </td>
-                </tr>
-                <!-- author  -->
-                <tr>
-                  <td class="menu">{L_AUTHOR}</td>
-                  <td align="center" style="padding:10px;">
-                    <input name="author" type="text" value="{AUTHOR_IMG}" />
-                  </td>
-                </tr>
-                <!-- date of creation  -->
-                <tr>
-                  <td class="menu">{L_CREATION_DATE}</td>
-                  <td align="center" style="padding:10px;">
-                    <input name="date_creation" type="text" value="{DATE_IMG}" />
-                  </td>
-                </tr>
-                <!-- comment  -->
-                <tr>
-                  <td class="menu">{L_COMMENT}</td>
-                  <td align="center" style="padding:10px;">
-                   <textarea name="comment" rows="3" cols="40" style="overflow:auto">{COMMENT_IMG}</textarea>
-                  </td>
-                </tr>
-                <!-- END fields -->
-                <tr>
-                  <td colspan="2" align="center">
-                    <input name="submit" type="submit" value="{L_SUBMIT}" />
-                  </td>
-                </tr>
-              </table>
-            </form>
-            <!-- END upload_not_successful -->
-            <!-- BEGIN upload_successful -->
-            {L_UPLOAD_DONE}<br />
-            <!-- END upload_successful -->
-            <div style="text-align:center;">
-              <a href="{U_RETURN}">[ {L_RETURN} ]</a>
-            </div>
-            <!-- BEGIN note -->
-            <div style="text-align:left;"><span style="color:red;">*</span> : {L_MANDATORY}</div>
-            <!-- END note -->
-          {T_END}
-        </td>
-      </tr>
-    </table>
\ No newline at end of file
+<div class="titrePage">{L_TITLE}</div>
+<!-- BEGIN upload_not_successful -->
+<form enctype="multipart/form-data" method="post" action="{F_ACTION}">
+  <table style="width:80%;margin-left:auto;margin-right:auto;">
+	<!-- BEGIN errors -->
+		  <tr>
+			<td colspan="2">
+			  <div class="errors">
+				<ul>
+				  <!-- BEGIN error -->
+				  <li>{upload_not_successful.errors.error.ERROR}</li>
+				  <!-- END error -->
+				</ul>
+			  </div>
+			</td>
+		  </tr>
+		  <!-- END errors -->
+	<tr>
+	  <td colspan="2" class="menu">
+		<div style="text-align:center;">{ADVISE_TITLE}</div>
+		<ul>
+		  <!-- BEGIN advise -->
+		  <li>{upload_not_successful.advise.ADVISE}</li>
+		  <!-- END advise -->
+		</ul>
+	  </td>
+	</tr>
+	<tr>
+	  <td colspan="2" align="center" style="padding:10px;">
+		<input name="picture" type="file" value="" />
+	  </td>
+	</tr>
+	<!-- BEGIN fields -->
+	<!-- username  -->
+	<tr>
+	  <td class="menu">{L_USERNAME} <span style="color:red;">*</span></td>
+	  <td align="center" style="padding:10px;">
+		<input name="username" type="text" value="{NAME}" />
+	  </td>
+	</tr>
+	<!-- mail address  -->
+	<tr>
+	  <td class="menu">{L_EMAIL} <span style="color:red;">*</span></td>
+	  <td align="center" style="padding:10px;">
+		<input name="mail_address" type="text" value="{EMAIL}" />
+	  </td>
+	</tr>
+	<!-- name of the picture  -->
+	<tr>
+	  <td class="menu">{L_NAME_IMG}</td>
+	  <td align="center" style="padding:10px;">
+		<input name="name" type="text" value="{NAME_IMG}" />
+	  </td>
+	</tr>
+	<!-- author  -->
+	<tr>
+	  <td class="menu">{L_AUTHOR}</td>
+	  <td align="center" style="padding:10px;">
+		<input name="author" type="text" value="{AUTHOR_IMG}" />
+	  </td>
+	</tr>
+	<!-- date of creation  -->
+	<tr>
+	  <td class="menu">{L_CREATION_DATE}</td>
+	  <td align="center" style="padding:10px;">
+		<input name="date_creation" type="text" value="{DATE_IMG}" />
+	  </td>
+	</tr>
+	<!-- comment  -->
+	<tr>
+	  <td class="menu">{L_COMMENT}</td>
+	  <td align="center" style="padding:10px;">
+	   <textarea name="comment" rows="3" cols="40" style="overflow:auto">{COMMENT_IMG}</textarea>
+	  </td>
+	</tr>
+	<!-- END fields -->
+	<tr>
+	  <td colspan="2" align="center">
+		<input name="submit" type="submit" value="{L_SUBMIT}" class="bouton" />
+	  </td>
+	</tr>
+  </table>
+</form>
+<!-- END upload_not_successful -->
+<!-- BEGIN upload_successful -->
+{L_UPLOAD_DONE}<br />
+<!-- END upload_successful -->
+<div style="text-align:center;">
+  <a href="{U_RETURN}">[ {L_RETURN} ]</a>
+</div>
+<!-- BEGIN note -->
+<div style="text-align:left;"><span style="color:red;">*</span> : {L_MANDATORY}</div>
+<!-- END note -->