Changeset b48887 in indico
- Timestamp:
- 04/16/10 17:30:47 (3 years ago)
- 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:
- c8661fe
- Parents:
- 398f39
- git-author:
- David Martín Clavo <david.martin.clavo@…> (03/25/10 11:55:50)
- git-committer:
- Pedro Ferreira <jose.pedro.ferreira@…> (04/16/10 17:30:47)
- Location:
- indico
- Files:
-
- 9 edited
-
MaKaC/plugins/Collaboration/CERNMCU/common.py (modified) (3 diffs)
-
MaKaC/plugins/Collaboration/CERNMCU/pages.py (modified) (1 diff)
-
MaKaC/plugins/Collaboration/CERNMCU/tpls/InformationDisplay.tpl (modified) (5 diffs)
-
MaKaC/plugins/Collaboration/EVO/pages.py (modified) (5 diffs)
-
MaKaC/plugins/Collaboration/EVO/tpls/InformationDisplay.tpl (modified) (2 diffs)
-
MaKaC/plugins/Collaboration/base.py (modified) (1 diff)
-
MaKaC/webinterface/stylesheets/include/indico.xsl (modified) (2 diffs)
-
MaKaC/webinterface/tpls/BookingDisplay.tpl (modified) (4 diffs)
-
htdocs/css/Default.css (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
indico/MaKaC/plugins/Collaboration/CERNMCU/common.py
rdc92f9 rb48887 142 142 return self._affiliation 143 143 144 def getDisplayName(self ):144 def getDisplayName(self, truncate=True): 145 145 result = [] 146 146 if self._title: … … 154 154 result.append(self._affiliation) 155 155 result.append(')') 156 return ("".join(result))[:31] #31 is the max length accepted by the MCU 156 result = "".join(result) 157 if truncate: 158 return result[:31] #31 is the max length accepted by the MCU 159 else: 160 return result 157 161 158 162 … … 173 177 return self._institution 174 178 175 def getDisplayName(self ):179 def getDisplayName(self, truncate=True): 176 180 result = self._name 177 181 if self._institution: 178 182 result = result + ' (' + self._institution + ')' 179 return result[:31] #31 is the max length accepted by the MCU 183 if truncate: 184 return result[:31] #31 is the max length accepted by the MCU 185 else: 186 return result 180 187 181 188 class RoomWithH323(Fossilizable): -
indico/MaKaC/plugins/Collaboration/CERNMCU/pages.py
rdc92f9 rb48887 233 233 def getDisplayName(cls): 234 234 return "MCU Conference" 235 236 @classmethod 237 def getFirstLineInfo(cls, booking, displayTz): 238 return None 235 239 236 240 @classmethod -
indico/MaKaC/plugins/Collaboration/CERNMCU/tpls/InformationDisplay.tpl
r11debe rb48887 1 <table >1 <table cellpadding="0" cellspacing="0"> 2 2 <tbody> 3 3 <tr> 4 4 <td class="collaborationConfDisplayInfoLeftCol"> 5 < span><%= _('Name')%>:</span>5 <%= _('Name:')%> 6 6 </td> 7 7 <td class="collaborationConfDisplayInfoRightCol"> … … 12 12 <tr> 13 13 <td class="collaborationConfDisplayInfoLeftCol"> 14 < span><%= _('Protection')%>:</span>14 <%= _('Protection:')%> 15 15 </td> 16 16 <td class="collaborationConfDisplayInfoRightCol"> … … 21 21 <tr> 22 22 <td class="collaborationConfDisplayInfoLeftCol"> 23 < span><%= _('Description')%>:</span>23 <%= _('Description:')%> 24 24 </td> 25 25 <td class="collaborationConfDisplayInfoRightCol"> … … 29 29 <tr> 30 30 <td class="collaborationConfDisplayInfoLeftCol"> 31 < span><%= _('Participants')%>:</span>31 <%= _('Participants:')%> 32 32 </td> 33 33 <td class="collaborationConfDisplayInfoRightCol"> 34 34 <% if Booking.getParticipantList(): %> 35 35 <% for p in Booking.getParticipantList(): %> 36 <div><%= p.getDisplayName( ) %></div>36 <div><%= p.getDisplayName(truncate=False) %></div> 37 37 <% end %> 38 38 <% end %> … … 44 44 <tr> 45 45 <td class="collaborationConfDisplayInfoLeftCol"> 46 < span><%= _('How to join')%>:</span>46 <%= _('How to join:')%> 47 47 </td> 48 48 <td class="collaborationConfDisplayInfoRightCol"> -
indico/MaKaC/plugins/Collaboration/EVO/pages.py
r398f39 rb48887 106 106 107 107 vars["Booking"] = self._booking 108 vars["ListOfPhoneBridgeNumbersURL"] = getEVOOptionValueByName("phoneBridgeNumberList") 108 109 109 110 return vars … … 119 120 120 121 @classmethod 122 def getFirstLineInfo(cls, booking, displayTz): 123 return _('Phone Bridge ID:') + booking.getPhoneBridgeId()+ '.' 124 125 @classmethod 121 126 def getCustomBookingXML(cls, booking, displayTz, out): 122 127 booking.checkCanStart() … … 129 134 130 135 if booking.getBookingParamByName("displayPhoneBridgeId"): 131 out.writeTag("firstLineInfo", _('Phone Bridge ID:') + booking.getPhoneBridgeId())136 out.writeTag("firstLineInfo", XMLGenerator.getFirstLineInfo(booking, displayTz)) 132 137 133 138 out.openTag("information") … … 141 146 if not booking.getBookingParamByName("displayPassword") and not booking.getBookingParamByName("displayPhonePassword"): 142 147 out.openTag("section") 143 out.writeTag("title", _('P rotection:'))144 out.writeTag("line", _('This EVO meeting is protected by a p assword.'))148 out.writeTag("title", _('Password:')) 149 out.writeTag("line", _('This EVO meeting is protected by a private password.')) 145 150 out.closeTag("section") 146 151 else: … … 161 166 out.openTag("linkLine") 162 167 out.writeTag("href", getEVOOptionValueByName("phoneBridgeNumberList")) 163 out.writeTag("caption", _("List of phone bridge numbers ."))168 out.writeTag("caption", _("List of phone bridge numbers")) 164 169 out.closeTag("linkLine") 165 170 out.closeTag("section") -
indico/MaKaC/plugins/Collaboration/EVO/tpls/InformationDisplay.tpl
r11debe rb48887 1 <table >1 <table cellpadding="0" cellspacing="0"> 2 2 <tbody> 3 3 <tr> 4 4 <td class="collaborationConfDisplayInfoLeftCol"> 5 < span><%= _('Title')%>:</span>5 <%= _('Title:')%> 6 6 </td> 7 7 <td class="collaborationConfDisplayInfoRightCol"> … … 9 9 </td> 10 10 </tr> 11 11 12 <% if Booking.getHasAccessPassword(): %> 13 <% if not Booking.getBookingParamByName("displayPassword") and not Booking.getBookingParamByName("displayPhonePassword"): %> 14 <tr> 15 <td class="collaborationConfDisplayInfoLeftCol"> 16 <%= _('Password:')%> 17 </td> 18 <td class="collaborationConfDisplayInfoRightCol"> 19 <%= _("This EVO meeting is protected by a private password.") %> 20 </td> 21 </tr> 22 <% end %> 23 <% else: %> 24 <% if Booking.getBookingParamByName("displayPassword"): %> 25 <tr> 26 <td class="collaborationConfDisplayInfoLeftCol"> 27 <%= _('Password:')%> 28 </td> 29 <td class="collaborationConfDisplayInfoRightCol"> 30 <%= Booking.getAccessPassword() %> 31 </td> 32 </tr> 33 <% end %> 34 <% if Booking.getBookingParamByName("displayPhonePassword"): %> 35 <tr> 36 <td class="collaborationConfDisplayInfoLeftCol"> 37 <%= _('Phone Bridge Password:')%> 38 </td> 39 <td class="collaborationConfDisplayInfoRightCol"> 40 <%= Booking.getPhoneBridgePassword() %> 41 </td> 42 </tr> 43 <% end %> 44 <% end %> 45 <% end %> 46 47 <% if Booking.getBookingParamByName("displayPhoneBridgeNumbers"): %> 12 48 <tr> 13 49 <td class="collaborationConfDisplayInfoLeftCol"> 14 < span><%= _('Protection')%>:</span>50 <%= _('Phone bridge numbers:')%> 15 51 </td> 16 52 <td class="collaborationConfDisplayInfoRightCol"> 17 <%= _("This EVO meeting is protected by a password.") %> 53 <a target="_blank" href="<%= ListOfPhoneBridgeNumbersURL%>"> 54 <%= _('List of phone bridge numbers')%> 55 </a> 18 56 </td> 19 57 </tr> 20 58 <% end %> 59 60 <% if Booking.getBookingParamByName("displayURL"): %> 21 61 <tr> 22 62 <td class="collaborationConfDisplayInfoLeftCol"> 23 <span><%= _('Description')%>:</span> 63 <%= _('Auto-join URL:')%> 64 </td> 65 <td class="collaborationConfDisplayInfoRightCol"> 66 <%= Booking.getURL() %> 67 </td> 68 </tr> 69 <% end %> 70 71 <tr> 72 <td class="collaborationConfDisplayInfoLeftCol"> 73 <%= _('Description:')%> 24 74 </td> 25 75 <td class="collaborationConfDisplayInfoRightCol"> -
indico/MaKaC/plugins/Collaboration/base.py
r398f39 rb48887 1166 1166 return CollaborationTools.getXMLGenerator(self._type).getDisplayName() 1167 1167 1168 def _getFirstLineInfo(self, tz): 1169 return CollaborationTools.getXMLGenerator(self._type).getFirstLineInfo(self, tz) 1170 1168 1171 def _getTitle(self): 1169 1172 if self.hasEventDisplay(): 1170 1173 raise CollaborationException("Method _getTitle was not overriden for the plugin type " + str(self._type)) 1171 1172 1174 1173 1175 def _getInformationDisplay(self, tz): -
indico/MaKaC/webinterface/stylesheets/include/indico.xsl
r5e2ab0 rb48887 882 882 <xsl:if test="count(child::information) = 1"> 883 883 884 <xsl:text disable-output-escaping="yes"><![CDATA[885 <script type="text/javascript">886 887 $E('collaborationBookingMoreInfo]]></xsl:text>888 <xsl:value-of select="./id" disable-output-escaping="yes"/>889 <xsl:text disable-output-escaping="yes"><![CDATA[').dom.onmouseover = function (event) {890 IndicoUI.Widgets.Generic.tooltip($E('collaborationBookingMoreInfo]]></xsl:text>891 <xsl:value-of select="./id" disable-output-escaping="yes"/>892 <xsl:text disable-output-escaping="yes"><![CDATA[').dom, event, ]]></xsl:text>893 <xsl:text disable-output-escaping="yes">'<div class="collaborationLinkTooltipMeetingLecture"></xsl:text>894 <xsl:text>Click here to show / hide detailed information.</xsl:text>895 <xsl:text disable-output-escaping="yes"></div>'</xsl:text>896 <xsl:text disable-output-escaping="yes"><![CDATA[897 );898 }899 900 var bookingInfoState]]></xsl:text>901 <xsl:value-of select="./id" disable-output-escaping="yes"/>902 <xsl:text disable-output-escaping="yes"><![CDATA[ = false;903 $E('collaborationBookingMoreInfo]]></xsl:text>904 <xsl:value-of select="./id" disable-output-escaping="yes"/>905 <xsl:text disable-output-escaping="yes"><![CDATA[').observeClick(function() {906 if (bookingInfoState]]></xsl:text>907 <xsl:value-of select="./id" disable-output-escaping="yes"/>908 <xsl:text disable-output-escaping="yes"><![CDATA[) {909 IndicoUI.Effect.disappear($E('collaborationInfoLine]]></xsl:text>910 <xsl:value-of select="./id" disable-output-escaping="yes"/>911 <xsl:text disable-output-escaping="yes"><![CDATA['));912 $E('collaborationBookingMoreInfo]]></xsl:text>913 <xsl:value-of select="./id" disable-output-escaping="yes"/>914 <xsl:text disable-output-escaping="yes"><![CDATA[').set('More info');915 $E('collaborationBookingMoreInfo]]></xsl:text>916 <xsl:value-of select="./id" disable-output-escaping="yes"/>917 <xsl:text disable-output-escaping="yes"><![CDATA[').dom.className = "collaborationDisplayMoreInfo";918 } else {919 IndicoUI.Effect.appear($E('collaborationInfoLine]]></xsl:text>920 <xsl:value-of select="./id" disable-output-escaping="yes"/>921 <xsl:text disable-output-escaping="yes"><![CDATA['));922 $E('collaborationBookingMoreInfo]]></xsl:text>923 <xsl:value-of select="./id" disable-output-escaping="yes"/>924 <xsl:text disable-output-escaping="yes"><![CDATA[').set('Hide info');925 $E('collaborationBookingMoreInfo]]></xsl:text>926 <xsl:value-of select="./id" disable-output-escaping="yes"/>927 <xsl:text disable-output-escaping="yes"><![CDATA[').dom.className = "collaborationDisplayHideInfo";928 }929 bookingInfoState]]></xsl:text>930 <xsl:value-of select="./id" disable-output-escaping="yes"/>931 <xsl:text disable-output-escaping="yes"><![CDATA[ = !bookingInfoState]]></xsl:text>932 <xsl:value-of select="./id" disable-output-escaping="yes"/>933 <xsl:text disable-output-escaping="yes"><![CDATA[934 });935 </script>936 ]]></xsl:text>937 938 884 <!-- Start of a booking info line --> 939 <div class="collaborationDisplayInfoLine" id="collaborationInfoLine{./id}" style="display:none;"> 885 <div id="collaborationInfoLine{./id}" style="visibility: hidden; overflow: hidden;"> 886 <div class="collaborationDisplayInfoLine"> 940 887 <table> 941 888 <tbody> … … 963 910 </tbody> 964 911 </table> 912 </div> 965 913 </div> 914 915 <xsl:text disable-output-escaping="yes"><![CDATA[ 916 <script type="text/javascript"> 917 918 $E('collaborationBookingMoreInfo]]></xsl:text> 919 <xsl:value-of select="./id" disable-output-escaping="yes"/> 920 <xsl:text disable-output-escaping="yes"><![CDATA[').dom.onmouseover = function (event) { 921 IndicoUI.Widgets.Generic.tooltip($E('collaborationBookingMoreInfo]]></xsl:text> 922 <xsl:value-of select="./id" disable-output-escaping="yes"/> 923 <xsl:text disable-output-escaping="yes"><![CDATA[').dom, event, ]]></xsl:text> 924 <xsl:text disable-output-escaping="yes">'<div class="collaborationLinkTooltipMeetingLecture"></xsl:text> 925 <xsl:text>Click here to show / hide detailed information.</xsl:text> 926 <xsl:text disable-output-escaping="yes"></div>'</xsl:text> 927 <xsl:text disable-output-escaping="yes"><![CDATA[ 928 ); 929 } 930 931 var bookingInfoState]]></xsl:text> 932 <xsl:value-of select="./id" disable-output-escaping="yes"/> 933 <xsl:text disable-output-escaping="yes"><![CDATA[ = false; 934 935 var height]]></xsl:text> 936 <xsl:value-of select="./id" disable-output-escaping="yes"/> 937 <xsl:text disable-output-escaping="yes"><![CDATA[ = IndicoUI.Effect.prepareForSlide('collaborationInfoLine]]></xsl:text> 938 <xsl:value-of select="./id" disable-output-escaping="yes"/> 939 <xsl:text disable-output-escaping="yes"><![CDATA[', true); 940 941 $E('collaborationBookingMoreInfo]]></xsl:text> 942 <xsl:value-of select="./id" disable-output-escaping="yes"/> 943 <xsl:text disable-output-escaping="yes"><![CDATA[').observeClick(function() { 944 if (bookingInfoState]]></xsl:text> 945 <xsl:value-of select="./id" disable-output-escaping="yes"/> 946 <xsl:text disable-output-escaping="yes"><![CDATA[) { 947 IndicoUI.Effect.slide('collaborationInfoLine]]></xsl:text> 948 <xsl:value-of select="./id" disable-output-escaping="yes"/> 949 <xsl:text disable-output-escaping="yes"><![CDATA[', height]]></xsl:text> 950 <xsl:value-of select="./id" disable-output-escaping="yes"/> 951 <xsl:text disable-output-escaping="yes"><![CDATA[); 952 $E('collaborationBookingMoreInfo]]></xsl:text> 953 <xsl:value-of select="./id" disable-output-escaping="yes"/> 954 <xsl:text disable-output-escaping="yes"><![CDATA[').set('More info'); 955 $E('collaborationBookingMoreInfo]]></xsl:text> 956 <xsl:value-of select="./id" disable-output-escaping="yes"/> 957 <xsl:text disable-output-escaping="yes"><![CDATA[').dom.className = "collaborationDisplayMoreInfo"; 958 } else { 959 IndicoUI.Effect.slide('collaborationInfoLine]]></xsl:text> 960 <xsl:value-of select="./id" disable-output-escaping="yes"/> 961 <xsl:text disable-output-escaping="yes"><![CDATA[', height]]></xsl:text> 962 <xsl:value-of select="./id" disable-output-escaping="yes"/> 963 <xsl:text disable-output-escaping="yes"><![CDATA[); 964 $E('collaborationBookingMoreInfo]]></xsl:text> 965 <xsl:value-of select="./id" disable-output-escaping="yes"/> 966 <xsl:text disable-output-escaping="yes"><![CDATA[').set('Hide info'); 967 $E('collaborationBookingMoreInfo]]></xsl:text> 968 <xsl:value-of select="./id" disable-output-escaping="yes"/> 969 <xsl:text disable-output-escaping="yes"><![CDATA[').dom.className = "collaborationDisplayHideInfo"; 970 } 971 bookingInfoState]]></xsl:text> 972 <xsl:value-of select="./id" disable-output-escaping="yes"/> 973 <xsl:text disable-output-escaping="yes"><![CDATA[ = !bookingInfoState]]></xsl:text> 974 <xsl:value-of select="./id" disable-output-escaping="yes"/> 975 <xsl:text disable-output-escaping="yes"><![CDATA[ 976 }); 977 </script> 978 ]]></xsl:text> 979 966 980 </xsl:if> 967 981 <!-- End of a booking info line --> -
indico/MaKaC/webinterface/tpls/BookingDisplay.tpl
r11debe rb48887 5 5 <div class="collaborationDisplayBookingLine" style="padding-left: 20px"> 6 6 7 <div class="collaborationConfDisplayBookingLine"> 7 8 <span class="collaborationDisplayBookingType" style="font-style:italic"> 8 <%= Booking._getTypeDisplayName() %> :9 <%= Booking._getTypeDisplayName() %> 9 10 </span> 10 11 … … 63 64 <% end %>. 64 65 66 <% firstLineInfo = Booking._getFirstLineInfo(Timezone) %> 67 <% if firstLineInfo: %> 68 <%= firstLineInfo %> 69 <% end %> 70 65 71 <% displayInfo = Booking._getInformationDisplay(Timezone) %> 66 72 <% launchInfo = Booking._getLaunchDisplayInfo() %> 67 73 74 <% if displayInfo or launchInfo: %> 75 <span style="margin-left:20px;"></span> 76 <% end %> 77 68 78 <% if displayInfo: %> 69 <span class=" fakeLink collaborationDisplayLink" id="collaborationBookingMoreInfo<%=id%>"><%= _("More Info") %></span>79 <span class="collaborationDisplayMoreInfo" id="collaborationBookingMoreInfo<%=id%>"><%= _("More Info") %></span> 70 80 <% end %> 71 81 72 82 <% if displayInfo and Kind == 'ongoing' and launchInfo: %> 73 <span class="collaborationDisplayLink">|</span>83 <span style="margin-left: 5px; margin-right:5px;">|</span> 74 84 <% end %> 75 85 … … 85 95 </script> 86 96 <% end %> 97 </div> 87 98 88 99 <% if displayInfo: %> … … 99 110 if (bookingInfoState<%= Booking.getId() %>) { 100 111 IndicoUI.Effect.slide('collaborationInfoLine<%=id%>', height<%=id%>); 112 $E('collaborationBookingMoreInfo<%=id%>').set($T('More info')); 113 $E('collaborationBookingMoreInfo<%=id%>').dom.className = 'collaborationDisplayMoreInfo'; 101 114 } else { 102 115 IndicoUI.Effect.slide('collaborationInfoLine<%=id%>', height<%=id%>); 116 $E('collaborationBookingMoreInfo<%=id%>').set($T('Hide info')); 117 $E('collaborationBookingMoreInfo<%=id%>').dom.className = 'collaborationDisplayHideInfo'; 103 118 } 104 119 bookingInfoState<%=id%> = !bookingInfoState<%=id%>; -
indico/htdocs/css/Default.css
r5e2ab0 rb48887 4391 4391 } 4392 4392 4393 div.collaborationConfDisplayBookingLine { 4394 font-size:12px; 4395 } 4396 4397 td.collaborationConfDisplayInfoLeftCol { 4398 white-space: nowrap; 4399 text-align: right; 4400 padding-right: 10px; 4401 padding-left: 5px; 4402 } 4403 4404 td.collaborationConfDisplayInfoLeftCol, td.collaborationConfDisplayInfoRightCol { 4405 padding-top: 2px; 4406 padding-bottom: 2px; 4407 vertical-align: top; 4408 font-size: 11px; 4409 } 4410 4411 td.collaborationConfDisplayInfoRightCol { 4412 padding-right: 5px; 4413 } 4414 4415 td.collaborationConfDisplayInfoRightCol a { 4416 font-size: 11px; 4417 } 4418 4419 div.collaborationDisplayInfoLine tr:hover { 4420 background-color: #ECECEC; 4421 } 4422 4393 4423 div.collaborationLinkTooltipMeetingLecture { 4394 4424 padding: 3px; … … 4402 4432 div.collaborationDisplayInfoLine { 4403 4433 padding-top: 5px; 4404 padding-bottom: 10px; 4434 padding-bottom: 15px; 4435 padding-left: 20px; 4405 4436 } 4406 4437
Note: See TracChangeset
for help on using the changeset viewer.
