Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
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
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor 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-Core
Commits
ffe9ec87
Commit
ffe9ec87
authored
2 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Plain Diff
Merge branch '719-prettify-footer-on-vue-enabled-pages' into 'master'
Resolve "Prettify footer on Vue-enabled pages" Closes
#719
See merge request
!1073
parents
b2bde999
6d341d52
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1073
Resolve "Prettify footer on Vue-enabled pages"
Checking pipeline status
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/core/templates/core/partials/vue_footer_menu.html
+1
-1
1 addition, 1 deletion
aleksis/core/templates/core/partials/vue_footer_menu.html
aleksis/core/templates/core/vue_base.html
+47
-29
47 additions, 29 deletions
aleksis/core/templates/core/vue_base.html
with
48 additions
and
30 deletions
aleksis/core/templates/core/partials/vue_footer_menu.html
+
1
−
1
View file @
ffe9ec87
{# -*- engine:django -*- #}
{% for item in FOOTER_MENU.items.all %}
<v-btn
plain
tile
href=
"{{ item.url }}"
color=
"
primary
"
>
<v-btn
text
rounded
href=
"{{ item.url }}"
color=
"
white"
class=
"ma-2
"
>
{% if item.icon %}
<v-icon
left
>
mdi-{{ item.icon }}
</v-icon>
{% endif %}
...
...
This diff is collapsed.
Click to expand it.
aleksis/core/templates/core/vue_base.html
+
47
−
29
View file @
ffe9ec87
...
...
@@ -98,7 +98,8 @@
</v-toolbar-title>
<v-spacer></v-spacer>
<language-form
action=
"{% url "
set_language
"
%}"
csrf_value=
{{
csrf_token
}}
next_url=
{{
request.get_full_path
}}
></language-form>
<language-form
action=
"{% url "
set_language
"
%}"
csrf_value=
{{
csrf_token
}}
next_url=
{{
request.get_full_path
}}
></language-form>
{% if user.is_authenticated %}
<v-menu
offset-y
>
<template
v-slot:activator=
"{ on, attrs }"
>
...
...
@@ -168,36 +169,53 @@
</v-container>
</v-main>
<v-footer
app
absolute
inset
class=
"white--text"
>
<v-container>
<v-row>
<v-col
cols=
"12"
lg=
"6"
>
{% include "core/partials/vue_footer_menu.html" %}
</v-col>
<v-col
cols=
"12"
>
<v-footer
app
absolute
inset
dark
class=
"pa-0 d-flex"
color=
"primary lighten-1"
>
<v-card
flat
tile
class=
"primary white--text flex-grow-1"
>
{% if FOOTER_MENU.items.all %}
<v-card-text
class=
"pa-0"
>
<v-container
class=
"px-6"
>
<v-row
justify=
"center"
no-gutters
>
{% include "core/partials/vue_footer_menu.html" %}
</v-row>
</v-container>
</v-card-text>
<v-divider></v-divider>
{% endif %}
<v-card-text
class=
"pa-0"
>
<v-container
class=
"px-6"
>
<v-row>
<v-btn
plain
rounded
href=
"{% url "
about_aleksis
"
%}"
color=
"white"
>
{% trans "About AlekSIS® — The Free School Information System" %}
</v-btn>
<span>
© The AlekSIS Team
</span>
<v-spacer></v-spacer>
{% if request.site.preferences.footer__imprint_url %}
<v-btn
plain
rounded
href=
"{{ request.site.preferences.footer__imprint_url }}"
color=
"white"
>
{% trans "Imprint" %}
</v-btn>
{% endif %}
{% if request.site.preferences.footer__privacy_url and request.site.preferences.footer__imprint_url %}
·
{% endif %}
{% if request.site.preferences.footer__privacy_url %}
<v-btn
plain
rounded
href=
"{{ request.site.preferences.footer__privacy_url }}"
color=
"white"
>
{% trans "Privacy Policy" %}
</v-btn>
{% endif %}
<v-col
class=
"white--text d-flex align-center subtitle-2"
>
<div>
<a
href=
"{% url "
about_aleksis
"
%}"
class=
"white--text text-decoration-none"
>
{% trans "About AlekSIS® — The Free School Information System" %}
</a>
<span>
© The AlekSIS Team
</span>
</div>
</v-col>
<v-col
class=
"d-flex justify-end"
>
{% if request.site.preferences.footer__imprint_url %}
<v-btn
small
text
href=
"{{ request.site.preferences.footer__imprint_url }}"
color=
"white"
>
{% trans "Imprint" %}
</v-btn>
{% endif %}
{% if request.site.preferences.footer__privacy_url %}
<v-btn
small
text
href=
"{{ request.site.preferences.footer__privacy_url }}"
color=
"white"
>
{% trans "Privacy Policy" %}
</v-btn>
{% endif %}
</v-col>
</v-row>
</v-co
l
>
</v-
row
>
</v-c
ontainer
>
</v-co
ntainer
>
</v-
card-text
>
</v-c
ard
>
</v-footer>
</v-app>
</main>
...
...
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