Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
concrexit
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
70
Issues
70
List
Boards
Labels
Service Desk
Milestones
Merge Requests
10
Merge Requests
10
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
thalia
concrexit
Commits
641dccde
Commit
641dccde
authored
Dec 12, 2018
by
Sébastiaan Versteeg
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bug/list-calendar' into 'master'
Changed List View in Calendar Closes
#789
See merge request
!1091
parents
8cf46933
fceb30c9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
9 deletions
+19
-9
website/events/locale/nl/LC_MESSAGES/djangojs.po
website/events/locale/nl/LC_MESSAGES/djangojs.po
+10
-6
website/events/static/events/js/calendarlistview.js
website/events/static/events/js/calendarlistview.js
+6
-0
website/events/static/events/js/main.js
website/events/static/events/js/main.js
+3
-3
No files found.
website/events/locale/nl/LC_MESSAGES/djangojs.po
View file @
641dccde
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-1
1-13 20:59
+0100\n"
"PO-Revision-Date: 2018-1
1-13 20:59
+0100\n"
"POT-Creation-Date: 2018-1
2-12 20:13
+0100\n"
"PO-Revision-Date: 2018-1
2-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
"
website/events/static/events/js/calendarlistview.js
View file @
641dccde
...
...
@@ -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
"
);
...
...
website/events/static/events/js/main.js
View file @
641dccde
...
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment