Template migration

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

6 files changed, 131 insertions, 145 deletions

diff --git a/template/default/category.tpl b/template/default/category.tpl
index 7feb34da3..4575063a8 100644
--- a/template/default/category.tpl
+++ b/template/default/category.tpl
@@ -1,7 +1,7 @@
 <table style="width:100%;">
   <tr>
 	<td valign="top" style="width:1%;padding:10px;">
-	  {F_START}100%{F_BEGIN}
+	  {T_START}100%{T_BEGIN}
 		<div class="titreMenu">
 		  <a href="{U_HOME}">{L_CATEGORIES}</a>
 		</div>
@@ -30,9 +30,9 @@
 		  <br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="{T_COLLAPSED}" alt='' />&nbsp;<a href="{U_MOST_VISITED}"><span title="{L_MOST_VISITED_HINT}" style="font-weight:bold;">{S_TOP}&nbsp;{L_MOST_VISITED}</span></a>
 		  <br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="{T_COLLAPSED}" alt='' />&nbsp;<a href="{U_RECENT}"><span title="{L_RECENT_HINT}" style="font-weight:bold;">{L_RECENT}</span></a> {T_SHORT}
 		</div>
-	  {F_END}
+	  {T_END}
 	  <div style="margin-bottom:5px;">&nbsp;</div>
-	  {F_START}100%{F_BEGIN}
+	  {T_START}100%{T_BEGIN}
 		<div class="titreMenu">{L_SUMMARY}</div>
 		<div class="menu">
 		  <!-- BEGIN summary -->
@@ -42,15 +42,15 @@
 		  <br />&nbsp;<img src="{T_COLLAPSED}" alt=''/>&nbsp;<a href="{upload.U_UPLOAD}">{L_UPLOAD}</a>
 		  <!-- END upload -->
 		</div>
-	  {F_END}
+	  {T_END}
 	</td>
 	<td style="padding:5px;width:99%;" valign="top">
 	  <table style="width:100%;">
 		<tr>
 		  <td align="center">
-			{F_START}1%{F_BEGIN}
+			{T_START}1%{T_BEGIN}
 			  <div class="titrePage">{TITLE}</div>
-			{F_END}
+			{T_END}
 			<div style="margin-bottom:5px;">&nbsp;</div>
 			<!-- BEGIN thumbnails -->
 			<table class="thumbnail">
@@ -94,7 +94,7 @@
 		</tr>
 		<tr>
 		  <td align="right">
-			{F_START}1%{F_BEGIN}
+			{T_START}1%{T_BEGIN}
 			  <div class="info">
 				{L_USER}&nbsp;{USERNAME}<br />
 				{L_RECENT_IMG}&nbsp;{S_SHORT_PERIOD}&nbsp;{L_DAYS}
@@ -103,7 +103,7 @@
 				  {T_LONG}<br />
 				{L_SEND_MAIL}&nbsp;<a href="mailto:{S_MAIL}?subject={L_TITLE_MAIL}"><span style="font-weight:bold;">{S_WEBMASTER}</span></a>
 			  </div>
-			{F_END}
+			{T_END}
 		  </td>
 		</tr>
 	  </table>
diff --git a/template/default/comments.tpl b/template/default/comments.tpl
new file mode 100644
index 000000000..e4a46e4b5
--- /dev/null
+++ b/template/default/comments.tpl
@@ -0,0 +1,61 @@
+<table style="width:100%;">
+  <tr align="center" valign="middle">
+	<td>
+	  {T_START}1px{T_BEGIN}
+		<div class="titrePage">{L_TITLE}</div>
+	  {T_END}
+	  <div style="margin-bottom:20px"></div>
+	  {T_START}90%{T_BEGIN}
+<table style="width:100%;">
+  <tr>
+    <th>
+      [
+      <!-- BEGIN last_day_option -->
+      <a href="{last_day_option.U_OPTION}" style="{last_day_option.T_STYLE}">{last_day_option.OPTION}</a>{T_SEPARATION}
+      <!-- END last_day_option -->
+      {L_STATS}
+      ]
+      [ <a href="{U_HOME}">{L_RETURN}</a> ]
+    </th>
+  </tr>
+</table>
+<!-- BEGIN picture -->
+<div style="border:2px solid gray;margin:2px;padding:2px;">
+  <table style="width:100%;">
+    <tr>
+     <td valign="top" style="width:15%;">
+       <!-- the thumbnail of the picture, linked to the full size page -->
+       <a href="{picture.U_THUMB}" title="{picture.TITLE_IMG}">
+         <img src="{picture.I_THUMB}" class="imgLink" alt="{picture.THUMB_ALT_IMG}"/>
+       </a>
+     </td>
+     <td style="padding:10px;width:85%;">
+       <div style="font-weight:bold;padding-left:10px;text-align:left;">{picture.TITLE_IMG}</div>
+       <!-- BEGIN comment -->
+             <table class="tableComment">
+               <tr>
+                 <td rowspan="2" valign="top" class="cellAuthor">
+                   <div class="commentsAuthor">{picture.comment.AUTHOR}</div>
+                 </td>
+                 <td class="cellInfo">
+                   <div class="commentsInfos">
+                     {picture.comment.DATE}
+                   </div>
+                 </td>
+               </tr>
+               <tr>
+                 <td>
+                   <div class="commentsContent">{picture.comment.CONTENT}</div>
+                 </td>
+               </tr>
+             </table>
+       <!-- END comment -->
+     </td>
+    </tr>
+  </table>
+</div>
+<!-- END picture -->
+	  {T_END}
+	</td>
+  </tr>
+</table>
\ No newline at end of file
diff --git a/template/default/comments.vtp b/template/default/comments.vtp
deleted file mode 100644
index 1c729ee74..000000000
--- a/template/default/comments.vtp
+++ /dev/null
@@ -1,61 +0,0 @@
-    <table style="width:100%;">
-      <tr align="center" valign="middle">
-        <td>
-          {#frame_start}1px{#frame_begin}
-            <div class="titrePage">{#title_comments}</div>
-          {#frame_end}
-          <div style="margin-bottom:20px"></div>
-          {#frame_start}90%{#frame_begin}
-<table style="width:100%;">
-  <tr>
-    <th>
-      [
-      <!--VTP_last_day_option-->
-      <a href="{#link}" style="{#style}">{#option}</a>{#separation}
-      <!--/VTP_last_day_option-->
-      {#stats_last_days}
-      ]
-      [ <a href="{#back_url}">{#search_return_main_page}</a> ]
-    </th>
-  </tr>
-</table>
-<!--VTP_picture-->
-<div style="border:2px solid gray;margin:2px;padding:2px;">
-  <table style="width:100%;">
-    <tr>
-     <td valign="top" style="width:15%;">
-       <!-- the thumbnail of the picture, linked to the full size page -->
-       <a href="{#thumb_url}" title="{#thumb_title}">
-         <img src="{#thumb_src}" class="imgLink" alt="{#thumb_alt}"/>
-       </a>
-     </td>
-     <td style="padding:10px;width:85%;">
-       <div style="font-weight:bold;padding-left:10px;text-align:left;">{#title}</div>
-       <!--VTP_comment-->
-             <table class="tableComment">
-               <tr>
-                 <td rowspan="2" valign="top" class="cellAuthor">
-                   <div class="commentsAuthor">{#author}</div>
-                 </td>
-                 <td class="cellInfo">
-                   <div class="commentsInfos">
-                     {#date}<!--VTP_delete--><a href="{#link}" title="{#comments_del}"><img src="../template/{#user_template}/admin/images/delete.gif" style="border:none;margin-left:5px;" alt="[{#delete}]"/></a><!--/VTP_delete-->
-                   </div>
-                 </td>
-               </tr>
-               <tr>
-                 <td>
-                   <div class="commentsContent">{#content}</div>
-                 </td>
-               </tr>
-             </table>
-       <!--/VTP_comment-->
-     </td>
-    </tr>
-  </table>
-</div>
-<!--/VTP_picture-->
-          {#frame_end}
-        </td>
-      </tr>
-    </table>
\ No newline at end of file
diff --git a/template/default/htmlfunctions.inc.php b/template/default/htmlfunctions.inc.php
index a3365b4a5..c1d8f49f9 100644
--- a/template/default/htmlfunctions.inc.php
+++ b/template/default/htmlfunctions.inc.php
@@ -143,9 +143,9 @@ function initialize_template()
   global $template, $user, $lang;
   
   $template->assign_vars(array(
-	'F_START' => get_frame_start(),
-	'F_BEGIN' => get_frame_begin(),
-	'F_END' =>  get_frame_end()
+	'T_START' => get_frame_start(),
+	'T_BEGIN' => get_frame_begin(),
+	'T_END' =>  get_frame_end()
 	)
 	);
 
diff --git a/template/default/search.tpl b/template/default/search.tpl
new file mode 100644
index 000000000..d5fbdb6b9
--- /dev/null
+++ b/template/default/search.tpl
@@ -0,0 +1,59 @@
+<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}
+		<div style="margin-left:auto;margin-right:auto;text-align:center;">
+		  <form 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>{errors.error.ERROR}</li>
+					  <!-- END error -->
+					</ul>
+				  </div>
+				</td>
+			  </tr>
+			  <!-- END errors -->
+			  <tr>
+				<td colspan="2">
+				  <div style="margin-bottom:10px;">&nbsp;</div>
+				</td>
+			  </tr>
+			  <tr>
+				<td class="menu">{L_SEARCH}</td>
+				<td class="menu">
+				  <input type="text" name="search" size="40" value="{F_TEXT_VALUE}" /><br />
+				  <input class="radio" type="radio" name="mode" value="OR" checked="checked" /> {L_SEARCH_OR}
+				  <input class="radio" type="radio" name="mode" value="AND" /> {L_SEARCH_AND}
+				</td>
+			  </tr>
+			  <tr>
+				<td align="center" colspan="2">
+				  <input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" style="margin:10px;" />
+				</td>
+			  </tr>
+			  <tr>
+				<td align="center" colspan="2">
+				  <a href="{U_HOME}">[ {L_RETURN} ]</a>
+				</td>
+			  </tr>
+			  <tr>
+				<td colspan="2">
+				  <div style="margin-top:10px;">* : {L_COMMENTS}</div>
+				</td>
+			  </tr>
+			</table>
+		  </form>
+		</div>
+	  {T_END}
+	</td>
+  </tr>
+</table>
\ No newline at end of file
diff --git a/template/default/search.vtp b/template/default/search.vtp
deleted file mode 100644
index bc6b92995..000000000
--- a/template/default/search.vtp
+++ /dev/null
@@ -1,73 +0,0 @@
-    <table style="width:100%;height:100%">
-      <tr align="center" valign="middle">
-        <td>
-          {#frame_start}1px{#frame_begin}
-            <div class="titrePage">{#search_title}</div>
-          {#frame_end}
-          <div style="margin-bottom:5px;">&nbsp;</div>
-          {#frame_start}50%{#frame_begin}
-            <div style="margin-left:auto;margin-right:auto;text-align:center;">
-              <form method="post" action="{#form_action}">
-                <table style="width:80%;margin-left:auto;margin-right:auto;">
-                  <!--VTP_errors-->
-                  <tr>
-                    <td colspan="2">
-                      <div class="errors">
-                        <ul>
-                          <!--VTP_li-->
-                          <li>{#li}</li>
-                          <!--/VTP_li-->
-                        </ul>
-                      </div>
-                    </td>
-                  </tr>
-                  <!--/VTP_errors-->
-                  <tr>
-                    <td colspan="2">
-                      <div style="margin-bottom:10px;">&nbsp;</div>
-                    </td>
-                  </tr>
-                  <!--VTP_line-->
-                  <tr>
-                    <td class="menu">{#name}</td>
-                    <td class="menu">
-                      <!--VTP_select-->
-                      <select name="{#name}">
-                        <!--VTP_option-->
-                        <option{#selected}>{#option}</option>
-                        <!--/VTP_option-->
-                      </select>
-                      <!--/VTP_select-->
-                      <!--VTP_text-->
-                      <input type="text" name="{#name}" size="{#size}" value="{#value}" />
-                      <!--/VTP_text-->
-                      <!--VTP_group-->
-                        <!--VTP_radio-->
-                        <input type="radio" name="{#name}" value="{#value}"{#checked}/>{#option}
-                        <!--/VTP_radio-->
-                      <!--/VTP_group-->
-                    </td>
-                  </tr>
-                  <!--/VTP_line-->
-                  <tr>
-                    <td align="center" colspan="2">
-                      <input type="submit" name="submit" value="{#submit}" class="bouton" style="margin:10px;" />
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="center" colspan="2">
-                      <a href="{#back_url}">[ {#search_return_main_page} ]</a>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      <div style="margin-top:10px;">* : {#search_comments}</div>
-                    </td>
-                  </tr>
-                </table>
-              </form>
-            </div>
-          {#frame_end}
-        </td>
-      </tr>
-    </table>
\ No newline at end of file