Add the mobile menu
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 11 Feb 2015 22:01:57 +0000 (17:01 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 11 Feb 2015 22:01:57 +0000 (17:01 -0500)
and start on toolbox

Toolkit/Page.php
Toolkit/Template/Image/Left.php
Toolkit/Template/Image/Right.php
Toolkit/Template/Navigation/AllInOneSideNav.php [new file with mode: 0755]
Toolkit/Template/Page/Toolbox.php
css/app.css
js/app.js
js/custom/pageSetup.js
scss/_settings.scss
scss/_structure.scss
templates/template.html

index 942e25c..80550a2 100755 (executable)
@@ -461,6 +461,7 @@ class Toolkit_Page
         $this->_navigationFactory->setGateway($this->_pageGateway);
         $this->mainNav = $this->_getMainNav($this->_catid);
         $this->sideNav = $this->_getSideNav($this->_catid);
+        $this->mobileNav = $this->_getMobileNavigation();
 
         $this->newsletterAction = Toolkit_Template_Page::getSeoUrl(
             $this->_pageGateway, 10
@@ -633,6 +634,106 @@ class Toolkit_Page
         }
     }
 
+
+    private function _getMobileNavigation()
+    {
+        if (defined('MAIN_LEVEL_NAV_ARRAY') && MAIN_LEVEL_NAV_ARRAY) {
+            $mainNavArray = unserialize(MAIN_LEVEL_NAV_ARRAY);
+        } else {
+            $mainNavArray = array();
+        }
+        $sideNav = new Toolkit_Template_Navigation_AllInOneSideNav(
+            $this->_pageGateway
+        );
+        $nav  = $sideNav->getNavigation();
+        $newNav = array();
+        foreach ($nav as $key => $item) {
+            if ($item['id'] == HOME_ID) {
+                $item['class'] = 'home';
+            }
+            //if (in_array($item['id'], $mainNavArray)
+                //|| $item['id'] == HOME_ID
+            //) {
+                //$key = array_search($item['id'], $mainNavArray);
+                //if ($key !== false) {
+                    //$item['class'] = $key;
+                //}
+                $newNav[] = $item;
+            //}
+        }
+        $html = $this->_arrayToListHTML($newNav, 0, 'off-canvas-list', true);
+        return ($html) ? $html : '';
+    }
+
+    private function _arrayToListHTML(
+        $array,
+        $level = 0,
+        $className = null,
+        $mobile = false,
+        $backgroundImage = null
+    ) {
+        static $tab = "\t", $format = '<a href="%s"%s>%s</a>';
+
+        if (empty($array)) {
+            return;
+        }
+        $tabs = str_repeat($tab, $level * 2);
+        if ($mobile) {
+            $mainClass = ' class="'.$className.'"';
+        } else {
+            $mainClass = ($level == 0 && $className)
+                ? ' class="'.$className.'"'
+                : ' class="dropdown"';
+        }
+        $styleCode = '';
+        $result = "{$tabs}<ul{$mainClass}{$styleCode}>\n";
+        if ($backgroundImage) {
+            $result .= '<li class="mainNavLiImgContainer"><img class="mainNavImg" src="'.$backgroundImage.'" ></li>';
+        }
+        foreach ($array as $i => $node) {
+            $classes = array();
+            if ($mobile && $node['class']) {
+                $class = ' class="'.$node['class'].'"';
+            } else {
+                if ($node['class']) {
+                    $classes[] = $node['class'];
+                }
+            }
+
+            if (!empty($node['pages'])) {
+                $classes[] = 'has-dropdown';
+            }
+            $parent = ' class="'.implode(' ', $classes).'"';
+            $link = sprintf(
+                $format,
+                $node['uri'],
+                $class,
+                $node['label']
+            );
+            $result .= "{$tabs}{$tab}<li{$parent}>\n{$tabs}{$tab}{$tab}{$link}\n";
+            if ($mobile) {
+                if (!empty($node['pages'])) {
+                    $result .= '<a class="toggle"></a>';
+                }
+                $result .=  $this->_arrayToListHTML(
+                    $node['pages'], $level + 1, '', true
+                );
+            } else {
+                $result .=  $this->_arrayToListHTML(
+                    $node['pages'],
+                    $level + 1,
+                    null,
+                    false,
+                    $node['background-image']
+                );
+            }
+
+
+            $result .= "{$tabs}{$tab}</li>\n";
+        }
+        $result .= "{$tabs}</ul>\n";
+        return $result;
+    }
     /**
      * Add Google Search module
      *
index 6fb37f1..6494e50 100644 (file)
@@ -45,14 +45,14 @@ class Toolkit_Template_Image_Left extends Toolkit_Template_Image_ImageAbstract
        {
                $imageData = $this->_adapter->getImageSize($size . $this->_src);
 
-               $html  = '<div class="imageleft" style="width: ' . $imageData[0] . 'px;">';
+               $html  = '<figure class="toolboxSectionImageFigure left small-12 medium-4 columns">';
                $html .=        parent::getImage($size);
                if (!empty($this->_caption)) {
-                       $html .=        '<div class="imagecaption">';
+                       $html .=        '<figcaption>';
                        $html .=                $this->_caption;
-                       $html .=        '</div>';
+                       $html .=        '</figcaption>';
                }
-               $html .= '</div>';
+               $html .= '</figure>';
 
                return $html;
        }
index f1ef03b..86974f4 100644 (file)
@@ -45,14 +45,14 @@ class Toolkit_Template_Image_Right extends Toolkit_Template_Image_ImageAbstract
        {
                $imageData = $this->_adapter->getImageSize($size . $this->_src);
 
-               $html  = '<div class="imageright" style="width: ' . $imageData[0] . 'px;">';
+               $html  = '<figure class="toolboxSectionFigureInner right small-12 medium-4 columns">';
                $html .=        parent::getImage($size);
                if (!empty($this->_caption)) {
-                       $html .=        '<div class="imagecaption">';
+                       $html .=        '<figcaption>';
                        $html .=                $this->_caption;
-                       $html .=        '</div>';
+                       $html .=        '</figcaption>';
                }
-               $html .= '</div>';
+               $html .= '</figure>';
 
                return $html;
        }
diff --git a/Toolkit/Template/Navigation/AllInOneSideNav.php b/Toolkit/Template/Navigation/AllInOneSideNav.php
new file mode 100755 (executable)
index 0000000..2f2df53
--- /dev/null
@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * AllInOneSideNav.php
+ *
+ * PHP version 5.3
+ *
+ * @category  Toolkit
+ * @package   Package
+ * @author    Steve Sutton <steve@gaslightmedia.com>
+ * @copyright 2013 Gaslight Media
+ * @license   Gaslight Media
+ * @version   SVN: (0.1)
+ * @link      <>
+ */
+
+/**
+ * Toolkit_Package_AllInOneSideNav
+ *
+ * Description of AllInOneSideNav
+ *
+ * @category  Toolkit
+ * @package   Package
+ * @author    Steve Sutton <steve@gaslightmedia.com>
+ * @copyright 2013 Gaslight Media
+ * @license   Gaslight Media
+ * @release   Release: (0.1)
+ * @link      <>
+ */
+class Toolkit_Template_Navigation_AllInOneSideNav
+{
+    private $_parents = array();
+    private $_navArray = array();
+    private $_gateway;
+    private $_pageId;
+
+    public function __construct(
+        Toolkit_Toolbox_GatewayAbstract $gateway
+    ) {
+        $this->_gateway = $gateway;
+        $id = filter_var($_REQUEST['catid'], FILTER_VALIDATE_INT);
+        $this->_pageId = $id;
+        if (!$id) {
+            $id = HOME_ID;
+        }
+        $this->_parents = $this->_getParentIds($id);
+    }
+
+    public function getNavigation()
+    {
+        return $this->setNavArray(0);
+    }
+
+    public function setNavArray($id)
+    {
+        try {
+            $navArray = array();
+            $dbh = Toolkit_Database::getInstance();
+            $pages = (defined('ALL_IN_ONE_INCLUDED')
+                && ALL_IN_ONE_INCLUDED)
+                ? unserialize(ALL_IN_ONE_INCLUDED)
+                : null;
+            $includedPages = (!empty($pages))
+                ? "AND (parent != 0 OR id IN (".implode(',', $pages)."))"
+                : '';
+            $memberPages = (defined('MEMBERS_DB') && MEMBERS_DB)
+                ? "AND id NOT IN (".MEMBERS_CATEGORY.")"
+                : '';
+            $sql = "
+            SELECT id,parent,navigation_name
+              FROM pages
+             WHERE parent = :id
+               AND active = true
+               $includedPages
+               $memberPages
+            ORDER BY parent,pos"; // AND id != ".MEMBERS_CATEGORY."
+            $stmt = $dbh->prepare($sql);
+            $stmt->bindParam(':id', $id, PDO::PARAM_INT);
+            $stmt->execute();
+            while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+                if ($row['id'] == $this->_pageId) {
+                    $class = 'current';
+                } else if (in_array($row['id'], $this->_parents)) {
+                    $class = 'parent';
+                } else {
+                    $class = '';
+                }
+                $navArray[] = array(
+                    'id'     => $row['id'],
+                    'parent' => $row['parent'],
+                    'label'  => $row['navigation_name'],
+                    'uri'    => Toolkit_Template_Page::getSeoUrl(
+                        $this->_gateway, $row['id']
+                    ),
+                    'class'  => $class,
+                    'pages'  => $this->setNavArray($row['id'])
+                );
+            }
+        } catch (PDOException $e) {
+            Toolkit_Common::handleError($e);
+        }
+        return $navArray;
+    }
+
+    private function _getParentIds($id)
+    {
+        try {
+            $dbh = Toolkit_Database::getInstance();
+            $sql = "
+            SELECT parent
+              FROM pages
+             WHERE id = :id";
+            $stmt = $dbh->prepare($sql);
+            $stmt->bindParam(':id', $id, PDO::PARAM_INT);
+            $stmt->execute();
+            $parent = $stmt->fetchColumn();
+            $this->_parents[] = $parent;
+            if ($parent == 0) {
+                return $this->_parents;
+            } else {
+                return $this->_getParentIds($parent);
+            }
+        } catch (PDOException $e) {
+            Toolkit_Common::handleError($e);
+        }
+    }
+}
+
index 1e50f90..e367ec7 100644 (file)
@@ -28,7 +28,7 @@
  */
 class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
 {
-       //      {{{     properties
+    //  {{{ properties
 
 
     /**
@@ -37,7 +37,7 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
      * @var int
      * @access protected
      */
-       protected $id;
+    protected $id;
 
     /**
      * Description of $imageFactory
@@ -45,7 +45,7 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
      * @var Toolkit_Template_Image_Factory
      * @access protected
      */
-       protected $imageFactory;
+    protected $imageFactory;
 
     /**
      * Description of $breadCrumbsFactory
@@ -53,7 +53,7 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
      * @var Toolkit_BreadCrumbsFactory
      * @access protected
      */
-       protected $breadCrumbsFactory;
+    protected $breadCrumbsFactory;
 
     /**
      * Description of $pageGateway
@@ -61,7 +61,7 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
      * @var Toolkit_Toolbox_PageGatewayAbstract
      * @access protected
      */
-       protected $pageGateway;
+    protected $pageGateway;
 
     /**
      * Description of $paragraphGateway
@@ -69,7 +69,7 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
      * @var Toolkit_Toolbox_ParagraphGatewayAbstract
      * @access protected
      */
-       protected $paragraphGateway;
+    protected $paragraphGateway;
 
     /**
      * Description of $keywordReplacement
@@ -77,7 +77,7 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
      * @var Toolkit_Template_KeywordReplacement
      * @access protected
      */
-       protected $keywordReplacement;
+    protected $keywordReplacement;
 
     /**
      * Description of $cache
@@ -85,7 +85,7 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
      * @var Cache_Lite
      * @access protected
      */
-       protected $cache;
+    protected $cache;
 
     /**
      * Description of $photoGallery
@@ -93,10 +93,10 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
      * @var Toolkit_Photos_Gallery
      * @access protected
      */
-       protected $photoGallery;
+    protected $photoGallery;
 
-       //      }}}
-       //      {{{     __construct()
+    //  }}}
+    //  {{{ __construct()
 
     /**
      * Class constructor
@@ -113,34 +113,34 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
      * @throws RuntimeException
      * @access public
      */
-       public function __construct(
-               $id,
-               Toolkit_Template_Image_Factory $imageFactory,
-               Toolkit_BreadCrumbsFactory $breadCrumbsFactory,
-               Toolkit_Toolbox_PageGatewayAbstract $pageGateway,
-               Toolkit_Toolbox_ParagraphGatewayAbstract $paragraphGateway,
-               Toolkit_Template_KeywordReplacement $keywordReplacement,
+    public function __construct(
+        $id,
+        Toolkit_Template_Image_Factory $imageFactory,
+        Toolkit_BreadCrumbsFactory $breadCrumbsFactory,
+        Toolkit_Toolbox_PageGatewayAbstract $pageGateway,
+        Toolkit_Toolbox_ParagraphGatewayAbstract $paragraphGateway,
+        Toolkit_Template_KeywordReplacement $keywordReplacement,
         Cache_Lite $cache,
-               Toolkit_Photos_Gallery $photoGallery = null
-       ) {
-               if (!filter_var($id, FILTER_VALIDATE_INT)) {
-                       throw new RuntimeException(
-                               "`$id` is not a valid page id - integer required"
-                       );
-               }
-               $this->id                 = $id;
-               $this->imageFactory       = $imageFactory;
-               $this->breadCrumbsFactory = $breadCrumbsFactory;
-               $this->pageGateway        = $pageGateway;
-               $this->paragraphGateway   = $paragraphGateway;
-               $this->keywordReplacement = $keywordReplacement;
-               $this->cache              = $cache;
-               $this->photoGallery       = $photoGallery;
-       }
-
-       //      }}}
-
-       //      {{{     getContent()
+        Toolkit_Photos_Gallery $photoGallery = null
+    ) {
+        if (!filter_var($id, FILTER_VALIDATE_INT)) {
+            throw new RuntimeException(
+                "`$id` is not a valid page id - integer required"
+            );
+        }
+        $this->id                 = $id;
+        $this->imageFactory       = $imageFactory;
+        $this->breadCrumbsFactory = $breadCrumbsFactory;
+        $this->pageGateway        = $pageGateway;
+        $this->paragraphGateway   = $paragraphGateway;
+        $this->keywordReplacement = $keywordReplacement;
+        $this->cache              = $cache;
+        $this->photoGallery       = $photoGallery;
+    }
+
+    //  }}}
+
+    //  {{{ getContent()
 
     /**
      * Get content
@@ -148,34 +148,34 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
      * @return string
      * @access public
      */
-       public function getContent()
-       {
-               $breadCrumbsBuilder  = $this->breadCrumbsFactory->createBreadCrumbsHelper();
-               $breadCrumbs         = $breadCrumbsBuilder->toHtml($this->id);
-               $secondaryParagraphs = $this->getSecondaryParagraphs($this->id);
-               $primaryParagraph    = $this->getPrimaryParagraph($this->id);
+    public function getContent()
+    {
+        $breadCrumbsBuilder  = $this->breadCrumbsFactory->createBreadCrumbsHelper();
+        $breadCrumbs         = $breadCrumbsBuilder->toHtml($this->id);
+        $secondaryParagraphs = $this->getSecondaryParagraphs($this->id);
+        $primaryParagraph    = $this->getPrimaryParagraph($this->id);
         $coupons = null;
-               if (defined('COUPONS') && COUPONS) {
-                       $coupons = $this->_getPageCoupons($this->id);
-               }
-               $staticPageContent   = $this->getStaticPageContent($this->id);
+        if (defined('COUPONS') && COUPONS) {
+            $coupons = $this->_getPageCoupons($this->id);
+        }
+        $staticPageContent   = $this->getStaticPageContent($this->id);
 
-               $photoGalleryContent = null;
-               if (defined('PHOTO_GALLERY') && PHOTO_GALLERY) {
-                       $photoGalleryContent = $this->photoGallery->getPageGallery($this->id);
-               }
+        $photoGalleryContent = null;
+        if (defined('PHOTO_GALLERY') && PHOTO_GALLERY) {
+            $photoGalleryContent = $this->photoGallery->getPageGallery($this->id);
+        }
 
-               return $breadCrumbs .
-                          $primaryParagraph .
-                          $staticPageContent .
-                          $secondaryParagraphs .
-                          $coupons .
-                          $photoGalleryContent;
-       }
+        return $breadCrumbs .
+               $primaryParagraph .
+               $staticPageContent .
+               $secondaryParagraphs .
+               $coupons .
+               $photoGalleryContent;
+    }
 
-       //      }}}
+    //  }}}
 
-       //      {{{     _getPageCoupons()
+    //  {{{ _getPageCoupons()
 
     /**
      * Description for _getPageCoupons
@@ -185,50 +185,50 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
      * @return string|void
      * @access private
      */
-       private function _getPageCoupons($id)
-       {
-               $page = $this->pageGateway->find($id);
-               if (!$page['include_coupons']) {
-                       return;
-               }
-
-               $widget = new Toolkit_Coupons_PageWidget(
-                       new Toolkit_Coupons_WebCouponFactory(),
-                       new Toolkit_Coupons_Coupons()
-               );
-
-               $flexyOpts = Toolkit_Coupons_Controller::getFlexyOptions();
-               $tEngine = new HTML_Template_Flexy($flexyOpts);
-
-               $widget->addPageCategories(
-                       Toolkit_Database::getInstance(),
-                       $id
-               );
-
-               $searchForm = new Toolkit_Coupons_UserSearch(
-                       'coupon_search',
-                       'get',
-                       MEDIA_BASE_URL . 'index.php'
-               );
-               $searchForm->configureForm(
-                       Toolkit_Database::getInstance(),
-                       $id
-               );
-
-               $widget->setSearchForm($searchForm);
-
-               $couponForm = new HTML_QuickForm(
-                       'coupon_form',
-                       'post',
-                       MEDIA_BASE_URL . 'Toolkit/Coupons/print.php'
-               );
-               $renderer =& $couponForm->defaultRenderer();
-               $renderer->clearAllTemplates();
-               return $widget->toHtml($couponForm, $tEngine, 'coupons.html');
-       }
-
-       //      }}}
-       //      {{{     getParagraphFiles()
+    private function _getPageCoupons($id)
+    {
+        $page = $this->pageGateway->find($id);
+        if (!$page['include_coupons']) {
+            return;
+        }
+
+        $widget = new Toolkit_Coupons_PageWidget(
+            new Toolkit_Coupons_WebCouponFactory(),
+            new Toolkit_Coupons_Coupons()
+        );
+
+        $flexyOpts = Toolkit_Coupons_Controller::getFlexyOptions();
+        $tEngine = new HTML_Template_Flexy($flexyOpts);
+
+        $widget->addPageCategories(
+            Toolkit_Database::getInstance(),
+            $id
+        );
+
+        $searchForm = new Toolkit_Coupons_UserSearch(
+            'coupon_search',
+            'get',
+            MEDIA_BASE_URL . 'index.php'
+        );
+        $searchForm->configureForm(
+            Toolkit_Database::getInstance(),
+            $id
+        );
+
+        $widget->setSearchForm($searchForm);
+
+        $couponForm = new HTML_QuickForm(
+            'coupon_form',
+            'post',
+            MEDIA_BASE_URL . 'Toolkit/Coupons/print.php'
+        );
+        $renderer =& $couponForm->defaultRenderer();
+        $renderer->clearAllTemplates();
+        return $widget->toHtml($couponForm, $tEngine, 'coupons.html');
+    }
+
+    //  }}}
+    //  {{{ getParagraphFiles()
 
     /**
      * Description for getParagraphFiles()
@@ -238,23 +238,23 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
      * @return void|string
      * @access protected
      */
-       protected function getParagraphFiles($files)
-       {
-               if (!is_array($files)) {
-                       return;
-               }
+    protected function getParagraphFiles($files)
+    {
+        if (!is_array($files)) {
+            return;
+        }
 
-               $filesList = '';
-               foreach ($files as $file) {
-                       $linkRenderer = Toolkit_Template_Page_FileLink_Factory::createLinkRenderer($file);
-                       $filesList .= $linkRenderer->getLink();
-               }
+        $filesList = '';
+        foreach ($files as $file) {
+            $linkRenderer = Toolkit_Template_Page_FileLink_Factory::createLinkRenderer($file);
+            $filesList .= $linkRenderer->getLink();
+        }
 
-               return $filesList;
-       }
+        return $filesList;
+    }
 
-       //      }}}
-       //      {{{     getParagraphImage()
+    //  }}}
+    //  {{{ getParagraphImage()
 
     /**
      * Description for getParagraphImage()
@@ -265,14 +265,14 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
      * @return string Through Toolkit/Template/Image  /Left or /Right or /Null
      * @access protected
      */
-       protected function getParagraphImage(array $data, $side)
-       {
-               $imageBuilder = $this->imageFactory->getImageBuilder($data, $side);
-               return $imageBuilder->getImage(TOOLBOX_RESIZED);
-       }
+    protected function getParagraphImage(array $data, $side)
+    {
+        $imageBuilder = $this->imageFactory->getImageBuilder($data, $side);
+        return $imageBuilder->getImage(TOOLBOX_RESIZED);
+    }
 
-       //      }}}
-       //      {{{     getParagraphLinks()
+    //  }}}
+    //  {{{ getParagraphLinks()
 
     /**
      * Description for getParagraphLinks()
@@ -280,23 +280,23 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
      * @return boolean|string
      * @access protected
      */
-       protected function getParagraphLinks()
-       {
-               if (!is_array($this->paragraphLinks)) {
-                       return false;
-               }
+    protected function getParagraphLinks()
+    {
+        if (!is_array($this->paragraphLinks)) {
+            return false;
+        }
 
-               $links  = '<ul id="paragraphLinks">';
-               foreach ($this->paragraphLinks as $anchor) {
-                       $links .= "<li>$anchor</li>";
-               }
-               $links .= '</ul>';
+        $links  = '<ul id="paragraphLinks">';
+        foreach ($this->paragraphLinks as $anchor) {
+            $links .= "<li>$anchor</li>";
+        }
+        $links .= '</ul>';
 
-               return $links;
-       }
+        return $links;
+    }
 
-       //      }}}
-       //      {{{     getPrimaryParagraph()
+    //  }}}
+    //  {{{ getPrimaryParagraph()
 
     /**
      * Description for getPrimaryParagraph()
@@ -306,44 +306,46 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
      * @return string
      * @access protected
      */
-       protected function getPrimaryParagraph($id)
-       {
-               $cache = $this->cache->get("page-$id", 'Toolbox');
-
-               if ($cache) {
-                       return $cache;
-               } else {
-                       $page = $this->pageGateway->find($id);
-
-                       switch ($page['template']) {
-                       case '2' :
-                       case '4' :
-                       case '5' :
-                               $side = 'left';
-                               break;
-
-                       default :
-                               $side = 'right';
-                               break;
-                       }
-
-                       $html  = '<div id="category">';
-                       $html .= "<h1>{$page['title']}</h1>";
-                       if ($page['paragraph_links']) {
-                               $html .= $this->getParagraphLinks();
-                       }
-                       $html .= $this->getParagraphImage($page, $side);
-                       $html .= $this->keywordReplacement->findAndReplace($page['description']);
-                       $html .= '</div>';
-
-                       $this->cache->save($html, "page-$id", 'Toolbox');
-               }
-
-               return $html;
-       }
-
-       //      }}}
-       //      {{{     getSecondaryParagraphs()
+    protected function getPrimaryParagraph($id)
+    {
+        $cache = $this->cache->get("page-$id", 'Toolbox');
+
+        if ($cache) {
+            return $cache;
+        } else {
+            $page = $this->pageGateway->find($id);
+
+            switch ($page['template']) {
+            case '2' :
+            case '4' :
+            case '5' :
+                $side = 'left';
+                break;
+
+            default :
+                $side = 'right';
+                break;
+            }
+
+            $html  = '<div id="category" class="row">';
+            $html .= "<h1>{$page['title']}</h1>";
+            if ($page['paragraph_links']) {
+                $html .= $this->getParagraphLinks();
+            }
+            $html .= $this->getParagraphImage($page, $side);
+            $html .= '<div class="small-12 medium-8 columns">';
+            $html .= $this->keywordReplacement->findAndReplace($page['description']);
+            $html .= '</div>';
+            $html .= '</div>';
+
+            $this->cache->save($html, "page-$id", 'Toolbox');
+        }
+
+        return $html;
+    }
+
+    //  }}}
+    //  {{{ getSecondaryParagraphs()
 
     /**
      * Description for getSecondaryParagraphs()
@@ -354,76 +356,82 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
      * @throws Toolkit_Template_Exception
      * @access protected
      */
-       protected function getSecondaryParagraphs($id)
-       {
-               $cache = $this->cache->get("paragraphs-$id", 'Toolbox');
-
-               if ($cache) {
-                       return $cache;
-               } else {
-                       $page       = $this->pageGateway->find($id);
-                       $paragraphs = $this->paragraphGateway->findAll($id);
-
-                       $side = array('left', 'right');
-                       switch ($page['template']) {
-                       case '2' :
-                       case '3' :
-                       case '6' :
-                               $key = 0;
-                               $flip = ($page['template'] == 3);
-                               if ($page['templte'] == '3') {
-                                       $flip = true;
-                               }
-                               break;
-
-                       case '1' :
-                       case '4' :
-                       case '5' :
-                               $key = 1;
-                               $flip = ($page['template'] == 4);
-                               break;
-
-                       default :
-                               throw new Toolkit_Template_Exception(
-                                       "Invalid page template for page `$id`"
-                               );
-                               break;
-                       }
-
-                       $html = '';
-                       $linksFormat = '<a href="#sect-%s">%s</a>';
-                       foreach ($paragraphs as $paragraph) {
-                               if ($paragraph['active']) {
-                                       $html .= '<div class="listing" id="sect-'.$paragraph['id'].'">';
-                                       $html .= "<h2>{$paragraph['title']}</h2>";
-                                       $html .= $this->getParagraphImage($paragraph, $side[$key]);
-                                       $html .= $this->keywordReplacement->findAndReplace($paragraph['description']);
-
-                                       $html .= $this->getParagraphFiles($paragraph['files']);
-
-                                       if ($paragraph['back_to_top']) {
-                                               $html .= '<a href="#toolbox">Back to Top</a>';
-                                       }
-
-                                       $html .= '</div>';
-
-                                       $this->paragraphLinks[] = sprintf(
-                                               $linksFormat,
-                                               $paragraph['id'],
-                                               $paragraph['title']
-                                       );
-                                       $key = $flip ? !$key : $key;
-                               }
-                       }
-
-                       $this->cache->save($html, "paragraphs-$id", 'Toolbox');
-                       return $html;
-               }
-       }
-
-       //      }}}
-
-       //      {{{     getStaticPageContent()
+    protected function getSecondaryParagraphs($id)
+    {
+        $cache = $this->cache->get("paragraphs-$id", 'Toolbox');
+
+        if ($cache) {
+            return $cache;
+        } else {
+            $page       = $this->pageGateway->find($id);
+            $paragraphs = $this->paragraphGateway->findAll($id);
+
+            $side = array('left', 'right');
+            switch ($page['template']) {
+            case '2' :
+            case '3' :
+            case '6' :
+                $key = 0;
+                $flip = ($page['template'] == 3);
+                if ($page['templte'] == '3') {
+                    $flip = true;
+                }
+                break;
+
+            case '1' :
+            case '4' :
+            case '5' :
+                $key = 1;
+                $flip = ($page['template'] == 4);
+                break;
+
+            default :
+                throw new Toolkit_Template_Exception(
+                    "Invalid page template for page `$id`"
+                );
+                break;
+            }
+
+            $html = '';
+            $linksFormat = '<a href="#sect-%s">%s</a>';
+            foreach ($paragraphs as $paragraph) {
+                if ($paragraph['active']) {
+                    $html .= '<div class="listing row" id="sect-'.$paragraph['id'].'">';
+                    $html .= "<h2>{$paragraph['title']}</h2>";
+                    $image = $this->getParagraphImage($paragraph, $side[$key]);
+                    if ($image) {
+                        $html .= '<div class="small-12 medium-8 columns">';
+                    } else {
+                        $html .= '<div class="small-12 columns">';
+                    }
+                    $html .= $this->keywordReplacement->findAndReplace($paragraph['description']);
+
+                    $html .= $this->getParagraphFiles($paragraph['files']);
+                    $html .= '</div>';
+
+                    if ($paragraph['back_to_top']) {
+                        $html .= '<a href="#toolbox">Back to Top</a>';
+                    }
+
+                    $html .= '</div>';
+
+                    $this->paragraphLinks[] = sprintf(
+                        $linksFormat,
+                        $paragraph['id'],
+                        $paragraph['title']
+                    );
+                    $key = $flip ? !$key : $key;
+                }
+            }
+
+            $this->cache->save($html, "paragraphs-$id", 'Toolbox');
+            return $html;
+        }
+    }
+
+    //  }}}
+
+    //  {{{ getStaticPageContent()
 
     /**
      * Description for getStaticPageCOntent()
@@ -447,6 +455,6 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
         return $html;
     }
 
-       //      }}}
+    //  }}}
 }
 ?>
index 75cdb1f..3587bca 100644 (file)
@@ -1180,9 +1180,9 @@ select {
     border-color: #de2d0f;
     color: #FFFFFF; }
   .alert-box.secondary {
-    background-color: #e7e7e7;
-    border-color: #c7c7c7;
-    color: #4f4f4f; }
+    background-color: #ebc389;
+    border-color: #e3ac5c;
+    color: #6c4712; }
   .alert-box.warning {
     background-color: #f08a24;
     border-color: #de770f;
@@ -1190,7 +1190,7 @@ select {
   .alert-box.info {
     background-color: #a0d3e8;
     border-color: #74bfdd;
-    color: #4f4f4f; }
+    color: #6c4712; }
   .alert-box.alert-close {
     opacity: 0; }
 
@@ -1511,8 +1511,8 @@ select {
   list-style: none;
   border-style: solid;
   border-width: 1px;
-  background-color: #f4f4f4;
-  border-color: gainsboro;
+  background-color: #f6e4ca;
+  border-color: #f0d1a4;
   border-radius: 3px; }
   .breadcrumbs > * {
     margin: 0;
@@ -1583,13 +1583,13 @@ button, .button {
   button:hover, button:focus, .button:hover, .button:focus {
     color: #FFFFFF; }
   button.secondary, .button.secondary {
-    background-color: #e7e7e7;
-    border-color: #b9b9b9;
+    background-color: #ebc389;
+    border-color: #e0a349;
     color: #333333; }
     button.secondary:hover, button.secondary:focus, .button.secondary:hover, .button.secondary:focus {
-      background-color: #b9b9b9; }
+      background-color: #e0a349; }
     button.secondary:hover, button.secondary:focus, .button.secondary:hover, .button.secondary:focus {
-      color: #333333; }
+      color: #FFFFFF; }
   button.success, .button.success {
     background-color: #43AC6A;
     border-color: #368a55;
@@ -1668,18 +1668,18 @@ button, .button {
     button.disabled:hover, button.disabled:focus, button[disabled]:hover, button[disabled]:focus, .button.disabled:hover, .button.disabled:focus, .button[disabled]:hover, .button[disabled]:focus {
       background-color: #0e2e4c; }
     button.disabled.secondary, button[disabled].secondary, .button.disabled.secondary, .button[disabled].secondary {
-      background-color: #e7e7e7;
-      border-color: #b9b9b9;
+      background-color: #ebc389;
+      border-color: #e0a349;
       color: #333333;
       cursor: default;
       opacity: 0.7;
       box-shadow: none; }
       button.disabled.secondary:hover, button.disabled.secondary:focus, button[disabled].secondary:hover, button[disabled].secondary:focus, .button.disabled.secondary:hover, .button.disabled.secondary:focus, .button[disabled].secondary:hover, .button[disabled].secondary:focus {
-        background-color: #b9b9b9; }
+        background-color: #e0a349; }
       button.disabled.secondary:hover, button.disabled.secondary:focus, button[disabled].secondary:hover, button[disabled].secondary:focus, .button.disabled.secondary:hover, .button.disabled.secondary:focus, .button[disabled].secondary:hover, .button[disabled].secondary:focus {
-        color: #333333; }
+        color: #FFFFFF; }
       button.disabled.secondary:hover, button.disabled.secondary:focus, button[disabled].secondary:hover, button[disabled].secondary:focus, .button.disabled.secondary:hover, .button.disabled.secondary:focus, .button[disabled].secondary:hover, .button[disabled].secondary:focus {
-        background-color: #e7e7e7; }
+        background-color: #ebc389; }
     button.disabled.success, button[disabled].success, .button.disabled.success, .button[disabled].success {
       background-color: #43AC6A;
       border-color: #368a55;
@@ -3264,7 +3264,7 @@ label.error {
     background-color: #43AC6A;
     color: #FFFFFF; }
   .label.secondary {
-    background-color: #e7e7e7;
+    background-color: #ebc389;
     color: #333333; }
   .label.info {
     background-color: #a0d3e8;
@@ -3668,7 +3668,7 @@ ul.pagination {
     height: 100%;
     display: block; }
   .progress.secondary .meter {
-    background: #e7e7e7;
+    background: #ebc389;
     height: 100%;
     display: block; }
   .progress.success .meter {
@@ -3750,7 +3750,7 @@ ul.pagination {
   display: inline-block;
   position: absolute;
   height: 0.875rem;
-  background: #e5e5e5; }
+  background: #eac186; }
 
 .range-slider-handle {
   display: inline-block;
@@ -4510,13 +4510,13 @@ meta.foundation-mq-topbar {
         .top-bar-section ul li > a.button:hover, .top-bar-section ul li > a.button:focus {
           color: #FFFFFF; }
       .top-bar-section ul li > a.button.secondary {
-        background-color: #e7e7e7;
-        border-color: #b9b9b9;
+        background-color: #ebc389;
+        border-color: #e0a349;
         color: #333333; }
         .top-bar-section ul li > a.button.secondary:hover, .top-bar-section ul li > a.button.secondary:focus {
-          background-color: #b9b9b9; }
+          background-color: #e0a349; }
         .top-bar-section ul li > a.button.secondary:hover, .top-bar-section ul li > a.button.secondary:focus {
-          color: #333333; }
+          color: #FFFFFF; }
       .top-bar-section ul li > a.button.success {
         background-color: #43AC6A;
         border-color: #368a55;
@@ -4553,13 +4553,13 @@ meta.foundation-mq-topbar {
       .top-bar-section ul li > button:hover, .top-bar-section ul li > button:focus {
         color: #FFFFFF; }
       .top-bar-section ul li > button.secondary {
-        background-color: #e7e7e7;
-        border-color: #b9b9b9;
+        background-color: #ebc389;
+        border-color: #e0a349;
         color: #333333; }
         .top-bar-section ul li > button.secondary:hover, .top-bar-section ul li > button.secondary:focus {
-          background-color: #b9b9b9; }
+          background-color: #e0a349; }
         .top-bar-section ul li > button.secondary:hover, .top-bar-section ul li > button.secondary:focus {
-          color: #333333; }
+          color: #FFFFFF; }
       .top-bar-section ul li > button.success {
         background-color: #43AC6A;
         border-color: #368a55;
@@ -5088,10 +5088,10 @@ code {
   font-family: Consolas, "Liberation Mono", Courier, monospace;
   font-weight: normal;
   color: #333333;
-  background-color: #f8f8f8;
+  background-color: #f9eddc;
   border-width: 1px;
   border-style: solid;
-  border-color: #dfdfdf;
+  border-color: #f2d9b4;
   padding: 0.125rem 0.3125rem 0.0625rem; }
 
 /* Lists */
@@ -5310,7 +5310,7 @@ blockquote, blockquote p {
 .tab-bar {
   -webkit-backface-visibility: hidden;
   background: #0e2e4c;
-  color: #FFFFFF;
+  color: #ebc389;
   height: 2.8125rem;
   line-height: 2.8125rem;
   position: relative; }
@@ -5367,7 +5367,7 @@ blockquote, blockquote p {
   height: 2.8125rem;
   display: block;
   padding: 0;
-  color: #FFFFFF;
+  color: #ebc389;
   position: relative;
   transform: translate3d(0, 0, 0); }
   .tab-bar .menu-icon span::after {
@@ -5378,10 +5378,10 @@ blockquote, blockquote p {
     top: 50%;
     margin-top: -0.5rem;
     left: 0.90625rem;
-    box-shadow: 0 0 0 1px #FFFFFF, 0 7px 0 1px #FFFFFF, 0 14px 0 1px #FFFFFF;
+    box-shadow: 0 0 0 1px #ebc389, 0 7px 0 1px #ebc389, 0 14px 0 1px #ebc389;
     width: 1rem; }
   .tab-bar .menu-icon span:hover:after {
-    box-shadow: 0 0 0 1px #b3b3b3, 0 7px 0 1px #b3b3b3, 0 14px 0 1px #b3b3b3; }
+    box-shadow: 0 0 0 1px #db922a, 0 7px 0 1px #db922a, 0 14px 0 1px #db922a; }
 
 .left-off-canvas-menu {
   -webkit-backface-visibility: hidden;
@@ -5391,7 +5391,7 @@ blockquote, blockquote p {
   position: absolute;
   overflow-x: hidden;
   overflow-y: auto;
-  background: #333333;
+  background: #0e2e4c;
   z-index: 1001;
   box-sizing: content-box;
   transition: transform 500ms ease 0s;
@@ -5415,7 +5415,7 @@ blockquote, blockquote p {
   position: absolute;
   overflow-x: hidden;
   overflow-y: auto;
-  background: #333333;
+  background: #0e2e4c;
   z-index: 1001;
   box-sizing: content-box;
   transition: transform 500ms ease 0s;
@@ -5438,19 +5438,19 @@ ul.off-canvas-list {
   ul.off-canvas-list li label {
     display: block;
     padding: 0.3rem 0.9375rem;
-    color: #999999;
+    color: #ebc389;
     text-transform: uppercase;
     font-size: 0.75rem;
     font-weight: bold;
-    background: #444444;
-    border-top: 1px solid #5e5e5e;
+    background: #ebc389;
+    border-top: 1px solid #eecb9a;
     border-bottom: none;
     margin: 0; }
   ul.off-canvas-list li a {
     display: block;
     padding: 0.6666666667rem;
     color: rgba(255, 255, 255, 0.7);
-    border-bottom: 1px solid #262626;
+    border-bottom: 1px solid #0b2239;
     transition: background 300ms ease; }
     ul.off-canvas-list li a:hover {
       background: #0a2035; }
@@ -5603,7 +5603,7 @@ ul.off-canvas-list {
   margin: 0;
   overflow-x: hidden;
   overflow-y: auto;
-  background: #333333;
+  background: #0e2e4c;
   z-index: 1002;
   box-sizing: content-box;
   -webkit-overflow-scrolling: touch;
@@ -5623,16 +5623,16 @@ ul.off-canvas-list {
     -webkit-backface-visibility: hidden; }
   .left-submenu .back > a {
     padding: 0.3rem 0.9375rem;
-    color: #999999;
+    color: #ebc389;
     text-transform: uppercase;
     font-weight: bold;
     background: #444;
-    border-top: 1px solid #5e5e5e;
+    border-top: 1px solid #eecb9a;
     border-bottom: none;
     margin: 0; }
     .left-submenu .back > a:hover {
       background: #303030;
-      border-top: 1px solid #5e5e5e;
+      border-top: 1px solid #eecb9a;
       border-bottom: none; }
     .left-submenu .back > a:before {
       content: "\AB";
@@ -5655,7 +5655,7 @@ ul.off-canvas-list {
   margin: 0;
   overflow-x: hidden;
   overflow-y: auto;
-  background: #333333;
+  background: #0e2e4c;
   z-index: 1002;
   box-sizing: content-box;
   -webkit-overflow-scrolling: touch;
@@ -5675,16 +5675,16 @@ ul.off-canvas-list {
     -webkit-backface-visibility: hidden; }
   .right-submenu .back > a {
     padding: 0.3rem 0.9375rem;
-    color: #999999;
+    color: #ebc389;
     text-transform: uppercase;
     font-weight: bold;
     background: #444;
-    border-top: 1px solid #5e5e5e;
+    border-top: 1px solid #eecb9a;
     border-bottom: none;
     margin: 0; }
     .right-submenu .back > a:hover {
       background: #303030;
-      border-top: 1px solid #5e5e5e;
+      border-top: 1px solid #eecb9a;
       border-bottom: none; }
     .right-submenu .back > a:after {
       content: "\BB";
@@ -6117,12 +6117,12 @@ a:hover {
 img {
   border: 0; }
 
-ul, ol {
+#toolbox ul, ol {
   display: table;
   margin: 0;
   padding: 10px 10px 10px 20px; }
 
-ul li {
+#toolbox ul li {
   display: block;
   margin: 0;
   padding: 0 0 2px 20px;
@@ -6146,7 +6146,7 @@ ul li {
   float: left;
   margin: 12px 15px 15px 2px; }
 
-.imageright img, .imageleft img {
+.imageright img, .imageleft img, figure img {
   display: block;
   width: 100%;
   border: 10px solid #355675;
@@ -6924,3 +6924,47 @@ ul#videoGallery li a span#vidtitle span#play {
 
 ul#videoGallery li:hover a span#vidtitle span#play {
   background-position: 0 -27px; }
+
+/* toggle class for off-canvas menu*/
+aside.right-off-canvas-menu ul.off-canvas-list li {
+  display: block;
+  overflow: hidden;
+  position: relative; }
+
+aside.right-off-canvas-menu ul.off-canvas-list li a {
+  /*font-family: "Arial";*/
+  /*font-size: 18px;*/
+  /*line-height: 20px;*/
+  /*color: black;*/
+  /*border-bottom: 1px solid #b1b3b6;*/
+  /*background-repeat: no-repeat;*/
+  /*background-position: 3px 50%;*/
+  padding-right: auto; }
+
+aside.right-off-canvas-menu ul.off-canvas-list li a.toggle {
+  background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAABUCAYAAADwHnXXAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NEIxREJCRjkxOTc3MTFFNEExMUU4NDJENjA5NTYyNEEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NEIxREJCRkExOTc3MTFFNEExMUU4NDJENjA5NTYyNEEiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo0QjFEQkJGNzE5NzcxMUU0QTExRTg0MkQ2MDk1NjI0QSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo0QjFEQkJGODE5NzcxMUU0QTExRTg0MkQ2MDk1NjI0QSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PmLH3EUAAAKASURBVHja7FpNKERRFH7jJ7KQkiKllGRBSRY2ViR2io2yUpSUhiLJb4QQg7KwsLJQNnZKysJWslB+RokSJdEkURjfae5imsa8d9+777lyTn3d3pt77/veOe+cc++54wuHw4bOkmRoLkyQCTLBv04wxekExQd3jsZfVOf9Aw1CSzto6iXmDQGfJn32gSZVJu4BaiX6Z5r8/gGMKnMSfCdnaFYVWm4NOFHtxWPAowJyNMeI8jADLT7JTJxAhmVeNMkt0/wgx2IOdwI1tPghHMaO0MKz24J3O4uDILmHZtsGwU3gwKtU1w+8S/R/BQY8y8XQYhDNssSQGeDG68XCJHBvod8VMOf5agZaDImQYSa9wNtvLbfWgaMEv+/adCg1BKHFLzT+BPnWr8OClULHVpz7lLtPdVlR98V8Zw9WVyteEbyO8dRB4Fm3PckscAscCufRY08SJS8iW1wCXzoSJNlQvSfxcXWLCTJBJsgEmSATZIJMkAkyQSb4i8InTbqZuApo1crEMS+7ApDNtsVGXisNtgGVQL4RqWFrZeIsYCrqmqpdBToRpFJbTtR1OjCvC8ESoCvO/WagWgeCS0BqnPs+IOD0GY4GI0g3oqlL0KVCOI/3BEGOvrMFC10nDPMDblc0SJ5aaKFfLjBk9yG26oPQHoUQquBnWBxC53plQNCrXDwtQY4kzYjUsN03MbRHoaPFxrPIoWpcJQhyyUbklNNnU/MB2fwvq8EOoNyBY5UC7a44CbSXjeYcyHYY2OkPFUWGOOhR6SQTCsgZYo5xpSaG9kqFeVVJp8jhyhas9MYhkz7JEhmDcvci0OBKoOZNk0oNcmWBCTJBJsgEmaDe8i3AAABaiPID+002AAAAAElFTkSuQmCC');
+  background-repeat: no-repeat;
+  background-position: 50% 3px;
+  width: 40px;
+  height: 100%;
+  position: absolute;
+  right: 0;
+  top: 0;
+  transition: none; }
+
+aside.right-off-canvas-menu ul.off-canvas-list li a.toggle.open {
+  background-position: 50% -40px; }
+
+aside.right-off-canvas-menu ul.off-canvas-list li > ul.open {
+  display: block; }
+
+aside.right-off-canvas-menu ul.off-canvas-list li > ul {
+  display: none; }
+
+aside.right-off-canvas-menu ul.off-canvas-list li > ul li > a {
+  padding-left: 10px;
+  margin-left: 25px;
+  font-size: 16px;
+  line-height: 18px; }
+
+/* END toggle class for off-canvas menu*/
\ No newline at end of file
index 5690f1c..095b1a1 100644 (file)
--- a/js/app.js
+++ b/js/app.js
@@ -35,9 +35,9 @@ $('a').each(function() {
 });;// Load foundation
 $(document).foundation();
 $(document).ready(function () {
-    $('ul.children').each(function () {
-        $(this).before('<a class="toggle" href="#"></a>');
-    });
+    //$('ul.children').each(function () {
+        //$(this).before('<a class="toggle" href="#"></a>');
+    //});
     $('a.toggle').click('click', function () {
         $(this).toggleClass('open');
         $(this).siblings('ul').toggleClass('open');
index 741d565..6fc4a32 100644 (file)
@@ -1,9 +1,9 @@
 // Load foundation
 $(document).foundation();
 $(document).ready(function () {
-    $('ul.children').each(function () {
-        $(this).before('<a class="toggle" href="#"></a>');
-    });
+    //$('ul.children').each(function () {
+        //$(this).before('<a class="toggle" href="#"></a>');
+    //});
     $('a.toggle').click('click', function () {
         $(this).toggleClass('open');
         $(this).siblings('ul').toggleClass('open');
index 384e4fc..d65e6b7 100644 (file)
@@ -118,7 +118,7 @@ $oil         : #333333;
 
 // We use these as default colors throughout
 $primary-color: #0e2e4c;
-// $secondary-color: #e7e7e7;
+$secondary-color: #ebc389;
 // $alert-color: #f04124;
 // $success-color: #43AC6A;
 // $warning-color: #f08a24;
@@ -152,7 +152,7 @@ $primary-color: #0e2e4c;
 // d. Media Query Ranges
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
-// $small-range: (0em, 40em);
+// $small-rang(0em, 40em);
 // $medium-range: (40.063em, 64em);
 // $large-range: (64.063em, 90em);
 // $xlarge-range: (90.063em, 120em);
@@ -822,7 +822,7 @@ $tabbar-bg: $primary-color;
 $tabbar-height: rem-calc(45);
 $tabbar-icon-width: $tabbar-height;
 $tabbar-line-height: $tabbar-height;
-$tabbar-color: $white;
+$tabbar-color: $secondary-color;
 $tabbar-middle-padding: 0 rem-calc(10);
 
 // Off Canvas Divider Styles
@@ -837,44 +837,44 @@ $tabbar-right-section-border: $tabbar-left-section-border;
 // $tabbar-header-margin: 0;
 
 // Off Canvas Menu Variables
-// $off-canvas-width: rem-calc(250);
-// $off-canvas-bg: $oil;
-// $off-canvas-bg-hover: scale-color($tabbar-bg, $lightness: -30%);
+$off-canvas-width: rem-calc(250);
+$off-canvas-bg: $primary-color;
+$off-canvas-bg-hover: scale-color($tabbar-bg, $lightness: -30%);
 
 // Off Canvas Menu List Variables
-// $off-canvas-label-padding: 0.3rem rem-calc(15);
-// $off-canvas-label-color: $aluminum;
-// $off-canvas-label-text-transform: uppercase;
-// $off-canvas-label-font-size: rem-calc(12);
-// $off-canvas-label-font-weight: $font-weight-bold;
-// $off-canvas-label-bg: $tuatara;
-// $off-canvas-label-border-top: 1px solid scale-color($off-canvas-label-bg, $lightness: 14%);
-// $off-canvas-label-border-bottom: none;
-// $off-canvas-label-margin:0;
-// $off-canvas-link-padding: rem-calc(10, 15);
-// $off-canvas-link-color: rgba($white, 0.7);
-// $off-canvas-link-border-bottom: 1px solid scale-color($off-canvas-bg, $lightness: -25%);
-// $off-canvas-back-bg: #444;
-// $off-canvas-back-border-top: $off-canvas-label-border-top;
-// $off-canvas-back-border-bottom: $off-canvas-label-border-bottom;
-// $off-canvas-back-hover-bg: scale-color($off-canvas-back-bg, $lightness: -30%);
-// $off-canvas-back-hover-border-top: 1px solid scale-color($off-canvas-label-bg, $lightness: 14%);
-// $off-canvas-back-hover-border-bottom: none;
+$off-canvas-label-padding: 0.3rem rem-calc(15);
+$off-canvas-label-color: $secondary-color;
+$off-canvas-label-text-transform: uppercase;
+$off-canvas-label-font-size: rem-calc(12);
+$off-canvas-label-font-weight: $font-weight-bold;
+$off-canvas-label-bg: $secondary-color;
+$off-canvas-label-border-top: 1px solid scale-color($off-canvas-label-bg, $lightness: 14%);
+$off-canvas-label-border-bottom: none;
+$off-canvas-label-margin:0;
+$off-canvas-link-padding: rem-calc(10, 15);
+$off-canvas-link-color: rgba($white, 0.7);
+$off-canvas-link-border-bottom: 1px solid scale-color($off-canvas-bg, $lightness: -25%);
+$off-canvas-back-bg: #444;
+$off-canvas-back-border-top: $off-canvas-label-border-top;
+$off-canvas-back-border-bottom: $off-canvas-label-border-bottom;
+$off-canvas-back-hover-bg: scale-color($off-canvas-back-bg, $lightness: -30%);
+$off-canvas-back-hover-border-top: 1px solid scale-color($off-canvas-label-bg, $lightness: 14%);
+$off-canvas-back-hover-border-bottom: none;
 
 // Off Canvas Menu Icon Variables
-// $tabbar-menu-icon-color: $white;
-// $tabbar-menu-icon-hover: scale-color($tabbar-menu-icon-color, $lightness: -30%);
-
-// $tabbar-menu-icon-text-indent: rem-calc(35);
-// $tabbar-menu-icon-width: $tabbar-icon-width;
-// $tabbar-menu-icon-height: $tabbar-height;
-// $tabbar-menu-icon-padding: 0;
-
-// $tabbar-hamburger-icon-width: rem-calc(16);
-// $tabbar-hamburger-icon-left: false;
-// $tabbar-hamburger-icon-top: false;
-// $tabbar-hamburger-icon-thickness: 1px;
-// $tabbar-hamburger-icon-gap: 6px;
+$tabbar-menu-icon-color: $secondary-color;
+$tabbar-menu-icon-hover: scale-color($tabbar-menu-icon-color, $lightness: -30%);
+
+$tabbar-menu-icon-text-indent: rem-calc(35);
+$tabbar-menu-icon-width: $tabbar-icon-width;
+$tabbar-menu-icon-height: $tabbar-height;
+$tabbar-menu-icon-padding: 0;
+
+$tabbar-hamburger-icon-width: rem-calc(16);
+$tabbar-hamburger-icon-left: false;
+$tabbar-hamburger-icon-top: false;
+$tabbar-hamburger-icon-thickness: 1px;
+$tabbar-hamburger-icon-gap: 6px;
 
 // Off Canvas Back-Link Overlay
 // $off-canvas-overlay-transition: background 300ms ease;
index 7d8aeb6..9d45bb3 100755 (executable)
@@ -69,12 +69,12 @@ a:hover {
 img {
     border: 0;
 }
-ul, ol {
+#toolbox ul, ol {
     display: table;
     margin: 0;
     padding: 10px 10px 10px 20px;
 }
-ul li {
+#toolbox ul li {
     display: block;
     margin: 0;
     padding: 0 0 2px 20px;
@@ -98,7 +98,7 @@ ul li {
     float: left;
     margin: 12px 15px 15px 2px;
 }
-.imageright img, .imageleft img {
+.imageright img, .imageleft img, figure img {
     display: block;
     width: 100%;
     border: 10px solid #355675;
@@ -852,3 +852,46 @@ ul#videoGallery li a span#vidtitle span#play {
 ul#videoGallery li:hover a span#vidtitle span#play {
     background-position: 0 -27px;
 }
+/* toggle class for off-canvas menu*/
+aside.right-off-canvas-menu ul.off-canvas-list li {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+aside.right-off-canvas-menu ul.off-canvas-list li a {
+  /*font-family: "Arial";*/
+  /*font-size: 18px;*/
+  /*line-height: 20px;*/
+  /*color: black;*/
+  /*border-bottom: 1px solid #b1b3b6;*/
+  /*background-repeat: no-repeat;*/
+  /*background-position: 3px 50%;*/
+  padding-right: auto;
+}
+aside.right-off-canvas-menu ul.off-canvas-list li a.toggle {
+  background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAABUCAYAAADwHnXXAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NEIxREJCRjkxOTc3MTFFNEExMUU4NDJENjA5NTYyNEEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NEIxREJCRkExOTc3MTFFNEExMUU4NDJENjA5NTYyNEEiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo0QjFEQkJGNzE5NzcxMUU0QTExRTg0MkQ2MDk1NjI0QSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo0QjFEQkJGODE5NzcxMUU0QTExRTg0MkQ2MDk1NjI0QSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PmLH3EUAAAKASURBVHja7FpNKERRFH7jJ7KQkiKllGRBSRY2ViR2io2yUpSUhiLJb4QQg7KwsLJQNnZKysJWslB+RokSJdEkURjfae5imsa8d9+777lyTn3d3pt77/veOe+cc++54wuHw4bOkmRoLkyQCTLBv04wxekExQd3jsZfVOf9Aw1CSzto6iXmDQGfJn32gSZVJu4BaiX6Z5r8/gGMKnMSfCdnaFYVWm4NOFHtxWPAowJyNMeI8jADLT7JTJxAhmVeNMkt0/wgx2IOdwI1tPghHMaO0MKz24J3O4uDILmHZtsGwU3gwKtU1w+8S/R/BQY8y8XQYhDNssSQGeDG68XCJHBvod8VMOf5agZaDImQYSa9wNtvLbfWgaMEv+/adCg1BKHFLzT+BPnWr8OClULHVpz7lLtPdVlR98V8Zw9WVyteEbyO8dRB4Fm3PckscAscCufRY08SJS8iW1wCXzoSJNlQvSfxcXWLCTJBJsgEmSATZIJMkAkyQSb4i8InTbqZuApo1crEMS+7ApDNtsVGXisNtgGVQL4RqWFrZeIsYCrqmqpdBToRpFJbTtR1OjCvC8ESoCvO/WagWgeCS0BqnPs+IOD0GY4GI0g3oqlL0KVCOI/3BEGOvrMFC10nDPMDblc0SJ5aaKFfLjBk9yG26oPQHoUQquBnWBxC53plQNCrXDwtQY4kzYjUsN03MbRHoaPFxrPIoWpcJQhyyUbklNNnU/MB2fwvq8EOoNyBY5UC7a44CbSXjeYcyHYY2OkPFUWGOOhR6SQTCsgZYo5xpSaG9kqFeVVJp8jhyhas9MYhkz7JEhmDcvci0OBKoOZNk0oNcmWBCTJBJsgEmaDe8i3AAABaiPID+002AAAAAElFTkSuQmCC');
+  background-repeat: no-repeat;
+  background-position: 50% 3px;
+  width: 40px;
+  height: 100%;
+  position: absolute;
+  right: 0;
+  top: 0;
+  transition: none;
+}
+aside.right-off-canvas-menu ul.off-canvas-list li a.toggle.open {
+  background-position: 50% -40px;
+}
+aside.right-off-canvas-menu ul.off-canvas-list li > ul.open {
+  display: block;
+}
+aside.right-off-canvas-menu ul.off-canvas-list li > ul {
+  display: none;
+}
+aside.right-off-canvas-menu ul.off-canvas-list li > ul li > a {
+  padding-left: 10px;
+  margin-left: 25px;
+  font-size: 16px;
+  line-height: 18px;
+}
+/* END toggle class for off-canvas menu*/
index 91ff58d..6e519e9 100755 (executable)
             <div class="inner-wrap">
 
                 <aside class="right-off-canvas-menu show-for-medium-down">
-                    <ul class="off-canvas-list">
-                        <li><a href="#">Home</a></li>
-                        <li><a href="#">Accommodations</a></li>
-                        <li><a href="#">The Resort</a></li>
-                        <li><a href="#">Things to See and Do</a></li>
-                        <li><a href="#">Area Info</a></li>
-                        <li><a href="#">Lodging Specials</a></li>
-                        <li><a href="#">Golf Packages</a></li>
-                    </ul>
+                    {mobileNav:h}
                 </aside>
         <div id="wrapper"  class="row">
             <a href="{homePageUrl:h}" id="logo">Trout Creek Condominium Resort</a>