MDL-60070 core_calendar: remove old iCal icon

This commit is contained in:
Simey Lameze 2017-09-19 09:33:49 +08:00
parent d8e9a23c48
commit 8766097ed6
7 changed files with 5 additions and 81 deletions

View File

@ -76,18 +76,6 @@ class footer_options_exporter extends exporter {
return new \single_button($exportcalendarurl, get_string('exportcalendar', 'calendar'));
}
/**
* Get the iCal url.
*
* @return string The iCal url.
*/
protected function get_ical_url() {
if ($this->token) {
return new moodle_url('/calendar/export_execute.php', ['preset_what' => 'all',
'preset_time' => 'recentupcoming', 'userid' => $this->userid, 'authtoken' => $this->token]);
}
}
/**
* Get manage subscription button.
*
@ -120,7 +108,6 @@ class footer_options_exporter extends exporter {
if ($managesubscriptionbutton = $this->get_manage_subscriptions_button()) {
$values->managesubscriptionbutton = $managesubscriptionbutton->export_for_template($output);
}
$values->icalurl = $this->get_ical_url()->out(false);
}
return (array) $values;
@ -141,10 +128,6 @@ class footer_options_exporter extends exporter {
'type' => PARAM_RAW,
'default' => null,
],
'icalurl' => [
'type' => PARAM_URL,
'default' => null,
],
);
}
}

View File

@ -22,8 +22,7 @@
Example context (json):
{
"exportcalendarbutton": "<button class='btn btn-secondary'>Export calendar</button>",
"managesubscriptionbutton": "<button class='btn btn-secondary'>Manage subscriptions</button>",
"icalurl": "http://example.com/"
"managesubscriptionbutton": "<button class='btn btn-secondary'>Manage subscriptions</button>"
}
}}
<div class="bottom">
@ -33,7 +32,4 @@
{{#managesubscriptionbutton}}
{{> core/single_button }}
{{/managesubscriptionbutton}}
{{#icalurl}}
<a href="{{icalurl}}" title="{{#str}} quickdownloadcalendar, calendar {{/str}}" class="ical-link m-l-1">iCal</a>
{{/icalurl}}
</div>

View File

@ -154,7 +154,6 @@ $string['eventtypeuser'] = 'user';
$string['hideeventtype'] = 'Hide {$a} events';
$string['showeventtype'] = 'Show {$a} events';
$string['hourly'] = 'Hourly';
$string['ical'] = 'iCal';
$string['importcalendar'] = 'Import calendar';
$string['importcalendarheading'] = 'Import calendar...';
$string['importcalendarfrom'] = 'Import from';
@ -198,7 +197,6 @@ $string['pref_startwday'] = 'First day of week';
$string['pref_startwday_help'] = 'Calendar weeks will be shown as starting on the day that you select here.';
$string['pref_timeformat'] = 'Time display format';
$string['pref_timeformat_help'] = 'You can choose to see times in either 12 or 24 hour format. If you choose "default", then the format will be automatically chosen according to the language you use in the site.';
$string['quickdownloadcalendar'] = 'Quick download / subscribe to calendar';
$string['recentupcoming'] = 'Recent and next 60 days';
$string['repeatedevents'] = 'Repeated events';
$string['repeateditall'] = 'Also apply changes to the other {$a} events in this repeat series';
@ -259,6 +257,8 @@ $string['youcandeleteallrepeats'] = 'This event is part of a repeating event ser
$string['for'] = 'for';
// Deprecated since Moodle 3.4.
$string['quickdownloadcalendar'] = 'Quick download / subscribe to calendar';
$string['ical'] = 'iCal';
$string['tt_hidecourse'] = 'Course events are shown (click to hide)';
$string['tt_hideglobal'] = 'Global events are shown (click to hide)';
$string['tt_hidegroups'] = 'Group events are shown (click to hide)';

View File

@ -152,3 +152,5 @@ xmlrpcdisabledpublish,core_hub
xmlrpcdisabledregistration,core_hub
moodleorghubname,core_admin
hubs,core_admin
quickdownloadcalendar,core_calendar
ical,core_calendar

View File

@ -345,26 +345,6 @@ table.calendartable caption {
caption-side: top;
}
.ical-link {
font-size: 10px;
font-weight: bold;
background-color: #f60;
padding: 0 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,
.ical-link:visited {
color: #fff;
text-decoration: none;
}
@media (min-width: 768px) {
#page-calender-view {
.container-fluid {

View File

@ -334,25 +334,6 @@
}
}
.ical-link {
font-size: 10px;
font-weight: bold;
background-color: #f60;
padding: 0 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,
.ical-link:visited {
color: #fff;
text-decoration: none;
}
@media (min-width: 768px) {
#page-calender-view {
.container-fluid {

View File

@ -5843,24 +5843,6 @@ img.iconsmall {
.block .content h3.eventskey {
margin-top: 0.5em;
}
.ical-link {
font-size: 10px;
font-weight: bold;
background-color: #f60;
padding: 0 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,
.ical-link:visited {
color: #fff;
text-decoration: none;
}
@media (min-width: 768px) {
#page-calender-view .container-fluid {
min-width: 1024px;