Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Alsijil
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-Alsijil
Commits
bf05b372
Commit
bf05b372
authored
4 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Plain Diff
Merge branch '87-move-version-history-to-own-tab' into 'master'
Resolve "[Lesson view] Organise information in tabs" Closes
#87
See merge request
!69
parents
f7008a9a
0962fce8
No related branches found
No related tags found
1 merge request
!69
Resolve "[Lesson view] Organise information in tabs"
Checking pipeline status
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+27
-23
27 additions, 23 deletions
...apps/alsijil/templates/alsijil/class_register/lesson.html
with
27 additions
and
23 deletions
aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+
27
−
23
View file @
bf05b372
...
...
@@ -50,15 +50,25 @@
</div>
<form
method=
"post"
>
<p>
{% include "core/partials/save_button.html" %}
</p>
{% csrf_token %}
<div
class=
"row"
>
<div
class=
"col s12"
>
{% include "core/partials/save_button.html" %}
<ul
class=
"tabs"
>
<li
class=
"tab"
>
<a
href=
"#lesson-documentation"
>
{% trans "Lesson documentation" %}
</a>
</li>
<li
class=
"tab"
>
<a
href=
"#personal-notes"
>
{% trans "Personal notes" %}
</a>
</li>
<li
class=
"tab"
>
<a
href=
"#version-history"
>
{% trans "Change history" %}
</a>
</li>
</ul>
</div>
</div>
{% csrf_token %}
<div
class=
"row"
>
<div
class=
"col s12 m12 l6 xl8"
>
<div
class=
"col s12"
id=
"lesson-documentation"
>
{% with prev_lesson=lesson_period.prev prev_doc=prev_lesson.get_lesson_documentation %}
{% with prev_doc=prev_lesson.get_lesson_documentation absences=prev_lesson.get_absences tardinesses=prev_lesson.get_tardinesses %}
{% if prev_doc %}
...
...
@@ -123,20 +133,8 @@
</div>
</div>
</div>
<div
class=
"col s12 m12 l6 xl4"
>
<div
class=
"card"
>
<div
class=
"card-content"
>
<span
class=
"card-title"
>
{% blocktrans %}Change history{% endblocktrans %}
</span>
{% include 'core/partials/crud_events.html' with obj=lesson_documentation %}
</div>
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col s12"
>
<div
class=
"col s12"
id=
"personal-notes"
>
<div
class=
"card"
>
<div
class=
"card-content"
>
<span
class=
"card-title"
>
...
...
@@ -203,12 +201,18 @@
</div>
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col s12"
>
{% include "core/partials/save_button.html" %}
<div
class=
"col s12"
id=
"version-history"
>
<div
class=
"card"
>
<div
class=
"card-content"
>
<span
class=
"card-title"
>
{% blocktrans %}Change history{% endblocktrans %}
</span>
{% include 'core/partials/crud_events.html' with obj=lesson_documentation %}
</div>
</div>
</div>
</div>
<p>
{% include "core/partials/save_button.html" %}
</p>
</form>
{% 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