From 27322a6f1bdeb3acda193e9c81fcc602fdfdec09 Mon Sep 17 00:00:00 2001 From: Gabriel Monnerat <gabriel@tiolive.com> Date: Fri, 8 Apr 2011 19:36:52 +0000 Subject: [PATCH] add date format in dialog git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@45268 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_web_ung_theme/WebSection_newEvent.xml | 4 ++++ .../portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml | 4 ++++ .../erp5_web_ung_theme/ung_js/ung_calendar.js.xml | 2 +- bt5/erp5_web_ung_theme/bt/revision | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_newEvent.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_newEvent.xml index 46d9ccb216..2dc6daa183 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_newEvent.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_newEvent.xml @@ -64,6 +64,8 @@ \n <input class="start_date_field" name="start_date_hour" value="" maxlength="2" type="text" size="2">:\n <input class="start_date_field" name="start_date_minute" value="" maxlength="2" type="text" size="2">\n + <br/>\n + <span class="date-format">MM dd yyyy HH:mm</span>\n </td>\n </tr>\n <tr>\n @@ -75,6 +77,8 @@ \n <input class="stop_date_field" name="stop_date_hour" value="" maxlength="2" type="text" size="2">:\n <input class="stop_date_field" name="stop_date_minute" value="" maxlength="2" type="text" size="2">\n + <br/>\n + <span class="date-format">MM dd yyyy HH:mm</span>\n </td>\n </tr>\n <tr>\n diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml index c03820bc0e..9a8d6014f0 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml @@ -1133,6 +1133,10 @@ select[name="field_your_language"] {\n \n div.navigation-right fieldset.widget div {\n float: left;\n +}\n +\n +span.date-format {\n + font-style: italic;\n } ]]></string> </value> diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml index 9a3623d984..78b326a1e6 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml @@ -248,7 +248,7 @@ $(document).ready(function() { \n });\n $("div#new_event_dialog").dialog({\n autoOpen: false,\n - height: 228,\n + height: 248,\n width: 410,\n modal: true,\n });\n diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision index f64b48379f..fc72547e33 100644 --- a/bt5/erp5_web_ung_theme/bt/revision +++ b/bt5/erp5_web_ung_theme/bt/revision @@ -1 +1 @@ -343 \ No newline at end of file +344 \ No newline at end of file -- 2.30.9