Changes that did not get committed. Not sure why.

This commit is contained in:
Wynne Crisman
2019-07-28 13:55:58 -07:00
parent 6fdaf93718
commit 3b1c57e47e
11 changed files with 278 additions and 147 deletions

View File

@@ -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 standard-minifier-js@2.4.0 # JS minifier run for production mode
es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers. es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers.
poorvavyas:es6-shim 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-ui
#accounts-base #accounts-base

View File

@@ -1 +1 @@
METEOR@1.8.0.1 METEOR@1.8.0.2

View File

@@ -211,4 +211,16 @@ pub.route("/CurrentBoard", {
require("/imports/ui/EditablePage.js"); require("/imports/ui/EditablePage.js");
BlazeLayout.render("Public", {content: "EditablePage"}); 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("/");
}
}); });

View File

@@ -156,7 +156,7 @@ Template.PageEditor.onRendered(function() {
borderCollapse: "collapse" borderCollapse: "collapse"
}, },
insert_toolbar: 'quicktable', //image 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: 'InsertImage | inserttable | cell row column deletetable', //image
contextmenu_never_use_native: false, contextmenu_never_use_native: false,

View File

@@ -1,46 +1,64 @@
<template name="Home"> <template name="Home">
<div id="homePage"> <div id="homePage">
<img class="pageHeader" src="/images/header_v2.jpg"/> <div class="pageHeader"><img src="/images/header_v2.jpg"/></div>
<div class="blockContainer"> <div class="blockContainer">
<a class="menuTile grantMenu" href="{{pathFor 'Grants'}}"> <div class="column column1">
<div class="menuHeaderBackground"></div> <div class="cellTile">
<div class="menuHeader">Grants</div> <div class="cellContent">
</a> <div class="menuText">Grants</div>
<a class="menuTile internshipsMenu" href="{{pathFor 'Internships'}}"> <a href="{{pathFor 'Grants'}}"><img src='./images/apple_seed_v2.jpg'/></a>
<div class="menuHeaderBackground"></div> </div>
<div class="menuHeader">Internships</div> </div>
<!--<a style="display: none" href="#!/internship">internship</a>--> <div class="cellTile">
</a> <div class="cellContent">
<a class="menuTile scholarshipsMenu" href="{{pathFor 'Scholarships'}}"> <div class="menuText">News &amp; Notices</div>
<div class="menuHeaderBackground"></div> <div id="newsHeaderTimestampDiv" class="menuTimestamp">{{newsDate}}</div> <!--03/13/18-->
<div class="menuHeader">Scholarships</div> <a href="{{pathFor 'News'}}"><img src='./images/redwood_seed_v2.jpg'/></a>
<!--<a style="display: none" href="#!/scholarship">scholarship</a>--> </div>
</a> </div>
<a class="menuTile fellowshipsMenu" href="{{pathFor 'Fellowships'}}"> </div>
<div class="menuHeaderBackground"></div> <div class="column column2">
<div class="menuHeader">Fellowships</div> <div class="cellTile">
<!--<a style="display: none" href="#!/fellowship">fellowship</a>--> <div class="cellContent">
</a> <div class="menuText internshipsMenu">Internships</div>
<a class="menuTile newsMenu" href="{{pathFor 'News'}}"> <a href="{{pathFor 'Internships'}}"><img src='./images/oak_seed_v2.jpg'/></a>
<div class="menuHeaderBackground"></div> </div>
<div class="menuHeader">News &amp; Notices</div> </div>
<div id="newsHeaderTimestampDiv" class="menuHeaderTimestamp">{{newsDate}}</div> <!--03/13/18--> <div class="cellTile">
<!--<a style="display: none" href="#!/news">news</a>--> <div class="cellContent">
</a> <div class="menuText">Photo Gallery</div>
<a class="menuTile photoGalleryMenu" href="{{pathFor 'PhotoGallery'}}"> <a href="{{pathFor 'PhotoGallery'}}"><img src='./images/buckeye_seed_v2.jpg'/></a>
<div class="menuHeaderBackground"></div> </div>
<div class="menuHeader">Photo Gallery</div> </div>
<!--<a style="display: none" href="#!/gallery">gallery</a>--> </div>
</a> <div class="column column3">
<a class="menuTile jrHighSummerMenu" href="{{pathFor 'JrHighSummer'}}"> <div class="cellTile">
<div class="menuHeaderBackground"></div> <div class="cellContent">
<div class="menuHeader">Jr High Summer</div> <div class="menuText scholarshipsMenu">Scholarships</div>
</a> <a href="{{pathFor 'Scholarships'}}"><img src='./images/maple_seed_v2.jpg'/></a>
<a class="menuTile howCanYouHelpMenu" href="{{pathFor 'HowCanYouHelp'}}"> </div>
<div class="menuHeaderBackground"></div> </div>
<div class="menuHeader">How You Can Help</div> <div class="cellTile">
<!--<a style="display: none" href="#!/support">support</a>--> <div class="cellContent">
</a> <div class="menuText">Jr High Summer</div>
<a href="{{pathFor 'JrHighSummer'}}"><img src='./images/bay_seed_v2.jpg'/></a>
</div>
</div>
</div>
<div class="column column4">
<div class="cellTile">
<div class="cellContent">
<div class="menuText">Fellowships</div>
<a href="{{pathFor 'Fellowships'}}"><img src='./images/fir_seed_v2.jpg'/></a>
</div>
</div>
<div class="cellTile">
<div class="cellContent">
<div class="menuText">How You Can Help</div>
<a href="{{pathFor 'HowCanYouHelp'}}"><img src='./images/madrone_seed_v2.jpg'/></a>
</div>
</div>
</div>
</div> </div>
</div> </div>
</template> </template>

View File

@@ -4,10 +4,12 @@
.pageHeader .pageHeader
margin-bottom: 30px margin-bottom: 30px
width: 100% margin-right: 10px
-webkit-box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.75) img
-moz-box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.75) width: 100%
box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.75) -webkit-box-shadow: 10px 10px 5px 0 rgba(0,0,0,0.75)
-moz-box-shadow: 10px 10px 5px 0 rgba(0,0,0,0.75)
box-shadow: 10px 10px 5px 0 rgba(0,0,0,0.75)
.blockContainer .blockContainer
position: relative position: relative
height: 350px height: 350px
@@ -20,81 +22,85 @@
min-width: 200px min-width: 200px
margin: 0 auto margin: 0 auto
position: relative position: relative
.menuTile .column
width: 225px
height: 140px
position: absolute
top: 0
margin: 0
background-repeat: no-repeat
background-origin: content-box
background-clip: content-box
background-position: center center
background-size: cover
-webkit-box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.75)
-moz-box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.75)
box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.75)
.menuHeader
font-family: "Avant Garde", Avantgarde, "Century Gothic", CenturyGothic, "AppleGothic", sans-serif
font-weight: 800
font-size: 15px
color: black
position: absolute position: absolute
width: 25%
.cellTile
max-width: 240px
//max-height: 140px
position: relative
.cellContent
margin: 0 12px 20px 4px
-webkit-box-shadow: 10px 10px 5px 0 rgba(0,0,0,0.75)
-moz-box-shadow: 10px 10px 5px 0 rgba(0,0,0,0.75)
box-shadow: 10px 10px 5px 0 rgba(0,0,0,0.75)
a
img
width: 100%
vertical-align: top
.menuText
position: absolute
left: 12px
top: -1px
font-family: "Avant Garde", Avantgarde, "Century Gothic", CenturyGothic, "AppleGothic", sans-serif
font-weight: 800
font-size: 15px
color: black
line-height: 27px
height: 0
overflow: visible
pointer-events: none
background: none !important
margin: 0
padding: 0
.menuTimestamp
font-family: "Avant Garde", Avantgarde, "Century Gothic", CenturyGothic, "AppleGothic", sans-serif
font-weight: 800
font-size: 15px
color: white
letter-spacing: -2px
position: absolute
bottom: 30px
right: 16px
line-height: 27px
height: 0
overflow: visible
pointer-events: none
background: none !important
margin: 0
padding: 0
.column1
left: 0 left: 0
top: -1px .column2
right: 0 left: 25%
height: 27px .column3
margin: 0 left: 50%
padding: 0 0 0 6px .column4
.menuHeaderBackground left: 75%
display: none
position: absolute @media(max-width: 800px)
left: 0 .column .cellTile .cellContent
right: 0 .menuText
top: 0 font-size: 12px
height: 24px .menuTimestamp
opacity: 0.25 font-size: 12px
/* filter: alpha(opacity=25); For IE8 and earlier */ @media(max-width: 650px)
background-color: white .column .cellTile .cellContent
.menuHeaderTimestamp .menuText
font-family: "Avant Garde", Avantgarde, "Century Gothic", CenturyGothic, "AppleGothic", sans-serif font-size: 10px
font-weight: 800 .menuTimestamp
font-size: 15px font-size: 10px
color: white @media(max-width: 550px)
letter-spacing: -2px .column .cellTile .cellContent
text-align: right .menuText
position: absolute font-size: 10px
left: 0px letter-spacing: -1px
top: -1px .menuTimestamp
right: 16px font-size: 10px
height: 27px @media(max-width: 500px)
margin: 0 .column .cellTile .cellContent
padding: 0 .menuText
.grantMenu font-size: 9px
left: 0 letter-spacing: -1px
background-image: url('./images/apple_seed_v2.jpg') .menuTimestamp
.internshipsMenu font-size: 9px
left: 245px
background-image: url('./images/oak_seed_v2.jpg')
.scholarshipsMenu
left: 490px
background-image: url('./images/maple_seed_v2.jpg')
.fellowshipsMenu
left: 735px
background-image: url('./images/fir_seed_v2.jpg')
.newsMenu
left: 0px
top: 160px
background-image: url('./images/redwood_seed_v2.jpg')
.photoGalleryMenu
left: 245px
top: 160px
background-image: url('./images/buckeye_seed_v2.jpg')
.jrHighSummerMenu
left: 490px
top: 160px
background-image: url('./images/bay_seed_v2.jpg')
.howCanYouHelpMenu
left: 735px
top: 160px
background-image: url('./images/madrone_seed_v2.jpg')

View File

@@ -8,15 +8,27 @@
<div class="menuBar"> <div class="menuBar">
<div onmousedown="return false"> <div onmousedown="return false">
<a href="{{pathFor 'InternshipsEditor'}}"><li class="fa fa-key theKey" aria-hidden="true"></li></a> <a href="{{pathFor 'InternshipsEditor'}}"><li class="fa fa-key theKey" aria-hidden="true"></li></a>
<li class="barButton"><a href="#"><i class="fa fa-bars"></i></a></li> <li><a class="barButton" href="javascript: "><i class="fa fa-bars"></i></a></li>
<li><a id="datesMenu" class="{{isActiveRoute 'ImportantDates'}}" href="{{pathFor 'ImportantDates'}}">Important Dates</a></li> <li><a id="datesMenu" class="level2 {{isActiveRoute 'ImportantDates'}}" href="{{pathFor 'ImportantDates'}}">Important Dates</a></li>
<li><a id="supportMenu" class="{{isActiveRoute 'Support'}}" href="{{pathFor 'Support'}}">Support &nbsp;</a></li> <li><a id="supportMenu" class="level2 {{isActiveRoute 'Support'}}" href="{{pathFor 'Support'}}">Support &nbsp;</a></li>
<li><a id="programsMenu" class="{{isActiveRoute 'Programs'}}" href="{{pathFor 'Programs'}}">Programs &nbsp;</a></li> <li><a id="programsMenu" class="level2 {{isActiveRoute 'Programs'}}" href="{{pathFor 'Programs'}}">Programs &nbsp;</a></li>
<li><a id="contactMenu" class="{{isActiveRoute 'Contact'}}" href="{{pathFor 'Contact'}}">Contact &nbsp;</a></li> <li><a id="contactMenu" class="level2 {{isActiveRoute 'Contact'}}" href="{{pathFor 'Contact'}}">Contact &nbsp;</a></li>
<li><a id="aboutMenu" class="{{isActiveRoute 'About'}}" href="{{pathFor 'About'}}">About &nbsp;</a></li> <li><a id="aboutMenu" class="level2 {{isActiveRoute 'About'}}" href="{{pathFor 'About'}}">About &nbsp;</a></li>
<li><a id="homeMenu" class="{{isActiveRoute 'Home'}}" href="{{pathFor 'Home'}}">Home &nbsp;</a></li> <li><a id="homeMenu" class="{{isActiveRoute 'Home'}}" href="{{pathFor 'Home'}}">Home &nbsp;</a></li>
</div> </div>
</div> </div>
<div class="dropMenu">
<div class="leftMenu">
<div class="hiddenMenuElementLeft"><a href="#!/about">About<p>find out who Anderson Valley Education Foundation is</p></a></div>
<div class="hiddenMenuElementLeft"><a href="#!/programs">Programs<p>view the various services we offer</p></a></div>
<div class="hiddenMenuElementLeft"><a href="#!/dates">Important Dates<p>check the calendar to ensure nothing is missed</p></a></div>
</div>
<div class="rightMenu">
<div class="hiddenMenuElementRight"><a href="#!/contact">Contact<p>provide us with your feedback</p></a></div>
<div class="hiddenMenuElementRight"><a href="#!/support">Support<p>help us educate the next generation</p></a></div>
<!--<div class="hiddenMenuElementRight"><a href="#/">Community<p>learn more about the community</p></a></div>-->
</div>
</div>
</div> </div>
<div id="content"> <div id="content">
{{> Template.dynamic template=content}} {{> Template.dynamic template=content}}

View File

@@ -8,6 +8,7 @@
background: #FDFDFD background: #FDFDFD
.topBar .topBar
display: relative
.logoLeft .logoLeft
cursor: pointer cursor: pointer
z-index: 1 z-index: 1
@@ -23,7 +24,8 @@
.menuBar .menuBar
list-style-type:none list-style-type:none
margin: 15px 0 0 0 margin: 15px 0 0 0
padding:0 padding: 0
margin-right: 10px
overflow:hidden overflow:hidden
display: inline-block display: inline-block
float: right float: right
@@ -43,10 +45,58 @@
a.active a.active
color: #777777 color: #777777
cursor: default 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 .theKey
color: #269 color: #269
margin-top: 2px
margin-left: 4px
.footer .footer
text-align: center text-align: center
padding-bottom: 40px padding-bottom: 40px
@@ -67,7 +117,11 @@
text-transform: uppercase text-transform: uppercase
font-size: 10px font-size: 10px
@media(max-width: 549px) // Some media settings for the MENU
// Small Screens
@media(max-width: 699px)
.dropMenu
visibility: visible
.level1, .level2 .level1, .level2
display: none display: none
#page #page
@@ -109,19 +163,11 @@
opacity: .7 opacity: .7
color: black color: black
border-bottom: 1px solid red border-bottom: 1px solid red
.copyright // Large Screens (MENU)
font-size: 7px @media(min-width: 700px)
.byline .dropMenu
float: left display: none
clear: both visibility: hidden
text-align: left
font-size: 7px
.footer
font-size: 7px
text-align: left
// Large Screens
@media(min-width: 550px)
.barButton .barButton
display: none display: none
#page #page
@@ -169,4 +215,39 @@
opacity: 1 opacity: 1
color: black color: black
background: transparent background: transparent
border-bottom: 3px solid #a20010 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

View File

@@ -2,5 +2,7 @@ import { Template } from 'meteor/templating';
import './Public.html'; import './Public.html';
Template.Public.events({ Template.Public.events({
'click .barButton': function(event, template) {
template.$('.dropMenu').toggle();
}
}); });

Binary file not shown.

Binary file not shown.