Permalink
Browse files

Revert "Merge branch 'wip-MDL-35875-master' of git://github.com/phala…

…cee/moodle"

This reverts commit 02dcf9b, reversing
changes made to 61cd506.
  • Loading branch information...
1 parent b37e555 commit 87d7c7b5783409ffc68d2da80ef00fa911a768b8 @nebgor nebgor committed Mar 14, 2013
Showing with 61 additions and 106 deletions.
  1. +5 −6 theme/base/style/user.css
  2. +3 −25 theme/canvas/style/core.css
  3. +0 −1 theme/upgrade.txt
  4. +33 −57 user/profile.php
  5. +1 −2 user/profile/lib.php
  6. +19 −15 user/view.php
@@ -1,11 +1,9 @@
/*$$$$$$$$$$$$$$$$$ User $$$$$$$$$$$$$$$$$$$$*/
+
.userprofile .fullprofilelink {text-align:center; margin:10px;}
.userprofile .profilepicture {float:left; margin-right:20px;}
.userprofile .description {margin-bottom:20px;}
-.userprofile dl {margin-top:10px; margin-left:0px; width:100%;}
-.userprofile dl dt, .userprofile dl dd {padding-top:3px; padding-bottom:3px;}
-.userprofile dl dt {margin:0px; font-weight:bold; display:block; float:left; width:110px; margin-right:10px;}
-.userprofile dl dd {display:block; margin:0px; margin-left:120px;}
+.userprofile .label {font-weight:normal;text-align:left;}
.user-box {margin:8px;width:115px;height:160px;text-align:center;float:left;clear: none;}
@@ -33,6 +31,7 @@
.userinfobox .list td {padding: 3px;}
.userinfobox .username {padding-bottom: 20px;font-weight: bold;}
.userinfobox td.label {text-align:right;white-space: nowrap;vertical-align: top;font-weight:bold;}
+
.groupinfobox {border:1px solid;}
.groupinfobox .left {padding: 10px;width: 100px;vertical-align: top;}
@@ -58,9 +57,9 @@
/** Overide for RTL layout **/
.dir-rtl .userprofile .profilepicture {float:right; margin-left:20px;margin-right:0px;}
+.dir-rtl .descriptionbox {margin-right: 110px;margin-left: 0px; }
.dir-rtl .userlist table#participants td,
.dir-rtl .userlist table#participants th {text-align: right;}
.dir-rtl .userlist table#participants {margin: 0 auto;}
-.dir-rtl .userprofile dl dt {float:right; width:110px; margin-left:10px;}
-.dir-rtl .userprofile dl dd {margin-right: 120px;}
+
#page-my-index.dir-rtl .block h3.main { text-align: right;}
@@ -268,47 +268,25 @@ input[type="radio"] {
margin-left: 110px;
border: 1px solid #ddd;
padding: 10px;
- width: 80%;
}
.path-user .description {
padding-bottom: 15px;
border-bottom: 1px solid #eee;
}
-.userprofile dl {
+.userprofile .list {
margin-top: 10px;
}
-.userprofile dl dt, .userprofile dl dd {
+.userprofile .list td {
padding-top: 3px;
padding-bottom: 3px;
- float: left;
-}
-
-.dir-rtl .userprofile dl dt, .dir-rtl .userprofile dl dd {
- float: right;
}
-.userprofile dl dt {
+.userprofile .list .c0 {
padding-left: 0;
font-weight: bold;
- display: inline-block;
- padding-right: 2%;
- min-width: 100px;
- width: 15%;
- clear: both;
-}
-
-.dir-rtl .userprofile dl dt {
- padding-left: 2%;
- padding-right: 0;
-}
-
-.userprofile dl dd {
- display: inline-block;
- margin: 0px;
- width: 75%;
}
#page-user-view .buttons {
View
@@ -5,7 +5,6 @@ information provided here is intended especially for theme designer.
DOM changes:
* changed the h1 title in the help popup to a h2.
-* Re-wrote the user profile views to definition lists.
=== 2.4 ===
View
@@ -243,100 +243,76 @@
// Print all the little details in a list
-echo html_writer::start_tag('dl', array('class'=>'list'));
-if (!isset($hiddenfields['country']) && $user->country) {
- echo html_writer::tag('dt', get_string('country'));
- echo html_writer::tag('dd', get_string($user->country, 'countries'));
+echo '<table class="list" summary="">';
+
+if (! isset($hiddenfields['country']) && $user->country) {
+ print_row(get_string('country') . ':', get_string($user->country, 'countries'));
}
-if (!isset($hiddenfields['city']) && $user->city) {
- echo html_writer::tag('dt', get_string('city'));
- echo html_writer::tag('dd', $user->city);
+if (! isset($hiddenfields['city']) && $user->city) {
+ print_row(get_string('city') . ':', $user->city);
}
if (isset($identityfields['address']) && $user->address) {
- echo html_writer::tag('dt', get_string('address'));
- echo html_writer::tag('dd', $user->address);
+ print_row(get_string("address").":", "$user->address");
}
if (isset($identityfields['phone1']) && $user->phone1) {
- echo html_writer::tag('dt', get_string('phone'));
- echo html_writer::tag('dd', $user->phone1);
+ print_row(get_string("phone").":", "$user->phone1");
}
if (isset($identityfields['phone2']) && $user->phone2) {
- echo html_writer::tag('dt', get_string('phone2'));
- echo html_writer::tag('dd', $user->phone2);
+ print_row(get_string("phone2").":", "$user->phone2");
}
if (isset($identityfields['institution']) && $user->institution) {
- echo html_writer::tag('dt', get_string('institution'));
- echo html_writer::tag('dd', $user->institution);
+ print_row(get_string("institution").":", "$user->institution");
}
if (isset($identityfields['department']) && $user->department) {
- echo html_writer::tag('dt', get_string('department'));
- echo html_writer::tag('dd', $user->department);
+ print_row(get_string("department").":", "$user->department");
}
if (isset($identityfields['idnumber']) && $user->idnumber) {
- echo html_writer::tag('dt', get_string('idnumber'));
- echo html_writer::tag('dd', $user->idnumber);
+ print_row(get_string("idnumber").":", "$user->idnumber");
}
if (isset($identityfields['email']) and ($currentuser
or $user->maildisplay == 1
or has_capability('moodle/course:useremail', $context)
or ($user->maildisplay == 2 and enrol_sharing_course($user, $USER)))) {
- echo html_writer::tag('dt', get_string('email'));
- echo html_writer::tag('dd', obfuscate_mailto($user->email, ''));
+ print_row(get_string("email").":", obfuscate_mailto($user->email, ''));
}
if ($user->url && !isset($hiddenfields['webpage'])) {
$url = $user->url;
if (strpos($user->url, '://') === false) {
$url = 'http://'. $url;
}
- $webpageurl = new moodle_url($url);
- echo html_writer::tag('dt', get_string('webpage'));
- echo html_writer::tag('dd', html_writer::link($webpageurl, s($user->url)));
+ print_row(get_string("webpage") .":", '<a href="'.s($url).'">'.s($user->url).'</a>');
}
if ($user->icq && !isset($hiddenfields['icqnumber'])) {
- $imurl = new moodle_url('http://web.icq.com/wwp', array('uin'=>$user->icq) );
- $iconurl = new moodle_url('http://web.icq.com/whitepages/online', array('icq'=>$user->icq, 'img'=>'5'));
- $statusicon = html_writer::tag('img', '', array('src'=>$iconurl, 'class'=>'icon icon-post', 'alt'=>get_string('status')));
- echo html_writer::tag('dt', get_string('icqnumber'));
- echo html_writer::tag('dd', html_writer::link($imurl, s($user->icq) . $statusicon));
+ print_row(get_string('icqnumber').':',"<a href=\"http://web.icq.com/wwp?uin=".urlencode($user->icq)."\">".s($user->icq)." <img src=\"http://web.icq.com/whitepages/online?icq=".urlencode($user->icq)."&amp;img=5\" alt=\"\" /></a>");
}
if ($user->skype && !isset($hiddenfields['skypeid'])) {
- $imurl = 'skype:'.urlencode($user->skype).'?call';
- $iconurl = new moodle_url('http://mystatus.skype.com/smallicon/'.$user->skype);
if (strpos($CFG->httpswwwroot, 'https:') === 0) {
// Bad luck, skype devs are lazy to set up SSL on their servers - see MDL-37233.
$statusicon = '';
} else {
- $statusicon = html_writer::empty_tag('img', array('src'=>$iconurl, 'class'=>'icon icon-post', 'alt'=>get_string('status')));
+ $statusicon = ' '.html_writer::empty_tag('img', array('src'=>'http://mystatus.skype.com/smallicon/'.urlencode($user->skype), 'alt'=>get_string('status')));
}
- echo html_writer::tag('dt', get_string('skypeid'));
- echo html_writer::tag('dd', html_writer::link($imurl, s($user->skype) . $statusicon));
+ print_row(get_string('skypeid').':','<a href="skype:'.urlencode($user->skype).'?call">'.s($user->skype).$statusicon.'</a>');
}
if ($user->yahoo && !isset($hiddenfields['yahooid'])) {
- $imurl = new moodle_url('http://edit.yahoo.com/config/send_webmesg', array('.target'=>$user->yahoo, '.src'=>'pg'));
- $iconurl = new moodle_url('http://opi.yahoo.com/online', array('u'=>$user->yahoo, 'm'=>'g', 't'=>'0'));
- $statusicon = html_writer::tag('img', '', array('src'=>$iconurl, 'class'=>'iconsmall icon-post', 'alt'=>get_string('status')));
- echo html_writer::tag('dt', get_string('yahooid'));
- echo html_writer::tag('dd', html_writer::link($imurl, s($user->yahoo) . $statusicon));
+ print_row(get_string('yahooid').':', '<a href="http://edit.yahoo.com/config/send_webmesg?.target='.urlencode($user->yahoo).'&amp;.src=pg">'.s($user->yahoo)." <img src=\"http://opi.yahoo.com/online?u=".urlencode($user->yahoo)."&m=g&t=0\" alt=\"\"></a>");
}
if ($user->aim && !isset($hiddenfields['aimid'])) {
- $imurl = 'aim:goim?screenname='.urlencode($user->aim);
- echo html_writer::tag('dt', get_string('aimid'));
- echo html_writer::tag('dd', html_writer::link($imurl, s($user->aim)));
+ print_row(get_string('aimid').':', '<a href="aim:goim?screenname='.urlencode($user->aim).'">'.s($user->aim).'</a>');
}
if ($user->msn && !isset($hiddenfields['msnid'])) {
- echo html_writer::tag('dt', get_string('msnid'));
- echo html_writer::tag('dd', s($user->msn));
+ print_row(get_string('msnid').':', s($user->msn));
}
/// Print the Custom User Fields
@@ -366,8 +342,7 @@
break;
}
}
- echo html_writer::tag('dt', get_string('courseprofiles'));
- echo html_writer::tag('dd', rtrim($courselisting,', '));
+ print_row(get_string('courseprofiles').':', rtrim($courselisting,', '));
}
}
if (!isset($hiddenfields['firstaccess'])) {
@@ -376,36 +351,32 @@
} else {
$datestring = get_string("never");
}
- echo html_writer::tag('dt', get_string('firstaccess'));
- echo html_writer::tag('dd', $datestring);
+ print_row(get_string("firstaccess").":", $datestring);
}
if (!isset($hiddenfields['lastaccess'])) {
if ($user->lastaccess) {
$datestring = userdate($user->lastaccess)."&nbsp; (".format_time(time() - $user->lastaccess).")";
} else {
$datestring = get_string("never");
}
- echo html_writer::tag('dt', get_string('lastaccess'));
- echo html_writer::tag('dd', $datestring);
+ print_row(get_string("lastaccess").":", $datestring);
}
/// Printing tagged interests
if (!empty($CFG->usetags)) {
if ($interests = tag_get_tags_csv('user', $user->id) ) {
- echo html_writer::tag('dt', get_string('interests'));
- echo html_writer::tag('dd', $interests);
+ print_row(get_string('interests') .": ", $interests);
}
}
if (!isset($hiddenfields['suspended'])) {
if ($user->suspended) {
- echo html_writer::tag('dt', '&nbsp;');
- echo html_writer::tag('dd', get_string('suspended', 'auth'));
+ print_row('', get_string('suspended', 'auth'));
}
}
-echo html_writer::end_tag('dl');
-echo "</div></div>"; // Closing desriptionbox and userprofilebox.
+echo "</table></div></div>";
+
echo '<div id="region-content" class="block-region"><div class="region-content">';
echo $OUTPUT->blocks_for_region('content');
echo '</div></div>';
@@ -425,4 +396,9 @@
}
echo '</div>'; // userprofile class
-echo $OUTPUT->footer();
+echo $OUTPUT->footer();
+
+
+function print_row($left, $right) {
+ echo "\n<tr><th class=\"label c0\">$left</th><td class=\"info c1\">$right</td></tr>\n";
+}
@@ -452,8 +452,7 @@ function profile_display_fields($userid) {
$newfield = 'profile_field_'.$field->datatype;
$formfield = new $newfield($field->id, $userid);
if ($formfield->is_visible() and !$formfield->is_empty()) {
- echo html_writer::tag('dt', format_string($formfield->field->name));
- echo html_writer::tag('dd', $formfield->display_data());
+ print_row(format_string($formfield->field->name.':'), $formfield->display_data());
}
}
}
View
@@ -237,7 +237,8 @@
// Print all the little details in a list
-echo html_writer::start_tag('dl', array('class'=>'list'));
+echo '<table class="list" summary="">';
+
// Show email if any of the following conditions match.
// 1. User is viewing his own profile.
// 2. Has allowed everyone to see email
@@ -248,8 +249,7 @@
or ($user->maildisplay == 2 && is_enrolled($coursecontext, $USER))
or has_capability('moodle/course:viewhiddenuserfields', $coursecontext)
or has_capability('moodle/site:viewuseridentity', $coursecontext)) {
- echo html_writer::tag('dt', get_string('email'));
- echo html_writer::tag('dd', obfuscate_mailto($user->email, ''));
+ print_row(get_string("email").":", obfuscate_mailto($user->email, ''));
}
// Show last time this user accessed this course
@@ -259,14 +259,12 @@
} else {
$datestring = get_string("never");
}
- echo html_writer::tag('dt', get_string('lastaccess'));
- echo html_writer::tag('dd', $datestring);
+ print_row(get_string("lastaccess").":", $datestring);
}
// Show roles in this course
if ($rolestring = get_user_roles_in_course($id, $course->id)) {
- echo html_writer::tag('dt', get_string('roles'));
- echo html_writer::tag('dd', $rolestring);
+ print_row(get_string('roles').':', $rolestring);
}
// Show groups this user is in
@@ -288,8 +286,7 @@
}
}
if ($groupstr !== '') {
- echo html_writer::tag('dt', get_string('group'));
- echo html_writer::tag('dd', rtrim($groupstr, ', '));
+ print_row(get_string("group").":", rtrim($groupstr, ', '));
}
}
}
@@ -325,19 +322,18 @@
break;
}
}
- echo html_writer::tag('dt', get_string('courseprofiles'));
- echo html_writer::tag('dd', rtrim($courselisting,', '));
+ print_row(get_string('courseprofiles').':', rtrim($courselisting,', '));
}
}
if (!isset($hiddenfields['suspended'])) {
if ($user->suspended) {
- echo html_writer::tag('dt', "&nbsp;");
- echo html_writer::tag('dd', get_string('suspended', 'auth'));
+ print_row('', get_string('suspended', 'auth'));
}
}
-echo html_writer::end_tag('dl');
-echo "</div></div>"; // Closing desriptionbox and userprofilebox.
+
+echo "</table></div></div>";
+
// Print messaging link if allowed
if (isloggedin() && has_capability('moodle/site:sendmessage', $usercontext)
&& !empty($CFG->messaging) && !isguestuser() && !isguestuser($user) && ($USER->id != $user->id)) {
@@ -365,3 +361,11 @@
echo '</div>'; // userprofile class
echo $OUTPUT->footer();
+
+/// Functions ///////
+
+function print_row($left, $right) {
+ echo "\n<tr><th class=\"label c0\">$left</th><td class=\"info c1\">$right</td></tr>\n";
+}
+
+

0 comments on commit 87d7c7b

Please sign in to comment.