MDL-19124 Continued misc user profile cleanups

- fixed user styles in base theme - added new divs for better control on user profile and user index pages - reduced data on course user profiles down to minimum - removed user/tabs.php completely and all uses of it - changed default user icon pix to something very bland (bye bye smiley cake)
eSrem · May 16, 2010 · 99cca84 · 99cca84
1 parent db1a1c0
commit 99cca84
Show file tree

Hide file tree

Showing 19 changed files with 104 additions and 538 deletions.
diff --git a/admin/roles/assign.php b/admin/roles/assign.php
@@ -231,7 +231,7 @@
         admin_externalpage_setup('assignroles', '', array('contextid' => $contextid, 'roleid' => $roleid));
         break;
     case CONTEXT_USER:
-        $tabfile = $CFG->dirroot.'/user/tabs.php';
+        $tabfile = null;
         if ($isfrontpage) {
             $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
             $PAGE->set_heading($fullname);
@@ -259,9 +259,11 @@
         break;
 }
 
-$currenttab = 'assign';
 echo $OUTPUT->header();
-include($tabfile);
+if ($tabfile) {
+    $currenttab = 'assign';
+    include($tabfile);
+}
 
 // Print heading.
 echo $OUTPUT->heading_with_help($title, 'assignroles', 'role');

diff --git a/admin/roles/check.php b/admin/roles/check.php
@@ -80,7 +80,7 @@
         admin_externalpage_setup('assignroles', '', array('contextid' => $contextid, 'roleid' => $roleid));
         break;
     case CONTEXT_USER:
-        $tabfile = $CFG->dirroot.'/user/tabs.php';
+        $tabfile = null;
         if ($isfrontpage) {
             $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
             $PAGE->set_heading($fullname);
@@ -108,12 +108,14 @@
         break;
 }
 
-$currenttab = 'check';
 echo $OUTPUT->header();
 // These are needed early because of tabs.php
 $assignableroles = get_assignable_roles($context, ROLENAME_BOTH);
 $overridableroles = get_overridable_roles($context, ROLENAME_BOTH);
-include($tabfile);
+if ($tabfile) {
+    $currenttab = 'check';
+    include($tabfile);
+}
 
 // Print heading.
 echo $OUTPUT->heading_with_help($title, 'checkpermissions', 'role');

diff --git a/admin/roles/override.php b/admin/roles/override.php
@@ -65,7 +65,7 @@
 
 $role = $DB->get_record('role', array('id'=>$roleid), '*', MUST_EXIST);
 
-// These are needed early because of tabs.php
+// These are needed early 
 $assignableroles  = get_assignable_roles($context, ROLENAME_BOTH);
 list($overridableroles, $overridecounts, $nameswithcounts) = get_overridable_roles($context, ROLENAME_BOTH, true);
 
@@ -86,7 +86,7 @@
         print_error('cannotoverridebaserole', 'error');
         break;
     case CONTEXT_USER:
-        $tabfile = $CFG->dirroot.'/user/tabs.php';
+        $tabfile = null;
         if ($isfrontpage) {
             $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
             $PAGE->set_heading($fullname);
@@ -135,7 +135,9 @@
 
 // Finally start page output
 echo $OUTPUT->header();
-include($tabfile);
+if ($tabfile) {
+    include($tabfile);
+}
 echo $OUTPUT->heading_with_help($title, 'overrides', 'role');
 
 // Show UI for overriding roles.

diff --git a/admin/roles/permissions.php b/admin/roles/permissions.php
@@ -85,7 +85,7 @@
         print_error('cannotoverridebaserole', 'error');
         break;
     case CONTEXT_USER:
-        $tabfile = $CFG->dirroot.'/user/tabs.php';
+        $tabfile = null;
         if ($isfrontpage) {
             $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
             $PAGE->set_heading($fullname);
@@ -143,7 +143,9 @@
         }
         // Display and print
         echo $OUTPUT->header();
-        include($tabfile);
+        if ($tabfile) {
+            include($tabfile);
+        }
         echo $OUTPUT->heading($title);
         echo $OUTPUT->confirm($message, $continueurl, $PAGE->url);
         echo $OUTPUT->footer();
@@ -182,7 +184,9 @@
             }
         }
         echo $OUTPUT->header();
-        include($tabfile);
+        if ($tabfile) {
+            include($tabfile);
+        }
         echo $OUTPUT->heading($title);
         echo $OUTPUT->box($message);
         $mform->display();
@@ -192,7 +196,9 @@
 }
 
 echo $OUTPUT->header();
-include($tabfile);
+if ($tabfile) {
+    include($tabfile);
+}
 echo $OUTPUT->heading($title);
 
 $table = new permissions_table($context, $contextname, $allowoverrides, $allowsafeoverrides, $overridableroles);

diff --git a/admin/roles/usersroles.php b/admin/roles/usersroles.php
@@ -106,11 +106,10 @@
     $contexts[$ra->contextid]->roleassignments[$ra->roleid] = $ra;
 }
 
-/// These are needed to determine which tabs tabs.php should show.
 $assignableroles = get_assignable_roles($usercontext, ROLENAME_BOTH);
 $overridableroles = get_overridable_roles($usercontext, ROLENAME_BOTH);
 
-/// Print the header and tabs
+/// Print the header
 $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $coursecontext));
 $straction = get_string('thisusersroles', 'role');
 $title = get_string('xroleassignments', 'role', $fullname);
@@ -128,11 +127,6 @@
 $PAGE->navbar->add($fullname, new moodle_url("$CFG->wwwroot/user/view.php", array('id'=>$userid,'course'=>$courseid)));
 $PAGE->navbar->add($straction);
 echo $OUTPUT->header();
-
-$showroles = 1;
-$currenttab = 'usersroles';
-include($CFG->dirroot.'/user/tabs.php');
-
 echo $OUTPUT->heading($title, 3);
 echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal');
 

diff --git a/blog/index.php b/blog/index.php
@@ -58,7 +58,6 @@
 }
 
 $sitecontext = get_context_instance(CONTEXT_SYSTEM);
-$tabsfile = null;
 
 if (!$userid && has_capability('moodle/blog:view', $sitecontext) && $CFG->bloglevel > BLOG_USER_LEVEL) {
     if ($entryid) {
@@ -173,7 +172,6 @@
             print_error('cannotviewcourseblog', 'blog');
         }
     }
-    $tabsfile = $CFG->dirroot . '/user/tabs.php';
 }
 
 $courseid = (empty($courseid)) ? SITEID : $courseid;
@@ -195,10 +193,6 @@
 
 echo $OUTPUT->header();
 
-if (!empty($tabsfile)) {
-    require_once($tabsfile);
-}
-
 echo $OUTPUT->heading($blogheaders['heading'], 2);
 
 $bloglisting = new blog_listing($blogheaders['filters']);

diff --git a/course/user.php b/course/user.php
@@ -154,15 +154,6 @@
 $PAGE->set_heading($course->fullname);
 echo $OUTPUT->header();
 
-/// Print tabs at top
-/// This same call is made in:
-///     /user/view.php
-///     /user/edit.php
-///     /course/user.php
-$currenttab = $mode;
-$showroles = 1;
-include($CFG->dirroot.'/user/tabs.php');
-
 switch ($mode) {
     case "grade":
         if (empty($CFG->grade_profilereport) or !file_exists($CFG->dirroot.'/grade/report/'.$CFG->grade_profilereport.'/lib.php')) {

diff --git a/message/edit.php b/message/edit.php
@@ -185,11 +185,6 @@
 }
 echo $OUTPUT->header();
 
-/// Print tabs at the top
-$showroles = 1;
-$currenttab = 'editmessage';
-require('../user/tabs.php');
-
 /// Start the form.  We're not using mform here because of our special formatting needs ...
 echo '<form class="mform" method="post" action="'.$CFG->wwwroot.'/message/edit.php">';
 

diff --git a/pix/u/f1.png b/pix/u/f1.png
diff --git a/pix/u/f2.png b/pix/u/f2.png
diff --git a/pix/u/user100.png b/pix/u/user100.png
diff --git a/pix/u/user35.png b/pix/u/user35.png
diff --git a/repository/manage_instances.php b/repository/manage_instances.php
@@ -137,8 +137,6 @@
     if ( !$course = $DB->get_record('course', array('id'=>$usercourseid))) {
         print_error('invalidcourseid');
     }
-    $currenttab = 'repositories';
-    include($CFG->dirroot.'/user/tabs.php');
 }
 
 echo $OUTPUT->heading($pagename);

diff --git a/theme/base/style/user.css b/theme/base/style/user.css
@@ -1,6 +1,22 @@
 /*$$$$$$$$$$$$$$$$$ User $$$$$$$$$$$$$$$$$$$$*/
+
+.userprofile .fullprofilelink {text-align:center; margin:10px;}
+.userprofile .profilepicture {float:left; margin-right:20px;}
+.userprofile .description {margin-bottom:20px;}
+
 .user-box {margin:8px;width:115px;height:160px;text-align:center;float:left;clear: none;}
 
+.userlist #showall {margin: 10px 0px;}
+.userlist .buttons {text-align: center;}
+.userlist table#participants {text-align:center;}
+.userlist table#participants td,
+.userlist table#participants th {vertical-align: middle;text-align: left;padding: 4px;}
+.userlist table.controls {width: 100%;}
+.userlist table.controls tr {vertical-align: top;}
+.userlist table.controls td.right,
+.userlist table.controls td.left {padding: 4px;}
+.userlist table.controls .right {text-align: right;}
+
 .userinfobox {width:100%;border:1px solid;border-collapse: separate;padding:10px;}
 .userinfobox .left,
 .userinfobox .side {width: 100px;vertical-align: top;}
@@ -14,24 +30,7 @@
 .groupinfobox {border:1px solid;}
 .groupinfobox .left {padding: 10px;width: 100px;vertical-align: top;}
 
-.iplookup #note,
-#course-participation h2,
-#user-index .rolesform,
-#user-view .buttons,
-#user-index .buttons {text-align: center;}
-#user-view .buttons form,
-#user-view .buttons form div {display:inline;}
-
-#user-index #showall {margin: 10px 0px;}
-#user-index table#participants,
-#user-index table#participants td,
-#user-index table#participants th {vertical-align: middle;text-align: left;padding: 4px;}
-#user-index table.controls {width: 100%;}
-#user-index table.controls tr {vertical-align: top;}
-#user-index table.controls td.right,
-#user-index table.controls td.left {padding: 4px;}
-#user-index table.controls .right {text-align: right;}
-#course-participation #showall {text-align:center;margin: 10px 0px;}
+.course-participation #showall {text-align:center;margin: 10px 0px;}
 #user-policy .noticebox {text-align:center;margin-left:auto;margin-right:auto;margin-bottom:10px;width:80%;height:250px;}
 #user-policy #policyframe {width:100%;height:100%;}
 .iplookup #map {margin:auto;}
@@ -40,4 +39,4 @@
 .userselector div {margin-top: 0.2em;}
 .userselector div label {margin-right: 0.3em;}
 #userselector_options .collapsibleregioncaption {font-weight: bold;}
-#userselector_options p {margin:0.2em 0;text-align:left;}
+#userselector_options p {margin:0.2em 0;text-align:left;}
diff --git a/theme/standard/config.php b/theme/standard/config.php
@@ -8,6 +8,7 @@
     'blocks',
     'calendar',
     'course',
+    'user',
     'dock',
     'grade',
     'message',
@@ -16,4 +17,4 @@
     'css3'      /** Sets up CSS 3 + browser specific styles **/
 );
 $THEME->enable_dock = true;
-$THEME->javascripts_footer = array('navigation');
+$THEME->javascripts_footer = array('navigation');
diff --git a/user/index.php b/user/index.php
@@ -143,10 +143,13 @@
     $PAGE->set_title("$course->shortname: ".get_string('participants'));
     $PAGE->set_heading($course->fullname);
     $PAGE->set_pagetype('course-view-' . $course->format);
+    $PAGE->add_body_class('path-user');                     // So we can style it independently
     $PAGE->set_other_editing_capability('moodle/course:manageactivities');
 
     echo $OUTPUT->header();
 
+    echo '<div class="userlist">';
+
     if ($isseparategroups and (!$currentgroup) ) {
         // The user is not in the group so show message and exit
         echo $OUTPUT->heading(get_string("notingroup"));
@@ -884,6 +887,8 @@
         echo $OUTPUT->container(html_writer::link($perpageurl, get_string('showall', '', $matchcount)), array(), 'showall');
     }
 
+    echo '</div>';  // userlist
+
     echo $OUTPUT->footer();
 
     if ($userlist) {

diff --git a/user/profile.php b/user/profile.php
@@ -169,7 +169,9 @@
 }
 
 // TODO WORK OUT WHERE THE NAV BAR IS!
+
 echo $OUTPUT->header();
+echo '<div class="userprofile">';
 
 
 // Print the standard content of this page, the basic profile info
@@ -370,6 +372,13 @@
 
 echo $OUTPUT->blocks_for_region('content');
 
+if ($CFG->debugdisplay && debugging('', DEBUG_DEVELOPER) && $currentuser) {  // Show user object
+    echo '<br /><br /><hr />';
+    echo $OUTPUT->heading('DEBUG MODE:  User session variables');
+    print_object($USER);
+}
+
+echo '</div>';  // userprofile class
 echo $OUTPUT->footer();