ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Style no class page, change admin display

This commit is contained in:
Christian Cueni 2019-11-04 15:06:48 +01:00
parent 06dbf20094
commit 193c1d39b5
8 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/src/pages/login.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="login"> <div class="login public-page">
<h1 class="login__title">Melden Sie sich jetzt an</h1> <h1 class="login__title public-page__title">Melden Sie sich jetzt an</h1>
<form class="login__form login-form" novalidate @submit.prevent="validateBeforeSubmit"> <form class="login__form login-form" novalidate @submit.prevent="validateBeforeSubmit">
<div class="login-form__field skillboxform-input"> <div class="login-form__field skillboxform-input">
<label for="email" class="skillboxform-input__label">E-Mail</label> <label for="email" class="skillboxform-input__label">E-Mail</label>
@ -148,15 +148,6 @@ export default {
@import "@/styles/_variables.scss"; @import "@/styles/_variables.scss";
@import "@/styles/_mixins.scss"; @import "@/styles/_mixins.scss";
.login {
&__title {
margin-top: 48px;
font-size: 2.75rem; // 44px
margin-bottom: 24px;
font-weight: 600;
}
}
.text-link { .text-link {
font-family: $sans-serif-font-family; font-family: $sans-serif-font-family;
color: $color-brand; color: $color-brand;

13
client/src/pages/registration.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="registration"> <div class="registration public-page">
<h1 class="registration__title">Registrieren Sie ihr persönliches Konto.</h1> <h1 class="registration__title public-page__title">Registrieren Sie ihr persönliches Konto.</h1>
<form class="registration__form registration-form" novalidate @submit.prevent="validateBeforeSubmit"> <form class="registration__form registration-form" novalidate @submit.prevent="validateBeforeSubmit">
<div class="registration-form__field skillboxform-input"> <div class="registration-form__field skillboxform-input">
<label for="firstname" class="skillboxform-input__label">Vorname</label> <label for="firstname" class="skillboxform-input__label">Vorname</label>
@ -206,15 +206,6 @@ export default {
@import "@/styles/_variables.scss"; @import "@/styles/_variables.scss";
@import "@/styles/_mixins.scss"; @import "@/styles/_mixins.scss";
.registration {
&__title {
margin-top: 48px;
font-size: 2.75rem; // 44px
margin-bottom: 24px;
font-weight: 600;
}
}
.text-link { .text-link {
font-family: $sans-serif-font-family; font-family: $sans-serif-font-family;
color: $color-brand; color: $color-brand;

6
client/src/pages/waitForClass.vue Normal file
View File

@ -0,0 +1,6 @@
<template>
<div class="no-class public-page">
<h1 class="public-page__title">Sie sind keiner Klasse zugeteilt.</h1>
<p>Sie können myskillbox nur verwenden wenn Sie in einer Klasse zugeteilt sind.</p>
</div>
</template>

5
client/src/pages/waitforClass.vue
View File

@ -1,5 +0,0 @@
<template>
<div>
<p>Sie sind keiner Klasse zugeteilt. Bitte kontaktieren Sie die zuständige Lehrperson um Zugriff zu erhalten.</p>
</div>
</template>

8
client/src/styles/_public-page.scss Normal file
View File

@ -0,0 +1,8 @@
.public-page {
&__title {
margin-top: 48px;
font-size: 2.75rem; // 44px
margin-bottom: 24px;
font-weight: 600;
}
}

1
client/src/styles/main.scss
View File

@ -19,3 +19,4 @@
@import "visibility"; @import "visibility";
@import "solutions"; @import "solutions";
@import "password_forms"; @import "password_forms";
@import "public-page";

4
server/registration/admin.py
View File

@ -14,8 +14,8 @@ from registration.models import LicenseType, License
@admin.register(LicenseType) @admin.register(LicenseType)
class LicenseTypeAdmin(admin.ModelAdmin): class LicenseTypeAdmin(admin.ModelAdmin):
list_display = ('id', 'key', 'for_role') list_display = ('id', 'name', 'key', 'for_role', 'active')
list_filter = ('for_role',) list_filter = ('for_role', 'active')
@admin.register(License) @admin.register(License)

3
server/registration/models.py
View File

@ -25,6 +25,9 @@ class LicenseType(models.Model):
def is_teacher_license(self): def is_teacher_license(self):
return self.for_role.key == RoleManager.TEACHER_KEY return self.for_role.key == RoleManager.TEACHER_KEY
def __str__(self):
return '%s - role: %s' % (self.name, self.for_role)
class License(models.Model): class License(models.Model):
license_type = models.ForeignKey(LicenseType, blank=False, null=False, on_delete=models.CASCADE) license_type = models.ForeignKey(LicenseType, blank=False, null=False, on_delete=models.CASCADE)