diff options
44 files changed, 460 insertions, 518 deletions
@@ -33,17 +33,16 @@ include_once( PHPWG_ROOT_PATH.'include/common.inc.php' ); // Start output of page // $title= $lang['about_page_title']; +$page['body_id'] = 'theAboutPage'; include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames(array('about'=>'about.tpl')); -$template->assign_vars(array( - 'PAGE_TITLE' => $title, - 'L_ABOUT' => $lang['about_message'], - 'L_RETURN' => $lang['home'], - 'L_RETURN_HINT' => $lang['home_hint'], - 'U_RETURN' => add_session_id(PHPWG_ROOT_PATH.'category.php?'.$_SERVER['QUERY_STRING']) - ) - ); +$template->assign_vars( + array( + 'L_ABOUT' => $lang['about_message'], + 'U_HOME' => add_session_id(PHPWG_ROOT_PATH.'category.php') + ) + ); $template->parse('about'); include(PHPWG_ROOT_PATH.'include/page_tail.php'); @@ -57,6 +57,8 @@ $conf_link = $link_start.'configuration&section='; $opt_link = $link_start.'cat_options&section='; //----------------------------------------------------- template initialization $title = l10n('PhpWebGallery administration'); // for include/page_header.php +$page['gallery_title'] = l10n('PhpWebGallery Administration'); +$page['body_id'] = 'theAdminPage'; include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames(array('admin' => 'admin.tpl')); diff --git a/admin/search.php b/admin/search.php deleted file mode 100644 index 482d6afbc..000000000 --- a/admin/search.php +++ /dev/null @@ -1,108 +0,0 @@ -<?php -// +-----------------------------------------------------------------------+ -// | PhpWebGallery - a PHP based picture gallery | -// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | -// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net | -// +-----------------------------------------------------------------------+ -// | branch : BSF (Best So Far) -// | file : $RCSfile$ -// | last update : $Date$ -// | last modifier : $Author$ -// | revision : $Revision$ -// +-----------------------------------------------------------------------+ -// | This program is free software; you can redistribute it and/or modify | -// | it under the terms of the GNU General Public License as published by | -// | the Free Software Foundation | -// | | -// | This program is distributed in the hope that it will be useful, but | -// | WITHOUT ANY WARRANTY; without even the implied warranty of | -// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | -// | General Public License for more details. | -// | | -// | You should have received a copy of the GNU General Public License | -// | along with this program; if not, write to the Free Software | -// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | -// | USA. | -// +-----------------------------------------------------------------------+ - -define('PHPWG_ROOT_PATH','../'); -include_once( PHPWG_ROOT_PATH.'include/common.inc.php' ); -include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' ); - -//----------------------------------------------------- template initialization -$title = $lang['Find_username']; -include(PHPWG_ROOT_PATH.'include/page_header.php'); - -$template->set_filenames( array('search'=>'admin/search_username.tpl') ); -$template->assign_vars(array( - 'USERNAME'=>( !empty($search_match) ) ? strip_tags($search_match) : '', - - 'L_SEARCH_USERNAME'=>$lang['Find_username'], - 'L_SEARCH'=>$lang['search'], - 'L_SEARCH_EXPLAIN'=>$lang['search_explain'], - 'L_SELECT'=>$lang['Select'], - 'L_UPDATE_USERNAME'=>$lang['Look_up_user'], - 'L_CLOSE_WINDOW'=>$lang['Close'], - - 'F_SEARCH_ACTION' => add_session_id($_SERVER['PHP_SELF']), - )); - -//----------------------------------------------------------------- form action -// -// Define initial vars -// -if ( isset($_POST['mode']) || isset($_GET['mode']) ) -{ - $mode = ( isset($_POST['mode']) ) ? $_POST['mode'] : $_GET['mode']; -} -else -{ - $mode = ''; -} -$search_match = ''; -if ( isset($_POST['search_username']) ) -{ - $search_match = $_POST['search_username']; -} - -$username_list = ''; -if ( !empty($search_match) ) -{ - $username_search = preg_replace('/\*/', '%', trim(strip_tags($search_match))); - - $sql = "SELECT username - FROM " . USERS_TABLE . " - WHERE username LIKE '" . str_replace("\'", "''", $username_search) . "' - AND id <> ".$conf['guest_id']." - ORDER BY username"; - if ( !($result = pwg_query($sql)) ) - { - die('Could not obtain search results'); - } - - if ( $row = mysql_fetch_array($result) ) - { - do - { - $username_list .= '<option value="' . $row['username'] . '">' . $row['username'] . '</option>'; - } - while ( $row = mysql_fetch_array($result) ); - } - else - { - $username_list .= '<option>' . $lang['No_match']. '</option>'; - } - mysql_free_result($result); -} - -//------------------------------------------------------------------ users list -if ( !empty($username_list)) -{ - $template->assign_block_vars('switch_select_name', array( - 'F_USERNAME_OPTIONS'=>$username_list - )); -} - -$template->parse('search'); -include(PHPWG_ROOT_PATH.'include/page_tail.php'); -?>
\ No newline at end of file diff --git a/admin/user_list.php b/admin/user_list.php index aa1bbff22..e4a4c6d7e 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -124,17 +124,29 @@ DELETE FROM '.USER_GROUP_TABLE.' $formfields = array('nb_image_line', 'nb_line_page', 'template', 'language', - 'recent_period', 'expand', 'show_nb_comments', 'maxwidth', + 'recent_period', 'maxwidth', 'expand', 'show_nb_comments', 'maxheight', 'status'); - + + $true_false_fields = array('expand', 'show_nb_comments'); + foreach ($formfields as $formfield) { - if ($_POST[$formfield.'_action'] != 'leave') + // special for true/false fields + if (in_array($formfield, $true_false_fields)) + { + $test = $formfield; + } + else + { + $test = $formfield.'_action'; + } + + if ($_POST[$test] != 'leave') { array_push($dbfields['update'], $formfield); } } - + // updating elements is useful only if needed... if (count($dbfields['update']) > 0) { @@ -150,7 +162,8 @@ DELETE FROM '.USER_GROUP_TABLE.' { // if the action is 'unset', the key won't be in row and // mass_updates function will set this field to NULL - if ('set' == $_POST[$dbfield.'_action']) + if (in_array($dbfield, $true_false_fields) + or 'set' == $_POST[$dbfield.'_action']) { $data[$dbfield] = $_POST[$dbfield]; } @@ -165,6 +178,10 @@ DELETE FROM '.USER_GROUP_TABLE.' array_push($datas, $data); } +// echo '<pre>'; +// print_r($datas); +// echo '</pre>'; + mass_updates(USER_INFOS_TABLE, $dbfields, $datas); } } @@ -366,12 +383,6 @@ else 'MAXWIDTH' => @$conf['default_maxwidth'], 'MAXHEIGHT' => @$conf['default_maxheight'], 'RECENT_PERIOD' => $conf['recent_period'], - 'EXPAND_YES' => $conf['auto_expand'] ? 'checked="checked"' : '', - 'EXPAND_NO' => !$conf['auto_expand'] ? 'checked="checked"' : '', - 'SHOW_NB_COMMENTS_YES' => - $conf['show_nb_comments'] ? 'checked="checked"' : '', - 'SHOW_NB_COMMENTS_NO' => - !$conf['show_nb_comments'] ? 'checked="checked"' : '' )); } diff --git a/category.php b/category.php index cfef60065..7e2a037f5 100644 --- a/category.php +++ b/category.php @@ -112,6 +112,7 @@ if ( $user['expand'] ) // Start output of page // $title = $page['title']; +$page['body_id'] = 'theCategoryPage'; include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames( array('category'=>'category.tpl') ); @@ -134,7 +135,8 @@ if ( isset( $page['cat_nb_images'] ) and $page['cat_nb_images'] > 0 ) $icon_recent = get_icon(date('Y-m-d')); -$template->assign_vars(array( +$template->assign_vars( + array( 'NB_PICTURE' => count_user_total_images(), 'TITLE' => $template_title, 'USERNAME' => $user['username'], diff --git a/comments.php b/comments.php index 6b949eb31..a2fdc466f 100644 --- a/comments.php +++ b/comments.php @@ -165,11 +165,10 @@ UPDATE '.COMMENTS_TABLE.' // +-----------------------------------------------------------------------+ // | page header and options | // +-----------------------------------------------------------------------+ -if (!defined('IN_ADMIN')) -{ - $title= l10n('title_comments'); - include(PHPWG_ROOT_PATH.'include/page_header.php'); -} + +$title= l10n('title_comments'); +$page['body_id'] = 'theCommentsPage'; +include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames(array('comments'=>'comments.tpl')); $template->assign_vars( diff --git a/doc/ChangeLog b/doc/ChangeLog index 7d325c215..cdf5bc542 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,22 @@ +2005-08-26 Pierrick LE GALL + + * new : HTML BODY identifier to let CSS stylesheets manage + specific behaviour. + + * deletion : admin/search useless + + * improvement : in admin/user_list, special behaviour for + true/false fields (expand, show_comments) + + * new : gallery_title and gallery_description are displayed at the + top of each page. + + * improvement : simplification in HTML for categories menu. + + * improvement : standardization of presentation in all public + pages (identification, registration, search, profile, + notification, comments, etc.) + 2005-08-25 Pierrick LE GALL * deletion : no mail notification anymore. Feature replaced by RSS diff --git a/identification.php b/identification.php index 2301934dd..79157e632 100644 --- a/identification.php +++ b/identification.php @@ -64,6 +64,7 @@ SELECT '.$conf['user_fields']['id'].' AS id, // Start output of page // $title = $lang['identification']; +$page['body_id'] = 'theIdentificationPage'; include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames( array('identification'=>'identification.tpl') ); diff --git a/include/config_default.inc.php b/include/config_default.inc.php index e13090fd4..62e4a2782 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -270,9 +270,13 @@ $conf['allow_random_representative'] = false; // category and element description. $conf['allow_html_descriptions'] = true; -// gallery_title : Title for RSS feed -$conf['gallery_title'] = 'PhpWebGallery demo'; +// gallery_title : Title at top of each page and for RSS feed +$conf['gallery_title'] = 'PhpWebGallery demonstration site'; + +// gallery_description : Short description displayed with gallery title +$conf['gallery_description'] = 'My photos web site'; // galery_url : URL given in RSS feed $conf['gallery_url'] = 'http://demo.phpwebgallery.net'; + ?> diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index b797d2657..b3aacb70d 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -374,27 +374,21 @@ function get_html_menu_category($categories) $menu.= str_repeat("\n</ul>",($ref_level-$level)); } $ref_level = $level; - - $menu.= ' - <li>'; - - $url = add_session_id(PHPWG_ROOT_PATH.'category.php?cat='.$category['id']); + $menu.= ' - $class = ''; + <li'; if (isset($page['cat']) and is_numeric($page['cat']) and $category['id'] == $page['cat']) { - $class = 'menuCategorySelected'; + $menu.= ' class="selected"'; } - else - { - $class = 'menuCategoryNotSelected'; - } - + $menu.= '>'; + + $url = add_session_id(PHPWG_ROOT_PATH.'category.php?cat='.$category['id']); $menu.= ' - <a href="'.$url.'" class="'.$class.'">'.$category['name'].'</a>'; + <a href="'.$url.'">'.$category['name'].'</a>'; if ($category['nb_images'] > 0) { diff --git a/include/page_header.php b/include/page_header.php index 7b00e7055..8bf830cf5 100644 --- a/include/page_header.php +++ b/include/page_header.php @@ -35,6 +35,18 @@ $css.= '/'.$user['template'].'.css'; $template->assign_vars( array( + 'GALLERY_TITLE' => + isset($page['gallery_title']) ? + $page['gallery_title'] : $conf['gallery_title'], + + 'GALLERY_DESCRIPTION' => + isset($page['gallery_description']) ? + $page['gallery_description'] : $conf['gallery_description'], + + 'BODY_ID' => + isset($page['body_id']) ? + $page['body_id'] : '', + 'CONTENT_ENCODING' => $lang_info['charset'], 'PAGE_TITLE' => $title, 'LANG'=>$lang_info['code'], diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php index c53518b8c..2793b9a30 100644 --- a/language/en_UK.iso-8859-1/common.lang.php +++ b/language/en_UK.iso-8859-1/common.lang.php @@ -224,11 +224,10 @@ $lang['total'] = 'images'; // About $lang['about_page_title'] = 'About PhpWebGallery'; $lang['about_title'] = 'About...'; -$lang['about_message'] = '<div style="text-align:center;font-weigh:bold;">Information about PhpWebGallery</div> -<ul> +$lang['about_message'] = '<ul> <li>PhpWebGallery is a web application giving you the possibility to create an online images gallery easily.</li> <li>Technicaly, PhpWebGallery is fully developped with PHP (the elePHPant) with a MySQL database (the SQuirreL).</li> - <li>If you have any suggestions or comments, please visit <a href="http://www.phpwebgallery.net" style="text-decoration:underline">PhpWebGallery</a> official site, and its dedicated <a href="http://forum.phpwebgallery.net" style="text-decoration:underline">forum</a>.</li> + <li>If you have any suggestions or comments, please visit <a href="http://www.phpwebgallery.net">PhpWebGallery</a> official site, and its dedicated <a href="http://forum.phpwebgallery.net">forum</a>.</li> </ul>'; // Picture diff --git a/notification.php b/notification.php new file mode 100644 index 000000000..a9d8dd2d1 --- /dev/null +++ b/notification.php @@ -0,0 +1,72 @@ +<?php +// +-----------------------------------------------------------------------+ +// | PhpWebGallery - a PHP based picture gallery | +// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | +// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net | +// +-----------------------------------------------------------------------+ +// | branch : BSF (Best So Far) +// | file : $RCSfile$ +// | last update : $Date$ +// | last modifier : $Author$ +// | revision : $Revision$ +// +-----------------------------------------------------------------------+ +// | This program is free software; you can redistribute it and/or modify | +// | it under the terms of the GNU General Public License as published by | +// | the Free Software Foundation | +// | | +// | This program is distributed in the hope that it will be useful, but | +// | WITHOUT ANY WARRANTY; without even the implied warranty of | +// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | +// | General Public License for more details. | +// | | +// | You should have received a copy of the GNU General Public License | +// | along with this program; if not, write to the Free Software | +// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | +// | USA. | +// +-----------------------------------------------------------------------+ + +// +-----------------------------------------------------------------------+ +// | initialization | +// +-----------------------------------------------------------------------+ + +define('PHPWG_ROOT_PATH','./'); +include_once( PHPWG_ROOT_PATH.'include/common.inc.php' ); + +// +-----------------------------------------------------------------------+ +// | new feed creation | +// +-----------------------------------------------------------------------+ + +$page['feed'] = find_available_feed_id(); + +$query = ' +INSERT INTO '.USER_FEED_TABLE.' + (id, user_id, last_check) + VALUES + (\''.$page['feed'].'\', '.$user['id'].', NULL) +;'; +pwg_query($query); + +// +-----------------------------------------------------------------------+ +// | template initialization | +// +-----------------------------------------------------------------------+ + +$title = l10n('Notification'); +$page['body_id'] = 'theNotificationPage'; +include(PHPWG_ROOT_PATH.'include/page_header.php'); +$template->set_filenames(array('notification'=>'notification.tpl')); + +$template->assign_vars( + array( + 'FEED_URL' => PHPWG_ROOT_PATH.'feed.php?feed='.$page['feed'], + 'U_HOME' => add_session_id(PHPWG_ROOT_PATH.'category.php') + ) + ); + +// +-----------------------------------------------------------------------+ +// | html code display | +// +-----------------------------------------------------------------------+ + +$template->parse('notification'); +include(PHPWG_ROOT_PATH.'include/page_tail.php'); + +?>
\ No newline at end of file diff --git a/picture.php b/picture.php index 94a981d26..b6995a3ca 100644 --- a/picture.php +++ b/picture.php @@ -466,6 +466,7 @@ if ($metadata_showable and !isset($_GET['show_metadata'])) $url_metadata.= '&show_metadata=1'; } +$page['body_id'] = 'thePicturePage'; include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames(array('picture'=>'picture.tpl')); diff --git a/profile.php b/profile.php index 09629ba9f..55b121691 100644 --- a/profile.php +++ b/profile.php @@ -142,10 +142,13 @@ SELECT password // +-----------------------------------------------------------------------+ // | page header and options | // +-----------------------------------------------------------------------+ + $title= $lang['customize_page_title']; +$page['body_id'] = 'theProfilePage'; include(PHPWG_ROOT_PATH.'include/page_header.php'); $url_action = PHPWG_ROOT_PATH.'profile.php'; + //----------------------------------------------------- template initialization $template->set_filenames(array('profile_body'=>'profile.tpl')); diff --git a/register.php b/register.php index 07b8b327a..6169d0704 100644 --- a/register.php +++ b/register.php @@ -67,6 +67,7 @@ $email = !empty($_POST['mail_address'])?$_POST['mail_address']:''; // Start output of page // $title= $lang['register_page_title']; +$page['body_id'] = 'theRegisterPage'; include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames( array('register'=>'register.tpl') ); @@ -78,6 +79,8 @@ $template->assign_vars(array( 'L_PASSWORD' => $lang['password'], 'L_CONFIRM_PASSWORD' => $lang['reg_confirm'], 'L_EMAIL' => $lang['mail_address'], + + 'U_HOME' => add_session_id(PHPWG_ROOT_PATH.'category.php'), 'F_ACTION' => add_session_id('register.php'), 'F_LOGIN' => $login, diff --git a/search.php b/search.php index c4cd1d9c2..e8645440c 100644 --- a/search.php +++ b/search.php @@ -145,6 +145,7 @@ get_month_list('end_month', @$_POST['end_month']); // Start output of page // $title= $lang['search_title']; +$page['body_id'] = 'theSearchPage'; include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames( array('search'=>'search.tpl') ); diff --git a/template/cclear/about.tpl b/template/cclear/about.tpl index b56481c4b..c3a94539c 100644 --- a/template/cclear/about.tpl +++ b/template/cclear/about.tpl @@ -1,10 +1,12 @@ -<h2>{PAGE_TITLE}</h2> -<div class="menu" style="white-space:normal;margin:10px;"> - {L_ABOUT} -</div> -<div style="text-align:center;margin:5px;"> -<a href="{U_RETURN}" title="{L_RETURN_HINT}">[{L_RETURN}]</a> -</div> -<div style="text-align:center;margin:5px;"> -<img src="./template/clear/images/php_sqreuil_artistes.gif" alt="php logo" /> +<div id="content"> + + <div class="titrePage"> + <ul class="categoryActions"> + <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li> + </ul> + <h2>{lang:About}</h2> + </div> + + {lang:about_message} + </div> diff --git a/template/cclear/admin.tpl b/template/cclear/admin.tpl index ef1f89a80..98f555332 100644 --- a/template/cclear/admin.tpl +++ b/template/cclear/admin.tpl @@ -1,4 +1,5 @@ <!-- $Id$ --> + <div id="menubar"> <dl> <dt>{lang:links}</dt> @@ -66,7 +67,6 @@ </div> <!-- menubar --> <div id="content"> - <!--h2>{PAGE_TITLE}</h2--> <!-- BEGIN errors --> <div id="errors"> <ul> @@ -89,5 +89,3 @@ {ADMIN_CONTENT} </div> - - diff --git a/template/cclear/admin/cat_list.tpl b/template/cclear/admin/cat_list.tpl index 7331fe2e3..6b59afb03 100644 --- a/template/cclear/admin/cat_list.tpl +++ b/template/cclear/admin/cat_list.tpl @@ -37,12 +37,12 @@ </li> <!-- END category --> - <p><input name="submitOrder" type="submit" class="bouton" value="{lang:Save order}" /></p> + <p><input name="submitOrder" type="submit" value="{lang:Save order}" /></p> </form> <form action="{F_ACTION}" method="post"> {L_ADD_VIRTUAL} : <input type="text" name="virtual_name" /> <input type="hidden" name="rank" value="{NEXT_RANK}"/> - <input type="submit" value="{L_SUBMIT}" class="bouton" name="submitAdd" /> + <input type="submit" value="{L_SUBMIT}" name="submitAdd" /> </form> diff --git a/template/cclear/admin/cat_perm.tpl b/template/cclear/admin/cat_perm.tpl index a066e5214..39374d5ed 100644 --- a/template/cclear/admin/cat_perm.tpl +++ b/template/cclear/admin/cat_perm.tpl @@ -4,7 +4,7 @@ <form action="{F_ACTION}" method="post" id="categoryPermissions"> - <h3>{lang:Groups}</h3> + <h4>{lang:Groups}</h4> <fieldset> <legend>{lang:Permission granted}</legend> @@ -26,7 +26,7 @@ <input type="submit" name="grant_groups_submit" value="{lang:Grant selected groups}" /> </fieldset> - <h3>{lang:Users}</h3> + <h4>{lang:Users}</h4> <fieldset> <legend>{lang:Permission granted}</legend> diff --git a/template/cclear/admin/configuration.tpl b/template/cclear/admin/configuration.tpl index a806b2af9..591a1bbca 100644 --- a/template/cclear/admin/configuration.tpl +++ b/template/cclear/admin/configuration.tpl @@ -190,8 +190,8 @@ <!-- END metadata --> <tr> <td colspan="2" align="center"> - <input type="submit" name="submit" class="bouton" value="{L_SUBMIT}"> - <input type="reset" name="reset" class="bouton" value="{L_RESET}"> + <input type="submit" name="submit" value="{L_SUBMIT}"> + <input type="reset" name="reset" value="{L_RESET}"> </td> </tr> </table> diff --git a/template/cclear/admin/element_set_global.tpl b/template/cclear/admin/element_set_global.tpl index def1d30a0..081bb808a 100644 --- a/template/cclear/admin/element_set_global.tpl +++ b/template/cclear/admin/element_set_global.tpl @@ -27,7 +27,7 @@ </ul> - <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit_caddie" class="bouton" /></p> + <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit_caddie" /></p> </fieldset> @@ -152,7 +152,7 @@ </p> - <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit" class="bouton" /></p> + <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit" /></p> </fieldset> diff --git a/template/cclear/admin/group_list.tpl b/template/cclear/admin/group_list.tpl index 3a5688af0..4344c10da 100644 --- a/template/cclear/admin/group_list.tpl +++ b/template/cclear/admin/group_list.tpl @@ -1,52 +1,27 @@ -<!-- BEGIN errors --> -<div class="errors"> -<ul> - <!-- BEGIN error --> - <li>{errors.error.ERROR}</li> - <!-- END error --> -</ul> -</div> -<!-- END errors --> -<form method="post" name="post" action="{S_GROUP_ACTION}"> -<div class="admin">{L_GROUP_SELECT}</div> -<!-- BEGIN select_box --> -{S_GROUP_SELECT} <input type="submit" name="edit" value="{L_LOOK_UP}" class="bouton" /> -<input type="submit" name="delete" value="{L_GROUP_DELETE}" class="bouton" /> -<div style="vertical-align:middle;"> -<input type="checkbox" name="confirm_delete" value="1">{L_GROUP_CONFIRM} -</div> -<!-- END select_box --> -<input type="text" name="newgroup"> -<input type="submit" class="bouton" name="new" value="{L_CREATE_NEW_GROUP}" /> -<br /> -<br /> -<!-- BEGIN edit_group --> -<div class="admin">{L_GROUP_EDIT} [{edit_group.GROUP_NAME}]</div> -<table class="table2" width="60%" style="margin-left:20%;"> -<tr class="throw"> - <th width="25%">{L_USER_NAME}</th> - <th width="25%">{L_USER_EMAIL}</th> - <th width="10%">{L_USER_SELECT}</th> -</tr> -<!-- BEGIN user --> - <tr class="{edit_group.user.T_CLASS}"> - <td>{edit_group.user.NAME}</td> - <td>{edit_group.user.EMAIL}</td> - <td align="center"><input name="members[]" type="checkbox" value="{edit_group.user.ID}"></td> +<h2>{lang:title_groups}</h2> + +<form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}"> + <fieldset> + <legend>{lang:Add group}</legend> + <label>{lang:Group name} <input type="text" name="groupname" maxlength="50" size="20" /></label> + <input type="submit" name="submit_add" value="{lang:Add}" /> + </fieldset> +</form> + +<table class="table2"> + <tr class="throw"> + <th>{lang:Group name}</th> + <th>{lang:Members}</th> + <th>{lang:Actions}</th> </tr> -<!-- END user --> -<tr> - <td colspan="3" align="right" valign="middle"> - <input type="submit" name="deny_user" value="{L_DENY_SELECTED}" class="bouton" /> - </td> -</tr> + <!-- BEGIN group --> + <tr class="{group.CLASS}"> + <td>{group.NAME}</td> + <td><a href="{group.U_MEMBERS}">{group.MEMBERS}</a></td> + <td style="text-align:center;"> + <a href="{group.U_PERM}"><img src="./template/default/theme/permissions.png" style="border:none" alt="permissions" title="{lang:permissions}" /></a> + <a href="{group.U_DELETE}"><img src="./template/default/theme/delete.png" style="border:none" alt="delete" title="{lang:delete}" /></a> + </td> + </tr> + <!-- END group --> </table> -<div align="left" style="margin-left:20%;"> -<input type="text" name="username" maxlength="50" size="20" /> -<input type="submit" name="add" value="{L_ADD_MEMBER}" class="bouton" /> -<input name="edit_group_id" type="hidden" value="{edit_group.GROUP_ID}"> -<input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="bouton" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /> -</div> -<br /> -<!-- END edit_group --> -</form>
\ No newline at end of file diff --git a/template/cclear/admin/group_perm.tpl b/template/cclear/admin/group_perm.tpl index 9bf490e5b..91c2f637a 100644 --- a/template/cclear/admin/group_perm.tpl +++ b/template/cclear/admin/group_perm.tpl @@ -1,7 +1,7 @@ -<!-- BEGIN select_box --> -<form method="post" name="post" action="{S_GROUP_ACTION}"> - <div class="admin">{L_GROUP_SELECT}</div> - {S_GROUP_SELECT} - <input type="submit" name="edit" value="{L_LOOK_UP}" class="bouton" /> +<h2>{TITLE}</h2> + +<form method="post" action="{F_ACTION}"> + {DOUBLE_SELECT} </form> -<!-- END select_box -->
\ No newline at end of file + +<p>{lang:Only private categories are listed}</p> diff --git a/template/cclear/admin/infos_images.tpl b/template/cclear/admin/infos_images.tpl deleted file mode 100644 index 2e786483b..000000000 --- a/template/cclear/admin/infos_images.tpl +++ /dev/null @@ -1,96 +0,0 @@ -<!-- BEGIN errors --> -<div class="errors"> -<ul> - <!-- BEGIN error --> - <li>{errors.error.ERROR}</li> - <!-- END error --> -</ul> -</div> -<!-- END errors --> - -<form action="{F_ACTION}" method="POST"> -<div class="admin">{L_INFOS_TITLE} "{CATEGORY}"</div> - <table width="100%"> - <tr> - <td><div style="margin-left:50px;">{L_AUTHOR}</div></td> - <td style="row1"> - <input type="text" name="author_cat" value="" maxlength="255" /> - </td> - <td style="text-align:left;"> - <input type="checkbox" name="use_common_author" value="1" /> - {L_INFOS_OVERALL_USE} - </td> - </tr> - <tr> - <td> - <div style="margin-left:50px;">{L_INFOS_CREATION_DATE} [DD/MM/YYYY]</div> - </td> - <td style="row1"> - <input type="text" name="date_creation_cat" value="" size="12" maxlength="10"/> - </td> - <td style="text-align:left;"> - <input type="checkbox" name="use_common_date_creation" value="1" /> - {L_INFOS_OVERALL_USE} - </td> - </tr> - <tr> - <td> - <div style="margin-left:50px;">{L_KEYWORD} {L_KEYWORD_SEPARATION}</div> - </td> - <td style="row1"> - <input type="text" name="keywords_cat" value="" maxlength="255" /> - </td> - <td style="text-align:left;"> - <input type="radio" name="common_keywords" value="add" /> - {L_INFOS_ADDTOALL} - <input type="radio" name="common_keywords" value="remove" /> - {L_INFOS_REMOVEFROMALL} - </td> - </tr> - </table> - <br /> - <div class="admin">{L_INFOS_DETAIL}</div> - <div class="navigationBar">{NAV_BAR}</div> - <table width="100%"> - <tr> - <td style="width:0px;"> </td> - <td class="row2" style="text-align:center;">{L_THUMBNAIL}</td> - <td class="row2" style="text-align:center;">{L_INFOS_IMG}</td> - <td class="row2" style="text-align:center;">{L_AUTHOR}</td> - <td class="row2" style="text-align:center;">{L_INFOS_COMMENT}</td> - <td class="row2" style="text-align:center;">{L_INFOS_CREATION_DATE}</td> - <td class="row2" style="text-align:center;">{L_KEYWORD}</td> - </tr> - <!-- BEGIN picture --> - <tr> - <td style="width:0px;"> - <div style="margin-left:2px;margin-right:2px;"> - <input type="checkbox" name="check-{picture.ID_IMG}" value="1" /> - </div> - </td> - <td style="text-align:center;"><a name="{picture.DEFAULTNAME_IMG}" href="{picture.URL_IMG}"><img src="{picture.TN_URL_IMG}" alt="" class="miniature" title="{picture.FILENAME_IMG}" /></a></td> - <td style="text-align:center;">{picture.DEFAULTNAME_IMG}<br /><input type="text" name="name-{picture.ID_IMG}" value="{picture.NAME_IMG}" maxlength="255"/></td> - <td style="text-align:center;"><input type="text" name="author-{picture.ID_IMG}" value="{picture.AUTHOR_IMG}" maxlength="255" size="12" /></td> - <td style="text-align:center;"><textarea name="comment-{picture.ID_IMG}" rows="5" cols="30" style="overflow:auto">{picture.COMMENT_IMG}</textarea></td> - <td style="text-align:center;"><input type="text" name="date_creation-{picture.ID_IMG}" value="{picture.DATE_IMG}" maxlength="10" size="10" /></td> - <td style="text-align:center;"><input type="text" name="keywords-{picture.ID_IMG}" value="{picture.KEYWORDS_IMG}" length="255" /></td> - </tr> - <!-- END picture --> - <tr> - <td colspan="7"> - <img src="./template/clear/admin/images/arrow_select.gif" alt="↑" /> - {L_INFOS_ASSOCIATE} - <select style="width:400px" name="associate" size="1"> - <!-- BEGIN associate_option --> - <option {associate_option.SELECTED} value="{associate_option.VALUE}">{associate_option.OPTION}</option> - <!-- END category_option --> - </select> - </td> - </tr> - <tr> - <td colspan="7" style="text-align:center;"> - <input type="submit" value="{L_SUBMIT}" name="submit" class="bouton" /> - </td> - </tr> - </table> -</form> diff --git a/template/cclear/admin/remote_site.tpl b/template/cclear/admin/remote_site.tpl index 4b8260279..f4b31d1e4 100644 --- a/template/cclear/admin/remote_site.tpl +++ b/template/cclear/admin/remote_site.tpl @@ -55,7 +55,7 @@ <form action="{F_ACTION}" method="post"> {L_REMOTE_SITE_CREATE} <input type="text" name="galleries_url" value="{F_GALLERIES_URL}" /> - <input class="bouton" type="submit" name="submit" value="{L_SUBMIT}" /> + <input type="submit" name="submit" value="{L_SUBMIT}" /> </form> <table> diff --git a/template/cclear/admin/search_username.tpl b/template/cclear/admin/search_username.tpl deleted file mode 100644 index f3e676f8d..000000000 --- a/template/cclear/admin/search_username.tpl +++ /dev/null @@ -1,22 +0,0 @@ -<script language="javascript" type="text/javascript"> -<!-- -function refresh_username(selected_username) -{ - opener.document.forms['post'].username.value = selected_username; - opener.focus(); - window.close(); -} -//--> -</script> -<div class="titrePage">{L_SEARCH_USERNAME}</div> -<form method="post" name="search" action="{F_SEARCH_ACTION}"> - <input type="text" name="search_username" value="{USERNAME}" class="post" /> - <input type="submit" name="search" value="{L_SEARCH}" class="bouton" /><br /> - <span class="gensmall">{L_SEARCH_EXPLAIN}</span><br /> - <!-- BEGIN switch_select_name --> - <span class="genmed">{L_UPDATE_USERNAME}<br /> - <select name="username_list">{switch_select_name.F_USERNAME_OPTIONS}</select> - <input type="submit" class="bouton" onClick="refresh_username(this.form.username_list.options[this.form.username_list.selectedIndex].value);return false;" name="use" value="{L_SELECT}" /></span><br /> - <!-- END switch_select_name --> - <br /><a href="javascript:window.close();" class="adminMenu">{L_CLOSE_WINDOW}</a> -</form> diff --git a/template/cclear/admin/thumbnail.tpl b/template/cclear/admin/thumbnail.tpl index e6e140f7d..aa8bbcd0f 100644 --- a/template/cclear/admin/thumbnail.tpl +++ b/template/cclear/admin/thumbnail.tpl @@ -98,7 +98,7 @@ </tr> <tr> <td colspan="3" style="text-align:center;"> - <input type="submit" name="submit" class="bouton" value="{L_SUBMIT}"/> + <input type="submit" name="submit" value="{L_SUBMIT}"/> </td> </tr> </table> diff --git a/template/cclear/admin/update.tpl b/template/cclear/admin/update.tpl index 182a9a868..8e952c329 100644 --- a/template/cclear/admin/update.tpl +++ b/template/cclear/admin/update.tpl @@ -79,8 +79,8 @@ </fieldset> <p class="bottomButtons"> - <input type="submit" value="{L_SUBMIT}" name="submit" class="bouton" /> - <input type="reset" value="{L_RESET}" name="reset" class="bouton" /> + <input type="submit" value="{L_SUBMIT}" name="submit" /> + <input type="reset" value="{L_RESET}" name="reset" /> </p> </form> diff --git a/template/cclear/admin/user_list.tpl b/template/cclear/admin/user_list.tpl index a66c6f4ba..ad6b18678 100644 --- a/template/cclear/admin/user_list.tpl +++ b/template/cclear/admin/user_list.tpl @@ -1,11 +1,11 @@ -<h1>{lang:title_liste_users}</h1> +<h2>{lang:title_liste_users}</h2> <form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}"> <fieldset> <legend>{lang:Add a user}</legend> <label>{L_USERNAME} <input type="text" name="login" maxlength="50" size="20" /></label> <label>{L_PASSWORD} <input type="text" name="password" /></label> - <input type="submit" name="submit_add" value="{L_SUBMIT}" class="bouton" /> + <input type="submit" name="submit_add" value="{L_SUBMIT}" /> </fieldset> </form> @@ -60,7 +60,7 @@ </select> </label> - <input type="submit" name="submit_filter" value="{L_SUBMIT}" class="bouton" /> + <input type="submit" name="submit_filter" value="{L_SUBMIT}" /> </fieldset> @@ -68,14 +68,14 @@ <form method="post" name="preferences" action="{F_PREF_ACTION}"> -<table class="table2" style="width:100%;" > +<table class="table2"> <tr class="throw"> - <th style="width:1%;"></th> - <th style="width:20%;">{L_USERNAME}</th> - <th style="width:20%;">{L_STATUS}</th> - <th style="width:30%;">{L_EMAIL}</th> - <th style="width:30%;">{L_GROUPS}</th> - <th style="width:1%;">{L_ACTIONS}</th> + <th> </th> + <th>{L_USERNAME}</th> + <th>{L_STATUS}</th> + <th>{L_EMAIL}</th> + <th>{lang:Groups}</th> + <th>{L_ACTIONS}</th> </tr> <!-- BEGIN user --> <tr class="{user.CLASS}"> @@ -90,13 +90,34 @@ </tr> <!-- END user --> </table> + <div class="navigationBar">{NAVBAR}</div> <!-- delete the selected users ? --> <fieldset> <legend>{lang:Deletions}</legend> - <input type="checkbox" name="confirm_deletion" value="1" /> {lang:confirm} - <input type="submit" value="{lang:Delete selected users}" name="delete" class="bouton" /> + <label><input type="checkbox" name="confirm_deletion" value="1" /> {lang:confirm}</label> + <input type="submit" value="{lang:Delete selected users}" name="delete" /> +</fieldset> + +<fieldset> + <legend>{lang:Status}</legend> + + <table> + <tr> + <td>{L_STATUS}</td> + <td> + <label><input type="radio" name="status_action" value="leave" checked="checked" /> {lang:leave}</label> + <label><input type="radio" name="status_action" value="set" id="status_action_set" /> {lang:set to}</label> + <select onmousedown="document.getElementById('status_action_set').checked = true;" name="status" size="1"> + <!-- BEGIN pref_status_option --> + <option {pref_status_option.SELECTED} value="{pref_status_option.VALUE}">{pref_status_option.CONTENT}</option> + <!-- END pref_status_option --> + </select> + </td> + </tr> + </table> + </fieldset> <!-- form to set properties for many users at once --> @@ -139,8 +160,8 @@ <tr> <td>{L_NB_IMAGE_LINE}</td> <td> - <input type="radio" name="nb_image_line_action" value="leave" checked="checked" /> leave unchanged - <input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set" /> set to + <label><input type="radio" name="nb_image_line_action" value="leave" checked="checked" /> {lang:leave}</label> + <label><input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set" /> {lang:set to}</label> <input onmousedown="document.getElementById('nb_image_line_action_set').checked = true;" size="3" maxlength="2" type="text" name="nb_image_line" value="{NB_IMAGE_LINE}" /> </td> @@ -149,8 +170,8 @@ <tr> <td>{L_NB_LINE_PAGE}</td> <td> - <input type="radio" name="nb_line_page_action" value="leave" checked="checked" /> leave unchanged - <input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set" /> set to + <label><input type="radio" name="nb_line_page_action" value="leave" checked="checked" /> {lang:leave}</label> + <label><input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set" /> {lang:set to}</label> <input onmousedown="document.getElementById('nb_line_page_action_set').checked = true;" size="3" maxlength="2" type="text" name="nb_line_page" value="{NB_LINE_PAGE}" /> <td> @@ -159,8 +180,8 @@ <tr> <td>{L_TEMPLATE}</td> <td> - <input type="radio" name="template_action" value="leave" checked="checked" /> leave unchanged - <input type="radio" name="template_action" value="set" id="template_action_set" /> set to + <label><input type="radio" name="template_action" value="leave" checked="checked" /> {lang:leave}</label> + <label><input type="radio" name="template_action" value="set" id="template_action_set" /> {lang:set to}</label> <select onmousedown="document.getElementById('template_action_set').checked = true;" name="template" size="1"> <!-- BEGIN template_option --> <option {template_option.SELECTED} value="{template_option.VALUE}">{template_option.CONTENT}</option> @@ -172,8 +193,8 @@ <tr> <td>{L_LANGUAGE}</td> <td> - <input type="radio" name="language_action" value="leave" checked="checked" /> leave unchanged - <input type="radio" name="language_action" value="set" id="language_action_set" /> set to + <label><input type="radio" name="language_action" value="leave" checked="checked" /> {lang:leave}</label> + <label><input type="radio" name="language_action" value="set" id="language_action_set" /> {lang:set to}</label> <select onmousedown="document.getElementById('language_action_set').checked = true;" name="language" size="1"> <!-- BEGIN language_option --> <option {language_option.SELECTED} value="{language_option.VALUE}">{language_option.CONTENT}</option> @@ -185,8 +206,8 @@ <tr> <td>{L_RECENT_PERIOD}</td> <td> - <input type="radio" name="recent_period_action" value="leave" checked="checked" /> leave unchanged - <input type="radio" name="recent_period_action" value="set" id="recent_period_action_set" /> set to + <label><input type="radio" name="recent_period_action" value="leave" checked="checked" /> {lang:leave}</label> + <label><input type="radio" name="recent_period_action" value="set" id="recent_period_action_set" /> {lang:set to}</label> <input onmousedown="document.getElementById('recent_period_action_set').checked = true;" type="text" size="3" maxlength="2" name="recent_period" value="{RECENT_PERIOD}" /> </td> @@ -195,33 +216,29 @@ <tr> <td>{L_EXPAND}</td> <td> - <input type="radio" name="expand_action" value="leave" checked="checked" /> leave unchanged - <input type="radio" name="expand_action" value="set" id="expand_action_set" /> set to - <input onmousedown="document.getElementById('expand_action_set').checked = true;" - type="radio" class="radio" name="expand" value="true" {EXPAND_YES} />{L_YES} - <input onmousedown="document.getElementById('expand_action_set').checked = true;" - type="radio" class="radio" name="expand" value="false" {EXPAND_NO} />{L_NO} + <label><input type="radio" name="expand" value="leave" checked="checked" /> {lang:leave}</label> + / {lang:set to} + <label><input type="radio" name="expand" value="true" {EXPAND_YES} />{L_YES}</label> + <label><input type="radio" name="expand" value="false" {EXPAND_NO} />{L_NO}</label> </td> </tr> <tr> <td>{L_SHOW_NB_COMMENTS}</td> <td> - <input type="radio" name="show_nb_comments_action" value="leave" checked="checked" /> leave unchanged - <input type="radio" name="show_nb_comments_action" value="set" id="show_nb_comments_action_set" /> set to - <input onmousedown="document.getElementById('show_nb_comments_action_set').checked = true;" - type="radio" class="radio" name="show_nb_comments" value="true" {SHOW_NB_COMMENTS_YES} />{L_YES} - <input onmousedown="document.getElementById('show_nb_comments_action_set').checked = true;" - type="radio" class="radio" name="show_nb_comments" value="false" {SHOW_NB_COMMENTS_NO} />{L_NO} + <label><input type="radio" name="show_nb_comments" value="leave" checked="checked" /> {lang:leave}</label> + / {lang:set to} + <label><input type="radio" name="show_nb_comments" value="true" {SHOW_NB_COMMENTS_YES} />{L_YES}</label> + <label><input type="radio" name="show_nb_comments" value="false" {SHOW_NB_COMMENTS_NO} />{L_NO}</label> </td> </tr> <tr> <td>{L_MAXWIDTH}</td> <td> - <input type="radio" name="maxwidth_action" value="leave" checked="checked" /> leave unchanged - <input type="radio" name="maxwidth_action" value="unset" /> unset - <input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set" /> set to + <label><input type="radio" name="maxwidth_action" value="leave" checked="checked" /> {lang:leave}</label> + <label><input type="radio" name="maxwidth_action" value="unset" /> {lang:unset}</label> + <label><input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set" /> {lang:set to}</label> <input onmousedown="document.getElementById('maxwidth_action_set').checked = true;" type="text" size="4" maxlength="4" name="maxwidth" value="{MAXWIDTH}" /> </td> @@ -231,40 +248,28 @@ <tr> <td>{L_MAXHEIGHT}</td> <td> - <input type="radio" name="maxheight_action" value="leave" checked="checked" /> leave unchanged - <input type="radio" name="maxheight_action" value="unset" /> unset - <input type="radio" name="maxheight_action" value="set" id="maxheight_action_set" /> set to + <label><input type="radio" name="maxheight_action" value="leave" checked="checked" /> {lang:leave}</label> + <label><input type="radio" name="maxheight_action" value="unset" /> {lang:unset}</label> + <label><input type="radio" name="maxheight_action" value="set" id="maxheight_action_set" /> {lang:set to}</label> <input onmousedown="document.getElementById('maxheight_action_set').checked = true;" type="text" size="4" maxlength="4" name="maxheight" value="{maxheight}" /> </td> </tr> - <tr> - <td>{L_STATUS}</td> - <td> - <input type="radio" name="status_action" value="leave" checked="checked" /> leave unchanged - <input type="radio" name="status_action" value="set" id="status_action_set" /> set to - <select onmousedown="document.getElementById('status_action_set').checked = true;" name="status" size="1"> - <!-- BEGIN pref_status_option --> - <option {pref_status_option.SELECTED} value="{pref_status_option.VALUE}">{pref_status_option.CONTENT}</option> - <!-- END pref_status_option --> - </select> - </td> - </tr> </table> </fieldset> -<p style="text-align:center;"> - target - <input type="radio" name="target" value="all" /> all - <input type="radio" name="target" value="selection" checked="checked" /> selection +<p> + {lang:target} + <label><input type="radio" name="target" value="all" /> {lang:all} + <label><input type="radio" name="target" value="selection" checked="checked" /> {lang:selection} </p> -<p style="text-align:center;"> - <input type="submit" value="{L_SUBMIT}" name="pref_submit" class="bouton" /> - <input type="reset" value="{L_RESET}" name="pref_reset" class="bouton" /> +<p> + <input type="submit" value="{L_SUBMIT}" name="pref_submit" /> + <input type="reset" value="{L_RESET}" name="pref_reset" /> </p> </form> diff --git a/template/cclear/admin/user_perm.tpl b/template/cclear/admin/user_perm.tpl index e3944fe42..a24fd9096 100644 --- a/template/cclear/admin/user_perm.tpl +++ b/template/cclear/admin/user_perm.tpl @@ -1,6 +1,21 @@ -<div class="admin">{L_SELECT_USERNAME}</div> -<form method="post" name="post" action="{F_SEARCH_USER_ACTION}"> - <input type="text" name="username" maxlength="50" size="20" /> - <input type="submit" name="submituser" value="{L_LOOKUP_USER}" class="bouton" /> - <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="bouton" onClick="window.open('{U_SEARCH_USER}', '_phpwgsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /> -</form>
\ No newline at end of file +<h2>{TITLE}</h2> + +<!-- BEGIN groups --> +<fieldset> + <legend>{lang:Categories authorized thanks to group associations}</legend> + + <ul> + <!-- BEGIN category --> + <li>{groups.category.NAME}</li> + <!-- END category --> + </ul> +</fieldset> +<!-- END groups --> + +<fieldset> + <legend>{lang:Other private categories}</legend> + + <form method="post" action="{F_ACTION}"> + {DOUBLE_SELECT} + </form> +</fieldset> diff --git a/template/cclear/category.tpl b/template/cclear/category.tpl index 17ff0d2bb..bb218f9be 100644 --- a/template/cclear/category.tpl +++ b/template/cclear/category.tpl @@ -1,6 +1,4 @@ <!-- $Id$ --> -<h1>PhpWebGallery demonstration site</h1> - <div id="menubar"> <!-- BEGIN links --> <dl> @@ -84,7 +82,7 @@ <label for="remember_me">{L_REMEMBER_ME}</label> </p> <!-- END remember_me --> - <p><input type="submit" name="login" value="{L_SUBMIT}" class="bouton"></p> + <p><input type="submit" name="login" value="{L_SUBMIT}"></p> </form> <!-- END quickconnect --> </dd> diff --git a/template/cclear/comments.tpl b/template/cclear/comments.tpl index 2ea1dc1bb..c8d435f38 100644 --- a/template/cclear/comments.tpl +++ b/template/cclear/comments.tpl @@ -1,5 +1,4 @@ -<div id="commentsPage"> - +<!-- $Id$ --> <div id="content"> <div class="titrePage"> @@ -92,5 +91,3 @@ </div> </div> <!-- content --> - -</div> <!-- commentsPage --> diff --git a/template/cclear/content.css b/template/cclear/content.css index 0ed06dd4c..ab9c845eb 100644 --- a/template/cclear/content.css +++ b/template/cclear/content.css @@ -5,7 +5,14 @@ margin-bottom: 1em; /* when it's longer than menu bar */ } -#commentsPage #content { +BODY#theCommentsPage #content, +BODY#theRegisterPage #content, +BODY#theIdentificationPage #content, +BODY#theProfilePage #content, +BODY#theSearchPage #content, +BODY#theAboutPage #content, +BODY#theNotificationPage #content +{ margin: 1em; } @@ -126,7 +133,7 @@ ul.categoryActions { #content DIV.comment > A.illustration { display: block; - float: left; + position: absolute; margin: 5px; } @@ -142,7 +149,6 @@ ul.categoryActions { #content DIV.comment UL.actions { text-align: center; margin: 0.2em; - clear: left; } #content DIV.comment > UL.actions > LI { @@ -155,3 +161,4 @@ ul.categoryActions { border-left: 2px solid gray; padding: 0.5em; } + diff --git a/template/cclear/default-colors.css b/template/cclear/default-colors.css index 3681a6ee7..f2262c85a 100644 --- a/template/cclear/default-colors.css +++ b/template/cclear/default-colors.css @@ -117,9 +117,7 @@ input, select, textarea { background-color: lightgrey; border: 1px solid gray; } -.bouton { - background-color:#d3d3d3; -} + .errors { /* Errors display */ color:red; background-color:#ffe1e1; @@ -132,7 +130,10 @@ input, select, textarea { { font-weight:normal; } -fieldset>legend { +LEGEND { font-style: italic; } +FIELDSET { + border: 1px solid gray; +} diff --git a/template/cclear/default-layout.css b/template/cclear/default-layout.css index e15db32c6..36d1f3249 100644 --- a/template/cclear/default-layout.css +++ b/template/cclear/default-layout.css @@ -28,7 +28,7 @@ H1 { H2 { margin: 0; - padding: 5px 10px; + padding: 5px; text-align: left; font-size: 120%; } @@ -67,7 +67,9 @@ div.formbox { width: 70%; margin: 0 auto 1em auto; } -form { padding: 0.5em; } + +form { padding: 0em; } + /* form row are dl instead of table rows */ form dl { text-align: left; /* must set it there otherwise IE render dl.biglabel dt incorectly */ @@ -113,10 +115,6 @@ form p { margin-top: 2em; margin-bottom: 2em; } - -form table { - width: 99%; /* IE 6 seems to dislike 100% in admin->user */ -} .small { font-size: 80%; } @@ -148,10 +146,15 @@ select.categoryList { } .table2 { - border: 1px solid #000000; - margin: auto 10px auto 10px; - padding:0px; + border: 1px solid black; + margin: 1em auto; + padding: 0; +} + +.table2 TD, .table2 TH { + padding: 0 1em; } + form#add_virtual p { text-align: left; } form#categoryOrdering p { text-align: left; @@ -181,8 +184,9 @@ form#cat_modify table { width: auto; } * Filter forms are displayed label by label with the input (or select...) * below the label */ -FORM.filter FIELDSET { - padding: 10px; +FIELDSET { + padding: 1em; + margin: 1em; } FORM.filter FIELDSET LABEL { @@ -193,19 +197,51 @@ FORM.filter FIELDSET LABEL { padding: 0; } -FORM.filter>FIELDSET>LABEL>INPUT, FORM.filter>FIELDSET>LABEL>SELECT { +FORM.filter FIELDSET LABEL INPUT, FORM.filter FIELDSET LABEL SELECT { display: block; + margin: 0.5em 0; } -FORM.filter FIELDSET P, FORM.filter FIELDSET>INPUT { +FORM.filter FIELDSET P, FORM.filter FIELDSET INPUT { clear: left; display: block; } -FORM.filter FIELDSET { - border: 1px solid gray; +FORM.filter INPUT[type="submit"] { + margin-top: 1em; +} + +FIELDSET.elementEdit A { + display: block; + float: right; } -FORM.filter FIELDSET + INPUT { - margin-top: 10px; +TABLE.doubleSelect { + text-align: center; + margin: 0 auto; } + +TABLE.doubleSelect TD { + padding: 0 5px; +} + +FORM#categoryPermissions LI { + display:inline; + white-space: nowrap; +} + +#theHeader { +} + +#theHeader H1 { + margin-bottom: 0.5em; +} + +#theHeader P { + margin-top: 0; + padding: 0; +} + +BODY#theAdminPage #theHeader P { + display: none; +}
\ No newline at end of file diff --git a/template/cclear/header.tpl b/template/cclear/header.tpl index fc991fb41..f89d405cb 100644 --- a/template/cclear/header.tpl +++ b/template/cclear/header.tpl @@ -21,5 +21,10 @@ <script type="text/javascript" src="include/scripts.js"></script> </head> -<body> +<body id="{BODY_ID}"> <div id="the_page"> + +<div id="theHeader"> + <h1>{GALLERY_TITLE}</h1> + <p>{GALLERY_DESCRIPTION}</p> +</div> diff --git a/template/cclear/identification.tpl b/template/cclear/identification.tpl index 41c98b792..8b0201834 100644 --- a/template/cclear/identification.tpl +++ b/template/cclear/identification.tpl @@ -1,4 +1,14 @@ -<h2>{L_TITLE}</h2> +<!-- $Id$ --> +<div id="content"> + + <div class="titrePage"> + <ul class="categoryActions"> + <li><a href="{U_REGISTER}" title="{lang:Create a new account}"><img src="./template/cclear/theme/register.png" alt="{lang:register"/></a></li> + <li><a href="{U_HOME}" title="{lang:Go through the gallery as a visitor}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li> + </ul> + <h2>{lang:Identification}</h2> + </div> + <div class="formbox"> <form action="{F_LOGIN_ACTION}" method="post"> <!-- BEGIN errors --> @@ -20,11 +30,9 @@ <dd><input type="checkbox" name="remember_me" value="1" /></dd> <!-- END remember_me --> </dl> - <p><input type="submit" name="login" value="{L_LOGIN}" class="bouton" /></p> + <p><input type="submit" name="login" value="{L_LOGIN}"></p> </form> - <!-- BEGIN free_access --> - <p><a href="./category.php">[ {L_GUEST} ]</a></p> - <a href="register.php"><img src="template/cclear/theme/register.gif" style="border:0;" alt=""/> {L_REGISTER}</a> - - <!-- END free_access --> - <a href="mailto:{MAIL_ADMIN}?subject=[PhpWebGallery] {L_FORGET}"><img src="template/cclear/theme/lost.gif" style="border:0;" alt=""/> {L_FORGET}</a> + <a href="{U_REGISTER}"><img src="template/cclear/theme/register.png" alt=""> {L_REGISTER}</a> </div> <!--formbox--> + +</div> <!-- content --> diff --git a/template/cclear/notification.tpl b/template/cclear/notification.tpl index ac50a7d8f..cc4a0ee9f 100644 --- a/template/cclear/notification.tpl +++ b/template/cclear/notification.tpl @@ -1,4 +1,13 @@ -{lang:The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.} +<div id="content"> -<p><a href="{FEED_URL}">{lang:RSS feed}</a></p> -<p><a href="{HOME_URL}">{lang:Return to home page}</a></p> + <div class="titrePage"> + <ul class="categoryActions"> + <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li> + </ul> + <h2>{lang:Notification}</h2> + </div> + + <p>{lang:The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.}</p> + + <p><a href="{FEED_URL}">{lang:RSS feed}</a></p> +</div> diff --git a/template/cclear/profile.tpl b/template/cclear/profile.tpl index 429999397..76fe2dba6 100644 --- a/template/cclear/profile.tpl +++ b/template/cclear/profile.tpl @@ -76,10 +76,11 @@ </dd> </dl> - <p> - <input type="submit" name="validate" value="{L_SUBMIT}" class="bouton" /> - <input type="reset" name="reset" value="{L_RESET}" class="bouton" /> + <p class="bottomButtons"> + <input type="submit" name="validate" value="{L_SUBMIT}"> + <input type="reset" name="reset" value="{L_RESET}"> </p> + </form> <p><a href="{U_RETURN}" title="{L_RETURN_HINT}">[{L_RETURN}]</a></p> diff --git a/template/cclear/register.tpl b/template/cclear/register.tpl index 8bae0bc16..c696bfe8b 100644 --- a/template/cclear/register.tpl +++ b/template/cclear/register.tpl @@ -1,59 +1,42 @@ -<h2>{L_TITLE}</h2> +<div id="registerPage"> + +<div id="content"> + + <div class="titrePage"> + <ul class="categoryActions"> + <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li> + </ul> + <h2>{lang:Registration}</h2> + </div> + <!-- TO DO --> <!-- It's easy, just lok at identification.tpl ;-) --> -<form method="post" action="{F_ACTION}"> - <table style="width:60%;" align="center"> - <!-- BEGIN errors --> - <tr> - <td colspan="2"> - <div class="errors"> - <ul> - <!-- BEGIN error --> - <li>{errors.error.ERROR}</li> - <!-- END error --> - </ul> - </div> - </td> - </tr> + <!-- BEGIN errors --> + <div class="errors"> + <ul> + <!-- BEGIN error --> + <li>{errors.error.ERROR}</li> + <!-- END error --> + </ul> + </div> <!-- END errors --> - <tr> - <td width="60%">{L_USERNAME}</td> - <td width="40%"> - <input type="text" name="login" value="{F_LOGIN}" /> - </td> - </tr> - <tr> - <td >{L_PASSWORD}</td> - <td > - <input type="password" name="password" /> - </td> - </tr> - <tr> - <td >{L_CONFIRM_PASSWORD}</td> - <td > - <input type="password" name="password_conf" /> - </td> - </tr> - <tr> - <td >{L_EMAIL}</td> - <td > - <input type="text" name="mail_address" value="{F_EMAIL}" /> - </td> - </tr> - <tr> - <td colspan="2"> </td> - </tr> - <tr> - <tr> - <td colspan="2" align="center"> - <input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" /> - </td> - </tr> - <tr> - <td colspan="2" align="center"> - <a href="./category.php">[ {L_GUEST} ]</a> - </td> - </tr> - </table> + +<form method="post" action="{F_ACTION}" class="filter"> + <fieldset> + <legend>{lang:Enter your personnal informations}</legend> + + <label>* {lang:Username}<input type="text" name="login" value="{F_LOGIN}"></label> + <label>* {lang:Password}<input type="password" name="password"></label> + <label>* {lang:Confirm Password}<input type="password" name="password_conf"></label> + <label>{lang:Mail address}<input type="text" name="mail_address" value="{F_EMAIL}"></label> + </fieldset> + + <p class="bottomButtons"> + <input type="submit" name="submit" value="{lang:Register}"> + </p> + </form> + +</div> <!-- content --> +</div> <!-- registerPage --> diff --git a/template/cclear/search.tpl b/template/cclear/search.tpl index 93315a663..75147cffa 100644 --- a/template/cclear/search.tpl +++ b/template/cclear/search.tpl @@ -1,4 +1,12 @@ -<h2>{L_SEARCH_TITLE}</h2> +<div id="content"> + + <div class="titrePage"> + <ul class="categoryActions"> + <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li> + </ul> + <h2>{lang:Search}</h2> + </div> + <!-- TO DO --> <form method="post" name="post" action="{S_SEARCH_ACTION}"> <!-- BEGIN errors --> @@ -11,9 +19,6 @@ </div> <!-- END errors --> <table width="100%" align="center" cellpadding="2"> - <tr class="admin"> - <th colspan="4">{L_SEARCH_TITLE}</th> - </tr> <tr> <td width="50%" colspan="2"><b>{L_SEARCH_KEYWORDS} : </b><br /><span class="small">{L_SEARCH_KEYWORDS_HINT}</span></td> <td colspan="2" valign="top"> @@ -129,4 +134,5 @@ </td> </table> </form> -<a href="{U_HOME}" title="{L_RETURN_HINT}">[ {L_RETURN} ]</a> + +</div> <!-- content --> diff --git a/template/cclear/theme/register.png b/template/cclear/theme/register.png Binary files differnew file mode 100644 index 000000000..a28069cb7 --- /dev/null +++ b/template/cclear/theme/register.png |
