Permalink
Browse files

Fixed minor issues

Fixed some template logic. Added some addtional stuff (logo selectors
etc).
  • Loading branch information...
1 parent 535b741 commit a4075333b4bb3d24f84b547b5769e6c87740a235 @antonydoyle committed Sep 17, 2012
View
1 framework.php
@@ -10,6 +10,7 @@
$analytics = $this->params->get('analytics');
$jQuery = $this->params->get('jQuery');
$customCSS = $this->params->get('customCSS');
+$logoUp = $this->params->get('logoUp');
$custLogo = $this->params->get('custLogo');
$unOrbit = $this->params->get('unOrbit');
$unReveal = $this->params->get('unReveal');
View
15 index.php
@@ -17,14 +17,15 @@
<!-- Included CSS Files -->
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template ?>/css/foundation.css">
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template ?>/css/templateCore.css">
+ <?php if ($customCSS > 0) : ?>
+ <link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template ?>/css/<?php echo $customCSS ?>">
+ <?php endif; ?>
<script src="<?php echo $this->baseurl ?>/templates/<?php echo $this->template ?>/js/modernizr.foundation.js"></script>
<!-- IE Fix for HTML5 Tags -->
<!--[if lt IE 9]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
- <?php if ($analytics != 'UA-XXXXX-X') : ?>
<script type="text/javascript">
-
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '<?php echo $analytics ?>']);
_gaq.push(['_trackPageview']);
@@ -36,18 +37,22 @@
})();
</script>
-<?php endif; ?>
</head>
<body>
<!--Logo / Nav Row -->
<div class="row">
<div class="three columns">
- <a href="<?php echo $this->baseurl ?>" alt="<?php echo $siteName ?>" title="<?php echo $siteName ?>">
+ <?php if ($logoUp > 0) { ?>
+ <a href="<?php echo $this->baseurl ?>" alt="<?php echo $siteName ?>" title="<?php echo $siteName ?>">
<img src="<?php echo $custLogo ?>" alt="<?php echo $siteName ?>" title="<?php echo $siteName ?>" />
</a>
+
+ <?php } else { ?>
+ <jdoc:include type="modules" name="logo" style="html5" />
+ <?php }; ?>
</div>
- <?php if ($menu > 0) : ?>
+ <?php if ($menu > 0) : ?>
<nav class="nine columns">
<jdoc:include type="modules" name="menu" style="html5" />
</nav>
View
6 language/en-GB/en-GB.tpl_siegeengine.ini
@@ -0,0 +1,6 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2012 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+TPL_SIEGEENGINE_DESCRIPTION="Atomic is an easy to modify example of how basic template elements look. Atomic includes the <a href="_QQ_"https://github.com/joshuaclayton/blueprint-css/wiki"_QQ_">Blueprint CSS framework</a>.</p><p><a href="_QQ_"http://www.garethjmsaunders.co.uk/blueprint/cheatsheets/"_QQ_">Blueprint Cheat Sheets</a> </p><p>The PSD for the background may be found at <a href="_QQ_"http://help.joomla.org/files/blueprint_psd.zip"_QQ_">joomla.org</a></p>"
View
17 language/en-GB/en-GB.tpl_siegeengine.sys.ini
@@ -0,0 +1,17 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2012 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+
+TPL_SIEGEENGINE_DESCRIPTION="SiegeEngine is a responsive template framework for Joomla built around the Foundation3 framework. Full details and basic documentation can be found at <a href="_QQ_"https://www.siegeengine.org"_QQ_">www.siegeengine.org</a>.</p><p>Siege Engine was hastily assembled by <a href="_QQ_"http://www.antonydoyle.co.uk/blueprint/cheatsheets/"_QQ_">Antony Doyle</a>. </p><p><p>Thanks / Credits / Props to:</p>
+ <ul>
+ <li>Seth Warburton (@nternetinspired) for his <a href="_QQ_"http://www.joomlafuture.com"_QQ_">One Web framework / template</a>. Check it out, seriously. I borrowed a few elements, I hope it's alright? :)</li>
+ <li>Roberto Segura ‏(@phproberto) for his assistance</li>
+ <li><a href="_QQ_"http://www.joomla.org"_QQ_">Joomla!</a>, obviously.</li>
+ <li>Everyone else who offered comments & feedback.</li>
+ <li>Nescafe, for the coffee that kept me awake & focused</li>
+ <li>Anyone else who I've missed. I either read your books and thought 'that's a good point', or listened to your opinions on Twitter and liked them. Thanks.</li>
+ </ul></p>"
+
+
View
1 language/en-GB/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
View
1 language/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
View
32 templateDetails.xml
@@ -8,22 +8,10 @@
<authorUrl>http://www.antonydoyle.co.uk</authorUrl>
<copyright>Copyright (C) 2012 Antony Doyle | Siege21.com | Siegeworks. All rights Reserved</copyright>
<license>GNU General Public License version 2 or later</license>
- <version>1.0</version>
- <description><![CDATA[
- <h3>SiegeEngine - Joomla Template Framework</h3>
- <p>SiegeEngine is our own Joomla template framework based on Foundation3 from Zurb.</p>
- <p>All of the Foundation3 files are untouched, so you can make full use of this awesome CSS framework.</p>
- <p>There is a built in implimentation of the Orbit slideshow but, if you want a little more flexibility, you can also use our module-ised version. See docs for usage.</p>
- <p>Thanks / Credits / Props to:</p>
- <ul>
- <li>Seth Warburton (@nternetinspired) for his <a href="http://www.joomlafuture.com" title="Joomla Future" alt="Joomla Future">One Web framework / template</a>. Check it out, seriously. I borrowed a few elements, I hope it's alright? :)</li>
- <li>Matt Thomas (@betweenbrain) for <a href="http://construct-framework.com/" title="Construct Framework" alt="Construct Framework">Construct Framework</a>. Another excellent framework. I borrowed a few elements from there too, so thank you!</li>
- <li><a href="http://www.joomla.org">Joomla!</a>, obviously.</li>
- <li>The Foundation3 guys at Zurb. </li>
- <li>Nescafe, for the coffee that kept me awake & focused</li>
- <li>Anyone else who I've missed. I either read your books and thought "that's a good point", or listened to your opinions on Twitter and liked them. Thanks.</li>
- </ul>
- ]]></description>
+ <version>1.2</version>
+ <description>
+ TPL_SIEGEENGINE_DESCRIPTION
+ </description>
<files>
<filename>index.php</filename>
@@ -32,6 +20,7 @@
<folder>css</folder>
<folder>html</folder>
<folder>images</folder>
+ <folder>language</folder>
<folder>js</folder>
</files>
@@ -62,7 +51,12 @@
<position>footerTop4</position>
<position>debug</position>
</positions>
-
+
+ <languages folder="language">
+ <language tag="en-GB">en-GB/en-GB.tpl_siegeengine.ini</language>
+ <language tag="en-GB">en-GB/en-GB.tpl_siegeengine.sys.ini</language>
+ </languages>
+
<config>
<fields name="params">
<fieldset name="Customise Joomla! output" label="Customise Joomla! output" addfieldpath="/templates/siegeengine/" >
@@ -80,6 +74,10 @@
<field name="analytics" type="text" default="UA-XXXXX-X" label="Google Analytics ID" description="Change UA-XXXXX-X to be your site's ID" size="15" />
<field name="menuModTitle" type="text" default="MenuModule" label="Menu Mod Title" description="Change UA-XXXXX-X to be your site's ID" size="15" />
<field name="customCSS" type="filelist" default="" label="Load a Custom CSS file" description="" directory="templates/siegeengine/css/" filter="" exclude="foundation\.css|templateCore\.css" stripext="" />
+ <field name="logoUp" type="radio" default="1" label="Logo Selector" description="Select to use a module position or the upload box below for the logo">
+ <option value="1">Select box</option>
+ <option value="0">Module Position</option>
+ </field>
<field name="custLogo" label="Load a Custom Logo" type="media" directory="stories" />
</fieldset>

0 comments on commit a407533

Please sign in to comment.