From 9fd459d0510534ab6f92b7f4e9a3a4598ff3c1ab Mon Sep 17 00:00:00 2001 From: gweltas Date: Fri, 26 Mar 2004 17:08:09 +0000 Subject: - Template migration - Admin Control Panel migration - Category management git-svn-id: http://piwigo.org/svn/trunk@394 68402e56-0260-453c-a942-63ccdbb3a9ee --- template/default/admin.tpl | 76 ++++++-- template/default/admin/cat_list.tpl | 55 ++++++ template/default/admin/cat_list.vtp | 110 ------------ template/default/admin/configuration.tpl | 171 ++++++++---------- template/default/admin/help.tpl | 2 +- template/default/admin/images/icon_folder.gif | Bin 0 -> 677 bytes template/default/admin/images/icon_folder_link.gif | Bin 0 -> 714 bytes template/default/admin/images/icon_folder_lock.gif | Bin 0 -> 673 bytes template/default/admin/images/icon_subfolder.gif | Bin 0 -> 705 bytes template/default/category.tpl | 2 +- template/default/comments.tpl | 2 + template/default/default.css | 59 ++++--- template/default/htmlfunctions.inc.php | 195 --------------------- 13 files changed, 223 insertions(+), 449 deletions(-) create mode 100644 template/default/admin/cat_list.tpl delete mode 100644 template/default/admin/cat_list.vtp create mode 100644 template/default/admin/images/icon_folder.gif create mode 100644 template/default/admin/images/icon_folder_link.gif create mode 100644 template/default/admin/images/icon_folder_lock.gif create mode 100644 template/default/admin/images/icon_subfolder.gif delete mode 100644 template/default/htmlfunctions.inc.php (limited to 'template') diff --git a/template/default/admin.tpl b/template/default/admin.tpl index 7b9dd9462..696f43072 100644 --- a/template/default/admin.tpl +++ b/template/default/admin.tpl @@ -1,21 +1,67 @@

{L_INSTALL_WARNING} -

- {L_CONFIG} |  - {L_USERS} |  - {L_GROUPS} |  - {L_CATEGORIES} |  - {L_WAITING} |  - {L_COMMENTS} |  - {L_UPDATE} |  - {L_THUMBNAILS} |  - {L_HISTORY} |  - {L_FAQ} |  - {L_RETURN} + + + + + +
+
+ +
{L_LINKS}
+
+
-
-
+
{L_GENERAL}
+
+ +
+
{L_CATEGORIES}
+
+ +
+
{L_IMAGES}
+
+ +
+
{L_IDENTIFY}
+
+ +
+
{L_AUTH}
+
+ +
+
+
+
{PAGE_TITLE}
{ADMIN_CONTENT} -
+ +
\ No newline at end of file diff --git a/template/default/admin/cat_list.tpl b/template/default/admin/cat_list.tpl new file mode 100644 index 000000000..dbc59d487 --- /dev/null +++ b/template/default/admin/cat_list.tpl @@ -0,0 +1,55 @@ + +
+
    + +
  • {errors.error.ERROR}
    • + +
+
+ +
{CATEGORIES_NAV}
+ + + + + + + + + + + + +
{category.CATEGORY_IMG}{category.CATEGORY_NAME} +
+ + {L_STORAGE} : {category.CATEGORY_DIR} - + + {L_NB_IMG} : {category.CATEGORY_NB_IMG} + 		+ {L_MOVE_UP}
+ {L_MOVE_DOWN} + 		+ {L_EDIT} + + + {L_INFO_IMG} + + + {L_INFO_IMG} + + + {L_UPDATE} + + + {L_DELETE} + + + {L_DELETE} + +
+
+ {L_ADD_VIRTUAL} : + + +
\ No newline at end of file diff --git a/template/default/admin/cat_list.vtp b/template/default/admin/cat_list.vtp deleted file mode 100644 index 997f3d1f1..000000000 --- a/template/default/admin/cat_list.vtp +++ /dev/null @@ -1,110 +0,0 @@ - -
-
{#errors_title}
-
    - -
  • {#content}
    • - -
-
- -
-
- {#cat_add} - {#cat_parent} - - - - - - - -
-
- - - - <{#td} style="width:50%;text-align:left;"> - - {#indent} - > - > - > -  {#name} [ - - dir : {#dir} - - - {#cat_virtual} - - ] - {#invisible} {#private} - - <{#td} class="{#class}" - style="width:1px;white-space:nowrap;text-align:center;"> - - {#cat_up} - - - {#cat_last} - - - <{#td} class="{#class}" - style="width:1px;white-space:nowrap;text-align:center;"> - - {#cat_down} - - - {#cat_first} - - - <{#td} class="{#class}" style="width:1px;text-align:center;"> -
{#nb_picture}
- - <{#td} class="{#class}" - style="width:10%;white-space:nowrap;text-align:center;"> - {#cat_edit} - - <{#td} class="{#class}" - style="width:10%;white-space:nowrap;text-align:center;"> - - {#cat_image_info} - - - {#cat_image_info} - - - <{#td} class="{#class}" - style="width:10%;white-space:nowrap;text-align:center;"> - - {#cat_permission} - - - {#cat_permission} - - - <{#td} class="{#class}" - style="width:10%;white-space:nowrap;text-align:center;"> - - {#cat_update} - - - {#cat_update} - - - <{#td} class="{#class}" - style="width:10%;white-space:nowrap;text-align:center;"> - - {#delete} - - - {#delete} - - - - -
\ No newline at end of file diff --git a/template/default/admin/configuration.tpl b/template/default/admin/configuration.tpl index 845c87435..76d09519a 100644 --- a/template/default/admin/configuration.tpl +++ b/template/default/admin/configuration.tpl @@ -11,197 +11,170 @@
{L_CONFIRM}
- +
- + - + - - - + + - - - + + - - - + + - - + - - - + - - - + - - + - + - + - - + - - - + - - - - + + - - + - - + - + - + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - + - - - + - - + - + - + - - + - - - - + + - - - + + - - - + + - - - + + - - - + + - + - + - + - - + - - - - + + - - - + + - + @@ -216,7 +189,7 @@ - + @@ -225,7 +198,7 @@ - diff --git a/template/default/admin/help.tpl b/template/default/admin/help.tpl index f603fe5e5..c890e1fea 100644 --- a/template/default/admin/help.tpl +++ b/template/default/admin/help.tpl @@ -12,7 +12,7 @@
{cat.illustration.CAPTION} -
    +
    • {cat.item.CONTENT}
      • diff --git a/template/default/admin/images/icon_folder.gif b/template/default/admin/images/icon_folder.gif new file mode 100644 index 000000000..9b2bc47c6 Binary files /dev/null and b/template/default/admin/images/icon_folder.gif differ diff --git a/template/default/admin/images/icon_folder_link.gif b/template/default/admin/images/icon_folder_link.gif new file mode 100644 index 000000000..d5e86d47d Binary files /dev/null and b/template/default/admin/images/icon_folder_link.gif differ diff --git a/template/default/admin/images/icon_folder_lock.gif b/template/default/admin/images/icon_folder_lock.gif new file mode 100644 index 000000000..436f3d21c Binary files /dev/null and b/template/default/admin/images/icon_folder_lock.gif differ diff --git a/template/default/admin/images/icon_subfolder.gif b/template/default/admin/images/icon_subfolder.gif new file mode 100644 index 000000000..9179303e7 Binary files /dev/null and b/template/default/admin/images/icon_subfolder.gif differ diff --git a/template/default/category.tpl b/template/default/category.tpl index deb4e2229..449ac30e4 100644 --- a/template/default/category.tpl +++ b/template/default/category.tpl @@ -102,7 +102,7 @@
      {cat_infos.comment.COMMENTS}
      - {L_NB_IMG} "{cat_infos.CAT_NAME}" : {cat_infos.NB_IMG_CAT} + {L_NB_IMG} "{TITLE}" : {cat_infos.NB_IMG_CAT}
      diff --git a/template/default/comments.tpl b/template/default/comments.tpl index 71f3a4c62..d74963d9f 100644 --- a/template/default/comments.tpl +++ b/template/default/comments.tpl @@ -49,7 +49,9 @@
{L_CONF_GENERAL}{L_CONF_GENERAL}
  
{L_ADMIN_NAME}{L_ADMIN_NAME_INFO}{L_ADMIN_NAME}  :
{L_ADMIN_NAME_INFO}
{L_ADMIN_MAIL}{L_ADMIN_MAIL_INFO}{L_ADMIN_MAIL} :
{L_ADMIN_MAIL_INFO}
{L_THUMBNAIL_PREFIX}{L_THUMBNAIL_PREFIX_INFO}{L_THUMBNAIL_PREFIX} :
{L_THUMBNAIL_PREFIX_INFO}
{L_ACCESS}{L_ACCESS_FREE}   + {L_ACCESS} :
{L_ACCESS_INFO}		{L_ACCESS_FREE}   {L_ACCESS_RESTRICTED}{L_ACCESS_INFO}
{L_HISTORY}{L_YES}   + {L_CONF_HISTORY} :
{L_CONF_HISTORY_INFO}		{L_YES}   {L_NO}{L_HISTORY_INFO}
{L_MAIL_NOTIFICATION}{L_YES}   + {L_MAIL_NOTIFICATION} :
{L_MAIL_NOTIFICATION_INFO}		{L_YES}   {L_NO}{L_MAIL_NOTIFICATION_INFO}
  
{L_CONF_COMMENTS}{L_CONF_COMMENTS}
  
{L_SHOW_COMMENTS}{L_YES}   + {L_SHOW_COMMENTS} :
{L_SHOW_COMMENTS_INFO}		{L_YES}   {L_NO}{L_SHOW_COMMENTS_INFO}
{L_COMMENTS_ALL}{L_YES}   + {L_COMMENTS_ALL} :
{L_NB_COMMENTS_PAGE_INFO}		{L_YES}   {L_NO}{L_COMMENTS_ALL_INFO}
{L_NB_COMMENTS_PAGE}{L_NB_COMMENTS_PAGE_INFO}{L_NB_COMMENTS_PAGE} :
{L_NB_COMMENTS_PAGE_INFO}
{L_VALIDATE_COMMENTS}{L_YES}   + {L_VALIDATE_COMMENTS} :
{L_VALIDATE_COMMENTS_INFO}		{L_YES}   {L_NO}{L_VALIDATE_COMMENTS_INFO}
  
{L_ABILITIES_SETTINGS}{L_ABILITIES_SETTINGS}
  
{L_LANG_SELECT}{LANG_SELECT}{L_LANG_SELECT_INFO}{L_LANG_SELECT} :
{L_LANG_SELECT_INFO}		{LANG_SELECT}
{L_NB_IMAGE_LINE}{L_NB_IMAGE_LINE_INFO}{L_NB_IMAGE_LINE} :
{L_NB_IMAGE_LINE_INFO}
{L_NB_ROW_PAGE}{L_NB_ROW_PAGE_INFO}{L_NB_ROW_PAGE} :
{L_NB_ROW_PAGE_INFO}
{L_STYLE_SELECT}{STYLE_SELECT}{L_STYLE_SELECT_INFO}{L_STYLE_SELECT} :
{L_STYLE_SELECT_INFO}		{STYLE_SELECT}
{L_SHORT_PERIOD}{L_SHORT_PERIOD_INFO}{L_SHORT_PERIOD} :
{L_SHORT_PERIOD_INFO}
{L_LONG_PERIOD}{L_LONG_PERIOD_INFO}{L_LONG_PERIOD} :
{L_LONG_PERIOD_INFO}
{L_EXPAND_TREE}{L_YES}   + {L_EXPAND_TREE} :
{L_EXPAND_TREE_INFO}		{L_YES}   {L_NO}{L_EXPAND_TREE_INFO}
{L_NB_COMMENTS}{L_YES}   + {L_NB_COMMENTS} :
{L_NB_COMMENTS_INFO}		{L_YES}   {L_NO}{L_NB_COMMENTS_INFO}
  
{L_CONF_UPLOAD}{L_CONF_UPLOAD}
  
{L_UPLOAD}{L_YES}   + {L_AUTH_UPLOAD} :
{L_AUTH_UPLOAD_INFO}		{L_YES}   {L_NO}{L_UPLOAD_INFO}
{L_UPLOAD_MAXSIZE}{L_UPLOAD_MAXSIZE_INFO}{L_UPLOAD_MAXSIZE} :
{L_UPLOAD_MAXSIZE_INFO}
{L_UPLOAD_MAXWIDTH}{L_UPLOAD_MAXWIDTH_INFO}{L_UPLOAD_MAXWIDTH} :
{L_UPLOAD_MAXWIDTH_INFO}
{L_UPLOAD_MAXHEIGHT}{L_UPLOAD_MAXHEIGHT_INFO}{L_UPLOAD_MAXHEIGHT} :
{L_UPLOAD_MAXHEIGHT_INFO}
{L_TN_UPLOAD_MAXWIDTH}{L_TN_UPLOAD_MAXWIDTH_INFO}{L_TN_UPLOAD_MAXWIDTH} :
{L_TN_UPLOAD_MAXWIDTH_INFO}
{L_TN_UPLOAD_MAXHEIGHT}{L_TN_UPLOAD_MAXHEIGHT_INFO}{L_TN_UPLOAD_MAXHEIGHT} :
{L_TN_UPLOAD_MAXHEIGHT_INFO}
  
{L_CONF_SESSION}{L_CONF_SESSION}
  
{L_COOKIE}{L_YES}   + {L_COOKIE} :
{L_COOKIE_INFO}		{L_YES}   {L_NO}{L_COOKIE_INFO}
{L_SESSION_LENGTH}{L_SESSION_LENGTH_INFO}{L_SESSION_LENGTH} :
{L_SESSION_LENGTH_INFO}
{L_SESSION_ID_SIZE}{L_SESSION_ID_SIZE_INFO}{L_SESSION_ID_SIZE} :
{L_SESSION_ID_SIZE_INFO}
{#remote_site}{#remote_site}
 
{#url} {#conf_remote_site_delete_info}{#conf_remote_site_delete_INFO}
+
+
+
\ No newline at end of file diff --git a/template/default/default.css b/template/default/default.css index 148f36d0f..704add92a 100644 --- a/template/default/default.css +++ b/template/default/default.css @@ -1,25 +1,36 @@ -/* Main styles */ +/* MAIN STYLES */ body { font-family: Verdana, Geneva, Arial, sans-serif; - font-size:10px; + font-size:12px; background-color:#000000; color:#E0E0E0; margin:5px; } -a { - text-decoration:none; - color:#FFFFFF; +h1 { + font: bold 18pt 'Trebuchet MS', Verdana, sans-serif; + text-decoration:none; + line-height: 120%; } -a:hover { - text-decoration:underline; - color:#FFF48E; +h2 { + font: bold 12pt Arial, Helvetica, sans-serif; + text-decoration:none; + line-height: 120%; } -a.none:hover { - text-decoration:none; -} +.small{ font-size:80%;} + +/* ANCHORS */ + +a { text-decoration:none; color:#FFFFFF;} +a:hover { text-decoration:underline; color:#FFF48E;} +a.none:hover { text-decoration:none;} +a.image:hover { text-decoration:none;} +a.thumbLink:hover { text-decoration:none;} +/*a.adminMenu:hover{ color : #C6B78E; } +a.adminMenu{ color : #FFF48E; }*/ + /* Navigation styles */ .titreMenu,.titrePage @@ -79,10 +90,6 @@ ul.menu { margin : 10px 4px 10px 4px; } -a.image:hover { - text-decoration:none; -} - .commentImage { text-align:justify; font-style:italic; @@ -144,7 +151,6 @@ a.image:hover { .throw { color:#FFFFCC; background-color:#3F3F3F; - width:100%; text-align:center; font-weight:bold; border-top: 1px solid #000000; @@ -177,10 +183,6 @@ table.thumbnail { margin: 2px; } -a.thumbLink:hover { - text-decoration:none; -} - /* Comment styles */ .commentTitle { font-family: Arial, Helvetica, sans-serif; @@ -203,6 +205,11 @@ a.thumbLink:hover { } /* Form styles */ +form{ + text-align:left; + padding:10px; +} + .bouton { background-image: url(theme/button_bg.gif); border: 1px solid #404750; @@ -215,12 +222,16 @@ a.thumbLink:hover { } input,select { + text-indent:2px; background-color:#505050; border: 1px solid #797979; padding: 0; color:#FFFFCC; } +.radio{ + border:0; +} /* Admin styles */ .adminMenu { @@ -232,14 +243,6 @@ div.adminMenu{ margin:10px 50px 10px 50px; } -a.adminMenu:hover{ - color : #C6B78E; -} - -a.adminMenu{ - color : #FFF48E; -} - .admin { font-weight:bold; background-color:#444444; diff --git a/template/default/htmlfunctions.inc.php b/template/default/htmlfunctions.inc.php deleted file mode 100644 index 6031d1e45..000000000 --- a/template/default/htmlfunctions.inc.php +++ /dev/null @@ -1,195 +0,0 @@ - | -// | 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. | -// +-----------------------------------------------------------------------+ - -function get_icon( $date_comparaison ) -{ - 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; -} - -function create_navigation_bar( $url, $nb_element, $start, - $nb_element_page, $link_class ) -{ - global $lang; - $navigation_bar = ""; - // 0. détection de la page en cours - if( !isset( $start ) - || !is_numeric( $start ) - || ( is_numeric( $start ) && $start < 0 ) ) - { - $start = 0; - } - // on n'affiche la bare de navigation que si on plus de 1 page - if ( $nb_element > $nb_element_page ) - { - // 1.une page précédente ? - if ( $start != 0 ) - { - $previous = $start - $nb_element_page; - $navigation_bar.= ''.$lang['previous_page']; - $navigation_bar.= ''; - $navigation_bar.= ' | '; - } - // 2.liste des numéros de page - $maximum = ceil ( $nb_element / $nb_element_page ); - for ( $i = 1; $i <= $maximum; $i++ ) - { - $temp_start = ( $i - 1 ) * $nb_element_page; - if ( $temp_start == $start ) - { - $navigation_bar.= ' '.$i.' '; - } - else - { - $navigation_bar.= ' '.$i.' '; - } - } - // 3.une page suivante ? - if ( $nb_element > $nb_element_page - && $start + $nb_element_page < $nb_element ) - { - $next = $start + $nb_element_page; - $navigation_bar.= ' | '.$lang['next_page'].''; - } - } - return $navigation_bar; -} - - - -function make_jumpbox($value, $selected, $usekeys=false) -{ - $boxstring = ''; - $nb = sizeof( $value); - $keys = ($usekeys?array_keys($value):$value); - $value = ($usekeys?array_values($value):$value); - for ( $i = 0; $i < $nb; $i++ ) - { - $boxstring .= ''; - } - $lang_select .= ''; - - return $lang_select; -} - -// -// Pick a template/theme combo, -// -function style_select($default_style, $select_name = "style") -{ - $dir = opendir(PHPWG_ROOT_PATH . 'template'); - $style_select = '