diff options
author | gweltas <gweltas@piwigo.org> | 2004-01-18 02:13:02 +0000 |
---|---|---|
committer | gweltas <gweltas@piwigo.org> | 2004-01-18 02:13:02 +0000 |
commit | 00ac0f8d3e45c4fa8b25c646c2b162742038849a (patch) | |
tree | 94a3447e7ef57e2a37c667248be79e48066435e1 /template | |
parent | 64e1ebb49cfa1f329bedbe62841c995f335810d3 (diff) |
Conformity with the XHTML 1.0 transitional standard
Creation of the following files :
- template/default/header.php and template/default/footer.php to ensure a common standard
- default.css to be CSS valid
Obsolescence of the following files :
- template/default/theme/conf.php
- template/default/style.inc.php
Custom galleries should reflect those changes.
git-svn-id: http://piwigo.org/svn/branches/release-1_3@290 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'template')
-rw-r--r-- | template/default/about.vtp | 13 | ||||
-rw-r--r-- | template/default/category.vtp | 26 | ||||
-rw-r--r-- | template/default/comments.vtp | 54 | ||||
-rw-r--r-- | template/default/default.css | 164 | ||||
-rw-r--r-- | template/default/footer.vtp | 8 | ||||
-rw-r--r-- | template/default/header.vtp | 13 | ||||
-rw-r--r-- | template/default/htmlfunctions.inc.php | 16 | ||||
-rw-r--r-- | template/default/identification.vtp | 13 | ||||
-rw-r--r-- | template/default/picture.vtp | 58 | ||||
-rw-r--r-- | template/default/profile.vtp | 13 | ||||
-rw-r--r-- | template/default/register.vtp | 13 | ||||
-rw-r--r-- | template/default/search.vtp | 13 | ||||
-rw-r--r-- | template/default/style.inc.php | 147 | ||||
-rw-r--r-- | template/default/theme/conf.php | 23 | ||||
-rw-r--r-- | template/default/upload.vtp | 13 |
15 files changed, 207 insertions, 380 deletions
diff --git a/template/default/about.vtp b/template/default/about.vtp index 7a0802fef..5b416d1b8 100644 --- a/template/default/about.vtp +++ b/template/default/about.vtp @@ -1,11 +1,3 @@ -<html> - <head> - {#style} - <title>{#about_page_title}</title> - <meta http-equiv="Content-Type" content="text/html; charset={#charset}" /> - </head> - <body> - {#header} <table style="width:100%;height:100%"> <tr align="center" valign="middle"> <td> @@ -26,7 +18,4 @@ </div> </td> </tr> - </table> - {#footer} - </body> -</html>
\ No newline at end of file + </table>
\ No newline at end of file diff --git a/template/default/category.vtp b/template/default/category.vtp index ed4cc67a9..64d0d6005 100644 --- a/template/default/category.vtp +++ b/template/default/category.vtp @@ -1,11 +1,3 @@ -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset={#charset}" /> - {#style} - <title>{#title}</title> - </head> - <body> - {#header} <table style="width:100%;"> <tr> <td valign="top" style="width:1%;padding:10px;"> @@ -16,11 +8,11 @@ <!--/VTP_category--> <div class="totalImages">[ {#nb_total_pictures} {#total} ]</div> <!--VTP_favorites--> - <br /> <img src="{#lien_collapsed}" al=">" /> <a href="{#url}"><span title="{#favorite_cat_hint}" style="font-weight:bold;">{#favorite_cat}</span></a> <span class="menuInfoCat">[ {#nb_favorites} ]</span> + <br /> <img src="{#lien_collapsed}" alt=">" /> <a href="{#url}"><span title="{#favorite_cat_hint}" style="font-weight:bold;">{#favorite_cat}</span></a> <span class="menuInfoCat">[ {#nb_favorites} ]</span> <!--/VTP_favorites--> - <br /> <img src="{#lien_collapsed}" al=">" /> <span style="font-weight:bold;">{#stats}</span></a> - <br /> <img src="{#lien_collapsed}" al=">" /> <a href="{#most_visited_url}"><span title="{#most_visited_cat_hint}" style="font-weight:bold;">{#top_number} {#most_visited_cat}</span></a> - <br /> <img src="{#lien_collapsed}" al=">" /> <a href="{#recent_url}"><span title="{#recent_cat_hint}" style="font-weight:bold;">{#recent_cat}</span></a> {#icon_short} + <br /> <img src="{#lien_collapsed}" alt=">" /> <span style="font-weight:bold;">{#stats}</span> + <br /> <img src="{#lien_collapsed}" alt=">" /> <a href="{#most_visited_url}"><span title="{#most_visited_cat_hint}" style="font-weight:bold;">{#top_number} {#most_visited_cat}</span></a> + <br /> <img src="{#lien_collapsed}" alt=">" /> <a href="{#recent_url}"><span title="{#recent_cat_hint}" style="font-weight:bold;">{#recent_cat}</span></a> {#icon_short} </div> {#frame_end} <div style="margin-bottom:5px;"> </div> @@ -101,12 +93,4 @@ </table> </td> </tr> - </table> - <div class="copyright">{#generation_time} {#time}</div> - <!-- Please, do not remove this copyright. If you really want to, - contact me pierrick@z0rglub.com to find a solution on how - to show the origin of the script...--> - <div class="copyright">Powered by <a href="{#site_url}" class="back">PhpWebGallery</a> {#version}</div> - {#footer} - </body> -</html>
\ No newline at end of file + </table>
\ No newline at end of file diff --git a/template/default/comments.vtp b/template/default/comments.vtp index 133f9578c..f7fad81f8 100644 --- a/template/default/comments.vtp +++ b/template/default/comments.vtp @@ -1,52 +1,3 @@ -<html> - <head> - {#style} - <title>{#title_comments}</title> - <meta http-equiv="Content-Type" content="text/html; {#charset}"> - <!-- Specific style to comments.php--> - <style type="text/css"> - .commentsAuthor,.commentsTitle,.commentsInfos,.commentsContent,.commentsNavigationBar { - color:{#text_color}; - font-family:arial,sans-Serif; - font-size:12px; - } - .commentsTitle,.commentsAuthor { - text-align:center; - font-weight:bold; - } - .commentsInfos { - margin:3px 3px 3px 10px; - font-size:11px; - text-align:right; - } - .commentsContent { - margin:10px; - } - .commentsTitle { - margin-top:15px; - } - .commentsAuthor { - margin:5px; - } - .commentsNavigationBar { - margin:10px; - } - .tableComment { - width:100%; - border:2px solid {#text_color}; - margin:10px; - } - .cellAuthor { - border-right:1px solid {#text_color}; - width:100px; - } - .cellInfo { - border-bottom:1px solid {#text_color}; - } - </style> - </head> - <body> - {#header} <table style="width:100%;"> <tr align="center" valign="middle"> <td> @@ -113,7 +64,4 @@ {#frame_end} </td> </tr> - </table> - {#footer} - </body> -</html>
\ No newline at end of file + </table>
\ No newline at end of file diff --git a/template/default/default.css b/template/default/default.css new file mode 100644 index 000000000..15e44e56d --- /dev/null +++ b/template/default/default.css @@ -0,0 +1,164 @@ +a { +text-decoration:none; +} + +a:hover { +text-decoration:underline; +} + +a.back { +color: #FFFFFF; +} + +body { +font-family:arial,sans-serif; +font-size:12px; +background-color:#444444; +color: #FFFFFF; +margin:5px; +} + +table,input { +font-family:arial,sans-serif; +font-size:12px; +} + +.imgLink { +border:1px solid #FFFFFF; +} + +.titrePage,.titreMenu,.menu,.info, a { +color:#FFFFFF; +} +.titreMenu,.menu,.info { +margin-bottom:5px; +white-space:nowrap; +} +.menu,.titrePage,.info { +margin-left:2px; +margin-right:2px; +} +.menuInfoCat { +font-family:sans-serif; +font-size:11px; +} +.totalImages { +text-align:center; +margin-top:5px; +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; +} +.comments { +text-align:justify; +font-style:italic; +} +.navigationBar { +text-align:center; +} +.infoCat { +text-align:left; +} +.thumbnail { +font-size:11px; +text-align:center; +} +.copyright { +font-size:11px; +text-align:center; +font-family:sans-serif; +letter-spacing:0.3mm; +} +.commentImage { +font-weight:bold; +text-align:center; +font-size:17px; +} +.bouton { +background:#EEEEEE; +} +input { +border-width:1; +border-color:#000000; +background:#ffffff; +color: #000000; +} +table { +border-collapse:collapse; +} +table.thumbnail { +border-collapse:separate; +} +td { +font-family:sans-serif; +padding:0; +} +.errors { +text-align:left; +margin-top:5px; +margin-bottom:5px; +background-color:red; +font-weight:bold; +border:1px solid black; +color:white; +} +div.information { +text-align:center; +border:2px solid #FFFFFF; +margin:10px;padding:5px; +} + +.commentsAuthor,.commentsTitle,.commentsInfos,.commentsContent,.commentsNavigationBar { + color:#FFFFFF; + font-family:arial,sans-Serif; + font-size:12px; + } + .commentsTitle,.commentsAuthor { + text-align:center; + font-weight:bold; + } + .commentsInfos { + margin:3px 3px 3px 10px; + font-size:11px; + text-align:right; + } + .commentsContent { + margin:10px; + } + .commentsTitle { + margin-top:15px; + } + .commentsAuthor { + margin:5px; + } + .commentsNavigationBar { + margin:10px; + } + .tableComment { + width:100%; + border:2px solid #FFFFFF; + margin:10px; + } + .cellAuthor { + border-right:1px solid #FFFFFF; + width:100px; + } + .cellInfo { + border-bottom:1px solid #FFFFFF; + }
\ No newline at end of file diff --git a/template/default/footer.vtp b/template/default/footer.vtp new file mode 100644 index 000000000..1cf62a5d5 --- /dev/null +++ b/template/default/footer.vtp @@ -0,0 +1,8 @@ + <div class="copyright">{#generation_time} {#time}</div> + <!-- Please, do not remove this copyright. If you really want to, + contact me pierrick@z0rglub.com to find a solution on how + to show the origin of the script...--> + <div class="copyright">Powered by <a href="{#site_url}" class="back">PhpWebGallery</a> {#version}</div> + {#footer} + </body> +</html>
\ No newline at end of file diff --git a/template/default/header.vtp b/template/default/header.vtp new file mode 100644 index 000000000..e97197576 --- /dev/null +++ b/template/default/header.vtp @@ -0,0 +1,13 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset={#charset}" /> +<meta http-equiv="Content-Style-Type" content="text/css" /> +<!--VTP_refresh--> +<meta http-equiv="refresh" content="{#time};url={#url}"> +<!--/VTP_refresh--> +<title>{#title}</title> +<link rel="stylesheet" href="{#style}" type="text/css" /> +</head> +<body> +{#header} diff --git a/template/default/htmlfunctions.inc.php b/template/default/htmlfunctions.inc.php index c3b2872b7..ad52bfc13 100644 --- a/template/default/htmlfunctions.inc.php +++ b/template/default/htmlfunctions.inc.php @@ -17,10 +17,10 @@ * * ***************************************************************************/ -include( PREFIX_INCLUDE.'./template/'.$user['template'].'/theme/conf.php' ); +//include( PREFIX_INCLUDE.'./template/'.$user['template'].'/theme/conf.php' ); $user['lien_expanded']='./template/'.$user['template'].'/theme/expanded.gif'; $user['lien_collapsed']='./template/'.$user['template'].'/theme/collapsed.gif'; -include_once( PREFIX_INCLUDE.'./template/'.$user['template'].'/style.inc.php'); +//include_once( PREFIX_INCLUDE.'./template/'.$user['template'].'/style.inc.php'); function get_icon( $date_comparaison ) { @@ -160,15 +160,15 @@ function initialize_template() { global $vtp, $handle, $user, $lang; - $vtp->setGlobalVar( $handle, 'charset', $lang['charset'] ); - $vtp->setGlobalVar( $handle, 'style', $user['style'] ); + // $vtp->setGlobalVar( $handle, 'charset', $lang['charset'] ); + //$vtp->setGlobalVar( $handle, 'style', $user['style'] ); $vtp->setGlobalVar( $handle, 'frame_start', get_frame_start() ); $vtp->setGlobalVar( $handle, 'frame_begin', get_frame_begin() ); $vtp->setGlobalVar( $handle, 'frame_end', get_frame_end() ); - $vtp->setVarF( $handle, 'header', - './template/'.$user['template'].'/header.htm' ); - $vtp->setVarF( $handle, 'footer', - './template/'.$user['template'].'/footer.htm' ); + //$vtp->setVarF( $handle, 'header', + // './template/'.$user['template'].'/header.htm' ); + //$vtp->setVarF( $handle, 'footer', + // './template/'.$user['template'].'/footer.htm' ); } function display_category( $category, $indent, $handle ) diff --git a/template/default/identification.vtp b/template/default/identification.vtp index 6240d0f99..132776ad6 100644 --- a/template/default/identification.vtp +++ b/template/default/identification.vtp @@ -1,11 +1,3 @@ -<html> - <head> - {#style} - <title>{#ident_page_title}</title> - <meta http-equiv="Content-Type" content="text/html; charset={#charset}" /> - </head> - <body> - {#header} <table style="width:100%;height:100%"> <tr align="center" valign="middle"> <td> @@ -72,7 +64,4 @@ {#frame_end} </td> </tr> - </table> - {#footer} - </body> -</html>
\ No newline at end of file + </table>
\ No newline at end of file diff --git a/template/default/picture.vtp b/template/default/picture.vtp index 6af7f54c6..2fddd393a 100644 --- a/template/default/picture.vtp +++ b/template/default/picture.vtp @@ -1,54 +1,3 @@ -<html> - <head> - <!--VTP_refresh--> - <meta http-equiv="refresh" content="{#time};url={#url}"> - <!--/VTP_refresh--> - <meta http-equiv="Content-Type" content="text/html;charset={#charset}"> - {#style} - <!-- Specific style to picture.php--> - <style type="text/css"> - .commentsAuthor,.commentsTitle,.commentsInfos,.commentsContent,.commentsNavigationBar { - color:{#text_color}; - font-family:arial,sans-Serif; - font-size:12px; - } - .commentsTitle,.commentsAuthor { - text-align:center; - font-weight:bold; - } - .commentsInfos { - margin:3px 3px 3px 10px; - font-size:11px; - } - .commentsContent { - margin:10px; - } - .commentsTitle { - margin-top:15px; - } - .commentsAuthor { - margin:5px; - } - .commentsNavigationBar { - margin:10px; - } - .tableComment { - width:90%; - border:2px solid {#text_color}; - margin:10px; - } - .cellAuthor { - border-right:1px solid {#text_color}; - width:100px; - } - .cellInfo { - border-bottom:1px solid {#text_color}; - } - </style> - <title>{#page_title}</title> - </head> - <body> - {#header} <!--VTP_information--> <div class="information">{#content}</div> <!--/VTP_information--> @@ -85,7 +34,7 @@ <div style="margin-bottom:5px"> </div> {#frame_start}1%{#frame_begin} <a href="{#picture_link}"> - <img style="margin:10px;width:{#picture_width}px;height:{#picture_height}px;border:1px solid {#picture_border_color}" src="{#picture_src}" alt="{#picture_alt}"/> + <img class="imgLink" style="margin:10px;width:{#picture_width}px;height:{#picture_height}px;border:1px solid" src="{#picture_src}" alt="{#picture_alt}"/> </a> <div class="commentImage">{#picture_comment}</div> <table style="width:100%;"> @@ -184,7 +133,4 @@ </td> </tr> <!--/VTP_comments--> - </table> - {#footer} - </body> -</html>
\ No newline at end of file + </table>
\ No newline at end of file diff --git a/template/default/profile.vtp b/template/default/profile.vtp index 3aef1460a..e53394e97 100644 --- a/template/default/profile.vtp +++ b/template/default/profile.vtp @@ -1,11 +1,3 @@ -<html> - <head> - {#style} - <title>{#customize_page_title}</title> - <meta http-equiv="Content-Type" content="text/html; {#charset}"> - </head> - <body> - {#header} <table style="width:100%;height:100%"> <tr align="center" valign="middle"> <td> @@ -96,7 +88,4 @@ {#frame_end} </td> </tr> - </table> - {#footer} - </body> -</html>
\ No newline at end of file + </table>
\ No newline at end of file diff --git a/template/default/register.vtp b/template/default/register.vtp index f7104641c..f4d97c52f 100644 --- a/template/default/register.vtp +++ b/template/default/register.vtp @@ -1,11 +1,3 @@ -<html> - <head> - {#style} - <title>{#register_page_title}</title> - <meta http-equiv="Content-Type" content="text/html; charset={#charset}"> - </head> - <body> - {#header} <table style="width:100%;height:100%"> <tr align="center" valign="middle"> <td> @@ -68,7 +60,4 @@ {#frame_end} </td> </tr> - </table> - {#footer} - </body> -</html>
\ No newline at end of file + </table>
\ No newline at end of file diff --git a/template/default/search.vtp b/template/default/search.vtp index 5b6f094ea..bc6b92995 100644 --- a/template/default/search.vtp +++ b/template/default/search.vtp @@ -1,11 +1,3 @@ -<html> - <head> - {#style} - <title>{#search_title}</title> - <meta http-equiv="Content-Type" content="text/html; charset={#charset}"> - </head> - <body> - {#header} <table style="width:100%;height:100%"> <tr align="center" valign="middle"> <td> @@ -78,7 +70,4 @@ {#frame_end} </td> </tr> - </table> - {#footer} - </body> -</html>
\ No newline at end of file + </table>
\ No newline at end of file diff --git a/template/default/style.inc.php b/template/default/style.inc.php deleted file mode 100644 index ac4fa32d2..000000000 --- a/template/default/style.inc.php +++ /dev/null @@ -1,147 +0,0 @@ -<?php -/*************************************************************************** - * style.inc.php * - * ------------------- * - * application : PhpWebGallery 1.3 <http://phpwebgallery.net> * - * author : Pierrick LE GALL <pierrick@z0rglub.com> * - * * - * $Id$ - * * - ***************************************************************************/ - -/*************************************************************************** - * * - * 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; * - * * - ***************************************************************************/ -$user['style'] = '<style type="text/css"> - a { - text-decoration:none; - } - a:hover { - text-decoration:underline; - } - a.back, body { - color:'.$user['couleur_text_fond'].'; - } - body,table,input { - font-family:arial,sans-serif; - font-size:12px; - } - .imgLink { - border:1px solid '.$user['couleur_text_fond'].'; - } - .titrePage,.titreMenu,.menu,.info, a { - color:'.$user['couleur_text'].'; - } - .titreMenu,.menu,.info { - margin-bottom:5px; - white-space:nowrap; - } - .menu,.titrePage,.info { - margin-left:2px; - margin-right:2px; - } - .menuInfoCat { - font-family:sans-serif; - font-size:11px; - } - .totalImages { - text-align:center; - margin-top:5px; - 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; - } - .comments { - text-align:justify; - font-style:italic; - } - .navigationBar { - text-align:center; - } - .infoCat { - text-align:left; - } - .thumbnail { - font-size:11px; - text-align:center; - } - .copyright { - font-size:11px; - text-align:center; - font-family:sans-serif; - letter-spacing:0.3mm; - } - .commentImage { - font-weight:bold; - text-align:center; - font-size:17px; - } - .bouton { - background:#EEEEEE; - } - input { - border-width:1; - border-color:#000000; - background:#ffffff; - color: #000000; - } - body {'; -$image = './theme/'.$user['template'].'/background.gif'; -if ( @is_file( $image ) ) -{ - $user['style'].= ' - background-image:url('.$image.');'; -} -else -{ - $user['style'].= ' - background-color:'.$user['couleur_fond'].';'; -} -$user['style'].= ' - margin:5px; - } - table { - border-collapse:collapse; - } - table.thumbnail { - border-collapse:separate; - } - td { - font-family:sans-serif; - padding:0; - } - .errors { - text-align:left; - margin-top:5px; - margin-bottom:5px; - background-color:red; - font-weight:bold; - border:1px solid black; - color:white; - } - div.information { - text-align:center; - border:2px solid '.$user['couleur_text_fond'].'; - margin:10px;padding:5px; - } - </style>';
\ No newline at end of file diff --git a/template/default/theme/conf.php b/template/default/theme/conf.php deleted file mode 100644 index 0f77103e5..000000000 --- a/template/default/theme/conf.php +++ /dev/null @@ -1,23 +0,0 @@ -<?php -/*************************************************************************** - * conf.php * - * ------------------- * - * application : PhpWebGallery 1.3 <http://phpwebgallery.net> * - * author : Jerome <http://www.ze-labo.com> * - * * - * $Id$ - * * - ***************************************************************************/ - -/*************************************************************************** - * * - * 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; * - * * - ***************************************************************************/ - -$user['couleur_fond'] = '#444444'; -$user['couleur_text_fond'] = 'white'; -$user['couleur_text'] = 'white'; -?>
\ No newline at end of file diff --git a/template/default/upload.vtp b/template/default/upload.vtp index 1ac1c3ccb..3b618442e 100644 --- a/template/default/upload.vtp +++ b/template/default/upload.vtp @@ -1,11 +1,3 @@ -<html> - <head> - {#style} - <title>{#upload_title}</title> - <meta http-equiv="Content-Type" content="text/html; charset={#charset}"> - </head> - <body> - {#header} <table style="width:100%;height:100%"> <tr align="center" valign="middle"> <td> @@ -109,7 +101,4 @@ {#frame_end} </td> </tr> - </table> - {#footer} - </body> -</html>
\ No newline at end of file + </table>
\ No newline at end of file |