[Fusionforge-commits] r14432 - in trunk/src: plugins/compactpreview/include plugins/compactpreview/www www/include

Olivier Berger olberger at fusionforge.org
Mon Sep 19 10:01:13 CEST 2011


Author: olberger
Date: 2011-09-19 10:01:13 +0200 (Mon, 19 Sep 2011)
New Revision: 14432

Modified:
   trunk/src/plugins/compactpreview/include/CompactPreviewPlugin.class.php
   trunk/src/plugins/compactpreview/www/project.php
   trunk/src/www/include/user_profile.php
Log:
Differentiate title between local and OSLC

Modified: trunk/src/plugins/compactpreview/include/CompactPreviewPlugin.class.php
===================================================================
--- trunk/src/plugins/compactpreview/include/CompactPreviewPlugin.class.php	2011-09-19 08:01:07 UTC (rev 14431)
+++ trunk/src/plugins/compactpreview/include/CompactPreviewPlugin.class.php	2011-09-19 08:01:13 UTC (rev 14432)
@@ -115,7 +115,7 @@
 				
 	}
 	
-	function display_project_html_compact_preview($project) {
+	function display_project_html_compact_preview($project, $title) {
 		
 		$project_obj = group_get_object_by_name($project);
 		
@@ -156,7 +156,7 @@
 			<table>
 		
 				<tr>
-					<td colspan="2"><i>Project Compact Preview</i></td>
+					<td colspan="2"><i>'. $title .'</i></td>
 				</tr>
 				<tr>
 					'/* <td rowspan="8"><img src="/plugins/compactpreview/images/userTooltip/oslc.png" />
@@ -285,7 +285,8 @@
 			// if want direct compact-preview rendering
 			case 'application/x-fusionforge-compact+html' : {
 				$params['content_type'] = 'text/html';
-				$params['content'] = $this->display_project_html_compact_preview($projectname);
+				$title = _('Compact preview of local project');
+				$params['content'] = $this->display_project_html_compact_preview($projectname, $title);
 				break;
 			}
 		}

Modified: trunk/src/plugins/compactpreview/www/project.php
===================================================================
--- trunk/src/plugins/compactpreview/www/project.php	2011-09-19 08:01:07 UTC (rev 14431)
+++ trunk/src/plugins/compactpreview/www/project.php	2011-09-19 08:01:13 UTC (rev 14432)
@@ -34,8 +34,10 @@
 
 $project = getStringFromRequest('project');
 
-echo $pluginCompatPreview->display_project_html_compact_preview($project);
+$title = _("OSLC Project Compact Preview");
 
+echo $pluginCompatPreview->display_project_html_compact_preview($project, $title);
+
 // Local Variables:
 // mode: php
 // c-file-style: "bsd"

Modified: trunk/src/www/include/user_profile.php
===================================================================
--- trunk/src/www/include/user_profile.php	2011-09-19 08:01:07 UTC (rev 14431)
+++ trunk/src/www/include/user_profile.php	2011-09-19 08:01:13 UTC (rev 14432)
@@ -47,7 +47,7 @@
 		$html = '<table>';
 		if($title) {
 			$html .= '<tr>
-						<td>'. $title . '</td>
+						<td colspan="2">'. $title . '</td>
 					  </tr>';
 		}
 	} else {




More information about the Fusionforge-commits mailing list