[evolvis-commits] r17685: unbreak jQueryUI; enable Lightbox test

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Nov 2 15:07:39 CET 2011


Author: mirabilos
Date: 2011-11-02 15:07:39 +0100 (Wed, 02 Nov 2011)
New Revision: 17685

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/tests/jstest.php
Log:
unbreak jQueryUI; enable Lightbox test


Modified: trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php	2011-11-02 14:07:36 UTC (rev 17684)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php	2011-11-02 14:07:39 UTC (rev 17685)
@@ -372,6 +372,7 @@
 function html_use_jqueryui() {
 	html_use_jquery();
 	use_javascript('/scripts/jquery-ui/jquery-ui.min.js');
+	use_stylesheet('/scripts/jquery-ui/css/smoothness/jquery-ui.css');
 }
 
 function html_use_lightbox() {

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-02 14:07:36 UTC (rev 17684)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php	2011-11-02 14:07:39 UTC (rev 17685)
@@ -58,7 +58,12 @@
 		$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;

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/tests/jstest.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/tests/jstest.php	2011-11-02 14:07:36 UTC (rev 17684)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/tests/jstest.php	2011-11-02 14:07:39 UTC (rev 17685)
@@ -42,7 +42,7 @@
 use_javascript('/js/prototype-date-extensions.js');
 use_javascript('/js/datepicker.js');
 /* and script.aculo.us and Lightbox2 */
-//html_use_lightbox();
+html_use_lightbox();
 
 /* display site header */
 site_header(array('title' => 'ECMAscript Test'));



More information about the evolvis-commits mailing list