From 2ab51344bc6267c48735aca36a33ca097dd2d39b Mon Sep 17 00:00:00 2001 From: Alberto Resco Perez Date: Wed, 9 Nov 2011 16:55:48 +0100 Subject: [PATCH] [FIX] Administrative style session display. - Display sessions even if there is only one session. --- .../meetings/administrative/include/Session.tpl | 141 ++++++++++----------- 1 file changed, 69 insertions(+), 72 deletions(-) rewrite indico/MaKaC/webinterface/tpls/events/meetings/administrative/include/Session.tpl (63%) diff --git a/indico/MaKaC/webinterface/tpls/events/meetings/administrative/include/Session.tpl b/indico/MaKaC/webinterface/tpls/events/meetings/administrative/include/Session.tpl dissimilarity index 63% index 93652ea53..7c802d542 100644 --- a/indico/MaKaC/webinterface/tpls/events/meetings/administrative/include/Session.tpl +++ b/indico/MaKaC/webinterface/tpls/events/meetings/administrative/include/Session.tpl @@ -1,72 +1,69 @@ -<%page args="item, parent=None, allMaterial=False, hideTime=True, materialSession=False, order=1, showOrder=True"/> - -<%namespace name="common" file="${context['INCLUDE']}/Common.tpl"/> - -<% session = item.getSession() %> - -<% conf = item.getConference() %> - - -% if len(conf.getSessionList()) != 1: - - - <%include file="${INCLUDE}/ManageButton.tpl" args="item=item, alignRight=True"/> - -
- - ${session.getTitle()} - - % if getLocationInfo(item) == getLocationInfo(parent): - (${common.renderLocationAdministrative(parent)}) - % elif getLocationInfo(item)!=('','',''): - (${common.renderLocationAdministrative(item)}) - % endif -
- - - % if len(session.getAllMaterialList()) > 0 and allMaterial: - % for material in session.getAllMaterialList(): - % if material.canView(accessWrapper): - ${material.getTitle()}  - % endif - % endfor - % elif materialSession and len(session.getAllMaterialList()) > 0: - % for material in session.getAllMaterialList(): - % if material.canView(accessWrapper): - % if material.getTitle()!='document' or not conf.getReportNumberHolder().listReportNumbers(): - ${material.getTitle()} - % endif - % endif - % endfor - % endif - - - - - -
- % if session.getDescription(): - ${session.getDescription()} -
- % endif - - -%endif - -% if len(item.getSchedule().getEntries()) > 0: - <% subentries = item.getSchedule().getEntries()%> - - % for subindex, subitem in enumerate(subentries): - <% - if subitem.__class__.__name__ != 'BreakTimeSchEntry': - subitem = subitem.getOwner() - if not subitem.canView(accessWrapper): - continue - %> - <%include file="${getItemType(subitem)}.tpl" args="item=subitem, parent=item, hideTime=hideTime, order=order, showOrder=showOrder"/> - % if getItemType(subitem) == "Contribution": - <% order +=1 %> - % endif - % endfor - -% endif \ No newline at end of file +<%page args="item, parent=None, allMaterial=False, hideTime=True, materialSession=False, order=1, showOrder=True"/> + +<%namespace name="common" file="${context['INCLUDE']}/Common.tpl"/> + +<% session = item.getSession() %> + +<% conf = item.getConference() %> + + + + <%include file="${INCLUDE}/ManageButton.tpl" args="item=item, alignRight=True"/> + +
+ + ${session.getTitle()} + + % if getLocationInfo(item) == getLocationInfo(parent): + (${common.renderLocationAdministrative(parent)}) + % elif getLocationInfo(item)!=('','',''): + (${common.renderLocationAdministrative(item)}) + % endif +
+ + + % if len(session.getAllMaterialList()) > 0 and allMaterial: + % for material in session.getAllMaterialList(): + % if material.canView(accessWrapper): + ${material.getTitle()}  + % endif + % endfor + % elif materialSession and len(session.getAllMaterialList()) > 0: + % for material in session.getAllMaterialList(): + % if material.canView(accessWrapper): + % if material.getTitle()!='document' or not conf.getReportNumberHolder().listReportNumbers(): + ${material.getTitle()} + % endif + % endif + % endfor + % endif + + + + + +
+ % if session.getDescription(): + ${session.getDescription()} +
+ % endif + + + +% if len(item.getSchedule().getEntries()) > 0: + <% subentries = item.getSchedule().getEntries()%> + + % for subindex, subitem in enumerate(subentries): + <% + if subitem.__class__.__name__ != 'BreakTimeSchEntry': + subitem = subitem.getOwner() + if not subitem.canView(accessWrapper): + continue + %> + <%include file="${getItemType(subitem)}.tpl" args="item=subitem, parent=item, hideTime=hideTime, order=order, showOrder=showOrder"/> + % if getItemType(subitem) == "Contribution": + <% order +=1 %> + % endif + % endfor + +% endif \ No newline at end of file -- 2.11.4.GIT