Changeset 154973e in indico

Timestamp:

02/22/12 08:51:51 (15 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

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

Children:

ef7e5c

Parents:

84cc6f

git-author:

Alberto Resco Perez <alberto.resco.perez@…> (02/21/12 17:08:50)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (02/22/12 08:51:51)

Message:

[FIX] Button for add user/groups popup

Location:

indico

Files:

• MaKaC/webinterface/tpls/ConferenceParticipants.tpl (modified) (1 diff)
• htdocs/js/indico/Core/Dialogs/Users.js (modified) (1 diff)

indico/MaKaC/webinterface/tpls/ConferenceParticipants.tpl

@@ -20 +20 @@
                               <a href="#">${_("Add")}</a>
                               <ul>
-                                <li><a href="#" id="add_existing_user">${_("Indico User")}</a></li>
+                                <li><a href="#" id="add_existing_user">${_("Indico User / Group")}</a></li>
                                 <li><a href="#" id="add_new_user">${_("New user")}</a></li>
                                 % if nowutc() < self_._conf.getStartDate() :

indico/htdocs/js/indico/Core/Dialogs/Users.js

@@ -1532 +1532 @@
         if (this.allowSearch || this.includeFavourites || exists(this.suggestedUsers)) {
 
-            var chooseUserButton = Html.input("button", {style:{marginRight: pixels(5)}}, $T('Add Indico User'));
+            var chooseUserButton = Html.input("button", {style:{marginRight: pixels(5)}}, $T('Add Indico User'+(this.enableGroups?" / Group":"")));
 
             var title = "";