New default template - User side

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

admin.php

@@ -35,6 +35,7 @@ $handle = $vtp->Open( './template/'.$user['template'].'/admin.vtp' );
 // language
 $tpl = array( 'title_default','charset','install_warning' );
 templatize_array( $tpl, 'lang', $handle );
+$vtp->setGlobalVar( $handle, 'style', './template/'.$user['template'].'/'.$user['template'].'-admin.css');
 //-------------------------------------------------- install.php still exists ?
 if ( is_file( './install.php' ) )
 {

category.php

@@ -48,7 +48,74 @@ if ( isset( $page['cat'] ) and is_numeric( $page['cat'] ) )
 {
   check_restrictions( $page['cat'] );
 }
+
 //-------------------------------------------------------------- initialization
+function display_category( $category, $indent )
+{
+  global $user,$lang,$template, $handle;
+  
+  $style='';
+  $url = './category.php?cat='.$category['id'];
+  $url.= '&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.= '&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 ));
+    }
+  }
+}
+
 // detection of the start picture to display
 if ( !isset( $_GET['start'] )
      or !is_numeric( $_GET['start'] )
@@ -118,7 +185,6 @@ $title = $page['title'];
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 
 $template->set_filenames( array('category'=>'category.tpl') );
-initialize_template();
 
 //-------------------------------------------------------------- category title
 $cat_title = $lang['no_category'];
@@ -126,7 +192,7 @@ if ( isset ( $page['cat'] ) )
 {
   if ( is_numeric( $page['cat'] ) )
   {
-    $cat_title = get_cat_display_name( $page['cat_name'], '<br />',
+    $cat_title = get_cat_display_name( $page['cat_name'], ' &gt; ',
                                     'font-style:italic;' );
   }
   else
@@ -144,12 +210,7 @@ $template->assign_vars(array(
   'NB_PICTURE' => count_user_total_images(),
   'TITLE' => $cat_title,
   'USERNAME' => $user['username'],
-  
+  'TOP_VISITED'=>$conf['top_number'],
-  'S_TOP'=>$conf['top_number'],
-  'S_SHORT_PERIOD'=>$user['short_period'],
-  'S_LONG_PERIOD'=>$user['long_period'],
-  'S_WEBMASTER'=>$conf['webmaster'],
-  'S_MAIL'=>$conf['mail_webmaster'],
 
   'L_CATEGORIES' => $lang['categories'],
   'L_HINT_CATEGORY' => $lang['hint_category'],
@@ -167,20 +228,30 @@ $template->assign_vars(array(
   'L_UPLOAD' => $lang['upload_picture'],
   'L_COMMENT' => $lang['comments'],
   'L_NB_IMG' => $lang['nb_image_category'],
-  'L_USER' => $lang['connected_user'],
+  'L_IDENTIFY' => $lang['ident_title'],
-  'L_RECENT_IMAGE' => $lang['recent_image'],
+  'L_SUBMIT' => $lang['menu_login'],
-  'L_DAYS' => $lang['days'],
+  'L_USERNAME' => $lang['login'],
-  'L_SEND_MAIL' => $lang['send_mail'],
+  'L_PASSWORD' => $lang['password'],
-  'L_TITLE_MAIL' => $lang['title_send_mail'],
+  'L_HELLO' => $lang['hello'],
+  'L_LOGOUT' => $lang['logout'],
+  'L_ADMIN' => $lang['admin'],
+  'L_ADMIN_HINT' => $lang['hint_admin'],
+  'L_PROFILE' => $lang['customize'],
+  'L_PROFILE_HINT' => $lang['hint_customize'],
+  
+  'F_IDENTIFY' => add_session_id( PHPWG_ROOT_PATH.'identification.php' ),
   
   'T_COLLAPSED' => $user['lien_collapsed'],
   'T_SHORT'=>get_icon( time() ),
   'T_LONG'=>get_icon( time() - ( $user['short_period'] * 24 * 60 * 60 + 1 ) ),
 
-  'U_HOME' => add_session_id( 'category.php' ),
+  'U_HOME' => add_session_id( PHPWG_ROOT_PATH.'category.php' ),
-  'U_FAVORITE' => add_session_id( './category.php?cat=fav&amp;expand='.$page['expand'] ),
+  'U_FAVORITE' => add_session_id( PHPWG_ROOT_PATH.'category.php?cat=fav&amp;expand='.$page['expand'] ),
-  'U_MOST_VISITED'=>add_session_id( './category.php?cat=most_visited&amp;expand='.$page['expand'] ),
+  'U_MOST_VISITED'=>add_session_id( PHPWG_ROOT_PATH.'category.php?cat=most_visited&amp;expand='.$page['expand'] ),
-  'U_RECENT'=>add_session_id( './category.php?cat=recent&amp;expand='.$page['expand'] )
+  'U_RECENT'=>add_session_id( PHPWG_ROOT_PATH.'category.php?cat=recent&amp;expand='.$page['expand'] ),
+  'U_LOGOUT' => add_session_id( PHPWG_ROOT_PATH.'category.php?act=logout' ),
+  'U_ADMIN'=>add_session_id( PHPWG_ROOT_PATH.'admin.php' ),
+  'U_PROFILE'=>add_session_id(PHPWG_ROOT_PATH.'profile.php?'.str_replace( '&', '&amp;', $_SERVER['QUERY_STRING'] ))
   )
 );
 
@@ -201,35 +272,19 @@ if ( !$user['is_the_guest'] )
   $template->assign_block_vars('username', array());
 }
 //--------------------------------------------------------------------- summary
-$sum_title = '';
+
-$sum_name='';
-$sum_url = '';
 if ( !$user['is_the_guest'] )
 {
-  $sum_name=replace_space($lang['logout']);
+  $template->assign_block_vars('logout',array());
-  $sum_url = 'category.php?act=logout';
+  // administration link
+  if ( $user['status'] == 'admin' )
+  {
+    $template->assign_block_vars('logout.admin', array());
+  }
 }
 else
 {
-  $sum_title =  $lang['hint_login'];
+  $template->assign_block_vars('login',array());
-  $sum_name=replace_space( $lang['menu_login']);
-  $sum_url = 'identification.php';
-}
-$template->assign_block_vars('summary', array(
-  'TITLE'=>$sum_title,
-  'NAME'=>$sum_name,
-  'U_SUMMARY'=>add_session_id( $sum_url ),
-  )
-);
-
-// customization link
-if ( !$user['is_the_guest'] )
-{
-  $template->assign_block_vars('summary', array(
-  'TITLE'=>$lang['hint_customize'],
-  'NAME'=>$lang['customize'],
-  'U_SUMMARY'=>add_session_id('profile.php?'.str_replace( '&', '&amp;', $_SERVER['QUERY_STRING'] )),
-  ));
 }
 
 // search link
@@ -253,16 +308,6 @@ $template->assign_block_vars('summary', array(
 'U_SUMMARY'=>add_session_id( 'about.php?'.str_replace( '&', '&amp;', $_SERVER['QUERY_STRING'] ) )
 ));
 
-// administration link
-if ( $user['status'] == 'admin' )
-{
-  $template->assign_block_vars('summary', array(
-    'TITLE'=>$lang['hint_admin'],
-    'NAME'=>$lang['admin'],
-    'U_SUMMARY'=>add_session_id( 'admin.php' )
-    ));
-}
-
 //------------------------------------------------------------------ thumbnails
 if ( isset( $page['cat'] ) && $page['cat_nb_images'] != 0 )
 {

identification.php

@@ -38,7 +38,7 @@ if ( isset( $_POST['login'] ) )
   $query.= ' FROM '.USERS_TABLE;
   $query.= " WHERE username = '".$_POST['username']."';";
   $row = mysql_fetch_array( mysql_query( $query ) );
-  if( $row['password'] == md5( $_POST['pass'] ) )
+  if( $row['password'] == md5( $_POST['password'] ) )
   {
     $session_id = session_create( $_POST['username'] );
     $url = 'category.php?id='.$session_id;

include/common.inc.php

@@ -119,7 +119,7 @@ if( !defined("PHPWG_INSTALLED") )
   exit;
 }
 
-
+define( 'PREFIX_INCLUDE', '' );// en attendant la migration complète
 include(PHPWG_ROOT_PATH . 'include/constants.php');
 include(PHPWG_ROOT_PATH . 'include/config.inc.php');
 include(PHPWG_ROOT_PATH . 'include/functions.inc.php');

include/constants.php

@@ -25,8 +25,6 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
-define( 'PREFIX_INCLUDE', '' );
- 
 // Debug Level
 define('DEBUG', 1); // Debugging on
 //define('DEBUG', 0); // Debugging off 
@@ -37,10 +35,6 @@ define('GENERAL_ERROR', 202);
 define('CRITICAL_MESSAGE', 203);
 define('CRITICAL_ERROR', 204); 
 
-// xml tags 
-define( 'ATT_REG', '\w+' );
-define( 'VAL_REG', '[^"]*' );
-  
 // Table names
 define('CATEGORIES_TABLE', $table_prefix.'categories');
 define('COMMENTS_TABLE', $table_prefix.'comments');

include/functions.inc.php

@@ -24,11 +24,11 @@
 // | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
-include( PREFIX_INCLUDE.'./include/functions_user.inc.php' );
+include( PHPWG_ROOT_PATH .'include/functions_user.inc.php' );
-include( PREFIX_INCLUDE.'./include/functions_session.inc.php' );
+include( PHPWG_ROOT_PATH .'include/functions_session.inc.php' );
-include( PREFIX_INCLUDE.'./include/functions_category.inc.php' );
+include( PHPWG_ROOT_PATH .'include/functions_category.inc.php' );
-include( PREFIX_INCLUDE.'./include/functions_xml.inc.php' );
+include( PHPWG_ROOT_PATH .'include/functions_xml.inc.php' );
-include( PREFIX_INCLUDE.'./include/functions_group.inc.php' );
+include( PHPWG_ROOT_PATH .'include/functions_group.inc.php' );
 
 //----------------------------------------------------------- generic functions
 

include/functions_xml.inc.php

@@ -24,6 +24,10 @@
 // | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
+// xml tags 
+define( 'ATT_REG', '\w+' );
+define( 'VAL_REG', '[^"]*' );
+
 //------------------------------------------------------------------- functions
 // getContent returns the content of a tag
 //

include/page_tail.php

@@ -31,12 +31,17 @@ $template->set_filenames(array('tail'=>'footer.tpl'));
 $time = get_elapsed_time( $t2, get_moment() );
 
 $template->assign_vars(array(
-	'L_GEN_TIME' => $lang['generation_time'],
+  'TIME' =>  $time,
-	'S_TIME' =>  $time, 
+  'VERSION' => $conf['version'],
-	'S_VERSION' => $conf['version'],
+  'WEBMASTER'=>$conf['webmaster'],
-	'U_SITE' => add_session_id( $conf['site_url'] )
+  'MAIL'=>$conf['mail_webmaster'],
-	)
+  
-	);
+  'L_GEN_TIME' => $lang['generation_time'],
+  'L_SEND_MAIL' => $lang['send_mail'],
+  'L_TITLE_MAIL' => $lang['title_send_mail'],
+	
+  'U_SITE' => add_session_id( $conf['site_url'] )
+  ));
 	
 if (DEBUG)
 {

include/user.inc.php

@@ -129,6 +129,6 @@ if ($user['status'] == 'admin') $isadmin =true;
 // calculation of the number of picture to display per page
 $user['nb_image_page'] = $user['nb_image_line'] * $user['nb_line_page'];
 init_userprefs($user);
-$user['lien_expanded']='./template/'.$user['template'].'/theme/expanded..gif';
+$user['lien_expanded']='./template/'.$user['template'].'/theme/expanded.gif';
 $user['lien_collapsed']='./template/'.$user['template'].'/theme/collapsed.gif';
 ?>

language/en_UK.iso-8859-1/common.lang.php

@@ -45,7 +45,7 @@ $lang['title_menu'] = 'Menu';
 $lang['change_login'] = 'change login';
 $lang['login'] = 'login';
 $lang['hint_login'] = 'identification enables site\'s appareance customization';
-$lang['logout'] = 'logout';
+$lang['logout'] = 'Logout';
 $lang['customize'] = 'customize';
 $lang['hint_customize'] = 'customize the appareance of the gallery';
 $lang['hint_search'] = 'search';
@@ -54,16 +54,16 @@ $lang['favorite_cat'] = 'favorites';
 $lang['favorite_cat_hint'] = 'display your favorites';
 $lang['about'] = 'about';
 $lang['hint_about'] = 'more informations on PhpWebGallery...';
-$lang['admin'] = 'admin';
+$lang['admin'] = 'Administration';
 $lang['hint_admin'] = 'available for administrators only';
-$lang['no_category'] = 'No category selected<br />please select it in the menu';
+$lang['no_category'] = 'Home';
 $lang['page_number'] = 'page number';
 $lang['previous_page'] = 'Previous';
 $lang['next_page'] = 'Next';
 $lang['nb_image_category'] = 'number of images in this category';
-$lang['recent_image'] = 'image within the';
+$lang['recent_image'] = 'Image within the';
 $lang['days'] = 'days';
-$lang['send_mail'] = 'Any comment? Send me an e-mail';
+$lang['send_mail'] = 'Contact the webmaster';
 $lang['title_send_mail'] = 'A comment on your site';
 $lang['sub-cat'] = 'subcategories';
 $lang['images_available'] = 'images in this category';
@@ -233,5 +233,5 @@ $lang['stats_last_days'] = 'last days';
 $lang['hint_comments'] = 'See last users comments';
 $lang['menu_login'] = 'login';
 $lang['update_wrong_dirname'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."';
-
+$lang['hello'] = 'Hello';
 ?>

picture.php

@@ -203,13 +203,14 @@ if ( isset( $_GET['slideshow'] ) && $next)
 }
 
 $title_img = $picture['current']['name'];
+$title_nb = '';
 if (is_numeric( $page['cat'] )) 
 {
-  $title_img = get_cat_display_name( $page['cat_name'], " - ","font-style:italic;" );
+  $title_img = replace_space(get_cat_display_name( $page['cat_name'], " > ","font-style:italic;" ));
   $n = $page['num'] + 1;
-  $title_img = replace_space( $title_img." - " ).$n.'/';
+  $title_nb = "Photo".' '.$n.'/';
-  $title_img.= $page['cat_nb_images']."<br />";
+  $title_nb.= $page['cat_nb_images'];
-  $title_img.= $picture['current']['name'];
+  //$title_img.= $picture['current']['name'];
 }
 else if ( $page['cat'] == 'search' )
 {
@@ -237,7 +238,9 @@ $template->set_filenames(array('picture'=>'picture.tpl'));
 initialize_template();
 
 $template->assign_vars(array(
-  'TITLE' => $title_img,
+  'CATEGORY' => $title_img,
+  'PHOTO' => $title_nb,
+  'TITLE' => $picture['current']['name'],
   'PREV_TITLE_IMG' => $picture['prev']['name'],
   'NEXT_TITLE_IMG' => $picture['next']['name'],
   'PREV_IMG' => $picture['prev']['thumbnail'],

template/default/admin.vtp

@@ -1,165 +1,10 @@
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-  <head>
+<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>
+	<link rel="stylesheet" href="{#style}" type="text/css" />
-      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>
     <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-->

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;">
+	<td valign="top" style="padding:10px;width:1%;">
-	  {T_START}100%{T_BEGIN}
+	<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">
+	<td style="padding:10px;width:99%;" valign="top">
-	  <table style="width:100%;">
+	  <div class="home">
-		<tr>
+			<div class="titrePage">{TITLE}</div>
-		  <td align="center">
-			{T_START}1%{T_BEGIN}
-			  <div class="titrePage">{TITLE}</div>
-			{T_END}
-			<div style="margin-bottom:5px;">&nbsp;</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>
+		<br />
-		</tr>
-		<tr>
-		  <td align="left">
 			<!-- 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>
+      </div>
-		</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>
 	</td>
   </tr>
 </table>

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;
+.titrePage 
-  font-size:12px;
+{
-  background-color:#444444;
+  text-align:left;
-  margin:5px;
+  font-size:16px;
+  margin-bottom:5px;
 }
-table, input {
+
-  font-family:arial, sans-serif;
+.titreImg{
-  font-size:12px;
+  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;
 }
-.titreMenu, .menu, .info {
+
+.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;
+}
+
+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;
-}
+  margin-left:5px;
-.menu, .titrePage, .info {
+  margin-right:5px;
-  margin-left:2px;
+  text-align:right;
-  margin-right:2px;
 }
 .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:-1px;
-  letter-spacing:0.3mm;
-}
-.commentImage {
-  font-weight:bold;
-  text-align:center;
-  font-size:17px;
 }
+
 .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;
@@ -206,3 +295,4 @@ div.information {
         text-align:center;
         color:red;
       }
+	  

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>

template/default/header.tpl

@@ -10,3 +10,5 @@
 <link rel="stylesheet" href="{T_STYLE}" type="text/css" />
 </head>
 <body>
+<table class="main">
+<tr><td>

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'].' ';
   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.'01.gif" style="margin:auto;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.'02.gif" style="margin:auto;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.'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="margin:autox;background:url('.$path.'04.gif);"></td>
-              <td style="background:url('.$path.'05.gif);width:100%;">';
+              <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>
+            <tr >
-              <td><img src="'.$path.'07.gif" alt="" /></td>
+              <td><img src="'.$path.'07.gif" style="margin:auto;" alt="" /></td>
-              <td><img src="'.$path.'08.gif" style="width:100%;height:'.$size_08[1].'px;" 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" 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)

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"> 

template/default/picture.tpl

@@ -16,31 +16,30 @@
     </div>
     <!-- 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>
+            <tr align="center" valign="middle">
-              <td align="center">
+			  <td style="width:30%;">
-                <table style="margin:auto;margin-top:5px;margin-bottom:5px;">
+				<!-- 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>
+			  </td>
-            </tr>
+			  <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>