diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html index 20961ee..c8df587 100644 --- a/hourglass/client/main/main.html +++ b/hourglass/client/main/main.html @@ -60,6 +60,10 @@ {{#if currSettingMode 'addClass'}} {{> joinClass}} {{/if}} + + {{$if currSettingMode 'createClass'}} + {{> createClass}} + {{/if}} diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js index b8e88a5..5cacee8 100644 --- a/hourglass/client/main/main.js +++ b/hourglass/client/main/main.js @@ -41,7 +41,7 @@ Template.login.rendered = function() { Template.main.created = function() { Session.set("mode", Session.get("user").preferences.mode); - Session.set("classInfo", Session.get("user").classes[0]); + Session.set("classInfo", null); } Template.main.rendered = function() { diff --git a/hourglass/client/menus/menus.css b/hourglass/client/menus/menus.css index b83b278..f779aca 100644 --- a/hourglass/client/menus/menus.css +++ b/hourglass/client/menus/menus.css @@ -298,7 +298,7 @@ display: inline-block; } -#infoClassCont div .fa-files-o{ +#infoClassCont div .fa-files-o, #infoClassCont div .fa-pencil-square-o { font-size: 2vh; position: absolute; @@ -335,6 +335,41 @@ position: absolute; } +#changeAdminWrapper { + margin-top: 1%; + display: none; +} + +#changeAdminWrapper span { + font-size: 2vh; + display: inline-block !important; +} + +#changeAdmin { + width: 40%; + margin: 0 1% 0 1%; + font-size: 2vh; + padding: 1%; + outline: none; +} + +#adminSubmit { + padding: 2%; + background-color: rgba(0,0,0,0.1); + display: inline-block; + + cursor: pointer; + + -webkit-transition: background-color 0.4s ease; + -moz-transition: background-color 0.4s ease; + -ms-transition: background-color 0.4s ease; + transition: background-color 0.4s ease; +} + +#adminSubmit:hover { + background-color: rgba(0,0,0,0.2); +} + .userAdder { width: 100%; margin-bottom: 3%; @@ -400,3 +435,59 @@ .userDisp .fa:hover { color: #FF1A1A; } + +#joinTop { + margin: 2% 0 0 5%; +} + +#joinTop .-autocomplete-container { + display: none; +} + +#joinTop .fa { + font-size: 2.5vh; +} + +#classSearch, #privateCode { + font-size: 2vh; + padding: 1%; + outline: none; +} + +#private { + font-size: 2.4vh; + padding: 1.5%; + margin: 0 2% 0 2%; + + background-color: rgba(0,0,0,0.1); + + cursor: pointer; + + -webkit-transition: background-color 0.4s ease; + -moz-transition: background-color 0.4s ease; + -ms-transition: background-color 0.4s ease; + transition: background-color 0.4s ease; +} + +#private:hover { + background-color: rgba(0,0,0,0.2); +} + +#privateCode { + width: 25%; + display: none; + + -webkit-animation: expand .7s ease 1; + animation: expand .7s ease 1; +} + +@-webkit-keyframes expand { + 0% { width: 0%; } + 100% { width: 25%; } +} + +@keyframes expand { + 0% { width: 0%; } + 100% { width: 25%; } +} + diff --git a/hourglass/client/menus/menus.html b/hourglass/client/menus/menus.html index c2f34ee..b728960 100644 --- a/hourglass/client/menus/menus.html +++ b/hourglass/client/menus/menus.html @@ -187,10 +187,14 @@ Users
Click on a class to see its info.
{{/if}}Click on a class to see its info!
{{/if}}Submit a request for a class to be approved by an administrator. You can have up to 8 unapproved classes at once.
School:
+ {{> inputAutocomplete settings=schoolComplete class="form-control creInput" type="text" name="school" placeholder="Example: International Academy" }} +Hour:
+ +Teacher:
+ {{> inputAutocomplete settings=teacherComplete class="form-control creInput" type="text" name="teacher" placeholder="Example: Woods" }} +Class Name:
+ +Privacy:
+ +Category:
+ +