- remake of Remote sites and Synchronize:

  - synchronization for remote and local sites are done by the same code
  - remote sites can update metadata now (not before) - bug 279
  - fixes bug 82: has_high column

- improve feature 280: user sort by filename

- fix path to template mimetypes icons

- bug 284: session cookie lifetime, deletion on logout and corrected issue 
when db upgrades were missing 

git-svn-id: http://piwigo.org/svn/trunk@1029 68402e56-0260-453c-a942-63ccdbb3a9ee

5 files changed, 161 insertions, 3 deletions

diff --git a/template/yoga/admin.tpl b/template/yoga/admin.tpl
index 2192f90f6..c5b8e7e03 100644
--- a/template/yoga/admin.tpl
+++ b/template/yoga/admin.tpl
@@ -14,6 +14,7 @@
     <dd>
       <ul>
 	<li><a href="{U_FAQ}">{lang:instructions}</a></li>
+	<li><a href="{U_SITE_MANAGER}">{lang:Site manager}</a></li>
 	<li><a href="{U_SITES}">{lang:remote_sites}</a></li>
 	<li><a href="{U_HISTORY}">{lang:history}</a></li>
 	<li><a href="{U_CAT_UPDATE}">{lang:update}</a></li>
@@ -67,7 +68,7 @@
 
 <div id="content">
   <!-- BEGIN errors -->
-  <div id="errors">
+  <div class="errors">
     <ul>
       <!-- BEGIN error -->
       <li>{errors.error.ERROR}</li>
diff --git a/template/yoga/admin/site_manager.tpl b/template/yoga/admin/site_manager.tpl
new file mode 100644
index 000000000..baf18ee0f
--- /dev/null
+++ b/template/yoga/admin/site_manager.tpl
@@ -0,0 +1,49 @@
+<!-- $Id: remote_site.tpl 980 2005-12-10 15:24:53Z chrisaga $ -->

+<div class="titrePage">

+  <ul class="categoryActions">

+    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>

+  </ul>

+  <h2>{lang:remote_sites}</h2>

+</div>

+

+<!-- BEGIN remote_output -->

+<div class="remoteOutput">

+  <ul>

+    <!-- BEGIN remote_line -->

+    <li class="{remote_output.remote_line.CLASS}">{remote_output.remote_line.CONTENT}</li>

+    <!-- END remote_line -->

+  </ul>

+</div>

+<!-- END remote_output -->

+

+<!-- BEGIN sites -->

+<table border="1" cellpadding="0" cellspacing="0">

+  <!-- BEGIN site -->

+  <tr align="left"><td>

+    <a href="{sites.site.NAME}" target="_blank">{sites.site.NAME}</a><br>({sites.site.TYPE}, {sites.site.CATEGORIES} {lang:categories}, {sites.site.IMAGES} {lang:picture}s)

+  </td><td>  

+    [<a href="{sites.site.U_UPDATE}" title="{lang:update this site}">{lang:remote_site_update}</a>]

+    <!-- BEGIN delete -->

+      [<a href="{sites.site.delete.U_DELETE}" onclick="return confirm('{lang:remote_site_delete_hint}.\n{sites.site.NAME}\n{lang:Are you sure}?');" 

+                title="{lang:remote_site_delete_hint}">{lang:remote_site_delete}</a>]

+    <!-- END delete -->

+    <!-- BEGIN remote -->

+      <br>

+      [<a href="{sites.site.remote.U_TEST}" title="{lang:@@}">{lang:Test}</a>]

+      [<a href="{sites.site.remote.U_GENERATE}" title="{lang:remote_site_generate_hint}">{lang:remote_site_generate}</a>]

+      [<a href="{sites.site.remote.U_CLEAN}" title="{lang:remote_site_clean_hint}">{lang:remote_site_clean}</a>]

+    <!-- END remote -->

+  </td></tr>

+  <!-- END site -->

+</table>

+<!-- END sites -->

+

+<form action="{F_ACTION}" method="post">

+  <p>

+    <label for="galleries_url" >{lang:remote_site_create}</label> 

+    <input type="text" name="galleries_url" id="galleries_url" />

+  </p>

+  <p>

+    <input type="submit" name="submit" value="{lang:submit}" />

+  </p>

+</form>

diff --git a/template/yoga/admin/site_update.tpl b/template/yoga/admin/site_update.tpl
new file mode 100644
index 000000000..ad0d6ee7c
--- /dev/null
+++ b/template/yoga/admin/site_update.tpl
@@ -0,0 +1,108 @@
+<!-- $Id: update.tpl 980 2005-12-10 15:24:53Z chrisaga $ -->

+

+<div class="titrePage">

+  <ul class="categoryActions">

+    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>

+  </ul>

+  <h2>{lang:title_update}: <a href="{SITE_URL}" target="_blank">{SITE_URL}</a></h2>

+</div>

+

+<!-- BEGIN update_result -->

+<h3>{L_RESULT_UPDATE}</h3>

+<ul>

+  <li class="update_summary_new">{update_result.NB_NEW_CATEGORIES} {lang:update_nb_new_categories}</li>

+  <li class="update_summary_new">{update_result.NB_NEW_ELEMENTS} {lang:update_nb_new_elements}</li>

+  <li class="update_summary_del">{update_result.NB_DEL_CATEGORIES} {lang:update_nb_del_categories}</li>

+  <li class="update_summary_del">{update_result.NB_DEL_ELEMENTS} {lang:update_nb_del_elements}</li>

+  <li class="update_summary_err">{update_result.NB_ERRORS} {lang:update_nb_errors}</li>

+</ul>

+<!-- END update_result -->

+

+<!-- BEGIN metadata_result -->

+<h3>{L_RESULT_METADATA}</h3>

+<ul>

+  <li>{metadata_result.NB_ELEMENTS_DONE} {lang:update_elements_metadata_sync}</li>

+  <li>{metadata_result.NB_ELEMENTS_CANDIDATES} {lang:elements available for synchronization}</li>

+  <li>{lang:update_used_metadata} : {METADATA_LIST}</li>

+</ul>

+<!-- END metadata_result -->

+

+

+<!-- BEGIN sync_errors -->

+<h3>{lang:update_error_list_title}</h3>

+<div class="errors">

+<ul>

+  <!-- BEGIN error -->

+  <li>[{sync_errors.error.ELEMENT}] {sync_errors.error.LABEL}</li>

+  <!-- END error -->

+</ul>

+</div>

+<h3>{lang:update_errors_caption}</h3>

+<ul>

+  <!-- BEGIN error_caption -->

+  <li><strong>{sync_errors.error_caption.TYPE}</strong>: {sync_errors.error_caption.LABEL}</li>

+  <!-- END error_caption -->

+</ul>

+<!-- END sync_errors -->

+

+<!-- BEGIN sync_infos -->

+<h3>{lang:update_infos_title}</h3>

+<div class="infos">

+<ul>

+  <!-- BEGIN info -->

+  <li>[{sync_infos.info.ELEMENT}] {sync_infos.info.LABEL}</li>

+  <!-- END sync_infos -->

+</ul>

+</div>

+<!-- END infos -->

+

+<!-- BEGIN introduction -->

+<h3>{lang:update_default_title}</h3>

+<form action="{F_ACTION}" method="post" id="update">

+

+  <fieldset>

+    <legend>{lang:update_sync_files}</legend>

+    <ul>

+      <li><label><input type="radio" name="sync" value="dirs" {SYNC_DIRS_CHECKED} /> {lang:update_sync_dirs}</label></li>

+      <li><label><input type="radio" name="sync" value="files" {SYNC_ALL_CHECKED} /> {lang:update_sync_all}</label></li>

+      <li><label><input type="checkbox" name="display_info" value="1" {DISPLAY_INFO_CHECKED} /> {lang:update_display_info}</label></li>

+    </ul>

+  </fieldset>

+

+  <fieldset>

+    <legend>{lang:update_sync_metadata}</legend>

+    {lang:update_used_metadata} : {METADATA_LIST}.<br/>

+    <ul>

+      <li><label><input type="radio" name="sync" value="metadata_new" {SYNC_META_NEW_CHECKED} /> {lang:update_sync_metadata_new}</label></li>

+      <li><label><input type="radio" name="sync" value="metadata_all" {SYNC_META_ALL_CHECKED} /> {lang:update_sync_metadata_all}</label></li>

+    </ul>

+  </fieldset>

+

+  <fieldset>

+    <legend></legend>

+    <ul><li><label><input type="checkbox" name="simulate" value="1" checked="checked" /> {lang:update_simulate}</label></li></ul>

+  </fieldset>

+  

+  <fieldset>

+    <legend>{lang:update_cats_subset}</legend>

+    <ul>

+    <li> 

+    <select style="width:500px" name="cat" size="10">

+      <!-- BEGIN category_option -->

+      <option {introduction.category_option.SELECTED} value="{introduction.category_option.VALUE}">{introduction.category_option.OPTION}</option>

+      <!-- END category_option -->

+    </select>

+    </li>

+  

+    <li><label><input type="checkbox" name="subcats-included" value="1" {SUBCATS_INCLUDED_CHECKED} /> {lang:search_subcats_included}</label></li>

+    </ul>

+  </fieldset>

+

+  <p class="bottomButtons">

+    <input type="submit" value="{lang:submit}" name="submit" />

+    <input type="reset"  value="{lang:reset}"  name="reset"  />

+  </p>

+</form>

+<!-- END introduction -->

+

+<a href="{U_SITE_MANAGER}">{lang:Site manager}</a>

diff --git a/template/yoga/theme/clear/themeconf.inc.php b/template/yoga/theme/clear/themeconf.inc.php
index 0a96b94aa..314e697c4 100644
--- a/template/yoga/theme/clear/themeconf.inc.php
+++ b/template/yoga/theme/clear/themeconf.inc.php
@@ -4,6 +4,6 @@ $themeconf = array(
   'theme' => 'clear',
   'icon_dir' => PHPWG_ROOT_PATH.'template/yoga/icon',
   'admin_icon_dir' => PHPWG_ROOT_PATH.'template/yoga/icon/admin',
-  'mime_icon_dir' => PHPWG_ROOT_PATH.'template/yoga/icon/mymetypes'
+  'mime_icon_dir' => PHPWG_ROOT_PATH.'template/yoga/icon/mimetypes/'
 );
 ?>
diff --git a/template/yoga/theme/dark/themeconf.inc.php b/template/yoga/theme/dark/themeconf.inc.php
index 1d2fb319e..784920150 100644
--- a/template/yoga/theme/dark/themeconf.inc.php
+++ b/template/yoga/theme/dark/themeconf.inc.php
@@ -4,6 +4,6 @@ $themeconf = array(
   'theme' => 'dark',
   'icon_dir' => PHPWG_ROOT_PATH.'template/yoga/icon',
   'admin_icon_dir' => PHPWG_ROOT_PATH.'template/yoga/icon/admin',
-  'mime_icon_dir' => PHPWG_ROOT_PATH.'template/yoga/icon/mymetypes'
+  'mime_icon_dir' => PHPWG_ROOT_PATH.'template/yoga/icon/mimetypes/'
 );
 ?>