From 7f25d41bf913302b8186f7a74e77ee690adc70ec Mon Sep 17 00:00:00 2001
From: Patrick Cool <patrick.cool@ugent.be>
Date: Fri, 17 Apr 2009 11:56:23 +0200
Subject: [PATCH] [svn r19824] actions consistency

---
 main/user/subscribe_user.php | 25 ++++++++++++++++++++-----
 main/user/userInfo.php       | 19 ++++++++++++++++---
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/main/user/subscribe_user.php b/main/user/subscribe_user.php
index 0081bbb086..3359ed049a 100644
--- a/main/user/subscribe_user.php
+++ b/main/user/subscribe_user.php
@@ -1,4 +1,4 @@
-<?php // $Id: subscribe_user.php 18925 2009-03-10 14:09:33Z ndieschburg $
+<?php // $Id: subscribe_user.php 19824 2009-04-17 09:56:23Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -64,9 +64,14 @@ if ($_REQUEST['type']=='teacher') {
 
 //extra entries in breadcrumb
 $interbreadcrumb[] = array ("url" => "user.php", "name" => get_lang("Users"));
+if ($_POST['keyword'])
+{
+	$interbreadcrumb[] = array ("url" => "subscribe_user.php?type=".Security::remove_XSS($_GET['type']), "name" => $tool_name);
+	$tool_name = get_lang('SearchResults');
+}
 Display :: display_header($tool_name, "User");
 
-api_display_tool_title($tool_name);
+// api_display_tool_title($tool_name);
 
 /*
 ============================================================================== 
@@ -416,11 +421,19 @@ function active_filter($active, $url_params, $row) {
 
 // Build search-form
 echo '<div class="actions">';
+
+$actions .= '<a href="user.php">'.Display::return_icon('members.gif').' '.get_lang('BackToUserList').'</a>';
+if ($_POST['keyword'])
+{
+	$actions .= '<a href="subscribe_user.php?type='.Security::remove_XSS($_GET['type']).'">'.Display::return_icon('clean_group.gif').' '.get_lang('ClearSearchResults').'</a>';
+}
+
 $form = new FormValidator('search_user', 'POST',api_get_self().'?type='.$_REQUEST['type'],'',null,false);
 $renderer = & $form->defaultRenderer();
 $renderer->setElementTemplate('<span>{element}</span> ');
 $form->add_textfield('keyword', '', false);
 $form->addElement('style_submit_button', 'submit', get_lang('SearchButton'), 'class="search"');
+$form->addElement('static','additionalactions',null,$actions);
 $form->display();
 echo '</div>';
 
@@ -442,13 +455,15 @@ $table->set_header($col ++, get_lang('reg'), false);
 $table->set_column_filter($col -1, 'reg_filter');
 $table->set_form_actions(array ('subscribe' => get_lang('reg')), 'user');
 
-// Display table
-$table->display();
-
 if ( !empty($_POST['keyword'])) {
 	$keyword_name=Security::remove_XSS($_POST['keyword']);
 	echo '<br/>'.get_lang('SearchResultsFor').' <span style="font-style: italic ;"> '.$keyword_name.' </span><br>';	
 }
+
+// Display table
+$table->display();
+
+
 /*
 ============================================================================== 
 		FOOTER 
diff --git a/main/user/userInfo.php b/main/user/userInfo.php
index d13f4d7f84..be3553764d 100644
--- a/main/user/userInfo.php
+++ b/main/user/userInfo.php
@@ -1,4 +1,4 @@
-<?php // $Id: userInfo.php 19254 2009-03-24 22:18:53Z cvargas1 $
+<?php // $Id: userInfo.php 19824 2009-04-17 09:56:23Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -87,7 +87,7 @@ else
 
 $currentCourse = $currentCourseID;
 
-api_display_tool_title(get_lang("Users"));
+// api_display_tool_title(get_lang("Users"));
 
 /*
  * data  found  in settings  are :
@@ -280,7 +280,20 @@ if ($allowedToEditContent)
 ==============================================================================
 */
 // Back button for each display mode (Top)
-echo "<div class=\"actions\"><a href=\"user.php?".api_get_cidreq()."&amp;origin=".$origin."\">".get_lang('BackUser')."</a></div>\n";
+echo '<div class="actions">';
+echo '<a href="user.php?'.api_get_cidreq().'&amp;origin='.$origin.'">'.Display::return_icon('members.gif').get_lang('BackUser').'</a>';
+if (!is_numeric($_GET['editMainUserInfo']))
+{
+	echo '<a href="userInfo.php?'.api_get_cidreq().'&amp;origin='.$origin.'&amp;editMainUserInfo='.$userIdViewed.'">'.Display::return_icon('edit.gif').get_lang('EditUser').'</a>';
+}
+else 
+{
+	echo '<a href="userInfo.php?'.api_get_cidreq().'&amp;origin='.$origin.'&amp;uInfo='.$userIdViewed.'">'.Display::return_icon('edit.gif').get_lang('ViewUser').'</a>';
+}
+echo '<a href="../mySpace/myStudents.php?'.api_get_cidreq().'&amp;origin=user_course&amp;student='.$userIdViewed.'&amp;details=true&amp;course='.$_course['id'].'">'.Display::return_icon('statistics.gif').get_lang('UserStatistics').'</a>';
+echo '</div>';
+
+
 if ($displayMode == "viewDefEdit")
 {
 	/*>>>>>>>>>>>> CATEGORIES DEFINITIONS : EDIT <<<<<<<<<<<<*/