Merge branch 'feature/vuejs' of edugit.org:AlekSIS/official/AlekSIS-Core into feature/vuejs

59191820 · Hangzhi Yu · ee98d8c2 · 6094fe0a · 59191820 · 59191820
Commit 59191820 authored 2 years ago by Hangzhi Yu
--- a/aleksis/core/static/js/vue/components/core/LanguageForm.js
+++ b/aleksis/core/static/js/vue/components/core/LanguageForm.js
 export default {
    data: () => ({
        items: JSON.parse(document.getElementById("language-info-list").textContent),
-        current_language: JSON.parse(document.getElementById("language-info-list").textContent).find(t=>t.code === JSON.parse(document.getElementById("current-language").textContent)).code,
+        current_language: JSON.parse(document.getElementById("current-language").textContent),
    }),
    methods: {
        submit: function (language) {
-            this.$refs.form.submit()
+            this.current_language = language;
+            // this.$refs.form.submit()
        },
    },
    props: ["action", "csrf_value", "next_url"],
@@ -24,20 +25,11 @@ export default {
      :value="next_url"
      type="hidden"
    ></v-text-field>
-    <!-- fixme: language value is not passed -->
-    <!--<v-select
+    <input
      name="language"
-      dense
-      outlined
-      dark
-      hide-details="auto"
-      prepend-inner-icon="mdi-translate"
-      :items="items"
-      item-text="name_local"
-      item-value="code"
-      :label="current_language"
-      @input="submit"
-    ></v-select>-->
+      :value="current_language"
+      type="hidden"
+    >
    <v-menu offset-y>
      <template v-slot:activator="{ on, attrs }">
        <v-btn
@@ -55,8 +47,8 @@ export default {
          v-model="current_language"
          color="primary"
        >
-          <v-list-item v-for="language in items" :key="language.code" :value="language.code" @click="submit(language.code)">
-            <v-list-item-title>{{ language.name_local }}</v-list-item-title>
+          <v-list-item v-for="language in items" :key="language[0]" :value="language[0]" @click="submit(language[0])">
+            <v-list-item-title>{{ language[1] }}</v-list-item-title>
          </v-list-item>
        </v-list-item-group>
      </v-list>

--- a/aleksis/core/templates/core/notifications.html
+++ b/aleksis/core/templates/core/notifications.html
@@ -9,7 +9,7 @@
  {% if object_list %}
    <v-list two-line>
      {% for notification in object_list %}
-	<v-list-item>
+        <v-list-item>
          <v-list-item-content>
            <v-list-item-title>{{ notification.title }}</v-list-item-title>


--- a/aleksis/core/templates/core/vue_base.html
+++ b/aleksis/core/templates/core/vue_base.html
@@ -2,6 +2,7 @@

 {% load i18n menu_generator static sass_tags any_js rules %}
 {% get_current_language as LANGUAGE_CODE %}
+{% get_available_languages as LANGUAGES %}


 <!DOCTYPE html>
@@ -99,9 +100,6 @@
        {{ request.site.preferences.general__title }}
      </v-toolbar-title>

-      <a>{{ get_language_info_list }}</a>
-
-
      <v-spacer></v-spacer>
      <language-form action="{% url "set_language" %}" csrf_value={{ csrf_token }} next_url={{ request.get_full_path }}></language-form>
      {% if user.is_authenticated %}
@@ -125,6 +123,7 @@
          </template>
          {% get_menu "NAVBAR_ACCOUNT_MENU" as account_menu %}
          <v-list id="account-dropdown" class="dropdown-content">
+            <v-subheader>REPORTS</v-subheader>
            {% for item in account_menu %}
              {% if item.divider %}
                <v-divider></v-divider>
@@ -216,8 +215,7 @@
 {{ request.site.preferences.theme__primary|json_script:"primary-color" }}
 {{ request.site.preferences.theme__secondary|json_script:"secondary-color" }}
 {{ LANGUAGE_CODE|json_script:"current-language" }}
-{% get_language_info_list for request.site.preferences.internationalisation__languages as languages %}
-{{ languages|json_script:"language-info-list" }}
+{{ LANGUAGES|json_script:"language-info-list" }}
 {#{{ request.site.preferences.all|json_script:"preferences" }}#}
 <script type="text/javascript" src="{% static 'js/search.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/vue/main_vue.js' %}"></script>