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

Css fixes, server bug fix

Browse Source
This commit is contained in:
Kenneth Jao 2017-02-09 09:01:18 -05:00
parent 9f7894a042
commit 07e62b42ff
5 changed files with 59 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hourglass/client/login/login.css
View File

@ -24,7 +24,7 @@
#loginTexts { #loginTexts {
color: #FCF0F0; color: #FCF0F0;
width: 40%; width: 45%;
margin-left: 48%; margin-left: 48%;
position: absolute; position: absolute;
top: 23vh; top: 23vh;

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

@ -474,6 +474,7 @@ input {
} }
.creWork h4 { .creWork h4 {
font-size: 100%;
padding-left: 0; padding-left: 0;
} }
@ -590,7 +591,7 @@ textarea.clickModify {
#editWork { #editWork {
min-height: 68vh; min-height: 68vh;
margin: auto; margin: auto;
margin-top: 5%; margin-top: 2%;
box-shadow: 2px 2px 5px 3px #333; box-shadow: 2px 2px 5px 3px #333;
} }
@ -602,11 +603,6 @@ textarea.clickModify {
box-shadow: inset 0 0 0 99999px rgba(0,0,0,0.12); box-shadow: inset 0 0 0 99999px rgba(0,0,0,0.12);
position: relative; position: relative;
display: table;
}
#workInfoContainer {
min-height: 68vh;
} }
#workTypeBar { #workTypeBar {
@ -615,7 +611,11 @@ textarea.clickModify {
} }
#workNameDiv { #workNameDiv {
padding: 4% 4% 0 3.5%; padding: 4% 0 0 3.5%;
}
#workNameDiv .resText {
font-size: 1.6vh;
} }
#wName { #wName {
@ -634,7 +634,7 @@ textarea.clickModify {
} }
.workTitle { .workTitle {
font-size: 150%; font-size: 2.1vh;
font-weight: 400; font-weight: 400;
margin: 0 3% 1% 0; margin: 0 3% 1% 0;
cursor: default; cursor: default;
@ -733,14 +733,14 @@ textarea.clickModify {
#workInfoContainer, #workToggle { #workInfoContainer, #workToggle {
height: 100%; height: 100%;
display: table-cell; display: inline-block;
vertical-align: top; vertical-align: top;
} }
#workInfoContainer { #workInfoContainer {
width: 70%; width: 70%;
margin-right: 3%; margin-right: 3%;
float: left; min-height: 68vh;
} }
#workToggle { #workToggle {
@ -806,7 +806,7 @@ textarea.clickModify {
#workSubmit, #workDelete { #workSubmit, #workDelete {
font-weight: 200; font-weight: 200;
font-size: 140%; font-size: 2vh;
padding: 2%; padding: 2%;
background-color: rgba(0,0,0,0.25); background-color: rgba(0,0,0,0.25);
@ -995,6 +995,15 @@ textarea.clickModify {
background-color: rgba(255,255,255,0.9) !important; background-color: rgba(255,255,255,0.9) !important;
} }
.fc-day-header {
font-weight: 100;
}
.fc-event {
border: 0 !important;
border-radius: 0px !important;
}
.workevent { .workevent {
pointer-events: auto; pointer-events: auto;
@ -1053,6 +1062,7 @@ textarea.clickModify {
.commentBox { .commentBox {
margin: 0 !important; margin: 0 !important;
width: 100%;
padding: 2%; padding: 2%;
background-color: rgba(255,255,255,0.1); background-color: rgba(255,255,255,0.1);
border-bottom: solid 1px #CCC; border-bottom: solid 1px #CCC;
@ -1067,6 +1077,7 @@ textarea.clickModify {
border-radius: 10%; border-radius: 10%;
display: inline-block; display: inline-block;
vertical-align: top;
} }
.commentAvatar { .commentAvatar {
@ -1090,8 +1101,11 @@ textarea.clickModify {
.commentInfo { .commentInfo {
max-height: 5%; max-height: 5%;
width: 85%;
max-width: 85%;
margin: 0 !important; margin: 0 !important;
display: inline-block; display: inline-block;
word-wrap: break-word;
} }
.commentUser:hover { .commentUser:hover {
@ -1099,13 +1113,19 @@ textarea.clickModify {
} }
.commentUser, .commentDate { .commentUser, .commentDate {
font-size: 75%; font-size: 55%;
} }
.commentAvatar, .commentUser { .commentAvatar, .commentUser {
cursor: pointer; cursor: pointer;
} }
.commentComment {
font-size: 1.7vh;
max-width: 85%;
width: 85%;
}
#commentRestrict { #commentRestrict {
font-weight: 400; font-weight: 400;
} }

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

@ -68,8 +68,8 @@
</div> </div>
<div class="overlay"> <div class="overlay">
<div id="editWork" style="width:{{screen '.4'}}"> <div id="editWork" style="width:{{screen '.5'}};max-width:{{screen '.5'}}">
<div id="editWorkCont" style="background-color:{{divColor 'mainColor'}};border-top:10px solid {{work 'typeColor'}}"> <div id="editWorkCont" style="background-color:{{divColor 'mainColor'}};border-top:10px solid {{work 'typeColor'}};">
<div id="workInfoContainer"> <div id="workInfoContainer">
{{#if inRole}} {{#if inRole}}
{{> workDisplayEdit}} {{> workDisplayEdit}}

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

@ -50,11 +50,6 @@ Template.main.rendered = function() {
height: '34vh', height: '34vh',
touchScrollStep: 90 touchScrollStep: 90
}); });
$("#comment").slimScroll({
width: '100%',
height: '20vh',
touchScrollStep: 90
});
document.getElementsByTagName("body")[0].style.color = Session.get("user").preferences.theme.textColor; document.getElementsByTagName("body")[0].style.color = Session.get("user").preferences.theme.textColor;
}; };
@ -229,6 +224,11 @@ Template.main.helpers({
Session.set("newWork", false); Session.set("newWork", false);
Session.set("currentWork", work.findOne({_id: event.id})); Session.set("currentWork", work.findOne({_id: event.id}));
$(".overlay").fadeIn(150); $(".overlay").fadeIn(150);
$("#comment").slimScroll({
width: '100%',
height: '20vh',
touchScrollStep: 90
});
}, },
eventMouseover: function(event, jsEvent, view) { eventMouseover: function(event, jsEvent, view) {
this.style.boxShadow = "inset 0 0 0 99999px rgba(255,255,255,0.2)"; this.style.boxShadow = "inset 0 0 0 99999px rgba(255,255,255,0.2)";
@ -350,6 +350,11 @@ Template.main.events({
Session.set("newWork", true); Session.set("newWork", true);
Session.set("currentWork",{class: attr, dueDate: (new Date((new Date()).valueOf() + 1000*3600*24))}); Session.set("currentWork",{class: attr, dueDate: (new Date((new Date()).valueOf() + 1000*3600*24))});
$(".overlay").fadeIn(150); $(".overlay").fadeIn(150);
$("#comment").slimScroll({
width: '100%',
height: '20vh',
touchScrollStep: 90
});
}, },
'click .fa-check-circle-o' () { // Confirmation Button 'click .fa-check-circle-o' () { // Confirmation Button
sendData(confirm); sendData(confirm);
@ -393,6 +398,11 @@ Template.main.events({
} }
} }
$(".overlay").fadeIn(150); $(".overlay").fadeIn(150);
$("#comment").slimScroll({
width: '100%',
height: '20vh',
touchScrollStep: 90
});
}, },
'click #requestSubmit' () { 'click #requestSubmit' () {
var area = document.getElementById("requestArea"); var area = document.getElementById("requestArea");

18
hourglass/server/main.js
View File

@ -429,7 +429,7 @@ Meteor.methods({
_id: classId _id: classId
}); });
var security = securityCheck([1, [5, 8, 9, true], false], var security = securityCheck([1, [5, 8, 9, true], false],
Object.assign(foundclass || {}, {userId: found._id})); Object.assign({}, foundclass || {}, {userId: found._id}));
if (!security) { if (!security) {
classes.update({ classes.update({
_id: classId _id: classId
@ -452,7 +452,7 @@ Meteor.methods({
_id: classId _id: classId
}); });
var security = securityCheck([1, [[5, [13, 22, true], false], 9, 21, true], false], var security = securityCheck([1, [[5, [13, 22, true], false], 9, 21, true], false],
Object.assign(foundclass, {userlist: userlist})); Object.assign({}, foundclass, {userlist: userlist}));
if (!security) { if (!security) {
if (_.contains(foundclass[userlist], userId)) { if (_.contains(foundclass[userlist], userId)) {
foundclass[userlist] = _.without(foundclass[userlist], userId); foundclass[userlist] = _.without(foundclass[userlist], userId);
@ -506,9 +506,9 @@ Meteor.methods({
_id: input.class _id: input.class
}); });
var security = securityCheck([[[8, 9, true], 16, false], 10, 20, 11, 12, true], var security = securityCheck([[[8, 9, true], 16, false], 10, 20, 11, 12, true],
Object.assign(found || {}, input, {userId: Meteor.userId()})); Object.assign({}, found || {}, input, {userId: Meteor.userId()}));
if (!security) { if (!security) {
input = Object.assign(input, {confirmations: [Meteor.userId()], reports: [], done: [], numberdone: 0, comments: []}); input = Object.assign({}, input, {confirmations: [Meteor.userId()], reports: [], done: [], numberdone: 0, comments: []});
work.insert(input); work.insert(input);
} else { } else {
throw new Meteor.Error(errors[security]); throw new Meteor.Error(errors[security]);
@ -523,7 +523,7 @@ Meteor.methods({
_id: currentwork.class _id: currentwork.class
}); });
var security = securityCheck([[1, 16, 13, 5, false], 11, 12, 10, 20, true], var security = securityCheck([[1, 16, 13, 5, false], 11, 12, 10, 20, true],
Object.assign(currentclass || {}, currentwork, {description: change.description, name: change.name, dueDate: change.dueDate, type: change.type})); Object.assign({}, currentclass || {}, currentwork, {description: change.description, name: change.name, dueDate: change.dueDate, type: change.type}));
if (!security) { if (!security) {
work.update({ work.update({
_id: change._id _id: change._id
@ -550,7 +550,7 @@ Meteor.methods({
}); });
var user = Meteor.userId(); var user = Meteor.userId();
var security = securityCheck([15, [16, [8, 9, true], false]], var security = securityCheck([15, [16, [8, 9, true], false]],
Object.assign(workobject, currentclass || {}, {userId: user, comment: comment})); Object.assign({}, workobject, currentclass || {}, {userId: user, comment: comment}));
if (!security) { if (!security) {
var commentInfo = { var commentInfo = {
"comment": comment, "comment": comment,
@ -578,7 +578,7 @@ Meteor.methods({
_id: workobject.class _id: workobject.class
}); });
var security = securityCheck([[16, 9, false], 23, true], var security = securityCheck([[16, 9, false], 23, true],
Object.assign(workobject, currentclass || {}, {userId: Meteor.userId(), toggle: input[1]})); Object.assign({}, workobject, currentclass || {}, {userId: Meteor.userId(), toggle: input[1]}));
if (!security) { if (!security) {
var userindex = workobject[input[1]].indexOf(Meteor.userId()); var userindex = workobject[input[1]].indexOf(Meteor.userId());
if (userindex === -1) { if (userindex === -1) {
@ -610,7 +610,7 @@ Meteor.methods({
_id: currentwork.class _id: currentwork.class
}); });
var security = securityCheck([1, 16, 13, 5, false], var security = securityCheck([1, 16, 13, 5, false],
Object.assign(currentwork, currentclass || {})); Object.assign({}, currentwork, currentclass || {}));
if (!security) { if (!security) {
work.remove({ work.remove({
_id: workId _id: workId
@ -694,7 +694,7 @@ Meteor.methods({
_id: change _id: change
}); });
var security = securityCheck([17, [5, 24, false], 18, true], var security = securityCheck([17, [5, 24, false], 18, true],
Object.assign(found, {userId: Meteor.userId(), pass: pass})); Object.assign({}, found, {userId: Meteor.userId(), pass: pass}));
if (!security) { if (!security) {
var foundsubs = found.subscribers; var foundsubs = found.subscribers;
classes.update({ classes.update({