Merge branch 'Kyfront' into 'master'
Kyfront See merge request LETU/LETU!21
This commit is contained in:
commit
38633a94b4
5 changed files with 201 additions and 151 deletions
|
|
@ -71,16 +71,8 @@ h2
|
||||||
i
|
i
|
||||||
color: $primary
|
color: $primary
|
||||||
|
|
||||||
#panel
|
|
||||||
background-color: $dark2
|
|
||||||
height: 100vh
|
|
||||||
border-right: 2px solid $light3
|
|
||||||
padding: 0
|
|
||||||
position: fixed
|
|
||||||
|
|
||||||
#main
|
#main
|
||||||
background-color: $dark1
|
background-color: $dark1
|
||||||
margin-left: 16vw
|
|
||||||
|
|
||||||
#navtop
|
#navtop
|
||||||
font-size: 22px
|
font-size: 22px
|
||||||
|
|
@ -130,11 +122,11 @@ i
|
||||||
cursor: pointer
|
cursor: pointer
|
||||||
|
|
||||||
.student
|
.student
|
||||||
background: radial-gradient(circle, rgb(1, 79, 116) 20%, rgb(15, 15, 99) 100%)
|
background-image: linear-gradient(to top, #4481eb 0%, #04befe 100%)
|
||||||
.teacher
|
.teacher
|
||||||
background: radial-gradient(circle, rgb(5, 116, 1) 20%, rgb(11, 68, 10) 100%)
|
background-image: radial-gradient( circle farthest-corner at -1% 57.5%, rgba(19,170,82,1) 0%, rgba(0,102,43,1) 90% )
|
||||||
.admin
|
.admin
|
||||||
background: radial-gradient(circle, rgb(116, 74, 1) 20%, rgb(99, 42, 15) 100%)
|
background-image: radial-gradient( circle farthest-corner at 7.2% 19%, rgba(120,0,0,1) 0%, rgba(239,75,75,1) 100.2% )
|
||||||
|
|
||||||
#page
|
#page
|
||||||
margin: 0
|
margin: 0
|
||||||
|
|
@ -219,6 +211,7 @@ h3
|
||||||
.midi
|
.midi
|
||||||
td
|
td
|
||||||
height: 10vh
|
height: 10vh
|
||||||
|
cursor: auto
|
||||||
th
|
th
|
||||||
background-color: $secondary
|
background-color: $secondary
|
||||||
text-align: center
|
text-align: center
|
||||||
|
|
@ -234,6 +227,7 @@ h3
|
||||||
td
|
td
|
||||||
border-bottom: 1px solid white
|
border-bottom: 1px solid white
|
||||||
td
|
td
|
||||||
|
cursor: pointer
|
||||||
text-align: center
|
text-align: center
|
||||||
font-size: 15px
|
font-size: 15px
|
||||||
background-color: $medium
|
background-color: $medium
|
||||||
|
|
@ -489,6 +483,37 @@ div#visible + div
|
||||||
margin: auto
|
margin: auto
|
||||||
cursor: pointer
|
cursor: pointer
|
||||||
|
|
||||||
|
.detailsedt
|
||||||
|
z-index: 1
|
||||||
|
display: none
|
||||||
|
position: fixed
|
||||||
|
top: 20vh
|
||||||
|
left: 30%
|
||||||
|
background-color: $dark2
|
||||||
|
width: 40%
|
||||||
|
border-radius: 50px
|
||||||
|
border: 1px solid $light3
|
||||||
|
p
|
||||||
|
font-size: 20px
|
||||||
|
padding: 5px
|
||||||
|
color: white
|
||||||
|
margin: 0
|
||||||
|
text-align: center
|
||||||
|
p:first-child
|
||||||
|
font-size: 25px
|
||||||
|
background-color: $secondary
|
||||||
|
border-top-right-radius: 50px
|
||||||
|
border-top-left-radius: 50px
|
||||||
|
|
||||||
|
#slide-out
|
||||||
|
background-color: $dark2
|
||||||
|
a
|
||||||
|
color: white
|
||||||
|
font-size: 20px
|
||||||
|
|
||||||
|
#hamburger
|
||||||
|
position: fixed
|
||||||
|
|
||||||
#notvisible
|
#notvisible
|
||||||
display: none
|
display: none
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,16 @@
|
||||||
extends ../template/navbar
|
extends ../template/navbar
|
||||||
|
|
||||||
block content
|
block content
|
||||||
|
- let variable = [{name:"",ue:{id:0,name:""},teachers:[{id:0,firstName:"",lastName:""}],location:[""],dateStart:Date,dateEnd:Date,group:{id:0,number:0,promotion:{id:0,name:""}},promotion:{id:0,name:""}}];
|
||||||
|
div.detailsedt#visibl
|
||||||
|
p Maths
|
||||||
|
p S26
|
||||||
|
p Mr. Jaloux
|
||||||
|
p G4S3
|
||||||
|
p 08h à 10h
|
||||||
|
p UE------------
|
||||||
|
|
||||||
|
div
|
||||||
table(id="edttable")
|
table(id="edttable")
|
||||||
tr
|
tr
|
||||||
th Monday
|
th Monday
|
||||||
|
|
@ -78,6 +88,7 @@ block content
|
||||||
td
|
td
|
||||||
p Maths
|
p Maths
|
||||||
p S26
|
p S26
|
||||||
|
|
||||||
div(class="row" id="edtweek")
|
div(class="row" id="edtweek")
|
||||||
div(class="col s3 offset-s1")
|
div(class="col s3 offset-s1")
|
||||||
i(class="large material-icons") fast_rewind
|
i(class="large material-icons") fast_rewind
|
||||||
|
|
@ -85,3 +96,5 @@ block content
|
||||||
h3 Week of the 02/11/2020
|
h3 Week of the 02/11/2020
|
||||||
div(class="col s3")
|
div(class="col s3")
|
||||||
i(class="large material-icons") fast_forward
|
i(class="large material-icons") fast_forward
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
extends ../template/navbar
|
extends ../template/navbar
|
||||||
|
|
||||||
block content
|
block content
|
||||||
div.managesub#visible
|
div.managesub#visibl
|
||||||
p.topicname Tick the topics you would like to see in your news feed
|
p.topicname Tick the topics you would like to see in your news feed
|
||||||
form
|
form
|
||||||
p
|
p
|
||||||
|
|
|
||||||
|
|
@ -7,13 +7,14 @@ html
|
||||||
link(rel="stylesheet", href="/stylesheets/style.css")
|
link(rel="stylesheet", href="/stylesheets/style.css")
|
||||||
script(src="/socket.io/socket.io.js")
|
script(src="/socket.io/socket.io.js")
|
||||||
body
|
body
|
||||||
- let student = false
|
- let student = true
|
||||||
- let teacher = true
|
- let teacher = false
|
||||||
- let admin = false
|
- let admin = false
|
||||||
div(class="row" id="page")
|
div(class="row" id="page")
|
||||||
div(class="col s2" id="panel")
|
|
||||||
block navbar
|
block navbar
|
||||||
div(class="col s10" id="main")
|
div(class="col s12" id="main")
|
||||||
block content
|
block content
|
||||||
script(src="/javascripts/main.js")
|
script(src="/javascripts/main.js")
|
||||||
script(src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js")
|
script(src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js")
|
||||||
|
script.
|
||||||
|
M.AutoInit();
|
||||||
|
|
|
||||||
|
|
@ -1,54 +1,65 @@
|
||||||
extends layout
|
extends layout
|
||||||
|
|
||||||
block navbar
|
block navbar
|
||||||
|
ul#slide-out.sidenav
|
||||||
if student === true
|
if student === true
|
||||||
div(id="navprofile" class="student" onclick="profilRedirect()")
|
li
|
||||||
p Kezel Benoit
|
.user-view.student
|
||||||
p G4S3
|
p
|
||||||
a(id="logout") Logout
|
span.white-text.name Benoit Kezel
|
||||||
if teacher === true
|
p
|
||||||
div(id="navprofile" class="teacher" onclick="profilRedirect()")
|
span.white-text.name G4S3
|
||||||
p Kezel Benoit
|
p
|
||||||
a(id="logout") Logout
|
span.white-text.email benoit.kezel@etu.univ-lyon1.fr
|
||||||
if admin === true
|
|
||||||
div(id="navprofile" class="admin" onclick="profilRedirect()")
|
|
||||||
p Kezel Benoit
|
|
||||||
a(id="logout") Logout
|
|
||||||
|
|
||||||
div(id="navtop")
|
li
|
||||||
ul
|
a(href="/" class="waves-effect") Home
|
||||||
if student === true
|
li
|
||||||
|
a(href="/edt" class="waves-effect") Planning
|
||||||
li(class="active")
|
li(class="active")
|
||||||
a(href="/") Home
|
a(href="/marks" class="waves-effect") Marks
|
||||||
li
|
li
|
||||||
a(href="/edt") Planning
|
a(href="https://mail.univ-lyon1.fr/owa/" class="waves-effect") Mail
|
||||||
li
|
li
|
||||||
a(href="/marks") Marks
|
a(href="https://clarolineconnect.univ-lyon1.fr/" class="waves-effect") Claroline
|
||||||
li
|
li
|
||||||
a(href="https://mail.univ-lyon1.fr/owa/") Mail
|
a(href="/viescol" class="waves-effect") School and student life
|
||||||
li
|
|
||||||
a(href="https://clarolineconnect.univ-lyon1.fr/") Claroline
|
|
||||||
li
|
|
||||||
a(href="/viescol") School and student life
|
|
||||||
if teacher === true
|
if teacher === true
|
||||||
|
li
|
||||||
|
.user-view.teacher
|
||||||
|
p(href='#name')
|
||||||
|
span.white-text.name Benoit Kezel
|
||||||
|
p(href='#email')
|
||||||
|
span.white-text.email benoit.kezel@etu.univ-lyon1.fr
|
||||||
|
li
|
||||||
|
a(href="/" class="waves-effect") Home
|
||||||
|
li
|
||||||
|
a(href="/edt" class="waves-effect") Planning
|
||||||
li(class="active")
|
li(class="active")
|
||||||
a(href="/") Home
|
a(href="/marks" class="waves-effect") Marks
|
||||||
li
|
li
|
||||||
a(href="/edt") Planning
|
a(href="https://mail.univ-lyon1.fr/owa/" class="waves-effect") Mail
|
||||||
li
|
li
|
||||||
a(href="/marks") Marks
|
a(href="https://clarolineconnect.univ-lyon1.fr/" class="waves-effect") Claroline
|
||||||
li
|
li
|
||||||
a(href="https://mail.univ-lyon1.fr/owa/") Mail
|
a(href="/viescol" class="waves-effect") School and student life
|
||||||
li
|
|
||||||
a(href="https://clarolineconnect.univ-lyon1.fr/") Claroline Connect
|
|
||||||
li
|
|
||||||
a(href="/viescol") School and student life
|
|
||||||
if admin === true
|
if admin === true
|
||||||
|
li
|
||||||
|
.user-view.admin
|
||||||
|
p(href='#name')
|
||||||
|
span.white-text.name Benoit Kezel
|
||||||
|
p(href='#email')
|
||||||
|
span.white-text.email benoit.kezel@etu.univ-lyon1.fr
|
||||||
|
li
|
||||||
|
a(href="/" class="waves-effect") Home
|
||||||
li(class="active")
|
li(class="active")
|
||||||
a Accueil
|
a(href="/marks" class="waves-effect") Marks
|
||||||
li
|
li
|
||||||
a Notes
|
a(href="/viescol" class="waves-effect") School and student life
|
||||||
li
|
li
|
||||||
a Vie scolaire et étudiante
|
a(href="/viescol" class="waves-effect") Profil Edition
|
||||||
li
|
|
||||||
a Gestion des profils
|
a.sidenav-trigger(href='#' data-target='slide-out')#hamburger
|
||||||
|
i.material-icons.medium menu
|
||||||
Reference in a new issue