Working on Boxxie, Canvas, and Formactor

This commit is contained in:
Patrick Malley
2010-05-16 22:57:31 +00:00
parent ac2032dcc5
commit 29ef7d4fe6
9 changed files with 947 additions and 223 deletions
@@ -28,15 +28,15 @@ class block_calendar_upcoming extends block_base {
} else {
$courseshown = $this->page->course->id;
$this->content->footer = '<br /><a href="'.$CFG->wwwroot.
$this->content->footer = '<div class="gotocal"><a href="'.$CFG->wwwroot.
'/calendar/view.php?view=upcoming&amp;course='.$courseshown.'">'.
get_string('gotocalendar', 'calendar').'</a>...';
get_string('gotocalendar', 'calendar').'</a>...</div>';
$context = get_context_instance(CONTEXT_COURSE, $courseshown);
if (has_capability('moodle/calendar:manageentries', $context) ||
has_capability('moodle/calendar:manageownentries', $context)) {
$this->content->footer .= '<br /><a href="'.$CFG->wwwroot.
$this->content->footer .= '<div class="newevent"><a href="'.$CFG->wwwroot.
'/calendar/event.php?action=new&amp;course='.$courseshown.'">'.
get_string('newevent', 'calendar').'</a>...';
get_string('newevent', 'calendar').'</a>...</div>';
}
if ($courseshown == SITEID) {
// Being displayed at site level. This will cause the filter to fall back to auto-detecting
-1
View File
@@ -1 +0,0 @@
.block_calendar_upcoming .event .date {text-align:right;}
+1 -1
View File
@@ -78,7 +78,7 @@ class block_news_items extends block_base {
$discussion->subject = format_string($discussion->subject, true, $forum->course);
$text .= '<li class="post">'.
'<div class="head">'.
'<div class="head clearfix">'.
'<div class="date">'.userdate($discussion->modified, $strftimerecent).'</div>'.
'<div class="name">'.fullname($discussion).'</div></div>'.
'<div class="info">'.$discussion->subject.' '.
-1
View File
@@ -20,7 +20,6 @@
.block .blockannotation {font-size:0.75em;margin: -1em 0 1em;}
.block.beingmoved {border-width: 2px;border-style: dashed;}
.block .content ul.list li.listentry {clear:both;}
.block .content div.info {text-align:center;}
/** List block contents **/
.block .list .c0 {display:inline;}
File diff suppressed because it is too large Load Diff
+14 -3
View File
@@ -1,4 +1,15 @@
.block_action .reloadnavigation { margin-right: 3px }
.block {padding: 0}
.block .footer {margin-top: 10px;margin-bottom: 0;text-align: center;}
.block_calendar_month .minicalendar th,
.block_calendar_month .minicalendar td { border-color: #ddd; border-style: dotted;border-width: 1px; }
.block_action .reloadnavigation { margin-right: 3px; }
.block_news_items .newlink {text-align: center;margin-bottom: 5px;}
.block_news_items .post .head { font-style: italic;font-size: 0.9em;margin-top: 10px;}
.block_news_items .post .date {float: right;text-align: right;}
.block_news_items .post .name {float: left;color: #555;}
.block_calendar_upcoming .event { font-weight: bold;}
.block_calendar_upcoming .date {font-weight: normal;font-size: 0.85em;font-style: italic;margin-left: 20px;}
.block_recent_activity .activitydate {font-size: 0.9em;color: #444;margin-bottom: 5px;}
.block_recent_activity .activityhead {font-size: 0.95em;margin: 0.5em 0;}
+28 -3
View File
@@ -182,13 +182,12 @@
.maincalendar .calendar-controls .previous,
.maincalendar .calendar-controls .current,
.maincalendar .calendar-controls .next {
width: 5%;
float: left;
}
.maincalendar .calendar-controls .current {
margin: 0 auto;
font-size: 1.5em;
font-size: 1.35em;
text-align: center;
line-height: 1;
font-weight: bold;
@@ -306,8 +305,34 @@
border: none;
}
.userinfobox .content {
.path-user .profilepicture {
float: left;
margin-right: 10px;
}
.path-user .descriptionbox {
margin-left: 110px;
border: 1px solid #ddd;
padding: 10px;
}
.path-user .description {
padding-bottom: 15px;
border-bottom: 1px solid #eee;
}
.userprofile .list {
margin-top: 10px;
}
.userprofile .list td {
padding-top: 3px;
padding-bottom: 3px;
}
.userprofile .list .c0 {
padding-left: 0;
font-weight: bold;
}
#page-user-view .buttons {
+4
View File
@@ -43,6 +43,10 @@
.calendar_event_user {border-color: #DCE7EC; background-color:#DCE7EC;}
.calendar_event_group {border-color: #FEE7AE; background-color:#FEE7AE;}
/** Calendar Upcoming **/
.block_calendar_upcoming .event .date {text-align:right;}
/** Login Block **/
.block_login .loginform .c1 {margin:0.3em 0.8em;text-align:right;}
.block_login .loginform .c1.fld input {width:5em;}
+3 -3
View File
@@ -200,11 +200,11 @@ if (is_mnet_remote_user($user)) {
}
}
echo '<div class="profilepicture">';
echo '<div class="userprofilebox clearfix"><div class="profilepicture">';
echo $OUTPUT->user_picture($user, array('size'=>100));
echo '</div>';
echo '<div class="description">';
echo '<div class="descriptionbox"><div class="description">';
// Print the description
if ($user->description && !isset($hiddenfields['description'])) {
@@ -367,7 +367,7 @@ if (!empty($CFG->usetags)) {
}
}
echo "</table>";
echo "</table></div></div>";
echo $OUTPUT->blocks_for_region('content');