Merge pull request #18 from simonwelsh/30-update

Updates templates to more SS3-ready syntax
This commit is contained in:
Will Rossiter 2012-10-26 21:53:34 -07:00
commit 878fc3261b
7 changed files with 45 additions and 45 deletions

View File

@ -1,5 +1,5 @@
<% if Level(2) %> <% if $Level(2) %>
<div id="Breadcrumbs"> <div id="Breadcrumbs">
$Breadcrumbs $Breadcrumbs
</div> </div>
<% end_if %> <% end_if %>

View File

@ -2,16 +2,16 @@
<div class="inner"> <div class="inner">
<a href="$BaseHref" class="brand" rel="home"> <a href="$BaseHref" class="brand" rel="home">
<h1>$SiteConfig.Title</h1> <h1>$SiteConfig.Title</h1>
<% if SiteConfig.Tagline %> <% if $SiteConfig.Tagline %>
<p>$SiteConfig.Tagline</p> <p>$SiteConfig.Tagline</p>
<% end_if %> <% end_if %>
</a> </a>
<% if SearchForm %> <% if $SearchForm %>
<span class="search-dropdown-icon">L</span> <span class="search-dropdown-icon">L</span>
<div class="search-bar"> <div class="search-bar">
$SearchForm $SearchForm
</div> </div>
<% end_if %> <% end_if %>
<% include Navigation %> <% include Navigation %>
</div> </div>
</header> </header>

View File

@ -1,8 +1,8 @@
<nav class="primary"> <nav class="primary">
<span class="nav-open-button">²</span> <span class="nav-open-button">²</span>
<ul> <ul>
<% loop Menu(1) %> <% loop $Menu(1) %>
<li class="$LinkingMode"><a href="$Link" title="$Title.XML">$MenuTitle.XML</a></li> <li class="$LinkingMode"><a href="$Link" title="$Title.XML">$MenuTitle.XML</a></li>
<% end_loop %> <% end_loop %>
</ul> </ul>
</nav> </nav>

View File

@ -1,16 +1,16 @@
<aside> <aside>
<% if Menu(2) %> <% if $Menu(2) %>
<nav class="secondary"> <nav class="secondary">
<h3> <h3>
<% loop Level(1) %> <% loop $Level(1) %>
$Title $Title
<% end_loop %> <% end_loop %>
</h3> </h3>
<ul> <ul>
<% loop Menu(1) %> <% loop $Menu(1) %>
<% include SidebarMenu %> <% include SidebarMenu %>
<% end_loop %> <% end_loop %>
</ul> </ul>
</nav> </nav>
<% end_if %> <% end_if %>
</aside> </aside>

View File

@ -1,18 +1,18 @@
<!--Include SidebarMenu recursively /--> <%--Include SidebarMenu recursively --%>
<% if Children %> <% if $Children %>
<% loop Children %> <% loop $Children %>
<li class="$LinkingMode"> <li class="$LinkingMode">
<a href="$Link" class="$LinkingMode" title="Go to the $Title.XML page"> <a href="$Link" class="$LinkingMode" title="Go to the $Title.XML page">
<span class="arrow">&rarr;</span> <span class="arrow">&rarr;</span>
<span class="text">$MenuTitle.XML</span> <span class="text">$MenuTitle.XML</span>
</a> </a>
<% if Children %> <% if $Children %>
<ul> <ul>
<% include SidebarMenu %> <% include SidebarMenu %>
</ul> </ul>
<% end_if %> <% end_if %>
</li> </li>
<% end_loop %> <% end_loop %>
<% end_if %> <% end_if %>

View File

@ -1,54 +1,54 @@
<div id="Content" class="searchResults"> <div id="Content" class="searchResults">
<h1>$Title</h1> <h1>$Title</h1>
<% if Query %> <% if $Query %>
<p class="searchQuery">You searched for &quot;{$Query}&quot;</p> <p class="searchQuery">You searched for &quot;{$Query}&quot;</p>
<% end_if %> <% end_if %>
<% if Results %> <% if $Results %>
<ul id="SearchResults"> <ul id="SearchResults">
<% control Results %> <% loop $Results %>
<li> <li>
<h4> <h4>
<a href="$Link"> <a href="$Link">
<% if MenuTitle %> <% if $MenuTitle %>
$MenuTitle $MenuTitle
<% else %> <% else %>
$Title $Title
<% end_if %> <% end_if %>
</a> </a>
</h4> </h4>
<% if Content %> <% if $Content %>
<p>$Content.LimitWordCountXML</p> <p>$Content.LimitWordCountXML</p>
<% end_if %> <% end_if %>
<a class="readMoreLink" href="$Link" title="Read more about &quot;{$Title}&quot;">Read more about &quot;{$Title}&quot;...</a> <a class="readMoreLink" href="$Link" title="Read more about &quot;{$Title}&quot;">Read more about &quot;{$Title}&quot;...</a>
</li> </li>
<% end_control %> <% end_loop %>
</ul> </ul>
<% else %> <% else %>
<p>Sorry, your search query did not return any results.</p> <p>Sorry, your search query did not return any results.</p>
<% end_if %> <% end_if %>
<% if Results.MoreThanOnePage %> <% if $Results.MoreThanOnePage %>
<div id="PageNumbers"> <div id="PageNumbers">
<div class="pagination"> <div class="pagination">
<% if Results.NotFirstPage %> <% if $Results.NotFirstPage %>
<a class="prev" href="$Results.PrevLink" title="View the previous page">&larr;</a> <a class="prev" href="$Results.PrevLink" title="View the previous page">&larr;</a>
<% end_if %> <% end_if %>
<span> <span>
<% control Results.Pages %> <% loop $Results.Pages %>
<% if CurrentBool %> <% if $CurrentBool %>
$PageNum $PageNum
<% else %> <% else %>
<a href="$Link" title="View page number $PageNum" class="go-to-page">$PageNum</a> <a href="$Link" title="View page number $PageNum" class="go-to-page">$PageNum</a>
<% end_if %> <% end_if %>
<% end_control %> <% end_loop %>
</span> </span>
<% if Results.NotLastPage %> <% if $Results.NotLastPage %>
<a class="next" href="$Results.NextLink" title="View the next page">&rarr;</a> <a class="next" href="$Results.NextLink" title="View the next page">&rarr;</a>
<% end_if %> <% end_if %>
</div> </div>
<p>Page $Results.CurrentPage of $Results.TotalPages</p> <p>Page $Results.CurrentPage of $Results.TotalPages</p>
</div> </div>
<% end_if %> <% end_if %>
</div> </div>

View File

@ -14,7 +14,7 @@ Change it, enhance it and most importantly enjoy it!
<!--[if IE 8 ]><html lang="$ContentLocale" class="ie ie8"><![endif]--> <!--[if IE 8 ]><html lang="$ContentLocale" class="ie ie8"><![endif]-->
<head> <head>
<% base_tag %> <% base_tag %>
<title><% if MetaTitle %>$MetaTitle<% else %>$Title<% end_if %> &raquo; $SiteConfig.Title</title> <title><% if $MetaTitle %>$MetaTitle<% else %>$Title<% end_if %> &raquo; $SiteConfig.Title</title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@ -22,13 +22,13 @@ Change it, enhance it and most importantly enjoy it!
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script> <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]--> <![endif]-->
<% require themedCSS(reset) %> <% require themedCSS('reset') %>
<% require themedCSS(typography) %> <% require themedCSS('typography') %>
<% require themedCSS(form) %> <% require themedCSS('form') %>
<% require themedCSS(layout) %> <% require themedCSS('layout') %>
<link rel="shortcut icon" href="$ThemeDir/images/favicon.ico" /> <link rel="shortcut icon" href="$ThemeDir/images/favicon.ico" />
</head> </head>
<body class="$ClassName<% if Menu(2) %><% else %> no-sidebar<% end_if %>"> <body class="$ClassName<% if not $Menu(2) %> no-sidebar<% end_if %>">
<% include Header %> <% include Header %>
<div class="main" role="main"> <div class="main" role="main">
<div class="inner typography"> <div class="inner typography">
@ -37,9 +37,9 @@ Change it, enhance it and most importantly enjoy it!
</div> </div>
<% include Footer %> <% include Footer %>
<% require javascript(framework/thirdparty/jquery/jquery.js) %> <% require javascript('framework/thirdparty/jquery/jquery.js') %>
<%-- Please move: Theme javascript (below) should be moved to mysite/code/page.php --%> <%-- Please move: Theme javascript (below) should be moved to mysite/code/page.php --%>
<script type="text/javascript" src="{$ThemeDir}/javascript/script.js"></script> <script type="text/javascript" src="{$ThemeDir}/javascript/script.js"></script>
</body> </body>
</html> </html>