From 9adb61c0cea0b9bdecf2ed60ca47191b0a847d50 Mon Sep 17 00:00:00 2001 From: Gabriel Monnerat <gabriel@tiolive.com> Date: Thu, 3 Feb 2011 16:52:41 +0000 Subject: [PATCH] - improve css git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42999 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../ung_css/ung_calendar.css.xml | 32 +++++++++++++++++++ .../ung_js/ung_calendar.js.xml | 12 +++++-- bt5/erp5_web_ung_theme/bt/revision | 2 +- 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml index d843ebd509..8473e130a2 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml @@ -234,6 +234,38 @@ div#showreflashbtn.fbutton,\n \n span#text-datetime {\n margin-top: 4px;\n +}\n +\n +div#display-datetime.fbutton:hover, span#text-datetime:hover {\n + background: none !important;\n + border: 1px solid #BBCCFF !important;\n +}\n +\n +.ui-datepicker .ui-datepicker-title {\n + margin: 0 0.3em;\n + text-align: left;\n +}\n +\n +.ui-datepicker .ui-datepicker-next {\n + right: -2px;\n +}\n +\n +.ui-datepicker .ui-datepicker-prev {\n + left: 10.5em;\n +}\n +\n +.ui-datepicker .ui-datepicker-title {\n + color: #20C;\n + text-decoration: underline;\n +}\n +\n +.ui-widget-header .ui-icon {\n + background-image: url("jquery/ui/css/erp5-theme/images/ui-icons_2e83ff_256x240.png") !important;\n +}\n +\n +.ui-datepicker .ui-datepicker-prev span,\n + .ui-datepicker .ui-datepicker-next span {\n + -moz-border-radius: 9px 9px 9px 9px;\n }</string> </value> </item> <item> 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 aa3c81f0aa..60cfd812e6 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 @@ -238,7 +238,7 @@ $(document).ready(function() { \n //go to today\n $("#showtodaybtn").click(function() {\n var optionList = $("#gridcontainer").gotoDate().BcalGetOp();\n - $("div#display-datetime span#text-datetime").text(p.datestrshow);\n + $("div#display-datetime span#text-datetime").text(optionList.datestrshow);\n });\n //previous date range\n $("#sfprevbtn").click(function() {\n @@ -327,8 +327,14 @@ $(document).ready(function() { \n op.view = "day";\n $("#gridcontainer").bcalendar(op).BcalGetOp();\n });\n - $("div#gridcontainer").css("height", \n - $("div#gridcontainer table tbody tr").length*$("div.event-listview tr").height() + "px");\n + if ($("div.event-listview tr").height() > 0){\n + $("div#gridcontainer").css("height", \n + $("div#gridcontainer table tbody tr").length*$("div.event-listview tr").height() + "px");\n + } else {\n + $("div#gridcontainer")\n + .css("height", "54px")\n + .append("No Results");\n + }\n },\n });\n tableList.push("</tbody></table></div>");\n diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision index fba8ce006f..bcad85486c 100644 --- a/bt5/erp5_web_ung_theme/bt/revision +++ b/bt5/erp5_web_ung_theme/bt/revision @@ -1 +1 @@ -224 \ No newline at end of file +225 \ No newline at end of file -- 2.30.9