kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added unapproved classes viewing

Browse Source
This commit is contained in:
Kenneth Jao 2017-04-25 10:43:42 -04:00
parent dcdb3f526a
commit 2076a9f562
3 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hourglass/client/main/main.css
View File

@ -476,6 +476,16 @@ input {
.mainClassTeacher { .mainClassTeacher {
font-size: 1.7vh; font-size: 1.7vh;
width: 70%;
display: table-cell;
pointer-events: none;
}
.mainClassStatus {
font-size: 1.7vh;
font-weight: bold;
margin: 0;
display: table-cell;
pointer-events: none; pointer-events: none;
} }
@ -1289,6 +1299,7 @@ textarea.clickModify {
} }
#markDone, #markConfirm, #markReport { #markDone, #markConfirm, #markReport {
font-size: 95%;
padding: 5%; padding: 5%;
background-color: rgba(0,0,0,0.1); background-color: rgba(0,0,0,0.1);

23
hourglass/client/main/main.html
View File

@ -190,13 +190,22 @@
</template> </template>
<template name="classesMode"> <template name="classesMode">
<div class="classWrapper"> <div class="classWrapper"> <!-- class color -->
<div class="mainClass" style="background-color:{{divColor 'classCardColor'}}"> <div class="mainClass" style="background-color:{{divColor 'classCardColor'}}">
<div class="classInfo"> <!-- class color --> {{#if status}}
<h3 class="mainClassName">{{name}}</h3> <div class="classInfo">
<p class="mainClassHour">{{hour}}</p> <h3 class="mainClassName">{{name}}</h3>
<p class="mainClassTeacher">{{teacher}}</p> <p class="mainClassHour">{{hour}}</p>
</div> <p class="mainClassTeacher">{{teacher}}</p>
</div>
{{else}}
<div class="classInfo" style="border-top:1vh solid #E64F4F;padding-top:2vh">
<h3 class="mainClassName">{{name}}</h3>
<p class="mainClassHour">{{hour}}</p>
<p class="mainClassTeacher">{{teacher}}</p>
<p class="mainClassStatus">Unapproved</p>
</div>
{{/if}}
<div class="creWork" classid="{{_id}}"> <div class="creWork" classid="{{_id}}">
<i class="fa fa-plus" aria-hidden="true"></i> <i class="fa fa-plus" aria-hidden="true"></i>
<h4>Add Work</h4> <h4>Add Work</h4>

1
hourglass/client/main/main.js
View File

@ -971,6 +971,7 @@ getClasses = function(myClasses) {
classObj.box = " owned"; classObj.box = " owned";
classObj.mine = false; // Actual value is reversed. classObj.mine = false; // Actual value is reversed.
classObj.subscribers = 1; classObj.subscribers = 1;
classObj.status = true;
classObj.admin = Meteor.userId(); classObj.admin = Meteor.userId();
classObj._id = Meteor.userId(); classObj._id = Meteor.userId();
} else { } else {