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 897e462b5049bf6e23fd85ee9abee66a0ee9eb40..d4370feb5639f6c52727e262e426c4100cd96ada 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 @@ -180,6 +180,11 @@ img[alt="calendar_logo_box"] {\n \n div.header-left {\n margin-top: -9px;\n +}\n +\n +div#gridcontainer div.event-listview tr td {\n + border-bottom: 1px solid #CCC;\n + padding: 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 20f421ed9ac48408f6b79e43afbd18c74687000a..2f6f8e5a90713c332300d1f99c1f4876e1788733 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 @@ -296,7 +296,36 @@ $(document).ready(function() { \n });\n $("input#submit-search").click(function(event){\n event.preventDefault();\n - alert($("input[name=\'searchable-text\']").val());\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#gridcontainer div.event-listview,div#gridcontainer div.toolbar-listview").remove();\n + var tableList = Array();\n + tableList.push("<div class=\'toolbar-listview\'>",\n + "<table width=\'100%\' cellspacing=\'0\' cellpadding=\'2\'>",\n + "<tbody>",\n + "<tr><td>Back to Calendar</td><td>Results:</td>",\n + "</tbody></table></div>");\n + tableList.push("<div class=\'event-listview\'>");\n + tableList.push("<table width=\'100%\' cellspacing=\'0\' cellpadding=\'2\'><tbody>");\n + $.ajax({\n + url:"Base_updateCalendarEventList?request_type=list",\n + dataType: "json",\n + success: function(data){\n + var eventTableList = Array();\n + var eventList = data.events; \n + for (var i = 0; i < eventList.length; i++){\n + eventTableList.push("<tr><td>");\n + eventTableList.push(eventList[i][2]);\n + eventTableList.push("</td><td>");\n + eventTableList.push(eventList[i][1]);\n + eventTableList.push("</td></tr>");\n + }\n + $("div.event-listview tbody").append(eventTableList.join(""));\n + },\n + });\n + tableList.push("</tbody></table></div>");\n + $("div#gridcontainer").append(tableList.join(""));\n });\n }); diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision index aebfaa171de09b0b7060f62ed145db806a73f62b..58e77f35150112bd116c971f0a16e4c29e23433e 100644 --- a/bt5/erp5_web_ung_theme/bt/revision +++ b/bt5/erp5_web_ung_theme/bt/revision @@ -1 +1 @@ -214 \ No newline at end of file +215 \ No newline at end of file