aboutsummaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorgweltas <gweltas@piwigo.org>2004-02-02 00:55:18 +0000
committergweltas <gweltas@piwigo.org>2004-02-02 00:55:18 +0000
commitbef4b3e3aa8e3d54cbf8b4962b9b5d4a89b55429 (patch)
tree647b2cf07ee8451a9314e1e8aebd11d9396cb32b /template
parenteea989f019f21fbd7ae4aa8e2f4a1503992c23bf (diff)
Merge of the 1.3.1 release
Creation of an unique include file (common.php) Creation of an unique define file (include/constants.php) Modification of the installation procedure git-svn-id: http://piwigo.org/svn/trunk@345 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'template')
-rw-r--r--template/default/about.vtp13
-rw-r--r--template/default/admin/cat_list.vtp18
-rw-r--r--template/default/admin/cat_modify.vtp7
-rw-r--r--template/default/admin/comments.vtp2
-rw-r--r--template/default/admin/configuration.vtp2
-rw-r--r--template/default/admin/infos_image.vtp19
-rw-r--r--template/default/admin/picture_modify.vtp6
-rw-r--r--template/default/admin/stats.vtp43
-rw-r--r--template/default/category.vtp38
-rw-r--r--template/default/comments.vtp66
-rw-r--r--template/default/default-admin.css93
-rw-r--r--template/default/default.css208
-rw-r--r--template/default/footer.vtp8
-rw-r--r--template/default/header.vtp13
-rw-r--r--template/default/htmlfunctions.inc.php37
-rw-r--r--template/default/identification.vtp13
-rw-r--r--template/default/picture.vtp58
-rw-r--r--template/default/profile.vtp13
-rw-r--r--template/default/register.vtp13
-rw-r--r--template/default/search.vtp13
-rw-r--r--template/default/style.inc.php147
-rw-r--r--template/default/theme/conf.php23
-rw-r--r--template/default/upload.vtp13
23 files changed, 409 insertions, 457 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/admin/cat_list.vtp b/template/default/admin/cat_list.vtp
index 884b6a937..997f3d1f1 100644
--- a/template/default/admin/cat_list.vtp
+++ b/template/default/admin/cat_list.vtp
@@ -8,26 +8,32 @@
</ul>
</div>
<!--/VTP_errors-->
-<table style="width:100%;">
-<tr>
- <td colspan="8" style="text-align:center;padding-top:10px;padding-bottom:10px;">
+<div style="text-align:center;padding-top:10px;padding-bottom:5px;">
<form action="" method="post">
{#cat_add} <input type="text" name="virtual_name" />
{#cat_parent}
+ <!--VTP_associate_LOV-->
<select name="associate">
<!--VTP_associate_cat-->
<option value="{#value}">{#content}</option>
<!--/VTP_associate_cat-->
</select>
+ <!--/VTP_associate_LOV-->
+ <!--VTP_associate_text-->
+ <input type="text" name="associate" />
+ <!--/VTP_associate_text-->
<input type="submit" value="{#submit}" name="submit" />
</form>
- </td>
-</tr>
+</div>
+<table style="width:100%;">
<!--VTP_cat-->
<tr>
<{#td} style="width:50%;text-align:left;">
<a name="{#id}"></a>
- {#indent}<img src="./template/{#user_template}/admin/images/puce.gif" alt="&gt;" />
+ {#indent}
+ <!--VTP_bullet_collapsed--><a href="{#link}"><img src="../template/{#user_template}/admin/images/collapsed.gif" style="border:none;" alt="&gt;" /></a><!--/VTP_bullet_collapsed-->
+ <!--VTP_bullet_expanded--><a href="{#link}"><img src="../template/{#user_template}/admin/images/expanded.gif" style="border:none;" alt="&gt;" /></a><!--/VTP_bullet_expanded-->
+ <!--VTP_bullet_wo_link--><img src="../template/{#user_template}/admin/images/collapsed.gif" style="border:none;" alt="&gt;" /><!--/VTP_bullet_wo_link-->
&nbsp;{#name} [
<!--VTP_storage-->
dir : {#dir}
diff --git a/template/default/admin/cat_modify.vtp b/template/default/admin/cat_modify.vtp
index 6293871a0..5436ff220 100644
--- a/template/default/admin/cat_modify.vtp
+++ b/template/default/admin/cat_modify.vtp
@@ -64,11 +64,16 @@
<tr>
<td>{#cat_parent}</td>
<td class="row2">
+ <!--VTP_associate_LOV-->
<select name="associate">
<!--VTP_associate_cat-->
- <option value="{#value}"{#selected}>{#content}</option>
+ <option value="{#value}">{#content}</option>
<!--/VTP_associate_cat-->
</select>
+ <!--/VTP_associate_LOV-->
+ <!--VTP_associate_text-->
+ <input type="text" name="associate" value="{#value}" />
+ <!--/VTP_associate_text-->
</td>
</tr>
<!--/VTP_parent-->
diff --git a/template/default/admin/comments.vtp b/template/default/admin/comments.vtp
index 05edc4c98..051008156 100644
--- a/template/default/admin/comments.vtp
+++ b/template/default/admin/comments.vtp
@@ -24,7 +24,7 @@
<form action="{#action}" method="post">
<!--/VTP_start_form-->
<!--VTP_picture-->
-<div style="border:2px solid #D3DCE3;margin:2px;">
+<div style="border:2px solid #D3DCE3;margin:3px;">
<table style="width:100%;">
<tr>
<td valign="top" width="1px">
diff --git a/template/default/admin/configuration.vtp b/template/default/admin/configuration.vtp
index 162e530ee..b3ec239ee 100644
--- a/template/default/admin/configuration.vtp
+++ b/template/default/admin/configuration.vtp
@@ -47,7 +47,7 @@
<!--/VTP_param_line-->
<!--VTP_title_line-->
<tr>
- <th colspan="3" align="center">{#title}</th>
+ <th colspan="3">{#title}</th>
</tr>
<!--/VTP_title_line-->
<!--VTP_space_line-->
diff --git a/template/default/admin/infos_image.vtp b/template/default/admin/infos_image.vtp
index dd1f3b8d3..869b2885b 100644
--- a/template/default/admin/infos_image.vtp
+++ b/template/default/admin/infos_image.vtp
@@ -1,3 +1,13 @@
+<!--VTP_errors-->
+<div class="errors">
+ <div class="errors_title">{#errors_title}</div>
+ <ul>
+ <!--VTP_li-->
+ <li>{#content}</li>
+ <!--/VTP_li-->
+ </ul>
+</div>
+<!--/VTP_errors-->
<form method="post" action="{#form_action}">
<table width="100%">
<tr>
@@ -75,13 +85,18 @@
<td colspan="6">
<img src="./template/{#user_template}/admin/images/arrow_select.gif" alt="&lt;" />
{#infoimage_associate}
+ <!--VTP_associate_LOV-->
<select name="associate">
<!--VTP_associate_cat-->
<option value="{#value}">{#content}</option>
<!--/VTP_associate_cat-->
</select>
- </td>
- </tr>
+ <!--/VTP_associate_LOV-->
+ <!--VTP_associate_text-->
+ <input type="text" name="associate" />
+ <!--/VTP_associate_text-->
+ </td>
+ </tr>
<tr>
<td colspan="6" style="text-align:center;">
<input type="submit" value="{#submit}" name="submit" />
diff --git a/template/default/admin/picture_modify.vtp b/template/default/admin/picture_modify.vtp
index 9cf36b4eb..c68021091 100644
--- a/template/default/admin/picture_modify.vtp
+++ b/template/default/admin/picture_modify.vtp
@@ -76,11 +76,17 @@
<tr><td colspan="2">&nbsp;</td></tr>
<tr>
<td>{#infoimage_associate}
+ <!--VTP_associate_LOV-->
<select name="associate">
<!--VTP_associate_cat-->
<option value="{#value}">{#content}</option>
<!--/VTP_associate_cat-->
</select>
+ <!--/VTP_associate_LOV-->
+ <!--VTP_associate_text-->
+ <input type="text" name="associate" />
+ <!--/VTP_associate_text-->
+ </select>
</td>
</tr>
</table>
diff --git a/template/default/admin/stats.vtp b/template/default/admin/stats.vtp
index 9967fdd33..e66c1ba18 100644
--- a/template/default/admin/stats.vtp
+++ b/template/default/admin/stats.vtp
@@ -1,46 +1,3 @@
-<style>
- .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 {
- text-align:right;
- margin:3px 3px 3px 10px;
- font-size:11px;
- }
- .commentsContent {
- margin:10px;
- }
- .commentsTitle {
- margin-top:15px;
- }
- .commentsAuthor {
- margin:5px;
- }
- .commentsNavigationBar {
- margin:10px;
- }
- .tableComment {
- width:100%;
- border:2px solid #006699;
- margin:10px;
- }
- .cellAuthor {
- border-right:1px solid #006699;
- width:100px;
- }
- .cellInfo {
- border-bottom:1px solid #006699;
- }
- .imgLink {
- border:1px solid black;
- }
-</style>
<div style="text-align:center;margin-top:5px;">
<!--VTP_last_day_option-->
<a href="{#link}" style="{#style}">{#option}</a>{#separation}
diff --git a/template/default/category.vtp b/template/default/category.vtp
index 29bff309a..bab094d54 100644
--- a/template/default/category.vtp
+++ b/template/default/category.vtp
@@ -1,26 +1,20 @@
-<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;">
{#frame_start}100%{#frame_begin}
- <div class="titreMenu">{#categories}</div>
+ <div class="titreMenu">
+ <a href="{#home_url}">{#categories}</a>
+ </div>
<div class="menu">
<!--VTP_category-->{#indent}<!--VTP_bullet_w_link--><a href="{#bullet_link}"><img src="{#bullet_url}" style="border:none;" alt="&gt;" /></a><!--/VTP_bullet_w_link--><!--VTP_bullet_wo_link--><img src="{#bullet_url}" style="border:none;" alt="&gt;" /><!--/VTP_bullet_wo_link-->&nbsp;<a href="{#link_url}"><span title="{#hint_category}" style="{#name_style}">{#link_name}</span>&nbsp;<span class="menuInfoCat">[&nbsp;<!--VTP_subcat--><span title="{#nb_subcats} {#sub-cat}">{#nb_subcats}</span>&nbsp;-&nbsp;<!--/VTP_subcat--><span title="{#total_cat} {#images_available}">{#total_cat}</span>&nbsp;]</span></a>{#cat_icon}<br />
<!--/VTP_category-->
<div class="totalImages">[&nbsp;{#nb_total_pictures}&nbsp;{#total}&nbsp;]</div>
<!--VTP_favorites-->
- <br />&nbsp;<img src="{#lien_collapsed}" al="&gt;" />&nbsp;<a href="{#url}"><span title="{#favorite_cat_hint}" style="font-weight:bold;">{#favorite_cat}</span></a>&nbsp;<span class="menuInfoCat">[&nbsp;{#nb_favorites}&nbsp;]</span>
+ <br />&nbsp;<img src="{#lien_collapsed}" alt="&gt;" />&nbsp;<a href="{#url}"><span title="{#favorite_cat_hint}" style="font-weight:bold;">{#favorite_cat}</span></a>&nbsp;<span class="menuInfoCat">[&nbsp;{#nb_favorites}&nbsp;]</span>
<!--/VTP_favorites-->
- <br />&nbsp;<img src="{#lien_collapsed}" al="&gt;" />&nbsp;<span style="font-weight:bold;">{#stats}</span></a>
- <br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="{#lien_collapsed}" al="&gt;" />&nbsp;<a href="{#most_visited_url}"><span title="{#most_visited_cat_hint}" style="font-weight:bold;">{#top_number}&nbsp;{#most_visited_cat}</span></a>
- <br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="{#lien_collapsed}" al="&gt;" />&nbsp;<a href="{#recent_url}"><span title="{#recent_cat_hint}" style="font-weight:bold;">{#recent_cat}</span></a> {#icon_short}
+ <br />&nbsp;<img src="{#lien_collapsed}" alt="&gt;" />&nbsp;<span style="font-weight:bold;">{#stats}</span>
+ <br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="{#lien_collapsed}" alt="&gt;" />&nbsp;<a href="{#most_visited_url}"><span title="{#most_visited_cat_hint}" style="font-weight:bold;">{#top_number}&nbsp;{#most_visited_cat}</span></a>
+ <br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="{#lien_collapsed}" alt="&gt;" />&nbsp;<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;">&nbsp;</div>
@@ -31,7 +25,7 @@
&nbsp;<img src="{#lien_collapsed}" alt="&gt;"/>&nbsp;<a href="{#url}" title="{#title}">{#name}</a><br />
<!--/VTP_summary-->
<!--VTP_upload-->
- <br />&nbsp;<img src="{#lien_collapsed}" alt="&gt;"/>&nbsp;<a href="{#url}" class="back">{#upload_picture}</a>
+ <br />&nbsp;<img src="{#lien_collapsed}" alt="&gt;"/>&nbsp;<a href="{#url}">{#upload_picture}</a>
<!--/VTP_upload-->
</div>
{#frame_end}
@@ -54,9 +48,9 @@
<img src="{#src}"
alt="{#alt}"
title="{#title}"
- class="imgLink"/><br />
- {#name}
- </a>
+ class="imgLink"/></a>
+ <br />
+ <a href="{#url}" class="back">{#name}</a>
{#icon}
<!--VTP_nb_comments-->
<br />{#nb} {#comments}
@@ -101,12 +95,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..1c729ee74 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>
@@ -72,18 +23,15 @@
<div style="border:2px solid gray;margin:2px;padding:2px;">
<table style="width:100%;">
<tr>
- <td valign="top" width="1px">
+ <td valign="top" style="width:15%;">
<!-- the thumbnail of the picture, linked to the full size page -->
<a href="{#thumb_url}" title="{#thumb_title}">
<img src="{#thumb_src}" class="imgLink" alt="{#thumb_alt}"/>
</a>
</td>
- <td style="padding:2px;">
- <div style="font-weight:bold;padding-left:10px;">{#title}</div>
+ <td style="padding:10px;width:85%;">
+ <div style="font-weight:bold;padding-left:10px;text-align:left;">{#title}</div>
<!--VTP_comment-->
- <table style="width:100%;">
- <tr>
- <td>
<table class="tableComment">
<tr>
<td rowspan="2" valign="top" class="cellAuthor">
@@ -101,9 +49,6 @@
</td>
</tr>
</table>
- </td>
- </tr>
- </table>
<!--/VTP_comment-->
</td>
</tr>
@@ -113,7 +58,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-admin.css b/template/default/default-admin.css
new file mode 100644
index 000000000..7270c1bb1
--- /dev/null
+++ b/template/default/default-admin.css
@@ -0,0 +1,93 @@
+@import url("default.css");
+
+a, a:hover {
+color:#006699;
+}
+
+body,font,table,input,form,select,textarea {
+font-family:arial,verdana,sans-serif;
+font-size:12px;
+color:#000000;
+text-align:left;
+}
+table
+{
+border-collapse:separate;
+}
+body {
+background-color:#E5E5E5;
+margin:5px;
+}
+
+.table1 {
+border-collapse:collapse;
+background-color:#FFFFFF;
+}
+.contenucellule {
+background-color:#EEEEEE;
+border:2px solid #006699;
+}
+.style1 {
+margin-top:20px;
+}
+th {
+font-weight:bold;
+background-color:#D3DCE3;
+margin-bottom:10px;
+text-align: center;
+}
+td.row1 {
+background-color:#E6E4E4;
+}
+td.row2,td.throw2 {
+background-color:#E8E8E8;
+}
+td.throw2 {
+text-align:center;
+font-weight:bold;
+}
+td.row3 {
+background-color:#eeeeee;
+}
+td.row4 {
+background-color:#cccccc;
+}
+.info {
+color:darkblue;
+text-align:center;
+}
+div.key {
+margin-left : 10px;
+}
+td.choice {
+text-align : center;
+}
+div.install_warning {
+text-align:center;
+color:red;
+margin:20px;
+font-weight:bold;
+}
+
+.tableComment,.cellAuthor,.cellInfo {
+color:#000000;
+border-color:#006699;
+}
+.commentsAuthor,.commentsTitle,.commentsInfos,.commentsContent
+{
+color:#000000;
+}
+.errors {
+ text-align:left;
+ margin:25px;
+ background-color:#ffe1e1;
+ border:1px solid red;
+ color:black;
+}
+.errors_title {
+ margin:5px;
+ font-weight:bold;
+ font-size:120%;
+ text-align:center;
+ color:red;
+} \ No newline at end of file
diff --git a/template/default/default.css b/template/default/default.css
new file mode 100644
index 000000000..8c7e447f9
--- /dev/null
+++ b/template/default/default.css
@@ -0,0 +1,208 @@
+a {
+ text-decoration:none;
+ color:#E0E0E0;
+}
+a:hover {
+ text-decoration:underline;
+ color:#E0E0E0;
+}
+
+a.back,body {
+ color:#E0E0E0;
+}
+body {
+ font-family:arial, sans-serif;
+ font-size:12px;
+ background-color:#444444;
+ margin:5px;
+}
+table, input {
+ font-family:arial, sans-serif;
+ font-size:12px;
+}
+.imgLink {
+ border:1px solid #E0E0E0;
+}
+.imgLink:hover {
+ text-decoration:none;
+}
+.titrePage,.titreMenu,.menu,.info,.commentsAuthor,.commentsTitle,.commentsInfos,.commentsContent,.commentsNavigationBar {
+ color:lightgray;
+}
+.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:lightgray;
+}
+textarea,input {
+ color:black;
+}
+table {
+ border-collapse:collapse;
+}
+table.thumbnail {
+ border-collapse:separate;
+}
+td {
+ font-family:sans-serif;
+ padding:0px;
+}
+.errors {
+ text-align:left;
+ margin-top:5px;
+ margin-bottom:5px;
+ background-color:red;
+ font-weight:bold;
+ border:1px solid black;
+ color:white;
+}
+div.information {
+ text-align:center;
+ border:2px solid #E0E0E0;
+ margin:10px;
+ padding:5px;
+}
+.commentsAuthor, .commentsTitle, .commentsInfos, .commentsContent, .commentsNavigationBar {
+
+ font-family:arial, sans-Serif;
+ font-size:12px;
+}
+.commentsTitle, .commentsAuthor {
+ text-align:center;
+ font-weight:bold;
+}
+.commentsInfos {
+ padding:3px 3px 3px 10px;
+ font-size:11px;
+ text-align:right;
+}
+.commentsContent {
+ margin:10px;
+}
+.commentsTitle {
+ margin-top:15px;
+}
+.commentsAuthor {
+ margin:5px;
+}
+.commentsNavigationBar {
+ margin:10px;
+}
+.tableComment,.cellAuthor,.cellInfo {
+ border-color:#E0E0E0;
+ border-style:solid;
+}
+.tableComment {
+ width:100%;
+ border-width:2px;
+ text-align:left;
+ padding: 10px;
+}
+.cellAuthor {
+ border-width:0px;
+ border-right-width:1px;
+ width:20%;
+}
+.cellInfo {
+ border-width:0px;
+ border-bottom-width:1px;
+}
+
+ .miniature {
+ border:solid 1px black;
+ }
+ .titretable1 {
+ color:black;
+ background-color:#D3DCE3;
+ text-align:center;
+ border:2px solid #006699;
+ font-weight:bold;
+ border-bottom:0px;
+ }
+ .grostitre {
+ text-align:center;
+ margin:10px 50px 10px 50px;
+ font-size:20px;
+ width:300px;
+ }
+ .plan {
+ margin:10px 10px 10px 2px;
+ white-space:nowrap;
+ }
+ .cat_plan {
+ font-weight:bold;
+ }
+ .retrait {
+ margin:10px;
+ margin-left:30px;
+ margin-top:2px;
+ }
+ .erreur {
+ color:red;
+ text-align:center;
+ }
+ .errors_title {
+ margin:5px;
+ font-weight:bold;
+ font-size:120%;
+ text-align:center;
+ color:red;
+ } \ 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 2010a2768..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 )
@@ -177,8 +177,7 @@ function display_category( $category, $indent, $handle )
$vtp->addSession( $handle, 'category' );
$vtp->setVar( $handle, 'category.indent', $indent );
-
- if ( $user['expand'] or count( $category['subcats'] ) == 0 )
+ if ( $user['expand'] or $category['nb_sub_categories'] == 0 )
{
$vtp->addSession( $handle, 'bullet_wo_link' );
$vtp->setVar( $handle, 'bullet_wo_link.bullet_url',
@@ -188,12 +187,16 @@ function display_category( $category, $indent, $handle )
else
{
$vtp->addSession( $handle, 'bullet_w_link' );
- $url = './category.php?cat='.$page['cat'];
+ $url = './category.php';
+ if (isset($page['cat']))
+ {
+ $url .='?cat='.$page['cat'];
$url.= '&amp;expand='.$category['expand_string'];
- if ( $page['cat'] == 'search' )
- {
- $url.= '&amp;search='.$_GET['search'].'&amp;mode='.$_GET['mode'];
- }
+ }
+ else if ($category['expand_string']<>'')
+ {
+ $url.= '?expand='.$category['expand_string'];
+ }
$vtp->setVar( $handle, 'bullet_w_link.bullet_link', add_session_id($url) );
if ( $category['expanded'] )
{
@@ -220,10 +223,10 @@ function display_category( $category, $indent, $handle )
{
$vtp->setVar( $handle, 'category.name_style', 'font-weight:bold;' );
}
- if ( count( $category['subcats'] ) > 0 )
+ if ( $category['nb_sub_categories'] > 0 )
{
$vtp->addSession( $handle, 'subcat' );
- $vtp->setVar( $handle, 'subcat.nb_subcats', count($category['subcats']) );
+ $vtp->setVar( $handle,'subcat.nb_subcats',$category['nb_sub_categories'] );
$vtp->closeSession( $handle, 'subcat' );
}
$vtp->setVar( $handle, 'category.total_cat', $category['nb_images'] );
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">&nbsp;</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 14ddebb66..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['theme'].'/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