[svn r11874] consistency improvements

improvements xhtml compliance
coding guidelines
skala
Patrick Cool 18 years ago
parent 5d16579e7e
commit daa02fd213
  1. 6
      main/group/group.php
  2. 43
      main/group/group_space.php
  3. 1
      main/inc/lib/main_api.lib.php
  4. 10
      main/user/user.php
  5. 42
      main/user/userInfo.php

@ -185,18 +185,18 @@ if (api_is_allowed_to_edit())
}
}
// Show admin-panel
echo '<a href="group_creation.php"><img src="../img/group_add_big.gif" align="absbottom">&nbsp;'.get_lang("NewGroupCreate").'</a>&nbsp;';
echo '<a href="group_creation.php">'.Display::return_icon('group_add_big.gif').'&nbsp;'.get_lang("NewGroupCreate").'</a>&nbsp;';
if (get_setting('allow_group_categories') == 'true')
{
echo '<a href="group_category.php?action=add_category">'.get_lang("AddCategory").'</a>&nbsp;';
}
else
{
echo '<a href="group_category.php?id=2"><img src="../img/edit_group.gif" align="absbottom">&nbsp;'.get_lang('PropModify').'</a>&nbsp;';
echo '<a href="group_category.php?id=2">'.Display::return_icon('edit_group.gif').'&nbsp;'.get_lang('PropModify').'</a>&nbsp;';
}
if( Database::count_rows(Database::get_course_table(TABLE_GROUP)) > 0)
{
echo '<a href="group_overview.php"><img src="../img/group_view.gif" align="absbottom">&nbsp;'.get_lang('GroupOverview').'</a>&nbsp;';
echo '<a href="group_overview.php">'.Display::return_icon('group_view.gif').'&nbsp;'.get_lang('GroupOverview').'</a>&nbsp;';
}
}
$group_cats = GroupManager :: get_categories();

@ -139,7 +139,10 @@ $is_course_member = CourseManager :: is_user_subscribed_in_real_or_linked_course
* Group title and comment
*/
api_display_tool_title($nameTools.' '.stripslashes($current_group['name']));
echo '<blockquote>'.stripslashes($current_group['description']).'</blockquote>';
if (!empty($current_group['description']))
{
echo '<blockquote>'.stripslashes($current_group['description']).'</blockquote>';
}
@ -153,30 +156,34 @@ if (api_is_allowed_to_edit() OR GroupManager :: is_user_in_group($_SESSION['_uid
// Edited by Patrick Cool, 12 feb 2004: hide the forum link if there is no forum for this group (deleted through forum_admin.php)
if (!is_null($current_group['forum_id']) && $current_group['forum_state'] != TOOL_NOT_AVAILABLE)
{
$tools .= "<a href=\"../phpbb/viewforum.php?".api_get_cidreq()."&amp;origin=$origin&amp;gidReq=".$current_group['id']."&amp;forum=".$current_group['forum_id']."\"><img src='../img/forum.gif' align='absbottom'>&nbsp;".get_lang("Forums")."</a></div>";
$tools .= "<a href=\"../forum/viewforum.php?".api_get_cidreq()."&amp;origin=$origin&amp;gidReq=".$current_group['id']."&amp;forum=".$current_group['forum_id']."\">".Display::return_icon('forum.gif')."&nbsp;".get_lang("Forums")."</a></div>";
}
if( $current_group['doc_state'] != TOOL_NOT_AVAILABLE )
{
// link to the documents area of this group
$tools .= "<div style='margin-bottom: 5px;'><a href=\"../document/document.php?".api_get_cidreq()."&amp;gidReq=".$current_group['id']."\"><img src='../img/folder_document.gif' align='absbottom'>&nbsp;".get_lang("GroupDocument")."</a></div>";
$tools .= "<div style='margin-bottom: 5px;'><a href=\"../document/document.php?".api_get_cidreq()."&amp;gidReq=".$current_group['id']."\">".Display::return_icon('folder_document.gif')."&nbsp;".get_lang("GroupDocument")."</a></div>";
}
if ( $current_group['calendar_state'] != TOOL_NOT_AVAILABLE)
{
//link to a group-specific part of agenda
$tools .= "<div style='margin-bottom: 5px;'><a href=\"../calendar/agenda.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."&amp;group=".$current_group['id']."&amp;acces=0\"><img src='../img/agenda.gif' align='absbottom'>&nbsp;".get_lang("GroupCalendar")."</a></div>";
$tools .= "<div style='margin-bottom: 5px;'><a href=\"../calendar/agenda.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."&amp;group=".$current_group['id']."&amp;acces=0\">".Display::return_icon('agenda.gif')."&nbsp;".get_lang("GroupCalendar")."</a></div>";
}
if ( $current_group['work_state'] != TOOL_NOT_AVAILABLE)
{
//link to the works area of this group
$tools .= "<div style='margin-bottom: 5px;'><a href=\"../work/work.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."\"><img src='../img/works.gif' align='absbottom'>&nbsp;".get_lang("GroupWork")."</a></div>";
$tools .= "<div style='margin-bottom: 5px;'><a href=\"../work/work.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."\">".Display::return_icon('works.gif')."&nbsp;".get_lang("GroupWork")."</a></div>";
}
if ( $current_group['announcements_state'] != TOOL_NOT_AVAILABLE)
{
//link to a group-specific part of announcements
$tools .= "<div style='margin-bottom: 5px;'><a href=\"../announcements/announcements.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."\"><img src='../img/valves.gif' align='absbottom'>&nbsp;".get_lang("GroupAnnouncements")."</a></div>";
$tools .= "<div style='margin-bottom: 5px;'><a href=\"../announcements/announcements.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."\">".Display::return_icon('valves.gif')."&nbsp;".get_lang("GroupAnnouncements")."</a></div>";
}
echo '<b>'.get_lang("Tools").':</b><blockquote>'.$tools.'</blockquote>';
echo '<b>'.get_lang("Tools").':</b>';
if (!empty($tools))
{
echo '<blockquote>'.$tools.'</blockquote>';
}
}
else
@ -184,29 +191,33 @@ else
$tools = '';
if ($current_group['forum_state'] == TOOL_PUBLIC && !is_null($current_group['forum_id']))
{
$tools .= "<a href=\"../phpbb/viewforum.php?".api_get_cidreq()."&amp;origin=$origin&amp;gidReq=".$current_group['id']."&amp;forum=".$current_group['forum_id']."\"><img src='../img/forum.gif' align='absbottom'>&nbsp;".get_lang("Forums")."</a><br/>";
$tools .= "<a href=\"../forum/viewforum.php?".api_get_cidreq()."&amp;origin=$origin&amp;gidReq=".$current_group['id']."&amp;forum=".$current_group['forum_id']."\">".Display::return_icon('forum.gif')."&nbsp;".get_lang("Forums")."</a><br/>";
}
if( $current_group['doc_state'] == TOOL_PUBLIC )
{
// link to the documents area of this group
$tools .= "<a href=\"../document/document.php?".api_get_cidreq()."&amp;gidReq=".$current_group['id']."&amp;origin=$origin\"><img src='../img/folder_document.gif' align='absbottom'>&nbsp;".get_lang("GroupDocument")."</a><br/>";
$tools .= "<a href=\"../document/document.php?".api_get_cidreq()."&amp;gidReq=".$current_group['id']."&amp;origin=$origin\">".Display::return_icon('folder_document.gif')."&nbsp;".get_lang("GroupDocument")."</a><br/>";
}
if ( $current_group['calendar_state'] == TOOL_PUBLIC )
{
//link to a group-specific part of agenda
$tools .= "<a href=\"../calendar/agenda.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."&amp;group=".$current_group['id']."\"><img src='../img/agenda.gif' align='absbottom'>&nbsp;".get_lang("GroupCalendar")."</a><br/>";
$tools .= "<a href=\"../calendar/agenda.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."&amp;group=".$current_group['id']."\">".Display::return_icon('agenda.gif')."&nbsp;".get_lang("GroupCalendar")."</a><br/>";
}
if ( $current_group['work_state'] == TOOL_PUBLIC )
{
//link to the works area of this group
$tools .= "<a href=\"../work/work.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."\"><img src='../img/works.gif' align='absbottom'>&nbsp;".get_lang("GroupWork")."</a><br/>";
$tools .= "<a href=\"../work/work.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."\">".Display::return_icon('works.gif')."&nbsp;".get_lang("GroupWork")."</a><br/>";
}
if ( $current_group['announcements_state'] == TOOL_PUBLIC)
{
//link to a group-specific part of announcements
$tools .= "<a href=\"../announcements/announcements.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."&amp;group=".$current_group['id']."\"><img src='../img/valves.gif' align='absbottom'>&nbsp;".get_lang("GroupAnnouncements")."</a><br/>";
$tools .= "<a href=\"../announcements/announcements.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."&amp;group=".$current_group['id']."\">".Display::return_icon('valves.gif')."&nbsp;".get_lang("GroupAnnouncements")."</a><br/>";
}
echo '<b>'.get_lang("Tools").':</b>';
if (!empty($tools))
{
echo '<blockquote>'.$tools.'</blockquote>';
}
echo '<b>'.get_lang("GroupTools").':</b><blockquote>'.$tools.'</blockquote>';
}
/*
@ -224,7 +235,11 @@ else
$tutor_info .= "<div style='margin-bottom: 5px;'><a href='../user/userInfo.php?origin=".$origin."&amp;uInfo=".$tutor['user_id']."'><img src='../img/coachs.gif' align='absbottom'>&nbsp;".$tutor['firstname']." ".$tutor['lastname']."</a></div>";
}
}
echo '<b>'.get_lang("GroupTutors").':</b><blockquote>'.$tutor_info.'</blockquote>';
echo '<b>'.get_lang("GroupTutors").':</b>';
if (!empty($tutor_info))
{
echo '<blockquote>'.$tutor_info.'</blockquote>';
}

@ -1144,6 +1144,7 @@ function api_display_tool_view_option()
else
{
$sourceurl = $_SERVER['REQUEST_URI'];
$sourceurl = str_replace('&', '&amp;', $sourceurl);
}
if ($isStudentView == "true" and $_SESSION["studentview"])
{

@ -311,10 +311,10 @@ Display::display_introduction_section(TOOL_USER, $is_allowed);
if( api_is_allowed_to_edit())
{
echo "<div align=\"right\">";
echo '<a href="user.php?action=export&type=csv"><img align="absbottom" src="../img/excel.gif">&nbsp;'.get_lang('ExportAsCSV').'</a> | ';
echo "<a href=\"subscribe_user.php\"><img align='absbottom' src='../img/add_user_big.gif'>&nbsp;".get_lang("SubscribeUserToCourse")."</a> | ";
echo "<a href=\"subscribe_user.php?type=teacher\"><img align='absbottom' src='../img/add_user_big.gif'>&nbsp;".get_lang("SubscribeUserToCourseAsTeacher")."</a> | ";
echo "<a href=\"../group/group.php?".api_get_cidreq()."\"><img align='absbottom' src='../img/edit_group.gif'>&nbsp;".get_lang("GroupUserManagement")."</a>";
echo '<a href="user.php?action=export&amp;type=csv">'.Display::return_icon('excel.gif', get_lang('ExportAsCSV')).'&nbsp;'.get_lang('ExportAsCSV').'</a> | ';
echo '<a href="subscribe_user.php">'.Display::return_icon('add_user_big.gif',get_lang("SubscribeUserToCourse")).'&nbsp;'.get_lang("SubscribeUserToCourse").'</a> | ';
echo "<a href=\"subscribe_user.php?type=teacher\">".Display::return_icon('add_user_big.gif', get_lang("SubscribeUserToCourseAsTeacher"))."&nbsp;".get_lang("SubscribeUserToCourseAsTeacher")."</a> | ";
echo "<a href=\"../group/group.php?".api_get_cidreq()."\">".Display::return_icon('edit_group.gif', get_lang("GroupUserManagement"))."&nbsp;".get_lang("GroupUserManagement")."</a>";
if(api_get_setting('use_session_mode')=='false')
{
echo ' | <a href="class.php">'.get_lang('Classes').'</a>';
@ -471,7 +471,7 @@ function modify_filter($user_id)
if($is_allowed_to_track)
{
$result .= '<a href="../mySpace/myStudents.php?student='.$user_id.'&details=true&course='.$_course['id'].'&origin=user_course"><img border="0" alt="'.get_lang('Tracking').'" src="../img/statistics.gif" /></a>&nbsp;';
$result .= '<a href="../mySpace/myStudents.php?student='.$user_id.'&amp;details=true&amp;course='.$_course['id'].'&amp;origin=user_course"><img border="0" alt="'.get_lang('Tracking').'" src="../img/statistics.gif" /></a>&nbsp;';
}
if(api_is_allowed_to_edit())

@ -217,7 +217,7 @@ if ($allowedToEditContent)
*/
// Back button for each display mode (Top)
echo "<div align=\"right\"><a href=\"user.php?".api_get_cidreq()."&origin=".$origin."\">".get_lang('BackUser')."</a></div>\n";
echo "<div align=\"right\"><a href=\"user.php?".api_get_cidreq()."&amp;origin=".$origin."\">".get_lang('BackUser')."</a></div>\n";
if ($displayMode == "viewDefEdit")
{
/*>>>>>>>>>>>> CATEGORIES DEFINITIONS : EDIT <<<<<<<<<<<<*/
@ -265,12 +265,16 @@ elseif ($displayMode == "viewDefList")
// displays commands
echo "<a href=\"".$_SERVER['PHP_SELF']."?removeDef=", $thisCat['catId'], "\">", "<img src=\"../img/delete.gif\" border=\"0\" alt=\"".get_lang('Remove')."\" onclick=\"javascript:if(!confirm('".addslashes(htmlentities(get_lang('ConfirmYourChoice')))."')) return false;\">", "</a>", "<a href=\"".$_SERVER['PHP_SELF']."?editDef=", $thisCat['catId'], "\">", "<img src=\"../img/edit.gif\" border=\"0\" alt=\"".get_lang('Edit')."\">", "</a>", "<a href=\"".$_SERVER['PHP_SELF']."?moveUpDef=", $thisCat['catId'], "\">", "<img src=\"../img/up.gif\" border=\"0\" alt=\"".get_lang('MoveUp')."\">", "</a>", "<a href=\"".$_SERVER['PHP_SELF']."?moveDownDef=", $thisCat['catId'], "\">", "<img src=\"../img/down.gif\" border=\"0\" alt=\"".get_lang('MoveDown')."\">", "</a>\n";
echo "<a href=\"".$_SERVER['PHP_SELF']."?removeDef=", $thisCat['catId'], "\">", "<img src=\"../img/delete.gif\" border=\"0\" alt=\"".get_lang('Remove')."\" onclick=\"javascript:if(!confirm('".addslashes(htmlentities(get_lang('ConfirmYourChoice')))."')) return false;\">", "</a>", "<a href=\"".$_SERVER['PHP_SELF']."?editDef=", $thisCat['catId'], "\">", "<img src=\"../img/edit.gif\" border=\"0\" alt=\"".get_lang('Edit')."\" />", "</a>", "<a href=\"".$_SERVER['PHP_SELF']."?moveUpDef=", $thisCat['catId'], "\">", "<img src=\"../img/up.gif\" border=\"0\" alt=\"".get_lang('MoveUp')."\">", "</a>", "<a href=\"".$_SERVER['PHP_SELF']."?moveDownDef=", $thisCat['catId'], "\">", "<img src=\"../img/down.gif\" border=\"0\" alt=\"".get_lang('MoveDown')."\">", "</a>\n";
} // end for each
} // end if ($catList)
echo "<center>\n", "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">", "<input type=\"submit\" name=\"addDef\" value=\"".get_lang('AddNewHeading')."\">", "</form>\n", "<center>\n";
echo "<center>\n",
"<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">",
"<input type=\"submit\" name=\"addDef\" value=\"".get_lang('AddNewHeading')."\" />",
"</form>\n",
"<center>\n";
}
elseif ($displayMode == "viewContentEdit")
{
@ -318,14 +322,26 @@ elseif ($displayMode == "viewMainInfoEdit")
}
else
{
echo "<img src=\"../img/unknown.jpg\" border=\"1\">";
Display::display_icon('unknown.jpg', get_lang('Unknown'));
}
echo "<form action=\"".$_SERVER['PHP_SELF']."\" method=\"post\">\n", "<input type=\"hidden\" name=\"submitMainUserInfo\" value=\"$userIdViewed\">\n", "<table width=\"80%\" border=\"0\">", "<tr align=\"center\" bgcolor=\"#E6E6E6\">\n", "<td align=\"left\">", get_lang('Name'), "</td>\n", "<td align=\"left\">", get_lang('Role'), "</td>\n", "<td>", get_lang('Tutor'), "</td>\n", "<td>", get_lang('CourseManager'), "</td>\n", "</tr>\n", "<tr align=\"center\">", "<td align=\"left\"><b>", htmlize($mainUserInfo['firstName']), " ", htmlize($mainUserInfo['lastName']), "</b></td>\n", "<td align=\"left\"><input type=\"text\" name =\"role\" value=\"", $mainUserInfo['role'], "\" maxlength=\"40\"></td>", "<td><input class=\"checkbox\" type=\"checkbox\" name=\"promoteTutor\" value=\"1\" ", $tutorChecked, "></td>";
echo "<form action=\"".$_SERVER['PHP_SELF']."\" method=\"post\">\n",
"<input type=\"hidden\" name=\"submitMainUserInfo\" value=\"$userIdViewed\" />\n",
"<table width=\"80%\" border=\"0\">",
"<tr align=\"center\" bgcolor=\"#E6E6E6\">\n",
"<td align=\"left\">", get_lang('Name'), "</td>\n",
"<td align=\"left\">", get_lang('Role'), "</td>\n",
"<td>", get_lang('Tutor'), "</td>\n",
"<td>", get_lang('CourseManager'), "</td>\n",
"</tr>\n",
"<tr align=\"center\">",
"<td align=\"left\"><b>", htmlize($mainUserInfo['firstName']), " ", htmlize($mainUserInfo['lastName']), "</b></td>\n",
"<td align=\"left\"><input type=\"text\" name =\"role\" value=\"", $mainUserInfo['role'], "\" maxlength=\"40\" /></td>",
"<td><input class=\"checkbox\" type=\"checkbox\" name=\"promoteTutor\" value=\"1\" ", $tutorChecked, " /></td>";
if (!($is_courseAdmin && $_user['user_id'] == $userIdViewed))
{
echo "<td><input class=\"checkbox\" type=\"checkbox\" name=\"promoteCourseAdmin\" value=\"1\"", $courseAdminChecked, "></td>\n";
echo "<td><input class=\"checkbox\" type=\"checkbox\" name=\"promoteCourseAdmin\" value=\"1\"", $courseAdminChecked, " /></td>\n";
}
else
{
@ -333,7 +349,7 @@ elseif ($displayMode == "viewMainInfoEdit")
}
echo "<td><input type=\"submit\" name=\"submit\" value=\"Ok\"></td>\n", "</tr>", "</table>", "</form>\n";
echo "<td><input type=\"submit\" name=\"submit\" value=\"Ok\" /></td>\n", "</tr>", "</table>", "</form>\n";
echo "<p>".Display :: encrypted_mailto_link($mainUserInfo['email'], $mainUserInfo['email'])."</p>";
@ -363,7 +379,7 @@ elseif ($displayMode == "viewContentList") // default display
}
else
{
echo "<img src=\"../img/unknown.jpg\" border=\"1\">";
Display::display_icon('unknown.jpg', get_lang('Unknown'));
}
if($is_allowedToTrack)
{
@ -411,14 +427,14 @@ elseif ($displayMode == "viewContentList") // default display
{
echo "<td>",
"<a href=\"".$_SERVER['PHP_SELF']."?editMainUserInfo=$userIdViewed\">",
"<img border=\"0\" alt=\"\" src=\"../img/edit.gif\">",
"<img border=\"0\" alt=\"\" src=\"../img/edit.gif\" />",
"</a>",
"</td>";
}
if ($is_allowedToTrack)
{
echo "<td>",
"<a href=\"../tracking/userLog.php?".api_get_cidreq()."&uInfo=$userIdViewed\">",
"<a href=\"../tracking/userLog.php?".api_get_cidreq()."&amp;uInfo=$userIdViewed\">",
"<img border=\"0\" alt=\"".get_lang('Tracking')." : $userIdViewed\" src=\"../img/statistics.png\" />",
"</a>",
"</td>";
@ -427,8 +443,6 @@ elseif ($displayMode == "viewContentList") // default display
"</table>";
//"<p><a href=\"mailto:",$mainUserInfo['email'],"\">",$mainUserInfo['email'],"</a>",
echo "<p>". Display::encrypted_mailto_link($mainUserInfo['email'],$mainUserInfo['email']). "</p>";
echo "<p>\n";
}
if (get_setting('allow_user_headings') == 'true' && $allowedToEditDef) // only course administrators see this line
@ -436,7 +450,7 @@ elseif ($displayMode == "viewContentList") // default display
echo "<div align=right>",
"<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">",
get_lang('CourseAdministratorOnly')," : ",
"<input type=\"submit\" name=\"viewDefList\" value=\"".get_lang('DefineHeadings')."\">",
"<input type=\"submit\" name=\"viewDefList\" value=\"".get_lang('DefineHeadings')."\" />",
"</form>",
"<hr noshade size=\"1\" style=\"color:#99CCFF\">",
"</div>\n";
@ -481,7 +495,7 @@ elseif ($displayMode == "viewContentList") // default display
}
// Back button for each display mode (bottom)
echo "<div align=\"right\"><a href=\"user.php?".api_get_cidreq()."&origin=".$origin."\">".get_lang('BackUser')."</a></div>\n";
echo "<div align=\"right\"><a href=\"user.php?".api_get_cidreq()."&amp;origin=".$origin."\">".get_lang('BackUser')."</a></div>\n";
/*
==============================================================================
FOOTER

Loading…
Cancel
Save