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

Merge branch 'master' of https://github.com/ksjdragon/hourglass

Browse Source
This commit is contained in:
yamanq 2016-08-12 17:39:55 -04:00
commit 60b1da6284
4 changed files with 56 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,11 +54,3 @@
</div> </div>
</div> </div>
</template> </template>
<template name="schoollist">
{{name}}
</template>
<template name="teacherlist">
{{teacher}}
</template>

14
hourglass/client/profile/profile.css
View File

@ -20,6 +20,7 @@
font-weight: 400; font-weight: 400;
margin: 0; margin: 0;
margin-bottom: 1%; margin-bottom: 1%;
margin-right: 10%;
} }
.profHea { .profHea {
@ -301,15 +302,22 @@
padding-top: 1%; padding-top: 1%;
} }
#formContainer {
margin-left: 5% !important;
margin-right: 5% !important;
margin-bottom: 0 !important;
position: relative;
}
#create div { #create div {
margin: 2%; margin: 3% 6% 5% 6%;
margin-left: 11%;
margin-bottom: 5%;
display: inline-block; display: inline-block;
} }
.creInput { .creInput {
font-size: 120%; font-size: 120%;
width: 100%;
padding: 3%; padding: 3%;
} }

72
hourglass/client/profile/profile.html
View File

@ -91,40 +91,42 @@
{{#if profClassTab "creClass"}} {{#if profClassTab "creClass"}}
<div id="creRules"><p>Insert description and rules of create a class --Will style later--</p></div> <div id="creRules"><p>Insert description and rules of create a class --Will style later--</p></div>
<form id="create"> <form id="create">
<div> <div id="formContainer">
<p class="profTitle">School:</p> <div>
{{> inputAutocomplete settings=schoolcomplete class="form-control creInput" type="text" name="school" placeholder="Example: International Academy" }} <p class="profTitle">School:</p>
</div> {{> inputAutocomplete settings=schoolcomplete class="form-control creInput" type="text" name="school" placeholder="Example: International Academy" }}
<div>
<p class="profTitle">Hour:</p>
<input class="creInput" type="text" name="hour">
</div>
<div>
<p class="profTitle">Teacher:</p>
{{> inputAutocomplete settings=teachercomplete class="form-control creInput" type="text" name="teacher" placeholder="Example: Woods" }}
</div>
<div>
<p class="profTitle">Class Name:</p>
<input class="creInput" type="text" name="classname">
</div>
<div>
<p class="profTitle">Privacy:</p>
<input class="creInput radio op" type="text" name="privacy" opc="1" op="1" readonly>
<div class="profOptions creOp" style="background-color:{{divColor 'header'}}">
<p class="profOptionText">Public</p>
<p class="profOptionText">Private</p>
</div> </div>
</div> <div>
<div> <p class="profTitle">Hour:</p>
<p class="profTitle">Category:</p> <input class="creInput" type="text" name="hour">
<input class="creInput radio op" type="text" name="category" opc="1" op="2" readonly> </div>
<div class="profOptions creOp" style="background-color:{{divColor 'header'}}"> <div>
<p class="profOptionText">Class</p> <p class="profTitle">Teacher:</p>
<p class="profOptionText">Club</p> {{> inputAutocomplete settings=teachercomplete class="form-control creInput" type="text" name="teacher" placeholder="Example: Woods" }}
<p class="profOptionText">Other</p> </div>
<div>
<p class="profTitle">Class Name:</p>
<input class="creInput" type="text" name="classname">
</div>
<div>
<p class="profTitle">Privacy:</p>
<input class="creInput radio op" type="text" name="privacy" opc="1" op="1" readonly>
<div class="profOptions creOp" style="background-color:{{divColor 'header'}}">
<p class="profOptionText">Public</p>
<p class="profOptionText">Private</p>
</div>
</div> </div>
<div>
<p class="profTitle">Category:</p>
<input class="creInput radio op" type="text" name="category" opc="1" op="2" readonly>
<div class="profOptions creOp" style="background-color:{{divColor 'header'}}">
<p class="profOptionText">Class</p>
<p class="profOptionText">Club</p>
<p class="profOptionText">Other</p>
</div>
</div>
</div> </div>
<h3 id="creSubmit" style="margin-left:{{submitMargin}}">Submit Request</h3> <h3 id="creSubmit">Submit Request</h3>
</form> </form>
{{/if}} {{/if}}
</div> </div>
@ -150,3 +152,11 @@
<span class="subscribers classText">{{subscribers}}</span> <span class="subscribers classText">{{subscribers}}</span>
</div> </div>
</template> </template>
<template name="schoollist">
{{name}}
</template>
<template name="teacherlist">
{{teacher}}
</template>

4
hourglass/client/profile/profile.js
View File

@ -384,6 +384,10 @@ Template.profile.events({
'click .fa-check-circle-o' () { 'click .fa-check-circle-o' () {
sendData(Session.get("confirm")); sendData(Session.get("confirm"));
closeDivFade(document.getElementsByClassName("overlay")[0]); closeDivFade(document.getElementsByClassName("overlay")[0]);
if(Session.get("confirm") === "createClass") {
var form = document.getElementById("create");
for(var i = 0; i < form.length; i++) form[i].value = "";
}
Session.set("serverData", null); Session.set("serverData", null);
Session.set("confirm", null); Session.set("confirm", null);
}, },