diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css
index 76cc982..d049d15 100644
--- a/hourglass/client/main/main.css
+++ b/hourglass/client/main/main.css
@@ -812,7 +812,7 @@ input, textarea {
#commentSubmit {
margin-bottom: 0;
padding: 2%;
- background-color: rgba(255,255,255,0.1);
+ background-color: rgba(0,0,0,0.1);
display: inline;
float: right;
@@ -825,7 +825,7 @@ input, textarea {
}
#commentSubmit:hover {
- background-color: rgba(255,255,255,0.05);
+ background-color: rgba(0,0,0,0.2);
}
#done {
@@ -894,3 +894,23 @@ input, textarea {
box-shadow: inset 0 0 0 99999px rgba(0,0,0,0.15);
}
+#workDelete {
+ margin-bottom: 0;
+ padding: 4%;
+ background-color: rgba(0,0,0,0.1);
+
+ position: absolute;
+ bottom: 8%;
+ right: 5%;
+ 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;
+}
+
+#workDelete:hover {
+ background-color: rgba(0,0,0,0.15);
+}
+
diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html
index 206f54d..b78f2b1 100644
--- a/hourglass/client/main/main.html
+++ b/hourglass/client/main/main.html
@@ -177,20 +177,20 @@
-
{{work 'confirmationLength'}}
+
{{work 'confirmations'}}
-
{{work 'reportLength'}}
-
+
{{work 'reports'}}
{{/unless}}
- {{#if newWork}}
- {{#if inRole}}
+ {{#if inRole}}
+ {{#if newWork}}
Save
{{/if}}
+ Delete
{{/if}}
diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index bdabfaa..719526d 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -131,7 +131,7 @@ Template.registerHelper('myClasses', () => { // Gets all classes and respective
}
thisWork[j].typeColor = workColors[thisWork[j].type];
- thisWork[j].confirmationLength = thisWork[j].confirmations.length // Counts the number of confiramtions and reportsfor a particular work
+ thisWork[j].confirmationLength = thisWork[j].confirmations.length // Counts the number of confirmations and reports for a particular work.
thisWork[j].reportLength = thisWork[j].reports.length
var hoverHighlight = Session.get("classDispHover"); // Highlight/scale related class works on hover.
@@ -686,6 +686,11 @@ Template.main.events({
Session.set("newWork",null);
closeDivFade(document.getElementsByClassName("overlay")[0]);
},
+ 'click #workDelete' () {
+ serverData = Session.get("currentWork")._id;
+ sendData("deleteWork");
+ closeDivFade(document.getElementsByClassName("overlay")[0]);
+ },
'keydown #workComment' (event) { // Restrict length on comment.
var chars = event.target.value.length;
document.getElementById("commentRestrict").style.color = "#7E7E7E";
@@ -793,7 +798,6 @@ function sendData(funcName) { // Call Meteor function, and do actions after func
} else if(funcName === "editProfile") {
$("#fullcalendar").fullCalendar( 'refetchEvents' );
}
- console.log(err,result);
});
}
@@ -909,6 +913,8 @@ function formReadable(input) { // Makes work information readable by users.
input.userReport = "";
}
+ input.confirmations = input.confirmations.length;
+ input.reports = input.reports.length;
var comments = input.comments;
var resort = [];