From 1077c4b578706660daee825c2b5b22964083a8e9 Mon Sep 17 00:00:00 2001 From: Julian Leucker <leuckerj@gmail.com> Date: Wed, 17 Aug 2022 22:07:32 +0200 Subject: [PATCH] Display back button and updateindicator in one line --- .../alsijil/assets/components/coursebook/CourseBook.vue | 9 +++++++-- .../assets/components/coursebook/UpdateIndicator.vue | 2 -- .../templates/alsijil/class_register/coursebook.html | 1 - 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/aleksis/apps/alsijil/assets/components/coursebook/CourseBook.vue b/aleksis/apps/alsijil/assets/components/coursebook/CourseBook.vue index f4411f02a..77b45ee6d 100644 --- a/aleksis/apps/alsijil/assets/components/coursebook/CourseBook.vue +++ b/aleksis/apps/alsijil/assets/components/coursebook/CourseBook.vue @@ -9,8 +9,13 @@ <!-- Result --> <div v-else-if="data" class="result apollo"> - <update-indicator @manual-update="updateManually()" ref="indicator" :status="status"></update-indicator> - <v-subheader>{{ data.lesson.subject.name }}</v-subheader> + <div class="d-flex justify-space-between"> + <v-btn text color="primary" :href="$root.urls.select_coursebook()"> + <v-icon left>mdi-chevron-left</v-icon> + {{ $root.django.gettext("Back") }} + </v-btn> + <update-indicator @manual-update="updateManually()" ref="indicator" :status="status"></update-indicator> + </div> <v-row> <v-col cols="12"> <lesson-documentations diff --git a/aleksis/apps/alsijil/assets/components/coursebook/UpdateIndicator.vue b/aleksis/apps/alsijil/assets/components/coursebook/UpdateIndicator.vue index bf330d05c..d3a061e5f 100644 --- a/aleksis/apps/alsijil/assets/components/coursebook/UpdateIndicator.vue +++ b/aleksis/apps/alsijil/assets/components/coursebook/UpdateIndicator.vue @@ -2,8 +2,6 @@ <v-tooltip bottom> <template v-slot:activator="{ on, attrs }"> <v-btn - absolute - fab right icon diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/coursebook.html b/aleksis/apps/alsijil/templates/alsijil/class_register/coursebook.html index 7e8c97dd5..80378c66a 100644 --- a/aleksis/apps/alsijil/templates/alsijil/class_register/coursebook.html +++ b/aleksis/apps/alsijil/templates/alsijil/class_register/coursebook.html @@ -3,7 +3,6 @@ {% load render_bundle from webpack_loader %} {% block page_title %} - <v-btn x-large icon color="primary" :href="urls.select_coursebook()"><v-icon>mdi-chevron-left</v-icon></v-btn> {% trans "Coursebook" %} {% endblock %} {% block browser_title %}{% trans "Coursebook" %} {{ lesson }}{% endblock %} -- GitLab