Commit 641dccde authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg

Merge branch 'bug/list-calendar' into 'master'

Changed List View in Calendar

Closes #789

See merge request !1091
parents 8cf46933 fceb30c9
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-11-13 20:59+0100\n"
"PO-Revision-Date: 2018-11-13 20:59+0100\n"
"POT-Creation-Date: 2018-12-12 20:13+0100\n"
"PO-Revision-Date: 2018-12-12 20:13+0100\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
......@@ -18,6 +18,10 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.2\n"
#: static/events/js/calendarlistview.js
msgid "Upcoming Events"
msgstr "Aankomende Evenementen"
#: static/events/js/calendarlistview.js
msgid "No events planned in the selected period."
msgstr "Er zijn geen evenementen gepland in de geselecteerde periode."
......@@ -27,13 +31,13 @@ msgid "Go to event"
msgstr "Naar de evenementpagina"
#: static/events/js/main.js
msgid "list"
msgstr "lijst"
msgid "show birthdays"
msgstr "toon verjaardagen"
#: static/events/js/main.js
msgid "hide birthdays"
msgstr "verberg verjaardagen"
#: static/events/js/main.js
msgid "show birthdays"
msgstr "toon verjaardagen"
msgid "list"
msgstr "lijst"
......@@ -3,6 +3,12 @@ var View = FC.View; // the class that all views must inherit from
var ListView; // our subclass
ListView = View.extend({
title: gettext("Upcoming Events"),
computeTitle: function (d) {
return this.title;
},
renderEvents: function (events) {
var root = $("<div>").addClass("accordion bordered");
......
......@@ -11,12 +11,12 @@ function checkResponsiveState(calendarElement, windowWidth, view) {
calendarElement.fullCalendar('removeEventSource', SOURCES.birthdays);
if (windowWidth <= 768) {
calendarElement.fullCalendar('option', 'header', {
right: 'prev,next today'
right: 'today'
});
} else {
if (view.name === 'list') {
calendarElement.fullCalendar('option', 'header', {
right: 'list,agendaWeek,month prev,next today'
right: 'list,agendaWeek,month today'
});
} else {
if (Cookies.get(BIRTHDAYS_COOKIE)) {
......@@ -79,7 +79,7 @@ $(function () {
views: {
list: {
buttonText: gettext('list'),
duration: {weeks: 1}
duration: {years: 5}
}
},
defaultDate: defaultDate,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment