Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Chronos
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
AlekSIS®
Official
AlekSIS-App-Chronos
Commits
c7d02ad5
Commit
c7d02ad5
authored
5 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Improve rendering of plural names (issue
#212
) | Some design improves [TIMETABLE: Hints]
parent
f9cea54f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
biscuit/apps/chronos/templates/timetable/hintsinplan.html
+5
-7
5 additions, 7 deletions
biscuit/apps/chronos/templates/timetable/hintsinplan.html
biscuit/apps/chronos/templates/timetable/hintsinsub.html
+3
-2
3 additions, 2 deletions
biscuit/apps/chronos/templates/timetable/hintsinsub.html
with
8 additions
and
9 deletions
biscuit/apps/chronos/templates/timetable/hintsinplan.html
+
5
−
7
View file @
c7d02ad5
...
...
@@ -39,9 +39,9 @@
{% endif %}
{{ hints_b|length }}
{% if hints %}
weitere
(n)
weitere
{{ hints_b|pluralize:"n," }}
{% endif %}
Hinweis
(e)
.
Hinweis
{{ hints_b|pluralize:"e" }}
.
<i
class=
"material-icons right collapsible-trigger"
></i>
</div>
</div>
...
...
@@ -50,12 +50,10 @@
{% if not hint.teachers %}
<div>
<strong>
{{ hint.classes
.all|join:", "
}},
{{ hint.classes
_formatted
}},
</strong>
{{ hint.from_date|date:"D, d.m." }},
{% if hint.from_date != hint.to_date %}
bis {{ hint.to_date|date:"D, d.m." }}
{% endif %}:
{{ hint.from_date|date:"D, d.m." }}{% if hint.from_date != hint.to_date %}, bis
{{ hint.to_date|date:"D, d.m." }}{% endif %}:
{{ hint.text|safe_markdown }}
</div>
{% endif %}
...
...
This diff is collapsed.
Click to expand it.
biscuit/apps/chronos/templates/timetable/hintsinsub.html
+
3
−
2
View file @
c7d02ad5
...
...
@@ -4,7 +4,8 @@
<li>
<div
class=
"collapsible-header "
style=
"font-size: 16px;"
>
<div
class=
"col s12"
>
<i
class=
"material-icons left"
>
announcement
</i>
Es gibt {{ hints|length }} Hinweis(e) für diesen Tag.
<i
class=
"material-icons left"
>
announcement
</i>
Es gibt {{ hints|length }}
Hinweis{{ hints|pluralize:"e" }} für diesen Tag.
<i
class=
"material-icons right collapsible-trigger"
></i>
</div>
</div>
...
...
@@ -12,7 +13,7 @@
{% for hint in hints %}
<div>
<strong>
{{ hint.classes
.all|join:", "
}}{% if hint.teachers and hint.classes.all %},{% endif %}
{{ hint.classes
_formatted
}}{% if hint.teachers and hint.classes.all %},{% endif %}
</strong>
{% if hint.teachers %}
<span
class=
"badge new green no-float no-margin"
>
Lehrkräfte
</span>
...
...
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