mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 04:33:13 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'm28_MDL-46716' of https://github.com/totara/moodle

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Eloy Lafuente (stronk7) 2014-08-26 02:16:50 +02:00
commit db438e0c14
4 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
calendar/view.php
View File

@ -156,10 +156,13 @@ if (!empty($CFG->enablecalendarexport)) {
echo $OUTPUT->single_button(new moodle_url('/calendar/managesubscriptions.php', array('course'=>$courseid)), get_string('managesubscriptions', 'calendar'));
}
if (isloggedin()) {
$authtoken = sha1($USER->id . $DB->get_field('user', 'password', array('id'=>$USER->id)) . $CFG->calendar_exportsalt);
$link = new moodle_url('/calendar/export_execute.php', array('preset_what'=>'all', 'preset_time'=>'recentupcoming', 'userid' => $USER->id, 'authtoken'=>$authtoken));
$icon = html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('i/ical'), 'height'=>'14', 'width'=>'36', 'alt'=>get_string('ical', 'calendar'), 'title'=>get_string('quickdownloadcalendar', 'calendar')));
echo html_writer::tag('a', $icon, array('href'=>$link));
$authtoken = sha1($USER->id . $DB->get_field('user', 'password', array('id' => $USER->id)) . $CFG->calendar_exportsalt);
$link = new moodle_url(
'/calendar/export_execute.php',
array('preset_what'=>'all', 'preset_time' => 'recentupcoming', 'userid' => $USER->id, 'authtoken'=>$authtoken)
);
echo html_writer::tag('a', 'iCal',
array('href' => $link, 'title' => get_string('quickdownloadcalendar', 'calendar'), 'class' => 'ical-link'));
}
}

20
theme/base/style/calendar.css
View File

@ -61,3 +61,23 @@
.block .calendar_filters .eventname { padding-left: .2em;}
.dir-rtl .block .calendar_filters .eventname { padding-right: .2em; padding-left: 0; }
.block .content h3.eventskey {margin-top:0.5em;}
.ical-link {
font-size: 10px;
font-weight: bold;
background-color: #f60;
padding: 0px 5px;
color: #fff;
border-top: 1px solid #f93;
border-left: 1px solid #f93;
border-bottom: 1px solid #013;
border-right: 1px solid #013;
margin: 3px;
text-decoration: none;
}
.ical-link:hover,
.ical-link:active,
.ical-link:focus {
color: #fff;
text-decoration: none;
}

18
theme/bootstrapbase/less/moodle/calendar.less
View File

@ -394,6 +394,24 @@
}
}
.ical-link {
font-size: 10px;
font-weight: bold;
background-color: #f60;
padding: 0px 5px;
color: #fff;
border-top: 1px solid #f93;
border-left: 1px solid #f93;
border-bottom: 1px solid #013;
border-right: 1px solid #013;
}
.ical-link:hover,
.ical-link:active,
.ical-link:focus {
color: #fff;
text-decoration: none;
}
@media (min-width: 768px) {
#page-calender-view {
.container-fluid {

2
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long