From b7dd7565a785145d3793b609cf24724d360e6d12 Mon Sep 17 00:00:00 2001
From: Frank Poetzsch-Heffter <p-h@katharineum.de>
Date: Sun, 25 Aug 2019 10:12:11 +0200
Subject: [PATCH] sorting AUBs - add Nimbus Link to footer
---
.idea/misc.xml | 2 +-
.idea/school-apps.iml | 2 +-
schoolapps/aub/views.py | 4 ++--
schoolapps/templates/partials/footer.html | 8 ++++++--
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1555825fc..c899900af 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,5 +6,5 @@
<component name="NodePackageJsonFileManager">
<packageJsonPaths />
</component>
- <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (SchoolApps)" project-jdk-type="Python SDK" />
+ <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (school-apps)" project-jdk-type="Python SDK" />
</project>
\ No newline at end of file
diff --git a/.idea/school-apps.iml b/.idea/school-apps.iml
index 8ae0a0d37..d0b5ddd7b 100644
--- a/.idea/school-apps.iml
+++ b/.idea/school-apps.iml
@@ -23,7 +23,7 @@
<excludeFolder url="file://$MODULE_DIR$/env" />
<excludeFolder url="file://$MODULE_DIR$/schoolapps/staticcollect" />
</content>
- <orderEntry type="jdk" jdkName="Python 3.7 (SchoolApps)" jdkType="Python SDK" />
+ <orderEntry type="jdk" jdkName="Python 3.7 (school-apps)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TemplatesService">
diff --git a/schoolapps/aub/views.py b/schoolapps/aub/views.py
index d3d2e7c34..ba1a759e7 100755
--- a/schoolapps/aub/views.py
+++ b/schoolapps/aub/views.py
@@ -142,7 +142,7 @@ def check1(request):
link=request.build_absolute_uri(reverse('aub_details', args=[aub.id]))
)
- aub_list = Aub.objects.filter(status=0).order_by('created_at')
+ aub_list = Aub.objects.filter(status=0).order_by('from_date')
aubs = AUBFilter(request.GET, queryset=aub_list)
return render(request, 'aub/check.html', {'filter': aubs})
@@ -186,7 +186,7 @@ def check2(request):
link=request.build_absolute_uri(reverse('aub_details', args=[aub.id]))
)
- aub_list = Aub.objects.filter(status=1).order_by('created_at')
+ aub_list = Aub.objects.filter(status=1).order_by('from_date')
aubs = AUBFilter(request.GET, queryset=aub_list)
return render(request, 'aub/check.html', {'filter': aubs})
diff --git a/schoolapps/templates/partials/footer.html b/schoolapps/templates/partials/footer.html
index e49dbeb03..0da5b3b42 100755
--- a/schoolapps/templates/partials/footer.html
+++ b/schoolapps/templates/partials/footer.html
@@ -16,7 +16,9 @@
<a class="blue-text text-lighten-4 btn-flat no-pad-left" href="https://katharineum-zu-luebeck.de"><i
class="material-icons footer-icon left">home</i> Homepage</a>
<a class="blue-text text-lighten-4 btn-flat" href="https://forum.katharineum.de"><i
- class="material-icons footer-icon left">cloud</i> Forum</a>
+ class="material-icons footer-icon left">looks</i> Forum</a>
+ <a class="blue-text text-lighten-4 btn-flat no-pad-right" href="https://nimbus.katharineum.de"><i
+ class="material-icons footer-icon left">cloud</i> Nimbus</a>
<a class="blue-text text-lighten-4 btn-flat no-pad-right" href="https://webmail.katharineum.de"><i
class="material-icons footer-icon left">email</i> Webmail</a>
</ul>
@@ -32,7 +34,9 @@
<a class="blue-text text-lighten-4 btn-flat no-pad-left" href="https://katharineum-zu-luebeck.de"><i
class="material-icons footer-icon left">home</i> Homepage</a>
<a class="blue-text text-lighten-4 btn-flat" href="https://forum.katharineum.de"><i
- class="material-icons footer-icon left">cloud</i> Forum</a>
+ class="material-icons footer-icon left">looks</i> Forum</a>
+ <a class="blue-text text-lighten-4 btn-flat no-pad-right" href="https://nimbus.katharineum.de"><i
+ class="material-icons footer-icon left">cloud</i> Nimbus</a>
<a class="blue-text text-lighten-4 btn-flat no-pad-right" href="https://webmail.katharineum.de"><i
class="material-icons footer-icon left">email</i> Webmail</a>
</ul>
--
GitLab