diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj
index a0411bc0..4f007e9e 100644
--- a/OurUmbraco.Site/OurUmbraco.Site.csproj
+++ b/OurUmbraco.Site/OurUmbraco.Site.csproj
@@ -14,7 +14,7 @@
OurUmbraco.Site
OurUmbraco.Site
v4.5.1
- true
+ false
@@ -1766,7 +1766,6 @@
-
@@ -1801,6 +1800,9 @@
+
+
+
@@ -4329,8 +4331,6 @@
-
-
@@ -4699,6 +4699,10 @@
{00f050b9-e3ed-49a7-ab97-e8bec2513553}
uPowers
+
+ {c5b74e6a-abce-4a9a-896d-89c33fdafcd8}
+ uRelease
+
{47fd2b14-1653-4052-ad53-1871a8f85e0e}
uRepo
@@ -4734,7 +4738,7 @@
True
24292
/
- http://localhost:24217/
+ http://our.local
False
False
diff --git a/OurUmbraco.Site/Views/MacroPartials/Documenation/Breadcrumb.cshtml b/OurUmbraco.Site/Views/MacroPartials/Documenation/Breadcrumb.cshtml
new file mode 100644
index 00000000..6fe5e62f
--- /dev/null
+++ b/OurUmbraco.Site/Views/MacroPartials/Documenation/Breadcrumb.cshtml
@@ -0,0 +1,30 @@
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
+@using uDocumentation.Busineslogic;
+
+@{
+ string baseurl = "/";
+ string absolutePath = HttpContext.Current.Request.Url.AbsolutePath;
+ string directoryName = Path.GetDirectoryName(absolutePath);
+
+ directoryName = directoryName.Substring(1);
+ string[] strDirs = directoryName.Split('\\');
+
+}
+
+
diff --git a/OurUmbraco.Site/Views/MacroPartials/Documenation/DisplayMarkdown.cshtml b/OurUmbraco.Site/Views/MacroPartials/Documenation/DisplayMarkdown.cshtml
new file mode 100644
index 00000000..9358d5ee
--- /dev/null
+++ b/OurUmbraco.Site/Views/MacroPartials/Documenation/DisplayMarkdown.cshtml
@@ -0,0 +1,10 @@
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
+@using uDocumentation.Busineslogic;
+
+@{
+ var path = HttpContext.Current.Items[MarkdownLogic.MarkdownPathKey].ToString();
+ MarkdownLogic ml = new MarkdownLogic(path) { PrefixLinks = false };
+ var markdown = ml.DoTransformation();
+}
+
+@Html.Raw(markdown)
\ No newline at end of file
diff --git a/OurUmbraco.Site/Views/MacroPartials/Documenation/Navigation.cshtml b/OurUmbraco.Site/Views/MacroPartials/Documenation/Navigation.cshtml
new file mode 100644
index 00000000..dcf56e43
--- /dev/null
+++ b/OurUmbraco.Site/Views/MacroPartials/Documenation/Navigation.cshtml
@@ -0,0 +1,49 @@
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
+@using uDocumentation;
+
+@{
+ var zipper = new uDocumentation.Busineslogic.GithubSourcePull.ZipDownloader();
+ dynamic sitemap = zipper.DocumentationSiteMap();
+ var root = "/documentation";
+ var currentUrl = HttpContext.Current.Request.Url.PathAndQuery;
+}
+
+@functions{
+ public static string IsActive(string path, string classname = "active")
+ {
+ if (HttpContext.Current.Request.Url.PathAndQuery.ToLower().StartsWith(path.ToLower()))
+ return classname;
+
+ return string.Empty;
+ }
+}
+
+
+
\ No newline at end of file
diff --git a/OurUmbraco.Site/jqtouch/jqtouch.css b/OurUmbraco.Site/jqtouch/jqtouch.css
deleted file mode 100644
index 328afae2..00000000
--- a/OurUmbraco.Site/jqtouch/jqtouch.css
+++ /dev/null
@@ -1,373 +0,0 @@
-* {
- margin: 0;
- padding: 0;
-}
-a {
- -webkit-tap-highlight-color: rgba(0,0,0,0);
-}
-
-body {
- overflow-x: hidden;
- -webkit-user-select: none;
- -webkit-text-size-adjust: none;
- font-family: Helvetica;
- -webkit-perspective: 800;
- -webkit-transform-style: preserve-3d;
-}
-.selectable, input, textarea {
- -webkit-user-select: auto;
-}
-body > * {
- -webkit-backface-visibility: hidden;
- -webkit-box-sizing: border-box;
- display: none;
- position: absolute;
- left: 0;
- width: 100%;
- -webkit-transform: translate3d(0,0,0) rotate(0) scale(1);
- min-height: 420px !important;
-}
-body.fullscreen > * {
- min-height: 460px !important;
-}
-body.fullscreen.black-translucent > * {
- min-height: 480px !important;
-}
-body.landscape > * {
- min-height: 320px;
-}
-body > .current {
- display: block !important;
-}
-
-.in, .out {
- -webkit-animation-timing-function: ease-in-out;
- -webkit-animation-duration: 350ms;
-}
-
-.slide.in {
- -webkit-animation-name: slideinfromright;
-}
-
-.slide.out {
- -webkit-animation-name: slideouttoleft;
-}
-
-.slide.in.reverse {
- -webkit-animation-name: slideinfromleft;
-}
-
-.slide.out.reverse {
- -webkit-animation-name: slideouttoright;
-}
-
-@-webkit-keyframes slideinfromright {
- from { -webkit-transform: translateX(100%); }
- to { -webkit-transform: translateX(0); }
-}
-
-@-webkit-keyframes slideinfromleft {
- from { -webkit-transform: translateX(-100%); }
- to { -webkit-transform: translateX(0); }
-}
-
-@-webkit-keyframes slideouttoleft {
- from { -webkit-transform: translateX(0); }
- to { -webkit-transform: translateX(-100%); }
-}
-
-@-webkit-keyframes slideouttoright {
- from { -webkit-transform: translateX(0); }
- to { -webkit-transform: translateX(100%); }
-}
-
-@-webkit-keyframes fadein {
- from { opacity: 0; }
- to { opacity: 1; }
-}
-
-@-webkit-keyframes fadeout {
- from { opacity: 1; }
- to { opacity: 0; }
-}
-
-.fade.in {
- z-index: 10;
- -webkit-animation-name: fadein;
-}
-.fade.out {
- z-index: 0;
-}
-
-.dissolve.in {
- -webkit-animation-name: fadein;
-}
-
-.dissolve.out {
- -webkit-animation-name: fadeout;
-}
-
-
-
-.flip {
- -webkit-animation-duration: .65s;
-}
-
-.flip.in {
- -webkit-animation-name: flipinfromleft;
-}
-
-.flip.out {
- -webkit-animation-name: flipouttoleft;
-}
-
-/* Shake it all about */
-
-.flip.in.reverse {
- -webkit-animation-name: flipinfromright;
-}
-
-.flip.out.reverse {
- -webkit-animation-name: flipouttoright;
-}
-
-@-webkit-keyframes flipinfromright {
- from { -webkit-transform: rotateY(-180deg) scale(.8); }
- to { -webkit-transform: rotateY(0) scale(1); }
-}
-
-@-webkit-keyframes flipinfromleft {
- from { -webkit-transform: rotateY(180deg) scale(.8); }
- to { -webkit-transform: rotateY(0) scale(1); }
-}
-
-@-webkit-keyframes flipouttoleft {
- from { -webkit-transform: rotateY(0) scale(1); }
- to { -webkit-transform: rotateY(-180deg) scale(.8); }
-}
-
-@-webkit-keyframes flipouttoright {
- from { -webkit-transform: rotateY(0) scale(1); }
- to { -webkit-transform: rotateY(180deg) scale(.8); }
-}
-
-.slideup.in {
- -webkit-animation-name: slideup;
- z-index: 10;
-}
-
-.slideup.out {
- -webkit-animation-name: dontmove;
- z-index: 0;
-}
-
-.slideup.out.reverse {
- z-index: 10;
- -webkit-animation-name: slidedown;
-}
-
-.slideup.in.reverse {
- z-index: 0;
- -webkit-animation-name: dontmove;
-}
-
-
-@-webkit-keyframes slideup {
- from { -webkit-transform: translateY(100%); }
- to { -webkit-transform: translateY(0); }
-}
-
-@-webkit-keyframes slidedown {
- from { -webkit-transform: translateY(0); }
- to { -webkit-transform: translateY(100%); }
-}
-
-
-
-/* Hackish, but reliable. */
-
-@-webkit-keyframes dontmove {
- from { opacity: 1; }
- to { opacity: 1; }
-}
-
-.swap {
- -webkit-transform: perspective(800);
- -webkit-animation-duration: .7s;
-}
-.swap.out {
- -webkit-animation-name: swapouttoleft;
-}
-.swap.in {
- -webkit-animation-name: swapinfromright;
-}
-.swap.out.reverse {
- -webkit-animation-name: swapouttoright;
-}
-.swap.in.reverse {
- -webkit-animation-name: swapinfromleft;
-}
-
-
-@-webkit-keyframes swapouttoright {
- 0% {
- -webkit-transform: translate3d(0px, 0px, 0px) rotateY(0deg);
- -webkit-animation-timing-function: ease-in-out;
- }
- 50% {
- -webkit-transform: translate3d(-180px, 0px, -400px) rotateY(20deg);
- -webkit-animation-timing-function: ease-in;
- }
- 100% {
- -webkit-transform: translate3d(0px, 0px, -800px) rotateY(70deg);
- }
-}
-
-@-webkit-keyframes swapouttoleft {
- 0% {
- -webkit-transform: translate3d(0px, 0px, 0px) rotateY(0deg);
- -webkit-animation-timing-function: ease-in-out;
- }
- 50% {
- -webkit-transform: translate3d(180px, 0px, -400px) rotateY(-20deg);
- -webkit-animation-timing-function: ease-in;
- }
- 100% {
- -webkit-transform: translate3d(0px, 0px, -800px) rotateY(-70deg);
- }
-}
-
-@-webkit-keyframes swapinfromright {
- 0% {
- -webkit-transform: translate3d(0px, 0px, -800px) rotateY(70deg);
- -webkit-animation-timing-function: ease-out;
- }
- 50% {
- -webkit-transform: translate3d(-180px, 0px, -400px) rotateY(20deg);
- -webkit-animation-timing-function: ease-in-out;
- }
- 100% {
- -webkit-transform: translate3d(0px, 0px, 0px) rotateY(0deg);
- }
-}
-
-@-webkit-keyframes swapinfromleft {
- 0% {
- -webkit-transform: translate3d(0px, 0px, -800px) rotateY(-70deg);
- -webkit-animation-timing-function: ease-out;
- }
- 50% {
- -webkit-transform: translate3d(180px, 0px, -400px) rotateY(-20deg);
- -webkit-animation-timing-function: ease-in-out;
- }
- 100% {
- -webkit-transform: translate3d(0px, 0px, 0px) rotateY(0deg);
- }
-}
-
-.cube {
- -webkit-animation-duration: .55s;
-}
-
-.cube.in {
- -webkit-animation-name: cubeinfromright;
- -webkit-transform-origin: 0% 50%;
-}
-.cube.out {
- -webkit-animation-name: cubeouttoleft;
- -webkit-transform-origin: 100% 50%;
-}
-.cube.in.reverse {
- -webkit-animation-name: cubeinfromleft;
- -webkit-transform-origin: 100% 50%;
-}
-.cube.out.reverse {
- -webkit-animation-name: cubeouttoright;
- -webkit-transform-origin: 0% 50%;
-
-}
-
-@-webkit-keyframes cubeinfromleft {
- from {
- -webkit-transform: rotateY(-90deg) translateZ(320px);
- opacity: .5;
- }
- to {
- -webkit-transform: rotateY(0deg) translateZ(0);
- opacity: 1;
- }
-}
-@-webkit-keyframes cubeouttoright {
- from {
- -webkit-transform: rotateY(0deg) translateX(0);
- opacity: 1;
- }
- to {
- -webkit-transform: rotateY(90deg) translateZ(320px);
- opacity: .5;
- }
-}
-@-webkit-keyframes cubeinfromright {
- from {
- -webkit-transform: rotateY(90deg) translateZ(320px);
- opacity: .5;
- }
- to {
- -webkit-transform: rotateY(0deg) translateZ(0);
- opacity: 1;
- }
-}
-@-webkit-keyframes cubeouttoleft {
- from {
- -webkit-transform: rotateY(0deg) translateZ(0);
- opacity: 1;
- }
- to {
- -webkit-transform: rotateY(-90deg) translateZ(320px);
- opacity: .5;
- }
-}
-
-
-
-
-.pop {
- -webkit-transform-origin: 50% 50%;
-}
-
-.pop.in {
- -webkit-animation-name: popin;
- z-index: 10;
-}
-
-.pop.out.reverse {
- -webkit-animation-name: popout;
- z-index: 10;
-}
-
-.pop.in.reverse {
- z-index: 0;
- -webkit-animation-name: dontmove;
-}
-
-@-webkit-keyframes popin {
- from {
- -webkit-transform: scale(.2);
- opacity: 0;
- }
- to {
- -webkit-transform: scale(1);
- opacity: 1;
- }
-}
-
-@-webkit-keyframes popout {
- from {
- -webkit-transform: scale(1);
- opacity: 1;
- }
- to {
- -webkit-transform: scale(.2);
- opacity: 0;
- }
-}
\ No newline at end of file
diff --git a/OurUmbraco.Site/jqtouch/jqtouch.js b/OurUmbraco.Site/jqtouch/jqtouch.js
deleted file mode 100644
index 69b5aba3..00000000
--- a/OurUmbraco.Site/jqtouch/jqtouch.js
+++ /dev/null
@@ -1,634 +0,0 @@
-/*
-
- _/ _/_/ _/_/_/_/_/ _/
- _/ _/ _/ _/_/ _/ _/ _/_/_/ _/_/_/
- _/ _/ _/_/ _/ _/ _/ _/ _/ _/ _/ _/
- _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/
- _/ _/_/ _/ _/ _/_/ _/_/_/ _/_/_/ _/ _/
- _/
- _/
-
- Created by David Kaneda
- Documentation and issue tracking on Google Code
-
- Special thanks to Jonathan Stark
- and pinch/zoom
-
- (c) 2009 by jQTouch project members.
- See LICENSE.txt for license.
-
- $Revision: 109 $
- $Date: 2009-10-06 12:23:30 -0400 (Tue, 06 Oct 2009) $
- $LastChangedBy: davidcolbykaneda $
-
-*/
-
-(function($) {
- $.jQTouch = function(options) {
-
- // Set support values
- $.support.WebKitCSSMatrix = (typeof WebKitCSSMatrix == "object");
- $.support.touch = (typeof Touch == "object");
- $.support.WebKitAnimationEvent = (typeof WebKitTransitionEvent == "object");
-
- // Initialize internal variables
- var $body,
- $head=$('head'),
- hist=[],
- newPageCount=0,
- jQTSettings={},
- hashCheck,
- currentPage,
- orientation,
- isMobileWebKit = RegExp(" Mobile/").test(navigator.userAgent),
- tapReady=true,
- lastAnimationTime=0,
- touchSelectors=[],
- publicObj={},
- extensions=$.jQTouch.prototype.extensions,
- defaultAnimations=['slide','flip','slideup','swap','cube','pop','dissolve','fade','back'],
- animations=[],
- hairextensions='';
-
- // Get the party started
- init(options);
-
- function init(options) {
-
- var defaults = {
- addGlossToIcon: true,
- backSelector: '.back, .cancel, .goback',
- cacheGetRequests: true,
- cubeSelector: '.cube',
- dissolveSelector: '.dissolve',
- fadeSelector: '.fade',
- fixedViewport: true,
- flipSelector: '.flip',
- formSelector: 'form',
- fullScreen: true,
- fullScreenClass: 'fullscreen',
- icon: null,
- touchSelector: 'a, .touch',
- popSelector: '.pop',
- preloadImages: false,
- slideSelector: 'body > * > ul li a',
- slideupSelector: '.slideup',
- startupScreen: null,
- statusBar: 'default', // other options: black-translucent, black
- submitSelector: '.submit',
- swapSelector: '.swap',
- useAnimations: true,
- useFastTouch: true // Experimental.
- };
- jQTSettings = $.extend({}, defaults, options);
-
- // Preload images
- if (jQTSettings.preloadImages) {
- for (var i = jQTSettings.preloadImages.length - 1; i >= 0; i--){
- (new Image()).src = jQTSettings.preloadImages[i];
- };
- }
- // Set icon
- if (jQTSettings.icon) {
- var precomposed = (jQTSettings.addGlossToIcon) ? '' : '-precomposed';
- hairextensions += '';
- }
- // Set startup screen
- if (jQTSettings.startupScreen) {
- hairextensions += '';
- }
- // Set viewport
- if (jQTSettings.fixedViewport) {
- hairextensions += '';
- }
- // Set full-screen
- if (jQTSettings.fullScreen) {
- hairextensions += '';
- if (jQTSettings.statusBar) {
- hairextensions += '';
- }
- }
- if (hairextensions) $head.append(hairextensions);
-
- // Initialize on document load:
- $(document).ready(function(){
-
- // Add extensions
- for (var i in extensions)
- {
- var fn = extensions[i];
- if ($.isFunction(fn))
- {
- $.extend(publicObj, fn(publicObj));
- }
- }
-
- // Add animations
- for (var i in defaultAnimations)
- {
- var name = defaultAnimations[i];
- var selector = jQTSettings[name + 'Selector'];
- if (typeof(selector) == 'string') {
- addAnimation({name:name, selector:selector});
- }
- }
-
- touchSelectors.push('input');
- touchSelectors.push(jQTSettings.touchSelector);
- touchSelectors.push(jQTSettings.backSelector);
- touchSelectors.push(jQTSettings.submitSelector);
- $(touchSelectors.join(', ')).css('-webkit-touch-callout', 'none');
- $(jQTSettings.backSelector).tap(liveTap);
- $(jQTSettings.submitSelector).tap(submitParentForm);
-
- $body = $('body');
-
- if (jQTSettings.fullScreenClass && window.navigator.standalone == true) {
- $body.addClass(jQTSettings.fullScreenClass + ' ' + jQTSettings.statusBar);
- }
-
- // Create custom live events
- $body
- .bind('touchstart', handleTouch)
- .bind('orientationchange', updateOrientation)
- .trigger('orientationchange')
- .submit(submitForm);
-
- if (jQTSettings.useFastTouch && $.support.touch)
- {
- $body.click(function(e){
- var $el = $(e.target);
- if ($el.attr('target') == '_blank' || $el.attr('rel') == 'external' || $el.is('input[type="checkbox"]'))
- {
- return true;
- } else {
- return false;
- }
- });
-
- // This additionally gets rid of form focusses
- $body.mousedown(function(e){
- var timeDiff = (new Date()).getTime() - lastAnimationTime;
- if (timeDiff < 200)
- {
- return false;
- }
- });
- }
-
- // Make sure exactly one child of body has "current" class
- if ($('body > .current').length == 0) {
- currentPage = $('body > *:first');
- } else {
- currentPage = $('body > .current:first');
- $('body > .current').removeClass('current');
- }
-
- // Go to the top of the "current" page
- $(currentPage).addClass('current');
- location.hash = $(currentPage).attr('id');
- addPageToHistory(currentPage);
- scrollTo(0, 0);
- dumbLoopStart();
- });
- }
-
- // PUBLIC FUNCTIONS
- function goBack(to) {
- // Init the param
- if (hist.length > 1) {
- var numberOfPages = Math.min(parseInt(to || 1, 10), hist.length-1);
-
- // Search through the history for an ID
- if( isNaN(numberOfPages) && typeof(to) === "string" && to != '#' ) {
- for( var i=1, length=hist.length; i < length; i++ ) {
- if( '#' + hist[i].id === to ) {
- numberOfPages = i;
- break;
- }
- }
- }
-
- // If still nothing, assume one
- if( isNaN(numberOfPages) || numberOfPages < 1 ) {
- numberOfPages = 1;
- };
-
- // Grab the current page for the "from" info
- var animation = hist[0].animation;
- var fromPage = hist[0].page;
-
- // Remove all pages in front of the target page
- hist.splice(0, numberOfPages);
-
- // Grab the target page
- var toPage = hist[0].page;
-
- // Make the animations
- animatePages(fromPage, toPage, animation, true);
-
- return publicObj;
- } else {
- console.error('No pages in history.');
- return false;
- }
- }
- function goTo(toPage, animation) {
- var fromPage = hist[0].page;
-
- if (typeof(toPage) === 'string') {
- toPage = $(toPage);
- }
- if (typeof(animation) === 'string') {
- for (var i = animations.length - 1; i >= 0; i--){
- if (animations[i].name === animation)
- {
- animation = animations[i];
- break;
- }
- }
- }
- if (animatePages(fromPage, toPage, animation)) {
- addPageToHistory(toPage, animation);
- return publicObj;
- }
- else
- {
- console.error('Could not animate pages.');
- return false;
- }
- }
- function getOrientation() {
- return orientation;
- }
-
- // PRIVATE FUNCTIONS
- function liveTap(e){
-
- // Grab the clicked element
- var $el = $(e.target);
-
- if ($el.attr('nodeName')!=='A'){
- $el = $el.parent('a');
- }
-
- var target = $el.attr('target'),
- hash = $el.attr('hash'),
- animation=null;
-
- if (tapReady == false || !$el.length) {
- console.warn('Not able to tap element.')
- return false;
- }
-
- if ($el.attr('target') == '_blank' || $el.attr('rel') == 'external')
- {
- return true;
- }
-
- // Figure out the animation to use
- for (var i = animations.length - 1; i >= 0; i--){
- if ($el.is(animations[i].selector)) {
- animation = animations[i];
- break;
- }
- };
-
- // User clicked an internal link, fullscreen mode
- if (target == '_webapp') {
- window.location = $el.attr('href');
- }
- // User clicked a back button
- else if ($el.is(jQTSettings.backSelector)) {
- goBack(hash);
- }
- // Branch on internal or external href
- else if (hash && hash!='#') {
- $el.addClass('active');
- goTo($(hash).data('referrer', $el), animation);
- } else {
- $el.addClass('loading active');
- showPageByHref($el.attr('href'), {
- animation: animation,
- callback: function(){
- $el.removeClass('loading'); setTimeout($.fn.unselect, 250, $el);
- },
- $referrer: $el
- });
- }
- return false;
- }
- function addPageToHistory(page, animation) {
- // Grab some info
- var pageId = page.attr('id');
-
- // Prepend info to page history
- hist.unshift({
- page: page,
- animation: animation,
- id: pageId
- });
- }
- function animatePages(fromPage, toPage, animation, backwards) {
- // Error check for target page
- if(toPage.length === 0){
- $.fn.unselect();
- console.error('Target element is missing.');
- return false;
- }
-
- // Collapse the keyboard
- $(':focus').blur();
-
- // Make sure we are scrolled up to hide location bar
- scrollTo(0, 0);
-
- // Define callback to run after animation completes
- var callback = function(event){
-
- if (animation)
- {
- toPage.removeClass('in reverse ' + animation.name);
- fromPage.removeClass('current out reverse ' + animation.name);
- }
- else
- {
- fromPage.removeClass('current');
- }
-
- toPage.trigger('pageAnimationEnd', { direction: 'in' });
- fromPage.trigger('pageAnimationEnd', { direction: 'out' });
-
- clearInterval(dumbLoop);
- currentPage = toPage;
- location.hash = currentPage.attr('id');
- dumbLoopStart();
-
- var $originallink = toPage.data('referrer');
- if ($originallink) {
- $originallink.unselect();
- }
- lastAnimationTime = (new Date()).getTime();
- tapReady = true;
- }
-
- fromPage.trigger('pageAnimationStart', { direction: 'out' });
- toPage.trigger('pageAnimationStart', { direction: 'in' });
-
- if ($.support.WebKitAnimationEvent && animation && jQTSettings.useAnimations) {
- toPage.one('webkitAnimationEnd', callback);
- tapReady = false;
- toPage.addClass(animation.name + ' in current ' + (backwards ? ' reverse' : ''));
- fromPage.addClass(animation.name + ' out' + (backwards ? ' reverse' : ''));
- } else {
- toPage.addClass('current');
- callback();
- }
-
- return true;
- }
- function dumbLoopStart() {
- dumbLoop = setInterval(function(){
- var curid = currentPage.attr('id');
- if (location.hash == '') {
- location.hash = '#' + curid;
- } else if (location.hash != '#' + curid) {
- try {
- goBack(location.hash)
- } catch(e) {
- console.error('Unknown hash change.');
- }
- }
- }, 100);
- }
- function insertPages(nodes, animation) {
- var targetPage = null;
- $(nodes).each(function(index, node){
- var $node = $(this);
- if (!$node.attr('id')) {
- $node.attr('id', 'page-' + (++newPageCount));
- }
- $node.appendTo($body);
- if ($node.hasClass('current') || !targetPage ) {
- targetPage = $node;
- }
- });
- if (targetPage !== null) {
- goTo(targetPage, animation);
- return targetPage;
- }
- else
- {
- return false;
- }
- }
- function showPageByHref(href, options) {
- var defaults = {
- data: null,
- method: 'GET',
- animation: null,
- callback: null,
- $referrer: null
- };
-
- var settings = $.extend({}, defaults, options);
-
- if (href != '#')
- {
- $.ajax({
- url: href,
- data: settings.data,
- type: settings.method,
- success: function (data, textStatus) {
- var firstPage = insertPages(data, settings.animation);
- if (firstPage)
- {
- if (settings.method == 'GET' && jQTSettings.cacheGetRequests && settings.$referrer)
- {
- settings.$referrer.attr('href', '#' + firstPage.attr('id'));
- }
- if (settings.callback) {
- settings.callback(true);
- }
- }
- },
- error: function (data) {
- if (settings.$referrer) settings.$referrer.unselect();
- if (settings.callback) {
- settings.callback(false);
- }
- }
- });
- }
- else if ($referrer)
- {
- $referrer.unselect();
- }
- }
- function submitForm(e, callback){
- var $form = (typeof(e)==='string') ? $(e) : $(e.target);
-
- if ($form.length && $form.is(jQTSettings.formSelector) && $form.attr('action')) {
- showPageByHref($form.attr('action'), {
- data: $form.serialize(),
- method: $form.attr('method') || "POST",
- animation: animations[0] || null,
- callback: callback
- });
- return false;
- }
- return true;
- }
- function submitParentForm(e){
- var $form = $(this).closest('form');
- if ($form.length)
- {
- evt = jQuery.Event("submit");
- evt.preventDefault();
- $form.trigger(evt);
- return false;
- }
- return true;
- }
- function addAnimation(animation) {
- if (typeof(animation.selector) == 'string' && typeof(animation.name) == 'string') {
- animations.push(animation);
- $(animation.selector).tap(liveTap);
- touchSelectors.push(animation.selector);
- }
- }
- function updateOrientation() {
- orientation = window.innerWidth < window.innerHeight ? 'profile' : 'landscape';
- $body.removeClass('profile landscape').addClass(orientation).trigger('turn', {orientation: orientation});
- // scrollTo(0, 0);
- }
- function handleTouch(e) {
-
- var $el = $(e.target);
-
- // Only handle touchSelectors
- if (!$(e.target).is(touchSelectors.join(', ')))
- {
- var $link = $(e.target).closest('a');
-
- if ($link.length){
- $el = $link;
- } else {
- return;
- }
- }
- if (event)
- {
- var hoverTimeout = null,
- startX = event.changedTouches[0].clientX,
- startY = event.changedTouches[0].clientY,
- startTime = (new Date).getTime(),
- deltaX = 0,
- deltaY = 0,
- deltaT = 0;
-
- // Let's bind these after the fact, so we can keep some internal values
- $el.bind('touchmove', touchmove).bind('touchend', touchend);
-
- hoverTimeout = setTimeout(function(){
- $el.makeActive();
- }, 100);
-
- }
-
- // Private touch functions (TODO: insert dirty joke)
- function touchmove(e) {
-
- updateChanges();
- var absX = Math.abs(deltaX);
- var absY = Math.abs(deltaY);
-
- // Check for swipe
- if (absX > absY && (absX > 35) && deltaT < 1000) {
- $el.trigger('swipe', {direction: (deltaX < 0) ? 'left' : 'right'}).unbind('touchmove touchend');
- } else if (absY > 1) {
- $el.removeClass('active');
- }
-
- clearTimeout(hoverTimeout);
- }
-
- function touchend(){
- updateChanges();
-
- if (deltaY === 0 && deltaX === 0) {
- $el.makeActive();
- // New approach:
- // Fake the double click?
- // TODO: Try with all click events (no tap)
- // if (deltaT < 40)
- // {
- // setTimeout(function(){
- // $el.trigger('touchstart')
- // .trigger('touchend');
- // }, 0);
- // }
- $el.trigger('tap');
- } else {
- $el.removeClass('active');
- }
- $el.unbind('touchmove touchend');
- clearTimeout(hoverTimeout);
- }
-
- function updateChanges(){
- var first = event.changedTouches[0] || null;
- deltaX = first.pageX - startX;
- deltaY = first.pageY - startY;
- deltaT = (new Date).getTime() - startTime;
- }
-
- } // End touch handler
-
- // Public jQuery Fns
- $.fn.unselect = function(obj) {
- if (obj) {
- obj.removeClass('active');
- } else {
- $('.active').removeClass('active');
- }
- }
- $.fn.makeActive = function(){
- return $(this).addClass('active');
- }
- $.fn.swipe = function(fn) {
- if ($.isFunction(fn))
- {
- return this.each(function(i, el){
- $(el).bind('swipe', fn);
- });
- }
- }
- $.fn.tap = function(fn){
- if ($.isFunction(fn))
- {
- var tapEvent = (jQTSettings.useFastTouch && $.support.touch) ? 'tap' : 'click';
- return $(this).live(tapEvent, fn);
- } else {
- $(this).trigger('tap');
- }
- }
-
- publicObj = {
- getOrientation: getOrientation,
- goBack: goBack,
- goTo: goTo,
- addAnimation: addAnimation,
- submitForm: submitForm
- }
-
- return publicObj;
- }
-
- // Extensions directly manipulate the jQTouch object, before it's initialized.
- $.jQTouch.prototype.extensions = [];
- $.jQTouch.addExtension = function(extension){
- $.jQTouch.prototype.extensions.push(extension);
- }
-
-})(jQuery);
\ No newline at end of file
diff --git a/OurUmbraco.Site/jqtouch/jqtouch.min.css b/OurUmbraco.Site/jqtouch/jqtouch.min.css
deleted file mode 100644
index 37ef6fed..00000000
--- a/OurUmbraco.Site/jqtouch/jqtouch.min.css
+++ /dev/null
@@ -1 +0,0 @@
-*{margin:0;padding:0;}a{-webkit-tap-highlight-color:rgba(0,0,0,0);}body{overflow-x:hidden;-webkit-user-select:none;-webkit-text-size-adjust:none;font-family:Helvetica;-webkit-perspective:800;-webkit-transform-style:preserve-3d;}.selectable,input,textarea{-webkit-user-select:auto;}body>*{-webkit-backface-visibility:hidden;-webkit-box-sizing:border-box;display:none;position:absolute;left:0;width:100%;-webkit-transform:translate3d(0,0,0) rotate(0) scale(1);min-height:420px!important;}body.fullscreen>*{min-height:460px!important;}body.fullscreen.black-translucent>*{min-height:480px!important;}body.landscape>*{min-height:320px;}body>.current{display:block!important;}.in,.out{-webkit-animation-timing-function:ease-in-out;-webkit-animation-duration:350ms;}.slide.in{-webkit-animation-name:slideinfromright;}.slide.out{-webkit-animation-name:slideouttoleft;}.slide.in.reverse{-webkit-animation-name:slideinfromleft;}.slide.out.reverse{-webkit-animation-name:slideouttoright;}@-webkit-keyframes slideinfromright{from{-webkit-transform:translateX(100%);}to{-webkit-transform:translateX(0);}}@-webkit-keyframes slideinfromleft{from{-webkit-transform:translateX(-100%);}to{-webkit-transform:translateX(0);}}@-webkit-keyframes slideouttoleft{from{-webkit-transform:translateX(0);}to{-webkit-transform:translateX(-100%);}}@-webkit-keyframes slideouttoright{from{-webkit-transform:translateX(0);}to{-webkit-transform:translateX(100%);}}@-webkit-keyframes fadein{from{opacity:0;}to{opacity:1;}}@-webkit-keyframes fadeout{from{opacity:1;}to{opacity:0;}}.fade.in{z-index:10;-webkit-animation-name:fadein;}.fade.out{z-index:0;}.dissolve.in{-webkit-animation-name:fadein;}.dissolve.out{-webkit-animation-name:fadeout;}.flip{-webkit-animation-duration:.65s;}.flip.in{-webkit-animation-name:flipinfromleft;}.flip.out{-webkit-animation-name:flipouttoleft;}.flip.in.reverse{-webkit-animation-name:flipinfromright;}.flip.out.reverse{-webkit-animation-name:flipouttoright;}@-webkit-keyframes flipinfromright{from{-webkit-transform:rotateY(-180deg) scale(.8);}to{-webkit-transform:rotateY(0) scale(1);}}@-webkit-keyframes flipinfromleft{from{-webkit-transform:rotateY(180deg) scale(.8);}to{-webkit-transform:rotateY(0) scale(1);}}@-webkit-keyframes flipouttoleft{from{-webkit-transform:rotateY(0) scale(1);}to{-webkit-transform:rotateY(-180deg) scale(.8);}}@-webkit-keyframes flipouttoright{from{-webkit-transform:rotateY(0) scale(1);}to{-webkit-transform:rotateY(180deg) scale(.8);}}.slideup.in{-webkit-animation-name:slideup;z-index:10;}.slideup.out{-webkit-animation-name:dontmove;z-index:0;}.slideup.out.reverse{z-index:10;-webkit-animation-name:slidedown;}.slideup.in.reverse{z-index:0;-webkit-animation-name:dontmove;}@-webkit-keyframes slideup{from{-webkit-transform:translateY(100%);}to{-webkit-transform:translateY(0);}}@-webkit-keyframes slidedown{from{-webkit-transform:translateY(0);}to{-webkit-transform:translateY(100%);}}@-webkit-keyframes dontmove{from{opacity:1;}to{opacity:1;}}.swap{-webkit-transform:perspective(800);-webkit-animation-duration:.7s;}.swap.out{-webkit-animation-name:swapouttoleft;}.swap.in{-webkit-animation-name:swapinfromright;}.swap.out.reverse{-webkit-animation-name:swapouttoright;}.swap.in.reverse{-webkit-animation-name:swapinfromleft;}@-webkit-keyframes swapouttoright{0%{-webkit-transform:translate3d(0px,0px,0px) rotateY(0deg);-webkit-animation-timing-function:ease-in-out;}50%{-webkit-transform:translate3d(-180px,0px,-400px) rotateY(20deg);-webkit-animation-timing-function:ease-in;}100%{-webkit-transform:translate3d(0px,0px,-800px) rotateY(70deg);}}@-webkit-keyframes swapouttoleft{0%{-webkit-transform:translate3d(0px,0px,0px) rotateY(0deg);-webkit-animation-timing-function:ease-in-out;}50%{-webkit-transform:translate3d(180px,0px,-400px) rotateY(-20deg);-webkit-animation-timing-function:ease-in;}100%{-webkit-transform:translate3d(0px,0px,-800px) rotateY(-70deg);}}@-webkit-keyframes swapinfromright{0%{-webkit-transform:translate3d(0px,0px,-800px) rotateY(70deg);-webkit-animation-timing-function:ease-out;}50%{-webkit-transform:translate3d(-180px,0px,-400px) rotateY(20deg);-webkit-animation-timing-function:ease-in-out;}100%{-webkit-transform:translate3d(0px,0px,0px) rotateY(0deg);}}@-webkit-keyframes swapinfromleft{0%{-webkit-transform:translate3d(0px,0px,-800px) rotateY(-70deg);-webkit-animation-timing-function:ease-out;}50%{-webkit-transform:translate3d(180px,0px,-400px) rotateY(-20deg);-webkit-animation-timing-function:ease-in-out;}100%{-webkit-transform:translate3d(0px,0px,0px) rotateY(0deg);}}.cube{-webkit-animation-duration:.55s;}.cube.in{-webkit-animation-name:cubeinfromright;-webkit-transform-origin:0 50%;}.cube.out{-webkit-animation-name:cubeouttoleft;-webkit-transform-origin:100% 50%;}.cube.in.reverse{-webkit-animation-name:cubeinfromleft;-webkit-transform-origin:100% 50%;}.cube.out.reverse{-webkit-animation-name:cubeouttoright;-webkit-transform-origin:0 50%;}@-webkit-keyframes cubeinfromleft{from{-webkit-transform:rotateY(-90deg) translateZ(320px);opacity:.5;}to{-webkit-transform:rotateY(0deg) translateZ(0);opacity:1;}}@-webkit-keyframes cubeouttoright{from{-webkit-transform:rotateY(0deg) translateX(0);opacity:1;}to{-webkit-transform:rotateY(90deg) translateZ(320px);opacity:.5;}}@-webkit-keyframes cubeinfromright{from{-webkit-transform:rotateY(90deg) translateZ(320px);opacity:.5;}to{-webkit-transform:rotateY(0deg) translateZ(0);opacity:1;}}@-webkit-keyframes cubeouttoleft{from{-webkit-transform:rotateY(0deg) translateZ(0);opacity:1;}to{-webkit-transform:rotateY(-90deg) translateZ(320px);opacity:.5;}}.pop{-webkit-transform-origin:50% 50%;}.pop.in{-webkit-animation-name:popin;z-index:10;}.pop.out.reverse{-webkit-animation-name:popout;z-index:10;}.pop.in.reverse{z-index:0;-webkit-animation-name:dontmove;}@-webkit-keyframes popin{from{-webkit-transform:scale(.2);opacity:0;}to{-webkit-transform:scale(1);opacity:1;}}@-webkit-keyframes popout{from{-webkit-transform:scale(1);opacity:1;}to{-webkit-transform:scale(.2);opacity:0;}}
\ No newline at end of file
diff --git a/OurUmbraco.Site/jqtouch/jqtouch.min.js b/OurUmbraco.Site/jqtouch/jqtouch.min.js
deleted file mode 100644
index f43917eb..00000000
--- a/OurUmbraco.Site/jqtouch/jqtouch.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function($){$.jQTouch=function(_2){$.support.WebKitCSSMatrix=(typeof WebKitCSSMatrix=="object");$.support.touch=(typeof Touch=="object");$.support.WebKitAnimationEvent=(typeof WebKitTransitionEvent=="object");var _3,$head=$("head"),hist=[],newPageCount=0,jQTSettings={},hashCheck,currentPage,orientation,isMobileWebKit=RegExp(" Mobile/").test(navigator.userAgent),tapReady=true,lastAnimationTime=0,touchSelectors=[],publicObj={},extensions=$.jQTouch.prototype.extensions,defaultAnimations=["slide","flip","slideup","swap","cube","pop","dissolve","fade","back"],animations=[],hairextensions="";init(_2);function init(_4){var _5={addGlossToIcon:true,backSelector:".back, .cancel, .goback",cacheGetRequests:true,cubeSelector:".cube",dissolveSelector:".dissolve",fadeSelector:".fade",fixedViewport:true,flipSelector:".flip",formSelector:"form",fullScreen:true,fullScreenClass:"fullscreen",icon:null,touchSelector:"a, .touch",popSelector:".pop",preloadImages:false,slideSelector:"body > * > ul li a",slideupSelector:".slideup",startupScreen:null,statusBar:"default",submitSelector:".submit",swapSelector:".swap",useAnimations:true,useFastTouch:true};jQTSettings=$.extend({},_5,_4);if(jQTSettings.preloadImages){for(var i=jQTSettings.preloadImages.length-1;i>=0;i--){(new Image()).src=jQTSettings.preloadImages[i];}}if(jQTSettings.icon){var _7=(jQTSettings.addGlossToIcon)?"":"-precomposed";hairextensions+="";}if(jQTSettings.startupScreen){hairextensions+="";}if(jQTSettings.fixedViewport){hairextensions+="";}if(jQTSettings.fullScreen){hairextensions+="";if(jQTSettings.statusBar){hairextensions+="";}}if(hairextensions){$head.append(hairextensions);}$(document).ready(function(){for(var i in extensions){var fn=extensions[i];if($.isFunction(fn)){$.extend(publicObj,fn(publicObj));}}for(var i in defaultAnimations){var _a=defaultAnimations[i];var _b=jQTSettings[_a+"Selector"];if(typeof (_b)=="string"){addAnimation({name:_a,selector:_b});}}touchSelectors.push("input");touchSelectors.push(jQTSettings.touchSelector);touchSelectors.push(jQTSettings.backSelector);touchSelectors.push(jQTSettings.submitSelector);$(touchSelectors.join(", ")).css("-webkit-touch-callout","none");$(jQTSettings.backSelector).tap(liveTap);$(jQTSettings.submitSelector).tap(submitParentForm);_3=$("body");if(jQTSettings.fullScreenClass&&window.navigator.standalone==true){_3.addClass(jQTSettings.fullScreenClass+" "+jQTSettings.statusBar);}_3.bind("touchstart",handleTouch).bind("orientationchange",updateOrientation).trigger("orientationchange").submit(submitForm);if(jQTSettings.useFastTouch&&$.support.touch){_3.click(function(e){var _d=$(e.target);if(_d.attr("target")=="_blank"||_d.attr("rel")=="external"||_d.is("input[type=\"checkbox\"]")){return true;}else{return false;}});_3.mousedown(function(e){var _f=(new Date()).getTime()-lastAnimationTime;if(_f<200){return false;}});}if($("body > .current").length==0){currentPage=$("body > *:first");}else{currentPage=$("body > .current:first");$("body > .current").removeClass("current");}$(currentPage).addClass("current");location.hash=$(currentPage).attr("id");addPageToHistory(currentPage);scrollTo(0,0);dumbLoopStart();});}function goBack(to){if(hist.length>1){var _11=Math.min(parseInt(to||1,10),hist.length-1);if(isNaN(_11)&&typeof (to)==="string"&&to!="#"){for(var i=1,length=hist.length;i=0;i--){if(animations[i].name===_17){_17=animations[i];break;}}}if(animatePages(_18,_16,_17)){addPageToHistory(_16,_17);return publicObj;}else{console.error("Could not animate pages.");return false;}}function getOrientation(){return orientation;}function liveTap(e){var $el=$(e.target);if($el.attr("nodeName")!=="A"){$el=$el.parent("a");}var _1c=$el.attr("target"),hash=$el.attr("hash"),animation=null;if(tapReady==false||!$el.length){console.warn("Not able to tap element.");return false;}if($el.attr("target")=="_blank"||$el.attr("rel")=="external"){return true;}for(var i=animations.length-1;i>=0;i--){if($el.is(animations[i].selector)){animation=animations[i];break;}}if(_1c=="_webapp"){window.location=$el.attr("href");}else{if($el.is(jQTSettings.backSelector)){goBack(hash);}else{if(hash&&hash!="#"){$el.addClass("active");goTo($(hash).data("referrer",$el),animation);}else{$el.addClass("loading active");showPageByHref($el.attr("href"),{animation:animation,callback:function(){$el.removeClass("loading");setTimeout($.fn.unselect,250,$el);},$referrer:$el});}}}return false;}function addPageToHistory(_1e,_1f){var _20=_1e.attr("id");hist.unshift({page:_1e,animation:_1f,id:_20});}function animatePages(_21,_22,_23,_24){if(_22.length===0){$.fn.unselect();console.error("Target element is missing.");return false;}$(":focus").blur();scrollTo(0,0);var _25=function(_26){if(_23){_22.removeClass("in reverse "+_23.name);_21.removeClass("current out reverse "+_23.name);}else{_21.removeClass("current");}_22.trigger("pageAnimationEnd",{direction:"in"});_21.trigger("pageAnimationEnd",{direction:"out"});clearInterval(dumbLoop);currentPage=_22;location.hash=currentPage.attr("id");dumbLoopStart();var _27=_22.data("referrer");if(_27){_27.unselect();}lastAnimationTime=(new Date()).getTime();tapReady=true;};_21.trigger("pageAnimationStart",{direction:"out"});_22.trigger("pageAnimationStart",{direction:"in"});if($.support.WebKitAnimationEvent&&_23&&jQTSettings.useAnimations){_22.one("webkitAnimationEnd",_25);tapReady=false;_22.addClass(_23.name+" in current "+(_24?" reverse":""));_21.addClass(_23.name+" out"+(_24?" reverse":""));}else{_22.addClass("current");_25();}return true;}function dumbLoopStart(){dumbLoop=setInterval(function(){var _28=currentPage.attr("id");if(location.hash==""){location.hash="#"+_28;}else{if(location.hash!="#"+_28){try{goBack(location.hash);}catch(e){console.error("Unknown hash change.");}}}},100);}function insertPages(_29,_2a){var _2b=null;$(_29).each(function(_2c,_2d){var _2e=$(this);if(!_2e.attr("id")){_2e.attr("id","page-"+(++newPageCount));}_2e.appendTo(_3);if(_2e.hasClass("current")||!_2b){_2b=_2e;}});if(_2b!==null){goTo(_2b,_2a);return _2b;}else{return false;}}function showPageByHref(_2f,_30){var _31={data:null,method:"GET",animation:null,callback:null,$referrer:null};var _32=$.extend({},_31,_30);if(_2f!="#"){$.ajax({url:_2f,data:_32.data,type:_32.method,success:function(_33,_34){var _35=insertPages(_33,_32.animation);if(_35){if(_32.method=="GET"&&jQTSettings.cacheGetRequests&&_32.$referrer){_32.$referrer.attr("href","#"+_35.attr("id"));}if(_32.callback){_32.callback(true);}}},error:function(_36){if(_32.$referrer){_32.$referrer.unselect();}if(_32.callback){_32.callback(false);}}});}else{if($referrer){$referrer.unselect();}}}function submitForm(e,_38){var _39=(typeof (e)==="string")?$(e):$(e.target);if(_39.length&&_39.is(jQTSettings.formSelector)&&_39.attr("action")){showPageByHref(_39.attr("action"),{data:_39.serialize(),method:_39.attr("method")||"POST",animation:animations[0]||null,callback:_38});return false;}return true;}function submitParentForm(e){var _3b=$(this).closest("form");if(_3b.length){evt=jQuery.Event("submit");evt.preventDefault();_3b.trigger(evt);return false;}return true;}function addAnimation(_3c){if(typeof (_3c.selector)=="string"&&typeof (_3c.name)=="string"){animations.push(_3c);$(_3c.selector).tap(liveTap);touchSelectors.push(_3c.selector);}}function updateOrientation(){orientation=window.innerWidth_43&&(_42>35)&&deltaT<1000){$el.trigger("swipe",{direction:(deltaX<0)?"left":"right"}).unbind("touchmove touchend");}else{if(_43>1){$el.removeClass("active");}}clearTimeout(_40);}function touchend(){updateChanges();if(deltaY===0&&deltaX===0){$el.makeActive();$el.trigger("tap");}else{$el.removeClass("active");}$el.unbind("touchmove touchend");clearTimeout(_40);}function updateChanges(){var _44=event.changedTouches[0]||null;deltaX=_44.pageX-startX;deltaY=_44.pageY-startY;deltaT=(new Date).getTime()-startTime;}}$.fn.unselect=function(obj){if(obj){obj.removeClass("active");}else{$(".active").removeClass("active");}};$.fn.makeActive=function(){return $(this).addClass("active");};$.fn.swipe=function(fn){if($.isFunction(fn)){return this.each(function(i,el){$(el).bind("swipe",fn);});}};$.fn.tap=function(fn){if($.isFunction(fn)){var _4a=(jQTSettings.useFastTouch&&$.support.touch)?"tap":"click";return $(this).live(_4a,fn);}else{$(this).trigger("tap");}};publicObj={getOrientation:getOrientation,goBack:goBack,goTo:goTo,addAnimation:addAnimation,submitForm:submitForm};return publicObj;};$.jQTouch.prototype.extensions=[];$.jQTouch.addExtension=function(_4b){$.jQTouch.prototype.extensions.push(_4b);};})(jQuery);
\ No newline at end of file
diff --git a/OurUmbraco.Site/jqtouch/jqtouch.transitions.js b/OurUmbraco.Site/jqtouch/jqtouch.transitions.js
deleted file mode 100644
index 9d8970fd..00000000
--- a/OurUmbraco.Site/jqtouch/jqtouch.transitions.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-
- _/ _/_/ _/_/_/_/_/ _/
- _/ _/ _/ _/_/ _/ _/ _/_/_/ _/_/_/
- _/ _/ _/_/ _/ _/ _/ _/ _/ _/ _/ _/
- _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/
- _/ _/_/ _/ _/ _/_/ _/_/_/ _/_/_/ _/ _/
- _/
- _/
-
- Created by David Kaneda
- Documentation and issue tracking on Google Code
-
- Special thanks to Jonathan Stark
- and pinch/zoom
-
- (c) 2009 by jQTouch project members.
- See LICENSE.txt for license.
-
-*/
-
-(function($) {
-
- $.fn.transition = function(css, options) {
- return this.each(function(){
- var $el = $(this);
- var defaults = {
- speed : '300ms',
- callback: null,
- ease: 'ease-in-out'
- };
- var settings = $.extend({}, defaults, options);
- if(settings.speed === 0) {
- $el.css(css);
- window.setTimeout(settings.callback, 0);
- } else {
- if ($.browser.safari)
- {
- var s = [];
- for(var i in css) {
- s.push(i);
- }
- $el.css({
- webkitTransitionProperty: s.join(", "),
- webkitTransitionDuration: settings.speed,
- webkitTransitionTimingFunction: settings.ease
- });
- if (settings.callback) {
- $el.one('webkitTransitionEnd', settings.callback);
- }
- setTimeout(function(el){ el.css(css) }, 0, $el);
- }
- else
- {
- $el.animate(css, settings.speed, settings.callback);
- }
- }
- });
- }
-})(jQuery);
\ No newline at end of file
diff --git a/OurUmbraco.Site/jqtouch/jquery.1.3.2.min.js b/OurUmbraco.Site/jqtouch/jquery.1.3.2.min.js
deleted file mode 100644
index b1ae21d8..00000000
--- a/OurUmbraco.Site/jqtouch/jquery.1.3.2.min.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * jQuery JavaScript Library v1.3.2
- * http://jquery.com/
- *
- * Copyright (c) 2009 John Resig
- * Dual licensed under the MIT and GPL licenses.
- * http://docs.jquery.com/License
- *
- * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
- * Revision: 6246
- */
-(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("",""]||!O.indexOf("",""]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,""]||!O.indexOf("",""]||(!O.indexOf("","
"]||!O.indexOf("",""]||!o.support.htmlSerialize&&[1,"div","
"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}});
-/*
- * Sizzle CSS Selector Engine - v0.9.3
- * Copyright 2009, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- * More information: http://sizzlejs.com/
- */
-(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return UT[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("").append(M.responseText.replace(//g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})();
\ No newline at end of file
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/img/backButton.png b/OurUmbraco.Site/jqtouch/themes/apple/img/backButton.png
deleted file mode 100644
index 935f914e..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/apple/img/backButton.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/img/blueButton.png b/OurUmbraco.Site/jqtouch/themes/apple/img/blueButton.png
deleted file mode 100644
index 0f92dfd9..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/apple/img/blueButton.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/img/cancel.png b/OurUmbraco.Site/jqtouch/themes/apple/img/cancel.png
deleted file mode 100644
index 5f6dcc87..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/apple/img/cancel.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/img/chevron.png b/OurUmbraco.Site/jqtouch/themes/apple/img/chevron.png
deleted file mode 100644
index 6421a167..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/apple/img/chevron.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/img/grayButton.png b/OurUmbraco.Site/jqtouch/themes/apple/img/grayButton.png
deleted file mode 100644
index 0ce6a30d..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/apple/img/grayButton.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/img/listArrowSel.png b/OurUmbraco.Site/jqtouch/themes/apple/img/listArrowSel.png
deleted file mode 100644
index 86832ebc..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/apple/img/listArrowSel.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/img/listGroup.png b/OurUmbraco.Site/jqtouch/themes/apple/img/listGroup.png
deleted file mode 100644
index 567d8580..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/apple/img/listGroup.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/img/loading.gif b/OurUmbraco.Site/jqtouch/themes/apple/img/loading.gif
deleted file mode 100644
index 8522ddf1..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/apple/img/loading.gif and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/img/on_off.png b/OurUmbraco.Site/jqtouch/themes/apple/img/on_off.png
deleted file mode 100644
index 62325a82..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/apple/img/on_off.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/img/pinstripes.png b/OurUmbraco.Site/jqtouch/themes/apple/img/pinstripes.png
deleted file mode 100644
index c9977751..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/apple/img/pinstripes.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/img/selection.png b/OurUmbraco.Site/jqtouch/themes/apple/img/selection.png
deleted file mode 100644
index 537e3f0b..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/apple/img/selection.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/img/thumb.png b/OurUmbraco.Site/jqtouch/themes/apple/img/thumb.png
deleted file mode 100644
index 81495a09..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/apple/img/thumb.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/img/toggle.png b/OurUmbraco.Site/jqtouch/themes/apple/img/toggle.png
deleted file mode 100644
index 3b62ebf2..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/apple/img/toggle.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/img/toggleOn.png b/OurUmbraco.Site/jqtouch/themes/apple/img/toggleOn.png
deleted file mode 100644
index b016814d..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/apple/img/toggleOn.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/img/toolButton.png b/OurUmbraco.Site/jqtouch/themes/apple/img/toolButton.png
deleted file mode 100644
index dfbba4ef..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/apple/img/toolButton.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/img/toolbar.png b/OurUmbraco.Site/jqtouch/themes/apple/img/toolbar.png
deleted file mode 100644
index 2159c7dd..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/apple/img/toolbar.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/img/whiteButton.png b/OurUmbraco.Site/jqtouch/themes/apple/img/whiteButton.png
deleted file mode 100644
index 5514b270..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/apple/img/whiteButton.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/theme.css b/OurUmbraco.Site/jqtouch/themes/apple/theme.css
deleted file mode 100644
index 07d85eb3..00000000
--- a/OurUmbraco.Site/jqtouch/themes/apple/theme.css
+++ /dev/null
@@ -1,677 +0,0 @@
-body {
- background: rgb(0,0,0);
-}
-
-body > * {
- background: rgb(197,204,211) url(img/pinstripes.png);
-}
-
-h1, h2 {
- font: bold 18px Helvetica;
- text-shadow: rgba(255,255,255,.2) 0 1px 1px;
- color: rgb(76, 86, 108);
- margin: 10px 20px 6px;
-}
-
-/* @group Toolbar */
-
-.toolbar {
- -webkit-box-sizing: border-box;
- border-bottom: 1px solid #2d3642;
- padding: 10px;
- height: 45px;
- background: url(img/toolbar.png) #6d84a2 repeat-x;
- position: relative;
-}
-
-.black-translucent .toolbar {
- margin-top: 20px;
-}
-
-.toolbar > h1 {
- position: absolute;
- overflow: hidden;
- left: 50%;
- top: 10px;
- line-height: 1em;
- margin: 1px 0 0 -75px;
- height: 40px;
- font-size: 20px;
- width: 150px;
- font-weight: bold;
- text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0;
- text-align: center;
- text-overflow: ellipsis;
- white-space: nowrap;
- color: #fff;
-}
-
-body.landscape .toolbar > h1 {
- margin-left: -125px;
- width: 250px;
-}
-
-.button, .back, .cancel, .add {
- position: absolute;
- overflow: hidden;
- top: 8px;
- right: 6px;
- margin: 0;
- border-width: 0 5px;
- padding: 0 3px;
- width: auto;
- height: 30px;
- line-height: 30px;
- font-family: inherit;
- font-size: 12px;
- font-weight: bold;
- color: #fff;
- text-shadow: rgba(0, 0, 0, 0.5) 0px -1px 0;
- text-overflow: ellipsis;
- text-decoration: none;
- white-space: nowrap;
- background: none;
- -webkit-border-image: url(img/toolButton.png) 0 5 0 5;
-}
-
-.button.active, .back.active, .cancel.active, .add.active {
- -webkit-border-image: url(img/toolButton.png) 0 5 0 5;
-}
-
-.blueButton {
- -webkit-border-image: url(img/blueButton.png) 0 5 0 5;
- border-width: 0 5px;
-}
-
-.back {
- left: 6px;
- right: auto;
- padding: 0;
- max-width: 55px;
- border-width: 0 8px 0 14px;
- -webkit-border-image: url(img/backButton.png) 0 8 0 14;
-}
-
-.leftButton, .cancel {
- left: 6px;
- right: auto;
-}
-
-.add {
- font-size: 24px;
- line-height: 24px;
- font-weight: bold;
-}
-
-.whiteButton,
-.grayButton {
- display: block;
- border-width: 0 12px;
- padding: 10px;
- text-align: center;
- font-size: 20px;
- font-weight: bold;
- text-decoration: inherit;
- color: inherit;
-}
-
-.whiteButton {
- -webkit-border-image: url(img/whiteButton.png) 0 12 0 12;
- text-shadow: rgba(255, 255, 255, 0.7) 0 1px 0;
-}
-
-.grayButton {
- -webkit-border-image: url(img/grayButton.png) 0 12 0 12;
- color: #FFFFFF;
-}
-
-/* @end */
-
-/* @group Lists */
-
-h1 + ul, h2 + ul, h3 + ul, h4 + ul, h5 + ul, h6 + ul {
- margin-top: 0;
-}
-
-ul {
- color: black;
- background: #fff;
- border: 1px solid #B4B4B4;
- font: bold 17px Helvetica;
- padding: 0;
- margin: 15px 10px 17px 10px;
- -webkit-border-radius: 8px;
-}
-
-ul li {
- color: #666;
- border-top: 1px solid #B4B4B4;
- list-style-type: none;
- padding: 10px 10px 10px 10px;
-}
-
-/* when you have a first LI item on any list */
-
-li:first-child, li:first-child a {
- border-top: 0;
- -webkit-border-top-left-radius: 8px;
- -webkit-border-top-right-radius: 8px;
-}
-
-li:last-child, li:last-child a {
- -webkit-border-bottom-left-radius: 8px;
- -webkit-border-bottom-right-radius: 8px;
-}
-
-/* universal arrows */
-
-ul li.arrow {
- background-image: url(img/chevron.png);
- background-position: right center;
- background-repeat: no-repeat;
-}
-
-#plastic ul li.arrow, #metal ul li.arrow {
- background-image: url(../images/chevron_dg.png);
- background-position: right center;
- background-repeat: no-repeat;
-}
-
-/* universal links on list */
-
-ul li a, li.img a + a {
- color: #000;
- text-decoration: none;
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
- display: block;
- padding: 12px 10px 12px 10px;
- margin: -10px;
- -webkit-tap-highlight-color: rgba(0,0,0,0);
-}
-
-ul li a.active {
- background: #194fdb url(img/selection.png) 0 0 repeat-x;
- color: #fff;
-}
-
-ul li a.button {
- background-color: #194fdb;
- color: #fff;
-}
-
-ul li.img a + a {
- margin: -10px 10px -20px -5px;
- font-size: 17px;
- font-weight: bold;
-}
-
-ul li.img a + a + a {
- font-size: 14px;
- font-weight: normal;
- margin-left: -10px;
- margin-bottom: -10px;
- margin-top: 0;
-}
-
-ul li.img a + small + a {
- margin-left: -5px;
-}
-
-ul li.img a + small + a + a {
- margin-left: -10px;
- margin-top: -20px;
- margin-bottom: -10px;
- font-size: 14px;
- font-weight: normal;
-}
-
-ul li.img a + small + a + a + a {
- margin-left: 0px !important;
- margin-bottom: 0;
-}
-
-ul li a + a {
- color: #000;
- font: 14px Helvetica;
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
- display: block;
- margin: 0;
- padding: 0;
-}
-
-ul li a + a + a, ul li.img a + a + a + a, ul li.img a + small + a + a + a {
- color: #666;
- font: 13px Helvetica;
- margin: 0;
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
- display: block;
- padding: 0;
-}
-
-/*
-@end */
-
-/* @group Forms */
-
-ul.form li {
- padding: 7px 10px;
-}
-
-ul.form li.error {
- border: 2px solid red;
-}
-
-ul.form li.error + li.error {
- border-top: 0;
-}
-
-ul.form li:hover {
- background: #fff;
-}
-
-ul li input[type="text"], ul li input[type="password"], ul li textarea, ul li select {
- color: #777;
- background: #fff url(../.png);
- border: 0;
- font: normal 17px Helvetica;
- padding: 0;
- display: inline-block;
- margin-left: 0px;
- width: 100%;
- -webkit-appearance: textarea;
-}
-
-ul li textarea {
- height: 120px;
- padding: 0;
- text-indent: -2px;
-}
-
-ul li select {
- text-indent: 0px;
- background: transparent url(../images/chevron.png) no-repeat 103% 3px;
- -webkit-appearance: textfield;
- margin-left: -6px;
- width: 104%;
-}
-
-ul li input[type="checkbox"], ul li input[type="radio"] {
- margin: 0;
- color: rgb(50,79,133);
- padding: 10px 10px;
-}
-
-ul li input[type="checkbox"]:after, ul li input[type="radio"]:after {
- content: attr(title);
- font: 17px Helvetica;
- display: block;
- width: 246px;
- margin: -12px 0 0 17px;
-}
-
-/* @end */
-
-/* @group Edge to edge */
-
-.edgetoedge h4 {
- color: #fff;
- background: rgb(154,159,170) url(img/listGroup.png) top left repeat-x;
- border-top: 1px solid rgb(165,177,186);
- text-shadow: #666 0 1px 0;
- margin: 0;
- padding: 2px 10px;
-}
-
-.edgetoedge, .metal {
- margin: 0;
- padding: 0;
- background-color: rgb(255,255,255);
-}
-
-.edgetoedge ul, .metal ul, .plastic ul {
- -webkit-border-radius: 0;
- margin: 0;
- border-left: 0;
- border-right: 0;
- border-top: 0;
-}
-
-.metal ul {
- border-top: 0;
- border-bottom: 0;
- background: rgb(180,180,180);
-}
-
-.edgetoedge ul li:first-child, .edgetoedge ul li:first-child a, .edgetoedge ul li:last-child, .edgetoedge ul li:last-child a, .metal ul li:first-child a, .metal ul li:last-child a {
- -webkit-border-radius: 0;
-}
-
-.edgetoedge ul li small {
- font-size: 16px;
- line-height: 28px;
-}
-
-.edgetoedge li, .metal li {
- -webkit-border-radius: 0;
-}
-
-.edgetoedge li em {
- font-weight: normal;
- font-style: normal;
-}
-
-.edgetoedge h4 + ul {
- border-top: 1px solid rgb(152,158,164);
- border-bottom: 1px solid rgb(113,125,133);
-}
-
-/* @end */
-
-/* @group Mini Label */
-
-ul li small {
- color: #369;
- font: 17px Helvetica;
- text-align: right;
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
- display: block;
- width: 23%;
- float: right;
- padding: 3px 0px;
-}
-
-ul li.arrow small {
- padding: 0 15px;
-}
-
-ul li small.counter {
- font-size: 17px !important;
- line-height: 13px !important;
- font-weight: bold;
- background: rgb(154,159,170);
- color: #fff;
- -webkit-border-radius: 11px;
- padding: 4px 10px 5px 10px;
- display: inline !important;
- width: auto;
- margin-top: -22px;
-}
-
-ul li.arrow small.counter {
- margin-right: 15px;
-}
-
-/* @end */
-
-/* @group Plastic */
-
-#plastic ul li.arrow, #metal ul li.arrow {
- background-image: url(img/listArrow.png);
- background-position: right center;
- background-repeat: no-repeat;
-}
-
-.edgetoedge ul, .metal ul, .plastic ul {
- -webkit-border-radius: 0;
- margin: 0;
- border-left: 0;
- border-right: 0;
- border-top: 0;
-}
-
-.metal ul li {
- border-top: 1px solid rgb(238,238,238);
- border-bottom: 1px solid rgb(156,158,165);
- background: url(../images/bgMetal.png) top left repeat-x;
- font-size: 26px;
- text-shadow: #fff 0 1px 0;
-}
-
-.metal ul li a {
- line-height: 26px;
- margin: 0;
- padding: 13px 0;
-}
-
-.metal ul li a:hover {
- color: rgb(0,0,0);
-}
-
-.metal ul li:hover small {
- color: inherit;
-}
-
-.metal ul li a em {
- display: block;
- font-size: 14px;
- font-style: normal;
- color: #444;
- width: 50%;
- line-height: 14px;
-}
-
-.metal ul li small {
- float: right;
- position: relative;
- margin-top: 10px;
- font-weight: bold;
-}
-
-.metal ul li.arrow a small {
- padding-right: 0;
- line-height: 17px;
-}
-
-.metal ul li.arrow {
- background: url(../images/bgMetal.png) top left repeat-x,
- url(../images/chevron_dg.png) right center no-repeat;
-}
-
-.plastic {
- margin: 0;
- padding: 0;
- background: rgb(173,173,173);
-}
-
-.plastic ul {
- -webkit-border-radius: 0;
- margin: 0;
- border-left: 0;
- border-right: 0;
- border-top: 0;
- background-color: rgb(173,173,173);
-}
-
-.plastic ul li {
- -webkit-border-radius: 0;
- border-top: 1px solid rgb(191,191,191);
- border-bottom: 1px solid rgb(157,157,157);
-}
-
-.plastic ul li:nth-child(odd) {
- background-color: rgb(152,152,152);
- border-top: 1px solid rgb(181,181,181);
- border-bottom: 1px solid rgb(138,138,138);
-}
-
-.plastic ul + p {
- font-size: 11px;
- color: #2f3237;
- text-shadow: none;
- padding: 10px 10px;
-}
-
-.plastic ul + p strong {
- font-size: 14px;
- line-height: 18px;
- text-shadow: #fff 0 1px 0;
-}
-
-.plastic ul li a {
- text-shadow: rgb(211,211,211) 0 1px 0;
-}
-
-.plastic ul li:nth-child(odd) a {
- text-shadow: rgb(191,191,191) 0 1px 0;
-}
-
-.plastic ul li small {
- color: #3C3C3C;
- text-shadow: rgb(211,211,211) 0 1px 0;
- font-size: 13px;
- font-weight: bold;
- text-transform: uppercase;
- line-height: 24px;
-}
-
-#plastic ul.minibanner, #plastic ul.bigbanner {
- margin: 10px;
- border: 0;
- height: 81px;
- clear: both;
-}
-
-#plastic ul.bigbanner {
- height: 140px !important;
-}
-
-#plastic ul.minibanner li {
- border: 1px solid rgb(138,138,138);
- background-color: rgb(152,152,152);
- width: 145px;
- height: 81px;
- float: left;
- -webkit-border-radius: 5px;
- padding: 0;
-}
-
-#plastic ul.bigbanner li {
- border: 1px solid rgb(138,138,138);
- background-color: rgb(152,152,152);
- width: 296px;
- height: 140px;
- float: left;
- -webkit-border-radius: 5px;
- padding: 0;
- margin-bottom: 4px;
-}
-
-#plastic ul.minibanner li:first-child {
- margin-right: 6px;
-}
-
-#plastic ul.minibanner li a {
- color: transparent;
- text-shadow: none;
- display: block;
- width: 145px;
- height: 81px;
-}
-
-#plastic ul.bigbanner li a {
- color: transparent;
- text-shadow: none;
- display: block;
- width: 296px;
- height: 145px;
-}
-
-/* @end */
-
-/* @group Individual */
-
-ul.individual {
- border: 0;
- background: none;
- clear: both;
- overflow: hidden;
-}
-
-ul.individual li {
- color: rgb(183,190,205);
- background: white;
- border: 1px solid rgb(180,180,180);
- font-size: 14px;
- text-align: center;
- -webkit-border-radius: 8px;
- -webkit-box-sizing: border-box;
- width: 48%;
- float: left;
- display: block;
- padding: 11px 10px 14px 10px;
-}
-
-ul.individual li + li {
- float: right;
-}
-
-ul.individual li a {
- color: rgb(50,79,133);
- line-height: 16px;
- margin: -11px -10px -14px -10px;
- padding: 11px 10px 14px 10px;
- -webkit-border-radius: 8px;
-}
-
-ul.individual li a:hover {
- color: #fff;
- background: #36c;
-}
-
-/* @end */
-
-/* @group Toggle */
-
-
-.toggle {
- width: 94px;
- position: relative;
- height: 27px;
- display: block;
- overflow: hidden;
- float: right;
-}
-
-.toggle input[type="checkbox"]:checked {
- left: 0px;
-}
-
-.toggle input[type="checkbox"] {
- -webkit-tap-highlight-color: rgba(0,0,0,0);
- margin: 0;
- -webkit-border-radius: 5px;
- background: #fff url(img/on_off.png) 0 0 no-repeat;
- height: 27px;
- overflow: hidden;
- width: 149px;
- border: 0;
- -webkit-appearance: textarea;
- background-color: transparent;
- -webkit-transition: left .15s;
- position: absolute;
- top: 0;
- left: -55px;
-}
-/* @end */
-
-
-
-.info {
- background: #dce1eb;
- font-size: 12px;
- line-height: 16px;
- text-align: center;
- text-shadow: rgba(255,255,255,.8) 0 1px 0;
- color: rgb(76, 86, 108);
- padding: 15px;
- border-top: 1px solid rgba(76, 86, 108, .3);
- font-weight: bold;
-}
diff --git a/OurUmbraco.Site/jqtouch/themes/apple/theme.min.css b/OurUmbraco.Site/jqtouch/themes/apple/theme.min.css
deleted file mode 100644
index decc185f..00000000
--- a/OurUmbraco.Site/jqtouch/themes/apple/theme.min.css
+++ /dev/null
@@ -1 +0,0 @@
-body{background:#000;}body>*{background:#c5ccd3 url(img/pinstripes.png);}h1,h2{font:bold 18px Helvetica;text-shadow:rgba(255,255,255,.2) 0 1px 1px;color:#4c566c;margin:10px 20px 6px;}.toolbar{-webkit-box-sizing:border-box;border-bottom:1px solid #2d3642;padding:10px;height:45px;background:url(img/toolbar.png) #6d84a2 repeat-x;position:relative;}.black-translucent .toolbar{margin-top:20px;}.toolbar>h1{position:absolute;overflow:hidden;left:50%;top:10px;line-height:1em;margin:1px 0 0 -75px;height:40px;font-size:20px;width:150px;font-weight:bold;text-shadow:rgba(0,0,0,0.4) 0 -1px 0;text-align:center;text-overflow:ellipsis;white-space:nowrap;color:#fff;}body.landscape .toolbar>h1{margin-left:-125px;width:250px;}.button,.back,.cancel,.add{position:absolute;overflow:hidden;top:8px;right:6px;margin:0;border-width:0 5px;padding:0 3px;width:auto;height:30px;line-height:30px;font-family:inherit;font-size:12px;font-weight:bold;color:#fff;text-shadow:rgba(0,0,0,0.5) 0 -1px 0;text-overflow:ellipsis;text-decoration:none;white-space:nowrap;background:none;-webkit-border-image:url(img/toolButton.png) 0 5 0 5;}.button.active,.back.active,.cancel.active,.add.active{-webkit-border-image:url(img/toolButton.png) 0 5 0 5;}.blueButton{-webkit-border-image:url(img/blueButton.png) 0 5 0 5;border-width:0 5px;}.back{left:6px;right:auto;padding:0;max-width:55px;border-width:0 8px 0 14px;-webkit-border-image:url(img/backButton.png) 0 8 0 14;}.leftButton,.cancel{left:6px;right:auto;}.add{font-size:24px;line-height:24px;font-weight:bold;}.whiteButton,.grayButton{display:block;border-width:0 12px;padding:10px;text-align:center;font-size:20px;font-weight:bold;text-decoration:inherit;color:inherit;}.whiteButton{-webkit-border-image:url(img/whiteButton.png) 0 12 0 12;text-shadow:rgba(255,255,255,0.7) 0 1px 0;}.grayButton{-webkit-border-image:url(img/grayButton.png) 0 12 0 12;color:#FFF;}h1+ul,h2+ul,h3+ul,h4+ul,h5+ul,h6+ul{margin-top:0;}ul{color:black;background:#fff;border:1px solid #B4B4B4;font:bold 17px Helvetica;padding:0;margin:15px 10px 17px 10px;-webkit-border-radius:8px;}ul li{color:#666;border-top:1px solid #B4B4B4;list-style-type:none;padding:10px 10px 10px 10px;}li:first-child,li:first-child a{border-top:0;-webkit-border-top-left-radius:8px;-webkit-border-top-right-radius:8px;}li:last-child,li:last-child a{-webkit-border-bottom-left-radius:8px;-webkit-border-bottom-right-radius:8px;}ul li.arrow{background-image:url(img/chevron.png);background-position:right center;background-repeat:no-repeat;}#plastic ul li.arrow,#metal ul li.arrow{background-image:url(../images/chevron_dg.png);background-position:right center;background-repeat:no-repeat;}ul li a,li.img a+a{color:#000;text-decoration:none;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;display:block;padding:12px 10px 12px 10px;margin:-10px;-webkit-tap-highlight-color:rgba(0,0,0,0);}ul li a.active{background:#194fdb url(img/selection.png) 0 0 repeat-x;color:#fff;}ul li a.button{background-color:#194fdb;color:#fff;}ul li.img a+a{margin:-10px 10px -20px -5px;font-size:17px;font-weight:bold;}ul li.img a+a+a{font-size:14px;font-weight:normal;margin-left:-10px;margin-bottom:-10px;margin-top:0;}ul li.img a+small+a{margin-left:-5px;}ul li.img a+small+a+a{margin-left:-10px;margin-top:-20px;margin-bottom:-10px;font-size:14px;font-weight:normal;}ul li.img a+small+a+a+a{margin-left:0!important;margin-bottom:0;}ul li a+a{color:#000;font:14px Helvetica;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;display:block;margin:0;padding:0;}ul li a+a+a,ul li.img a+a+a+a,ul li.img a+small+a+a+a{color:#666;font:13px Helvetica;margin:0;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;display:block;padding:0;}ul.form li{padding:7px 10px;}ul.form li.error{border:2px solid red;}ul.form li.error+li.error{border-top:0;}ul.form li:hover{background:#fff;}ul li input[type="text"],ul li input[type="password"],ul li textarea,ul li select{color:#777;background:#fff url(../.png);border:0;font:normal 17px Helvetica;padding:0;display:inline-block;margin-left:0;width:100%;-webkit-appearance:textarea;}ul li textarea{height:120px;padding:0;text-indent:-2px;}ul li select{text-indent:0;background:transparent url(../images/chevron.png) no-repeat 103% 3px;-webkit-appearance:textfield;margin-left:-6px;width:104%;}ul li input[type="checkbox"],ul li input[type="radio"]{margin:0;color:#324f85;padding:10px 10px;}ul li input[type="checkbox"]:after,ul li input[type="radio"]:after{content:attr(title);font:17px Helvetica;display:block;width:246px;margin:-12px 0 0 17px;}.edgetoedge h4{color:#fff;background:#9a9faa url(img/listGroup.png) top left repeat-x;border-top:1px solid #a5b1ba;text-shadow:#666 0 1px 0;margin:0;padding:2px 10px;}.edgetoedge,.metal{margin:0;padding:0;background-color:#fff;}.edgetoedge ul,.metal ul,.plastic ul{-webkit-border-radius:0;margin:0;border-left:0;border-right:0;border-top:0;}.metal ul{border-top:0;border-bottom:0;background:#b4b4b4;}.edgetoedge ul li:first-child,.edgetoedge ul li:first-child a,.edgetoedge ul li:last-child,.edgetoedge ul li:last-child a,.metal ul li:first-child a,.metal ul li:last-child a{-webkit-border-radius:0;}.edgetoedge ul li small{font-size:16px;line-height:28px;}.edgetoedge li,.metal li{-webkit-border-radius:0;}.edgetoedge li em{font-weight:normal;font-style:normal;}.edgetoedge h4+ul{border-top:1px solid #989ea4;border-bottom:1px solid #717d85;}ul li small{color:#369;font:17px Helvetica;text-align:right;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;display:block;width:23%;float:right;padding:3px 0;}ul li.arrow small{padding:0 15px;}ul li small.counter{font-size:17px!important;line-height:13px!important;font-weight:bold;background:#9a9faa;color:#fff;-webkit-border-radius:11px;padding:4px 10px 5px 10px;display:inline!important;width:auto;margin-top:-22px;}ul li.arrow small.counter{margin-right:15px;}#plastic ul li.arrow,#metal ul li.arrow{background-image:url(img/listArrow.png);background-position:right center;background-repeat:no-repeat;}.edgetoedge ul,.metal ul,.plastic ul{-webkit-border-radius:0;margin:0;border-left:0;border-right:0;border-top:0;}.metal ul li{border-top:1px solid #eee;border-bottom:1px solid #9c9ea5;background:url(../images/bgMetal.png) top left repeat-x;font-size:26px;text-shadow:#fff 0 1px 0;}.metal ul li a{line-height:26px;margin:0;padding:13px 0;}.metal ul li a:hover{color:#000;}.metal ul li:hover small{color:inherit;}.metal ul li a em{display:block;font-size:14px;font-style:normal;color:#444;width:50%;line-height:14px;}.metal ul li small{float:right;position:relative;margin-top:10px;font-weight:bold;}.metal ul li.arrow a small{padding-right:0;line-height:17px;}.metal ul li.arrow{background:url(../images/bgMetal.png) top left repeat-x,url(../images/chevron_dg.png) right center no-repeat;}.plastic{margin:0;padding:0;background:#adadad;}.plastic ul{-webkit-border-radius:0;margin:0;border-left:0;border-right:0;border-top:0;background-color:#adadad;}.plastic ul li{-webkit-border-radius:0;border-top:1px solid #bfbfbf;border-bottom:1px solid #9d9d9d;}.plastic ul li:nth-child(odd){background-color:#989898;border-top:1px solid #b5b5b5;border-bottom:1px solid #8a8a8a;}.plastic ul+p{font-size:11px;color:#2f3237;text-shadow:none;padding:10px 10px;}.plastic ul+p strong{font-size:14px;line-height:18px;text-shadow:#fff 0 1px 0;}.plastic ul li a{text-shadow:#d3d3d3 0 1px 0;}.plastic ul li:nth-child(odd) a{text-shadow:#bfbfbf 0 1px 0;}.plastic ul li small{color:#3C3C3C;text-shadow:#d3d3d3 0 1px 0;font-size:13px;font-weight:bold;text-transform:uppercase;line-height:24px;}#plastic ul.minibanner,#plastic ul.bigbanner{margin:10px;border:0;height:81px;clear:both;}#plastic ul.bigbanner{height:140px!important;}#plastic ul.minibanner li{border:1px solid #8a8a8a;background-color:#989898;width:145px;height:81px;float:left;-webkit-border-radius:5px;padding:0;}#plastic ul.bigbanner li{border:1px solid #8a8a8a;background-color:#989898;width:296px;height:140px;float:left;-webkit-border-radius:5px;padding:0;margin-bottom:4px;}#plastic ul.minibanner li:first-child{margin-right:6px;}#plastic ul.minibanner li a{color:transparent;text-shadow:none;display:block;width:145px;height:81px;}#plastic ul.bigbanner li a{color:transparent;text-shadow:none;display:block;width:296px;height:145px;}ul.individual{border:0;background:none;clear:both;overflow:hidden;}ul.individual li{color:#b7becd;background:white;border:1px solid #b4b4b4;font-size:14px;text-align:center;-webkit-border-radius:8px;-webkit-box-sizing:border-box;width:48%;float:left;display:block;padding:11px 10px 14px 10px;}ul.individual li+li{float:right;}ul.individual li a{color:#324f85;line-height:16px;margin:-11px -10px -14px -10px;padding:11px 10px 14px 10px;-webkit-border-radius:8px;}ul.individual li a:hover{color:#fff;background:#36c;}.toggle{width:94px;position:relative;height:27px;display:block;overflow:hidden;float:right;}.toggle input[type="checkbox"]:checked{left:0;}.toggle input[type="checkbox"]{-webkit-tap-highlight-color:rgba(0,0,0,0);margin:0;-webkit-border-radius:5px;background:#fff url(img/on_off.png) 0 0 no-repeat;height:27px;overflow:hidden;width:149px;border:0;-webkit-appearance:textarea;background-color:transparent;-webkit-transition:left .15s;position:absolute;top:0;left:-55px;}.info{background:#dce1eb;font-size:12px;line-height:16px;text-align:center;text-shadow:rgba(255,255,255,.8) 0 1px 0;color:#4c566c;padding:15px;border-top:1px solid rgba(76,86,108,.3);font-weight:bold;}
\ No newline at end of file
diff --git a/OurUmbraco.Site/jqtouch/themes/jqt/img/back_button.png b/OurUmbraco.Site/jqtouch/themes/jqt/img/back_button.png
deleted file mode 100644
index 9873901c..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/jqt/img/back_button.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/jqt/img/back_button_clicked.png b/OurUmbraco.Site/jqtouch/themes/jqt/img/back_button_clicked.png
deleted file mode 100644
index 5ec4230a..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/jqt/img/back_button_clicked.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/jqt/img/button.png b/OurUmbraco.Site/jqtouch/themes/jqt/img/button.png
deleted file mode 100644
index 52cc7e27..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/jqt/img/button.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/jqt/img/button_clicked.png b/OurUmbraco.Site/jqtouch/themes/jqt/img/button_clicked.png
deleted file mode 100644
index 25d478fc..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/jqt/img/button_clicked.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/jqt/img/chevron.png b/OurUmbraco.Site/jqtouch/themes/jqt/img/chevron.png
deleted file mode 100644
index 5bdaa46d..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/jqt/img/chevron.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/jqt/img/chevron_circle.png b/OurUmbraco.Site/jqtouch/themes/jqt/img/chevron_circle.png
deleted file mode 100644
index b477e7c9..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/jqt/img/chevron_circle.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/jqt/img/grayButton.png b/OurUmbraco.Site/jqtouch/themes/jqt/img/grayButton.png
deleted file mode 100644
index 0ce6a30d..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/jqt/img/grayButton.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/jqt/img/loading.gif b/OurUmbraco.Site/jqtouch/themes/jqt/img/loading.gif
deleted file mode 100644
index 2b4205be..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/jqt/img/loading.gif and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/jqt/img/on_off.png b/OurUmbraco.Site/jqtouch/themes/jqt/img/on_off.png
deleted file mode 100644
index 95d6d5cc..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/jqt/img/on_off.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/jqt/img/rowhead.png b/OurUmbraco.Site/jqtouch/themes/jqt/img/rowhead.png
deleted file mode 100644
index b2fa8f67..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/jqt/img/rowhead.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/jqt/img/toggle.png b/OurUmbraco.Site/jqtouch/themes/jqt/img/toggle.png
deleted file mode 100644
index 3b62ebf2..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/jqt/img/toggle.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/jqt/img/toggleOn.png b/OurUmbraco.Site/jqtouch/themes/jqt/img/toggleOn.png
deleted file mode 100644
index b016814d..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/jqt/img/toggleOn.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/jqt/img/toolbar.png b/OurUmbraco.Site/jqtouch/themes/jqt/img/toolbar.png
deleted file mode 100644
index c17bcf21..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/jqt/img/toolbar.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/jqt/img/whiteButton.png b/OurUmbraco.Site/jqtouch/themes/jqt/img/whiteButton.png
deleted file mode 100644
index 5514b270..00000000
Binary files a/OurUmbraco.Site/jqtouch/themes/jqt/img/whiteButton.png and /dev/null differ
diff --git a/OurUmbraco.Site/jqtouch/themes/jqt/theme.css b/OurUmbraco.Site/jqtouch/themes/jqt/theme.css
deleted file mode 100644
index 6b2f608f..00000000
--- a/OurUmbraco.Site/jqtouch/themes/jqt/theme.css
+++ /dev/null
@@ -1,527 +0,0 @@
-body {
- background: #000;
- color: #ddd;
-}
-body > * {
- background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#333), to(#5e5e65));
-}
-h1, h2 {
- font: bold 18px Helvetica;
- text-shadow: rgba(255,255,255,.2) 0 1px 1px;
- color: #000;
- margin: 10px 20px 5px;
-}
-/* @group Toolbar */
-.toolbar {
- -webkit-box-sizing: border-box;
- border-bottom: 1px solid #000;
- padding: 10px;
- height: 45px;
- background: url(img/toolbar.png) #000000 repeat-x;
- position: relative;
-}
-.black-translucent .toolbar {
- margin-top: 20px;
-}
-.toolbar > h1 {
- position: absolute;
- overflow: hidden;
- left: 50%;
- top: 10px;
- line-height: 1em;
- margin: 1px 0 0 -75px;
- height: 40px;
- font-size: 20px;
- width: 150px;
- font-weight: bold;
- text-shadow: rgba(0,0,0,1) 0 -1px 1px;
- text-align: center;
- text-overflow: ellipsis;
- white-space: nowrap;
- color: #fff;
-}
-body.landscape .toolbar > h1 {
- margin-left: -125px;
- width: 250px;
-}
-.button, .back, .cancel, .add {
- position: absolute;
- overflow: hidden;
- top: 8px;
- right: 10px;
- margin: 0;
- border-width: 0 5px;
- padding: 0 3px;
- width: auto;
- height: 30px;
- line-height: 30px;
- font-family: inherit;
- font-size: 12px;
- font-weight: bold;
- color: #fff;
- text-shadow: rgba(0, 0, 0, 0.5) 0px -1px 0;
- text-overflow: ellipsis;
- text-decoration: none;
- white-space: nowrap;
- background: none;
- -webkit-border-image: url(img/button.png) 0 5 0 5;
-}
-.blueButton {
- -webkit-border-image: url(img/blueButton.png) 0 5 0 5;
- border-width: 0 5px;
-}
-.back {
- left: 6px;
- right: auto;
- padding: 0;
- max-width: 55px;
- border-width: 0 8px 0 14px;
- -webkit-border-image: url(img/back_button.png) 0 8 0 14;
-}
-.back.active {
- -webkit-border-image: url(img/back_button_clicked.png) 0 8 0 14;
- color: #aaa;
-}
-.leftButton, .cancel {
- left: 6px;
- right: auto;
-}
-.add {
- font-size: 24px;
- line-height: 24px;
- font-weight: bold;
-}
-.whiteButton,
-.grayButton {
- display: block;
- border-width: 0 12px;
- padding: 10px;
- text-align: center;
- font-size: 20px;
- font-weight: bold;
- text-decoration: inherit;
- color: inherit;
-}
-.whiteButton {
- -webkit-border-image: url(img/whiteButton.png) 0 12 0 12;
- text-shadow: rgba(255, 255, 255, 0.7) 0 1px 0;
-}
-.grayButton {
- -webkit-border-image: url(img/grayButton.png) 0 12 0 12;
- color: #FFFFFF;
-}
-/* @end */
-/* @group Lists */
-h1 + ul, h2 + ul, h3 + ul, h4 + ul, h5 + ul, h6 + ul {
- margin-top: 0;
-}
-ul {
- color: #aaa;
- border: 1px solid #333333;
- font: bold 18px Helvetica;
- padding: 0;
- margin: 15px 10px 17px 10px;
-}
-ul.rounded {
- -webkit-border-radius: 8px;
- -webkit-box-shadow: rgba(0,0,0,.3) 1px 1px 3px;
-}
-ul.rounded li:first-child, ul.rounded li:first-child a {
- border-top: 0;
- -webkit-border-top-left-radius: 8px;
- -webkit-border-top-right-radius: 8px;
-}
-ul.rounded li:last-child, ul.rounded li:last-child a {
- -webkit-border-bottom-left-radius: 8px;
- -webkit-border-bottom-right-radius: 8px;
-}
-ul li {
- color: #666;
- border-top: 1px solid #333;
- border-bottom: #555858;
- list-style-type: none;
- padding: 10px 10px 10px 10px;
- background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#4c4d4e), to(#404142));
- overflow: hidden;
-}
-ul li.arrow {
- background-image: url(img/chevron.png), -webkit-gradient(linear, 0% 0%, 0% 100%, from(#4c4d4e), to(#404142));
- background-position: right center;
- background-repeat: no-repeat;
-}
-ul li.forward {
- background-image: url(img/chevron_circle.png), -webkit-gradient(linear, 0% 0%, 0% 100%, from(#4c4d4e), to(#404142));
- background-position: right center;
- background-repeat: no-repeat;
-}
-/* universal links on list */
-ul li a, li.img a + a {
- color: #fff;
- text-decoration: none;
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
- display: block;
- padding: 12px 10px 12px 10px;
- margin: -10px;
- -webkit-tap-highlight-color: rgba(0,0,0,0);
- text-shadow: rgba(0,0,0,.2) 0 1px 1px;
-}
-ul li a.active, ul li a.button {
- background-color: #53b401;
- color: #fff;
-}
-ul li a.active.loading {
- background-image: url(img/loading.gif);
- background-position: 95% center;
- background-repeat: no-repeat;
-}
-ul li.arrow a.active {
- background-image: url(img/chevron.png);
- background-position: right center;
- background-repeat: no-repeat;
-}
-ul li.forward a.active {
- background-image: url(img/chevron_circle.png);
- background-position: right center;
- background-repeat: no-repeat;
-}
-ul li.img a + a {
- margin: -10px 10px -20px -5px;
- font-size: 17px;
- font-weight: bold;
-}
-ul li.img a + a + a {
- font-size: 14px;
- font-weight: normal;
- margin-left: -10px;
- margin-bottom: -10px;
- margin-top: 0;
-}
-ul li.img a + small + a {
- margin-left: -5px;
-}
-ul li.img a + small + a + a {
- margin-left: -10px;
- margin-top: -20px;
- margin-bottom: -10px;
- font-size: 14px;
- font-weight: normal;
-}
-ul li.img a + small + a + a + a {
- margin-left: 0px !important;
- margin-bottom: 0;
-}
-ul li a + a {
- color: #000;
- font: 14px Helvetica;
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
- display: block;
- margin: 0;
- padding: 0;
-}
-ul li a + a + a, ul li.img a + a + a + a, ul li.img a + small + a + a + a {
- color: #666;
- font: 13px Helvetica;
- margin: 0;
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
- display: block;
- padding: 0;
-}
-/*
-@end */
-/* @group Forms */
-ul.form li {
- padding: 7px 10px;
-}
-ul.form li.error {
- border: 2px solid red;
-}
-ul.form li.error + li.error {
- border-top: 0;
-}
-ul li input[type="text"], ul li input[type="password"], ul li textarea, ul li select {
- color: #777;
- background: transparent url(../.png);
- border: 0;
- font: normal 17px Helvetica;
- padding: 0;
- display: inline-block;
- margin-left: 0px;
- width: 100%;
- -webkit-appearance: textarea;
-}
-ul li textarea {
- height: 120px;
- padding: 0;
- text-indent: -2px;
-}
-ul li select {
- text-indent: 0px;
- background: transparent url(img/chevron.png) no-repeat right center;
- -webkit-appearance: textfield;
- margin-left: -6px;
- width: 104%;
-}
-ul li input[type="checkbox"], ul li input[type="radio"] {
- margin: 0;
- padding: 10px 10px;
-}
-ul li input[type="checkbox"]:after, ul li input[type="radio"]:after {
- content: attr(title);
- font: 17px Helvetica;
- display: block;
- width: 246px;
- color: #777;
- margin: -12px 0 0 17px;
-}
-/* @end */
-/* @group Mini Label */
-ul li small {
- color: #64c114;
- font: 17px Helvetica;
- text-align: right;
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
- display: block;
- width: 23%;
- float: right;
- padding: 0;
-}
-ul li.arrow small {
- padding: 0 15px;
-}
-ul li small.counter {
- font-size: 17px;
- line-height: 13px;
- font-weight: bold;
- background: rgba(0,0,0,.15);
- color: #fff;
- -webkit-border-radius: 11px;
- padding: 4px 10px 5px 10px;
- display: block;
- width: auto;
- margin-top: -22px;
- -webkit-box-shadow: rgba(255,255,255,.1) 0 1px 0;
-}
-ul li.arrow small.counter {
- margin-right: 15px;
-}
-/* @end */
-/* @group Individual */
-ul.individual {
- border: 0;
- background: none;
- clear: both;
- overflow: hidden;
- padding-bottom: 3px;
- -webkit-box-shadow: none;
-}
-ul.individual li {
- background: #4c4d4e;
- border: 1px solid #333;
- font-size: 14px;
- text-align: center;
- -webkit-border-radius: 8px;
- -webkit-box-sizing: border-box;
- width: 48%;
- float: left;
- display: block;
- padding: 11px 10px 14px 10px;
- -webkit-box-shadow: rgba(0,0,0,.2) 1px 1px 3px;
- background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#4c4d4e), to(#404142));
-}
-ul.individual li + li {
- float: right;
-}
-ul.individual li a {
- color: #fff;
- line-height: 16px;
- margin: -11px -10px -14px -10px;
- padding: 11px 10px 14px 10px;
- -webkit-border-radius: 8px;
-}
-/* @end */
-/* @group Toggle */
-.toggle {
- width: 94px;
- position: relative;
- height: 27px;
- display: block;
- overflow: hidden;
- float: right;
-}
-.toggle input[type="checkbox"]:checked {
- left: 0px;
-}
-.toggle input[type="checkbox"] {
- -webkit-appearance: textarea;
- -webkit-border-radius: 5px;
- -webkit-tap-highlight-color: rgba(0,0,0,0);
- -webkit-transition: left .15s;
- background-color: transparent;
- background: #fff url(img/on_off.png) 0 0 no-repeat;
- border: 0;
- height: 27px;
- left: -55px;
- margin: 0;
- overflow: hidden;
- position: absolute;
- top: 0;
- width: 149px;
-}
-/* @end */
-/* @group Info */
-.info {
- background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ccc), to(#aaa), color-stop(.6,#CCCCCC));
- font-size: 12px;
- line-height: 16px;
- text-align: center;
- text-shadow: rgba(255,255,255,.8) 0 1px 0;
- color: #444;
- padding: 15px;
- border-top: 1px solid rgba(255,255,255,.2);
- font-weight: bold;
-}
-/* @end */
-/* @group Edge to edge */
-ul.edgetoedge {
- border-width: 1px 0;
- margin: 0;
- padding: 0;
-}
-ul.edgetoedge li {
- background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#1e1f21), to(#272729));
- border-bottom: 2px solid #000;
- border-top: 1px solid #4a4b4d;
- font-size: 20px;
- margin-bottom: -1px;
-}
-ul.edgetoedge li.sep {
- background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(0,0,0,0)), to(rgba(0,0,0,.5)));
- border-bottom: 1px solid #111113;
- border-top: 1px solid #666;
- color: #3e9ac3;
- font-size: 16px;
- margin: 1px 0 0 0;
- padding: 2px 10px;
- text-shadow: #000 0 1px 0;
-}
-ul.edgetoedge li em {
- font-weight: normal;
- font-style: normal;
-}
-/* @end */
-/* @group Plastic */
-#plastic {
- background: #17181a;
-}
-ul.plastic {
- background: #17181a;
- color: #aaa;
- font: bold 18px Helvetica;
- margin: 0;
- padding: 0;
- border-width: 0 0 1px 0;
-}
-ul.plastic li {
- border-width: 1px 0;
- border-style: solid;
- border-top-color: #222;
- border-bottom-color: #000;
- color: #666;
- list-style-type: none;
- overflow: hidden;
- padding: 10px 10px 10px 10px;
-}
-ul.plastic li a.active.loading {
- background-image: url(img/loading.gif);
- background-position: 95% center;
- background-repeat: no-repeat;
-}
-ul.plastic li small {
- color: #888;
- font-size: 13px;
- font-weight: bold;
- line-height: 24px;
- text-transform: uppercase;
-}
-ul.plastic li:nth-child(odd) {
- background-color: #1c1c1f;
-}
-ul.plastic li.arrow {
- background-image: url(img/chevron.png);
- background-position: right center;
- background-repeat: no-repeat;
-}
-ul.plastic li.arrow a.active {
- background-image: url(img/chevron.png);
- background-position: right center;
- background-repeat: no-repeat;
-}
-ul.plastic li.forward {
- background-image: url(img/chevron_circle.png);
- background-position: right center;
- background-repeat: no-repeat;
-}
-ul.plastic li.forward a.active {
- background-image: url(img/chevron_circle.png);
- background-position: right center;
- background-repeat: no-repeat;
-}
-/* @group Metal */
-ul.metal {
- border-bottom: 0;
- border-left: 0;
- border-right: 0;
- border-top: 0;
- margin: 0;
-}
-ul.metal li {
- background-image: none;
- border-top: 1px solid #fff;
- border-bottom: 1px solid #666;
- font-size: 26px;
- background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(238,238,238,1)), to(rgba(156,158,160,1)));
-}
-ul.metal li a {
- line-height: 26px;
- margin: 0;
- text-shadow: #fff 0 1px 0;
- padding: 13px 0;
-}
-ul.metal li a em {
- display: block;
- font-size: 14px;
- font-style: normal;
- color: #444;
- width: 50%;
- line-height: 14px;
-}
-ul.metal li a.active {
- color: rgb(0,0,0);
-}
-ul.metal li small {
- float: right;
- position: relative;
- margin-top: 10px;
- font-weight: bold;
-}
-ul.metal li.arrow {
- background-image: url(img/chevron.png);
- background-position: right center;
- background-repeat: no-repeat;
- background-image: url(img/chevron.png), -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(238,238,238,1)), to(rgba(156,158,160,1)));
- background-repeat: no-repeat;
- background-position: right center;
-}
-ul.metal li.arrow a small {
- padding-right: 15px;
- line-height: 17px;
-}
-/* @end */
diff --git a/OurUmbraco.Site/jqtouch/themes/jqt/theme.min.css b/OurUmbraco.Site/jqtouch/themes/jqt/theme.min.css
deleted file mode 100644
index 0182b88c..00000000
--- a/OurUmbraco.Site/jqtouch/themes/jqt/theme.min.css
+++ /dev/null
@@ -1 +0,0 @@
-body{background:#000;color:#ddd;}body>*{background:-webkit-gradient(linear,0% 0,0% 100%,from(#333),to(#5e5e65));}h1,h2{font:bold 18px Helvetica;text-shadow:rgba(255,255,255,.2) 0 1px 1px;color:#000;margin:10px 20px 5px;}.toolbar{-webkit-box-sizing:border-box;border-bottom:1px solid #000;padding:10px;height:45px;background:url(img/toolbar.png) #000 repeat-x;position:relative;}.black-translucent .toolbar{margin-top:20px;}.toolbar>h1{position:absolute;overflow:hidden;left:50%;top:10px;line-height:1em;margin:1px 0 0 -75px;height:40px;font-size:20px;width:150px;font-weight:bold;text-shadow:rgba(0,0,0,1) 0 -1px 1px;text-align:center;text-overflow:ellipsis;white-space:nowrap;color:#fff;}body.landscape .toolbar>h1{margin-left:-125px;width:250px;}.button,.back,.cancel,.add{position:absolute;overflow:hidden;top:8px;right:10px;margin:0;border-width:0 5px;padding:0 3px;width:auto;height:30px;line-height:30px;font-family:inherit;font-size:12px;font-weight:bold;color:#fff;text-shadow:rgba(0,0,0,0.5) 0 -1px 0;text-overflow:ellipsis;text-decoration:none;white-space:nowrap;background:none;-webkit-border-image:url(img/button.png) 0 5 0 5;}.blueButton{-webkit-border-image:url(img/blueButton.png) 0 5 0 5;border-width:0 5px;}.back{left:6px;right:auto;padding:0;max-width:55px;border-width:0 8px 0 14px;-webkit-border-image:url(img/back_button.png) 0 8 0 14;}.back.active{-webkit-border-image:url(img/back_button_clicked.png) 0 8 0 14;color:#aaa;}.leftButton,.cancel{left:6px;right:auto;}.add{font-size:24px;line-height:24px;font-weight:bold;}.whiteButton,.grayButton{display:block;border-width:0 12px;padding:10px;text-align:center;font-size:20px;font-weight:bold;text-decoration:inherit;color:inherit;}.whiteButton{-webkit-border-image:url(img/whiteButton.png) 0 12 0 12;text-shadow:rgba(255,255,255,0.7) 0 1px 0;}.grayButton{-webkit-border-image:url(img/grayButton.png) 0 12 0 12;color:#FFF;}h1+ul,h2+ul,h3+ul,h4+ul,h5+ul,h6+ul{margin-top:0;}ul{color:#aaa;border:1px solid #333;font:bold 18px Helvetica;padding:0;margin:15px 10px 17px 10px;}ul.rounded{-webkit-border-radius:8px;-webkit-box-shadow:rgba(0,0,0,.3) 1px 1px 3px;}ul.rounded li:first-child,ul.rounded li:first-child a{border-top:0;-webkit-border-top-left-radius:8px;-webkit-border-top-right-radius:8px;}ul.rounded li:last-child,ul.rounded li:last-child a{-webkit-border-bottom-left-radius:8px;-webkit-border-bottom-right-radius:8px;}ul li{color:#666;border-top:1px solid #333;border-bottom:#555858;list-style-type:none;padding:10px 10px 10px 10px;background:-webkit-gradient(linear,0% 0,0% 100%,from(#4c4d4e),to(#404142));overflow:hidden;}ul li.arrow{background-image:url(img/chevron.png),-webkit-gradient(linear,0% 0,0% 100%,from(#4c4d4e),to(#404142));background-position:right center;background-repeat:no-repeat;}ul li.forward{background-image:url(img/chevron_circle.png),-webkit-gradient(linear,0% 0,0% 100%,from(#4c4d4e),to(#404142));background-position:right center;background-repeat:no-repeat;}ul li a,li.img a+a{color:#fff;text-decoration:none;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;display:block;padding:12px 10px 12px 10px;margin:-10px;-webkit-tap-highlight-color:rgba(0,0,0,0);text-shadow:rgba(0,0,0,.2) 0 1px 1px;}ul li a.active,ul li a.button{background-color:#53b401;color:#fff;}ul li a.active.loading{background-image:url(img/loading.gif);background-position:95% center;background-repeat:no-repeat;}ul li.arrow a.active{background-image:url(img/chevron.png);background-position:right center;background-repeat:no-repeat;}ul li.forward a.active{background-image:url(img/chevron_circle.png);background-position:right center;background-repeat:no-repeat;}ul li.img a+a{margin:-10px 10px -20px -5px;font-size:17px;font-weight:bold;}ul li.img a+a+a{font-size:14px;font-weight:normal;margin-left:-10px;margin-bottom:-10px;margin-top:0;}ul li.img a+small+a{margin-left:-5px;}ul li.img a+small+a+a{margin-left:-10px;margin-top:-20px;margin-bottom:-10px;font-size:14px;font-weight:normal;}ul li.img a+small+a+a+a{margin-left:0!important;margin-bottom:0;}ul li a+a{color:#000;font:14px Helvetica;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;display:block;margin:0;padding:0;}ul li a+a+a,ul li.img a+a+a+a,ul li.img a+small+a+a+a{color:#666;font:13px Helvetica;margin:0;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;display:block;padding:0;}ul.form li{padding:7px 10px;}ul.form li.error{border:2px solid red;}ul.form li.error+li.error{border-top:0;}ul li input[type="text"],ul li input[type="password"],ul li textarea,ul li select{color:#777;background:transparent url(../.png);border:0;font:normal 17px Helvetica;padding:0;display:inline-block;margin-left:0;width:100%;-webkit-appearance:textarea;}ul li textarea{height:120px;padding:0;text-indent:-2px;}ul li select{text-indent:0;background:transparent url(img/chevron.png) no-repeat right center;-webkit-appearance:textfield;margin-left:-6px;width:104%;}ul li input[type="checkbox"],ul li input[type="radio"]{margin:0;padding:10px 10px;}ul li input[type="checkbox"]:after,ul li input[type="radio"]:after{content:attr(title);font:17px Helvetica;display:block;width:246px;color:#777;margin:-12px 0 0 17px;}ul li small{color:#64c114;font:17px Helvetica;text-align:right;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;display:block;width:23%;float:right;padding:0;}ul li.arrow small{padding:0 15px;}ul li small.counter{font-size:17px;line-height:13px;font-weight:bold;background:rgba(0,0,0,.15);color:#fff;-webkit-border-radius:11px;padding:4px 10px 5px 10px;display:block;width:auto;margin-top:-22px;-webkit-box-shadow:rgba(255,255,255,.1) 0 1px 0;}ul li.arrow small.counter{margin-right:15px;}ul.individual{border:0;background:none;clear:both;overflow:hidden;padding-bottom:3px;-webkit-box-shadow:none;}ul.individual li{background:#4c4d4e;border:1px solid #333;font-size:14px;text-align:center;-webkit-border-radius:8px;-webkit-box-sizing:border-box;width:48%;float:left;display:block;padding:11px 10px 14px 10px;-webkit-box-shadow:rgba(0,0,0,.2) 1px 1px 3px;background:-webkit-gradient(linear,0% 0,0% 100%,from(#4c4d4e),to(#404142));}ul.individual li+li{float:right;}ul.individual li a{color:#fff;line-height:16px;margin:-11px -10px -14px -10px;padding:11px 10px 14px 10px;-webkit-border-radius:8px;}.toggle{width:94px;position:relative;height:27px;display:block;overflow:hidden;float:right;}.toggle input[type="checkbox"]:checked{left:0;}.toggle input[type="checkbox"]{-webkit-appearance:textarea;-webkit-border-radius:5px;-webkit-tap-highlight-color:rgba(0,0,0,0);-webkit-transition:left .15s;background-color:transparent;background:#fff url(img/on_off.png) 0 0 no-repeat;border:0;height:27px;left:-55px;margin:0;overflow:hidden;position:absolute;top:0;width:149px;}.info{background:-webkit-gradient(linear,0% 0,0% 100%,from(#ccc),to(#aaa),color-stop(.6,#CCC));font-size:12px;line-height:16px;text-align:center;text-shadow:rgba(255,255,255,.8) 0 1px 0;color:#444;padding:15px;border-top:1px solid rgba(255,255,255,.2);font-weight:bold;}ul.edgetoedge{border-width:1px 0;margin:0;padding:0;}ul.edgetoedge li{background:-webkit-gradient(linear,0% 0,0% 100%,from(#1e1f21),to(#272729));border-bottom:2px solid #000;border-top:1px solid #4a4b4d;font-size:20px;margin-bottom:-1px;}ul.edgetoedge li.sep{background:-webkit-gradient(linear,0% 0,0% 100%,from(rgba(0,0,0,0)),to(rgba(0,0,0,.5)));border-bottom:1px solid #111113;border-top:1px solid #666;color:#3e9ac3;font-size:16px;margin:1px 0 0 0;padding:2px 10px;text-shadow:#000 0 1px 0;}ul.edgetoedge li em{font-weight:normal;font-style:normal;}#plastic{background:#17181a;}ul.plastic{background:#17181a;color:#aaa;font:bold 18px Helvetica;margin:0;padding:0;border-width:0 0 1px 0;}ul.plastic li{border-width:1px 0;border-style:solid;border-top-color:#222;border-bottom-color:#000;color:#666;list-style-type:none;overflow:hidden;padding:10px 10px 10px 10px;}ul.plastic li a.active.loading{background-image:url(img/loading.gif);background-position:95% center;background-repeat:no-repeat;}ul.plastic li small{color:#888;font-size:13px;font-weight:bold;line-height:24px;text-transform:uppercase;}ul.plastic li:nth-child(odd){background-color:#1c1c1f;}ul.plastic li.arrow{background-image:url(img/chevron.png);background-position:right center;background-repeat:no-repeat;}ul.plastic li.arrow a.active{background-image:url(img/chevron.png);background-position:right center;background-repeat:no-repeat;}ul.plastic li.forward{background-image:url(img/chevron_circle.png);background-position:right center;background-repeat:no-repeat;}ul.plastic li.forward a.active{background-image:url(img/chevron_circle.png);background-position:right center;background-repeat:no-repeat;}ul.metal{border-bottom:0;border-left:0;border-right:0;border-top:0;margin:0;}ul.metal li{background-image:none;border-top:1px solid #fff;border-bottom:1px solid #666;font-size:26px;background:-webkit-gradient(linear,0% 0,0% 100%,from(rgba(238,238,238,1)),to(rgba(156,158,160,1)));}ul.metal li a{line-height:26px;margin:0;text-shadow:#fff 0 1px 0;padding:13px 0;}ul.metal li a em{display:block;font-size:14px;font-style:normal;color:#444;width:50%;line-height:14px;}ul.metal li a.active{color:#000;}ul.metal li small{float:right;position:relative;margin-top:10px;font-weight:bold;}ul.metal li.arrow{background-image:url(img/chevron.png);background-position:right center;background-repeat:no-repeat;background-image:url(img/chevron.png),-webkit-gradient(linear,0% 0,0% 100%,from(rgba(238,238,238,1)),to(rgba(156,158,160,1)));background-repeat:no-repeat;background-position:right center;}ul.metal li.arrow a small{padding-right:15px;line-height:17px;}
\ No newline at end of file
diff --git a/OurUmbraco.Site/macroScripts/Documentation-GithubSync.cshtml b/OurUmbraco.Site/macroScripts/Documentation-GithubSync.cshtml
index 729de7e7..3550a2aa 100644
--- a/OurUmbraco.Site/macroScripts/Documentation-GithubSync.cshtml
+++ b/OurUmbraco.Site/macroScripts/Documentation-GithubSync.cshtml
@@ -14,6 +14,7 @@
}
var unzip = new uDocumentation.Busineslogic.GithubSourcePull.ZipDownloader(rootFolderPath, configPath);
+ unzip.IsProjectDocumentation = true;
unzip.Run();
}
else
diff --git a/OurUmbraco.Site/masterpages/DocumentationSubpage.master b/OurUmbraco.Site/masterpages/DocumentationSubpage.master
index cdac9b0c..7bc13610 100644
--- a/OurUmbraco.Site/masterpages/DocumentationSubpage.master
+++ b/OurUmbraco.Site/masterpages/DocumentationSubpage.master
@@ -12,306 +12,7 @@
@@ -320,11 +21,11 @@
diff --git a/OurUmbraco.Site/usercontrols/DocumentationBreadcrumb.ascx b/OurUmbraco.Site/usercontrols/DocumentationBreadcrumb.ascx
deleted file mode 100644
index 478516a2..00000000
--- a/OurUmbraco.Site/usercontrols/DocumentationBreadcrumb.ascx
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="DocumentationBreadcrumb.ascx.cs" Inherits="uDocumentation.usercontrols.DocumentationBreadcrumb" %>
-
-<%= GetBreadcrumb() %>
-
\ No newline at end of file
diff --git a/OurUmbraco.Site/usercontrols/DocumentationEditButton.ascx b/OurUmbraco.Site/usercontrols/DocumentationEditButton.ascx
deleted file mode 100644
index 567e747b..00000000
--- a/OurUmbraco.Site/usercontrols/DocumentationEditButton.ascx
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="DocumentationEditButton.ascx.cs" Inherits="uDocumentation.usercontrols.DocumentationEditButton" %>
-
-Edit
\ No newline at end of file
diff --git a/OurUmbraco.Site/usercontrols/DocumentationShowMarkdown.ascx b/OurUmbraco.Site/usercontrols/DocumentationShowMarkdown.ascx
deleted file mode 100644
index b3132c29..00000000
--- a/OurUmbraco.Site/usercontrols/DocumentationShowMarkdown.ascx
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="DocumentationShowMarkdown.ascx.cs" Inherits="uDocumentation.usercontrols.DocumentationShowMarkdown" %>
-
-
\ No newline at end of file
diff --git a/our.umbraco.org.sln b/our.umbraco.org.sln
index a4b787f5..c7e4beda 100644
--- a/our.umbraco.org.sln
+++ b/our.umbraco.org.sln
@@ -1,8 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
-MinimumVisualStudioVersion = 10.0.40219.1
+# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OurUmbraco.Site", "OurUmbraco.Site\OurUmbraco.Site.csproj", "{911907FB-3B9D-4E5F-9A45-16700A451A54}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{84E122E2-FB7D-4732-A764-B6EFB1F524DE}"
@@ -38,6 +36,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{F3A30E
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "uWiki", "uWiki\uWiki.csproj", "{996601FA-5C0E-46A6-B39D-2863BADC80D8}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "uRelease", "uRelease\uRelease.csproj", "{C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -158,6 +158,16 @@ Global
{996601FA-5C0E-46A6-B39D-2863BADC80D8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{996601FA-5C0E-46A6-B39D-2863BADC80D8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{996601FA-5C0E-46A6-B39D-2863BADC80D8}.Release|x86.ActiveCfg = Release|Any CPU
+ {C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/uDocumentation/Busineslogic/GithubSourcePull/ZipDownloader.cs b/uDocumentation/Busineslogic/GithubSourcePull/ZipDownloader.cs
index 917406e6..a8078a1d 100644
--- a/uDocumentation/Busineslogic/GithubSourcePull/ZipDownloader.cs
+++ b/uDocumentation/Busineslogic/GithubSourcePull/ZipDownloader.cs
@@ -8,11 +8,19 @@ using System.Net;
using ICSharpCode.SharpZipLib.Zip;
using System.Diagnostics;
using umbraco.BusinessLogic;
+using System.Dynamic;
+using Newtonsoft.Json;
namespace uDocumentation.Busineslogic.GithubSourcePull
{
public class ZipDownloader
{
+ private const string rootFolder = @"~\Documentation";
+ private const string config = @"~\config\githubpull.config";
+ private string rootFolderPath = HttpContext.Current.Server.MapPath(rootFolder);
+ private string configPath = HttpContext.Current.Server.MapPath(config);
+
+
public string RootFolder { get; set; }
public XmlDocument Configuration { get; set; }
public bool IsProjectDocumentation { get; set; }
@@ -24,6 +32,16 @@ namespace uDocumentation.Busineslogic.GithubSourcePull
IsProjectDocumentation = false;
}
+ public ZipDownloader()
+ {
+ XmlDocument xd = new XmlDocument();
+ xd.Load(configPath);
+
+ Configuration = xd;
+ RootFolder = rootFolderPath;
+ IsProjectDocumentation = false;
+ }
+
public ZipDownloader(string rootFolder, string configurationPath)
{
XmlDocument xd = new XmlDocument();
@@ -64,25 +82,64 @@ namespace uDocumentation.Busineslogic.GithubSourcePull
process(url, folder);
}
+
FinishEventArgs ev = new FinishEventArgs();
-
FireOnFinish(ev);
}
+ public dynamic DocumentationSiteMap(string folder = "")
+ {
+ var path = Path.Combine(RootFolder, folder, "sitemap.js");
+ var json = File.ReadAllText(path);
+ dynamic d = JsonConvert.DeserializeObject(json);
+ return d;
+ }
+
public void process(string url, string foldername)
{
var zip = Download(url, foldername);
unzip(zip, foldername, RootFolder);
+ BuildSitemap(foldername);
+ }
+
+ private void BuildSitemap(string foldername)
+ {
+ var folder = new DirectoryInfo(Path.Combine(RootFolder, foldername));
+ dynamic root = GetFolderStructure(folder, folder.FullName, 0);
+
+ var serializedRoot = JsonConvert.SerializeObject(root, Newtonsoft.Json.Formatting.Indented);
+ File.WriteAllText(Path.Combine(folder.FullName, "sitemap.js"), serializedRoot);
+ }
+
+ private dynamic GetFolderStructure(DirectoryInfo dir, string rootPath, int level)
+ {
+ dynamic d = new ExpandoObject();
+ d.name = dir.Name;
+ d.path = dir.FullName.Substring(rootPath.Length).Replace('\\','/');
+ d.level = level;
+
+ if (dir.GetDirectories().Any())
+ {
+ var list = new List();
+ foreach (var child in dir.GetDirectories())
+ list.Add(GetFolderStructure(child, rootPath, level+1));
+
+
+ d.hasChildren = true;
+ d.directories = list;
+ }
+
+ return d;
}
private string Download(string url, string foldername)
{
var dir = new DirectoryInfo(Path.Combine(RootFolder, foldername));
var dirsToCreate = new List();
+
while (!dir.Exists)
{
dirsToCreate.Add(dir);
-
dir = dir.Parent;
}
@@ -93,7 +150,7 @@ namespace uDocumentation.Busineslogic.GithubSourcePull
d.Create();
}
- var path = Path.Combine(RootFolder, foldername + ".zip");
+ var path = Path.Combine(RootFolder, foldername + "archive.zip");
if (File.Exists(path))
File.Delete(path);
@@ -104,6 +161,7 @@ namespace uDocumentation.Busineslogic.GithubSourcePull
return path;
}
+
private void unzip(string path, string foldername, string rootFolder)
{
ZipInputStream s = new ZipInputStream(File.OpenRead(path));
@@ -116,8 +174,14 @@ namespace uDocumentation.Busineslogic.GithubSourcePull
if (Directory.Exists(serverFolder))
{
- var files = string.Join("|", Directory.GetFiles(serverFolder, "*.md", SearchOption.AllDirectories)).ToLower().Split('|');
- existingFiles.AddRange(files);
+ foreach (var folder in Directory.GetDirectories(serverFolder))
+ Directory.Delete(folder, true);
+
+ foreach (var mdfile in Directory.GetFiles(serverFolder, "*.md"))
+ File.Delete(mdfile);
+
+// var files = string.Join("|", Directory.GetFiles(serverFolder, "*.md", SearchOption.AllDirectories)).ToLower().Split('|');
+// existingFiles.AddRange(files);
}
else
Directory.CreateDirectory(serverFolder);
@@ -195,14 +259,7 @@ namespace uDocumentation.Busineslogic.GithubSourcePull
s.Close();
foreach (var file in Directory.GetFiles(rootFolder, "*.zip"))
{
- File.Delete(file);
- }
-
- foreach (var file in existingFiles)
- {
- DeleteEventArgs ev = new DeleteEventArgs();
- ev.FilePath = file;
- FireOnDelete(ev);
+ //File.Delete(file);
}
}
diff --git a/uDocumentation/Busineslogic/MarkdownLogic.cs b/uDocumentation/Busineslogic/MarkdownLogic.cs
index 7efa64fe..8d3d4ba7 100644
--- a/uDocumentation/Busineslogic/MarkdownLogic.cs
+++ b/uDocumentation/Busineslogic/MarkdownLogic.cs
@@ -7,12 +7,10 @@ namespace uDocumentation.Busineslogic
public class MarkdownLogic
{
private readonly string _filePath;
- private readonly string _version;
- public MarkdownLogic(string filePath, string version)
+ public MarkdownLogic(string filePath)
{
_filePath = filePath;
- _version = version;
}
public const string VersionSession = "DocumentationVersion";
diff --git a/uDocumentation/DocumentationContentFinder.cs b/uDocumentation/DocumentationContentFinder.cs
index 61cf7001..495fc11a 100644
--- a/uDocumentation/DocumentationContentFinder.cs
+++ b/uDocumentation/DocumentationContentFinder.cs
@@ -87,6 +87,7 @@ namespace uDocumentation
{
XmlAttribute legacyNodeTypeAliasAttribute = urlNode.Attributes["nodeTypeAlias"];
string nodeTypeAlias = legacyNodeTypeAliasAttribute == null ? string.Empty : legacyNodeTypeAliasAttribute.Value;
+
if (urlNode.Name == MarkdownLogic.DocumentTypeAlias || nodeTypeAlias == MarkdownLogic.DocumentTypeAlias || urlNode.Name == "Projects")
{
HttpContext.Current.Items[MarkdownLogic.MarkdownPathKey] = markdownPath;
diff --git a/uDocumentation/uDocumentation.csproj b/uDocumentation/uDocumentation.csproj
index f73c0f90..a67ed95f 100644
--- a/uDocumentation/uDocumentation.csproj
+++ b/uDocumentation/uDocumentation.csproj
@@ -242,17 +242,6 @@
..\packages\UmbracoCms.Core.7.2.1\lib\UrlRewritingNet.UrlRewriter.dll
-
-
- ASPXCodeBehind
-
-
- ASPXCodeBehind
-
-
- ASPXCodeBehind
-
-
@@ -261,27 +250,6 @@
-
- DocumentationEditButton.ascx
- ASPXCodeBehind
-
-
- DocumentationEditButton.ascx
-
-
- DocumentationBreadcrumb.ascx
- ASPXCodeBehind
-
-
- DocumentationBreadcrumb.ascx
-
-
- DocumentationShowMarkdown.ascx
- ASPXCodeBehind
-
-
- DocumentationShowMarkdown.ascx
-
@@ -299,7 +267,8 @@
- XCOPY "$(ProjectDir)usercontrols\*.ascx" "$(ProjectDir)..\OurUmbraco.Site\usercontrols\" /y
+
+