diff --git a/admin.php b/admin.php index 6f76ad4cc..d8b25ec64 100644 --- a/admin.php +++ b/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' ) ) { diff --git a/category.php b/category.php index 060440b68..aa836afe8 100644 --- a/category.php +++ b/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( ' ', 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'], '
', + $cat_title = get_cat_display_name( $page['cat_name'], ' > ', 'font-style:italic;' ); } else @@ -144,12 +210,7 @@ $template->assign_vars(array( 'NB_PICTURE' => count_user_total_images(), 'TITLE' => $cat_title, 'USERNAME' => $user['username'], - - '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'], + 'TOP_VISITED'=>$conf['top_number'], '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_RECENT_IMAGE' => $lang['recent_image'], - 'L_DAYS' => $lang['days'], - 'L_SEND_MAIL' => $lang['send_mail'], - 'L_TITLE_MAIL' => $lang['title_send_mail'], + 'L_IDENTIFY' => $lang['ident_title'], + 'L_SUBMIT' => $lang['menu_login'], + 'L_USERNAME' => $lang['login'], + 'L_PASSWORD' => $lang['password'], + '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_FAVORITE' => add_session_id( './category.php?cat=fav&expand='.$page['expand'] ), - 'U_MOST_VISITED'=>add_session_id( './category.php?cat=most_visited&expand='.$page['expand'] ), - 'U_RECENT'=>add_session_id( './category.php?cat=recent&expand='.$page['expand'] ) + 'U_HOME' => add_session_id( PHPWG_ROOT_PATH.'category.php' ), + 'U_FAVORITE' => add_session_id( PHPWG_ROOT_PATH.'category.php?cat=fav&expand='.$page['expand'] ), + 'U_MOST_VISITED'=>add_session_id( PHPWG_ROOT_PATH.'category.php?cat=most_visited&expand='.$page['expand'] ), + 'U_RECENT'=>add_session_id( PHPWG_ROOT_PATH.'category.php?cat=recent&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( '&', '&', $_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']); - $sum_url = 'category.php?act=logout'; + $template->assign_block_vars('logout',array()); + // administration link + if ( $user['status'] == 'admin' ) + { + $template->assign_block_vars('logout.admin', array()); + } } else { - $sum_title = $lang['hint_login']; - $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( '&', '&', $_SERVER['QUERY_STRING'] )), - )); + $template->assign_block_vars('login',array()); } // search link @@ -253,16 +308,6 @@ $template->assign_block_vars('summary', array( 'U_SUMMARY'=>add_session_id( 'about.php?'.str_replace( '&', '&', $_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 ) { diff --git a/identification.php b/identification.php index 9c3abd6aa..ac2477d27 100644 --- a/identification.php +++ b/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; diff --git a/include/common.inc.php b/include/common.inc.php index 27b74ae5a..9c3e84cde 100644 --- a/include/common.inc.php +++ b/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'); diff --git a/include/constants.php b/include/constants.php index b2c75a895..473bacfdc 100644 --- a/include/constants.php +++ b/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'); diff --git a/include/functions.inc.php b/include/functions.inc.php index 55a4426d7..5287bf99e 100644 --- a/include/functions.inc.php +++ b/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( PREFIX_INCLUDE.'./include/functions_session.inc.php' ); -include( PREFIX_INCLUDE.'./include/functions_category.inc.php' ); -include( PREFIX_INCLUDE.'./include/functions_xml.inc.php' ); -include( PREFIX_INCLUDE.'./include/functions_group.inc.php' ); +include( PHPWG_ROOT_PATH .'include/functions_user.inc.php' ); +include( PHPWG_ROOT_PATH .'include/functions_session.inc.php' ); +include( PHPWG_ROOT_PATH .'include/functions_category.inc.php' ); +include( PHPWG_ROOT_PATH .'include/functions_xml.inc.php' ); +include( PHPWG_ROOT_PATH .'include/functions_group.inc.php' ); //----------------------------------------------------------- generic functions diff --git a/include/functions_xml.inc.php b/include/functions_xml.inc.php index a8ce44413..de21dc61f 100644 --- a/include/functions_xml.inc.php +++ b/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 // diff --git a/include/page_tail.php b/include/page_tail.php index cc6b04f03..ac4df0a78 100644 --- a/include/page_tail.php +++ b/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'], - 'S_TIME' => $time, - 'S_VERSION' => $conf['version'], - 'U_SITE' => add_session_id( $conf['site_url'] ) - ) - ); + 'TIME' => $time, + 'VERSION' => $conf['version'], + 'WEBMASTER'=>$conf['webmaster'], + '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) { diff --git a/include/user.inc.php b/include/user.inc.php index c86ce93fc..880e419d4 100644 --- a/include/user.inc.php +++ b/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'; ?> diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php index b8dc8ed48..8fc0e18f8 100644 --- a/language/en_UK.iso-8859-1/common.lang.php +++ b/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
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'; ?> \ No newline at end of file diff --git a/picture.php b/picture.php index 47f0d51d1..03d5300c3 100644 --- a/picture.php +++ b/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_img.= $page['cat_nb_images']."
"; - $title_img.= $picture['current']['name']; + $title_nb = "Photo".' '.$n.'/'; + $title_nb.= $page['cat_nb_images']; + //$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'], 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 @@ - - + + + + + {#title_default} - + - +
{#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 @@ +
+
- -
- {T_START}100%{T_BEGIN} + +
{L_CATEGORIES}
@@ -14,12 +16,12 @@ -  {category.LINK_NAME} +  {category.LINK_NAME}  [ {category.NB_SUBCATS} - - {category.TOTAL_CAT} ]{category.CAT_ICON}
+ {category.TOTAL_CAT} ]{category.CAT_ICON}
[ {NB_PICTURE} {L_TOTAL} ]
@@ -27,12 +29,9 @@
  {L_FAVORITE} [ {favorites.NB_FAV} ]
  {L_STATS} -
      {S_TOP} {L_MOST_VISITED} +
      {TOP_VISITED} {L_MOST_VISITED}
      {L_RECENT} {T_SHORT}
- {T_END} -
 
- {T_START}100%{T_BEGIN}
{L_SUMMARY}
@@ -42,22 +41,38 @@
  {L_UPLOAD}
- {T_END} +
{L_IDENTIFY}
+
+ +
+ + {L_USERNAME}
+
+ {L_PASSWORD}
+

+ +
+ + +

{L_HELLO} {USERNAME} !

+   {L_LOGOUT}
+   {L_PROFILE}
+ +   {L_ADMIN}
+ + +
+ 		- - - - - - - - - - -
- {T_START}1%{T_BEGIN} -
{TITLE}
- {T_END} -
 
+ 		+
+
{TITLE}
- +
-
+ {thumbnails.line.thumbnail.IMAGE_ALT}
-
+
{cat_infos.navigation.NAV_BAR}
@@ -90,25 +102,7 @@ {L_NB_IMG} "{cat_infos.CAT_NAME}" : {cat_infos.NB_IMG_CAT} -
- {T_START}1%{T_BEGIN} -
- - {L_USER} {USERNAME}
- - {L_RECENT_IMAGE} {S_SHORT_PERIOD} {L_DAYS} - {T_SHORT}
- {L_RECENT_IMAGE} {S_LONG_PERIOD} {L_DAYS} - {T_LONG}
- {L_SEND_MAIL} {S_WEBMASTER} -
- {T_END} -
+
\ 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; } -.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; -} -.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 @@ -
{L_GEN_TIME} {S_TIME}
+
{L_GEN_TIME} {TIME}
-
Powered by PhpWebGallery {S_VERSION}
+
Powered by PhpWebGallery {VERSION}
+
{L_SEND_MAIL} : {WEBMASTER}
+ + \ 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 @@ + + diff --git a/template/default/images/logo.jpg b/template/default/images/logo.jpg new file mode 100644 index 000000000..78ddd2dac Binary files /dev/null and b/template/default/images/logo.jpg differ 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 @@ -16,31 +16,30 @@
\ 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'].' '; 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 .= ' '.$lang['days']; $size = getimagesize( $icon_url ); - $output = ''; } return $output; @@ -105,7 +109,7 @@ function create_navigation_bar( $url, $nb_element, $start, function get_frame_start() { - return ' - - - + + + - - + - + - - - - + + + +
'; + '; } function get_frame_end() @@ -133,12 +137,12 @@ function get_frame_end() $size_08 = getimagesize( $path.'08.gif' ); return '
'; } @@ -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.= '&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( ' ', 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 @@
{L_PASSWORD}: - +
- - - - - - - -
- - {PREV_TITLE_IMG}{T_START}1%{T_BEGIN} -
{TITLE}
- {T_END} 		- - {NEXT_TITLE_IMG}
- {T_START}1%{T_BEGIN} +
+
{CATEGORY}
+
{PHOTO}
+
- {ALT_IMG} + {ALT_IMG} +
+
{TITLE}
{COMMENT_IMG}
+
- - diff --git a/template/default/theme/left-arrow.jpg b/template/default/theme/left-arrow.jpg new file mode 100644 index 000000000..c867edec1 Binary files /dev/null and b/template/default/theme/left-arrow.jpg differ diff --git a/template/default/theme/right-arrow.jpg b/template/default/theme/right-arrow.jpg new file mode 100644 index 000000000..359ddfc2a Binary files /dev/null and b/template/default/theme/right-arrow.jpg differ diff --git a/template/default/theme/tableh1_bg.gif b/template/default/theme/tableh1_bg.gif new file mode 100644 index 000000000..9f0ef65bd Binary files /dev/null and b/template/default/theme/tableh1_bg.gif differ
- + + + - + + +
+ + + + {PREV_TITLE_IMG} + + + @@ -48,8 +47,14 @@
{info_line.INFO} :
-
+ + {NEXT_TITLE_IMG} + + +
@@ -63,7 +68,6 @@ [ {L_ADMIN} ]
- {T_END}
{L_BACK}