Merge pull request #21 from berkmancenter/dev

Merge branch 'dev' for v0.4 release

.meteor/packages

@@ -13,3 +13,4 @@ linto:jquery-ui
 steeve:reactive-cookie
 email
 meteorhacks:fast-render
+todda00:friendly-slugs

.meteor/versions

@@ -11,6 +11,7 @@ [email protected]
 [email protected]
 [email protected]
 chuangbo:[email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -36,6 +37,7 @@ linto:[email protected]
 [email protected]
 [email protected]
 [email protected]
+matb33:[email protected]
 [email protected]
 [email protected]
 meteorhacks:[email protected]
@@ -62,6 +64,7 @@ [email protected]
 [email protected]
 steeve:[email protected]
 [email protected]
+todda00:[email protected]
 [email protected]
 [email protected]
 [email protected]

client/styles/global.css

@@ -12,7 +12,6 @@ body {
 
 * {
 	text-indent:0px!important;
-	font-weight:normal!important;
 }
 
 a {
@@ -156,7 +155,7 @@ div #wrapper {
     bottom: 0;
 	right:0;
 	left:0;
-	opacity:.6;
+	opacity:.9;
 	overflow:hidden;
 	z-index:999999999999999;
 	cursor:pointer;

client/views/add/add.js

@@ -1,11 +1,11 @@
 Template.add.onCreated(function () {
 	// Checks whether the user has a valid table cookie
-	Meteor.call('listCookieCheck', Session.get("tablename"), function (error, result) {
+	Meteor.call('listCookieCheck', Session.get("id"), function (error, result) {
 		if(!result) {
 			// If not, return the user to the chooser page
 			window.location.href = "/";
 		} else {
-			Meteor.call('adminCheck', Session.get("tablename"), function (error, result) {
+			Meteor.call('adminCheck', Session.get("id"), function (error, result) {
 				if(!result) {
 					// If not, return the user to the chooser page
 					window.location.href = "/";
@@ -66,7 +66,7 @@ Template.add.events({
 	},
 	"click .removebutton": function(event, template) {
 		var mod = event.currentTarget.previousElementSibling.value;
-		Meteor.call('removeMods', mod, Session.get("tablename"));
+		Meteor.call('removeMods', mod, Session.get("id"));
 	},
 	// When the submit button is clicked...
 	"click #modsdonebutton": function(event, template) {
@@ -78,7 +78,15 @@ Template.add.events({
 				mods.push(modsInput[m].value);
 			}
 		}
-		Meteor.call('addMods', mods, Session.get("tablename"), function(error, result) {
+		Meteor.call('addMods', mods, Session.get("id"), function(error, result) {
+			console.log(Meteor.user().emails[0].address);
+			for(var m = 0; m < mods.length; m++) {
+				Meteor.call('sendEmail',
+				            mods[m],
+				            Meteor.user().emails[0].address,
+				            'You have been added as a moderator on Question Tool',
+				            Meteor.user().profile.name + ' added you as a moderator on Question Tool. You are able to modify, combine, and hide questions. You must use this email address when registering to be considered a moderator.');
+			}
 			// If the result is an object, there was an error
 			if(typeof result === 'object') {
 				// Alert the error

client/views/combine/combine.js

@@ -6,7 +6,7 @@ Template.combine.onCreated(function () {
 			window.location.href = "/";
 		} else {
 			// Checks whether the current user has admin privileges
-			Meteor.call('adminCheck', Session.get("tablename"), function (error, result) {
+			Meteor.call('adminCheck', Session.get("id"), function (error, result) {
 				if(!result) {
 					// If not, redirects back to the list page
 					window.location.href = "/list";
@@ -44,7 +44,7 @@ Template.combine.events({
 		// Calls the combine function on the server to update the DBs
 		var id2 = Template.instance().data.second;
 		var id1 = Template.instance().data.first;
-		Meteor.call('combine', question, id1, id2, Session.get("tablename"), function (error, result) { 
+		Meteor.call('combine', question, id1, id2, Session.get("id"), function (error, result) { 
 			// If successful
 			if(!error) {
 				// Hides the second question (combined -> first)

client/views/create/create.js

@@ -56,11 +56,13 @@ Template.create.events({
 		if(!Meteor.user()) {
 			return false;
 		}
+		//document.getElementById("buttonarea").disabled = true;
 		var anonElement = document.getElementById("allowanoncheck");
+		var anonymous;
 		if(anonElement.style.display) {
-			var anonymous = (anonElement.style.display != "none");
+			anonymous = (anonElement.style.display != "none");
 		} else {
-			var anonymous = false;
+			anonymous = false;
 		}
 		// Retrieve data from the form
 		var tablename = document.getElementById("instancenameinput").value;
@@ -111,14 +113,13 @@ Template.create.events({
 					"description": "Please enter a valid description under 255 characters.",
 					"modlength": "You have entered too many moderators. Please try again."/*,
 					"password": "Please enter a valid password using letters, numbers, *, #, @, and between 4 and 10 characters."*/
-				}
+				};
 				// Alert the error
 				showCreateError(errorCodes[result[0].name]);
 				return false;
 			} else {
 				// Redirects to the newly-created table's list page
 				Blaze.remove(dropDownTemplate);
-				Router.go("/list/" + result);
 			}
 		});
 	},
@@ -140,4 +141,14 @@ Template.create.events({
 			last.previousSibling.focus();
 		}
 	}
-});
+});
+
+function showCreateError(reason) {
+	if(typeof currentError != "undefined") {
+		Blaze.remove(currentError);
+		document.getElementById("buttonarea").disabled = false;
+	}
+	var parentNode = document.getElementById("creatediv");
+	var nextNode = document.getElementById("instancebottominputcontainer");
+	currentError = Blaze.renderWithData(Template.form_error, reason, parentNode, nextNode);
+}

client/views/credits/credits.css

@@ -1,17 +1,42 @@
 #creditstext {
-	color:#777777;
-	font-family:regular;
-	text-align:center;
-	font-size:14px;
-	display:block;
-	margin:0px auto;
-	padding:0px;
-	line-height:1.5em;
-	width:80%;
-	margin-top:25px;
-	margin-bottom:35px;
+	color: #777777;
+	font-family: regular;
+	text-align: center;
+	font-size: 14px;
+	display: block;
+	margin: 0 auto;
+	padding: 0;
+	line-height: 1.5em;
+	width: 80%;
+	margin-top: 25px;
+	margin-bottom: 35px;
 }
 
 #creditstext a {
 	text-decoration:underline;
+}
+
+.creditsformcontainer {
+	position: fixed;
+	background-color:black;
+    top: 1%;
+	left: 30%;
+	width: 40%;
+	opacity:.9;
+	overflow:hidden;
+	z-index:999999999999999;
+	cursor:pointer;	
+}
+
+@media screen and (max-width: 667px) {
+    .creditsformcontainer {
+	background-color:black;
+    top: 0;
+	left: 0;
+	width: 100%;
+	opacity:.9;
+	overflow:hidden;
+	z-index:999999999999999;
+	cursor:pointer;	
+}
 }

client/views/credits/credits.html

@@ -1,76 +1,53 @@
 <template name="credits">
-	<div id="darker">
-	</div>
 	<div class="creditsformcontainer">
 		{{> close_button}}
 		<h1 class="formtitle">About Question Tool</h1>
 		<div id="creditstext">
 			<span class="boldcreditstext">Version:</span>
 			<br/>
-			1.6
+			0.4
 			<br/>
 			<br/>
 			Source:
 			<br/>
-			<a href="#" target="_blank">Github Repository</a>
+			<a href="https://github.com/berkmancenter/question_tool" target="_blank">Github Repository</a>
 			<br/>
 			<br/>
 			<span class="boldcreditstext">Thanks to:</span>
 			<br/>
-			Dan Collis-Puro - First Lead Developer
+			<a href="http://twitter.com/nickrubin" target="_blank">Nick Rubin</a> - JS version Developer
+			<br/>
+			Dan Cohen - PHP version Developer
+			<br/>
+			David Russcol - PHP version Developer
 			<br/>
-			Justin Clark - Second Lead Developer
+			Jonathan Zittrain - Father of the Question Tool
 			<br/>
-			Tomas Reimers - Developer
+			<a href="https://cyber.law.harvard.edu" target="_blank">The Berkman Center for Internet & Society</a> - Hosting, Funding and Support
 			<br/>
-			Brian 'Phunk' Gadoury - Developer
+			<a href="http://law.harvard.edu/about/administration/its/">HLS ITS</a> - Support
 			<br/>
 			<br/>
 			<span class="creditstitle">Bugs</span>
 			<br/>
-			Please report them to the <a href="#" target="_blank">github issue tracker</a>.
+			Please report them to the <a href="https://github.com/berkmancenter/question_tool/issues" target="_blank">github issue tracker</a>.
 			<br/>
 			<br/>
 			<span class="creditstitle">Administrative</span>
 			<span class="boldcreditstext">Copyright</span>
 			<br/>
-			© 2011 - 2015 President and Fellows of Harvard College
+			© 2015 President and Fellows of Harvard College
 			<br/>
 			<br/>
 			<span class="boldcreditstext">License</span>
 			<br/>
-			Question Tool is licensed under the...
-			<br/>
+			Question Tool is licensed under the <a href="http://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank">GNU General Public License</a>.
+			<!--<br/>
 			<br/>
 			<span class="boldcreditstext">Terms of service</span>
 			<br/>
-			The Question Tool terms of service can be found on the...
+			The Question Tool terms of service needs to be written.
+			-->
 		</div>
 	</div>
 </template>
-
-<!--<template name="credits">
-	<body>
-		<div id="banner">
-			Question Tool Credits
-		</div>
-		<br />
-		<br />
-		<div id="wrapper">							
-			<center>
-				<div class="center">
-					<br/>
-					<p>The question tool was conceived by Professor Jonathan Zittrain and first coded by David Russcol. This version, published in August of 2015, was coded by <a href="http://twitter.com/nickrubin" target="_blank">Nick Rubin</a>. Additional thanks and huge props to Team Nesson and the folks at the Berkman Center, and especially to Denise Grey and Ken Martin and everyone at Harvard Law School ITS.
-						<br />
-					</p>
-					<p>
-						This software is available under the GNU Public License.
-						<br />
-						<br />
-						<a href="/list">Return to the list</a>
-					</p>
-				</div>
-			</center>
-		</div>
-	</body>
-</template>-->

client/views/credits/credits.js

@@ -1,5 +1,11 @@
 Template.credits.onRendered(function() {
 	// Sets the document title when the template is rendered
 	$(".formcontainer").hide().fadeIn(400);
-	$("#darker").hide().fadeIn(400);
+
+});
+
+Template.credits.events({
+	"click .closecontainer": function(event, template) {
+			Blaze.remove(popoverTemplate);
+	}
 });

client/views/footer/footer.js

@@ -2,11 +2,5 @@ Template.footer.events({
 	"click #creditsbutton": function(event, template) {
 		var parentNode = document.getElementById("banner");
 		popoverTemplate = Blaze.render(Template.credits, parentNode);
-	},
-	"click #darker": function(event, template) {
-		$(".formcontainer").fadeOut(400);
-		$("#darker").fadeOut(400, function() {
-			Blaze.remove(popoverTemplate);
-		});
 	}
 });

client/views/helpers/chunks/question_div/question_div.css

@@ -278,7 +278,6 @@
 
 .replybottom {
 	width:340px;
-	height:158px;
 	display:none;
 	margin:0px auto;
 	margin-top:55px;

client/views/helpers/chunks/question_div/question_div.html

@@ -105,13 +105,24 @@
 				{{#if currentUser}}
 					<input type="text" class="replyname" id="name{{_id}}" value="{{currentUser.profile.name}}" readonly>
 					<input type="text" class="replyemail" id="email{{_id}}" value="{{currentUser.emails.[0].address}}" readonly>
+					<div id="checkarea1">
+						<div class="checkarealeft">
+							<div class="checkbox" id="anonbox">
+								<div class="checked" id="anoncheck">
+								</div>
+							</div>
+						</div>
+						<div class="checkarearight">
+							<p class="checkboxlabel">Post as anonymous?</p>
+						</div>
+					</div>
 				{{else}}
 					<input type="text" class="replyname" id="name{{_id}}" value="{{responseName}}" placeholder="Name...">
 					<input type="text" class="replyemail" id="email{{_id}}" value="{{responseEmail}}" placeholder="Email...">
 				{{/if}}
 			</div>
 			<div class="replybottomcheck">
-				<div class="checkarealeft" style="{{#if anonymous}}{{else}}visibility:hidden!important{{/if}}">
+				<div class="checkarealeft" style="{{#if anonymous}}{{else}}display: none{{/if}}">
 					<div class="checkbox" id="replyanonbox" style="{{#if anonymous}}{{else}}visibility:hidden!important{{/if}}">
 						<div class="checked anonchecked" id="{{_id}}">
 						</div>
@@ -130,10 +141,8 @@
 		</div>
 		{{#if adminButtons}}
 			<div class="adminbottom">
-				<!--<a class="hideQuestion" id="{{_id}}">Hide</a>
-				<a href="{{modifylink}}">Modify</a>-->
 				<div class="adminquestionhide" id="{{_id}}">
-					Hide
+					{{#if isDisabled}}Unhide{{else}}Hide{{/if}}
 				</div>
 				<div class="adminquestionmodify" id="{{_id}}">
 					Modify

client/views/helpers/chunks/question_div/question_div.js

@@ -9,4 +9,10 @@ Template.question_div.helpers({
 			return 150;
 		}
 	},
-})
+	isDisabled: function() {
+		if(Questions.findOne({ _id: this._id}).state === "disabled") {
+			return true;
+		}
+		return false;
+	}
+});