[evolvis-commits] r17659: theme-evolvis pending merges:↵ [#2160] Thorsten Glaser 2011-10-28 replay evolvis svn r17650 (actually by Mike Esser)↵ [#2030] Thorsten Glaser 2011-10-27 avoid using entities, use U+00A0 directly instead↵ aux. Thorsten Glaser 2011-10-27 attempt a somewhat more sane ECMAscript handling, and deduplicate↵ [#2030] Thorsten Glaser 2011-10-27 restore these and update from Evolvis 4.8 sources

mirabilos at evolvis.org mirabilos at evolvis.org
Fri Oct 28 19:30:01 CEST 2011


Author: mirabilos
Date: 2011-10-28 19:30:01 +0200 (Fri, 28 Oct 2011)
New Revision: 17659

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php
   trunk/gforge_base/evolvisforge-5.1/src/image-sources/evolvis-logo.svg
   trunk/gforge_base/evolvisforge-5.1/src/image-sources/evolvis.svg
   trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php
Log:
theme-evolvis pending merges:
[#2160]    Thorsten Glaser 2011-10-28 replay evolvis svn r17650 (actually by Mike Esser)
[#2030]    Thorsten Glaser 2011-10-27 avoid using entities, use U+00A0 directly instead
aux.       Thorsten Glaser 2011-10-27 attempt a somewhat more sane ECMAscript handling, and deduplicate
[#2030]    Thorsten Glaser 2011-10-27 restore these and update from Evolvis 4.8 sources


Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php	2011-10-28 17:29:56 UTC (rev 17658)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php	2011-10-28 17:30:01 UTC (rev 17659)
@@ -223,7 +223,7 @@
 		$menu['tooltips'][] = _('Forge Main Page');
                 
                 // My Page
-                $menu['titles'][] = _('My Page');
+                $menu['titles'][] = _('My Page');
                 $menu['urls'][] = util_make_uri('/my/'); 
 		$menu['tooltips'][] = _('Account settings; Register new projects');
                 if (strstr($request_uri, util_make_uri('/my/'))
@@ -245,7 +245,7 @@
 		}
                  
 		if (forge_get_config('use_snippet')) {
-			$menu['titles'][] = _('Code Snippets');
+			$menu['titles'][] = _('Code Snippets');
 			$menu['urls'][] = util_make_uri('/snippet/') ;
 			$menu['tooltips'][] = _('-tooltip:Snippets');
 			if (strstr($request_uri, util_make_uri('/snippet/'))) {
@@ -254,7 +254,7 @@
 		}
                  
 		if (forge_get_config('use_people')) {
-			$menu['titles'][] = _('Project Openings');
+			$menu['titles'][] = _('Project Openings');
 			$menu['urls'][] = util_make_uri('/people/') ;
 			$menu['tooltips'][] = _('-tooltip:People');
 			if (strstr($request_uri, util_make_uri('/people/'))) {

Modified: trunk/gforge_base/evolvisforge-5.1/src/image-sources/evolvis-logo.svg
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/image-sources/evolvis-logo.svg	2011-10-28 17:29:56 UTC (rev 17658)
+++ trunk/gforge_base/evolvisforge-5.1/src/image-sources/evolvis-logo.svg	2011-10-28 17:30:01 UTC (rev 17659)
@@ -4,6 +4,7 @@
     Evolvis Logo
     Copyright © Martin Buhren 〈m.buhren at tarent.de〉
     Copyright © Thorsten Glaser 〈t.glaser at tarent.de〉
+    Licenced under the GNU GPL, version 2 or later
   </desc>
   <g style="fill:#cb1009">
     <path d="M 13.78062,45.23100 c -0.06200,0.09800 -0.12400,0.19500 -0.18300,0.29500 c -0.68100,-0.02100 -1.35600,-0.11700 -2.00000,-0.29500 l -7.12000,0 c 2.19200,3.16400 6.35900,4.90600 10.31100,4.52400 c 0.08500,0.00900 0.17000,0.01500 0.25500,0.01500 c 0.83100,0 1.66000,-0.36800 2.04400,-1.34500 c 0,0 0.06400,-0.18400 0.25600,-0.55000 c 0.62800,-1.06800 1.48400,-2.00900 2.54900,-2.64400 l -4.07300,-0.00100 l -2.03900,0 l 0,0.00100 z" />

Modified: trunk/gforge_base/evolvisforge-5.1/src/image-sources/evolvis.svg
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/image-sources/evolvis.svg	2011-10-28 17:29:56 UTC (rev 17658)
+++ trunk/gforge_base/evolvisforge-5.1/src/image-sources/evolvis.svg	2011-10-28 17:30:01 UTC (rev 17659)
@@ -21,6 +21,7 @@
 <desc>
 	Evolvis Repository emblem
 	Copyright © Martin Buhren 〈m.buhren at tarent.de〉
+	Licenced under the GNU GPL, version 2 or later
 </desc>
 	<style type="text/css">
 	<![CDATA[
@@ -91,7 +92,7 @@
      <xapGImg:format>JPEG</xapGImg:format>
      <xapGImg:width>256</xapGImg:width>
      <xapGImg:height>24</xapGImg:height>
-     <xapGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA&#xA;AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK&#xA;DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f&#xA;Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgAGAEAAwER&#xA;AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA&#xA;AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB&#xA;UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE&#xA;1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ&#xA;qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy&#xA;obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp&#xA;0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo&#xA;+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A6T52/OjT7nStZ0/QxdW3&#xA;CKeGDzBRUtzcRivpwsx5Mz0KqRuK1pTfNZn1oIIj83quz+wJxnCWThO4Jh1o9T7uf2MM0DQdd8t3&#xA;mi69ZaHqrGaG1vlu9MEl214ssStcW18jMFiDOTxcL8K/ssdxj48coESAPft18vx9rt9TqcWojPFL&#xA;Jj2Mo1Oo8NH0ygeu3MdT1A5zDyl+b/mmbzXaaR5itrL0dRuZbMCzLia0uo9/Ql5kq/HkoPHpXrUF&#xA;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&#xA;ei1zzT0Zar6KLI0lf5QpzKdM
+     <xapGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA&#xA;AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK&#xA;DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f&#xA;Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgAGAEAAwER&#xA;AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA&#xA;AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB&#xA;UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE&#xA;1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ&#xA;qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy&#xA;obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp&#xA;0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo&#xA;+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A6T52/OjT7nStZ0/QxdW3&#xA;CKeGDzBRUtzcRivpwsx5Mz0KqRuK1pTfNZn1oIIj83quz+wJxnCWThO4Jh1o9T7uf2MM0DQdd8t3&#xA;mi69ZaHqrGaG1vlu9MEl214ssStcW18jMFiDOTxcL8K/ssdxj48coESAPft18vx9rt9TqcWojPFL&#xA;Jj2Mo1Oo8NH0ygeu3MdT1A5zDyl+b/mmbzXaaR5itrL0dRuZbMCzLia0uo9/Ql5kq/HkoPHpXrUF&#xA;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</xapGImg:image>
     </rdf:li>
    </rdf:Alt>
   </xap:Thumbnails>

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php	2011-10-28 17:29:56 UTC (rev 17658)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php	2011-10-28 17:30:01 UTC (rev 17659)
@@ -198,8 +198,9 @@
 	function getJavascripts() {
 		$code = '';
 		foreach ($this->javascripts as $js) {
-			$code .= "\t\t\t";
-			$code .= '<script type="text/javascript" src="'.$js.'"></script>'."\n";
+			$code .= "\n\t\t\t" .
+			    '<script type="text/javascript" src="' . $js .
+			    '"></script>';
 		}
 		return $code;
 	}
@@ -323,19 +324,20 @@
 	 * @todo generalize this
 	 */
 	function headerJS() {
-		echo '
-			<script type="text/javascript" src="/scripts/prototype/prototype.js"></script>
-			<script type="text/javascript" src="/scripts/scriptaculous/scriptaculous.js"></script>
-			<script type="text/javascript" src="/scripts/codendi/Tooltip.js"></script>
-			<script type="text/javascript" src="/scripts/codendi/LayoutManager.js"></script>
-			<script type="text/javascript" src="/scripts/codendi/ReorderColumns.js"></script>
-			<script type="text/javascript" src="/scripts/codendi/codendi-1236793993.js"></script>
-			<script type="text/javascript" src="/scripts/codendi/validate.js"></script>
-			<script type="text/javascript" src="'. util_make_uri('/js/common.js') .'"></script>
-			<script language="JavaScript" type="text/javascript">/* <![CDATA[ */';
+		$this->addJavascript("/scripts/prototype/prototype.js");
+		$this->addJavascript("/scripts/scriptaculous/scriptaculous.js");
+		$this->addJavascript("/scripts/codendi/Tooltip.js");
+		$this->addJavascript("/scripts/codendi/LayoutManager.js");
+		$this->addJavascript("/scripts/codendi/ReorderColumns.js");
+		$this->addJavascript("/scripts/codendi/codendi-1236793993.js");
+		$this->addJavascript("/scripts/codendi/validate.js");
+		$this->addJavascript('/js/common.js');
+
+		echo "\n\t\t\t" .
+		    '<script language="JavaScript" type="text/javascript">' .
+		    "//<![CDATA[\n";
 		plugin_hook ("javascript",false);
-		echo '
-			/* ]]> */</script>';
+		echo "\n\t\t\t//]]></script>\n";
 		plugin_hook ("javascript_file",false);
 		echo $this->getJavascripts();
 	}
@@ -1234,9 +1236,9 @@
 
 	function widget(&$widget, $layout_id, $readonly, $column_id, $is_minimized, $display_preferences, $owner_id, $owner_type) {
 		$element_id = 'widget_'. $widget->id .'-'. $widget->getInstanceId();
-		echo '<div class="widget" id="'. $element_id . "\">\n";
-		echo '<div class="widget_titlebar '. ($readonly?'':'widget_titlebar_handle') . "\">\n";
-		echo '<div class="widget_titlebar_title">'. $widget->getTitle() . "</div>\n";
+		echo '<div class="widget" id="' . $element_id . "\">\n";
+		echo '<div class="widget_titlebar ' . ($readonly ? '' : 'widget_titlebar_handle') . "\">\n";
+		echo '<div class="widget_titlebar_title">' . $widget->getTitle() . "</div>\n";
 		if (!$readonly) {
 			echo '<div class="widget_titlebar_close"><a href="/widgets/updatelayout.php?owner='. $owner_type.$owner_id .'&action=widget&name['. $widget->id .'][remove]='. $widget->getInstanceId() .'&column_id='. $column_id .'&layout_id='. $layout_id .'">'. $this->getPicto('ic/close.png', _('Close'), 'Close', '16', '16') . "</a></div>\n";
 			if ($is_minimized) {
@@ -1269,14 +1271,18 @@
 		}
 		echo "</div>\n";
 		if ($widget->isAjax()) {
-			echo '<script language="JavaScript" type="text/javascript">/* <![CDATA[ */'."
-				document.observe('dom:loaded', function () {
-						$('$element_id-ajax').update('<div style=\"text-align:center\">". $this->getPicto('ic/spinner.gif','spinner','spinner', '10', '10') ."</div>');
-						new Ajax.Updater('$element_id-ajax', 
-							'". $widget->getAjaxUrl($owner_id, $owner_type) ."'
-							);
-						});
-			/* ]]> */</script>";
+?>
+			<script language="JavaScript" type="text/javascript">//<![CDATA[
+			document.observe('dom:loaded', function () {
+				$('<?php echo $element_id; ?>-ajax').update('<div style="text-align:center"><?php
+			echo $this->getPicto('ic/spinner.gif', 'spinner', 'spinner', '10', '10');
+				?></div>');
+				new Ajax.Updater('<?php echo $element_id; ?>-ajax', '<?php
+			echo $widget->getAjaxUrl($owner_id, $owner_type);
+				?>');
+			});
+			//]]></script>
+<?php
 		}
 		echo "</div>\n";
 	}

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-10-28 17:29:56 UTC (rev 17658)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php	2011-10-28 17:30:01 UTC (rev 17659)
@@ -53,6 +53,7 @@
 		$this->addStylesheet('/themes/css/evolvis.css', 'all');
 		// $this->addStylesheet('/themes/css/screen.css', 'screen');
 		$this->addStylesheet('/themes/css/print.css', 'print');
+		$this->addStylesheet('/themes/css/smoothness/jquery-ui-1.8.15.custom.css');
 		$this->addJavascript('/js/common.js');
 		$this->addJavascript('/js/css.js');
 		$this->project = false;



More information about the evolvis-commits mailing list