From 97ffdb2edc14c12502f75efef9622cecd89a3020 Mon Sep 17 00:00:00 2001
From: mistic100 <mistic@piwigo.org>
Date: Sun, 18 May 2014 10:58:53 +0000
Subject: feature 2679 : allow to change creation time

git-svn-id: http://piwigo.org/svn/trunk@28500 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/themes/default/template/batch_manager_global.tpl   |  2 +-
 admin/themes/default/template/batch_manager_unit.tpl     |  2 +-
 admin/themes/default/template/include/datepicker.inc.tpl | 13 ++++++++++---
 admin/themes/default/template/picture_modify.tpl         |  3 +--
 4 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'admin/themes/default/template')

diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl
index 148f48735..631a00f0d 100644
--- a/admin/themes/default/template/batch_manager_global.tpl
+++ b/admin/themes/default/template/batch_manager_global.tpl
@@ -60,7 +60,7 @@ jQuery(document).ready(function() {
 
 {footer_script require='jquery.tokeninput'}
 jQuery(document).ready(function() {ldelim}
-  jQuery('[data-datepicker]').pwgDatepicker();
+  jQuery('[data-datepicker]').pwgDatepicker({ showTimepicker: true });
 
   jQuery("a.preview-box").colorbox();
   
diff --git a/admin/themes/default/template/batch_manager_unit.tpl b/admin/themes/default/template/batch_manager_unit.tpl
index e282a5e0b..d0d06e11d 100644
--- a/admin/themes/default/template/batch_manager_unit.tpl
+++ b/admin/themes/default/template/batch_manager_unit.tpl
@@ -51,7 +51,7 @@ tagsCache.get(function(tags) {
 
 {* <!-- DATEPICKER --> *}
 jQuery(function(){ {* <!-- onLoad needed to wait localization loads --> *}
-  jQuery('[data-datepicker]').pwgDatepicker();
+  jQuery('[data-datepicker]').pwgDatepicker({ showTimepicker: true });
 });
 
 {* <!-- THUMBNAILS --> *}
diff --git a/admin/themes/default/template/include/datepicker.inc.tpl b/admin/themes/default/template/include/datepicker.inc.tpl
index d8202703d..92e40aa3a 100644
--- a/admin/themes/default/template/include/datepicker.inc.tpl
+++ b/admin/themes/default/template/include/datepicker.inc.tpl
@@ -1,9 +1,16 @@
-{combine_script id='datepicker.js' load='footer' require='jquery.ui.datepicker' path='admin/themes/default/js/datepicker.js'}
+{combine_script id='jquery.ui.timepicker-addon' load='footer' require='jquery.ui.datepicker,jquery.ui.slider' path="themes/default/js/ui/jquery.ui.timepicker-addon.js"}
+{combine_script id='datepicker.js' load='footer' require='jquery.ui.timepicker-addon' path='admin/themes/default/js/datepicker.js'}
 
 {assign var="datepicker_language" value="themes/default/js/ui/i18n/jquery.ui.datepicker-`$lang_info.code`.js"}
+{if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists}
+{combine_script id="jquery.ui.datepicker-$lang_info.code" load='footer' require='jquery.ui.datepicker' path=$datepicker_language}
+{/if}
 
+{assign var="timepicker_language" value="themes/default/js/ui/i18n/jquery.ui.timepicker-`$lang_info.code`.js"}
 {if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists}
-{combine_script id="jquery.ui.datepicker-$lang_info.code" load='footer' path=$datepicker_language}
+{combine_script id="jquery.ui.timepicker-$lang_info.code" load='footer' require='jquery.ui.timepicker-addon' path=$timepicker_language}
 {/if}
 
-{combine_css path="themes/default/js/ui/theme/jquery.ui.datepicker.css"}
\ No newline at end of file
+{combine_css path="themes/default/js/ui/theme/jquery.ui.slider.css"}
+{combine_css path="themes/default/js/ui/theme/jquery.ui.datepicker.css"}
+{combine_css path="themes/default/js/ui/theme/jquery.ui.timepicker-addon.css"}
\ No newline at end of file
diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl
index 99a53b247..f48a152d6 100644
--- a/admin/themes/default/template/picture_modify.tpl
+++ b/admin/themes/default/template/picture_modify.tpl
@@ -77,7 +77,7 @@ tagsCache.get(function(tags) {
 
 {* <!-- DATEPICKER --> *}
 jQuery(function(){ {* <!-- onLoad needed to wait localization loads --> *}
-  jQuery('[data-datepicker]').pwgDatepicker();
+  jQuery('[data-datepicker]').pwgDatepicker({ showTimepicker: true });
 });
 }());
 {/footer_script}
@@ -140,7 +140,6 @@ jQuery(function(){ {* <!-- onLoad needed to wait localization loads --> *}
     <p>
       <strong>{'Creation date'|@translate}</strong>
       <br>
-      <input type="hidden" name="date_creation_time" value="{$DATE_CREATION_TIME}">
       <input type="hidden" name="date_creation" value="{$DATE_CREATION}">
       <label>
         <i class="icon-calendar"></i>
-- 
cgit v1.2.3