Updated

client/main.styl

@@ -204,8 +204,8 @@ h3
 @import "../imports/ui/Scholarships.import.styl"
 @import "../imports/ui/SecondChance.import.styl"
 @import "../imports/ui/Fellowships.import.styl"
-@import "../imports/ui/News&Notices.import.styl"
+//@import "../imports/ui/News&Notices.import.styl"
-@import "../imports/ui/PhotoGallery.import.styl"
+@import "../imports/ui/NewsAndPhotos.import.styl"
 @import "../imports/ui/JrHighSummer.import.styl"
 @import "../imports/ui/Support.import.styl"
 @import "../imports/ui/CurrentBoard.import.styl"

imports/startup/client/routes.js

@@ -200,11 +200,11 @@ pub.route("/SecondChance", {
 		BlazeLayout.render("Public", {content: "SecondChance"});
 	}
 });
-pub.route("/PhotoGallery", {
+pub.route("/NewsAndPhotos", {
-	name: 'PhotoGallery',
+	name: 'NewsAndPhotos',
 	action: function(params, queryParams) {
-		require("/imports/ui/PhotoGallery.js");
+		require("/imports/ui/NewsAndPhotos.js");
-		BlazeLayout.render("Public", {content: "PhotoGallery"});
+		BlazeLayout.render("Public", {content: "NewsAndPhotos"});
 	}
 });
 pub.route("/JrHighSummer", {

imports/ui/Grants.html

@@ -14,20 +14,21 @@
 		<div id="grantRecipientGuidelines" class="recipientGuidelinesToggle grantGuidelinesContent" style="display:none">
 			<h4 class="proposalFormat">Proposals <em>should</em>:</h4>
 			<ol class="listFormat">
-				<li>enhance and enrich the skills, knowledge and creative abilities of the youth involved.</li>
+				<li>enhance and enrich the skills, knowledge and creative abilities of the youth involved;</li>
-				<li>describe the objective and goals</li>
+				<li>describe the objective and goals;</li>
-				<li>define a budget for the various components</li>
+				<li>define a budget for the various components;</li>
-				<li>specify how many students will be benefitting</li>
+				<li>specify how many students will be benefitting;</li>
-				<li>name a qualified individual or individuals responsible for student oversight and implementation</li>
+				<li>name a qualified individual or individuals responsible for student oversight and implementation;</li>
-				<li>include background or added information that will aid AVEF members in making a decision</li>
+				<li>include background or added information that will aid AVEF members in making a decision;</li>
-				<li>indicate the name or organization that a check should be written to</li>
+				<li>indicate the name or organization that a check should be written to;</li>
-				<li>indicate the address that a check should be mailed to</li>
+				<li>indicate the address that a check should be mailed to;</li>
-				<li>indicate if there are any deadlines AVEF should know about</li>
+				<li>indicate if there are any deadlines AVEF should know about; and</li>
+                <li>please provide the name and contact information for the person who will be responsible for sending pictures to the AVEF.</li>
 			</ol>
 			<h4 class="proposalFormat">Proposals <em>should not</em>:</h4>
 			<ol class="listFormat">
-				<li>duplicate curricular work of the Anderson Valley Schools</li>
+				<li>duplicate curricular work of the Anderson Valley Schools; and</li>
-				<li>involve recreation or sports activities</li>
+				<li>involve recreation or sports activities.</li>
 			</ol>
 		</div>
 		<h3 class="relevantLinks proposalFormat">Relevant Links</h3>

imports/ui/Home.html

@@ -33,9 +33,9 @@
 				</div>
 				<div class="cellTile">
 					<div class="cellContent">
-						<div class="menuText">News &amp; Photo</div>
+						<div class="menuText">News &amp; Photos</div>
                         <div id="newsHeaderTimestampDiv" class="menuTimestamp">{{newsDate}}</div>
-						<a href="{{pathFor 'PhotoGallery'}}"><img src='./images/buckeye_seed_v2.jpg'/></a>
+						<a href="{{pathFor 'NewsAndPhotos'}}"><img src='./images/buckeye_seed_v2.jpg'/></a>
 					</div>
 				</div>
 			</div>

imports/ui/News&Notices.html

@@ -1,5 +0,0 @@
-<template name="NewsNotices">
-	<div id="newsNotices" class="textView">
-		{{{newsHTML}}}
-	</div>
-</template>

imports/ui/News&Notices.import.styl

@@ -1,21 +0,0 @@
-#newsView
-	display: block
-
-#newsNotices p, #newsEditor p
-	font-family: Palatino, "Palatino Linotype", "Palatino LT STD", "Book Antiqua", Georgia, serif
-	font-size: 16px
-	margin: 16px 0
-
-#newsNotices h2, #newsEditor h2
-	font-family: "Arial Black", "Arial Bold", Gadget, sans-serif
-	font-size: 19px
-	text-transform: uppercase
-	background-color: #EEE
-	font-weight: bold
-	padding-left: 40px
-
-#newsNotices h4, #newsEditor h4
-	font-family: "Century Gothic", CenturyGothic, AppleGothic, sans-serif
-	font-size: 16px
-	font-weight: 800
-	clear: left

imports/ui/News&Notices.js

@@ -1,13 +0,0 @@
-import './News&Notices.html';
-
-Tracker.autorun(function() {
-	Meteor.subscribe("pages");
-});
-
-Template.NewsNotices.helpers({
-	newsHTML: function() {
-		let doc = Meteor.collections.Pages.findOne({name: 'News'});
-
-		return doc === undefined ? "" : doc.html;
-	}
-});

imports/ui/NewsAndPhotos.html

@@ -1,5 +1,5 @@
-<template name="PhotoGallery">
+<template name="NewsAndPhotos">
-    <div id="photoGalleryView">
+    <div id="newsAndPhotosView">
         <div class="textView newsNotices">
             {{{newsHTML}}}
         </div>

imports/ui/NewsAndPhotos.import.styl

@@ -1,4 +1,4 @@
-#photoGalleryView
+#newsAndPhotosView
 	.textView
 		clear: both
 	.intro

imports/ui/NewsAndPhotos.js

@@ -1,5 +1,5 @@
 
-import './PhotoGallery.html';
+import './NewsAndPhotos.html';
 
 let PREFIX = "PhotoGallery_";
 
@@ -8,11 +8,11 @@ Tracker.autorun(function() {
 	Meteor.subscribe("slideshow");
 });
 
-Template.PhotoGallery.onCreated(function() {
+Template.NewsAndPhotos.onCreated(function() {
 	let template = this;
 	this.slideshows = Meteor.collections.Slideshow.find({}, {sort: {name: 1}});
 });
-Template.PhotoGallery.events({
+Template.NewsAndPhotos.events({
 	'click .galleryLink': function(event, template) {
 		let slideshowId = $(event.target).data("slideshow-id");
 		let slideshow = slideshowId ? Meteor.collections.Slideshow.findOne(slideshowId) : undefined;
@@ -21,7 +21,7 @@ Template.PhotoGallery.events({
 	}
 });
 
-Template.PhotoGallery.helpers({
+Template.NewsAndPhotos.helpers({
 	editableHTML: function() {
 		let doc = Meteor.collections.Pages.findOne({name: "Slideshow"});
 		

imports/ui/Programs.html

@@ -14,6 +14,8 @@
 			<p>This program allows high school juniors to apply for a summer educational opportunity outside of Anderson Valley. The program of interest can be located within the United States or even abroad. AVEF will support fees, transportation, living expenses and incidentals. Students must complete the AVEF application before the deadline and interview with our selection committee. The application form is available on this web site. This program is competitive and open to current juniors only. (<a class="{{isActiveRoute 'Fellowships'}}" href="{{pathFor 'Fellowships'}}">more...</a>)</p>
 			<h4>Jr High Summer</h4>
 			<p>This program is an opportunity for students in 6th, 7th and 8th grade to gain new experiences during the summer. There are a wide variety of camps to choose from ranging from academic subjects (e.g. science exploration) to the arts (e.g. dance and theater) to sports. Students must complete and submit an application. (<a class="{{isActiveRoute 'JrHighSummer'}}" href="{{pathFor 'JrHighSummer'}}">more...</a>)</p>
+            <h4>Second Chance</h4>
+            <p>Second Chance is a scholarship program designed for students 26 or under who either, a) decided to delay post high school education or, b) may need some additional support to complete their educational program. The scholarship can be used for college, university or a vocational program. They will be awarded based on previous school experience, personal and educational goals and the quality of the essay submitted with the application. (<a class="{{isActiveRoute 'SecondChance'}}" href="{{pathFor 'SecondChance'}}">more...</a>) </p>
 		</div>
 	</div>
 </template>

imports/ui/SecondChance.html

@@ -16,7 +16,7 @@
 		</div>
 		<h3 class="recipientGuidelines">Recipient Guidelines <a class="headingShowHide recipientGuidelinesToggle" onclick="javascript: $('#secondChanceView .recipientGuidelinesToggle').toggle();">(Show)</a><a class="headingShowHide recipientGuidelinesToggle" style="display:none" onclick="javascript: $('#secondChanceView .recipientGuidelinesToggle').toggle();">(Hide)</a></h3>
 		<div class="recipientGuidelinesToggle">
-			<p class="recipientGuidelinesContent">Guidelines to assist who have already been awarded an Anderson Valley Education Foundation Second Chance Scholarship...</p>
+			<p class="recipientGuidelinesContent">The purpose of these guidelines is to assist students who have been awarded an AVEF Second Chance Scholarship.</p>
 		</div>
 		<div id="scholarshipRecipientGuidelines" class="recipientGuidelinesToggle" style="display:none">
 			<p class="paragraphOne">The purpose of these guidelines is to assist students who have been awarded an AVEF Second Chance Scholarship. You may receive your scholarship in one lump sum, or it may be split into two equal payments. That will depend on your circumstances. If it is split into two, it is typically to provide support for two semesters or quarters. In order to receive these checks please take note of the following deadlines and requirements.</p>