[evolvis-commits] r17702: [#2030] theme-evolvis pending merges:↵ Thorsten Glaser 2011-11-03 evolvis svn r17701 as discussed with messer

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Nov 3 15:38:22 CET 2011


Author: mirabilos
Date: 2011-11-03 15:38:22 +0100 (Thu, 03 Nov 2011)
New Revision: 17702

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   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/themes/evolvis/Theme.class.php
Log:
[#2030] theme-evolvis pending merges:
  Thorsten Glaser 2011-11-03 evolvis svn r17701 as discussed with messer


Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2011-11-03 12:47:56 UTC (rev 17701)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2011-11-03 14:38:22 UTC (rev 17702)
@@ -23,8 +23,9 @@
     member (label, link, tooltip) indexed array, subMenu() errors
   * Fix and sanitise ECMAscript handling for once and always, grr!
   * [#2030] [#2158] New Evolvis theme look
-  * Supply libjs-jquery-ui in gforge-web-apache2
-  * Use jQuery in noConflict mode in all themes (if used at all)
+  * Use jQuery in noConflict mode in all themes (if used at all);
+    supply libjs-jquery-ui in gforge-web-apache2; fix coexistence
+    of jQuery{,-Tipsy, UI}, Prototype, script.aculo.us libraries
   * Version libjs-* Depends on today’s sid’s backports to fix issues
   * Use lightbox for image pop-ins on Tracker attachments
 
@@ -32,7 +33,7 @@
   * [#1850] Fix merge glitch
   * [#1859] [#1906] Port code from Evolvis 4.8 to 5.1
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Wed, 02 Nov 2011 17:05:08 +0100
+ -- Thorsten Glaser <t.glaser at tarent.de>  Thu, 03 Nov 2011 14:28:14 +0100
 
 fusionforge (5.1.1-1+) UNRELEASED; urgency=low
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/de.po	2011-11-03 12:47:56 UTC (rev 17701)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/de.po	2011-11-03 14:38:22 UTC (rev 17702)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: EvolvisForge 5.1+evolvis0exp5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-02 16:50+0100\n"
+"POT-Creation-Date: 2011-11-03 14:27+0100\n"
 "PO-Revision-Date: 2011-11-02 16:50+0100\n"
 "Last-Translator: Thorsten Glaser <t.glaser at tarent.de>\n"
 "Language-Team: german\n"
@@ -2179,22 +2179,22 @@
 "stattgegeben."
 
 #: common/include/Navigation.class.php:184
-#: www/themes/evolvis/Theme.class.php:124
+#: www/themes/evolvis/Theme.class.php:118
 msgid "Log Out"
 msgstr "Abmelden"
 
 #: common/include/Navigation.class.php:187
-#: www/themes/evolvis/Theme.class.php:129
+#: www/themes/evolvis/Theme.class.php:123
 msgid "My Account"
 msgstr "Mein Account"
 
 #: common/include/Navigation.class.php:195
-#: www/themes/evolvis/Theme.class.php:142
+#: www/themes/evolvis/Theme.class.php:136
 msgid "Log In"
 msgstr "Anmelden"
 
 #: common/include/Navigation.class.php:199
-#: www/themes/evolvis/Theme.class.php:147
+#: www/themes/evolvis/Theme.class.php:141
 msgid "New Account"
 msgstr "Neuer Account"
 
@@ -9805,7 +9805,7 @@
 msgstr "Sende erneut neue Email mit Projekt-Anweisungen "
 
 #: www/admin/grouplist.php:27 www/include/Layout.class.php:1323
-#: www/themes/evolvis/Theme.class.php:472
+#: www/themes/evolvis/Theme.class.php:466
 msgid "Project List"
 msgstr "Projektliste"
 
@@ -12007,7 +12007,7 @@
 msgid "Can't find theme directory!"
 msgstr "Konnte Datei nicht ins Zielverzeichnis kopieren"
 
-#: www/include/Layout.class.php:279 www/themes/evolvis/Theme.class.php:112
+#: www/include/Layout.class.php:279 www/themes/evolvis/Theme.class.php:106
 msgid "en"
 msgstr "de"
 
@@ -12040,7 +12040,7 @@
 msgid "Display all public projects as trove tree"
 msgstr "Zeige vollständige Projektliste/Bearbeite Projekte"
 
-#: www/include/Layout.class.php:1325 www/themes/evolvis/Theme.class.php:473
+#: www/include/Layout.class.php:1325 www/themes/evolvis/Theme.class.php:467
 msgid "Display an alphabetically sorted list of all public projects"
 msgstr ""
 
@@ -12309,7 +12309,7 @@
 msgid "My Personal Page"
 msgstr "Meine persönliche Seite"
 
-#: www/include/html.php:797 www/themes/evolvis/Theme.class.php:132
+#: www/include/html.php:797 www/themes/evolvis/Theme.class.php:126
 msgid "Manage projects, assigned tasks, bugs, etc."
 msgstr ""
 
@@ -12335,11 +12335,11 @@
 msgstr ""
 
 #: www/include/html.php:815 www/register/index.php:166
-#: www/themes/evolvis/Theme.class.php:468
+#: www/themes/evolvis/Theme.class.php:462
 msgid "Register Project"
 msgstr "Registriere Projekt"
 
-#: www/include/html.php:817 www/themes/evolvis/Theme.class.php:469
+#: www/include/html.php:817 www/themes/evolvis/Theme.class.php:463
 #, fuzzy
 msgid "Register a new Project on the forge"
 msgstr "Neues Projekt registrieren"
@@ -17835,39 +17835,39 @@
 msgid "Jump to Task"
 msgstr "Springe zu Task"
 
-#: www/themes/evolvis/Theme.class.php:121
+#: www/themes/evolvis/Theme.class.php:115
 msgid "Log out of the session with the Forge system"
 msgstr "Beende die Sitzung mit dem Forge-System"
 
-#: www/themes/evolvis/Theme.class.php:127
+#: www/themes/evolvis/Theme.class.php:121
 msgid "Configure Account settings, Password & SSH keys"
 msgstr "Einstellungen, Paßwort und SSH-Keys konfigurieren"
 
-#: www/themes/evolvis/Theme.class.php:134
+#: www/themes/evolvis/Theme.class.php:128
 msgid "My Page"
 msgstr "Persönliche Seite"
 
-#: www/themes/evolvis/Theme.class.php:139
+#: www/themes/evolvis/Theme.class.php:133
 msgid "Log into a new session with the Forge system"
 msgstr "Beginne eine neue Sitzung mit dem Forge-System"
 
-#: www/themes/evolvis/Theme.class.php:145
+#: www/themes/evolvis/Theme.class.php:139
 msgid "Register a user account with the Forge system"
 msgstr ""
 
-#: www/themes/evolvis/Theme.class.php:167
+#: www/themes/evolvis/Theme.class.php:161
 #, php-format
 msgid "Project: %s"
 msgstr "Projekt: %s"
 
-#: www/themes/evolvis/Theme.class.php:172
+#: www/themes/evolvis/Theme.class.php:166
 #, php-format
 msgid "Forge: %s"
 msgstr "Forge: %s"
 
-#: www/themes/evolvis/Theme.class.php:203
-#: www/themes/evolvis/Theme.class.php:206
-#: www/themes/evolvis/Theme.class.php:269
+#: www/themes/evolvis/Theme.class.php:197
+#: www/themes/evolvis/Theme.class.php:200
+#: www/themes/evolvis/Theme.class.php:263
 msgid "Toggle"
 msgstr "Ein-/Ausklappen"
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot	2011-11-03 12:47:56 UTC (rev 17701)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot	2011-11-03 14:38:22 UTC (rev 17702)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-02 17:05+0100\n"
+"POT-Creation-Date: 2011-11-03 14:27+0100\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"
@@ -1953,22 +1953,22 @@
 msgstr ""
 
 #: common/include/Navigation.class.php:184
-#: www/themes/evolvis/Theme.class.php:124
+#: www/themes/evolvis/Theme.class.php:118
 msgid "Log Out"
 msgstr ""
 
 #: common/include/Navigation.class.php:187
-#: www/themes/evolvis/Theme.class.php:129
+#: www/themes/evolvis/Theme.class.php:123
 msgid "My Account"
 msgstr ""
 
 #: common/include/Navigation.class.php:195
-#: www/themes/evolvis/Theme.class.php:142
+#: www/themes/evolvis/Theme.class.php:136
 msgid "Log In"
 msgstr ""
 
 #: common/include/Navigation.class.php:199
-#: www/themes/evolvis/Theme.class.php:147
+#: www/themes/evolvis/Theme.class.php:141
 msgid "New Account"
 msgstr ""
 
@@ -8682,7 +8682,7 @@
 msgstr ""
 
 #: www/admin/grouplist.php:27 www/include/Layout.class.php:1323
-#: www/themes/evolvis/Theme.class.php:472
+#: www/themes/evolvis/Theme.class.php:466
 msgid "Project List"
 msgstr ""
 
@@ -10688,7 +10688,7 @@
 msgid "Can't find theme directory!"
 msgstr ""
 
-#: www/include/Layout.class.php:279 www/themes/evolvis/Theme.class.php:112
+#: www/include/Layout.class.php:279 www/themes/evolvis/Theme.class.php:106
 msgid "en"
 msgstr ""
 
@@ -10720,7 +10720,7 @@
 msgid "Display all public projects as trove tree"
 msgstr ""
 
-#: www/include/Layout.class.php:1325 www/themes/evolvis/Theme.class.php:473
+#: www/include/Layout.class.php:1325 www/themes/evolvis/Theme.class.php:467
 msgid "Display an alphabetically sorted list of all public projects"
 msgstr ""
 
@@ -10949,7 +10949,7 @@
 msgid "My Personal Page"
 msgstr ""
 
-#: www/include/html.php:797 www/themes/evolvis/Theme.class.php:132
+#: www/include/html.php:797 www/themes/evolvis/Theme.class.php:126
 msgid "Manage projects, assigned tasks, bugs, etc."
 msgstr ""
 
@@ -10974,11 +10974,11 @@
 msgstr ""
 
 #: www/include/html.php:815 www/register/index.php:166
-#: www/themes/evolvis/Theme.class.php:468
+#: www/themes/evolvis/Theme.class.php:462
 msgid "Register Project"
 msgstr ""
 
-#: www/include/html.php:817 www/themes/evolvis/Theme.class.php:469
+#: www/include/html.php:817 www/themes/evolvis/Theme.class.php:463
 msgid "Register a new Project on the forge"
 msgstr ""
 
@@ -15918,39 +15918,39 @@
 msgid "Jump to Task"
 msgstr ""
 
-#: www/themes/evolvis/Theme.class.php:121
+#: www/themes/evolvis/Theme.class.php:115
 msgid "Log out of the session with the Forge system"
 msgstr ""
 
-#: www/themes/evolvis/Theme.class.php:127
+#: www/themes/evolvis/Theme.class.php:121
 msgid "Configure Account settings, Password & SSH keys"
 msgstr ""
 
-#: www/themes/evolvis/Theme.class.php:134
+#: www/themes/evolvis/Theme.class.php:128
 msgid "My Page"
 msgstr ""
 
-#: www/themes/evolvis/Theme.class.php:139
+#: www/themes/evolvis/Theme.class.php:133
 msgid "Log into a new session with the Forge system"
 msgstr ""
 
-#: www/themes/evolvis/Theme.class.php:145
+#: www/themes/evolvis/Theme.class.php:139
 msgid "Register a user account with the Forge system"
 msgstr ""
 
-#: www/themes/evolvis/Theme.class.php:167
+#: www/themes/evolvis/Theme.class.php:161
 #, php-format
 msgid "Project: %s"
 msgstr ""
 
-#: www/themes/evolvis/Theme.class.php:172
+#: www/themes/evolvis/Theme.class.php:166
 #, php-format
 msgid "Forge: %s"
 msgstr ""
 
-#: www/themes/evolvis/Theme.class.php:203
-#: www/themes/evolvis/Theme.class.php:206
-#: www/themes/evolvis/Theme.class.php:269
+#: www/themes/evolvis/Theme.class.php:197
+#: www/themes/evolvis/Theme.class.php:200
+#: www/themes/evolvis/Theme.class.php:263
 msgid "Toggle"
 msgstr ""
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php	2011-11-03 12:47:56 UTC (rev 17701)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php	2011-11-03 14:38:22 UTC (rev 17702)
@@ -58,12 +58,6 @@
 		$this->addStylesheet('/themes/css/evolvis.css', 'all');
 		// $this->addStylesheet('/themes/css/screen.css', 'screen');
 		$this->addStylesheet('/themes/css/print.css', 'print');
-		/*
-		 * disabled for now, cf. www/include/html.php
-		 * which already includes a jQuery UI theme
-		$this->addStylesheet('/themes/css/smoothness/jquery-ui-1.8.15.custom.css');
-		 * to be revisited with messer later
-		 */
 		$this->addJavascript('/js/common.js');
 		$this->addJavascript('/js/css.js');
 		$this->project = false;



More information about the evolvis-commits mailing list