projects / web / SooLocks.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b716b99 d804697)
Merge branch 'feature/menu' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Jun 2014 17:28:39 +0000 (13:28 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Jun 2014 17:28:39 +0000 (13:28 -0400)
Conflicts:
Toolkit/Page.php
templates/template.html

1  2 
templates/template.html patch | diff1 | diff2 | blob | history

diff --cc templates/template.html
index 852ba30,d1008a5..544235c
--- 1/templates/template.html
--- 2/templates/template.html
+++ b/templates/template.html
@@@ -8,17 -8,9 +8,18 @@@
  <script src="{mediaBaseURL:h}libjs/vendor/modernizr.js"></script>
  <link rel="stylesheet" href="{mediaBaseURL:h}css/foundation.css" />
  <link rel="stylesheet" href="{mediaBaseURL:h}styles.css" />
+ <flexy:toJavascript flexy:prefix="" media_base_url="mediaBaseURL"></flexy:toJavascript>
  {styles:h}
  {topScripts:h}
 +<script>
 +$(function() {
 +    $("#nav a").each(function() {
 +        if (this.href == window.location) {
 +            $(this).css("color", "#fffb02");
 +        };
 +    });
 +});
 +</script>
  </head>
  <body>
  <div class="off-canvas-wrap" data-offcanvas>
@@@ -28,27 -20,10 +29,11 @@@
                  <section class="left-small">
                      <a class="left-off-canvas-toggle menu-icon" href="#"><span></span></a>
                  </section>
 +                  <h1 id="logoSmall">Soo Locks Boat Tours</h1>  <!-- <img src="{baseURLDefined:h}assets/logoSmall.png" id="logoSmall" class="right"> -->
              </nav>
          </div>
-         <aside class="left-off-canvas-menu">
-             <ul class="off-canvas-list">
-                 <li class="menu-icon">
-                     <a href="{homePageUrl:h}">Home</a>
-                 </li>
-                 <li>
-                     <a href="{baseURLDefined:h}tours-2/">Tours &amp; Cruises</a>
-                 </li>
-                 <li>
-                     <a href="{baseURLDefined:h}tickets-3">Tickets, Packages &amp; Coupons</a>
-                 </li>
-                 <li>
-                     <a href="{baseURLDefined:h}groups-4">Groups &amp; School Rates</a>
-                 </li>
-                 <li>
-                     <a href="{baseURLDefined:h}about_us-5/">About</a>
-                 </li>
-             </ul>
+         <aside class="left-off-canvas-menu" id="mobilenav">
+             {mainNav:h}
          </aside>
          <section class="main-section">
              <div class="row">