diff --git a/.meteor/packages b/.meteor/packages
index 405bbcf..7a657db 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -18,7 +18,7 @@ standard-minifier-css@1.5.2 # CSS minifier run for production mode
standard-minifier-js@2.4.0 # JS minifier run for production mode
es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers.
poorvavyas:es6-shim
-ecmascript@0.12.3 # Enable ECMAScript2015+ syntax in app code
+ecmascript@0.12.4 # Enable ECMAScript2015+ syntax in app code
#accounts-ui
#accounts-base
diff --git a/.meteor/release b/.meteor/release
index 2299ae7..91e05fc 100644
--- a/.meteor/release
+++ b/.meteor/release
@@ -1 +1 @@
-METEOR@1.8.0.1
+METEOR@1.8.0.2
diff --git a/imports/startup/client/routes.js b/imports/startup/client/routes.js
index 2842ec2..d45df17 100644
--- a/imports/startup/client/routes.js
+++ b/imports/startup/client/routes.js
@@ -211,4 +211,16 @@ pub.route("/CurrentBoard", {
require("/imports/ui/EditablePage.js");
BlazeLayout.render("Public", {content: "EditablePage"});
}
+});
+
+// Fix stale routes in Google's search index from old site. Redirect to home.
+pub.route('/!/*', {
+ action: function(params, queryParams) {
+ FlowRouter.go("/");
+ }
+});
+pub.route('/!', {
+ action: function(params, queryParams) {
+ FlowRouter.go("/");
+ }
});
\ No newline at end of file
diff --git a/imports/ui/Admin/PageEditor.js b/imports/ui/Admin/PageEditor.js
index da3b2ae..3b81808 100644
--- a/imports/ui/Admin/PageEditor.js
+++ b/imports/ui/Admin/PageEditor.js
@@ -156,7 +156,7 @@ Template.PageEditor.onRendered(function() {
borderCollapse: "collapse"
},
insert_toolbar: 'quicktable', //image
- selection_toolbar: 'bold italic | h1 h2 h3 | blockquote quicklink',
+ selection_toolbar: 'bold italic | h1 h2 h3 | blockquote link',
contextmenu: 'InsertImage | inserttable | cell row column deletetable', //image
contextmenu_never_use_native: false,
diff --git a/imports/ui/Home.html b/imports/ui/Home.html
index 7ad15c6..8622b08 100644
--- a/imports/ui/Home.html
+++ b/imports/ui/Home.html
@@ -1,46 +1,64 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{> Template.dynamic template=content}}
diff --git a/imports/ui/layouts/Public.import.styl b/imports/ui/layouts/Public.import.styl
index 26e27ec..4a83ce6 100644
--- a/imports/ui/layouts/Public.import.styl
+++ b/imports/ui/layouts/Public.import.styl
@@ -8,6 +8,7 @@
background: #FDFDFD
.topBar
+ display: relative
.logoLeft
cursor: pointer
z-index: 1
@@ -23,7 +24,8 @@
.menuBar
list-style-type:none
margin: 15px 0 0 0
- padding:0
+ padding: 0
+ margin-right: 10px
overflow:hidden
display: inline-block
float: right
@@ -43,10 +45,58 @@
a.active
color: #777777
cursor: default
+ .dropMenu
+ display: none
+ position: absolute
+ width: 100%
+ z-index: 9999
+ background: #d8e3f6
+ height: 104px
+ margin: 0 0 10px 0
+ padding-top: 2px
+ color: white
+ a
+ display: block
+ color: #226699
+ font-family: Corbel, "Helvetica Neue", Helvetica, Arial, sans-serif
+ font-size: 18px
+ font-weight: 800
+ line-height: 19px
+ text-align: left
+ text-decoration: none
+ padding: 2px 0 2px 6px
+ margin: 2px 0
+ a:hover
+ color: white
+ background-color: #226699
+ a:active
+ color: #AAA
+ p
+ color: #DDF
+ font-family: Georgia, serif
+ font-size: 10px
+ text-indent: 0
+ text-wrap: none
+ line-height: 10px
+ margin: 0 0 2px 0
+ padding: 0
+ .leftMenu
+ position: absolute
+ left:0
+ width: 50%
+ div
+ max-height: 30px
+ .rightMenu
+ position: absolute
+ left:50%
+ right:0
+ div
+ max-height: 30px
.theKey
color: #269
-
+ margin-top: 2px
+ margin-left: 4px
.footer
text-align: center
padding-bottom: 40px
@@ -67,7 +117,11 @@
text-transform: uppercase
font-size: 10px
- @media(max-width: 549px)
+ // Some media settings for the MENU
+ // Small Screens
+ @media(max-width: 699px)
+ .dropMenu
+ visibility: visible
.level1, .level2
display: none
#page
@@ -109,19 +163,11 @@
opacity: .7
color: black
border-bottom: 1px solid red
- .copyright
- font-size: 7px
- .byline
- float: left
- clear: both
- text-align: left
- font-size: 7px
- .footer
- font-size: 7px
- text-align: left
-
- // Large Screens
- @media(min-width: 550px)
+ // Large Screens (MENU)
+ @media(min-width: 700px)
+ .dropMenu
+ display: none
+ visibility: hidden
.barButton
display: none
#page
@@ -169,4 +215,39 @@
opacity: 1
color: black
background: transparent
- border-bottom: 3px solid #a20010
\ No newline at end of file
+ border-bottom: 3px solid #a20010
+
+ //Some settings for the FOOTER
+ @media(max-width: 800px)
+ .copyright
+ font-size: 10px
+ .byline
+ float: left
+ clear: both
+ text-align: left
+ font-size: 10px
+ .footer
+ font-size: 10px
+ text-align: left
+ @media(max-width: 600px)
+ .copyright
+ font-size: 8px
+ .byline
+ float: left
+ clear: both
+ text-align: left
+ font-size: 8px
+ .footer
+ font-size: 8px
+ text-align: left
+ @media(max-width: 500px)
+ .copyright
+ font-size: 7px
+ .byline
+ float: left
+ clear: both
+ text-align: left
+ font-size: 7px
+ .footer
+ font-size: 7px
+ text-align: left
\ No newline at end of file
diff --git a/imports/ui/layouts/Public.js b/imports/ui/layouts/Public.js
index 65a7e30..6224928 100644
--- a/imports/ui/layouts/Public.js
+++ b/imports/ui/layouts/Public.js
@@ -2,5 +2,7 @@ import { Template } from 'meteor/templating';
import './Public.html';
Template.Public.events({
-
+ 'click .barButton': function(event, template) {
+ template.$('.dropMenu').toggle();
+ }
});
\ No newline at end of file
diff --git a/public/forms/Jr_High_Summer_Application.pdf b/public/forms/Jr_High_Summer_Application.pdf
new file mode 100644
index 0000000..b9cf672
Binary files /dev/null and b/public/forms/Jr_High_Summer_Application.pdf differ
diff --git a/public/forms/Jr_High_Summer_Application_Guidelines.pdf b/public/forms/Jr_High_Summer_Application_Guidelines.pdf
new file mode 100644
index 0000000..ee1eb28
Binary files /dev/null and b/public/forms/Jr_High_Summer_Application_Guidelines.pdf differ
+