biola_frontend_toolkit 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f089cf0b9315739c130dc453f1718e4de6f0290c
-  data.tar.gz: 0a4b0b3ffbafce462fa59366390faebf18a8b268
+  metadata.gz: 5a0a9a8642ee45945391b2b15e54350ec5df375c
+  data.tar.gz: 749213074d04bf5a54b528700597e50a960824da
 SHA512:
-  metadata.gz: e445aee231509eefae989d80d43453b6c0984a5c7ebf4ed5615f1c5b570b46aeaac7e4ffafe6e99e8ac9c652b16a68b00a7f3dad3bc8a9a6365d94d9142dcb71
-  data.tar.gz: 541ee459b38fd0541264b99420ca6f55e642605e1711e41c22109476b2bbd38be10d15da2315ea7039098d16dba872c3b274540214008cc9b040fd2d86b961a4
+  metadata.gz: a0c9d60a40c9f93758a8e3acc7591a73f30ee5852666c9c192204392606cd033919c8fbf725cd1dac5bd9f8e0119400f8ea87b00b61c5d8003e240ba1660df7e
+  data.tar.gz: c5881dc079ab657bed57e9737d8df35357e7b0ca63b11620c1ea0ad633115b7ceecce4fa860e6920d54abadd2ff09f4e9259a0e63c6e63b9c8c9217e31dbcd06

data/README.md

@@ -49,7 +49,7 @@ Include the following in `application.js.coffee`. This includes `jquery`, `jquer
 
 #### Other requirements
 
-* `@current_user` - When a user is logged in
+* `current_user` - When a user is logged in
 * `logout_path` - Should return a link to the logout path
 * `/whateverpath?login=true` - Should be caught by ApplicationController and redirect to login page if not already logged in.
 

data/app/assets/stylesheets/biola/{header.css.scss → global_app_header.scss}

@@ -1,6 +1,5 @@
-body { margin: 0; }
-#wrapperBiolaHeader { background:#111; width:100%; }
-#biolaHeader { margin:0 auto; padding:0 15px; height: 42px;
+#wrapperGlobalAppHeader { background:#111; width:100%; }
+#globalAppHeader { margin:0 auto; padding:0 15px; height: 42px;
   a { text-decoration:none; color:#FFF; }
 
   .branding { float:left; font-weight:bold; font-size:13px; height:42px; line-height:42px; margin:0; font-family:'proxima-nova', 'avenir next',Helvetica,Arial,sans-serif; text-transform:uppercase; letter-spacing:0.25em;
@@ -8,16 +7,10 @@ body { margin: 0; }
     .university { display: none; }
   }
 
-
-  // Customize header dropdown menus. These will still use Bootstrap but will overwrite some of it's default styles.
-  .dropdown { float: right;
-    .dropdown-toggle { display: block; text-align:center; line-height:42px; padding:0 15px; color:#CCC; cursor:pointer; background:transparent; border:0; outline:0; -webkit-user-select: none; -webkit-appearance:none;
-      i.fa { vertical-align: middle; }
-    }
+  .dropdown.custom-dropdown {
     .dropdown-menu { top: 122%; border-radius: 0; min-width: 230px;
       > li {
-        > a { color:inherit; padding: 10px 20px;
-          i { margin-right: 8px; }
+        > a { color: inherit;
         }
       }
 
@@ -68,8 +61,9 @@ body { margin: 0; }
 }
 
 
+
 @media screen and (max-width:360px) {
-  #biolaHeader {
+  #globalAppHeader {
     #apps-list.dropdown {
       .dropdown-menu { right: -80px;
         &::before { right: 87px; }
@@ -80,7 +74,7 @@ body { margin: 0; }
 }
 
 @media screen and (min-width:549px) {
-  #biolaHeader {
+  #globalAppHeader {
     #apps-list.dropdown {
       .dropdown-toggle {
         .mobile { display:none; }
@@ -93,19 +87,19 @@ body { margin: 0; }
 }
 
 @media screen and (min-width:768px) {
-  #biolaHeader {
+  #globalAppHeader {
     .branding .university { display: inline; }
   }
 }
 
 @media screen and (min-width:768px) {
-  #biolaHeader { width:750px; }
+  #globalAppHeader { width:750px; }
 }
 
 @media screen and (min-width:992px) {
-  #biolaHeader { width:970px; }
+  #globalAppHeader { width:970px; }
 }
 
 @media screen and (min-width:1200px) {
-  #biolaHeader { width:1170px; }
+  #globalAppHeader { width:1170px; }
 }

data/app/assets/stylesheets/biola/global_marketing_footer.css.scss

@@ -0,0 +1,45 @@
+html { background: #222;  } // This should color the footer in case the window expands past the footer then the color is the same.
+#wrapperBiolaFooter { background:image-url('toolkit/footer-standard/footer_shadow.png') 0 0 repeat-x; background: #222; }
+#siteinfo .org { text-indent:1000%; white-space:nowrap; overflow:hidden; }
+#wrapperBiolaFooter { float:left; width:100%; padding:0 0 20px; }
+#biolaFooter { width:770px; margin:22px auto; overflow:hidden; padding:0; background:image-url('toolkit/footer-standard/rule_dotted_v.gif') 60% top repeat-y; }
+#biolaFooter,#biolaFooter a { color:#CCC; font:normal 12px/1.3 Helvetica,Arial,sans-serif; }
+#navBiolaSupplemental { float:right; width:35%; margin:0; }
+#navBiolaSupplemental ul { list-style-type:none; margin:4px 0; padding:0; }
+#navBiolaSupplemental ul li { float:left; width:50%; margin:0 0 6px; }
+#siteinfo { float:left; width:55%; margin:0; }
+#siteinfo .org { display:block; width:45%; height:40px; float:left; margin:0 0 28px; background:image-url('toolkit/footer-standard/logo-biola-h-white.png') no-repeat 0 0; }
+#siteinfo .adr,#siteinfo .tel,#siteinfoMapLink { float:right; clear:right; width:55%; font-style:normal; line-height:1.6; }
+#siteinfo .adr { padding:4px 0 0 0; }
+#siteinfo .tel { margin:0 0 9px 0; }
+#siteinfoLegal { float:left; clear:left; width:160px; padding:0; text-align:left; margin:-15px 0 0; }
+#siteinfoLegal,#siteinfoLegal a { color:#AAA; font-size:10px; }
+#siteinfoLegal a { display:block; padding:0 0 2px; }
+
+@media(max-width:767px) {
+  #wrapperBiolaFooter { float:none; padding:0; }
+  #biolaFooter { margin:0; padding:20px 0 20px; width:auto; text-align:center; background:transparent; }
+  #biolaFooter,#biolaFooter a { color:#CCC; font-size:10px; }
+  #siteinfo { float:none; width:auto; }
+  #siteinfo .org { display:inline-block; width:200px; height:70px; float:none; margin:0 auto 10px; padding:0; background:image-url('toolkit/footer-standard/logo-biola-v-white.png') no-repeat center top; }
+  #siteinfo .tel,#siteinfo .adr { float:none; width:100%; }
+  #siteinfoLegal { float:none; width:100%; text-align:center; margin:0; }
+  #siteinfoLegal a { display:inline; }
+  #siteinfoContact { margin:0 0 10px; }
+  #navBiolaSupplemental,#siteinfoMapLink { display:none; }
+}
+
+@media(min-width:768px) and (max-width:979px) {
+  #biolaFooter { width:680px; }
+  #biolaFooter,#biolaFooter a { font-size:11px; }
+  #siteinfo .org { background-size:120px 31px; background-position:0 5px; }
+  #siteinfoLegal,#siteinfoLegal a { font-size:9px; }
+}
+
+@media(max-width:767px) and (-webkit-min-device-pixel-ratio:1.5),(min-device-pixel-ratio:1.5) {
+  #siteinfo .org { background-image:image-url('toolkit/footer-standard/logo-biola-v-white-x2.png'); background-size:92px 69px; }
+}
+
+@media(min-width:768px) and (-webkit-min-device-pixel-ratio:1.5),(min-device-pixel-ratio:1.5) {
+  #siteinfo .org { background-image:image-url('toolkit/footer-standard/logo-biola-h-white-x2.png'); background-size:142px 37px; }
+}

data/app/assets/stylesheets/biola/global_marketing_header.css.scss

@@ -0,0 +1,28 @@
+#wrapperGlobalMarketingHeader { background:#FFF; width:100%; height:46px; border-bottom:solid 2px #CCC; margin:0; }
+#globalMarketingHeader { width:946px; height:44px; margin:0 auto; padding:0 11px; background:url(http://static.biola.edu/botr/biola/header-mini/images/watermark.gif) 66px 0 no-repeat; }
+#globalMarketingHeader .branding { float:left; width:104px; height:30px; }
+#globalMarketingHeader .logo { background:url(http://static.biola.edu/botr/biola/header-mini/images/logo-biola.png) 11px center no-repeat; width:116px; height:44px; display:block; text-indent:-1000px; overflow:hidden; }
+#globalMarketingHeader .navMain { display:block; white-space:nowrap; list-style-type:none; font:bold 11px/1 Arial, sans-serif; letter-spacing:1px; text-transform:uppercase; padding:0; margin:0; overflow:hidden; float:right; }
+#globalMarketingHeader .navMain li { display:block; float:left; margin:0 1px; }
+#globalMarketingHeader .navMain a { text-align:center; display:block; padding:0 13px; margin:11px 0; height:22px; line-height:22px; text-decoration:none; color:#666; white-space:nowrap; }
+#globalMarketingHeader .navMain a:hover { background:#3D434D; color:#FFF; }
+#globalMarketingHeader .navMain a:active { display:block; }
+
+* html #globalMarketingHeader .navMain li { width:1%; }
+
+@media only screen and (max-width:980px) {
+  #globalMarketingHeader { width:720px; }
+  #globalMarketingHeader .navMain a { padding:0 5px; font-size:10px; letter-spacing:0; }
+}
+
+@media only screen and (max-width:767px) {
+  #wrapperGlobalMarketingHeader { height:30px; border-bottom:1px solid #999; }
+  #globalMarketingHeader { width:100%; padding:0; height:30px; background:#FFF url(http://static.biola.edu/botr/biola/header-mini/images/bg_header_m.png) left bottom repeat-x; }
+  #globalMarketingHeader .branding { float:none; margin:0; width:100%; }
+  #globalMarketingHeader .logo { width:100%; height:30px; padding:9px 0; margin:0; font:bold 13px/1 Helvetica,sans-serif; color:#666; text-transform:uppercase; text-indent:0; text-align:center; text-decoration:none; background:transparent !important; }
+  #globalMarketingHeader .navMain { display:none; }
+}
+
+@media (-webkit-min-device-pixel-ratio:1.5), (min-device-pixel-ratio:1.5) {
+  #globalMarketingHeader .logo { background-image:url(http://static.biola.edu/botr/biola/header-mini/images/logo-biola-x2.png); background-size:103px 30px; }
+}

data/app/assets/stylesheets/biola-frontend-toolkit.css.scss

@@ -2,3 +2,20 @@
 //= require font-awesome
 //= require_tree ./biola
 //= require_self
+
+body { margin: 0; }
+
+
+// Customize header dropdown menus. These will still use Bootstrap but will overwrite some of it's default styles.
+.dropdown.custom-dropdown { float: right;
+  .dropdown-toggle { display: block; text-align:center; line-height:42px; padding:0 15px; color:#CCC; cursor:pointer; background:transparent; border:0; outline:0; -webkit-user-select: none; -webkit-appearance:none;
+    i.fa { vertical-align: middle; }
+  }
+  .dropdown-menu { top: 122%; border-radius: 0; min-width: 230px;
+    > li {
+      > a { padding: 10px 20px;
+        i { margin-right: 8px; }
+      }
+    }
+  }
+}

data/app/views/frontend_toolkit/_global_app_header.html.slim

@@ -0,0 +1,41 @@
+#wrapperGlobalAppHeader
+  #globalAppHeader
+    h2.branding
+      a.logo href="http://www.biola.edu"
+        img> src="http://academics.biola.edu/static/biola/header-slim/images/logo-biola-mark-white.png" alt=""
+        ' Biola
+        span.university University
+
+    #current-user-profile.dropdown.custom-dropdown
+      a.dropdown-toggle href="#" aria-hidden="true" data-toggle="dropdown"
+        - if current_user.try(:photo_url).present?
+          #profile-img style="background-image: url('#{current_user.photo_url}')"
+        - else
+          span.fa-stack.fa-lg
+            i.fa.fa-circle.fa-stack-2x
+            i.fa.fa-user.fa-stack-1x.fa-inverse
+      = render 'frontend_toolkit/shared/profile_dropdown'
+
+    #apps-list.dropdown.custom-dropdown
+      = app_dropdown_link BiolaFrontendToolkit.config.app_links.present? do
+        span.desktop
+          = BiolaFrontendToolkit.config.app_name
+          - if BiolaFrontendToolkit.config.app_version.present?
+            span.version = "v#{BiolaFrontendToolkit.config.app_version}"
+          = show_environment
+          - if BiolaFrontendToolkit.config.app_links.present?
+            i.fa.fa-caret-down<
+        span.mobile
+          - if BiolaFrontendToolkit.config.app_links.present?
+            i.fa.fa-list.app-list-icon
+            i.fa.fa-caret-down
+          - else
+            i.fa.fa-home
+
+      - if BiolaFrontendToolkit.config.app_links.present?
+        ul.dropdown-menu.pull-right role="menu" aria-labelledby="dLabel"
+          - BiolaFrontendToolkit.config.app_links.each do |link|
+            li = app_link link
+          / li.divider
+          / li.text-center = link_to 'More', '#'
+

data/app/views/frontend_toolkit/_global_marketing_footer.html.erb

@@ -0,0 +1,27 @@
+<div id="wrapperBiolaFooter">
+  <div id="biolaFooter">
+    <div id="navBiolaSupplemental">
+      <ul>
+        <li><a href="http://www.biola.edu/contact/">Contact Biola</a></li>
+        <li><a href="http://www.biola.edu/admissions/">Request Admission Info</a></li>
+        <li><a href="http://www.biola.edu/library/">Library</a></li>
+        <li><a href="http://www.biola.edu/donations/">Giving to Biola</a></li>
+        <li><a href="http://www.biola.edu/hr/">Employment</a></li>
+        <li><a href="http://www.biola.edu/news/press/">Press Room</a></li>
+      </ul>
+    </div>
+    <div id="siteinfo">
+      <div id="siteinfoContact" class="vcard">
+        <a class="org fn" href="http://www.biola.edu/">Biola University</a>
+        <div id="biola-address" class="adr">
+          <span class="street-address">13800 Biola Ave.</span>
+          <span class="locality">La Mirada</span>, <span class="region">CA</span>
+          <span class="postal-code">90639</span>
+        </div>
+        <div class="tel">1-562-903-6000</div>
+      </div>
+      <div id="siteinfoMapLink"><a href="http://www.biola.edu/maps/">Maps &amp; Directions</a> | <a href="http://biola.edu/privacy/">Privacy Policy</a></div>
+      <div id="siteinfoLegal"><a href="http://www.biola.edu/copyright/">© 1996-<%= Time.now.year %> Biola University, Inc.</a> All Rights Reserved.</div>
+    </div>
+  </div>
+</div>

data/app/views/frontend_toolkit/_global_marketing_header.html.slim

@@ -0,0 +1,13 @@
+#wrapperGlobalMarketingHeader
+  #globalMarketingHeader
+    div.branding
+      a.logo href="http://www.biola.edu" Biola University
+    ul.navMain
+      li = link_to "About", "http://www.biola.edu/about"
+      li = link_to "Academics", "http://www.biola.edu/academics"
+      li = link_to "Admissions", "http://www.biola.edu/admissions"
+      li = link_to "Athletics", "http://www.biola.edu/athletics"
+      li = link_to "News & Events", "http://now.biola.edu/"
+      li = link_to "Resources", "http://www.biola.edu/resources"
+      li = link_to "Offices", "http://www.biola.edu/offices"
+      li = link_to "Search", "http://www.biola.edu/find/"

data/app/views/frontend_toolkit/_header.html.slim

@@ -1,62 +1,2 @@
-#header
-  #wrapperBiolaHeader
-    #biolaHeader
-      h2.branding
-        a.logo href="http://www.biola.edu"
-          img> src="http://academics.biola.edu/static/biola/header-slim/images/logo-biola-mark-white.png" alt=""
-          ' Biola
-          span.university University
-
-      #current-user-profile.dropdown
-        a.dropdown-toggle href="#" aria-hidden="true" data-toggle="dropdown"
-          - if @current_user.try(:photo_url).present?
-            #profile-img style="background-image: url('#{@current_user.photo_url}')"
-          - else
-            span.fa-stack.fa-lg
-              i.fa.fa-circle.fa-stack-2x
-              i.fa.fa-user.fa-stack-1x.fa-inverse
-        ul.dropdown-menu.pull-right role="menu" aria-labelledby="dLabel"
-          - if @current_user
-            - BiolaFrontendToolkit.config.profile_links.each do |link|
-              li = app_link link
-            li
-              = link_to logout_path do
-                i.fa.fa-power-off>
-                | Logout
-          - else
-            li = link_to 'Login', params.merge(login: 'true')
-
-      / - if @current_user
-      /   #global-alerts.dropdown
-      /     a.dropdown-toggle href="#" aria-hidden="true" data-toggle="dropdown"
-      /       i.fa.fa-bell-o
-      /     ul.dropdown-menu.pull-right role="menu" aria-labelledby="dLabel"
-      /       li = link_to 'This is a really important message...', '#'
-      /       li = link_to 'Your last timecard is way overdue.', '#'
-      /       li = link_to 'You are in quite the pickle mister.', '#'
-      /       li = link_to 'Your student bill was due last week Thursday.', '#'
-      /       li = link_to 'You owe us one million dollars, plus a delicious candy bar.', '#'
-
-      #apps-list.dropdown
-        = app_dropdown_link BiolaFrontendToolkit.config.app_links.present? do
-          span.desktop
-            = BiolaFrontendToolkit.config.app_name
-            - if BiolaFrontendToolkit.config.app_version.present?
-              span.version = "v#{BiolaFrontendToolkit.config.app_version}"
-            = show_environment
-            - if BiolaFrontendToolkit.config.app_links.present?
-              i.fa.fa-caret-down<
-          span.mobile
-            - if BiolaFrontendToolkit.config.app_links.present?
-              i.fa.fa-list.app-list-icon
-              i.fa.fa-caret-down
-            - else
-              i.fa.fa-home
-
-        - if BiolaFrontendToolkit.config.app_links.present?
-          ul.dropdown-menu.pull-right role="menu" aria-labelledby="dLabel"
-            - BiolaFrontendToolkit.config.app_links.each do |link|
-              li = app_link link
-            / li.divider
-            / li.text-center = link_to 'More', '#'
-
+/ this file is depricated
+= render 'frontend_toolkit/global_app_header'

data/app/views/frontend_toolkit/_prerelease_banner.html.slim

@@ -1,9 +1,11 @@
 - feedback_form_url ||= nil
 - phase = BiolaFrontendToolkit.config.release_phase
+- styles = ''
+- styles += "background-color: #{background_color};" if defined?(background_color)
 
 - if ['alpha', 'beta'].include? phase
   #wrapperPreRelease
-    div id==phase+'Banner' class='pre-release-banner'
+    div id==phase+'Banner' class='pre-release-banner' style=styles
       .container
         span
           strong = phase.upcase+':'
@@ -11,4 +13,4 @@
           - if feedback_form_url
             | #{BiolaFrontendToolkit.config.release_phase_intro} — your #{link_to 'feedback', feedback_form_url, target: '_blank' } will help us improve it.
           - else
-            = BiolaFrontendToolkit.config.release_phase_intro+'.'
+            = BiolaFrontendToolkit.config.release_phase_intro+'.'

data/app/views/frontend_toolkit/shared/_profile_dropdown.html.slim

@@ -0,0 +1,10 @@
+ul.dropdown-menu.pull-right role="menu" aria-labelledby="dLabel"
+  - if current_user
+    - BiolaFrontendToolkit.config.profile_links.each do |link|
+      li = app_link link
+    li
+      = link_to logout_path do
+        i.fa.fa-power-off>
+        | Logout
+  - else
+    li = link_to 'Login', params.merge(login: 'true')

data/lib/biola_frontend_toolkit/version.rb

@@ -1,3 +1,3 @@
 module BiolaFrontendToolkit
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biola_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan Hall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,15 +50,27 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/assets/images/toolkit/footer-standard/footer_shadow.png
+- app/assets/images/toolkit/footer-standard/logo-biola-h-white-x2.png
+- app/assets/images/toolkit/footer-standard/logo-biola-h-white.png
+- app/assets/images/toolkit/footer-standard/logo-biola-v-white-x2.png
+- app/assets/images/toolkit/footer-standard/logo-biola-v-white.png
+- app/assets/images/toolkit/footer-standard/rule_dotted_v.gif
 - app/assets/javascripts/biola-frontend-toolkit.js.coffee
 - app/assets/stylesheets/biola-frontend-toolkit.css.scss
-- app/assets/stylesheets/biola/header.css.scss
+- app/assets/stylesheets/biola/global_app_header.scss
+- app/assets/stylesheets/biola/global_marketing_footer.css.scss
+- app/assets/stylesheets/biola/global_marketing_header.css.scss
 - app/assets/stylesheets/biola/prerelease.css.scss
 - app/helpers/biola_frontend/rails/frontend_toolkit_helper.rb
+- app/views/frontend_toolkit/_global_app_header.html.slim
+- app/views/frontend_toolkit/_global_marketing_footer.html.erb
+- app/views/frontend_toolkit/_global_marketing_header.html.slim
 - app/views/frontend_toolkit/_google_analytics.html.erb
 - app/views/frontend_toolkit/_head.html.slim
 - app/views/frontend_toolkit/_header.html.slim
 - app/views/frontend_toolkit/_prerelease_banner.html.slim
+- app/views/frontend_toolkit/shared/_profile_dropdown.html.slim
 - biola_frontend_toolkit.gemspec
 - lib/biola_frontend_toolkit.rb
 - lib/biola_frontend_toolkit/configuration.rb