Vastly improved styles, lots of inline styles removed, markup improved.
This commit is contained in:
+1
-1
@@ -392,7 +392,7 @@ function calendar_print_event($event) {
|
||||
echo '<td class="eventfullheader">';
|
||||
|
||||
if (!empty($event->referer)) {
|
||||
echo '<div style="float:left;" class="calendarreferer">'.$event->referer.'</div>';
|
||||
echo '<div class="referer">'.$event->referer.'</div>';
|
||||
} else {
|
||||
echo '<div style="float:left;" class="event">'.$event->name."</div>";
|
||||
}
|
||||
|
||||
+10
-11
@@ -1,11 +1,10 @@
|
||||
ol_delay = 350;
|
||||
ol_fgcolor = '#ffffff';
|
||||
ol_fgclass = 'cal_popup_fg';
|
||||
ol_bgclass = 'cal_popup_bg';
|
||||
ol_cgclass = 'cal_popup_cg';
|
||||
ol_captionfontclass = 'cal_popup_caption';
|
||||
ol_noclose = true;
|
||||
ol_sticky = true;
|
||||
ol_close = 'X';
|
||||
ol_offsety = -1;
|
||||
ol_mouseoff = 1;
|
||||
ol_delay = 350;
|
||||
ol_fgclass = 'cal_popup_fg';
|
||||
ol_bgclass = 'cal_popup_bg';
|
||||
ol_cgclass = 'cal_popup_cg';
|
||||
ol_captionfontclass = 'cal_popup_caption';
|
||||
ol_noclose = true;
|
||||
ol_sticky = true;
|
||||
ol_close = 'X';
|
||||
ol_offsety = -1;
|
||||
ol_mouseoff = 1;
|
||||
|
||||
@@ -22,16 +22,16 @@
|
||||
$strgroupmy = get_string("groupmy");
|
||||
$editing = isediting($course->id);
|
||||
|
||||
echo '<table width="100%" border="0" cellspacing="5" cellpadding="5" id="layout-table">';
|
||||
echo '<table id="layout-table">';
|
||||
echo '<tr>';
|
||||
|
||||
if(blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $editing) {
|
||||
echo '<td style="vertical-align: top; width: '.$preferred_width_left.'px;" id="left-column">';
|
||||
echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
|
||||
blocks_print_group($PAGE, $pageblocks[BLOCK_POS_LEFT]);
|
||||
echo '</td>';
|
||||
}
|
||||
|
||||
echo '<td valign="top" width="*" id="middle-column">';
|
||||
echo '<td id="middle-column">';
|
||||
if ($social = forum_get_course_forum($course->id, "social")) {
|
||||
if (forum_is_subscribed($USER->id, $social->id)) {
|
||||
$subtext = get_string("unsubscribe", "forum");
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
// The right column
|
||||
if(blocks_have_content($pageblocks[BLOCK_POS_RIGHT]) || $editing) {
|
||||
echo '<td style="vertical-align: top; width: '.$preferred_width_right.'px;" id="right-column">';
|
||||
echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
|
||||
blocks_print_group($PAGE, $pageblocks[BLOCK_POS_RIGHT]);
|
||||
if ($editing) {
|
||||
blocks_print_adminblock($PAGE, $pageblocks);
|
||||
|
||||
@@ -57,20 +57,18 @@
|
||||
|
||||
|
||||
/// Layout the whole page as three big columns.
|
||||
echo "<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" width=\"100%\" id=\"layout-table\">";
|
||||
|
||||
echo "<tr valign=\"top\">\n";
|
||||
echo '<table id="layout-table"><tr>';
|
||||
|
||||
/// The left column ...
|
||||
|
||||
if(blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $editing) {
|
||||
echo '<td style="vertical-align: top; width: '.$preferred_width_left.'px;" id="left-column">';
|
||||
echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
|
||||
blocks_print_group($PAGE, $pageblocks[BLOCK_POS_LEFT]);
|
||||
echo '</td>';
|
||||
}
|
||||
|
||||
/// Start main column
|
||||
echo '<td valign="top" width="*" id="middle-column">';
|
||||
echo '<td id="middle-column">';
|
||||
|
||||
print_heading_block(get_string("topicoutline"), "100%", "outlineheadingblock");
|
||||
print_spacer(8, 1, true);
|
||||
@@ -271,7 +269,7 @@
|
||||
|
||||
// The right column
|
||||
if(blocks_have_content($pageblocks[BLOCK_POS_RIGHT]) || $editing) {
|
||||
echo '<td style="vertical-align: top; width: '.$preferred_width_right.'px;" id="right-column">';
|
||||
echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
|
||||
blocks_print_group($PAGE, $pageblocks[BLOCK_POS_RIGHT]);
|
||||
if ($editing) {
|
||||
blocks_print_adminblock($PAGE, $pageblocks);
|
||||
|
||||
@@ -48,20 +48,18 @@
|
||||
|
||||
|
||||
/// Layout the whole page as three big columns.
|
||||
echo "<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" width=\"100%\" id=\"layout-table\">";
|
||||
|
||||
echo "<tr valign=\"top\">\n";
|
||||
echo '<table id="layout-table"><tr>';
|
||||
|
||||
/// The left column ...
|
||||
|
||||
if(blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $editing) {
|
||||
echo '<td style="vertical-align: top; width: '.$preferred_width_left.'px;" id="left-column">';
|
||||
echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
|
||||
blocks_print_group($PAGE, $pageblocks[BLOCK_POS_LEFT]);
|
||||
echo '</td>';
|
||||
}
|
||||
|
||||
/// Start main column
|
||||
echo '<td valign="top" width="*" id="middle-column">';
|
||||
echo '<td id="middle-column">';
|
||||
print_heading_block(get_string("weeklyoutline"), "100%", "outlineheadingblock");
|
||||
print_spacer(8, 1, true);
|
||||
|
||||
@@ -257,7 +255,7 @@
|
||||
|
||||
// The right column
|
||||
if(blocks_have_content($pageblocks[BLOCK_POS_RIGHT]) || $editing) {
|
||||
echo '<td style="vertical-align: top; width: '.$preferred_width_right.'px;" id="right-column">';
|
||||
echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
|
||||
blocks_print_group($PAGE, $pageblocks[BLOCK_POS_RIGHT]);
|
||||
if ($editing) {
|
||||
blocks_print_adminblock($PAGE, $pageblocks);
|
||||
|
||||
@@ -75,17 +75,17 @@
|
||||
?>
|
||||
|
||||
|
||||
<table width="100%" border="0" cellspacing="5" cellpadding="5" id="layout-table">
|
||||
<table id="layout-table">
|
||||
<tr>
|
||||
<?PHP
|
||||
|
||||
if(blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $editing) {
|
||||
echo '<td style="vertical-align: top; width: '.$preferred_width_left.'px;" id="left-column">';
|
||||
echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
|
||||
blocks_print_group($PAGE, $pageblocks[BLOCK_POS_LEFT]);
|
||||
echo '</td>';
|
||||
}
|
||||
|
||||
echo '<td style="vertical-align: top;" id="middle-column">';
|
||||
echo '<td id="middle-column">';
|
||||
|
||||
|
||||
/// Print Section
|
||||
@@ -191,7 +191,7 @@
|
||||
|
||||
// The right column
|
||||
if(blocks_have_content($pageblocks[BLOCK_POS_RIGHT]) || $editing || isadmin()) {
|
||||
echo '<td style="vertical-align: top; width: '.$preferred_width_right.'px;" id="right-column">';
|
||||
echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
|
||||
if (isadmin()) {
|
||||
echo '<div align="center">'.update_course_icon($site->id).'</div>';
|
||||
echo '<br />';
|
||||
|
||||
+3
-4
@@ -80,11 +80,10 @@
|
||||
|
||||
$PAGE->print_header($course->shortname.': %fullname%');
|
||||
|
||||
echo '<table border="0" cellpadding="3" cellspacing="0" width="100%" id="layout-table">';
|
||||
echo '<tr valign="top">';
|
||||
echo '<table id="layout-table"><tr>';
|
||||
|
||||
if(blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $PAGE->user_is_editing()) {
|
||||
echo '<td style="vertical-align: top; width: '.$blocks_preferred_width.'px;" id="left-column">';
|
||||
echo '<td style="width: '.$blocks_preferred_width.'px;" id="left-column">';
|
||||
blocks_print_group($PAGE, $pageblocks[BLOCK_POS_LEFT]);
|
||||
if ($PAGE->user_is_editing()) {
|
||||
blocks_print_adminblock($PAGE, $pageblocks);
|
||||
@@ -92,7 +91,7 @@
|
||||
echo '</td>';
|
||||
}
|
||||
|
||||
echo '<td valign="top" width="*" id="middle-column">';
|
||||
echo '<td id="middle-column">';
|
||||
|
||||
if (($chat->studentlogs or isteacher($course->id)) and !isguest()) {
|
||||
echo "<p align=\"right\"><a href=\"report.php?id=$cm->id\">".
|
||||
|
||||
+3
-4
@@ -72,11 +72,10 @@
|
||||
|
||||
$PAGE->print_header($course->shortname.': %fullname%');
|
||||
|
||||
echo '<table border="0" cellpadding="3" cellspacing="0" width="100%" id="layout-table">';
|
||||
echo '<tr valign="top">';
|
||||
echo '<table id="layout-table"><tr>';
|
||||
|
||||
if(blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $PAGE->user_is_editing()) {
|
||||
echo '<td style="vertical-align: top; width: '.$blocks_preferred_width.'px;" id="left-column">';
|
||||
echo '<td style="width: '.$blocks_preferred_width.'px;" id="left-column">';
|
||||
blocks_print_group($PAGE, $pageblocks[BLOCK_POS_LEFT]);
|
||||
if ($PAGE->user_is_editing()) {
|
||||
blocks_print_adminblock($PAGE, $pageblocks);
|
||||
@@ -84,7 +83,7 @@
|
||||
echo '</td>';
|
||||
}
|
||||
|
||||
echo '<td valign="top" width="*" id="middle-column">';
|
||||
echo '<td id="middle-column">';
|
||||
|
||||
if (isteacher($course->id)) {
|
||||
$attemptcount = count_records_select("quiz_attempts", "quiz = '$quiz->id' AND timefinish > 0");
|
||||
|
||||
@@ -344,77 +344,81 @@ table.message_search_results td {
|
||||
background-color: #EEEEEE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*****************************
|
||||
***
|
||||
*** Calendar
|
||||
***
|
||||
******************************/
|
||||
|
||||
.event_global {
|
||||
#calendar .event_global,
|
||||
.minicalendar .event_global,
|
||||
.block_calendar_month .event_global {
|
||||
border-color:#2EBA0E !important;
|
||||
background-color:#2EBA0E;
|
||||
}
|
||||
|
||||
.event_course {
|
||||
#calendar .event_course,
|
||||
.minicalendar .event_course,
|
||||
.block_calendar_month .event_course {
|
||||
border-color:#FF9966 !important;
|
||||
background-color:#FF9966;
|
||||
}
|
||||
|
||||
.event_group {
|
||||
#calendar .event_group,
|
||||
.minicalendar .event_group,
|
||||
.block_calendar_month .event_group {
|
||||
border-color:#FBBB23 !important;
|
||||
background-color:#FBBB23;
|
||||
}
|
||||
|
||||
.event_user {
|
||||
#calendar .event_user,
|
||||
.minicalendar .event_user,
|
||||
.block_calendar_month .event_user {
|
||||
border-color:#A1BECB !important;
|
||||
background-color:#A1BECB;
|
||||
}
|
||||
|
||||
.duration_global {
|
||||
#calendar .duration_global,
|
||||
.minicalendar .duration_global {
|
||||
border-top-color:#2EBA0E !important;
|
||||
border-bottom-color:#2EBA0E !important;
|
||||
}
|
||||
|
||||
.duration_course {
|
||||
#calendar .duration_course,
|
||||
.minicalendar .duration_course {
|
||||
border-top-color:#FF9966 !important;
|
||||
border-bottom-color:#FF9966 !important;
|
||||
}
|
||||
|
||||
.duration_user {
|
||||
border-top-color:#A1BECB !important;
|
||||
border-bottom-color:#A1BECB !important;
|
||||
}
|
||||
|
||||
.duration_group {
|
||||
#calendar .duration_group,
|
||||
.minicalendar .duration_group {
|
||||
border-top-color:#FBBB23 !important;
|
||||
border-bottom-color:#FBBB23 !important;
|
||||
}
|
||||
|
||||
.weekend {
|
||||
#calendar .duration_user,
|
||||
.minicalendar .duration_user {
|
||||
border-top-color:#A1BECB !important;
|
||||
border-bottom-color:#A1BECB !important;
|
||||
}
|
||||
|
||||
#calendar .weekend,
|
||||
.minicalendar .weekend {
|
||||
color:#FF0000;
|
||||
}
|
||||
|
||||
.today {
|
||||
#calendar .today,
|
||||
.minicalendar .today {
|
||||
border-color:#000000 !important;
|
||||
}
|
||||
|
||||
table.calendarmonth thead td {
|
||||
border-bottom-color:#FFC85F;
|
||||
}
|
||||
|
||||
td.cal_event_description {
|
||||
border-left-color:#FFC85F;
|
||||
}
|
||||
|
||||
.cal_popup_fg {
|
||||
background-color:#FFFFFF; /* cellcontent */
|
||||
}
|
||||
|
||||
.cal_popup_bg {
|
||||
border-color:#FEE6B9;
|
||||
border-color:#000000;
|
||||
background-color:#FFFFFF;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -255,6 +255,26 @@ h4 {
|
||||
***
|
||||
******************************/
|
||||
|
||||
.sideblock.block_calendar_month .cal_popup_caption,
|
||||
.sideblock.block_calendar_month .cal_popup_fg div {
|
||||
font-size: 0.85em !important;
|
||||
}
|
||||
|
||||
.cal_popup_caption {
|
||||
font-family:sans-serif;
|
||||
font-size:0.8em;
|
||||
font-weight:bold;
|
||||
}
|
||||
|
||||
.cal_popup_close {
|
||||
font-family:sans-serif;
|
||||
font-size:0.8em;
|
||||
font-weight:bold;
|
||||
}
|
||||
|
||||
#calendar .maincalendar .referer {
|
||||
font-weight:bold;
|
||||
}
|
||||
|
||||
/*****************************
|
||||
***
|
||||
|
||||
@@ -100,6 +100,18 @@ a img {
|
||||
float:right;
|
||||
}
|
||||
|
||||
#layout-table {
|
||||
width:100%;
|
||||
border-spacing:5px;
|
||||
border-collapse:separate;
|
||||
}
|
||||
|
||||
#layout-table #left-column,
|
||||
#layout-table #middle-column,
|
||||
#layout-table #right-column
|
||||
{
|
||||
vertical-align:top;
|
||||
}
|
||||
|
||||
/* footer styles */
|
||||
|
||||
@@ -294,77 +306,50 @@ table.message_search_results td {
|
||||
******************************/
|
||||
/* calendar */
|
||||
|
||||
.event_global {
|
||||
#calendar .event_global,
|
||||
#calendar .event_course,
|
||||
#calendar .event_group,
|
||||
#calendar .event_user,
|
||||
.minicalendar .event_global,
|
||||
.minicalendar .event_course,
|
||||
.minicalendar .event_group,
|
||||
.minicalendar .event_user,
|
||||
.block_calendar_month .event_global,
|
||||
.block_calendar_month .event_course,
|
||||
.block_calendar_month .event_group,
|
||||
.block_calendar_month .event_user
|
||||
{
|
||||
border:2px solid !important;
|
||||
}
|
||||
|
||||
.event_course {
|
||||
border:2px solid !important;
|
||||
}
|
||||
|
||||
.event_group {
|
||||
border:2px solid !important;
|
||||
}
|
||||
|
||||
.event_user {
|
||||
border:2px solid !important;
|
||||
}
|
||||
|
||||
.duration_global {
|
||||
#calendar .duration_global,
|
||||
#calendar .duration_course,
|
||||
#calendar .duration_group,
|
||||
#calendar .duration_user,
|
||||
.minicalendar .duration_global,
|
||||
.minicalendar .duration_course,
|
||||
.minicalendar .duration_group,
|
||||
.minicalendar .duration_user
|
||||
{
|
||||
border-top:2px solid !important;
|
||||
border-bottom:2px solid !important;
|
||||
}
|
||||
|
||||
.duration_course {
|
||||
border-top:2px solid !important;
|
||||
border-bottom:2px solid !important;
|
||||
}
|
||||
|
||||
.duration_user {
|
||||
border-top:2px solid !important;
|
||||
border-bottom:2px solid !important;
|
||||
}
|
||||
|
||||
.duration_group {
|
||||
border-top:2px solid !important;
|
||||
border-bottom:2px solid !important;
|
||||
}
|
||||
|
||||
.today {
|
||||
#calendar .today,
|
||||
.minicalendar .today {
|
||||
border:2px solid !important;
|
||||
}
|
||||
|
||||
.mycalendar hr {
|
||||
height:1px;
|
||||
margin-top:4px;
|
||||
margin-bottom:4px;
|
||||
border:none;
|
||||
border-top:1px solid;
|
||||
}
|
||||
|
||||
|
||||
.cal_popup_bg {
|
||||
padding:0px;
|
||||
margin:0px;
|
||||
background-image:url(gradient.jpg);
|
||||
background-position:top;
|
||||
background-repeat:repeat-x;
|
||||
border:2px solid;
|
||||
border:1px solid;
|
||||
}
|
||||
|
||||
.cal_popup_close {
|
||||
margin-right:5px;
|
||||
}
|
||||
|
||||
.eventfull {
|
||||
border-width:1px;
|
||||
border-style:solid;
|
||||
}
|
||||
|
||||
.eventfullpicture {
|
||||
padding:8px;
|
||||
}
|
||||
|
||||
|
||||
/*****************************
|
||||
***
|
||||
*** Blocks
|
||||
@@ -520,19 +505,10 @@ CALENDAR STYLES -- PROVISIONALLY PLACED HERE UNTIL FINALIZED
|
||||
*/
|
||||
|
||||
.cal_popup_caption {
|
||||
font-family:sans-serif;
|
||||
font-size:75%;
|
||||
font-weight:bold;
|
||||
}
|
||||
|
||||
.cal_popup_close {
|
||||
font-family:sans-serif;
|
||||
font-size:75%;
|
||||
font-weight:bold;
|
||||
}
|
||||
|
||||
.calendarreferer {
|
||||
font-weight:bold;
|
||||
background-image:url(gradient.jpg);
|
||||
border-bottom-width:1px;
|
||||
border-bottom-style:solid;
|
||||
padding-bottom:2px;
|
||||
}
|
||||
|
||||
#calendar .maincalendar .calendarmonth tbody td {
|
||||
@@ -555,7 +531,7 @@ CALENDAR STYLES -- PROVISIONALLY PLACED HERE UNTIL FINALIZED
|
||||
|
||||
#calendar .maincalendar table.calendarmonth thead th {
|
||||
padding:10px;
|
||||
border-bottom:2px solid;
|
||||
border-bottom:2px #000000 solid;
|
||||
}
|
||||
|
||||
#calendar {
|
||||
@@ -564,7 +540,6 @@ CALENDAR STYLES -- PROVISIONALLY PLACED HERE UNTIL FINALIZED
|
||||
}
|
||||
|
||||
#calendar,
|
||||
#calendar .maincalendar .eventlist table,
|
||||
#calendar .maincalendar table.calendarmonth {
|
||||
border-collapse: separate;
|
||||
}
|
||||
@@ -653,20 +628,28 @@ table.minicalendar tbody td {
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
#calendar .eventfull {
|
||||
#calendar .eventlist .eventfull {
|
||||
margin-bottom:10px;
|
||||
width: 100%;
|
||||
border-color:#DDDDDD; /* borders */
|
||||
border-spacing:0px;
|
||||
border-collapse:separate;
|
||||
border-width:1px;
|
||||
border-style:solid;
|
||||
border-color:#DDDDDD;
|
||||
}
|
||||
|
||||
#calendar .eventfullheader, #calendar .eventfullpicture, #calendar .eventfullside {
|
||||
background-color:#EEEEEE;
|
||||
}
|
||||
|
||||
#calendar .eventfullmessage {
|
||||
#calendar .eventlist .eventfullmessage {
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
#calendar .eventlist .eventfullpicture {
|
||||
padding:8px;
|
||||
}
|
||||
|
||||
#calendar .maincalendar ul {
|
||||
padding:0px;
|
||||
margin:0px;
|
||||
|
||||
@@ -70,16 +70,16 @@
|
||||
-moz-border-radius-topright:15px;
|
||||
}
|
||||
|
||||
.eventfull {
|
||||
#calendar .eventlist .eventfull {
|
||||
-moz-border-radius-bottomleft:15px;
|
||||
-moz-border-radius-bottomright:15px;
|
||||
}
|
||||
|
||||
.eventfullside {
|
||||
#calendar .eventlist .eventfullside {
|
||||
-moz-border-radius-bottomleft:15px;
|
||||
}
|
||||
|
||||
.eventfullmessage {
|
||||
#calendar .eventlist .eventfullmessage {
|
||||
-moz-border-radius-bottomright:15px;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user