Permalink
Browse files

Initial Updates for 3.0 compatibility

  • Loading branch information...
1 parent c9d53ae commit fa13bfef3f0e0cd9b57a4255479ef9f9b624912b @antonydoyle committed Sep 28, 2012
View
10 README.md
@@ -6,4 +6,12 @@
<h3>Check out <a href="http://www.siegeengine.org/">SiegeEngine.org</a> for more information.</h3>
<h5>Updated - 17/9/12</h5>
-<p>Fixed some minor issues that were breaking a few features.</p>
+<p>Fixed some minor issues that were breaking a few features.</p>
+<h5>Updated - 28/9/12</h5>
+<p>Updated for compatibility with Joomla 3.0.</p>
+<ul>
+<li>Added fixed MooTools toggle</li>
+<li>Added template width override</li>
+<li>Fixed a menu issue causing problems on 3.0</li>
+</ul>
+<p>Some features are still untested on 3.0, so please use with caution and take backups! </p>
View
650 css/florence.css
@@ -0,0 +1,650 @@
+body {
+ background:#F3F3F3;
+ font-size:13px;
+
+}
+
+p {
+ text-shadow:0 1px 0 #fff;
+ font-size:13px;
+}
+#logo a {
+
+}
+a {
+ color:#ec008c;
+}
+a:hover {
+ color:#97bf0d;
+}
+a:focus {
+ color:#97bf0d;
+}
+.componentheading {
+ font-size: 2.8em;
+ line-height: 2em;
+ color:#333;
+ text-shadow:0 1px 0 #fff;
+}
+
+#header {
+background:#76b4cf;
+padding-top:10px;
+border-bottom:1px solid #3b6172;
+}
+.headcont {
+ margin: 15px auto;
+ max-width: 85em;
+ width: 95%;
+}
+#body-container {
+}
+
+/* Width Overrides */
+
+.main-only #content-main{float:left;width:100%;}
+.main-only #load-first{width:100%;}
+
+.alpha-1-main #load-first{width:100%;}
+.alpha-1-main #content-main{float:right;width:72%;}
+.alpha-1-main #column-group-alpha{float:left;width:28%;}
+
+.alpha-2-main #load-first{width:100%;}
+.alpha-2-main #content-main{float:right;width:72%;}
+.alpha-2-main #column-group-alpha{float:left;width:28%;}
+
+.main-beta-1 #content-main{float:left;width:100%;}
+.main-beta-1 #load-first{width:72%;}
+.main-beta-1 #column-group-beta{float:right;width:28%;}
+
+.main-beta-2 #content-main{float:left;width:100%;}
+.main-beta-2 #load-first{width:62%;}
+.main-beta-2 #column-group-beta{float:right;width:38%;}
+
+.alpha-1-main-beta-1 #load-first{width:81%;}
+.alpha-1-main-beta-1 #content-main{float:right;width:74.2%;}
+.alpha-1-main-beta-1 #column-group-alpha{float:left;width:25.8%;}
+.alpha-1-main-beta-1 #column-group-beta{float:right;width:19%;}
+
+.alpha-2-main-beta-1 #load-first{width:81%;}
+.alpha-2-main-beta-1 #content-main{float:right;width:62%;}
+.alpha-2-main-beta-1 #column-group-alpha{float:left;width:38%;}
+.alpha-2-main-beta-1 #column-group-beta{float:right;width:19%;}
+
+.alpha-1-main-beta-2 #load-first{width:62%;}
+.alpha-1-main-beta-2 #content-main{float:right;width:65.5%;}
+.alpha-1-main-beta-2 #column-group-alpha{float:left;width:34.5%;}
+.alpha-1-main-beta-2 #column-group-beta{float:right;width:38%;}
+
+.alpha-2-main-beta-2 #load-first{width:62%;}
+.alpha-2-main-beta-2 #content-main{float:right;width:38%;}
+.alpha-2-main-beta-2 #column-group-alpha{float:left;width:62%;}
+.alpha-2-main-beta-2 #column-group-beta{float:right;width:38%;}
+/*Menu Stuff */
+
+.nav-bar {
+ float:right;
+}
+#nav {
+ float:right;
+ clear:right;
+}
+#nav ul, ol {
+ margin: 0 0;
+ padding: 0;
+
+}
+ul.menu a, ul.menu span.separator {
+ display: block;
+ padding: 0.7em 1.3em;
+}
+#nav li {
+ margin-left:5px;
+}
+#nav li ul li {
+ margin-left:0px;
+}
+li a {
+ font-size:1.2em !important;
+
+}
+#nav li a {
+ color:#fff;
+ background:#ec008c;
+ border:1px solid #9e035f;
+ border-radius:5px;
+ box-shadow:inset 0 0px 1px rgba(255,255,255,0.3), 0 0px 1px rgba(0,0,0,0.3);
+}
+#nav li ul li a{
+ color:#fff;
+ background:#ec008c;
+ border-top:0px solid #9e035f;
+ border-bottom:0px solid #9e035f;
+ border-radius:0px;
+ box-shadow:none;
+}
+#nav li a:hover {
+ background:#97bf0d;
+ color:#333;
+ text-decoration:none;
+ border:1px solid #516609;
+ box-shadow:none;
+
+}
+#nav li .active a {
+ background:#97bf0d !important;
+ text-decoration:none;
+ border:1px solid #516609;
+ box-shadow:none;
+
+}
+#nav ul li.active a {
+ background:#97bf0d;
+ text-decoration:none;
+ border:1px solid #516609;
+ box-shadow:none;
+}
+#nav ul li.active ul li a {
+ background:#97bf0d;
+ text-decoration:none;
+ border:none;
+ border-left:1px solid #9e035f;
+ border-right:1px solid #9e035f;
+ box-shadow:none;
+}
+#nav ul li.active ul li a {
+ background:#ec008c;
+ box-shadow:none;
+}
+#nav ul li.active ul li a:hover {
+ background:#97bf0d;
+ box-shadow:none;
+}
+#nav ul li ul li a .active {
+ background:#97bf0d;
+ box-shadow:none;
+}
+#nav ul li ul a:hover {
+ box-shadow:none !important;
+ border-top:none !important;
+ border-bottom:none;
+}
+.flyout {
+ background: url(../images/menu-top.png) top no-repeat;
+ padding-top:15px !important;
+ border-left:none !important;
+ border-right:none !important;
+ border-top:none !important;
+ border-bottom:1px solid #9e035f;
+ width:200px;
+}
+ul.menu ul a {
+ border-left:1px solid #9e035f;
+ border-right:1px solid #9e035f;
+}
+ul.menu ul li a{
+ border-radius:0 !important;
+
+}
+ul.menu ul li:first-of-type {
+ border-top:none !important;
+}
+ul.menu ul a:hover {
+ background: #76b4cf;
+ color:#fff;
+ text-decoration:none;
+}
+#navmobile {
+ display:none;
+}
+#navmobilebut {
+ display:none;
+ }
+nav.breadcrumbs {
+ margin-top:20px;
+ margin-bottom:10px;
+ width:100%;
+
+}
+.breadcrumbs ol {
+ background:#ec008c;
+ border:1px solid #9e035f;
+}
+.breadcrumbs ol li {
+ padding:3px 4px;
+ display:inline-block;
+ color:#fff;
+
+}
+.breadcrumbs li a{
+ display:inline-block;
+ font-size:1em;
+ color:#fff;
+}
+.breadcrumbs h5 {
+ display:inline;
+ width:90px;
+ float:left;
+ padding:4px 0 3px 4px;
+ margin:0px 0px;
+ color:#fff;
+}
+/* Tabs Stuff */
+.fronttabs {
+ margin-left:-10px;
+ padding-bottom:15px;
+ border-bottom: 1px solid #DDDDDD;
+}
+.sprocket-tabs-panels {
+ padding: 15px 10px
+}
+.sprocket-tabs-panels img {
+ float:right;
+ margin-left:10px;
+ display:block;
+}
+.sprocket-tabs-nav {
+ background:none repeat scroll 0 0 transparent !important;
+}
+.sprocket-tabs-nav li {
+ color:#fff;
+}
+.sprocket-tabs-nav > li.active > .sprocket-tabs-inner {
+ background-color:transparent !important;
+}
+
+.sprocket-tabs-nav li:first-of-type .sprocket-tabs-inner {
+ background:#b06408;
+ border-top:1px solid #774406;
+ border-left:1px solid #774406;
+ border-right:1px solid #774406;
+ box-shadow:inset 0 1px 1px rgba(255,255,255,0.3), 0 -1px 1px rgba(0,0,0,0.3);
+}
+.sprocket-tabs-nav li:nth-of-type(2) .sprocket-tabs-inner {
+ background:#ec008c;
+ border-top:1px solid #9e035f;
+ border-left:1px solid #9e035f;
+ border-right:1px solid #9e035f;
+ box-shadow:inset 0 1px 1px rgba(255,255,255,0.3), 0 -1px 1px rgba(0,0,0,0.3);
+}
+.sprocket-tabs-nav li:nth-of-type(3) .sprocket-tabs-inner {
+ background:#97bf0d;
+ border-top:1px solid #516609;
+ border-left:1px solid #516609;
+ border-right:1px solid #516609;
+ box-shadow:inset 0 1px 1px rgba(255,255,255,0.3), 0 -1px 1px rgba(0,0,0,0.3);
+}
+.sprocket-tabs-nav li:nth-of-type(4) .sprocket-tabs-inner {
+ background:#76b4cf;
+ border-top:1px solid #2f637a;
+ border-left:1px solid #2f637a;
+ border-right:1px solid #2f637a;
+ box-shadow:inset 0 1px 1px rgba(255,255,255,0.3), 0 -1px 1px rgba(0,0,0,0.3);
+}
+.sprocket-tabs-nav li:nth-of-type(5) .sprocket-tabs-inner {
+ background:#b06408;
+ border-top:1px solid #774406;
+ border-left:1px solid #774406;
+ border-right:1px solid #774406;
+ box-shadow:inset 0 1px 1px rgba(255,255,255,0.3), 0 -1px 1px rgba(0,0,0,0.3);;
+}
+.sprocket-tabs-nav li:nth-of-type(6) .sprocket-tabs-inner {
+ background:#ec008c;
+ border-top:1px solid #9e035f;
+ border-left:1px solid #9e035f;
+ border-right:1px solid #9e035f;
+ box-shadow:inset 0 1px 1px rgba(255,255,255,0.3), 0 -1px 1px rgba(0,0,0,0.3);
+}
+.sprocket-tabs-nav li:nth-of-type(7) .sprocket-tabs-inner {
+ background:#97bf0d;
+ border-top:1px solid #516609;
+ border-left:1px solid #516609;
+ border-right:1px solid #516609;
+ box-shadow:inset 0 1px 1px rgba(255,255,255,0.3), 0 -1px 1px rgba(0,0,0,0.3);
+}
+.sprocket-tabs-nav li .sprocket-tabs-inner:hover {
+ box-shadow:none;
+}
+.sprocket-tabs-panel a {
+ background:#ec008c;
+ padding:7px 12px;
+ color:#fff;
+ text-shadow:none;
+ text-decoration:none;
+ margin-top:10px;
+}
+.sprocket-tabs-panel a:hover {
+ background:#97bf0d;
+}
+.sprocket-tabs-nav > li > .sprocket-tabs-inner {
+ color:#fff;
+ text-shadow:0 1px 0 #333;
+ box-shadow:none;
+ font-size:1.2em;
+}
+.sprocket-tabs-nav > li.active > .sprocket-tabs-inner {
+ color:#333;
+ text-shadow:0 1px 0 #fff;
+ box-shadow:none;
+}
+.slideshow {
+ margin-top: 10px !important;
+}
+/* K2 Stuff */
+.eventDate {
+ background: #ec008c;
+ border-radius:500px;
+ border:#9e035f solid 1px;
+ height: 130px;
+ width: 130px;
+ box-shadow:inset 0 1px 1px rgba(255,255,255,0.3), 0 -1px 1px rgba(0,0,0,0.3);
+
+}
+.dates {
+ text-align:center;
+ margin-top:18px;
+ line-height:1.5em;
+}
+.catItemExtraFieldsValue {
+ font-size:1.5em;
+ color:#fff;
+ font-weight:bold;
+ text-shadow:-1px -1px 0 #333;
+
+}
+.catItemExtraFields {
+ max-width:140px;
+ float:left;
+ border-top: none !important;
+}
+.catItemExtraFieldsLabel {
+ font-style:italic;
+}
+.catItemImageBlock {
+ float: right;
+ margin-top: 50px !important;
+ max-width: 400px;
+ padding:0 !important;
+
+ }
+
+.eventItemIntroText {
+ width:310px;
+ float:left;
+ margin-left:20px;
+ margin-right:20px;
+ margin-top:10px;
+
+}
+.k2ReadMore {
+ background:#ec008c;
+ padding:7px 12px;
+ color:#fff;
+ text-shadow:none;
+ text-decoration:none;
+ margin-top:10px;
+}
+.k2ReadMore:hover {
+ background:#97bf0d;
+ color:#fff;
+ text-decoration:none;
+
+}
+.catItemCommentsLink a {
+ background:#ec008c;
+ padding:7px 12px;
+ color:#fff;
+ text-shadow:none;
+ text-decoration:none;
+ margin-top:10px;
+}
+.catItemCommentsLink a:hover {
+ background:#97bf0d;
+ color:#fff;
+ text-decoration:none;
+}
+.eventsLinks {
+ float:right;
+
+}
+.groupLeading {
+ border-bottom:1px solid #ec008c;
+ padding-bottom:25px !important;
+}
+.sprocket-lists-image {
+ clear: both !important;
+ float: left;
+ margin: 15px !important;
+}
+
+.moduletable h3 {
+ background: none repeat scroll 0 0 #EC008C;
+ border: 1px solid #9E035F;
+ box-shadow: 0 1px 1px rgba(255, 255, 255, 0.3) inset, 0 -1px 1px rgba(0, 0, 0, 0.3);
+ border-radius: 4px;
+ padding: 10px 15px; color:#fff;
+ text-shadow: 0 1px 0 #333333;
+ margin-bottom:10px;
+}
+.sprocket-lists {
+ margin-top:30px;
+}
+
+.itemExtraFieldsItem {
+ max-width:140px;
+ float:left;
+ border-top: none !important;
+ margin-right:10px;
+ margin-left:-50px;
+}
+div.itemToolbar {
+ background: none repeat scroll 0 0 transparent;
+ border-bottom: none;
+ border-top: none;
+ margin: 16px 0 0;
+ padding: 2px 0;
+}
+.itemImageBlock {
+ float:right;
+
+}
+
+span.itemImage img {
+ border: none;
+ padding: 0px;
+}
+div.k2FeedIcon {
+ padding: 4px 8px;
+ width:30px;
+ float:right;
+}
+#header-below-1 {
+ width:70%;
+}
+
+#header-below-6 {
+ width:30%;
+}
+#header-below-6 .noaccordion {
+ margin:0px !important;
+}
+.noaccordion .sprocket-lists-title {
+ background: transparent;
+ border:none;
+}
+.noaccordion h3{
+ margin-left:0px;
+ background: none repeat scroll 0 0 #EC008C;
+ border: 1px solid #9E035F;
+ box-shadow: 0 1px 1px rgba(255, 255, 255, 0.3) inset, 0 -1px 1px rgba(0, 0, 0, 0.3);
+ border-radius: 4px;
+ padding: 10px 15px; color:#fff;
+ text-shadow: 0 1px 0 #333333;
+ margin-bottom:5px;
+ margin-top: 10px;
+}
+.noaccordion .sprocket-lists {
+ margin-top:0px;
+}
+.noaccordion .sprocket-lists-container li {
+ border-bottom:1px solid #ec008c;
+ margin-top:10px;
+
+}
+#header-below-1 .gutter {
+ margin-left:0px;
+}
+.theme-default .nivoSlider {
+ background: url("loading.gif") no-repeat scroll 50% 50% #FFFFFF;
+ box-shadow: none !important;
+ border:1px solid #5c3506;
+ margin: 0 auto;
+}
+
+
+@media only screen and (max-width: 760px) {
+ #nav {
+ display:none;
+ }
+ #navmobile {
+ display:inline;
+
+ }
+ #navmobilebut {
+ position: absolute;
+ right:-30px;
+ top:100px;
+ display:block;
+ margin-right:50px;
+ overflow:visible;
+ }
+ #navmobilebut a {
+ background:#97bf0d;
+ padding:8px 18px;
+ border-radius:3px;
+ border:1px solid #516609;
+ box-shadow:inset 0 1px 1px rgba(255,255,255,0.3), 0 0px 1px rgba(0,0,0,0.3);
+ background-image:url(../images/menu-mob-but.png);
+ background-repeat:no-repeat;
+ background-position:center;
+ background-size:auto !important
+ }
+ #navmobilebut a span {
+
+ }
+
+ #navmobilebut a:hover {
+ text-decoration:none;
+ box-shadow:none;
+ color:#000;
+ text-shadow:none;
+ }
+ #header-below-1, content-above-1, #header-below-6, .main-beta-1 #load-first, .main-beta-1 #column-group-beta {
+ width:100%;
+ margin:0px;
+ }
+ .sprocket-tabs-nav > li > .sprocket-tabs-inner {
+ font-size:1em;
+ }
+ .fronttabs {
+ margin-left: 5px;
+}
+nav.breadcrumbs {
+ margin-bottom: 10px;
+ margin-top: 20px;
+ margin-left:10px;
+ margin-right:15px;
+ width: 98%;}
+
+#navmobile {
+ width:480px;
+ margin:20px auto;
+ margin-left:auto;
+ margin-right: auto;
+}
+
+#navmobile ul.nav-bar {
+ list-style: none outside none;
+ margin-top: 30px;
+ margin-left:auto;
+ margin-right: auto;
+ width:80%;
+ float:none;
+}
+#navmobile ul.nav-bar li {
+ background-color: #ec008c;
+ margin: 0;
+ margin-top:2px;
+ margin-bottom:2px;
+}
+#navmobile ul.nav-bar li a {
+ color: #FFFFFF;
+ display: inline;
+ font-size: 1.8rem;
+ padding: 3px 15px 2px;
+ display: block;
+
+}
+#navmobile ul.nav-bar li:hover, ul.nav-bar li.active {
+ border-radius: 0 0 0 0;
+ text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.4);
+ background-color: #97bf0d;
+}
+#navmobile ul.nav-bar li.active ul.flyout {
+ display:block;
+ background-image:none;
+ padding-top:0;
+}
+#navmobile ul.nav-bar li.active ul.flyout a{
+ display:block;
+ background-image:none;
+ background:#ec008c;
+ padding: 10px 5px;
+ border-color: transparent;
+ border-style: solid;
+ border-width: 0;
+ box-shadow: none;
+ text-indent:40px;
+
+}
+#navmobile ul.nav-bar li.active ul.flyout a:hover{
+ background-color: #97bf0d;
+
+}
+#navmobile ul.nav-bar li.active ul.flyout li.active a{
+ background-color: #97bf0d;
+
+}
+div.catItemHeader h3.catItemTitle {
+ font-size:20px;
+}
+.catItemExtraFields{
+ float:none;
+}
+.itemImageBlock {
+ float:none;
+}
+div.itemCommentsForm form textarea.inputbox,div.itemCommentsForm form input.inputbox {
+ width:200px;
+}
+div.catItemExtraFields, div.genericItemExtraFields {
+ margin-left:auto;
+ margin-right:auto;
+}
+
+.eventItemIntroText {width:100%; clear:both; float:none; margin:0;}
+.catItemImageBlock {
+ clear: both;
+ float: none;
+ margin-top: 0px !important;
+ max-width: 100%;
+ padding: 0 !important;
+}
+.itemExtraFieldsItem {
+ border-top: medium none !important;
+ float: left;
+ margin-left: 20px;
+ margin-right: 10px;
+ max-width: 140px;
+}
+}
View
19 framework.php
@@ -23,7 +23,7 @@
$unPlaceholder = $this->params->get('unPlaceholder');
$unAlerts = $this->params->get('unAlerts');
$minFound = $this->params->get('minFound');
-
+$setWidth = $this->params->get('setWidth');
$pageTitle = $this->getTitle();
$option = JRequest::getCmd('option');
@@ -35,8 +35,7 @@
$article->load($article_id);
}
-$config =& JFactory::getConfig();
-$siteName = $config->getValue( 'config.sitename' );
+
$logo = (int) ($this->countModules('logo') > 0);
$menu = (int) ($this->countModules('menu') > 0);
@@ -164,8 +163,9 @@
// GPL code taken from Construct template framework by Matt Thomas http://construct-framework.com/
// To enable use of site configuration
-$app = JFactory::getApplication();
-
+$app = JFactory::getApplication();
+$pageParams = $app->getParams();
+$sitename = $app->getCfg('sitename');
// Returns a reference to the global document object
$doc = JFactory::getDocument();
@@ -177,16 +177,23 @@
// Remove MooTools if set to no.
if ( !$loadMoo ) {
-unset($doc->_scripts[$this->baseurl.'/media/system/js/mootools-core.js']);
+ unset($doc->_scripts[$this->baseurl.'/media/system/js/mootools-core.js']);
unset($doc->_scripts[$this->baseurl.'/media/system/js/mootools-more.js']);
unset($doc->_scripts[$this->baseurl.'/media/system/js/core.js']);
unset($doc->_scripts[$this->baseurl.'/media/system/js/caption.js']);
+ unset($doc->_scripts[$this->baseurl.'/media/system/js/modal.js']);
unset($doc->_scripts[$this->baseurl.'/media/system/js/mootools.js']);
unset($doc->_scripts[$this->baseurl.'/plugins/system/mtupgrade/mootools.js']);
}
#-------------End Construct Code--------------------------------------#
+// Add stylesheets etc
+$doc->addStyleSheet($template.'/css/foundation.css');
+$doc->addStyleSheet($template.'/css/templateCore.css');
+$doc->addCustomTag('<script src="'.$template.'/js/modernizr.foundation.js"></script>');
+
+
if ($minFound > 0) {
$doc->addCustomTag('<script src="'.$template.'/js/foundation.js"></script>');
}
View
7 html/com_content/article/default.php
@@ -47,7 +47,9 @@
<?php echo $this->escape($this->item->title); ?>
<?php endif; ?>
</h1>
- <?php if ($canEdit || $params->get('show_print_icon') || $params->get('show_email_icon')) : ?>
+</header>
+<?php endif; ?>
+<?php if ($canEdit || $params->get('show_print_icon') || $params->get('show_email_icon')) : ?>
<section class="actions">
<ul>
<?php if (!$this->print) : ?>
@@ -78,9 +80,6 @@
</ul>
</section>
<?php endif; ?>
-</header>
-<?php endif; ?>
-
<?php if (!$params->get('show_intro')) :
echo $this->item->event->afterDisplayTitle;
endif; ?>
View
55 html/mod_menu/default.php
@@ -1,20 +1,21 @@
<?php
/**
- * @package Joomla.Site
- * @subpackage mod_menu
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE.txt
+ * @package Joomla.Site
+ * @subpackage mod_menu
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
*/
-// No direct access.
defined('_JEXEC') or die;
// Note. It is important to remove spaces between elements.
?>
-
-<ul class="nav-bar"<?php
+<?php // The menu class is deprecated. Use nav instead. ?>
+<ul class="nav-bar <?php echo $class_sfx;?>"<?php
$tag = '';
- if ($params->get('tag_id')!=NULL) {
+ if ($params->get('tag_id') != null)
+ {
$tag = $params->get('tag_id').'';
echo ' id="'.$tag.'"';
}
@@ -31,17 +32,19 @@
}
elseif ($item->type == 'alias') {
$aliasToId = $item->params->get('aliasoptions');
- if (count($path) > 0 && $aliasToId == $path[count($path)-1]) {
+ if (count($path) > 0 && $aliasToId == $path[count($path) - 1]) {
$class .= ' active';
}
elseif (in_array($aliasToId, $path)) {
$class .= ' alias-parent-active';
}
}
-
if ($item->deeper) {
$class .= 'deeper has-flyout';
}
+ if ($item->deeper) {
+ $class .= ' deeper';
+ }
if ($item->parent) {
$class .= ' parent';
@@ -65,12 +68,9 @@
require JModuleHelper::getLayoutPath('mod_menu', 'default_url');
break;
endswitch;
- if ($item->deeper) {
- echo ' <a class="flyout-toggle" href="#">
- <span> </span>
- </a>';
+ if ($item->deeper) {
+ echo ' <a class="flyout-toggle" href="#"><span> </span></a>';
}
-
// The next item is deeper.
if ($item->deeper) {
echo '<ul class="flyout">';
@@ -85,27 +85,4 @@
echo '</li>';
}
endforeach;
-
-?>
-<?php
-
-$doc = JFactory::getDocument();
-$renderer = $doc->loadRenderer( 'modules' );
-$html5 = array( 'style' => 'html5' );
-$template = $app->getTemplate(true);
-$params = $template->params;
-$menuModTitle = $params->get('menuModTitle');
-?>
-<li class="has-flyout">
- <a href="#"><?php echo $menuModTitle ?></a>
- <a href="#" class="flyout-toggle"><span> </span></a>
- <div class="flyout right">
- <div class="row">
-<?php
-echo $renderer->render('menuMod', $html5, null);
-?>
-</div>
-</div>
-</li>
-
-</ul>
+?></ul>
View
37 html/mod_menu/default_component.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package Joomla.Site
+ * @subpackage mod_menu
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Note. It is important to remove spaces between elements.
+$class = $item->anchor_css ? 'class="'.$item->anchor_css.'" ' : '';
+$title = $item->anchor_title ? 'title="'.$item->anchor_title.'" ' : '';
+if ($item->menu_image) {
+ $item->params->get('menu_text', 1) ?
+ $linktype = '<img src="'.$item->menu_image.'" alt="'.$item->title.'" /><span class="image-title">'.$item->title.'</span> ' :
+ $linktype = '<img src="'.$item->menu_image.'" alt="'.$item->title.'" />';
+}
+else { $linktype = $item->title;
+}
+
+switch ($item->browserNav) :
+ default:
+ case 0:
+?><a <?php echo $class; ?>href="<?php echo $item->flink; ?>" <?php echo $title; ?>><?php echo $linktype; ?></a><?php
+ break;
+ case 1:
+ // _blank
+?><a <?php echo $class; ?>href="<?php echo $item->flink; ?>" target="_blank" <?php echo $title; ?>><?php echo $linktype; ?></a><?php
+ break;
+ case 2:
+ // window.open
+?><a <?php echo $class; ?>href="<?php echo $item->flink; ?>" onclick="window.open(this.href,'targetWindow','toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes');return false;" <?php echo $title; ?>><?php echo $linktype; ?></a>
+<?php
+ break;
+endswitch;
View
22 html/mod_menu/default_separator.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package Joomla.Site
+ * @subpackage mod_menu
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Note. It is important to remove spaces between elements.
+$title = $item->anchor_title ? 'title="'.$item->anchor_title.'" ' : '';
+if ($item->menu_image) {
+ $item->params->get('menu_text', 1) ?
+ $linktype = '<img src="'.$item->menu_image.'" alt="'.$item->title.'" /><span class="image-title">'.$item->title.'</span> ' :
+ $linktype = '<img src="'.$item->menu_image.'" alt="'.$item->title.'" />';
+}
+else { $linktype = $item->title;
+}
+
+?><span class="separator"><?php echo $title; ?><?php echo $linktype; ?></span>
View
39 html/mod_menu/default_url.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package Joomla.Site
+ * @subpackage mod_menu
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Note. It is important to remove spaces between elements.
+$class = $item->anchor_css ? 'class="'.$item->anchor_css.'" ' : '';
+$title = $item->anchor_title ? 'title="'.$item->anchor_title.'" ' : '';
+if ($item->menu_image) {
+ $item->params->get('menu_text', 1) ?
+ $linktype = '<img src="'.$item->menu_image.'" alt="'.$item->title.'" /><span class="image-title">'.$item->title.'</span> ' :
+ $linktype = '<img src="'.$item->menu_image.'" alt="'.$item->title.'" />';
+}
+else { $linktype = $item->title;
+}
+$flink = $item->flink;
+$flink = JFilterOutput::ampReplace(htmlspecialchars($flink));
+
+switch ($item->browserNav) :
+ default:
+ case 0:
+?><a <?php echo $class; ?>href="<?php echo $flink; ?>" <?php echo $title; ?>><?php echo $linktype; ?></a><?php
+ break;
+ case 1:
+ // _blank
+?><a <?php echo $class; ?>href="<?php echo $flink; ?>" target="_blank" <?php echo $title; ?>><?php echo $linktype; ?></a><?php
+ break;
+ case 2:
+ // window.open
+ $options = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,'.$params->get('window_open');
+ ?><a <?php echo $class; ?>href="<?php echo $flink; ?>" onclick="window.open(this.href,'targetWindow','<?php echo $options;?>');return false;" <?php echo $title; ?>><?php echo $linktype; ?></a><?php
+ break;
+endswitch;
View
28 index.php
@@ -1,6 +1,6 @@
<?php defined('_JEXEC') or die;
// Load template framework
-include_once (dirname(__FILE__).DS.'framework.php');
+include_once JPATH_THEMES . '/' . $this->template . '/framework.php';
?>
<!DOCTYPE html>
<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
@@ -10,17 +10,21 @@
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<head>
<meta charset="utf-8" />
-
<jdoc:include type="head" />
<!-- Set the viewport width to device width for mobile -->
<meta name="viewport" content="width=device-width" />
<!-- 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 != "-1") : ?>
+ <?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>
+
+ <?php if ($setWidth) : ?>
+ <style>
+ .row {
+ width: <?php echo $setWidth ?>px;
+}
+</style>
+ <?php endif; ?>
<!-- IE Fix for HTML5 Tags -->
<!--[if lt IE 9]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
@@ -29,23 +33,21 @@
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '<?php echo $analytics ?>']);
_gaq.push(['_trackPageview']);
-
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
-
</script>
-
</head>
<body>
+
<!--Logo / Nav Row -->
<div class="row">
<div class="three columns">
<?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 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 { ?>
@@ -214,9 +216,7 @@
<?php endif; ?>
</div>
-<?php if ($debug > 0) : ?>
- <jdoc:include type="modules" name="debug" style="raw" />
-<?php endif; ?>
+
View
2 language/en-GB/en-GB.tpl_siegeengine.ini
@@ -181,6 +181,8 @@ TPL_SETTINGS_FOUNDATION_MINFOUND_DESC="Select to unload all of the above individ
TPL_SETTINGS_FOUNDATION_ALL_YES="Yes"
TPL_SETTINGS_FOUNDATION_ALL_NO="No"
+TPL_SETTINGS_SETWIDTH_LABEL="Template Width"
+TPL_SETTINGS_SETWIDTH_DESC="Specify the template width in px. Leave blank for default value (1440px)"
View
3 templateDetails.xml
@@ -68,10 +68,11 @@
</field>
<field type="spacer" default=" " />
<field type="spacer" default=" " />
+ <field name="setWidth" type="text" default="1440" label="TPL_SETTINGS_SETWIDTH_LABEL" description="TPL_SETTINGS_SETWIDTH_DESC" size="15" />
<field name="setGeneratorTag" type="text" default="" label="TPL_SETTINGS_GENERATOR_LABEL" description="TPL_SETTINGS_GENERATOR_DESC" size="85" />
<field name="analytics" type="text" default="UA-XXXXX-X" label="TPL_SETTINGS_ANALYTICS_LABEL" description="TPL_SETTINGS_ANALYTICS_DESC" size="15" />
<field name="menuModTitle" type="text" default="MenuModule" label="TPL_SETTINGS_MENUMODULE_LABEL" description="TPL_SETTINGS_MENUMODULE_DESC" size="15" />
- <field name="customCSS" type="filelist" default="" label="TPL_SETTINGS_CUSTOM_CSS_LABEL" description="TPL_SETTINGS_CUSTOM_CSS_DESC" directory="templates/siegeengine/css/" filter="" exclude="foundation\.css|templateCore\.css" stripext="" />
+ <field name="customCSS" type="filelist" default="" label="TPL_SETTINGS_CUSTOM_CSS_LABEL" description="TPL_SETTINGS_CUSTOM_CSS_DESC" directory="templates/siegeengine/css/" filter="" exclude="foundation\.css|templateCore\.css|index\.html" stripext="" />
<field name="logoUp" type="radio" default="1" label="TPL_SETTINGS_LOGO_SELECT_LABEL" description="TPL_SETTINGS_LOGO_SELECT_DESC">
<option value="1">TPL_SETTINGS_LOGO_SELECT_UP</option>
<option value="0">TPL_SETTINGS_LOGO_SELECT_MOD</option>

0 comments on commit fa13bfe

Please sign in to comment.