[Fusionforge-commits] r12637 - in branches/Branch_5_1/src: common/include plugins/oslc/include

Sabri LABBENE labbenes at fusionforge.org
Thu Mar 10 16:54:23 CET 2011


Author: labbenes
Date: 2011-03-10 16:54:23 +0100 (Thu, 10 Mar 2011)
New Revision: 12637

Modified:
   branches/Branch_5_1/src/common/include/utils.php
   branches/Branch_5_1/src/plugins/oslc/include/oslcPlugin.class.php
Log:
Enable tooltips describing users through oslc plugin.

Modified: branches/Branch_5_1/src/common/include/utils.php
===================================================================
--- branches/Branch_5_1/src/common/include/utils.php	2011-03-10 15:54:01 UTC (rev 12636)
+++ branches/Branch_5_1/src/common/include/utils.php	2011-03-10 15:54:23 UTC (rev 12637)
@@ -1145,13 +1145,22 @@
  * @return string
  */
 function util_display_user($username, $user_id,$text, $size='xs') {
-	$params = array('user_id' => $user_id, 'size' => $size, 'content' => '');
-	plugin_hook_by_reference('user_logo', $params);
-	$url = '<a href="' . util_make_url_u ($username, $user_id) . '">' . $text . '</a>';
-	if ($params['content']) {
-		return $params['content'].$url.'<div class="new_line"></div>';
-	}
-	return $url;
+        $hook_params = array();
+        $hook_params['username'] = $username;
+        $hook_params['user_id'] = $user_id;
+        $hook_params['user_link'] = '';
+        plugin_hook_by_reference("plugin_oslc_compact_user_link", $hook_params);
+        if($hook_params['user_link'] != ''){
+                return $hook_params['user_link'];
+        }
+
+        $params = array('user_id' => $user_id, 'size' => $size, 'content' => '');
+        plugin_hook_by_reference('user_logo', $params);
+        $url = '<a href="' . util_make_url_u ($username, $user_id) . '">' . $text . '</a>';
+        if ($params['content']) {
+                return $params['content'].$url.'<div class="new_line"></div>';
+        }
+        return $url;
 }
 
 /**

Modified: branches/Branch_5_1/src/plugins/oslc/include/oslcPlugin.class.php
===================================================================
--- branches/Branch_5_1/src/plugins/oslc/include/oslcPlugin.class.php	2011-03-10 15:54:01 UTC (rev 12636)
+++ branches/Branch_5_1/src/plugins/oslc/include/oslcPlugin.class.php	2011-03-10 15:54:23 UTC (rev 12637)
@@ -34,6 +34,11 @@
 		$this->_addHook("userisactivecheckbox"); // The "use ..." checkbox in user account
 		$this->_addHook("userisactivecheckboxpost"); //
 		$this->_addHook("project_admin_plugins"); // to show up in the admin page fro group
+		$this->_addHook("plugin_oslc_compact_user_link"); 
+		$this->_addHook("plugin_oslc_compact_user_view");
+		$this->_addHook("plugin_oslc_compact_cr_link");
+		$this->_addHook("plugin_oslc_compact_cr_view");
+		$this->_addHook("javascript_file"); // Add js files for oslc plugin
 	}
 
 	function CallHook ($hookname, &$params) {
@@ -147,7 +152,32 @@
 				echo '<p>'.util_make_link ("/plugins/oslc/admin/index.php?id=".$group->getID().'&type=admin&pluginname='.$this->name,
 						     _('oslc Admin')).'</p>' ;
 			}
-		}												    
+		}
+		elseif ($hookname == "plugin_oslc_compact_user_link"){
+			require_once dirname( __FILE__ ).'/CompactRessource.class.php';
+			$CR = new CompactRessource($params);
+			$params['user_link'] = $CR->compactUserLink($params['username'], $params['user_id']);
+		}
+		elseif ($hookname == "plugin_oslc_compact_user_view") {
+			// Create needed params here.
+			
+			require_once dirname( __FILE__ ).'/CompactRessource.class.php';
+			$CR = new CompactRessource($params);
+			$params['compact_user'] = $CR->CompactUser();
+		}
+		elseif ($hookname == "plugin_oslc_compact_cr_link") {
+			//
+		}
+		elseif ($hookname == "plugin_oslc_compact_cr_view") {
+			// Create needed params here.
+			
+			require_once dirname( __FILE__ ).'/CompactRessource.class.php';
+			$CompactRessource = new CompactRessource($params);
+			return $CR->CompactChangeRequest();
+		}
+		elseif ($hookname == "javascript_file") {
+			echo '<script type="text/javascript" src="/plugins/oslc/scripts/pluginOSLCHoverScripts.js"></script>'."\n";
+		}
 		elseif ($hookname == "blahblahblah") {
 			// ...
 		} 




More information about the Fusionforge-commits mailing list