Changeset bc991f in indico for indico/MaKaC/webinterface/tpls/ConferenceInstantMessaging.tpl

Timestamp:

01/18/11 19:53:44 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

4bd938

Parents:

c1435a

git-author:

Cesar Munoz Orena <cesar.munoz.orena@…> (11/01/10 16:14:27)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (01/18/11 19:53:44)

Message:

[FIX] Adapted to sleekxmpp 1.0

• There was a problem while sending the chat room configuration.
• Also, a slight change was made when getting the rhmap.

More fixes:

• The join now! message is not appearing in two columns.
• Chat rooms that have a space have replaced it for a _, so no error is showed by the parameter manager by default.
• A couple of internationalization messages.
• ContextManager? used for the MailHelper?.
• Some refactor in the component to send mails.
• Operation of sending emails in AJAX requests wrapped inside an ExternalOperation?.

File:

• indico/MaKaC/webinterface/tpls/ConferenceInstantMessaging.tpl (modified) (2 diffs)

indico/MaKaC/webinterface/tpls/ConferenceInstantMessaging.tpl

@@ -37 +37 @@
                 <td style="font-family:monospace;"> <%= server%></td>
 
-                <td style="width:200px"><div id='desc<%= cr.getId() %>'> <%= cr.getDescription()%></div></td>
+                <td><div id='desc<%= cr.getId() %>'> <%= cr.getDescription()%></div></td>
 
                 <td> <%= _('Yes') if len(cr.getPassword()) > 0 else _('No')%></td>
@@ -45 +45 @@
                 <% end %>
                 <% elif not cr.getShowPass() and len(cr.getPassword()) > 0:%>
-                    <td style="font-style:italic"> <%= _('Not displayed')%> </td>
+                    <td style="font-style:italic;"> <%= _('Not displayed')%> </td>
                 <% end %>
                 <% else:%>
-                    <td style="font-style:italic"> - </td>
+                    <td style="font-style:italic;"> - </td>
                 <% end %>
                 <% if PluginFieldsWrapper('InstantMessaging', 'XMPP').getOption('joinDesktopClients') or PluginFieldsWrapper('InstantMessaging', 'XMPP').getOption('joinWebClient'): %>
-                    <td style="font-weight: bold" ><a id="joinLink" class="dropDownMenu highlight" href="#"><%= _("Join now!")%></a></td>
+                    <td style="font-weight: bold;" nowrap><a id="joinLink" class="dropDownMenu highlight" href="#"><%= _("Join now!")%></a></td>
                 <% end %>
                 </tr>