diff --git a/frontend/src/components/BaseLayout.vue b/frontend/src/components/BaseLayout.vue index d45f70330a6217db6929fa7dd353b15c83bd1bde..48c466eba0b90ba22d5a623ebb67981786b2d7aa 100644 --- a/frontend/src/components/BaseLayout.vue +++ b/frontend/src/components/BaseLayout.vue @@ -9,29 +9,29 @@ > <v-toolbar> <v-list> - <v-list-tile> - <v-list-tile-action v-if="mini"> + <v-list-item> + <v-list-item-action v-if="mini"> <v-btn icon @click.native.stop="mini = !mini" > <v-icon>chevron_right</v-icon> </v-btn> - </v-list-tile-action> - <v-list-tile-content + </v-list-item-action> + <v-list-item-content class="title" > <slot name="header" /> - </v-list-tile-content> - <v-list-tile-action v-if="!mini"> + </v-list-item-content> + <v-list-item-action v-if="!mini"> <v-btn icon @click.native.stop="mini = !mini" > <v-icon>chevron_left</v-icon> </v-btn> - </v-list-tile-action> - </v-list-tile> + </v-list-item-action> + </v-list-item> </v-list> </v-toolbar> <slot name="sidebar-content" /> diff --git a/frontend/src/components/UserOptions.vue b/frontend/src/components/UserOptions.vue index 8d3091a005f88e30f72702f91065e7dbd46676f4..2b2a239eecbe9abd701fe4317c2215b435d3b354 100644 --- a/frontend/src/components/UserOptions.vue +++ b/frontend/src/components/UserOptions.vue @@ -1,19 +1,19 @@ <template> <div> <v-list> - <v-list-tile + <v-list-item v-if="!isStudent" @click="showPasswordChangeDialog" > Change password - </v-list-tile> + </v-list-item> <v-divider class="my-2" /> - <v-list-tile @click="logout"> + <v-list-item @click="logout"> <v-icon left> exit_to_app </v-icon> Logout - </v-list-tile> + </v-list-item> </v-list> <component :is="displayComponent" diff --git a/frontend/src/components/export/ExportDialog.vue b/frontend/src/components/export/ExportDialog.vue index 458600cacd3571e6f834027d129189429adaa293..4df16b3b1fa26c11fc8b4fbcd848b2d46768abc3 100644 --- a/frontend/src/components/export/ExportDialog.vue +++ b/frontend/src/components/export/ExportDialog.vue @@ -30,14 +30,14 @@ >(UNCORRECTED submissions left! Export will be incomplete.)</span> </v-tooltip> <v-list> - <v-list-tile + <v-list-item v-for="(item, i) in menuItems" :id="'export-list' + i" :key="i" @click="item.action" > {{ item.display }} - </v-list-tile> + </v-list-item> </v-list> <component :is="displayComponent" diff --git a/frontend/src/components/student_list/StudentListMenu.vue b/frontend/src/components/student_list/StudentListMenu.vue index 165590e03e832faed785a0e2a8b0333e3adecd7e..95176ffbf7b9b3023cd640ff464bec7f1c3ced13 100644 --- a/frontend/src/components/student_list/StudentListMenu.vue +++ b/frontend/src/components/student_list/StudentListMenu.vue @@ -12,13 +12,13 @@ <v-icon>menu</v-icon> </v-btn> <v-list> - <v-list-tile + <v-list-item v-for="item in items" :key="item.title" @click="item.action" > - <v-list-tile-title>{{ item.title }}</v-list-tile-title> - </v-list-tile> + <v-list-item-title>{{ item.title }}</v-list-item-title> + </v-list-item> </v-list> </v-menu> </template> diff --git a/frontend/src/components/submission_type/SubmissionTypesOverview.vue b/frontend/src/components/submission_type/SubmissionTypesOverview.vue index 90a952090183145ccdc834b41cac7d2f96c52eb3..c10d4c3b0166d0f29b2b2c440e4520da400a7f19 100644 --- a/frontend/src/components/submission_type/SubmissionTypesOverview.vue +++ b/frontend/src/components/submission_type/SubmissionTypesOverview.vue @@ -6,15 +6,15 @@ <v-row> <v-col cols="3"> <v-list id="submission-types-list"> - <v-list-tile + <v-list-item v-for="submissionType in sortedSubmissionTypes" :key="submissionType.pk" @click="selectedSubmissionType = submissionType" > - <v-list-tile-content> + <v-list-item-content> {{ submissionType.name }} - </v-list-tile-content> - </v-list-tile> + </v-list-item-content> + </v-list-item> </v-list> </v-col> <v-col cols="9"> diff --git a/frontend/src/components/subscriptions/SubscriptionForList.vue b/frontend/src/components/subscriptions/SubscriptionForList.vue index 28ae948e1d82f0de2b7a80041b068d3417db4825..710aa986aef7db850750d8bd028fc6ea80efe4ea 100644 --- a/frontend/src/components/subscriptions/SubscriptionForList.vue +++ b/frontend/src/components/subscriptions/SubscriptionForList.vue @@ -1,21 +1,21 @@ <template> <v-row> - <v-list-tile + <v-list-item exact :to="correctionRoute" style="width: 100%" > <!-- dynamically set css class depending on active --> - <v-list-tile-content + <v-list-item-content :class="{'inactive-subscription': !active}" class="mr-3 subscription" > {{ name }} - </v-list-tile-content> - <v-list-tile-action-text> + </v-list-item-content> + <v-list-item-action-text> left: {{ available }} - </v-list-tile-action-text> - </v-list-tile> + </v-list-item-action-text> + </v-list-item> </v-row> </template> diff --git a/frontend/src/pages/base/TutorReviewerBaseLayout.vue b/frontend/src/pages/base/TutorReviewerBaseLayout.vue index 185d6a2de2e46eb0f39396dcb0a43c500b5b8dbc..cb9c2e986becdbfd6008ea21484334a4b69f1470 100644 --- a/frontend/src/pages/base/TutorReviewerBaseLayout.vue +++ b/frontend/src/pages/base/TutorReviewerBaseLayout.vue @@ -6,20 +6,20 @@ <template slot="sidebar-content"> <v-list dense> - <v-list-tile + <v-list-item v-for="(item, i) in generalNavItems" :key="i" :to="item.route" > - <v-list-tile-action> + <v-list-item-action> <v-icon>{{ item.icon }}</v-icon> - </v-list-tile-action> - <v-list-tile-content> - <v-list-tile-title :id="item.tagId"> + </v-list-item-action> + <v-list-item-content> + <v-list-item-title :id="item.tagId"> {{ item.name }} - </v-list-tile-title> - </v-list-tile-content> - </v-list-tile> + </v-list-item-title> + </v-list-item-content> + </v-list-item> </v-list> <v-divider /> <slot name="above-subscriptions" /> diff --git a/frontend/src/pages/reviewer/ReviewerLayout.vue b/frontend/src/pages/reviewer/ReviewerLayout.vue index ff1b2141255b4207fe829f5428b73286c5eeadf2..2aaf3912820bba8d96100d647dd106d43430a543 100644 --- a/frontend/src/pages/reviewer/ReviewerLayout.vue +++ b/frontend/src/pages/reviewer/ReviewerLayout.vue @@ -4,20 +4,20 @@ slot="above-subscriptions" dense > - <v-list-tile + <v-list-item v-for="(item, i) in subGeneralNavItems" :key="i" :to="item.route" > - <v-list-tile-action> + <v-list-item-action> <v-icon>{{ item.icon }}</v-icon> - </v-list-tile-action> - <v-list-tile-content> - <v-list-tile-title> + </v-list-item-action> + <v-list-item-content> + <v-list-item-title> {{ item.name }} - </v-list-tile-title> - </v-list-tile-content> - </v-list-tile> + </v-list-item-title> + </v-list-item-content> + </v-list-item> </v-list> </tutor-reviewer-base-layout> </template> diff --git a/frontend/src/pages/student/StudentLayout.vue b/frontend/src/pages/student/StudentLayout.vue index 2229f27d5b5f47cd9214e572f51b0bdce2fdcd29..5dca9d7322cf4df26d47dffb6ae8e42071dbce57 100644 --- a/frontend/src/pages/student/StudentLayout.vue +++ b/frontend/src/pages/student/StudentLayout.vue @@ -8,21 +8,21 @@ slot="sidebar-content" dense > - <v-list-tile + <v-list-item v-for="(item, i) in generalNavItems" :key="i" exact :to="item.route" > - <v-list-tile-action> + <v-list-item-action> <v-icon>{{ item.icon }}</v-icon> - </v-list-tile-action> - <v-list-tile-content> - <v-list-tile-title> + </v-list-item-action> + <v-list-item-content> + <v-list-item-title> {{ item.name }} - </v-list-tile-title> - </v-list-tile-content> - </v-list-tile> + </v-list-item-title> + </v-list-item-content> + </v-list-item> <v-divider /> @@ -31,26 +31,26 @@ :exam="exam" class="elevation-1 exam-info ma-1" /> - <v-list-tile + <v-list-item v-for="item in submissionNavItems" :key="item.route" exact :to="item.route" > - <v-list-tile-action> + <v-list-item-action> <v-icon v-if="!visited[item.id]"> assignment </v-icon> <v-icon v-else> check </v-icon> - </v-list-tile-action> - <v-list-tile-content> - <v-list-tile-title> + </v-list-item-action> + <v-list-item-content> + <v-list-item-title> {{ item.name }} - </v-list-tile-title> - </v-list-tile-content> - </v-list-tile> + </v-list-item-title> + </v-list-item-content> + </v-list-item> </v-list> </base-layout> </template> diff --git a/frontend/src/pages/tutor/TutorLayout.vue b/frontend/src/pages/tutor/TutorLayout.vue index 10f9a3c8be615b3d74f0c7ca337df6fbed6c013f..6fd1c7bf3d61ff21fd907078005af32a9720ac96 100644 --- a/frontend/src/pages/tutor/TutorLayout.vue +++ b/frontend/src/pages/tutor/TutorLayout.vue @@ -5,16 +5,16 @@ slot="above-subscriptions" dense > - <v-list-tile :to="'/participant-overview'"> - <v-list-tile-action> + <v-list-item :to="'/participant-overview'"> + <v-list-item-action> <v-icon> people </v-icon> - </v-list-tile-action> - <v-list-tile-content> - <v-list-tile-title> + </v-list-item-action> + <v-list-item-content> + <v-list-item-title> {{ "Participants" }} - </v-list-tile-title> - </v-list-tile-content> - </v-list-tile> + </v-list-item-title> + </v-list-item-content> + </v-list-item> </v-list> </tutor-reviewer-base-layout> </template> diff --git a/functional_tests/test_import.py b/functional_tests/test_import.py index f573836e1b6748811315ec149f668af3141e9818..44b1c575591ec74eb13dc4a613f970a3f9ef5064 100644 --- a/functional_tests/test_import.py +++ b/functional_tests/test_import.py @@ -35,7 +35,7 @@ class TestImport(GradyTestCase): def test_reviewer_can_import_data(self): self._login() self.browser.find_element_by_id("user-options").click() - self.browser.find_element_by_id("import-data-list-tile").click() + self.browser.find_element_by_id("import-data-list-item").click() self.browser.execute_script( "document.getElementById('file-input').style.display='block';" )