[Erp5-report] r42971 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: SkinTemplateItem/port...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Feb 3 11:06:31 CET 2011
Author: gabriel
Date: Thu Feb 3 11:06:31 2011
New Revision: 42971
URL: http://svn.erp5.org?rev=42971&view=rev
Log:
- refactor to allow open the day view when the date is selected
- improve css to calendar view
Modified:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml
erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml?rev=42971&r1=42970&r2=42971&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml [utf8] Thu Feb 3 11:06:31 2011
@@ -210,7 +210,25 @@ tr#today-event td:first-child{\n
}\n
\n
div.event-listview table tbody tr td:first-child {\n
- width: 12%;\n
+ width: 9%;\n
+}\n
+\n
+td#event-date {\n
+ color: #2200CC;\n
+ cursor: pointer;\n
+ font-size: 10pt;\n
+ font-weight: bold;\n
+}\n
+\n
+td#time-range {\n
+ width: 9%;\n
+ text-align: center;\n
+}\n
+div#showreflashbtn.fbutton,\n
+ div#showdaybtn.fbutton,\n
+ div#showmonthbtn.fbutton,\n
+ div#showweekbtn.fbutton {\n
+ float: right !important;\n
}</string> </value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml?rev=42971&r1=42970&r2=42971&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_theme.css.xml [utf8] Thu Feb 3 11:06:31 2011
@@ -880,9 +880,9 @@ fieldset.center.editable div.field label
\n
span#ui-dialog-title-preference_dialog {\n
margin: 0;\n
- margin-top: -3px;\n
+ margin-top: -2px;\n
margin-left: -10px;\n
- font-size: 17px;\n
+ font-size: 15px;\n
color: #222222 !important;\n
}\n
\n
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml?rev=42971&r1=42970&r2=42971&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml [utf8] Thu Feb 3 11:06:31 2011
@@ -186,14 +186,14 @@ $(document).ready(function() { \n
var dvH = $dv.height() + 2;\n
op.height = _MH - dvH;\n
op.eventItems =[];\n
- var p = $("#gridcontainer").bcalendar(op).BcalGetOp();\n
- if (p && p.datestrshow) {\n
- $("#txtdatetimeshow").text(p.datestrshow);\n
- }\n
+ //ar p = $("#gridcontainer").bcalendar(op).BcalGetOp();\n
+ console.log($("#gridcontainer").bcalendar(op).BcalGetOp().datestrshow);\n
+ //if (p && p.datestrshow) {\n
+ // $("#txtdatetimeshow").text(p.datestrshow);\n
+ //}\n
$("#caltoolbar").noSelect();\n
//to show day view\n
$("#showdaybtn").click(function(e) {\n
- //document.location.href="#day";\n
$("#caltoolbar div.fcurrent").each(function() {\n
$(this).removeClass("fcurrent");\n
})\n
@@ -205,7 +205,6 @@ $(document).ready(function() { \n
});\n
//to show week view\n
$("#showweekbtn").click(function(e) {\n
- //document.location.href="#week";\n
$("#caltoolbar div.fcurrent").each(function() {\n
$(this).removeClass("fcurrent");\n
})\n
@@ -299,8 +298,8 @@ $(document).ready(function() { \n
if ($("input[name=\'searchable-text\']").val() == "")\n
return false;\n
$("div#dvCalMain.calmain div#gridcontainer").css("background", "none repeat scroll 0 0 #FFFFFF");\n
- $("div#dvwkcontaienr.wktopcontainer").hide();\n
- $("div#gridcontainer div#dvtec.scolltimeevent").hide();\n
+ $("div#dvwkcontaienr.wktopcontainer").remove();\n
+ $("div#gridcontainer div#dvtec.scolltimeevent").remove();\n
$("div#gridcontainer div.event-listview,div#gridcontainer div.toolbar-listview").remove();\n
var tableList = Array();\n
tableList.push("<div class=\'toolbar-listview\'>",\n
@@ -336,9 +335,9 @@ $(document).ready(function() { \n
var dateSplitted = eventList[i][2].split(" ");\n
if (eventDate.getHours() >= 12)\n
hourSymbol = "pm";\n
- eventTableList.push("<td id=\'event-date\'>");\n
- eventTableList.push(dateSplitted[0]);\n
- eventTableList.push("</td>");\n
+ eventTableList.push("<td id=\'event-date\'>",\n
+ dateSplitted[0],\n
+ "</td>");\n
eventTableList.push("<td id=\'time-range\'>", \n
dateSplitted[1] + hourSymbol,\n
"</td>");\n
@@ -350,6 +349,11 @@ $(document).ready(function() { \n
$("div.event-listview tbody tr").length + \n
"</b>" + " to " + \n
"<b>" + text + "</b>");\n
+ $("div.event-listview tbody td#event-date").click(function(){\n
+ op.showday = new Date($(this).text());\n
+ op.view = "day";\n
+ $("#gridcontainer").bcalendar(op).BcalGetOp();\n
+ });\n
},\n
});\n
tableList.push("</tbody></table></div>");\n
Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/revision?rev=42971&r1=42970&r2=42971&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Thu Feb 3 11:06:31 2011
@@ -1 +1 @@
-218
\ No newline at end of file
+219
\ No newline at end of file
More information about the Erp5-report
mailing list