Changeset df7cbd in indico

Timestamp:

07/29/11 18:05:02 (22 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

6c87d3

Parents:

4d8700

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (07/29/11 15:41:02)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (07/29/11 18:05:02)

Message:

[FIX] Several template fixes

• Old style templates were still there;

Location:

indico/MaKaC/webinterface/tpls

Files:

• ConfModAbstractBook.tpl (modified) (1 diff)
• RBAdminFrame.tpl (modified) (1 diff)
• RoomBookingRoomForm.tpl (modified) (2 diffs)

indico/MaKaC/webinterface/tpls/ConfModAbstractBook.tpl

@@ -11 +11 @@
         </td>
         <td bgcolor="white" width="100%" class="blacktext">
-            <% if showIds: %>
+            % if showIds:
                 <% icon = str(Config.getInstance().getSystemIconURL( "enabledSection" )) %>
-            <% end %>
-            <% else: %>
+            % else:
                 <% icon = str(Config.getInstance().getSystemIconURL( "disabledSection" )) %>
-            <% end %>
-            <a href="<%= urlToogleShowIds %>"><img src="<%= icon %>"> <%= _("Show Abstract IDs") %></a> <%= _("(Table of Contents)") %>
+            % endif
+            <a href="${ urlToogleShowIds }"><img src="${ icon }"> ${ _("Show Abstract IDs") }</a> ${ _("(Table of Contents)") }
         </td>
     </tr>

indico/MaKaC/webinterface/tpls/RBAdminFrame.tpl

@@ -1 @@
-<div class="banner"><span class="bannerTitle bannerTitle_0"><%= _("Room Booking Administration") %></span></div>
+<div class="banner"><span class="bannerTitle bannerTitle_0"><${ _("Room Booking Administration") }</span></div>
 
 <!-- Body -->
 <div class="container">
-    <%= body %>
+    ${ body }
 </div>
 <!-- End of body -->

indico/MaKaC/webinterface/tpls/RoomBookingRoomForm.tpl

@@ -32 +32 @@
         </div>
         <div id="resvStartNotificationCH" class="tip">
-             <%= _("Whether to trigger notifications when a booking for the room begins.")%>
+             ${ _("Whether to trigger notifications when a booking for the room begins.") }
         </div>
         <div id="resvEndNotificationCH" class="tip">
-             <%= _("Whether to trigger notifications when a booking for the room ends.")%>
+             ${ _("Whether to trigger notifications when a booking for the room ends.") }
         </div>
         <div id="whereIsKeyCH" class="tip">
@@ -159 +159 @@
                                         </tr>
                                         <tr>
-                                            <td align="right" valign="top"><small> <%= _("Notification on booking start")%>&nbsp;&nbsp;</small></td>
-                                            <td align="left" class="blacktext"><input type="checkbox" <% if room.resvStartNotification: %> checked="checked" <% end %> id="resvStartNotification" name="resvStartNotification" /> <% contextHelp( 'resvStartNotificationCH' ) %></td>
-                                        </tr>
-                                        <tr>
-                                            <td align="right" valign="top"><small> <%= _("Notification on booking end")%>&nbsp;&nbsp;</small></td>
-                                            <td align="left" class="blacktext"><input type="checkbox" <% if room.resvEndNotification: %> checked="checked" <% end %> id="resvEndNotification" name="resvEndNotification" /> <% contextHelp( 'resvEndNotificationCH' ) %></td>
+                                            <td align="right" valign="top"><small> ${ _("Notification on booking start")}&nbsp;&nbsp;</small></td>
+                                            <td align="left" class="blacktext"><input type="checkbox" ${'checked="checked"' if room.resvStartNotification else ''} id="resvStartNotification" name="resvStartNotification" /> ${ contextHelp( 'resvStartNotificationCH' ) }</td>
+                                        </tr>
+                                        <tr>
+                                            <td align="right" valign="top"><small> ${ _("Notification on booking end")}&nbsp;&nbsp;</small></td>
+                                            <td align="left" class="blacktext"><input type="checkbox" ${'checked="checked"' if room.resvEndNotification else ''} id="resvEndNotification" name="resvEndNotification" /> ${ contextHelp( 'resvEndNotificationCH' ) }</td>
                                         </tr>
                                     </table>