From a3dc1471cd613b6d472f82bca5a266f70c6568b5 Mon Sep 17 00:00:00 2001 From: Sara Tusar Date: Wed, 9 May 2012 17:16:21 +0200 Subject: [PATCH] ENHANCEMENT overlapping menu, css, search-results styling --- css/layout.css | 131 ++++++++++++---------------- images/search-icon-active.png | Bin 392 -> 0 bytes images/search-icon.png | Bin 383 -> 0 bytes images/selected.png | Bin 168 -> 0 bytes javascript/script.js | 143 ++++++++++++++++--------------- templates/Includes/Header.ss | 1 - templates/Includes/Navigation.ss | 4 +- templates/Layout/Page_results.ss | 4 +- templates/Page.ss | 10 +-- 9 files changed, 140 insertions(+), 153 deletions(-) delete mode 100644 images/search-icon-active.png delete mode 100644 images/search-icon.png delete mode 100755 images/selected.png diff --git a/css/layout.css b/css/layout.css index 22da4c6..f900a91 100755 --- a/css/layout.css +++ b/css/layout.css @@ -1,4 +1,4 @@ -header:after, .main:after, #Root:after {height:0;content:".";display:block;clear:both;visibility:hidden;} +header:after, .main:after, #Root:after, .search-bar:after, header .inner:after {height:0;content:".";display:block;clear:both;visibility:hidden;} body{margin:0; background:#ededed; min-width:240px;-webkit-text-size-adjust:none; font-family:Arial, Helvetica, sans-serif;} .ie7 body, .ie8 body{min-width:860px;} @@ -14,7 +14,7 @@ a.btn:hover{background:#d80000; color:#fff;} .content ul{margin:20px 0 20px 30px;} .content li{line-height:22px; margin-bottom:5px; list-style-type:disc;} -.content-container h1{font-size:36px; border-bottom:1px solid #e5e5e5; padding-bottom:7px; margin:0 0 23px 0;} +.content-container h1 {font-size:36px; border-bottom:1px solid #e5e5e5; padding-bottom:6px; margin:0 0 23px 0; line-height:45px;} .content-container h1 span.amp{font-family:Baskerville,"Goudy Old Style","Palatino","Book Antiqua",Georgia; font-style:italic;} .content-container h2{font-size:25px; margin-bottom:15px; padding-top:15px;} .content-container h3{font-size:21px; margin-bottom:10px; padding-top:10px;} @@ -24,59 +24,40 @@ a.btn:hover{background:#d80000; color:#fff;} .brand h1{margin:0; padding:0; font-size:50px; font-family: "HelveticaNeueLTPro-Bd", "Helvetica Neue LT Pro Bold", "HelveticaNeueBold", "HelveticaNeue-Bold", "Helvetica Neue Bold", "Helvetica Neue LT Pro", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; color:#fff; font-weight:600; font-stretch:normal; line-height:1em;} .brand, .brand:hover{color:#fff;} -/* Log in Form */ - -#MemberLoginForm_LoginForm fieldset { border:none; padding-left:0px;} -#MemberLoginForm_LoginForm fieldset #Email label {margin-top:7px;} -#MemberLoginForm_LoginForm fieldset #Email input.text {border:1px solid #e5e5e5; border-radius:4px; color:#888; background:#ededed; margin:0;} -#MemberLoginForm_LoginForm fieldset #Email input.text:focus {outline:none; background:#fff;} -#MemberLoginForm_LoginForm fieldset #Password label {margin-top:7px;} -#MemberLoginForm_LoginForm fieldset #Password input.text {border:1px solid #e5e5e5; border-radius:4px; color:#888; background:#ededed; margin:0;} -#MemberLoginForm_LoginForm fieldset #Password input.text:focus {outline:none; background:#fff;} - -#MemberLoginForm_LoginForm .Actions input {cursor:pointer; text-align:center; color:#fff; background-color:#888; border:none; border-radius:4px; font-size: 13px; - font-weight: bold; margin: 5px 0; padding:5px; font-family:"HelveticaNeueLTPro-Bd", "Helvetica Neue LT Pro Bold", "HelveticaNeueBold", "HelveticaNeue-Bold", "Helvetica Neue Bold", "Helvetica Neue LT Pro", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif;} +.search-bar form input.action, .header .primary li a, .footer a{-moz-transition:color 0.2s; -webkit-transition:color 0.2s; transition:color 0.2s;} /* Search Form */ -.search-bar {position:absolute; right:0; top:18px; max-width: 1100px; margin: 0 auto; padding: 0 30px 0 0;} +.search-bar {position:absolute; right:30px; top:32px;} .search-dropdown-icon {display:none;} -.search-bar .search-bubble-arrow {display:none;} -.search-bar form {margin:10px 0 0 0; float:right; width:200px;} -.search-bar form fieldset {position:relative; padding:0; margin:0; border:none;} -.search-bar form div.field {margin:0;} -.search-bar form div.field .middleColumn {float:none; width:100%; position:relative;} -.search-bar form input.text {width:155px; padding-left:10px; padding-right:35px; color:#888; margin:0; border:0px; border-radius:20px; background:#fff; border:1px solid #161616;} -.search-bar form input.action {display:block; font-size:0; line-height:0; background:transparent url(../images/search-icon.png) 5px 6px no-repeat; text-indent:-9999em; position:absolute; right:0px; cursor:pointer; height:32px; width:35px; border:none; - border-top-left-radius:4px; border-bottom-left-radius:4px; padding:0;} -.search-bar form input.action:active {background:transparent url(../images/search-icon-active.png) 5px 6px no-repeat;} +.search-bar form fieldset {position:relative; padding:0; margin:0;} +.search-bar form input.text {width:155px; padding-left:10px; padding-right:35px; color:#888; margin:0; border:none; border-radius:20px; background:#fff; font-family:Arial, Helvetica, sans-serif;} +.search-bar form input.active{color:#000;} +.search-bar form input.action {font-size:15px; position:absolute; right:3px; top:-1px; cursor:pointer; border:none; padding:5px; background:none;font-family:'WebSymbolsRegular'; color:#848484;} +.search-bar form input.action:hover {color:#000;} .search-bar form input:focus, .header textarea:focus {outline:none;} -/* navigation visible when menu items overflow the 1100px width and when users don't have javascript enabled*/ - -.header .primary ul {float:right; margin:24px -15px 0 0; white-space:normal; padding:0;} -.header .primary ul li{float:left; margin:0 0 10px 6px; padding-bottom:0; background-image:none; list-style-type:none;} -.header .primary ul li.current a, .header .primary ul li.section a{background-color:#525252;} -.header .primary li a{letter-spacing:1px; color:#888; font-size:15px; font-family:Helvetica, Arial, sans-serif; padding:6px 8px; border-radius:4px; font-weight:bold; display:block; -moz-transition:color 0.2s; -webkit-transition:color 0.2s; transition:color 0.2s;} -.header .primary li a:hover{color:#fff;} -.header .primary li .nav-arrow {display:none;} +.header .primary ul{float:right; margin:23px -12px 0 0;} +.header .primary li{float:left; padding-bottom:20px; margin:0 5px; position:relative; white-space:nowrap;} +.header .primary li a{color:#888; font-size:15px; font-family:Helvetica, Arial, sans-serif; padding:6px 8px; font-weight:bold; display:block; } +.header .primary li a:hover{color:#fff;} .header .primary li.section a, .header .primary li.current a{color:#fff;} - - /* fancy javascript initiated menu - for when menu items fit within the 1100px width (nowrap)*/ - -.header .primary ul.standard-nav{float:right; margin:24px -15px 0 0; white-space:nowrap;} -.header .primary ul.standard-nav .menu-bubble-arrow {display:none;} -.header .primary .standard-nav li{float:left; padding-bottom:20px; margin:0 5px;} -.header .primary .standard-nav li .nav-arrow {display:none;} -.header .primary .standard-nav li.section, .header .primary li.current {background:url(../images/selected.png) center bottom no-repeat;} -.header .primary ul.standard-nav li.current a, .header .primary ul.standard-nav li.section a {background:none;} +.header .primary li.section:after, .header .primary li.current:after{content:'}'; display:block; position:absolute; left:50%; margin-left:-7px; bottom:-6px; font-family:'WebSymbolsRegular'; font-size:28px; color:#fff; text-align:center; line-height:20px;} + +/* when navigation and logo overlap tablet-nav is initialized */ +.tablet-nav .header .inner{padding-top:20px;} +.tablet-nav .header .primary ul {float:left; clear:both; margin:20px 0 4px -12px; white-space:nowrap;} +.tablet-nav .header .primary ul li{margin-bottom:10px; padding-bottom:0; white-space:nowrap;} +.tablet-nav .header .primary ul li a{-moz-transition:none; -webkit-transition:none; transition:none;} +.tablet-nav .header .primary ul li.current a, .tablet-nav .header .primary ul li.section a{background-color:#525252; border-radius:4px;} +.tablet-nav .header .primary li.section:after, .tablet-nav .header .primary li.current:after{display:none;} +.tablet-nav .footer .right{float:left; width:100%;} .header .nav-open-button {display:none;} - .inner{max-width:1100px; margin:0 auto; padding:0 30px;} .ie6 .inner {width:960px;} .main{background:#fff; padding:50px 0 60px;} -aside{float:left; width:20%; margin-top:17px;} +aside{float:left; width:23%; margin-top:17px;} .secondary h3{font-size:20px; color:#b8b7b7; margin:0 0 8px 0;} .secondary {border-bottom:1px solid #e5e5e5;} @@ -86,73 +67,73 @@ aside{float:left; width:20%; margin-top:17px;} .secondary li:hover .arrow{left:6px;} .secondary li a{padding:8px 0; display:block; width:100%; text-transform:uppercase; letter-spacing:2px; font-size:11px; color:#333; line-height:17px; font-family:'Lucida Sans', 'Lucida Grande', Arial, Helvetica, sans-serif;} .secondary li .text {padding-left:28px; display:block;} -.secondary li.section, .secondary li.current{background-color:#f9f9f9;} +.secondary li.section, .secondary li.current{background-color:#f7f7f7;} .secondary li.section a, .secondary li.current a{color:#000;} -.content-container{float:right; width:75%; padding-bottom:20px;} +.content-container{float:right; width:73%; padding-bottom:20px;} .no-sidebar .content-container{float:left;} .header{background:#161616;} .header .inner{padding-top:55px; position:relative;} /* Search Results */ - .searchResults h1 { font-size:36px; margin-bottom:15px;} .searchResults p.searchQuery {color:#333; margin-bottom:10px;} - -.searchResults ul#SearchResults {padding:0px;} -.searchResults ul#SearchResults li {border-top:1px solid #e5e5e5; padding:20px 0 0 20px; margin-bottom:20px; list-style-type:none;} -.searchResults ul#SearchResults p {font-size:1.1em; font-weight:normal; line-height:2em;} -.searchResults ul#SearchResults a.searchResultHeader {font-size:1.3em; font-weight:bold; text-decoration:none; margin:20px 0 8px 0;} -.searchResults ul#SearchResults a {text-decoration:none;} -.searchResults #PageNumbers {border-top:1px solid #e5e5e5;padding-top:20px;} +.searchResults ul#SearchResults {padding:0;} +.searchResults ul#SearchResults li {border-top:1px solid #e5e5e5; padding:20px 0; list-style-type:none;} +.searchResults ul#SearchResults p {margin-bottom:12px;} +.searchResults ul#SearchResults a.searchResultHeader {font-size:16px; font-weight:bold; margin-bottom:6px; display:block;} +.searchResults #PageNumbers {border-top:1px solid #e5e5e5; padding-top:20px;} +.searchResults #PageNumbers a{padding:0 5px;} .searchResults #PageNumbers .pagination {float:left;} .searchResults #PageNumbers p {float:right;} -.searchResults #PageNumbers .next {margin-left:20px;} -.searchResults #PageNumbers .prev {margin-right:20px;} +.searchResults #PageNumbers .next, .searchResults #PageNumbers .prev{font-size:14px;} +.searchResults #PageNumbers .next {margin-left:15px;} +.searchResults #PageNumbers .prev {margin-right:15px;} /* Footer */ .footer{color:#999; background:#ededed; padding:20px 0; font-size:11px; line-height:22px;} .footer a{color:#999;} -.footer .left{float:left; color:#000; display:block; margin-bottom:20px;} +.footer a:hover{color:#000;} +.footer .left{float:left; color:#000; display:block; margin-bottom:10px;} .footer .right{float:right; display:block;} .footer span{padding:0 3px; color:#bbb;} .footer .primary, .footer .primary ul{display:inline; margin:0; padding:0;} .footer .primary li{display:inline;} -/*.ie6 .footer .primary li, .ie7 .footer .primary li{display:inline; zoom:1; margin-right:10px;}*/ +.ie6 .footer .primary li, .ie7 .footer .primary li{display:inline; zoom:1; margin-right:10px;} .footer .primary li:after{padding:0 3px 0 5px; content:'/'; color:#999;} .footer .primary li:last-child:after{content:'';} .footer .arrow{padding:0 8px 0 5px; color:#b80000; font-size:13px;} .footer .primary .nav-open-button {display:none;} .footer .primary ul#nav .menu-bubble-arrow {display:none;} +#media-query-trigger{display:none; visibility:hidden;} @media only screen and (max-width: 960px) { .content img{width:97%; height:auto; margin:0 0 20px;} .header .primary ul {margin-left:-12px; -webkit-padding-start: 0px;} } -@media only screen and (max-width: 700px) { +/* when changing the breakpoint below, change it ito the same value in the script.js file as well */ +@media only screen and (max-width: 640px) { +#media-query-trigger{ visibility:visible;} .brand{float:none; display:inline-block; margin-left:22px; margin-bottom:24px;} .brand h1{font-size:40px;} .header {padding:0px;} .header .inner{padding:20px 0 0 0;} -.header .primary {} .header .primary .nav-open-button {z-index:100; width:20px; height:20px; position:absolute; right:20px; top:30px; display:block; cursor:pointer; font-family:'WebSymbolsRegular'; font-size:20px; color:#ededed;} -.header .primary ul {z-index:10; position:relative; background:#e5e5e5; display:none; float:left; margin:0; padding:0; width:100%; white-space:normal; } -.header .primary ul#nav li {border-radius:0; width:100%; margin:0; float:none; background:none; position:relative;} -.header .primary ul#nav li .nav-arrow {display:block; position:absolute; right:20px; top:0px; font-family:'WebSymbolsRegular'; font-size:12px; color:#999; text-align:center; vertical-align:middle; line-height:38px;} -.header .primary ul#nav li:last-child a {border-bottom:none;} -.header .primary ul#nav li a {border-radius:0; padding:10px 0 10px 22px; font-weight:normal; border-bottom:1px solid #bbb;} -.header .primary ul#nav li a:hover {color:#525252;} -.header .primary ul#nav li.current a, .header .primary ul#nav li.section a{background-color:#999; color:#fff;} -.header .primary ul#nav li.current .nav-arrow, .header .primary ul#nav li.section .nav-arrow {display:none;} +.header .primary ul {z-index:10; position:relative; display:none; float:left; margin:0 !important; padding:0; white-space:normal; width:100%;} +.header .primary ul li {width:100%; margin:0 !important; float:none; background:none; position:relative; text-shadow:0 1px #fff;} +.header .primary ul li:after {content:'\003e'; display:block; position:absolute; right:20px; top:0px; font-family:'WebSymbolsRegular'; font-size:14px; color:#999; text-align:center; vertical-align:middle; line-height:38px;} +.header .primary ul li a, .header .primary ul li.current a, .header .primary ul li.section a{padding:10px 0 10px 22px; font-weight:bold; border-bottom:1px solid #bbb; color:#434343; border-radius:0 !important; background:#e7e7e7 !important;} +.header .primary ul li a:hover{color:inherit;} + /* Search Form */ -.search-bar {width:100%; position:relative; top:0; right:0; display:none; padding:20px 0; height:32px; margin:0; background-color:#ededed;} +.search-bar {width:100%; position:relative; top:0; right:0; display:none; padding:20px 0; margin:0; background-color:#E7E7E7;} .search-dropdown-icon {display:block; cursor:pointer; width:20px; height:20px; position:absolute; right:60px; top:32px; font-family:'WebSymbolsRegular'; font-size:20px; color:#ededed; text-align:center; line-height:20px;} -.search-bar .search-bubble-arrow {display:block; height:20px; width:20px;position:absolute; right:62px; top:-12px; font-family:'WebSymbolsRegular'; font-size:20px; color:#e5e5e5; text-align:center; line-height:20px;} -.search-bar form {display:none; margin:0; height:32px;} -.search-bar form fieldset {padding:0 18px; position:absolute; left:0; right:0;} -.search-bar form input.text {width:auto; position:absolute; right:0; left:0; border:1px solid #e5e5e5; background:#fff;} -.search-bar form input.action {right:20px;} +.search-bar form {margin:0; width:100%;} +.search-bar form fieldset {padding:0 18px; left:0; right:0; position:relative;} +.search-bar div.field{margin-bottom:0;} +.search-bar form input.text {width:93%; padding:8px 7% 8px 0; text-indent:15px; position:relative; display:block; right:0; left:0; border:1px solid #e5e5e5; background:#fff; font-size:17px;} +.search-bar form input.action {right:24px; top:2px; font-size:18px;} /* Main Content */ .main{padding:20px 0 45px;} @@ -161,11 +142,13 @@ aside{float:left; width:20%; margin-top:17px;} .content-container p{font-size:14px; line-height:23px;} p.intro{font-size:19px; line-height:27px;} .main .inner{padding:0 22px;} + /* Secondry Nav */ .secondary li a{line-height:24px;} .secondary li .arrow{line-height:26px;} + /* Footer */ -.footer .right{float:left; padding-top:14px; width:100%;} +.footer .right{float:left; width:100%;} } diff --git a/images/search-icon-active.png b/images/search-icon-active.png deleted file mode 100644 index c52a721196566d0ebcf05ee56630c49ceb6e5b9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 392 zcmV;30eAk1P)zv$8;Ve;dGx_VtX<7V$9j8#d!B8qlknH9qbLsnovPg$4Kd)~l*Yao zP;TB^0DGQ?&^Va!%3?r0qz%W&2b;I(4MT%&!A-%RPXbfhP@4z@b~24w%&T2J4PD#q z4`^y;Oj0jYO|4q4p>EqkMn&uNjf0Q%%9n8ka~o+87?TIu16X`L*sNQ@=*Iar m`Z_`rshcm|pMh2{0R{jJT9L8QSge%*0000rUHFc3v=1Ov4&B!C2v zFeHG4B7sSu5yK`wWnlXP>Y^Rtxnzg02Nv)RsN451#-nOi1m>Ua=eY29ZS>_60}srj&Av=m_cT z*rRwZz#b7AWU?wnXvNxI!AOC75kyx4Zt>~nDhc2yIw1>e#o2wLFbDjb7IQlmv{vuE z0ljGIIjBXIt3W5#E|tdaRD0b@eV7_KHS8VL3<{eR%) dfPd;KzyKNWOa2HL<4gbm002ovPDHLkV1mbkoVfr1 diff --git a/images/selected.png b/images/selected.png deleted file mode 100755 index 1fa32028814c34bf70d91de5be6211696b25ac75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^d_c^~!3HEt`|kDSr z1<%~X^wgl##FWaylc_d9MP8mRjv*DdlK%YvZ_g}tfb+=Z1#ff|{`Di_j~+BrWpFezgC_~(Di!I~9OY&m|)EC>A9ISd%oCY@33+z_Y* PG?l^A)z4*}Q$iB}Y=<|? diff --git a/javascript/script.js b/javascript/script.js index 907d640..de9b722 100644 --- a/javascript/script.js +++ b/javascript/script.js @@ -2,81 +2,86 @@ jQuery.noConflict(); (function($) {        $(document).ready(function() { -         - /* turns on specific styling when main nav items are less than the width of the header otherwise it defaults to mediaquery multiline styling */ - function toggleNavigationClassByWidth(){ -            var primaryNavigation = $('.primary').first(); -            var mainNavigation = $(primaryNavigation).find('ul').first(); - -            if(primaryNavigation.outerWidth() > mainNavigation.outerWidth()) { -               mainNavigation.addClass("standard-nav"); //if the nav ul fits within its container the standard styling is applied -            } -            else { -               mainNavigation.removeClass("standard-nav"); -            } -        } -         -        var resizeTimer; //constantly checks for the size of the browser window so correct style is applied. -        $(window).resize(function(){ -            clearTimeout(resizeTimer); -            resizeTimer = setTimeout(toggleNavigationClassByWidth, 100); -        }).load(function(){ -            clearTimeout(resizeTimer); -            resizeTimer = setTimeout(toggleNavigationClassByWidth, 100); -        }); - - /* show/hide search form when window width less than 700px */ - $('span.search-dropdown-icon').on('click',function() { - if ($(window).width() < 700) { // checks for width of window - if it is less than 700px - if ($('div.search-bar').is(":hidden")){ //checks if ul#nav is hidden - $('div.search-bar').slideDown('fast'); // slides the Search bar down - $('div.search-bar form').fadeIn(500); // Fades the Search form in - return false; - } else { - $('div.search-bar').slideUp('fast'); // slides the Search bar up - $('div.search-bar form').hide(); // Fades the Search form out - return false; + var searchBarButton = $("span.search-dropdown-icon"); + var searchBar = $('div.search-bar'); + var menuButton = $("span.nav-open-button"); + var menu = $('.header .primary ul'); + var mobile = false; + var changed = false; + + $('body').append('
'); + + function menuWidthCheck() { + var header_w = $('header .inner').width(); + var elements_w = menu.width() + $('.brand').width(); + + if ((header_w < elements_w) || ($(window).width() <= 768)) { + $('body').addClass('tablet-nav'); + } + else { + $('body').removeClass('tablet-nav'); + } + + mobile_old = mobile; + if ($('#media-query-trigger').css('visibility') == 'hidden') { + mobile = false; + } + else { + mobile = true; + } + + if (mobile_old != mobile) { + changed = true; + } + else { + changed = false; + } + } + + menuWidthCheck(); + + $(window).resize(function() { + console.log($(window).innerWidth()); + menuWidthCheck(); + + if (!mobile) { + menu.show(); + searchBar.show(); + } + else { + if (changed) { + menu.hide(); + searchBar.hide(); } } }); - /* show/hide main nav menu when window width less than 700px */ - $('span.nav-open-button').on('click',function() { - if ($(window).width() < 700) { // checks for width of window - if it is less than 700px - if ($('ul#nav').is(":hidden")){ //checks if ul#nav is hidden - $('ul#nav').slideDown('fast'); // slides the nav menu down - $('header span.menu-bubble-arrow').show(); // shows the nav menu arrow - return false; - } else { - $('ul#nav').slideUp('fast'); // slides the nav menu up - $('header span.menu-bubble-arrow').removeAttr("style"); // hides the nav menu arrow - return false; - } - } - }); - /* clears any inline styles when window is resized above 700px */ - $(window).resize(function () { - if ($(this).width() >= 700) { - $('div.search-bar').removeAttr("style"); - $('ul#nav').removeAttr("style"); - $('div.search-bar form').removeAttr("style"); - $('span.search-bubble-arrow').removeAttr("style"); - } + /* toggle navigation and search in mobile view */ + searchBarButton.click(function() { + menu.slideUp(); + searchBar.slideToggle('fast'); }); + + menuButton.click(function() { + searchBar.slideUp(); + menu.slideToggle('fast'); + }); /* removes text from search form on focus and replaces it on unfocus - if text is entered then it does not get replaced with default on unfocus */ - $('#SearchForm_SearchForm_Search').each(function() { - var default_value = this.value; - $(this).focus(function() { - if(this.value == default_value) { - this.value = ''; - } - }); - $(this).blur(function() { - if(this.value == '') { - this.value = default_value; - } - }); - }); + $('#SearchForm_SearchForm_action_results').val('L'); + var searchField = $('#SearchForm_SearchForm_Search'); + var default_value = searchField.val(); + searchField.focus(function() { + $(this).addClass('active'); + if(searchField.val() == default_value) { + searchField.val(''); + } + }); + searchField.blur(function() { + if(searchField.val() == '') { + searchField.val(default_value); + } + }); +    }); }(jQuery)); diff --git a/templates/Includes/Header.ss b/templates/Includes/Header.ss index e519c5e..15422f9 100755 --- a/templates/Includes/Header.ss +++ b/templates/Includes/Header.ss @@ -7,7 +7,6 @@ L
$SearchForm - }
<% end_if %> <% include Navigation %> diff --git a/templates/Includes/Navigation.ss b/templates/Includes/Navigation.ss index 305bfbd..d2965c6 100755 --- a/templates/Includes/Navigation.ss +++ b/templates/Includes/Navigation.ss @@ -1,8 +1,8 @@ \ No newline at end of file diff --git a/templates/Layout/Page_results.ss b/templates/Layout/Page_results.ss index 70613aa..8a0b176 100644 --- a/templates/Layout/Page_results.ss +++ b/templates/Layout/Page_results.ss @@ -29,7 +29,7 @@

Page $Results.CurrentPage of $Results.TotalPages

diff --git a/templates/Page.ss b/templates/Page.ss index 26ea949..f6bf3df 100755 --- a/templates/Page.ss +++ b/templates/Page.ss @@ -11,15 +11,15 @@ Change it, enhance it and most importantly enjoy it! - - + <% base_tag %> <% if MetaTitle %>$MetaTitle<% else %>$Title<% end_if %> » $SiteConfig.Title $MetaTags(false) - + + @@ -33,7 +33,7 @@ Change it, enhance it and most importantly enjoy it!
<% include Footer %> - - + <% require javascript(http://code.jquery.com/jquery-1.7.2.js) %> + <% require javascript(themes/simple/javascript/script.js) %> \ No newline at end of file