diff --git a/hourglass/client/admin/admin.css b/hourglass/client/admin/admin.css
index 877405d..50fc5a7 100644
--- a/hourglass/client/admin/admin.css
+++ b/hourglass/client/admin/admin.css
@@ -1,3 +1,8 @@
+#copyArea {
+ position: absolute;
+ top: -50px;
+}
+
#adminBanner {
width: 100%;
height: 32%;
@@ -114,7 +119,7 @@
}
.classItem {
- width: 20%;
+ width: 23%;
margin: 2% 0 2% 2%;
padding: 1.5%;
@@ -140,26 +145,71 @@
display: table-row;
}
+.keyContainer .fa-plus, .keyContainer .fa-times {
+ -webkit-filter: none;
+ filter: none;
+
+ cursor: pointer;
+
+ -webkit-transition: color 0.5s ease;
+ -moz-transition: color 0.5s ease;
+ -ms-transition: color 0.5s ease;
+ transition: color 0.5s ease;
+}
+
+.keyContainer .fa-plus:hover {
+ color: #519C39;
+}
+
+.keyContainer .fa-times {
+ margin-left: 5%;
+}
+
+.keyContainer .fa-times:hover {
+ color: #CC4444;
+}
+
.key {
font-weight: 400;
font-size: 120%;
- width: 40%;
+ width: 30%;
padding-top: 2%;
display: table-cell;
}
.modify {
- width: 60%;
+ width: 50%;
padding: 0;
display: table-cell;
}
+.fa-files-o, .fa-pencil-square-o {
+ width: 10%;
+ display: table-cell;
+ cursor: pointer;
+
+ -webkit-transition: color 0.5s ease;
+ -moz-transition: color 0.5s ease;
+ -ms-transition: color 0.5s ease;
+ transition: color 0.5s ease;
+}
+
+.fa-files-o:hover {
+ color: #E6E619;
+}
+
+.fa-pencil-square-o:hover {
+ color: #E6B319;
+}
+
.aUserContainer {
margin-left: -50%;
}
-.aUserContainer p {
- margin: 0;
- padding: 1%;
+#editValue {
+ width: 10%;
+ margin: auto;
+ margin-top: 30%;
+ background-color: #FEFEFE;
}
diff --git a/hourglass/client/admin/admin.html b/hourglass/client/admin/admin.html
index 02b8107..0797f25 100644
--- a/hourglass/client/admin/admin.html
+++ b/hourglass/client/admin/admin.html
@@ -42,60 +42,79 @@
Name:
- {{name}}
+ {{name}}
+
+
Hour:
- {{hour}}
+ {{hour}}
+
+
Teacher:
- {{teacher}}
+ {{teacher}}
+
+
School:
- {{school}}
+ {{school}}
+
+
Category:
- {{category}}
+ {{category}}
+
+
Privacy:
- {{privacy}}
+ {{privacy}}
+
+
Code:
- {{code}}
+ {{code}}
+
+
User Info
Creator:
- {{admin}}
+ {{admin}}
+
+
-
Subscribers:
+
Subscribers:
+
{{#each subscribers}}
-
{{email}}
+ {{> adminUserBox}}
{{/each}}
-
Moderators:
+
Moderators:
+
{{#each moderators}}
-
{{email}}
+ {{> adminUserBox}}
{{/each}}
-
Banned:
+
Banned:
+
{{#each banned}}
-
{{email}}
+ {{> adminUserBox}}
{{/each}}
@@ -121,4 +140,20 @@
{{/if}}
+
+
+
+
+
+ {{email}}
+ {{#if none}}
+
+ {{/if}}
diff --git a/hourglass/client/admin/admin.js b/hourglass/client/admin/admin.js
index 11db086..ed0061b 100644
--- a/hourglass/client/admin/admin.js
+++ b/hourglass/client/admin/admin.js
@@ -29,17 +29,19 @@ Template.admin.helpers({
userClasses[i].code = "None";
}
userClasses[i].category = userClasses[i].category.charAt(0).toUpperCase() + userClasses[i].category.slice(1);
-
userClasses[i].admin = getEmail(userClasses[i].admin);
var types = ["subscribers","moderators","banned"];
for(var j = 0; j < types.length; j++) {
+
if(userClasses[i][types[j]].length === 0) {
- userClasses[i][types[j]][k] = {"email":"None"};
+ userClasses[i][types[j]][k] = {"email":"None","none":false};
continue;
}
+
for(var k = 0; k < userClasses[i][types[j]].length; k++) {
userClasses[i][types[j]][k] = {
- "email": getEmail(userClasses[i][types[j]][k])
+ "email": getEmail(userClasses[i][types[j]][k]),
+ "none":true
};
}
}
@@ -61,6 +63,14 @@ Template.admin.helpers({
Template.admin.events({
'click #adminTabs li' (event) {
Session.set("adminTab",event.target.id);
+ },
+ 'click .fa-files-o' (event) {
+ document.getElementById("copyArea").value = event.target.parentNode.childNodes[3].childNodes[0].nodeValue;
+ document.getElementById("copyArea").select();
+ document.execCommand("copy");
+ },
+ 'click .fa-pencil-square-o' (event) {
+ var value = event.target.parentNode.childNodes[3].className.replace("modify ","");
}
});
diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css
index 438335e..a53e391 100644
--- a/hourglass/client/main/main.css
+++ b/hourglass/client/main/main.css
@@ -40,10 +40,10 @@ html {
-ms-user-select: none;
user-select: none;
- -webkit-transition: color 0.5s ease
- -moz-transition: color 0.5s ease
- -ms-transition: color 0.5s ease
- transition: color 0.5s ease
+ -webkit-transition: color 0.5s ease;
+ -moz-transition: color 0.5s ease;
+ -ms-transition: color 0.5s ease;
+ transition: color 0.5s ease;
}
::-webkit-input-placeholder {