Changeset 7bd661 in indico

Timestamp:

04/12/10 15:54:11 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 4c7d4152dff271ba5df5a8606605969cab454080

Children:

bebabe

Parents:

ccf519

git-author:

Jose Benito <jose.benito.gonzalez@…> (04/12/10 15:01:07)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (04/12/10 15:54:11)

Message:

[IMP] Improving fix#237

• layout/functionality improvements
• fixing flat calendar library

Location:

indico

Files:

• MaKaC/po/locale/fr_FR/LC_MESSAGES/messages.po (modified) (1 diff)
• MaKaC/webinterface/pages/category.py (modified) (1 diff)
• MaKaC/webinterface/tpls/CategoryOverview.tpl (modified) (4 diffs)
• htdocs/css/Default.css (modified) (1 diff)
• htdocs/css/calendar-blue.css (modified) (7 diffs)
• htdocs/js/calendar/calendar-setup.js (modified) (3 diffs)

indico/MaKaC/po/locale/fr_FR/LC_MESSAGES/messages.po

@@ -321 +321 @@
 
 #: /home/pferreir/indico/cds-indico/indico/MaKaC/webinterface/tpls/CategoryOverview.tpl:26
-msgid "Details level"
+msgid "Detail level"
 msgstr "Niveau de détails"
 

indico/MaKaC/webinterface/pages/category.py

@@ -801 +801 @@
                 categ=cm.getById(str(icon))
                 otherOW = self._ow.getOverviewOtherCateg(categ)
-                a=(""" <a href="%s" style="font-size: 1.0em;"><img src="%s" width="16" height="16" border="0" alt="category">&nbsp;%s</a>  <BR>""" %(\
+                a=(""" <a href="%s" style="font-size: 1.0em;"><img src="%s" width="16" height="16" border="0">&nbsp;%s</a>  <br/>""" %(\
                                         vars["categOverviewURLGen"]( otherOW ),\
                                         urlHandlers.UHCategoryIcon.getURL(categ),\

indico/MaKaC/webinterface/tpls/CategoryOverview.tpl

@@ -1 @@
-<div class="container">
+<div class="container" style="overflow: visible; margin:15px;">
     <div class="categoryHeader">
         <ul>
             <li><a href="<%= categDisplayURL %>"><%= _("Go back to category page") %></a></li>
         </ul>
-        <h1 class="categoryTitle" style="margin-bottom: 0; border: none;">
+        <h1 class="categoryTitle">
             <%= categoryTitle %>&nbsp;
             <span style="font-style: italic; font-size: 0.8em;">(<%= _("events overview") %>)</span>
         </h1>
     </div>
-
-<!--  old version of an overeview with vertical options bar
-    <div class="topBar">
-        <div class="content"">
-
-            <form action="%(postURL)s" id="optionsForm" method="GET">
-            <h1 style="display: inline; padding-right: 50px;"><%= _("Display options") %></h1>
-
-            %(locator)s
-
-            <%= _("Period")%>:&nbsp;
-                        <select name="period" style="margin-right: 30px; font-size: 10pt; min-width: 70px;">
-                            <option value="day" %(selDay)s> <%= _("day")%></option>
-                            <option value="week" %(selWeek)s> <%= _("week")%></option>
-                            <option value="month" %(selMonth)s> <%= _("month")%></option>
-                        </select>
-            <%= _("Details level")%>:&nbsp; <span><select name="detail" style="margin-right: 30px; font-size: 10pt;  min-width: 70px;">
-                            %(detailLevelOpts)s
-                        </select></span>
-            <%= _("Date")%>:&nbsp;
-                        <span id="datePlace" style="margin-right: 30px; font-size: 10pt;"></span>
-                        <input type="hidden" id="day" name="day" value="<%= day %>" />
-                        <input type="hidden" id="month" name="month" value="<%= month %>" />
-                        <input type="hidden" id="year" name="year" value="<%= year %>" />
-
-                <input type="submit" class="btn" value="<%= _("apply")%>" >
-
-            </form>
-            <% if key: %>
-                <div style="display: none;">
-                <h1><%= _("Legend") %></h1>
-                <div style="margin: 10px 0 30px 10px;">%(key)s</div>
-                </div>
-            <% end %>
-        </div>
-    </div>
-
-    <div>
-
-        <div class="categoryOverview">
-            %(overview)s
-        </div>
-    </div>
-
-</div>
--->
     <table width = "100%%" cellSpacing = 3 cellPadding = 2>
         <tbody>
             <tr>
                 <td valign="top">
-                    <table width = "100%%">
+                    <table>
                         <tr><td height = 15></td></tr>
                         <tr><td width = "100%%" valign = "top">
-                            <div style="margin-top: 30px; float: none; width: 100%%" class="sideBar clearfix">
+                            <div style="margin-top: 10px; float: none; width: 100%%" class="sideBar clearfix">
                                 <div class="leftCorner"></div>
                                 <div class="rightCorner"></div>
-                                <div class="content"">
+                                <div class="content" style="padding-right:10px;padding-left:10px;">
 
                                     <form action="%(postURL)s" id="optionsForm" name="optionsForm" method="GET">
-                                    <h1 style="display: inline; padding-right: 50px;"><%= _("Display options") %></h1><br>
+                                        %(locator)s
 
-                                    %(locator)s<br>
+                                        <span id="calendar-container" style="width:0px"></span>
+                                        <input type="hidden" id="dateContainer" name="dateContainer" value="<%= "%s/%s/%s"%(day, month, year)%>"/>
+                                        <input type="hidden" id="day" name="day" value="<%= day %>" />
+                                        <input type="hidden" id="month" name="month" value="<%= month %>" />
+                                        <input type="hidden" id="year" name="year" value="<%= year %>" /><br />
 
-                                    <%= _("Period")%>:<br>
-                                                <select name="period" onchange="javascript:submitForm()" style="margin-right: 30px; font-size: 10pt; min-width: 100%%; margin-bottom: 10px">
+                                        <h1 style="padding-bottom:5px;"><%= _("Display options") %>:</h1>
+                                        <table cellpadding="0" cellspacing="0" style="width:100%%">
+                                            <tr>
+                                                <td><%= _("Period")%>:</td>
+                                                <td><select name="period">
                                                     <option value="day" %(selDay)s> <%= _("day")%></option>
                                                     <option value="week" %(selWeek)s> <%= _("week")%></option>
                                                     <option value="month" %(selMonth)s> <%= _("month")%></option>
-                                                </select><br>
-                                    <%= _("Details level")%>:<br> <span><select name="detail" onchange="javascript:submitForm()" style="margin-right: 30px; font-size: 10pt;  min-width: 100%%; margin-bottom: 10px">
-                                                    %(detailLevelOpts)s
-                                                </select></span><br>
-                                    <%= _("Date")%>:<br>
-                                                <span id="calendar-container"></span>
-                                                <input type="hidden" id="dateContainer" name="dateContainer" />
-                                                <input type="hidden" id="day" name="day" value="<%= day %>" />
-                                                <input type="hidden" id="month" name="month" value="<%= month %>" />
-                                                <input type="hidden" id="year" name="year" value="<%= year %>" />
+                                                </select></td>
+                                            </tr>
+                                            <tr>
+                                                <td><%= _("Detail level")%>:</td>
+                                                <td><select name="detail">
+                                                    <%= detailLevelOpts %>
+                                                </select></td>
+                                           </tr>
+                                        </table>
+                                    <span id="applyButtonWrapper"><input type="button" value="<%= _("Apply") %>" onclick="javascript:buttonSubmitForm();" /></span>
 
                                     </form>
                                     <% if key: %>
                                         <br><h1><%= _("Legend") %>:</h1>
-                                        <div style="margin: 10px 0 30px 10px;">%(key)s</div>
+                                        <div style="margin: 10px 0 30px 10px;width:180px;">%(key)s</div>
                                     <% end %>
                                 </div>
@@ -99 +60 @@
                 </td>
                 <td valign = "top">
-                    <div>
-
-                        <div class="categoryOverview">
-                            %(overview)s
-                        </div>
+                    <div class="categoryOverview">
+                        %(overview)s
                     </div>
                 </td>
@@ -112 +70 @@
 
 <script type="text/javascript">
+
+    function buttonSubmitForm() {
+        var applyButtonWrapper = $E("applyButtonWrapper");
+        applyButtonWrapper.set(progressIndicator(true, false));
+        setTimeout(function(){
+            submitForm();
+        }, 30);
+
+    }
 
     function submitForm()
@@ -129 +96 @@
 
     Calendar.setup({
+        inputField: $E("dateContainer").dom,
+        ifFormat: IndicoDateTimeFormats.DefaultHourless,
         flat : "calendar-container",
         flatCallback :  dateChanged

indico/htdocs/css/Default.css

@@ -281 +281 @@
 
 .categoryOverview {
-    margin-top: 20px;
+    margin-top: 0px;
 }
 

indico/htdocs/css/calendar-blue.css

@@ -35 +35 @@
     border: 1px solid #888888;
     padding: 1px;
+    width: 183px;
 }
 
@@ -83 +84 @@
 .calendar thead .name { /* Cells <TD> containing the day names */
   border-bottom: 1px solid #AAA;
-  padding: 4px;
+  padding: 4px 2px;
   text-align: center;
   color: #000;
@@ -97 +98 @@
   border: 1px solid #AAA;
   border-top: none;
-  padding: 3px;
+  padding: 1px;
 }
 
@@ -111 +112 @@
   color: black;
   text-align: right;
-  padding: 3px 4px;
+  padding: 3px 2px;
 }
 .calendar tbody .day.othermonth {
@@ -138 +139 @@
 .calendar tbody td.hilite { /* Hovered cells <TD> */
   background: #EED79A;
-  padding: 1px 3px 1px 1px;
+  padding: 1px 1px 1px 1px;
   border: 1px solid #AAA;
 }
@@ -149 +150 @@
 .calendar tbody td.selected { /* Cell showing today date */
   font-weight: bold;
-  padding: 1px 3px 1px 1px;
+  padding: 1px 1px 1px 1px;
   background: #fff;
   color: #000;
@@ -262 +263 @@
   padding: 0px 2px 0px 3px;
   font-weight: bold;
+  display: None;
 }
 

indico/htdocs/js/calendar/calendar-setup.js

@@ -60 +60 @@
  *  saying "nothing to setup".
  */
- 
+
 // ** I18N
 
@@ -188 +188 @@
 Calendar._TT["WK"] = $T("wk");
 Calendar._TT["TIME"] = $T("Time:");
- 
+
 Calendar.setup = function (params) {
         function param_default(pname, def) { if (typeof params[pname] == "undefined") { params[pname] = def; } };
@@ -275 +275 @@
                         cal.setDateFormat(params.ifFormat);
                 }
+                cal.create(params.flat);
                 if (params.inputField && typeof params.inputField.value == "string") {
                         cal.parseDate(params.inputField.value);
                 }
-                cal.create(params.flat);
                 cal.show();
                 return false;