Changeset bda086 in indico

Timestamp:

06/17/10 17:32:31 (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, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

8df9bb

Parents:

18ea58

git-author:

Leszek Syroka <leszek.marek.syroka@…> (05/28/10 14:53:15)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (06/17/10 17:32:31)

Message:

[FIX] Remove chairperson text modification

• if chairperson text is empty it's not displayed in event modification page
• if chairperson text is not empty input field, containing it, is disabled and text can be removed by clicking at the red cross next to it
• tooltip added
• fix#408

Location:

indico/MaKaC

Files:

• po/locale/fr_FR/LC_MESSAGES/messages.po (modified) (1 diff)
• webinterface/tpls/ConferenceDataModification.tpl (modified) (3 diffs)

indico/MaKaC/po/locale/fr_FR/LC_MESSAGES/messages.po

@@ -16475 +16475 @@
 msgstr "Texte du responsable"
 
+#: /home/pferreir/indico/cds-indico/indico/MaKaC/webinterface/tpls/ConferenceDataModification.tpl
+msgid "Chairperson text is deprecated, use chairpersons list instead.<br>Click on the red cross to remove the text."
+msgstr "Le texte du responsable est obsolÚte, veuillez utiliser la liste des responsables à la place.<br>Cliquez sur la croix rouge pour supprimer le texte."
+
 #: /home/pferreir/indico/cds-indico/indico/MaKaC/webinterface/tpls/RoomBookingManyRoomsCalendar.tpl:15
 #: /home/pferreir/indico/cds-indico/indico/MaKaC/webinterface/tpls/RoomBookingRoomCalendar.tpl:41

indico/MaKaC/webinterface/tpls/ConferenceDataModification.tpl

@@ -70 +70 @@
         </tr>
         <!-- TO REMOVE CHAIRPERSON TEXT -->
-        <% if conference.getType() != "simple_event": %>
+        <% if conference.getType() != "simple_event" and chairText != '""': %>
         <tr>
             <td nowrap class="titleCellTD"><span class="titleCellFormat"> <%= _("Chairperson text")%></span></td>
             <td bgcolor="white" width="100%%">
-                <input type="text" name="chairText" value=%(chairText)s size="50">
+                <input type="text" name="chairText" id="chairText" value=%(chairText)s size="50" disabled="disabled">
+                <span id="removeChairpersonText"></span>
+                <% inlineContextHelp( _("Chairperson text is deprecated, use chairpersons list instead.<br>Click on the red cross to remove the text.") ) %>
             </td>
         </tr>
@@ -133 +135 @@
         IndicoUI.executeOnLoad(function()
         {
-
         var startDate = IndicoUI.Widgets.Generic.dateField(true,null,['sDay', 'sMonth', 'sYear','sHour', 'sMinute']);
         $E('sDatePlace').set(startDate);
@@ -139 +140 @@
         var endDate = IndicoUI.Widgets.Generic.dateField(true,null,['eDay', 'eMonth', 'eYear', 'eHour', 'eMinute']);
         $E('eDatePlace').set(endDate);
+
+        <% if conference.getType() != "simple_event" and chairText != '""': %>
+            var removeChairpersonTextButton = Html.img({src: imageSrc("remove.png")});
+            removeChairpersonTextButton.observeClick( function(){
+                $E('chairText').dom.value = "";
+            });
+
+            $E('removeChairpersonText').set(removeChairpersonTextButton);
+        <% end %>
 
         <% if sDay != '': %>