Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Paweljong
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Teckids
Projekt Hack-n-Fun
AlekSIS-App-Paweljong
Commits
b27bd0e1
Commit
b27bd0e1
authored
3 years ago
by
Tom Teichler
Browse files
Options
Downloads
Patches
Plain Diff
Beautify event full page
parent
44e9b21c
No related branches found
No related tags found
No related merge requests found
Pipeline
#56329
canceled
3 years ago
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/paweljong/forms.py
+2
-1
2 additions, 1 deletion
aleksis/apps/paweljong/forms.py
aleksis/apps/paweljong/templates/paweljong/event/full.html
+57
-62
57 additions, 62 deletions
aleksis/apps/paweljong/templates/paweljong/event/full.html
with
59 additions
and
63 deletions
aleksis/apps/paweljong/forms.py
+
2
−
1
View file @
b27bd0e1
from
django
import
forms
from
django
import
forms
from
django.forms
import
fields
from
django.forms
import
fields
from
django.utils
import
dateformat
,
formats
from
django.utils.translation
import
ugettext_lazy
as
_
from
django.utils.translation
import
ugettext_lazy
as
_
from
allauth.account.views
import
SignupForm
from
allauth.account.views
import
SignupForm
...
@@ -381,7 +382,7 @@ class RegisterEventConsent(ExtensibleForm):
...
@@ -381,7 +382,7 @@ class RegisterEventConsent(ExtensibleForm):
label
=
_
(
label
=
_
(
"
I confirm that the retraction of the registration is not possible anymore
"
"
I confirm that the retraction of the registration is not possible anymore
"
"
after {}
"
"
after {}
"
).
format
(
event
.
date_retraction
),
).
format
(
dateformat
.
format
(
event
.
date_retraction
,
formats
.
get_format
(
'
DATE_FORMAT
'
))
),
)
)
self
.
fields
[
"
retraction_deadline
"
]
=
field_instance
self
.
fields
[
"
retraction_deadline
"
]
=
field_instance
node
=
Row
(
"
retraction_deadline
"
)
node
=
Row
(
"
retraction_deadline
"
)
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/paweljong/templates/paweljong/event/full.html
+
57
−
62
View file @
b27bd0e1
{% extends "core/base.html" %}
{% extends "core/base.html" %}
{% load material_form i18n any_js coerce static %}
{% load material_form i18n any_js coerce static
html_helpers
%}
{% block browser_title %}{% blocktrans %}Event{% endblocktrans %} {{ event.display_name }}{% endblock %}
{% block browser_title %}{% blocktrans %}Event{% endblocktrans %} {{ event.display_name }}{% endblock %}
...
@@ -9,67 +9,62 @@
...
@@ -9,67 +9,62 @@
{% block content %}
{% block content %}
<div
class=
"card"
>
<div
class=
"row"
>
<div
class=
"card-content"
>
<div
class=
"container"
>
<span
class=
"card-title"
>
<div
class=
"card"
>
{{ event.display_name }}
<div
class=
"card-content"
>
</span>
<span
class=
"card-title"
>
<div
class=
"row"
>
{{ event.display_name }}
<div
class=
"col s1"
>
</span>
<time
datetime=
"{{ event.date_event|date:'Y-m-d' }}"
class=
"icon"
>
<div
class=
"row"
>
<em>
{{ event.date_event|date:'l' }}
</em>
<div
class=
"col s12"
>
<strong>
{{ event.date_event|date:'F' }}
</strong>
<p>
{{ event.description }}
</p>
<span>
{{ event.date_event|date:'d' }}
</span>
<table>
</time>
<tr>
</div>
<td><i
class=
"material-icons small"
>
event
</i></td>
<div
class=
"col s11"
>
<td>
{{ event.date_event }}
</td>
<p>
{{ event.description }}
</p>
<td><i
class=
"material-icons small"
>
location_on
</i></td>
<td>
{{ event.place }}
</td>
</tr>
<tr>
<td><i
class=
"material-icons small"
>
edit_calendar
</i></td>
<td
colspan=
"2"
>
{% trans "Registration open until" %}:
</td>
<td>
{{ event.date_registration }}
</td>
</tr>
<tr>
<td><i
class=
"material-icons small"
>
money
</i></td>
<td
colspan=
"2"
>
{% trans "Participation fee (all inclusive)" %}
</td>
<td>
{{ event.cost }}
</td>
</tr>
<tr>
<td><i
class=
"material-icons small"
>
group
</i></td>
<td>
{{ event.linked_group.members.count }}
</td>
<td
colspan=
"2"
>
{% trans "of" %} {{ event.max_participants }}
</td>
</tr>
<tr>
<td
colspan=
"4"
>
<div
class=
"progress"
>
<div
class=
"determinate"
style=
"min-width: 2em;width:{{ event.booked_percentage|coerce_max:100|floatformat:0 }}%"
>
</div>
</div>
</td>
</tr>
</table>
</div>
</div>
</div>
<div
class=
"card-action"
>
{% if can_register and not is_authenticated %}
<a
href=
"{% url "
register_event_by_slug_start
"
event.slug
%}"
>
{% trans "Register now" %}
</a>
{% elif can_register and is_authenticated %}
<a
href=
"{% url "
register_event_by_slug
"
event.slug
%}"
>
{% trans "Register now" %}
</a>
{% else %}
<a
href=
"#"
>
{% trans "Not available" %}
</a>
{% endif %}
</div>
</div>
<table>
{{ event.information|add_class_to_el:"ul, browser-default"|safe }}
<tr>
<td><i
class=
"material-icons small"
>
event
</i></td>
<td>
{{ event.date_event }}
</td>
<td><i
class=
"material-icons small"
>
location_on
</i></td>
<td>
{{ event.place }}
</td>
</tr>
<tr>
<td><i
class=
"material-icons small"
>
edit_calendar
</i></td>
<td
colspan=
"2"
>
{% trans "Registration open until" %}:
</td>
<td>
{{ event.date_registration }}
</td>
</tr>
<tr>
<td><i
class=
"material-icons small"
>
money
</i></td>
<td
colspan=
"2"
>
{% trans "Participation fee (all inclusive)" %}
</td>
<td>
{{ event.cost }}
</td>
</tr>
<tr>
<td><i
class=
"material-icons small"
>
group
</i></td>
<td>
{{ event.linked_group.members.count }}
</td>
<td
colspan=
"2"
>
{% trans "of" %} {{ event.max_participants }}
</td>
</tr>
<tr>
<td
colspan=
"4"
>
<div
class=
"progress"
>
<div
class=
"determinate"
style=
"min-width: 2em;width:{{ event.booked_percentage|coerce_max:100|floatformat:0 }}%"
>
</div>
</div>
</td>
</tr>
</table>
</div>
</div>
</div>
<div
class=
"card-action"
>
{% if can_register and not is_authenticated %}
<a
href=
"{% url "
register_event_by_slug_start
"
event.slug
%}"
>
{% trans "Register now" %}
</a>
{% elif can_register and is_authenticated %}
<a
href=
"{% url "
register_event_by_slug
"
event.slug
%}"
>
{% trans "Register now" %}
</a>
{% else %}
<a
href=
"#"
>
{% trans "Not available" %}
</a>
{% endif %}
</div>
</div>
</div>
</div>
{{ event.information | safe }}
{% endblock %}
{% endblock %}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment