From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 9 Sep 2013 20:44:17 +0000 (+0000)
Subject: Update the Toolkit_Page class for urlBase
X-Git-Tag: v1.0~39
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=b8b9c83776e90739d9912ac4ef4f788b02b20388;p=web%2FMichiganTrailMaps.git

Update the Toolkit_Page class for urlBase

Setting up new variable for the template to use for the baseurl/
part of the url's. So the force compile option can be turned off.
---

diff --git a/Toolkit/Page.php b/Toolkit/Page.php
index d0adbb5..1727cc1 100755
--- a/Toolkit/Page.php
+++ b/Toolkit/Page.php
@@ -127,6 +127,8 @@ class Toolkit_Page
             ? BASE_SECURE_URL
             : BASE_URL;
 
+        $this->urlBase = BASE_URL;
+
         // determine the base url to use (for GLM_APP_BASE_URL)
         $this->glmAppBaseURL
             = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')
diff --git a/templates/template.html b/templates/template.html
index 6fa30b3..49d4918 100755
--- a/templates/template.html
+++ b/templates/template.html
@@ -20,7 +20,7 @@
 	<div id="wrapper_inner">
 		<header>
 			<a id="logo" href="{homePageUrl:h}">Michigan Trail Maps Home</a>
-			<a id="header_planner" href="baseurl/trip-planner-6/">Trip Planner (<span class="trip-list-count">{tripPlannerCount:h}</span>)</a>
+			<a id="header_planner" href="{urlBase:h}trip-planner-6/">Trip Planner (<span class="trip-list-count">{tripPlannerCount:h}</span>)</a>
 			<a id="fb_link" flexy:if="isHomePage" href="http://www.facebook.com/pages/MichiganTrailMapscom/137414706279294?ref=ts">Find Us on Facebook</a>
 			<a id="tw_link" flexy:if="isHomePage" href="http://twitter.com/MiTrailMaps">Follow Us on Twitter</a>
 			<div id="tagline">Michigan's Premier Trail Resource</div>
@@ -36,11 +36,11 @@
 		</header>
 		<nav id="topnav">
 			<ul>
-				<li><a href="baseurl/about-2/">About</a></li>
-				<li><a href="baseurl/find-trails-3/">Find Trails</a></li>
-				<li><a href="baseurl/shop-4/">Shop</a></li>
+				<li><a href="{urlBase:h}about-2/">About</a></li>
+				<li><a href="{urlBase:h}find-trails-3/">Find Trails</a></li>
+				<li><a href="{urlBase:h}shop-4/">Shop</a></li>
 				<li><a href="http://michigantrailmaps.com/blog/">Blog</a></li>
-				<li><a href="baseurl/contact-us-5/">Contact Us</a></li>
+				<li><a href="{urlBase:h}contact-us-5/">Contact Us</a></li>
 			</ul>
 		</nav><!--/#toponav-->
 		<div id="main">
@@ -50,8 +50,8 @@
 						<nav id="subnav">{sideNav:h}</nav>
 					</div><!--/#subnav-->
 					<div id="action_inside">
-						<a id="enews" href="baseurl/newsletter-7/">Sign Up For Our Enewsletter</a>
-						<a id="tripplanner" href="baseurl/trip-planner-6/">Trip And Trail Planner (<span class="trip-list-count">{tripPlannerCount:h}</span>)</a>
+						<a id="enews" href="{urlBase:h}newsletter-7/">Sign Up For Our Enewsletter</a>
+						<a id="tripplanner" href="{urlBase:h}trip-planner-6/">Trip And Trail Planner (<span class="trip-list-count">{tripPlannerCount:h}</span>)</a>
 					</div>
 					<div id="inside_social">
 						<a id="fb_link" href="http://www.facebook.com/pages/MichiganTrailMapscom/137414706279294?ref=ts">Find Us on Facebook</a>
@@ -113,8 +113,8 @@
 					</form>
 				</div><!--/#findatrail-->
 				<div id="action">
-					<a id="enews" href="baseurl/newsletter-7/">Sign Up For Our Enewsletter</a>
-					<a id="tripplanner" href="baseurl/trip-planner-6/">Trip And Trail Planner (<span class="trip-list-count">{tripPlannerCount:h}</span>)</a>
+					<a id="enews" href="{urlBase:h}newsletter-7/">Sign Up For Our Enewsletter</a>
+					<a id="tripplanner" href="{urlBase:h}trip-planner-6/">Trip And Trail Planner (<span class="trip-list-count">{tripPlannerCount:h}</span>)</a>
 				</div>
 				<div id="horizontal_banner_inside" flexy:if="hasHorizontalBanners">
 					{horizontalBannerAds:h}
@@ -153,8 +153,8 @@
 					<div id="action2">
 						<div id="trailshop_wrapper">
 							<h2>MichiganTrailMaps.com Trail Shop</h2>
-							<p>Now open - the <a href="baseurl/shop-4/">MichiganTrailMaps.com Trail Shop</a> with personally autographed books by the authors that wrote them! It's the best and most affordable way to purchase maps and trail guides to Michigan.</p>
-							<a id="goToShop" href="baseurl/shop-4/">Go</a>
+							<p>Now open - the <a href="{urlBase:h}shop-4/">MichiganTrailMaps.com Trail Shop</a> with personally autographed books by the authors that wrote them! It's the best and most affordable way to purchase maps and trail guides to Michigan.</p>
+							<a id="goToShop" href="{urlBase:h}shop-4/">Go</a>
 						</div><!--/#trailshop_wrapper-->
 						<h2>Trail Talk Blog</h2>
 						<div id="blog_wrapper_outer">