New default template - User side

git-svn-id: http://piwigo.org/svn/trunk@375 68402e56-0260-453c-a942-63ccdbb3a9ee
author: gweltas <gweltas@piwigo.org> 2004-02-26 18:33:45 +0000
committer: gweltas <gweltas@piwigo.org> 2004-02-26 18:33:45 +0000
commit: 9e993f2d21e9cf7bd44a7c676af567be550dca90 (patch)
tree: e6a4c049a28164631f75c087a91201a9b152cbf9 /template/default
parent: 29a07c00d083b7687331cd7cc19f097a8849a3ea (diff)
12 files changed, 241 insertions, 374 deletions
diff --git a/template/default/admin.vtp b/template/default/admin.vtp
index c17cd7f05..abe85807d 100644
--- a/template/default/admin.vtp
+++ b/template/default/admin.vtp
@@ -1,165 +1,10 @@
-<html>
-  <head>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset={#charset}" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
     <title>{#title_default}</title>
-    <style>
-      a {
-        text-decoration:none;
-        color:#006699;
-      }
-      a:hover {
-        text-decoration:underline;
-      }
-      body,table,input,form,select,textarea {
-        font-family:arial,verdana,sans-serif;
-        font-size:12px;
-      }
-      .miniature {
-        border:solid 1px black;
-      }
-      body {
-        background-color:#E5E5E5;
-      }
-      .titretable1 {
-        color:black;
-        background-color:#D3DCE3;
-        text-align:center;
-        border:2px solid #006699;
-        font-weight:bold;
-        border-bottom:0px;
-      }
-      .grostitre {
-        text-align:center;
-        margin:10px 50px 10px 50px;
-        font-size:20px;
-        width:300px;
-      }
-      .plan {
-        margin:10px 10px 10px 2px;
-        white-space:nowrap;
-      }
-      .table1 {
-        border-collapse:collapse;
-        background-color:#FFFFFF;
-      }
-      .contenucellule {
-        background-color:#EEEEEE;
-        border:2px solid #006699;
-      }
-      .style1 {
-        margin-top:20px;
-      }
-      th {
-        font-weight:bold;
-        background-color:#D3DCE3;
-      }
-      td.row1 {
-        background-color:#E6E4E4;
-      }
-      td.row2,td.throw2 {
-        background-color:#E8E8E8;
-      }
-      td.throw2 {
-        text-align:center;
-        font-weight:bold;
-      }
-      td.row3 {
-        background-color:#eeeeee;
-      }
-      td.row4 {
-        background-color:#cccccc;
-      }
-      .summary {
-        text-align:center;
-        font-weight:bold;
-      }
-      .retrait {
-        margin:10px;
-        margin-left:30px;
-        margin-top:2px;
-      }
-      input,textarea {
-        border-width:1;
-        border-color:#000000;
-        background:#ffffff;
-        color: #000000;
-      }
-      .erreur {
-        color:red;
-        text-align:center;
-      }
-      .errors {
-        text-align:left;
-        margin:25px;
-        background-color:#ffe1e1;
-        border:1px solid red;
-        color:black;
-      }
-      .errors_title {
-        margin:5px;
-        font-weight:bold;
-        font-size:120%;
-        text-align:center;
-        color:red;
-      }
-      .info {
-        color:darkblue;
-        text-align:center;
-      }
-      div.key {
-        margin-left : 10px;
-      }
-      td.choice {
-        text-align : center;
-      }
-      div.install_warning {
-        text-align:center;
-        color:red;
-        margin:20px;
-        font-weight:bold;
-      }
-<!-- comments CSS style -->
-      .commentsAuthor,.commentsTitle,.commentsInfos,.commentsContent,.commentsNavigationBar {
-        color:black;
-        font-family:arial,sans-Serif;
-        font-size:12px;
-      }
-      .commentsTitle,.commentsAuthor {
-        text-align:center;
-        font-weight:bold;
-      }
-      .commentsInfos {
-        text-align:right;
-        margin:3px 3px 3px 10px;
-        font-size:11px;
-      }
-      .commentsContent {
-        margin:10px;
-      }
-      .commentsTitle {
-        margin-top:15px;
-      }
-      .commentsAuthor {
-        margin:5px;
-      }
-      .commentsNavigationBar {
-        margin:10px;
-      }
-      .tableComment {
-        width:100%;
-        border:2px solid #006699;
-        margin:10px;
-      }
-      .cellAuthor {
-        border-right:1px solid #006699;
-        width:100px;
-      }
-      .cellInfo {
-        border-bottom:1px solid #006699;
-      }
-      .imgLink {
-        border:1px solid black;
-      }
-    </style>
+	<link rel="stylesheet" href="{#style}" type="text/css" />
     <script language="javascript">
       function SelectAll( formulaire )
       {
@@ -189,7 +34,7 @@
         }
       }
     </script>
-    <meta http-equiv="Content-Type" content="text/html; charset={#charset}">
+
   </head>
   <body>
     <!--VTP_install_warning--><div class="install_warning">{#install_warning}</div><!--/VTP_install_warning-->
diff --git a/template/default/category.tpl b/template/default/category.tpl
index 8bec51f4d..16307a824 100644
--- a/template/default/category.tpl
+++ b/template/default/category.tpl
@@ -1,7 +1,9 @@
+<div align="center" style="padding:10px;"><img src="template/default/images/logo.jpg" width="360" height="100">
+</div>
 <table style="width:100%;">
   <tr>
-	<td valign="top" style="width:1%;padding:10px;">
-	  {T_START}100%{T_BEGIN}
+	<td valign="top" style="padding:10px;width:1%;">
+	<div class="table1">
 		<div class="titreMenu">
 		  <a href="{U_HOME}">{L_CATEGORIES}</a>
 		</div>
@@ -14,12 +16,12 @@
 			 <!-- BEGIN bulletnolink -->
 				<img src="{category.bulletnolink.BULLET_IMAGE}" style="border:none;" alt="" />
 			<!-- END bulletnolink -->
-			&nbsp;<a href="{category.U_LINK}"><span title='{L_HINT_CATEGORY}' style="{category.T_NAME}">{category.LINK_NAME}</span>
+			&nbsp;<a href="{category.U_LINK}"><span title='{L_HINT_CATEGORY}' style="{category.T_NAME}">{category.LINK_NAME}</span></a>
 			&nbsp;<span class="menuInfoCat">[
 			<!-- BEGIN subcat -->
 			<span title="{category.NB_SUBCATS} {L_SUBCAT}">{category.NB_SUBCATS}</span>&nbsp;-
 			<!-- END subcat -->
-			<span title="{category.TOTAL_CAT} {L_IMG_AVAILABLE}">{category.TOTAL_CAT}</span>&nbsp;]</span></a>{category.CAT_ICON}<br />
+			<span title="{category.TOTAL_CAT} {L_IMG_AVAILABLE}">{category.TOTAL_CAT}</span>&nbsp;]</span>{category.CAT_ICON}<br />
 		  <!-- END category -->
 
 		  <div class="totalImages">[&nbsp;{NB_PICTURE}&nbsp;{L_TOTAL}&nbsp;]</div>
@@ -27,12 +29,9 @@
 		  <br />&nbsp;<img src="{T_COLLAPSED}" alt='' />&nbsp;<a href="{U_FAVORITE}"><span title="{L_FAVORITE_HINT}" style="font-weight:bold;">{L_FAVORITE}</span></a>&nbsp;<span class="menuInfoCat">[&nbsp;{favorites.NB_FAV}&nbsp;]</span>
 		  <!-- END favorites -->
 		  <br />&nbsp;<img src="{T_COLLAPSED}" alt='' />&nbsp;<span style="font-weight:bold;">{L_STATS}</span>
-		  <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_MOST_VISITED}"><span title="{L_MOST_VISITED_HINT}" style="font-weight:bold;">{TOP_VISITED}&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>
-	  {T_END}
-	  <div style="margin-bottom:5px;">&nbsp;</div>
-	  {T_START}100%{T_BEGIN}
 		<div class="titreMenu">{L_SUMMARY}</div>
 		<div class="menu">
 		  <!-- BEGIN summary -->
@@ -42,22 +41,38 @@
 		  <br />&nbsp;<img src="{T_COLLAPSED}" alt=''/>&nbsp;<a href="{upload.U_UPLOAD}">{L_UPLOAD}</a>
 		  <!-- END upload -->
 		</div>
-	  {T_END}
+		<div class="titreMenu">{L_IDENTIFY}</div>
+		 <div class="menu">
+		 <!-- BEGIN login -->
+		<form method="post" action="{F_IDENTIFY}">
+		<input type="hidden" name="redirect" value="{U_REDIRECT}">
+		{L_USERNAME}<br />
+		<input type="text" name="username" size="15" value="" /><br />
+		{L_PASSWORD}<br />
+		<input type="password" name="password" size="15"><br /><br />
+		<input type="submit" name="login" value="{L_SUBMIT}" class="bouton" />
+		</form>
+		<!-- END login -->
+		<!-- BEGIN logout -->
+		<p>{L_HELLO}&nbsp;{USERNAME}&nbsp;!</p>
+		&nbsp;<img src="{T_COLLAPSED}" alt=""/>&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a><br />
+		&nbsp;<img src="{T_COLLAPSED}" alt=''/>&nbsp;<a href="{U_PROFILE}" title="{L_PROFILE_HINT}">{L_PROFILE}</a><br />
+		<!-- BEGIN admin -->
+	    &nbsp;<img src="{T_COLLAPSED}" alt=''/>&nbsp;<a href="{U_ADMIN}" title="{L_ADMIN_HINT}">{L_ADMIN}</a><br />
+		<!-- END admin -->
+		<!-- END logout -->
+		</div>
+      </div>
 	</td>
-	<td style="padding:5px;width:99%;" valign="top">
-	  <table style="width:100%;">
-		<tr>
-		  <td align="center">
-			{T_START}1%{T_BEGIN}
-			  <div class="titrePage">{TITLE}</div>
-			{T_END}
-			<div style="margin-bottom:5px;">&nbsp;</div>
+	<td style="padding:10px;width:99%;" valign="top">
+	  <div class="home">
+			<div class="titrePage">{TITLE}</div>
 			<!-- BEGIN thumbnails -->
-			<table class="thumbnail">
+			<table valign="top" align="center" class="thumbnail">
 			  <!-- BEGIN line -->
 			  <tr>
 				<!-- BEGIN thumbnail -->
-				<td valign="bottom" class="thumbnail">
+				<td class="thumbnail">
 				  <a href="{thumbnails.line.thumbnail.U_IMG_LINK}" class="back">
 				  <img src="{thumbnails.line.thumbnail.IMAGE}"
 					   alt="{thumbnails.line.thumbnail.IMAGE_ALT}"
@@ -75,10 +90,7 @@
 			  <!-- END line -->
 			</table>
 			<!-- END thumbnails -->
-		  </td>
-		</tr>
-		<tr>
-		  <td align="left">
+		<br />
 			<!-- BEGIN cat_infos -->
 			  <!-- BEGIN navigation -->
 			  <div class="navigationBar">{cat_infos.navigation.NAV_BAR}</div>
@@ -90,25 +102,7 @@
 			  {L_NB_IMG} "{cat_infos.CAT_NAME}" : {cat_infos.NB_IMG_CAT}
 			  </div>
 			<!-- END cat_infos -->
-		  </td>
-		</tr>
-		<tr>
-		  <td align="right">
-			{T_START}1%{T_BEGIN}
-			  <div class="info">
-				<!-- BEGIN username -->
-				{L_USER}&nbsp;{USERNAME}<br />
-				<!-- END username -->
-				{L_RECENT_IMAGE}&nbsp;{S_SHORT_PERIOD}&nbsp;{L_DAYS}
-				  {T_SHORT}<br />
-				{L_RECENT_IMAGE}&nbsp;{S_LONG_PERIOD}&nbsp;{L_DAYS}
-				  {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>
-			{T_END}
-		  </td>
-		</tr>
-	  </table>
+      </div>
 	</td>
   </tr>
 </table>
 \ No newline at end of file
diff --git a/template/default/default.css b/template/default/default.css
index 8c7e447f9..7a2d04405 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -1,41 +1,156 @@
+/* Main styles */
+
+body {
+  font-family: Verdana, Arial, Helvetica, sans-serif;
+  font-size:10px;
+  background-color:#000000;
+  color:#E0E0E0;
+  margin:5px;
+}
+
 a {
   text-decoration:none;
-  color:#E0E0E0;
+  color:#FFFFFF;
 }
 a:hover {
   text-decoration:underline;
-  color:#E0E0E0;
+  color:#FFFFAA;
 }
 
-a.back,body {
+/* Navigation styles */
+
+.titreMenu,.titrePage
+{
+  padding-right: 10px;
+  padding-left: 10px;
+  border-bottom: 1px solid #000000;
+  border-right: 1px solid #000000;
+  height: 25px;
+  line-height: 25px;
+  font-size:12px;
   color:#E0E0E0;
+  background-image: url(theme/tableh1_bg.gif);
+  font-weight:600;
+  text-align:center;
 }
-body {
-  font-family:arial, sans-serif;
-  font-size:12px;
-  background-color:#444444;
-  margin:5px;
+
+.titrePage 
+{
+  text-align:left;
+  font-size:16px;
+  margin-bottom:5px;
 }
-table, input {
-  font-family:arial, sans-serif;
-  font-size:12px;
+
+.titreImg{
+  text-align:center;
+  font-size:16px;
+  color:#FFF48E;
+  font-weight:600;
+}
+
+.menu 
+{
+  margin:10px 5px 10px 5px;
+  white-space:nowrap;
+  font-size:11px;
 }
+
+ /* Image related styles */
+ 
 .imgLink {
-  border:1px solid #E0E0E0;
+	border-style: solid;
+	border-width:2px;
+	border-color: #A0A0A0;
+	margin: 2px;
 }
+
 .imgLink:hover {
   text-decoration:none;
 }
-.titrePage,.titreMenu,.menu,.info,.commentsAuthor,.commentsTitle,.commentsInfos,.commentsContent,.commentsNavigationBar {
-  color:lightgray;
+
+.image {
+	border: 1px solid #000000;
+	background-color: #FFFFFF;
+	text-align:center;
+	margin-top: 10px;
+	margin-bottom: 20px;
+	white-space: nowrap;
+	padding: 0px;
+	display: table;
+}
+
+.commentImage {
+  font-weight:bold;
+  text-align:center;
+  font-size:17px;
+  color:#F0F0F0;
+  margin-bottom: 10px;
+}
+
+/* Table styles */
+
+.main {
+	background-color:#444444;
+	border: 1px solid #E0E0E0; 
+	width:100%;
+	padding-bottom:30px;
+}
+
+.table1, .home
+{
+  border: 1px solid #000000;
+  background-color:#555555;
+}
+
+.home
+{
+  text-align:center;
+  width:100%;
+}
+  
+.table2 {
+	background: #797979;
+	border: 1px solid #000000; 
+	margin: 0px 10px 10px 10px;
+}
+
+td{
+  padding:0px;
+}
+
+/* Thumbnails styles */
+
+.thumbnail {
+	font-size:11px;
+	text-align:center;
+	display:inline-table;
+	vertical-align: baseline;
 }
-.titreMenu, .menu, .info {
+
+table.thumbnail {
+  border-collapse:separate;
+}
+
+/* Other styles */
+a.back {
+  color:#E0E0E0;
+}
+
+input {
+  font-family: Verdana, Arial, Helvetica, sans-serif;
+  font-size:11px;
+}
+
+.info,.commentsAuthor,.commentsTitle,.commentsInfos,.commentsContent,.commentsNavigationBar {
+  color:#E0E0E0;
+  background-color:#444444;
+}
+.info {
   margin-bottom:5px;
   white-space:nowrap;
-}
-.menu, .titrePage, .info {
-  margin-left:2px;
-  margin-right:2px;
+  margin-left:5px;
+  margin-right:5px;
+  text-align:right;
 }
 .menuInfoCat {
   font-family:sans-serif;
@@ -47,19 +162,7 @@ table, input {
   font-family:sans-serif;
   font-size:11px;
 }
-.titreMenu {
-  font-weight:600;
-  text-align:center;
-}
-.info {
-  text-align:right;
-}
-.titrePage {
-  white-space:nowrap;
-  font-weight:500;
-  font-size:18px;
-  text-align:center;
-}
+
 .comments, .infoCat, .navigationBar {
   margin-top:10px;
   margin-bottom:10px;
@@ -74,37 +177,22 @@ table, input {
 .infoCat {
   text-align:left;
 }
-.thumbnail {
-  font-size:11px;
-  text-align:center;
-}
+
 .copyright {
-  font-size:11px;
+  font-size:10px;
   text-align:center;
-  font-family:sans-serif;
-  letter-spacing:0.3mm;
-}
-.commentImage {
-  font-weight:bold;
-  text-align:center;
-  font-size:17px;
+  letter-spacing:-1px;
 }
+
 .bouton {
-  background:lightgray;
+  background:#E0E0E0;
 }
 textarea,input {
   color:black;
 }
-table {
-  border-collapse:collapse;
-}
-table.thumbnail {
-  border-collapse:separate;
-}
-td {
-  font-family:sans-serif;
-  padding:0px;
-}
+
+
+
 .errors {
   text-align:left;
   margin-top:5px;
@@ -114,6 +202,7 @@ td {
   border:1px solid black;
   color:white;
 }
+
 div.information {
   text-align:center;
   border:2px solid #E0E0E0;
@@ -205,4 +294,5 @@ div.information {
         font-size:120%;
         text-align:center;
         color:red;
-      }
-\ No newline at end of file
+      }
+	  
diff --git a/template/default/footer.tpl b/template/default/footer.tpl
index f62f6e1f1..c6b303833 100644
--- a/template/default/footer.tpl
+++ b/template/default/footer.tpl
@@ -1,9 +1,12 @@
 <!-- BEGIN debug -->
-    <div class="copyright">{L_GEN_TIME} {S_TIME}</div>
+    <div class="copyright">{L_GEN_TIME} {TIME}</div>
 <!-- END debug -->
     <!-- Please, do not remove this copyright. If you really want to,
          contact me pierrick@z0rglub.com to find a solution on how
          to show the origin of the script...-->
-    <div class="copyright">Powered by <a href="{U_SITE}" class="back">PhpWebGallery</a> {S_VERSION}</div>
+    <div class="copyright">Powered by <a href="{U_SITE}" class="back">PhpWebGallery</a> {VERSION}</div>
+	<div class="copyright">{L_SEND_MAIL}&nbsp;:&nbsp;<a href="mailto:{MAIL}?subject={L_TITLE_MAIL}"><span style="font-weight:bold;">{WEBMASTER}</span></a></div>
+  </td></tr>
+  </table>
   </body>
 </html>
 \ No newline at end of file
diff --git a/template/default/header.tpl b/template/default/header.tpl
index b3bb96501..7e5deb3de 100644
--- a/template/default/header.tpl
+++ b/template/default/header.tpl
@@ -10,3 +10,5 @@
 <link rel="stylesheet" href="{T_STYLE}" type="text/css" />
 </head>
 <body>
+<table class="main">
+<tr><td>
+\ No newline at end of file
diff --git a/template/default/htmlfunctions.inc.php b/template/default/htmlfunctions.inc.php
index 9528efd80..c47ca2f1e 100644
--- a/template/default/htmlfunctions.inc.php
+++ b/template/default/htmlfunctions.inc.php
@@ -27,23 +27,27 @@
 
 function get_icon( $date_comparaison )
 {
-  global $user, $conf;
+  global $user, $conf, $lang;
   $difference = time() - $date_comparaison;
   $jours = 24*60*60;
   $output = '';
+  $title = $lang['recent_image'].'&nbsp;';
   if ( $difference < $user['long_period'] * $jours )
   {
     $icon_url = './template/'.$user['template'].'/theme/';
     if ( $difference < $user['short_period'] * $jours )
     {
       $icon_url.= 'new_short.gif';
+	  $title .= $user['short_period'];
     }
     else
     {
       $icon_url.= 'new_long.gif';
+	  $title .= $user['long_period'];
     }
+	$title .=  '&nbsp;'.$lang['days'];
     $size = getimagesize( $icon_url );
-    $output = '<img src="'.$icon_url.'" style="border:0;';
+    $output = '<img title="'.$title.'" src="'.$icon_url.'" style="border:0;';
     $output.= 'height:'.$size[1].'px;width:'.$size[0].'px" alt="" />';
   }
   return $output;
@@ -105,7 +109,7 @@ function create_navigation_bar( $url, $nb_element, $start,
 
 function get_frame_start()
 {
-  return '<table style="width:';
+  return '<table style="padding:0px;border-collapse:collapse; width:';
 }
 
 function get_frame_begin()
@@ -117,13 +121,13 @@ function get_frame_begin()
   $size_03 = getimagesize( $path.'03.gif' );
   return ';">
             <tr>
-              <td><img src="'.$path.'01.gif" style="width:'.$size_01[0].'px;display:box;" alt="" /></td>
-              <td><img src="'.$path.'02.gif" style="display:box;width:100%;height:'.$size_02[1].'px;" alt="" /></td>
-              <td><img src="'.$path.'03.gif" style="display:box;width:'.$size_03[0].'px;" alt="" /></td>
+              <td><img src="'.$path.'01.gif" style="margin:auto;width:'.$size_01[0].'px;display:box;" alt="" /></td>
+              <td><img src="'.$path.'02.gif" style="margin:auto;display:box;width:100%;height:'.$size_02[1].'px;" alt="" /></td>
+              <td><img src="'.$path.'03.gif" style="margin:auto;display:box;width:'.$size_03[0].'px;" alt="" /></td>
             </tr>
             <tr>
-              <td style="background:url('.$path.'04.gif);"></td>
-              <td style="background:url('.$path.'05.gif);width:100%;">';
+              <td style="margin:autox;background:url('.$path.'04.gif);"></td>
+              <td style="margin:auto;background:url('.$path.'05.gif);width:100%;">';
 }
         
 function get_frame_end()
@@ -133,12 +137,12 @@ function get_frame_end()
   $size_08 = getimagesize( $path.'08.gif' );
   return '
               </td>
-              <td style="background:url('.$path.'06.gif);"></td>
+              <td style="margin:auto;background:url('.$path.'06.gif);"></td>
             </tr>
-            <tr>
-              <td><img src="'.$path.'07.gif" alt="" /></td>
-              <td><img src="'.$path.'08.gif" style="width:100%;height:'.$size_08[1].'px;" alt="" /></td>
-              <td><img src="'.$path.'09.gif" alt="" /></td>
+            <tr >
+              <td><img src="'.$path.'07.gif" style="margin:auto;" alt="" /></td>
+              <td><img src="'.$path.'08.gif" style="margin:auto;width:100%;height:'.$size_08[1].'px;" alt="" /></td>
+              <td><img src="'.$path.'09.gif" style="margin:auto;" alt="" /></td>
             </tr>   
           </table>';
 }
@@ -153,81 +157,6 @@ function initialize_template()
 	'T_END' =>  get_frame_end()
 	)
 	);
-
-
-  global $vtp, $handle;
-  if (isset($handle))
-  {
-  $vtp->setGlobalVar( $handle, 'frame_start', get_frame_start() );
-  $vtp->setGlobalVar( $handle, 'frame_begin', get_frame_begin() );
-  $vtp->setGlobalVar( $handle, 'frame_end',   get_frame_end() );
-  }
-}
-
-function display_category( $category, $indent )
-{
-  global $user,$lang,$template, $vtp, $handle;
-  
-  $style='';
-  $url = './category.php?cat='.$category['id'];
-  $url.= '&amp;expand='.$category['expand_string'];
-  $name = $category['name'];
-  if ( $name == '' ) $name = str_replace( '_', ' ', $category['dir'] );
-  if ( $category['id_uppercat'] == '' )
-  {
-    $style = 'font-weight:bold;';
-  }
-  
-  $template->assign_block_vars('category', array(
-    'LINK_NAME' => $name,
-	'INDENT' => $indent,
-	'NB_SUBCATS'=>$category['nb_sub_categories'],
-	'TOTAL_CAT'=>$category['nb_images'],
-	'CAT_ICON'=>get_icon($category['date_last']),
-	
-	'T_NAME'=>$style,
-    'U_LINK' => add_session_id($url)));
-
-  if ( $user['expand'] or $category['nb_sub_categories'] == 0 )
-  {
-  	$template->assign_block_vars('category.bulletnolink', array('BULLET_IMAGE' =>  $user['lien_collapsed']));
-  }
-  else
-  {
-	$url = './category.php';
-  	if (isset($page['cat']))
-	{
-	  $url .='?cat='.$page['cat'];
-      $url.= '&amp;expand='.$category['expand_string'];
-	}
-	else if ($category['expand_string']<>'')
-	{
-	  $url.= '?expand='.$category['expand_string'];
-	}
-	
-	if ( $category['expanded'] )
-    {
-      $img=$user['lien_expanded'];
-    }
-    else
-    {
-      $img=$user['lien_collapsed'];
-    }
-	
-    $template->assign_block_vars('category.bulletlink', array(
-      'BULLET_IMAGE' =>  $img,
-	  'U_BULLET_LINK'=>  add_session_id($url)		
-	));
-  }
-
-  // recursive call
-  if ( $category['expanded'] )
-  {
-    foreach ( $category['subcats'] as $subcat ) {
-	  $template->assign_block_vars('category.subcat', array());
-      display_category( $subcat, $indent.str_repeat( '&nbsp', 2 ));
-    }
-  }
 }
 
 function make_jumpbox($value, $selected, $usekeys=false)
@@ -259,4 +188,4 @@ function make_radio($name, $value, $selected, $usekeys=false)
   }
   return $boxstring;
 }
-?>
-\ No newline at end of file
+?>
diff --git a/template/default/identification.tpl b/template/default/identification.tpl
index bc36f0c78..82b808b2f 100644
--- a/template/default/identification.tpl
+++ b/template/default/identification.tpl
@@ -34,7 +34,7 @@
 		  <tr> 
 			<td align="right"><span class="gentbl">{L_PASSWORD}:</span></td>
 			<td> 
-			  <input class="login" type="password" name="pass" size="25" maxlength="25" />
+			  <input class="login" type="password" name="password" size="25" maxlength="25" />
 			</td>
 		  </tr>
 		  <tr align="center"> 
diff --git a/template/default/images/logo.jpg b/template/default/images/logo.jpg
new file mode 100644
index 000000000..78ddd2dac
--- /dev/null
+++ b/template/default/images/logo.jpg
diff --git a/template/default/picture.tpl b/template/default/picture.tpl
index 6ce9f1ba4..7f664fec1 100644
--- a/template/default/picture.tpl
+++ b/template/default/picture.tpl
@@ -17,30 +17,29 @@
     <!-- END stop_slideshow -->
     <table style="width:100%;height:100%;">
       <tr align="center" valign="middle">
-        <td style="width:30%;">
-		<!-- BEGIN previous -->
-		  <a href="{U_PREV_IMG}" title="{L_PREV_IMG}{PREV_TITLE_IMG}"><img src="{PREV_IMG}" class="imgLink" style="margin-right:10px;margin-left:5px;" alt="{PREV_TITLE_IMG}"/></a></td>
-		<!-- END previous -->
-        <td style="width:40%;">{T_START}1%{T_BEGIN}
-        <div class="titrePage">{TITLE}</div>
-        {T_END} </td>
-        <td style="width:30%;">
-		<!-- BEGIN next -->
-		  <a href="{U_NEXT_IMG}" title="{L_NEXT_IMG}{NEXT_TITLE_IMG}"><img src="{NEXT_IMG}" class="imgLink" style="margin-right:10px;margin-left:5px;" alt="{NEXT_TITLE_IMG}"/></a></td>
-		<!-- END next -->
-	    </td>
-      </tr>
-      <tr align="center" valign="middle">
         <td colspan="3" style="width:100%;"> 
-          {T_START}1%{T_BEGIN}
+		<div class="table2">
+		<div class="titrePage">{CATEGORY}</div>
+		<div class="titreImg">{PHOTO}</div>
+		  <div class="image">
           <a href="{U_HOME}">
-            <img class="imgLink" style="margin:10px;width:{WIDTH_IMG}px;height:{HEIGHT_IMG}px;border:1px solid" src="{SRC_IMG}" alt="{ALT_IMG}"/>
+            <img class="imgLink" src="{SRC_IMG}" style="width:{WIDTH_IMG}px;height:{HEIGHT_IMG}px;" alt="{ALT_IMG}"/>
           </a>
+		  </div>
+		  <div class="commentImage">{TITLE}</div>
           <div class="commentImage">{COMMENT_IMG}</div>
+		  </div>
           <table style="width:100%;">   
-            <tr>
-              <td align="center">
-                <table style="margin:auto;margin-top:5px;margin-bottom:5px;">
+            <tr align="center" valign="middle">
+			  <td style="width:30%;">
+				<!-- BEGIN previous -->
+				<a href="{U_PREV_IMG}" title="{L_PREV_IMG}{PREV_TITLE_IMG}">
+				<img style="border:none;" class="imgLink" width="30" height="100" src="template/default/theme/left-arrow.jpg" alt="" />
+				  <img src="{PREV_IMG}" class="imgLink" style="margin-right:10px;margin-left:5px;" alt="{PREV_TITLE_IMG}"/></a>
+				<!-- END previous -->
+			  </td>
+			  <td style="width:40%;">
+			  <table style="margin:auto;margin-top:5px;margin-bottom:5px;">
                   <!-- BEGIN info_line -->
                   <tr>
                      <td class="menu" style="font-weight:bold;">{info_line.INFO} : </td>
@@ -48,8 +47,14 @@
                   </tr>
                   <!-- END info_line -->
                 </table>
-              </td>
-            </tr>
+			  </td>
+			  <td style="width:30%;">
+				<!-- BEGIN next -->
+				  <a href="{U_NEXT_IMG}" title="{L_NEXT_IMG}{NEXT_TITLE_IMG}"><img src="{NEXT_IMG}" class="imgLink" style="margin-right:10px;margin-left:5px;" alt="{NEXT_TITLE_IMG}"/>
+				  <img style="border:none;" class="imgLink" width="30" height="100" src="template/default/theme/right-arrow.jpg" alt="" /></a>
+				<!-- END next -->
+			  </td>
+			</tr>
           </table>
           <!-- BEGIN favorite -->
           <div class="menu" style="text-align:center;margin:5px;">
@@ -63,7 +68,6 @@
             [ <a href="{U_ADMIN}">{L_ADMIN}</a> ]
           </div>
           <!-- END modification -->
-          {T_END}
           <div style="text-align:center;">{L_BACK}</div>
         </td>
         <td>&nbsp;</td>
diff --git a/template/default/theme/left-arrow.jpg b/template/default/theme/left-arrow.jpg
new file mode 100644
index 000000000..c867edec1
--- /dev/null
+++ b/template/default/theme/left-arrow.jpg
diff --git a/template/default/theme/right-arrow.jpg b/template/default/theme/right-arrow.jpg
new file mode 100644
index 000000000..359ddfc2a
--- /dev/null
+++ b/template/default/theme/right-arrow.jpg
diff --git a/template/default/theme/tableh1_bg.gif b/template/default/theme/tableh1_bg.gif
new file mode 100644
index 000000000..9f0ef65bd
--- /dev/null
+++ b/template/default/theme/tableh1_bg.gif
author	gweltas <gweltas@piwigo.org>	2004-02-26 18:33:45 +0000
committer	gweltas <gweltas@piwigo.org>	2004-02-26 18:33:45 +0000
commit	9e993f2d21e9cf7bd44a7c676af567be550dca90 (patch)
tree	e6a4c049a28164631f75c087a91201a9b152cbf9 /template/default
parent	29a07c00d083b7687331cd7cc19f097a8849a3ea (diff)