Changeset afd571 in indico

Timestamp:

08/05/10 19:33:08 (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, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

e77daf

Parents:

da025d

git-author:

Leszek Syroka <leszek.marek.syroka@…> (06/30/10 16:57:09)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (08/05/10 19:33:08)

Message:

[FIX] Poster session - contribution improvements

• duration when adding a contribution is hidden
• duration when displaying the list of contributions for a poster session (from both, display and management area) is hidden
• "Add new > contribution" is now "Add poster"
• fix#466

Location:

indico

Files:

• MaKaC/webinterface/pages/conferences.py (modified) (1 diff)
• MaKaC/webinterface/pages/contributions.py (modified) (3 diffs)
• MaKaC/webinterface/tpls/ContribModifMain.tpl (modified) (1 diff)
• MaKaC/webinterface/tpls/ContributionDataModification.tpl (modified) (3 diffs)
• MaKaC/webinterface/tpls/ContributionDisplayFull.tpl (modified) (1 diff)
• htdocs/js/indico/Management/Timetable.js (modified) (2 diffs)
• htdocs/js/indico/Timetable/Base.js (modified) (1 diff)
• htdocs/js/indico/Timetable/Draw.js (modified) (2 diffs)
• htdocs/js/indico/Timetable/Management.js (modified) (1 diff)

indico/MaKaC/webinterface/pages/conferences.py

@@ -7376 +7376 @@
         title = """<a href=%s>%s</a>"""%( quoteattr( str( urlHandlers.UHContributionModification.getURL( contrib ) ) ), self.htmlText( contrib.getTitle() ))
         strdur = ""
-        if contrib.getDuration() is not None and contrib.getDuration().seconds != 0:
+        if contrib.getSession() and contrib.getSession()._ttType == 'poster':
+            strdur = 'poster'
+        elif contrib.getDuration() is not None and contrib.getDuration().seconds != 0:
             strdur = (datetime(1900,1,1)+ contrib.getDuration()).strftime("%Hh%M'")
             dur = contrib.getDuration()

indico/MaKaC/webinterface/pages/contributions.py

@@ -282 +282 @@
         vars["reviewingStuffDisplay"]= contributionReviewing.WContributionReviewingDisplay(self._contrib).getHTML({"ShowReviewingTeam" : False})
         vars["reviewingHistoryStuffDisplay"]= contributionReviewing.WContributionReviewingHistory(self._contrib).getHTML({"ShowReviewingTeam" : False})
+        if self._contrib.getSession():
+            vars["sessionType"] = self._contrib.getSession()._ttType
+        else:
+            vars["sessionType"] = 'none'
         return vars
 
@@ -753 +757 @@
         vars["reportNumbersTable"]=wcomponents.WReportNumbersTable(self._contrib,"contribution").getHTML()
         vars["keywords"]=self._contrib.getKeywords()
+        if self._contrib.getSession():
+            vars["sessionType"] = self._contrib.getSession()._ttType
+        else:
+            vars["sessionType"] = 'none'
         return vars
 
@@ -1344 +1352 @@
         minfo = info.HelperMaKaCInfo.getMaKaCInfoInstance()
         vars["useRoomBookingModule"] = minfo.getRoomBookingModuleActive()
+        if self._contrib.getSession():
+            vars["sessionType"] = self._contrib.getSession()._ttType
+        else:
+            vars["sessionType"] = 'none'
         return vars
 

indico/MaKaC/webinterface/tpls/ContribModifMain.tpl

@@ -59 +59 @@
                     </td>
                 </tr>
+                <% if sessionType != "poster": %>
                 <tr>
                     <td class="dataCaptionTD"><span class="dataCaptionFormat"><%= _("Duration")%></span</td>
                     <td bgcolor="white" class="blacktext">%(duration)s</td>
                 </tr>
+                <% end %>
                 <tr>
                     <td class="dataCaptionTD"><span class="dataCaptionFormat"> <%= _("Type")%></span</td>

indico/MaKaC/webinterface/tpls/ContributionDataModification.tpl

@@ -36 +36 @@
           <td><span id="dateTime"></span></td>
         </tr>
+    <% if sessionType != 'poster': %>
         <tr>
           <td style="text-align: right;">
@@ -42 +43 @@
           <td><span id="duration"></span></td>
         </tr>
+    <% end %>
         <% includeTpl('EventLocationInfo', event=self._rh._target, modifying=True, parentRoomInfo=roomInfo(self._rh._target, level='inherited'), showParent=True) %>
 
@@ -74 +76 @@
 $E('dateTime').set('Not scheduled')
 <% end %>
-
-var duration = IndicoUI.Widgets.Generic.durationField('<%= duration %>', {name: 'duration'});
-$E('duration').set(duration)
+<% if sessionType != 'poster': %>
+    var duration = IndicoUI.Widgets.Generic.durationField('<%= duration %>', {name: 'duration'});
+    $E('duration').set(duration)
+<% end %>
 
 injectValuesInForm($E('ContributionDataModificationForm'));

indico/MaKaC/webinterface/tpls/ContributionDisplayFull.tpl

@@ -59 +59 @@
                         </td>
                     </tr>
+            <% if sessionType != "poster": %>
                     <tr>
                         <td align="right" valign="top" class="displayField"><b><%= _("Duration")%>:</b></td>
                         <td width="100%%">%(duration)s</td>
                     </tr>
+            <% end %>
                                         %(contribType)s
                                         %(primaryAuthors)s

indico/htdocs/js/indico/Management/Timetable.js

@@ -377 +377 @@
                 ],
                 [$T('Place'), Html.div({style: {marginBottom: '15px'}}, this.roomEditor.draw())],
-                daySelect,
-                startTimeLine,
+                this.timetable.isPoster?Html.div({}):daySelect,
+                this.timetable.isPoster?Html.div({}):startTimeLine,
                 [$T('Presenter(s)'), presListWidget.draw()]
             ]);
@@ -572 +572 @@
              };
          this.startTimeField = IndicoUI.Widgets.Generic.timeField(attributes);
-         this.timeField = IndicoUI.Widgets.Generic.durationField(20);
+         this.timeField = IndicoUI.Widgets.Generic.durationField(this.timetable.isPoster?1:20);
 
          var killProgress = IndicoUI.Dialogs.Util.progress($T("Loading dialog..."));

indico/htdocs/js/indico/Timetable/Base.js

@@ -1134 +1134 @@
 
          this.canvas = Html.div({});
-
+         this.isPoster = contextInfo.isPoster;
 
          this.setData = IntervalTimeTableMixin.prototype.setData;

indico/htdocs/js/indico/Timetable/Draw.js

@@ -860 +860 @@
                     value.title) :
                     Html.span({}, value.title);
-                contributions.append(Html.tr({}, Html.td('timetablePopupContributionTime', self.eventData.r ? '-' : value.startDate.time.substr(0,5)),
+                contributions.append(Html.tr({}, Html.td('timetablePopupContributionTime', self.eventData.r || self.eventData.isPoster ? '-' : value.startDate.time.substr(0,5)),
                                              Html.td('timetablePopupContributionTitle', element)));
             }
@@ -1691 +1691 @@
                 var entryTools = Html.div({style:{cssFloat: "right"}},editLink," | ",deleteLink);
                 var entryInfo = Html.div({},blockData.contributionId + " - " + blockData.title );
-                var timeDiv = Html.div("posterBlockTime", blockData.startDate.time.substring(0,5) +' - '+ blockData.endDate.time.substring(0,5));
                 var block = Html.div({className:'posterEntry'},
                     entryTools,
                     entryInfo,
-                    Html.div({},timeDiv));
+                    Html.div({}));
                 blockDiv.append(block);
                 self.blocks.push(block);

indico/htdocs/js/indico/Timetable/Management.js

@@ -274 +274 @@
 
         if (this._allowCreateHere('Contribution')){
-            menuItems[$T('Contribution')] = function() { self.addContribution(); };
+            menuItems[target.isPoster?$T('Poster'):$T('Contribution')] = function() { self.addContribution(); };
         }