[evolvis-commits] r18717: upstream pending merges:↵ Thorsten Glaser 2012-10-07 tell the user what is expected *before* they do anything (usability)↵ Thorsten Glaser 2012-10-06 use common code to display number of active site users

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Oct 8 14:43:29 CEST 2012


Author: mirabilos
Date: 2012-10-08 14:43:29 +0200 (Mon, 08 Oct 2012)
New Revision: 18717

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/www/plugin_admin.php
   trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
   trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot
   trunk/gforge_base/evolvisforge-5.1/src/www/admin/index.php
Log:
upstream pending merges:
  Thorsten Glaser 2012-10-07 tell the user what is expected *before* they do anything (usability)
    Thorsten Glaser 2012-10-06 use common code to display number of active site users

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-10-08 12:43:24 UTC (rev 18716)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-10-08 12:43:29 UTC (rev 18717)
@@ -6,8 +6,9 @@
   * Improve UI colours in Site Admin → Display Full User List
   * Use Gravatar in more places
   * Repair ECMAscript used to handle multiple-assignment checkboxen
+  * Usability: MediaWiki Plugin Admin now tells the expected format
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Mon, 08 Oct 2012 14:32:43 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Mon, 08 Oct 2012 14:40:40 +0200
 
 fusionforge (1:5.1.1+evolvis73) unstable; urgency=low
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/www/plugin_admin.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/www/plugin_admin.php	2012-10-08 12:43:24 UTC (rev 18716)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/www/plugin_admin.php	2012-10-08 12:43:29 UTC (rev 18717)
@@ -171,6 +171,7 @@
  style="border:solid 1px black; margin:3px; padding:3px;"
  action="<?php echo getStringFromServer('PHP_SELF')."?group_id=$gid"; ?>">
 <h4><?php echo _("Upload a new logo") ?></h4>
+<p><?php echo _('The logo must be in PNG format and precisely 135x135 pixels in size.'); ?></p>
 <span class="important">
  <?php echo _('NOTE: In some browsers you must select the file in the file-upload dialog and click "OK".  Double-clicking doesn\'t register the file.')?>)
 </span>

Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/de.po	2012-10-08 12:43:24 UTC (rev 18716)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/de.po	2012-10-08 12:43:29 UTC (rev 18717)
@@ -3,8 +3,8 @@
 msgstr ""
 "Project-Id-Version: EvolvisForge 5.1+evolvis74\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-08 14:14+0200\n"
-"PO-Revision-Date: 2012-10-08 12:11+0200\n"
+"POT-Creation-Date: 2012-10-08 14:39+0200\n"
+"PO-Revision-Date: 2012-10-08 14:40+0200\n"
 "Last-Translator: Thorsten Glaser <t.glaser at tarent.de>\n"
 "Language-Team: german\n"
 "Language: de\n"
@@ -383,7 +383,7 @@
 #: common/docman/views/listfile.php:204 common/docman/views/listfile.php:206
 #: common/forum/ForumHTML.class.php:65 common/forum/ForumHTML.class.php:224
 #: common/forum/ForumHTML.class.php:465 common/include/descriptive.php:133
-#: common/pm/ProjectTask.class.php:1249 common/tracker/Artifact.class.php:1547
+#: common/pm/ProjectTask.class.php:1250 common/tracker/Artifact.class.php:1547
 #: common/tracker/Artifact.class.php:1639
 #: common/widget/Widget_MyLatestSvnCommits.class.php:65
 #: common/widget/Widget_ProjectInfo.class.php:66
@@ -513,7 +513,7 @@
 msgstr "Gruppiere die Dokument-Zugehörigkeit in:"
 
 #: common/docman/include/utils.php:327 common/docman/views/editfile.php:132
-#: www/pm/browse_task.php:654 www/project/admin/database.php:208
+#: www/pm/browse_task.php:657 www/project/admin/database.php:208
 #: www/tracker/admin/form-customizelist.php:44 www/tracker/browse.php:527
 #: www/tracker/browse.php:689 www/tracker/browse.php:942
 #: www/tracker/query.php:346
@@ -2257,7 +2257,7 @@
 msgstr "Liste aller öffentlich zugänglichen Projekte"
 
 #: common/include/Navigation.class.php:257 www/admin/globalroleedit.php:139
-#: www/admin/index.php:40
+#: www/admin/index.php:41
 msgid "Site Admin"
 msgstr "Site-Admin"
 
@@ -2397,7 +2397,7 @@
 #: common/include/Navigation.class.php:518
 #: common/include/group_section_texts.php:33 plugins/blocks/www/index.php:173
 #: plugins/quota_management/www/quota_project.php:75 www/activity/index.php:97
-#: www/activity/index.php:293 www/admin/index.php:157 www/news/index.php:35
+#: www/activity/index.php:293 www/admin/index.php:156 www/news/index.php:35
 msgid "News"
 msgstr "Neuigkeiten"
 
@@ -3614,7 +3614,7 @@
 msgid "setAssignedTo(): Error “%1$s” assigning to %2$d"
 msgstr "setAssignedTo(): Fehler „%1$s“ aufgetreten beim Zuweisen an %2$d"
 
-#: common/pm/ProjectTask.class.php:1259
+#: common/pm/ProjectTask.class.php:1260
 #, fuzzy, php-format
 msgid "[%1$s - %2$s] [Task #%3$d] "
 msgstr "[%1$s - %2$s] Task [#%3$d] "
@@ -4061,7 +4061,7 @@
 #: plugins/forumml/www/forumml_utils.php:603 plugins/forumml/www/index.php:126
 #: www/account/pending-resend.php:75 www/activity/index.php:169
 #: www/admin/admin_table.php:212 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:263 www/admin/index.php:152
+#: www/admin/globalroleedit.php:263 www/admin/index.php:151
 #: www/admin/pending-news.php:173 www/forum/admin/index.php:427
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/news/admin/index.php:161
@@ -7131,7 +7131,7 @@
 msgid "-tooltip:plugin:mantisbt:admin"
 msgstr ""
 
-#: plugins/mantisbt/www/index.php:52 www/admin/index.php:162
+#: plugins/mantisbt/www/index.php:52 www/admin/index.php:161
 msgid "Stats"
 msgstr "Statistiken"
 
@@ -7349,7 +7349,12 @@
 msgid "Upload a new logo"
 msgstr "Ein neues Logo hochladen"
 
-#: plugins/mediawiki/www/plugin_admin.php:175
+#: plugins/mediawiki/www/plugin_admin.php:174
+msgid "The logo must be in PNG format and precisely 135x135 pixels in size."
+msgstr ""
+"Das Logo muß im PNG-Format vorliegen und exakt 135x135 Pixel groß sein."
+
+#: plugins/mediawiki/www/plugin_admin.php:176
 msgid ""
 "NOTE: In some browsers you must select the file in the file-upload dialog "
 "and click \"OK\".  Double-clicking doesn't register the file."
@@ -7358,12 +7363,12 @@
 "auswählen und dann auf \"OK\" klicken. Ein Doppelklick wählt die Datei nicht "
 "aus."
 
-#: plugins/mediawiki/www/plugin_admin.php:177
+#: plugins/mediawiki/www/plugin_admin.php:178
 #: www/frs/admin/editrelease.php:283 www/frs/admin/qrs.php:203
 msgid "Upload a new file"
 msgstr "Eine neue Datei hochladen"
 
-#: plugins/mediawiki/www/plugin_admin.php:184
+#: plugins/mediawiki/www/plugin_admin.php:185
 #: www/frs/admin/editrelease.php:298 www/frs/admin/qrs.php:219
 #, php-format
 msgid ""
@@ -7374,7 +7379,7 @@
 "\"%2$s\">incoming-Verzeichnis (%1$s) des Projektes</a> hochgeladen wurde, "
 "auswählen."
 
-#: plugins/mediawiki/www/plugin_admin.php:186
+#: plugins/mediawiki/www/plugin_admin.php:187
 #: www/frs/admin/editrelease.php:300 www/frs/admin/qrs.php:221
 msgid ""
 "This direct <tt>sftp://</tt> link only works with some browsers, such as "
@@ -7383,17 +7388,17 @@
 "Dieser direkte <tt>sftp://</tt>-Link funktioniert nur mit manchen Browsern, "
 "zum Beispiel Konqueror."
 
-#: plugins/mediawiki/www/plugin_admin.php:187
+#: plugins/mediawiki/www/plugin_admin.php:188
 #: www/frs/admin/editrelease.php:288 www/frs/admin/editrelease.php:301
 #: www/frs/admin/qrs.php:222
 msgid "Choose an already uploaded file:"
 msgstr "Bereits hochgeladene Datei wählen:"
 
-#: plugins/mediawiki/www/plugin_admin.php:193
+#: plugins/mediawiki/www/plugin_admin.php:194
 msgid "… or delete the currently uploaded logo and revert to the site default"
 msgstr "… oder das zur Zeit aktive Logo löschen und zum Standard revertieren"
 
-#: plugins/mediawiki/www/plugin_admin.php:194
+#: plugins/mediawiki/www/plugin_admin.php:195
 msgid "Upload new logo"
 msgstr "Neues Logo hochladen"
 
@@ -10172,7 +10177,7 @@
 msgid "Section %s"
 msgstr "Sektion"
 
-#: www/admin/cronman.php:30 www/admin/index.php:181
+#: www/admin/cronman.php:30 www/admin/index.php:180
 msgid "Cron Manager"
 msgstr "Cron-Manager"
 
@@ -10397,7 +10402,7 @@
 msgstr "Projekt dauerhaft löschen"
 
 #: www/admin/groupedit.php:114 www/admin/groupedit.php:126
-#: www/admin/index.php:148 www/admin/useredit.php:131
+#: www/admin/index.php:147 www/admin/useredit.php:131
 #: www/admin/useredit.php:137
 msgid "Pending (P)"
 msgstr "Anstehend (P)"
@@ -10406,7 +10411,7 @@
 msgid "Incomplete (I)"
 msgstr "Unvollständig (I)"
 
-#: www/admin/groupedit.php:125 www/admin/index.php:146
+#: www/admin/groupedit.php:125 www/admin/index.php:145
 #: www/admin/useredit.php:33 www/admin/useredit.php:132
 #: www/admin/useredit.php:138 www/admin/useredit.php:142
 msgid "Active (A)"
@@ -10471,176 +10476,176 @@
 msgid "Projects that begin with \"%s\""
 msgstr "Projekte, die mit \"%s\" anfangen"
 
-#: www/admin/index.php:46
+#: www/admin/index.php:47
 msgid "User Maintenance"
 msgstr "Benutzerverwaltung"
 
-#: www/admin/index.php:53
+#: www/admin/index.php:51
 #, php-format
-msgid "Active site users: <strong>%1$s</strong>"
-msgstr "Aktive Seitenbenutzer: <strong>%1$s</strong>"
+msgid "Active site users: <strong>%d</strong>"
+msgstr "Aktive Benutzer: <strong>%d</strong>"
 
-#: www/admin/index.php:57
+#: www/admin/index.php:56
 msgid "Display Full User List/Edit Users"
 msgstr "Zeige vollständige Benutzerliste/Bearbeite Benutzer"
 
-#: www/admin/index.php:59
+#: www/admin/index.php:58
 #, fuzzy
 msgid "Display Users Beginning with:"
 msgstr "Zeige Benutzer, die anfangen mit :"
 
-#: www/admin/index.php:66
+#: www/admin/index.php:65
 msgid "Search <em>(userid, username, realname, email)</em>"
 msgstr "Suchen <em>(Benutzer-ID, Benutzername, wirklicher Name, Email)</em>"
 
-#: www/admin/index.php:70 www/admin/index.php:136
+#: www/admin/index.php:69 www/admin/index.php:135
 msgid "get"
 msgstr "abrufen"
 
-#: www/admin/index.php:74
+#: www/admin/index.php:73
 msgid "Register a New User"
 msgstr "Einen neuen Nutzer registrieren"
 
-#: www/admin/index.php:77
+#: www/admin/index.php:76
 #, fuzzy
 msgid "Pending users"
 msgstr "Anstehende Anfragen"
 
-#: www/admin/index.php:80
+#: www/admin/index.php:79
 #, fuzzy
 msgid "Global roles and permissions"
 msgstr "Fehler bei der Vergabe von Erlaubnissen"
 
-#: www/admin/index.php:86 www/project/admin/massfinish.php:66
+#: www/admin/index.php:85 www/project/admin/massfinish.php:66
 #: www/project/admin/roleedit.php:147
 msgid "Edit Role"
 msgstr "Rolle bearbeiten"
 
-#: www/admin/index.php:94 www/project/admin/users.php:453
+#: www/admin/index.php:93 www/project/admin/users.php:453
 #, fuzzy
 msgid "Create Role"
 msgstr "Erstellen"
 
-#: www/admin/index.php:98
+#: www/admin/index.php:97
 msgid "Project Maintenance"
 msgstr "Projekt-Verwaltung"
 
-#: www/admin/index.php:105
+#: www/admin/index.php:104
 #, php-format
 msgid "Registered projects: <strong>%1$s</strong>"
 msgstr "Registrierte Projekte: <strong>%1$s</strong>"
 
-#: www/admin/index.php:112
+#: www/admin/index.php:111
 #, php-format
 msgid "Active projects: <strong>%1$s</strong>"
 msgstr "Aktive Projekte: <strong>%1$s</strong>"
 
-#: www/admin/index.php:119
+#: www/admin/index.php:118
 #, php-format
 msgid "Pending projects: <strong>%1$s</strong>"
 msgstr "Anstehende Projekte: <strong>%1$s</strong>"
 
-#: www/admin/index.php:123
+#: www/admin/index.php:122
 msgid "Display Full Project List/Edit Projects"
 msgstr "Zeige vollständige Projektliste/Bearbeite Projekte"
 
-#: www/admin/index.php:125
+#: www/admin/index.php:124
 #, fuzzy
 msgid "Display Projects Beginning with:"
 msgstr "Zeige Gruppen, die anfangen mit:"
 
-#: www/admin/index.php:132
+#: www/admin/index.php:131
 #, fuzzy
 msgid "Search <em>(groupid, project Unix name, project full name)</em>"
 msgstr "Suchen <em>(Gruppen-ID, Unix-Gruppen-Name, vollständiger Name)</em>"
 
-#: www/admin/index.php:141
+#: www/admin/index.php:140
 msgid "Register New Project"
 msgstr "Neues Projekt registrieren"
 
-#: www/admin/index.php:142
+#: www/admin/index.php:141
 #, fuzzy
 msgid "Pending projects (new project approval)"
 msgstr "Es sind keine anstehenden Projekte zu genehmigen."
 
-#: www/admin/index.php:144
+#: www/admin/index.php:143
 msgid "Projects with status"
 msgstr "Projekte mit Status:"
 
-#: www/admin/index.php:147
+#: www/admin/index.php:146
 msgid "Hold (H)"
 msgstr "Halten (H)"
 
-#: www/admin/index.php:154
+#: www/admin/index.php:153
 msgid "Private Projects"
 msgstr "Private Projekte"
 
-#: www/admin/index.php:159
+#: www/admin/index.php:158
 msgid "Pending news (moderation for front-page)"
 msgstr "Ankommente Nachricht (Moderation für front-page)"
 
-#: www/admin/index.php:164
+#: www/admin/index.php:163
 msgid "Site-Wide Stats"
 msgstr "Seiten-weite Statistiken"
 
-#: www/admin/index.php:167
+#: www/admin/index.php:166
 msgid "Trove Project Tree"
 msgstr "gefundene Projektbaumstruktur"
 
-#: www/admin/index.php:169
+#: www/admin/index.php:168
 msgid "Display Trove Map"
 msgstr "Zeige generierte Projekt-Karte"
 
-#: www/admin/index.php:170
+#: www/admin/index.php:169
 msgid "Add to the Trove Map"
 msgstr "Füge neue Kategorie zur Projekt-Karte hinzu"
 
-#: www/admin/index.php:173
+#: www/admin/index.php:172
 msgid "Site Utilities"
 msgstr "Seiten-Hilfsprogramme"
 
-#: www/admin/index.php:175 www/admin/massmail.php:79
+#: www/admin/index.php:174 www/admin/massmail.php:79
 #, php-format
 msgid "Mail Engine for %1$s Subscribers"
 msgstr "Mailserver-Formular (Engine) für %1$s Abonnenten"
 
-#: www/admin/index.php:176
+#: www/admin/index.php:175
 msgid "Site Mailings Maintenance"
-msgstr "Seiten-Mailinglisten Verwaltung"
+msgstr ""
 
-#: www/admin/index.php:177
+#: www/admin/index.php:176
 msgid "Add, Delete, or Edit File Types"
 msgstr "Hinzufügen, Löschen, oder Bearbeiten von Dateitypen"
 
-#: www/admin/index.php:178
+#: www/admin/index.php:177
 msgid "Add, Delete, or Edit Processors"
 msgstr "Hinzufügen, Löschen, oder Bearbeiten von Prozessoren"
 
-#: www/admin/index.php:179
+#: www/admin/index.php:178
 msgid "Add, Delete, or Edit Themes"
 msgstr "Hinzufügen, Löschen, oder Bearbeiten von Site-Designs"
 
-#: www/admin/index.php:180
+#: www/admin/index.php:179
 msgid "Last Logins"
 msgstr "Letzte Logins"
 
-#: www/admin/index.php:182 www/admin/pluginman.php:109
+#: www/admin/index.php:181 www/admin/pluginman.php:109
 msgid "Plugin Manager"
 msgstr "Plugin Manager"
 
-#: www/admin/index.php:183
+#: www/admin/index.php:182
 msgid "Config Manager"
 msgstr "Konfig Manager"
 
-#: www/admin/index.php:191
+#: www/admin/index.php:190
 msgid "Virtual Host Admin Tool"
 msgstr "Administrations-Werkzeug für virtuelle Hosts"
 
-#: www/admin/index.php:195
+#: www/admin/index.php:194
 msgid "Project Database Administration"
 msgstr "Projekt-Datenbank Administration"
 
-#: www/admin/index.php:198
+#: www/admin/index.php:197
 #, fuzzy
 msgid "Job / Categories Administration"
 msgstr "Foren: Administration"
@@ -13086,8 +13091,8 @@
 msgstr "Evolvis Hilfedienst: %s"
 
 #: www/include/html.php:342 www/include/html.php:475 www/include/html.php:742
-#: www/pm/browse_task.php:619 www/pm/browse_task.php:644
-#: www/pm/browse_task.php:655 www/tracker/browse.php:926
+#: www/pm/browse_task.php:622 www/pm/browse_task.php:647
+#: www/pm/browse_task.php:658 www/tracker/browse.php:926
 #: www/tracker/browse.php:934 www/tracker/browse.php:943
 msgid "No Change"
 msgstr "Keine Änderung"
@@ -13765,7 +13770,7 @@
 msgstr "Ändern"
 
 #: www/my/dashboard.php:69 www/pm/browse_task.php:219
-#: www/pm/browse_task.php:415 www/pm/browse_task.php:645
+#: www/pm/browse_task.php:415 www/pm/browse_task.php:648
 #: www/pm/include/pm_columns.php:37 www/pm/templates/detail_template.php:20
 #: www/tracker/admin/form-customizelist.php:45 www/tracker/browse.php:280
 #: www/tracker/browse.php:692 www/tracker/browse.php:930
@@ -13774,7 +13779,7 @@
 msgstr "Priorität"
 
 #: www/my/dashboard.php:71 www/pm/browse_task.php:413
-#: www/pm/browse_task.php:652 www/pm/templates/detail_template.php:30
+#: www/pm/browse_task.php:655 www/pm/templates/detail_template.php:30
 #: www/tracker/browse.php:695 www/tracker/browse.php:933
 #: www/tracker/item.php:209
 msgid "Assigned to"
@@ -14252,7 +14257,7 @@
 #: www/people/editjob.php:74 www/people/editjob.php:163
 #: www/people/people_utils.php:350 www/people/people_utils.php:406
 #: www/pm/browse_task.php:298 www/pm/browse_task.php:411
-#: www/pm/browse_task.php:642 www/pm/ganttpage.php:157
+#: www/pm/browse_task.php:645 www/pm/ganttpage.php:157
 #: www/pm/include/pm_columns.php:35 www/pm/templates/detail_template.php:25
 #: www/pm/templates/time_tracking.php:7 www/reporting/timeadd.php:142
 #: www/snippet/package.php:163 www/snippet/submit.php:131
@@ -14993,7 +14998,7 @@
 msgid "Any"
 msgstr "Alle"
 
-#: www/pm/browse_task.php:197 www/pm/browse_task.php:616
+#: www/pm/browse_task.php:197 www/pm/browse_task.php:619
 #: www/pm/ganttpage.php:58 www/tracker/browse.php:272
 msgid "Unassigned"
 msgstr "Nicht zugeordnet"
@@ -15114,19 +15119,19 @@
 msgid "Sub-Project"
 msgstr "Unterprojekt"
 
-#: www/pm/browse_task.php:600 www/tracker/browse.php:887
+#: www/pm/browse_task.php:603 www/tracker/browse.php:887
 msgid "Mass Update"
 msgstr "Massen-Update"
 
-#: www/pm/browse_task.php:635
+#: www/pm/browse_task.php:638
 msgid "Check all"
 msgstr "Alle auswählen"
 
-#: www/pm/browse_task.php:637
+#: www/pm/browse_task.php:640
 msgid "Clear all"
 msgstr "Alle abwählen"
 
-#: www/pm/browse_task.php:639 www/tracker/browse.php:909
+#: www/pm/browse_task.php:642 www/tracker/browse.php:909
 msgid ""
 "<strong>Admin:</strong> If you wish to apply changes to all items selected "
 "above, use these controls to change their properties and click once on "
@@ -15136,15 +15141,15 @@
 "Änderungen durchführen möchten, nutzen Sie diese Bedienungselemente, um ihre "
 "Eigenschaften zu ändern, und klicken Sie anschließend auf \"Massen-Update\"."
 
-#: www/pm/browse_task.php:658 www/pm/templates/detail_template.php:79
+#: www/pm/browse_task.php:661 www/pm/templates/detail_template.php:79
 msgid "Subproject"
 msgstr "Unterprojekt"
 
-#: www/pm/browse_task.php:661 www/tracker/browse.php:950
+#: www/pm/browse_task.php:664 www/tracker/browse.php:950
 msgid "Mass update"
 msgstr "Massen-Update"
 
-#: www/pm/browse_task.php:709
+#: www/pm/browse_task.php:712
 msgid "* Denotes overdue tasks"
 msgstr "* markiert überfällige Aufgaben"
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot	2012-10-08 12:43:24 UTC (rev 18716)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot	2012-10-08 12:43:29 UTC (rev 18717)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-08 14:14+0200\n"
+"POT-Creation-Date: 2012-10-08 14:39+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -337,7 +337,7 @@
 #: common/docman/views/listfile.php:204 common/docman/views/listfile.php:206
 #: common/forum/ForumHTML.class.php:65 common/forum/ForumHTML.class.php:224
 #: common/forum/ForumHTML.class.php:465 common/include/descriptive.php:133
-#: common/pm/ProjectTask.class.php:1249 common/tracker/Artifact.class.php:1547
+#: common/pm/ProjectTask.class.php:1250 common/tracker/Artifact.class.php:1547
 #: common/tracker/Artifact.class.php:1639
 #: common/widget/Widget_MyLatestSvnCommits.class.php:65
 #: common/widget/Widget_ProjectInfo.class.php:66
@@ -462,7 +462,7 @@
 msgstr ""
 
 #: common/docman/include/utils.php:327 common/docman/views/editfile.php:132
-#: www/pm/browse_task.php:654 www/project/admin/database.php:208
+#: www/pm/browse_task.php:657 www/project/admin/database.php:208
 #: www/tracker/admin/form-customizelist.php:44 www/tracker/browse.php:527
 #: www/tracker/browse.php:689 www/tracker/browse.php:942
 #: www/tracker/query.php:346
@@ -1993,7 +1993,7 @@
 msgstr ""
 
 #: common/include/Navigation.class.php:257 www/admin/globalroleedit.php:139
-#: www/admin/index.php:40
+#: www/admin/index.php:41
 msgid "Site Admin"
 msgstr ""
 
@@ -2131,7 +2131,7 @@
 #: common/include/Navigation.class.php:518
 #: common/include/group_section_texts.php:33 plugins/blocks/www/index.php:173
 #: plugins/quota_management/www/quota_project.php:75 www/activity/index.php:97
-#: www/activity/index.php:293 www/admin/index.php:157 www/news/index.php:35
+#: www/activity/index.php:293 www/admin/index.php:156 www/news/index.php:35
 msgid "News"
 msgstr ""
 
@@ -3222,7 +3222,7 @@
 msgid "setAssignedTo(): Error “%1$s” assigning to %2$d"
 msgstr ""
 
-#: common/pm/ProjectTask.class.php:1259
+#: common/pm/ProjectTask.class.php:1260
 #, php-format
 msgid "[%1$s - %2$s] [Task #%3$d] "
 msgstr ""
@@ -3653,7 +3653,7 @@
 #: plugins/forumml/www/forumml_utils.php:603 plugins/forumml/www/index.php:126
 #: www/account/pending-resend.php:75 www/activity/index.php:169
 #: www/admin/admin_table.php:212 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:263 www/admin/index.php:152
+#: www/admin/globalroleedit.php:263 www/admin/index.php:151
 #: www/admin/pending-news.php:173 www/forum/admin/index.php:427
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/news/admin/index.php:161
@@ -6364,7 +6364,7 @@
 msgid "-tooltip:plugin:mantisbt:admin"
 msgstr ""
 
-#: plugins/mantisbt/www/index.php:52 www/admin/index.php:162
+#: plugins/mantisbt/www/index.php:52 www/admin/index.php:161
 msgid "Stats"
 msgstr ""
 
@@ -6573,18 +6573,22 @@
 msgid "Upload a new logo"
 msgstr ""
 
-#: plugins/mediawiki/www/plugin_admin.php:175
+#: plugins/mediawiki/www/plugin_admin.php:174
+msgid "The logo must be in PNG format and precisely 135x135 pixels in size."
+msgstr ""
+
+#: plugins/mediawiki/www/plugin_admin.php:176
 msgid ""
 "NOTE: In some browsers you must select the file in the file-upload dialog "
 "and click \"OK\".  Double-clicking doesn't register the file."
 msgstr ""
 
-#: plugins/mediawiki/www/plugin_admin.php:177
+#: plugins/mediawiki/www/plugin_admin.php:178
 #: www/frs/admin/editrelease.php:283 www/frs/admin/qrs.php:203
 msgid "Upload a new file"
 msgstr ""
 
-#: plugins/mediawiki/www/plugin_admin.php:184
+#: plugins/mediawiki/www/plugin_admin.php:185
 #: www/frs/admin/editrelease.php:298 www/frs/admin/qrs.php:219
 #, php-format
 msgid ""
@@ -6592,24 +6596,24 @@
 "the <a href=\"%2$s\">project's incoming directory</a> (%1$s)."
 msgstr ""
 
-#: plugins/mediawiki/www/plugin_admin.php:186
+#: plugins/mediawiki/www/plugin_admin.php:187
 #: www/frs/admin/editrelease.php:300 www/frs/admin/qrs.php:221
 msgid ""
 "This direct <tt>sftp://</tt> link only works with some browsers, such as "
 "Konqueror."
 msgstr ""
 
-#: plugins/mediawiki/www/plugin_admin.php:187
+#: plugins/mediawiki/www/plugin_admin.php:188
 #: www/frs/admin/editrelease.php:288 www/frs/admin/editrelease.php:301
 #: www/frs/admin/qrs.php:222
 msgid "Choose an already uploaded file:"
 msgstr ""
 
-#: plugins/mediawiki/www/plugin_admin.php:193
+#: plugins/mediawiki/www/plugin_admin.php:194
 msgid "… or delete the currently uploaded logo and revert to the site default"
 msgstr ""
 
-#: plugins/mediawiki/www/plugin_admin.php:194
+#: plugins/mediawiki/www/plugin_admin.php:195
 msgid "Upload new logo"
 msgstr ""
 
@@ -8921,7 +8925,7 @@
 msgid "Section %s"
 msgstr ""
 
-#: www/admin/cronman.php:30 www/admin/index.php:181
+#: www/admin/cronman.php:30 www/admin/index.php:180
 msgid "Cron Manager"
 msgstr ""
 
@@ -9133,7 +9137,7 @@
 msgstr ""
 
 #: www/admin/groupedit.php:114 www/admin/groupedit.php:126
-#: www/admin/index.php:148 www/admin/useredit.php:131
+#: www/admin/index.php:147 www/admin/useredit.php:131
 #: www/admin/useredit.php:137
 msgid "Pending (P)"
 msgstr ""
@@ -9142,7 +9146,7 @@
 msgid "Incomplete (I)"
 msgstr ""
 
-#: www/admin/groupedit.php:125 www/admin/index.php:146
+#: www/admin/groupedit.php:125 www/admin/index.php:145
 #: www/admin/useredit.php:33 www/admin/useredit.php:132
 #: www/admin/useredit.php:138 www/admin/useredit.php:142
 msgid "Active (A)"
@@ -9206,169 +9210,169 @@
 msgid "Projects that begin with \"%s\""
 msgstr ""
 
-#: www/admin/index.php:46
+#: www/admin/index.php:47
 msgid "User Maintenance"
 msgstr ""
 
-#: www/admin/index.php:53
+#: www/admin/index.php:51
 #, php-format
-msgid "Active site users: <strong>%1$s</strong>"
+msgid "Active site users: <strong>%d</strong>"
 msgstr ""
 
-#: www/admin/index.php:57
+#: www/admin/index.php:56
 msgid "Display Full User List/Edit Users"
 msgstr ""
 
-#: www/admin/index.php:59
+#: www/admin/index.php:58
 msgid "Display Users Beginning with:"
 msgstr ""
 
-#: www/admin/index.php:66
+#: www/admin/index.php:65
 msgid "Search <em>(userid, username, realname, email)</em>"
 msgstr ""
 
-#: www/admin/index.php:70 www/admin/index.php:136
+#: www/admin/index.php:69 www/admin/index.php:135
 msgid "get"
 msgstr ""
 
-#: www/admin/index.php:74
+#: www/admin/index.php:73
 msgid "Register a New User"
 msgstr ""
 
-#: www/admin/index.php:77
+#: www/admin/index.php:76
 msgid "Pending users"
 msgstr ""
 
-#: www/admin/index.php:80
+#: www/admin/index.php:79
 msgid "Global roles and permissions"
 msgstr ""
 
-#: www/admin/index.php:86 www/project/admin/massfinish.php:66
+#: www/admin/index.php:85 www/project/admin/massfinish.php:66
 #: www/project/admin/roleedit.php:147
 msgid "Edit Role"
 msgstr ""
 
-#: www/admin/index.php:94 www/project/admin/users.php:453
+#: www/admin/index.php:93 www/project/admin/users.php:453
 msgid "Create Role"
 msgstr ""
 
-#: www/admin/index.php:98
+#: www/admin/index.php:97
 msgid "Project Maintenance"
 msgstr ""
 
-#: www/admin/index.php:105
+#: www/admin/index.php:104
 #, php-format
 msgid "Registered projects: <strong>%1$s</strong>"
 msgstr ""
 
-#: www/admin/index.php:112
+#: www/admin/index.php:111
 #, php-format
 msgid "Active projects: <strong>%1$s</strong>"
 msgstr ""
 
-#: www/admin/index.php:119
+#: www/admin/index.php:118
 #, php-format
 msgid "Pending projects: <strong>%1$s</strong>"
 msgstr ""
 
-#: www/admin/index.php:123
+#: www/admin/index.php:122
 msgid "Display Full Project List/Edit Projects"
 msgstr ""
 
-#: www/admin/index.php:125
+#: www/admin/index.php:124
 msgid "Display Projects Beginning with:"
 msgstr ""
 
-#: www/admin/index.php:132
+#: www/admin/index.php:131
 msgid "Search <em>(groupid, project Unix name, project full name)</em>"
 msgstr ""
 
-#: www/admin/index.php:141
+#: www/admin/index.php:140
 msgid "Register New Project"
 msgstr ""
 
-#: www/admin/index.php:142
+#: www/admin/index.php:141
 msgid "Pending projects (new project approval)"
 msgstr ""
 
-#: www/admin/index.php:144
+#: www/admin/index.php:143
 msgid "Projects with status"
 msgstr ""
 
-#: www/admin/index.php:147
+#: www/admin/index.php:146
 msgid "Hold (H)"
 msgstr ""
 
-#: www/admin/index.php:154
+#: www/admin/index.php:153
 msgid "Private Projects"
 msgstr ""
 
-#: www/admin/index.php:159
+#: www/admin/index.php:158
 msgid "Pending news (moderation for front-page)"
 msgstr ""
 
-#: www/admin/index.php:164
+#: www/admin/index.php:163
 msgid "Site-Wide Stats"
 msgstr ""
 
-#: www/admin/index.php:167
+#: www/admin/index.php:166
 msgid "Trove Project Tree"
 msgstr ""
 
-#: www/admin/index.php:169
+#: www/admin/index.php:168
 msgid "Display Trove Map"
 msgstr ""
 
-#: www/admin/index.php:170
+#: www/admin/index.php:169
 msgid "Add to the Trove Map"
 msgstr ""
 
-#: www/admin/index.php:173
+#: www/admin/index.php:172
 msgid "Site Utilities"
 msgstr ""
 
-#: www/admin/index.php:175 www/admin/massmail.php:79
+#: www/admin/index.php:174 www/admin/massmail.php:79
 #, php-format
 msgid "Mail Engine for %1$s Subscribers"
 msgstr ""
 
-#: www/admin/index.php:176
+#: www/admin/index.php:175
 msgid "Site Mailings Maintenance"
 msgstr ""
 
-#: www/admin/index.php:177
+#: www/admin/index.php:176
 msgid "Add, Delete, or Edit File Types"
 msgstr ""
 
-#: www/admin/index.php:178
+#: www/admin/index.php:177
 msgid "Add, Delete, or Edit Processors"
 msgstr ""
 
-#: www/admin/index.php:179
+#: www/admin/index.php:178
 msgid "Add, Delete, or Edit Themes"
 msgstr ""
 
-#: www/admin/index.php:180
+#: www/admin/index.php:179
 msgid "Last Logins"
 msgstr ""
 
-#: www/admin/index.php:182 www/admin/pluginman.php:109
+#: www/admin/index.php:181 www/admin/pluginman.php:109
 msgid "Plugin Manager"
 msgstr ""
 
-#: www/admin/index.php:183
+#: www/admin/index.php:182
 msgid "Config Manager"
 msgstr ""
 
-#: www/admin/index.php:191
+#: www/admin/index.php:190
 msgid "Virtual Host Admin Tool"
 msgstr ""
 
-#: www/admin/index.php:195
+#: www/admin/index.php:194
 msgid "Project Database Administration"
 msgstr ""
 
-#: www/admin/index.php:198
+#: www/admin/index.php:197
 msgid "Job / Categories Administration"
 msgstr ""
 
@@ -11554,8 +11558,8 @@
 msgstr ""
 
 #: www/include/html.php:342 www/include/html.php:475 www/include/html.php:742
-#: www/pm/browse_task.php:619 www/pm/browse_task.php:644
-#: www/pm/browse_task.php:655 www/tracker/browse.php:926
+#: www/pm/browse_task.php:622 www/pm/browse_task.php:647
+#: www/pm/browse_task.php:658 www/tracker/browse.php:926
 #: www/tracker/browse.php:934 www/tracker/browse.php:943
 msgid "No Change"
 msgstr ""
@@ -12128,7 +12132,7 @@
 msgstr ""
 
 #: www/my/dashboard.php:69 www/pm/browse_task.php:219
-#: www/pm/browse_task.php:415 www/pm/browse_task.php:645
+#: www/pm/browse_task.php:415 www/pm/browse_task.php:648
 #: www/pm/include/pm_columns.php:37 www/pm/templates/detail_template.php:20
 #: www/tracker/admin/form-customizelist.php:45 www/tracker/browse.php:280
 #: www/tracker/browse.php:692 www/tracker/browse.php:930
@@ -12137,7 +12141,7 @@
 msgstr ""
 
 #: www/my/dashboard.php:71 www/pm/browse_task.php:413
-#: www/pm/browse_task.php:652 www/pm/templates/detail_template.php:30
+#: www/pm/browse_task.php:655 www/pm/templates/detail_template.php:30
 #: www/tracker/browse.php:695 www/tracker/browse.php:933
 #: www/tracker/item.php:209
 msgid "Assigned to"
@@ -12536,7 +12540,7 @@
 #: www/people/editjob.php:74 www/people/editjob.php:163
 #: www/people/people_utils.php:350 www/people/people_utils.php:406
 #: www/pm/browse_task.php:298 www/pm/browse_task.php:411
-#: www/pm/browse_task.php:642 www/pm/ganttpage.php:157
+#: www/pm/browse_task.php:645 www/pm/ganttpage.php:157
 #: www/pm/include/pm_columns.php:35 www/pm/templates/detail_template.php:25
 #: www/pm/templates/time_tracking.php:7 www/reporting/timeadd.php:142
 #: www/snippet/package.php:163 www/snippet/submit.php:131
@@ -13206,7 +13210,7 @@
 msgid "Any"
 msgstr ""
 
-#: www/pm/browse_task.php:197 www/pm/browse_task.php:616
+#: www/pm/browse_task.php:197 www/pm/browse_task.php:619
 #: www/pm/ganttpage.php:58 www/tracker/browse.php:272
 msgid "Unassigned"
 msgstr ""
@@ -13319,34 +13323,34 @@
 msgid "Sub-Project"
 msgstr ""
 
-#: www/pm/browse_task.php:600 www/tracker/browse.php:887
+#: www/pm/browse_task.php:603 www/tracker/browse.php:887
 msgid "Mass Update"
 msgstr ""
 
-#: www/pm/browse_task.php:635
+#: www/pm/browse_task.php:638
 msgid "Check all"
 msgstr ""
 
-#: www/pm/browse_task.php:637
+#: www/pm/browse_task.php:640
 msgid "Clear all"
 msgstr ""
 
-#: www/pm/browse_task.php:639 www/tracker/browse.php:909
+#: www/pm/browse_task.php:642 www/tracker/browse.php:909
 msgid ""
 "<strong>Admin:</strong> If you wish to apply changes to all items selected "
 "above, use these controls to change their properties and click once on "
 "\"Mass Update\"."
 msgstr ""
 
-#: www/pm/browse_task.php:658 www/pm/templates/detail_template.php:79
+#: www/pm/browse_task.php:661 www/pm/templates/detail_template.php:79
 msgid "Subproject"
 msgstr ""
 
-#: www/pm/browse_task.php:661 www/tracker/browse.php:950
+#: www/pm/browse_task.php:664 www/tracker/browse.php:950
 msgid "Mass update"
 msgstr ""
 
-#: www/pm/browse_task.php:709
+#: www/pm/browse_task.php:712
 msgid "* Denotes overdue tasks"
 msgstr ""
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/admin/index.php	2012-10-08 12:43:24 UTC (rev 18716)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/admin/index.php	2012-10-08 12:43:29 UTC (rev 18717)
@@ -30,6 +30,7 @@
 
 require_once('../env.inc.php');
 require_once $gfcommon.'include/pre.php';
+require_once $gfcommon.'include/FusionForge.class.php';
 require_once $gfwww.'admin/admin_utils.php';
 require_once $gfwww.'include/role_utils.php';
 
@@ -46,11 +47,9 @@
 <h2><?php echo _('User Maintenance'); ?></h2>
 	<ul>
 	<li><?php
-		$res=db_query_params ('SELECT count(*) AS count FROM users WHERE status=$1',
-			array('A')) ;
-
-		$row = db_fetch_array($res);
-		printf(_('Active site users: <strong>%1$s</strong>'), $row['count']);
+		$gforge = new FusionForge();
+		printf(_('Active site users: <strong>%d</strong>'),
+		    $gforge->getNumberOfActiveUsers());
 	?></li>
 </ul>
 <ul>



More information about the evolvis-commits mailing list