[evolvis-commits] r17240: merge bm:taramir51/patches/xhtml-improvements

mirabilos at evolvis.org mirabilos at evolvis.org
Fri May 13 18:14:20 CEST 2011


Author: mirabilos
Date: 2011-05-13 18:14:20 +0200 (Fri, 13 May 2011)
New Revision: 17240

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_ProjectMembers.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php
Log:
merge bm:taramir51/patches/xhtml-improvements

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_ProjectMembers.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_ProjectMembers.class.php	2011-05-13 16:14:17 UTC (rev 17239)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_ProjectMembers.class.php	2011-05-13 16:14:20 UTC (rev 17240)
@@ -42,7 +42,6 @@
 
 		$iam_member = false ;
 		if (count($admins) > 0) {
-			echo "<p>\n";
 			echo '<span class="develtitle">'._('Project Admins').'</span><br />';
 			foreach ($admins as $u) {
 				echo '<div rel="doap:maintainer">'."\n";
@@ -64,11 +63,9 @@
 				}
 				$seen[] = $u->getID() ;
 			}
-			echo "</p>\n";
 		}
 		$seen_member = false ;
 		if (count($members) > 0) {
-			echo "<p>\n";
 			foreach ($members as $u) {
 				if (in_array ($u->getID(), $seen)) {
 					continue ;
@@ -114,7 +111,6 @@
 				}
 				echo "</div>\n"; // /#klappendevs
 			}
-			echo "</p>\n";
 		}
 
 		echo '<p><span rel="sioc:has_usergroup">';

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-05-13 16:14:17 UTC (rev 17239)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php	2011-05-13 16:14:20 UTC (rev 17240)
@@ -6,6 +6,7 @@
  * Copyright 2010 - Alain Peyrat
  * Copyright 2010 - Franck Villaume - Capgemini
  * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
+ * Copyright © 2011 Thorsten Glaser – tarent GmbH
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -197,7 +198,8 @@
 	function getJavascripts() {
 		$code = '';
 		foreach ($this->javascripts as $js) {
-			$code .= '    <script type="text/javascript" src="'.$js.'"></script>'."\n";
+			$code .= "\t\t\t";
+			$code .= '<script type="text/javascript" src="'.$js.'"></script>'."\n";
 		}
 		return $code;
 	}
@@ -205,10 +207,11 @@
 	function getStylesheets() {
 		$code = '';
 		foreach ($this->stylesheets as $c) {
+			$code .= "\t\t\t";
 			if ($c['media']) {
-				$code .= '    <link rel="stylesheet" type="text/css" href="'.$c['css'].'" media="'.$c['media'].'" />'."\n";
+				$code .= '<link rel="stylesheet" type="text/css" href="'.$c['css'].'" media="'.$c['media'].'" />'."\n";
 			} else {
-				$code .= '    <link rel="stylesheet" type="text/css" href="'.$c['css'].'"/>'."\n";
+				$code .= '<link rel="stylesheet" type="text/css" href="'.$c['css'].'"/>'."\n";
 			}
 		}
 		return $code;



More information about the evolvis-commits mailing list