From a6fc7f618cc2ebbda92fe237329aef92e35d239f Mon Sep 17 00:00:00 2001
From: Kenneth Jao <ksjdragon@gmail.com>
Date: Thu, 13 Apr 2017 02:11:31 -0400
Subject: [PATCH] Added shortname for display, changed description max length
 to 300

---
 hourglass/client/mobile/mobile.css  | 6 +++---
 hourglass/client/mobile/mobile.html | 6 +++---
 hourglass/client/mobile/mobile.js   | 3 ++-
 hourglass/server/main.js            | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/hourglass/client/mobile/mobile.css b/hourglass/client/mobile/mobile.css
index 982de9e..5f8423d 100644
--- a/hourglass/client/mobile/mobile.css
+++ b/hourglass/client/mobile/mobile.css
@@ -54,7 +54,7 @@
 
 #mobileBody {
 	width: 100%;
-	height: 92%;
+	height: 91%;
 	margin-bottom: 10%;
 	overflow-y: auto;
 	overflow-x: hidden;
@@ -126,12 +126,12 @@
 
 .mName {
 	font-size: 4.3vw !important;
-	width: 50%;
+	width: 70%;
 }
 
 .mDate {
 	font-size: 3.4vw !important;
-	width: 48%;
+	width: 28%;
 	text-align: right;
 }
 
diff --git a/hourglass/client/mobile/mobile.html b/hourglass/client/mobile/mobile.html
index 98399a5..ebc9bcb 100644
--- a/hourglass/client/mobile/mobile.html
+++ b/hourglass/client/mobile/mobile.html
@@ -192,7 +192,7 @@
 		<input id="type" class="mAddForm" form="type" placeholder="Type" value="{{work 'type'}}" readonly>
 		<i class="fa fa-angle-down" aria-hidden="true"></i>
 	</div>
-	<textarea id="description" class="mAddForm restrict" form="description" rows="8" maxLength="150" placeholder="Description"></textarea>
+	<textarea id="description" class="mAddForm restrict" form="description" rows="8" maxLength="300" placeholder="Description"></textarea>
 	<div id="mRestrictText">
 		<span class="resText">{{restrict 'name'}}</span>
 		<span class="resText">{{restrict 'description'}}</span>
@@ -211,7 +211,7 @@
 		<input id="type" class="mAddForm" form="type" placeholder="Type" value="{{work 'type'}}"  onfocus="this.blur()" readonly>
 		<i class="fa fa-angle-down" aria-hidden="true"></i>
 	</div>
-	<textarea id="description" class="mAddForm restrict" form="description" rows="8" maxLength="150" placeholder="Description" value="{{work 'description'}}"></textarea>
+	<textarea id="description" class="mAddForm restrict" form="description" rows="8" maxLength="300" placeholder="Description" value="{{work 'description'}}"></textarea>
 	<div id="mRestrictText"> 
 		<span class="resText">{{restrict 'name'}}</span>
 		<span class="resText">{{restrict 'description'}}</span>
@@ -236,7 +236,7 @@
 	<div id="typeCont">
 		<input id="type" class="mAddForm" form="type" placeholder="Type" value="{{work 'type'}}" onfocus="this.blur()" readonly>
 	</div>
-	<textarea id="description" class="mAddForm restrict" form="description" rows="8" maxLength="150" placeholder="Description" value="{{work 'description'}}" onfocus="this.blur()" readonly></textarea>
+	<textarea id="description" class="mAddForm restrict" form="description" rows="8" maxLength="300" placeholder="Description" value="{{work 'description'}}" onfocus="this.blur()" readonly></textarea>
 	<div id="mRestrictText"> 
 		<span class="resText">{{restrict 'name'}}</span>
 		<span class="resText">{{restrict 'description'}}</span>
diff --git a/hourglass/client/mobile/mobile.js b/hourglass/client/mobile/mobile.js
index 045e012..a354595 100644
--- a/hourglass/client/mobile/mobile.js
+++ b/hourglass/client/mobile/mobile.js
@@ -692,8 +692,9 @@ mobileWork = function() {
 			var classid = array[i].thisClassWork[j].classid;
 			var desc = array[i].thisClassWork[j].description;
 			if(desc) {
-				array[i].thisClassWork[j].shortdesc = (desc.length <= 40 ) ? desc : desc.substring(0,20) +"...";
+				array[i].thisClassWork[j].shortdesc = (desc.length <= 30 ) ? desc : desc.substring(0,30) + "...";
 			}
+			array[i].thisClassWork[j].shortname = (name.length <= 20) ? name : name.substring(0,20) + "...";
 			array[i].thisClassWork[j]["class"] = (classid === Meteor.userId()) ? "Personal" : classes.findOne({_id:classid}).name;
 			if(_.contains(array[i].thisClassWork[j].done, Meteor.userId())) {
 				array[i].thisClassWork[j].isDone = true;
diff --git a/hourglass/server/main.js b/hourglass/server/main.js
index 621ea87..18ee71c 100644
--- a/hourglass/server/main.js
+++ b/hourglass/server/main.js
@@ -248,7 +248,7 @@ function securityCheck(checklist, input) {
             break;
         // Description too long
         case 12:
-            if ((typeof input.description !== "string" || input.description.length > 150) && input.description !== undefined) error = 11;
+            if ((typeof input.description !== "string" || input.description.length > 300) && input.description !== undefined) error = 11;
             break;
         // Moderator of class
         case 13: