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

1 files changed, 12 insertions, 6 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}