aboutsummaryrefslogtreecommitdiffstats
path: root/template/default/admin
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/default/admin
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/default/admin')
-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
7 files changed, 43 insertions, 54 deletions
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}