[evolvis-commits] r17229: merge bm:taramir51/patches/theme-evolvis

mirabilos at evolvis.org mirabilos at evolvis.org
Fri May 13 14:12:36 CEST 2011


Author: mirabilos
Date: 2011-05-13 14:12:36 +0200 (Fri, 13 May 2011)
New Revision: 17229

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php
Log:
merge bm:taramir51/patches/theme-evolvis

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-05-13 12:12:30 UTC (rev 17228)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php	2011-05-13 12:12:36 UTC (rev 17229)
@@ -258,17 +258,18 @@
 
 		// ################# Homepage Link
 
-		print '<a href="http://' . $project->getHomePage() . '">';
+		print "\n".'<a href="http://' . $project->getHomePage() . '">';
 		print html_image('ic/home16b.png','20','20',array('alt'=>_('Home Page')));
-		print ' '._('Project Home Page').'</a>';
+		print ' '._('Project Home Page')."</a>\n";
 
 		// ################## ArtifactTypes
 
 		// CB hide tracker if desired
 		if ($project->usesTracker()) {
-			print '<hr size="1" /><a href="'.util_make_url ('/tracker/?group_id='.$group_id).'">';
+			print '<hr size="1" />' . "\n" .
+			    '<a href="'.util_make_url ('/tracker/?group_id='.$group_id).'">';
 			print html_image('ic/tracker20g.png','20','20',array('alt'=>_('Tracker')));
-			print ' '._('Tracker').'</a>';
+			print ' '._('Tracker')."</a>\n";
 
 			$result=db_query_params("SELECT agl.*,aca.count,aca.open_count
 			FROM artifact_group_list agl
@@ -280,29 +281,31 @@
 			$rows = db_numrows($result);
 
 			if (!$result || $rows < 1) {
-				echo '<br /><em>'._('No trackers found').'</em>';
+				echo "<br />\n<em>"._('No trackers found').'</em>';
 			} else {
 				for ($j = 0; $j < $rows; $j++) {
-					echo '<p>- ' ;
+					echo "\n<p>- ";
 					print util_make_link ('/tracker/?atid='. db_result($result, $j, 'group_artifact_id') . '&group_id='.$group_id.'&func=browse',db_result($result, $j, 'name')) . ' ' ;
 					printf(ngettext('(<strong>%1$s</strong> open / <strong>%2$s</strong> total)', '(<strong>%1$s</strong> open / <strong>%2$s</strong> total)', (int) db_result($result, $j, 'open_count')), (int) db_result($result, $j, 'open_count'), (int) db_result($result, $j, 'count'));
 					echo '<br />'.db_result($result, $j, 'description').'</p>';
 				}
+				echo "\n";
 			}
 		}
 
 		// ################## forums
 
 		if ($project->usesForum()) {
-			print '<hr size="1" /><a href="'.util_make_url ('/forum/?group_id='.$group_id).'">';
+			print '<hr size="1" />' . "\n" .
+			    '<a href="'.util_make_url ('/forum/?group_id='.$group_id).'">';
 			print html_image('ic/forum20g.png','20','20',array('alt'=>_('Forums')));
-			print ' '._('Public Forums').'</a><br />(';
+			print ' '._('Public Forums')."</a>\n<br />(";
 			$messages_count = project_get_public_forum_message_count($group_id);
 			$forums_count = project_get_public_forum_count($group_id);
 			printf(ngettext("<strong>%d</strong> message","<strong>%d</strong> messages",$messages_count),$messages_count);
 			print ' in ';
 			printf(ngettext("<strong>%d</strong> forum","<strong>%d</strong> forums",$forums_count),$forums_count);
-			print ')' ;
+			print ")\n";
 		}
 
 		// ##################### Doc Manager
@@ -312,41 +315,45 @@
 			<hr size="1" />
 			<a href="'.util_make_url ('/docman/?group_id='.$group_id).'">';
 			print html_image('ic/docman16b.png','20','20',array('alt'=>_('Docs')));
-			print ' '._('Document Manager').'</a>';
+			print ' '._('Document Manager')."</a>\n";
 		}
 
 		// ##################### Mailing lists
 
 		if ($project->usesMail()) {
-			print '<hr size="1" /><a href="'.util_make_url ('/mail/?group_id='.$group_id).'">';
+			print '<hr size="1" />' . "\n" .
+			    '<a href="'.util_make_url ('/mail/?group_id='.$group_id).'">';
 			print html_image('ic/mail16b.png','20','20',array('alt'=>_('Lists')));
-			print ' '._('Mailing Lists').'</a><br />';
+			print ' '._('Mailing Lists')."</a><br />\n";
 			$n = project_get_mail_list_count($group_id);
-			printf(ngettext('(<strong>%1$s</strong> public mailing list)', '(<strong>%1$s</strong> public mailing lists)', $n), $n);
+			printf(ngettext('(<strong>%1$s</strong> public mailing list)', '(<strong>%1$s</strong> public mailing lists)', $n), $n)."\n";
 		}
 
 		// ##################### Task Manager
 
 		if ($project->usesPm()) {
-			print '<hr size="1" /><a href="'.util_make_url ('/pm/?group_id='.$group_id).'">';
+			print '<hr size="1" />' . "\n" .
+			    '<a href="'.util_make_url ('/pm/?group_id='.$group_id).'">';
 			print html_image('ic/taskman20g.png','20','20',array('alt'=>_('Tasks')));
-			print ' '._('Task Manager').'</a>';
+			print ' '._('Task Manager')."</a>\n";
 			$result = db_query_params ("SELECT * FROM project_group_list WHERE group_id=$1 AND is_public=1",array($group_id));
 			$rows = db_numrows($result);
 			if (!$result || $rows < 1) {
-				echo '<br /><em>'._('No tasks found').'</em>';
+				echo "<br />\n<em>"._('No tasks found').'</em>';
 			} else {
 				for ($j = 0; $j < $rows; $j++) {
-					echo '<br />- ' ;
+					echo "\n<br />- ";
 					print util_make_link ('/pm/task.php?group_project_id='.db_result($result, $j, 'group_project_id').'&group_id='.$group_id.'&func=browse',db_result($result, $j, 'project_name'));
 				}
+				echo "\n";
 			}
 		}
 
 		// ######################### SCM
 
 		if ($project->usesSCM()) {
-			print '<hr size="1" /><a href="'.util_make_url ('/scm/?group_id='.$group_id).'">';
+			print '<hr size="1" />' . "\n" .
+			    '<a href="'.util_make_url ('/scm/?group_id='.$group_id).'">';
 			print html_image('ic/cvs16b.png','20','20',array('alt'=>_('SCM')));
 			print ' '._('SCM Repository')."</a><br />";
 
@@ -368,6 +375,7 @@
 			$hook_params = array () ;
 			$hook_params['group_id'] = $group_id ;
 			plugin_hook ("scm_stats", $hook_params) ;
+			echo "\n";
 		}
 
 		// ######################## AnonFTP
@@ -375,10 +383,10 @@
 		// CB hide FTP if desired
 		if ($project->usesFTP()) {
 			if ($project->isActive()) {
-				print '<hr size="1" />';
+				print '<hr size="1" />'."\n";
 				print '<a href="ftp://' . $project->getUnixName() . '.' . forge_get_config('web_host') . '/pub/'. $project->getUnixName() .'/">';
 				print html_image('ic/ftp16b.png','20','20',array('alt'=>_('Anonymous FTP Space')));
-				print ' '._('Anonymous FTP Space')."</a>";
+				print ' '._('Anonymous FTP Space')."</a>\n";
 			}
 		}
 
@@ -547,12 +555,13 @@
 
 		$rv = "";
 		for ($i = 0; $i < count($TABS_DIRS); $i++) {
-			$rv .= '<span class="headblock"><span class="headlink' .
+			$rv .= '<span class="headblock">' . "\n\t" .
+			    '<span class="headlink' .
 			    (($TAB_TYPE=='outerTab' || $selected==$i)?'s':'') .
 			    '">//</span><a class="headlink" href="' .
 			    $TABS_DIRS[$i] . '"><span class="headlink' .
 			    (($selected==$i)?'s':'') . '">' . $TABS_TITLES[$i] .
-			    '</span></a></span> ';
+			    "</span></a>\n</span> ";
 		}
 		return $rv;
 	}



More information about the evolvis-commits mailing list