diff --git a/closin/cache/jqt-r109/jqtouch/jqtouch.css b/closin/cache/jqt-r109/jqtouch/jqtouch.css index 328afae..9eaa098 100644 --- a/closin/cache/jqt-r109/jqtouch/jqtouch.css +++ b/closin/cache/jqt-r109/jqtouch/jqtouch.css @@ -104,7 +104,7 @@ body > .current { } .dissolve.out { - -webkit-animation-name: fadeout; + -webkit-animation-name: fadeout; } @@ -278,7 +278,7 @@ body > .current { -webkit-transform-origin: 100% 50%; } .cube.in.reverse { - -webkit-animation-name: cubeinfromleft; + -webkit-animation-name: cubeinfromleft; -webkit-transform-origin: 100% 50%; } .cube.out.reverse { diff --git a/closin/cache/jqt-r109/jqtouch/jqtouch.js b/closin/cache/jqt-r109/jqtouch/jqtouch.js index 69b5aba..5f46de6 100644 --- a/closin/cache/jqt-r109/jqtouch/jqtouch.js +++ b/closin/cache/jqt-r109/jqtouch/jqtouch.js @@ -1,22 +1,22 @@ /* - _/ _/_/ _/_/_/_/_/ _/ - _/ _/ _/ _/_/ _/ _/ _/_/_/ _/_/_/ - _/ _/ _/_/ _/ _/ _/ _/ _/ _/ _/ _/ - _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ - _/ _/_/ _/ _/ _/_/ _/_/_/ _/_/_/ _/ _/ - _/ + _/ _/_/ _/_/_/_/_/ _/ + _/ _/ _/ _/_/ _/ _/ _/_/_/ _/_/_/ + _/ _/ _/_/ _/ _/ _/ _/ _/ _/ _/ _/ + _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ + _/ _/_/ _/ _/ _/_/ _/_/_/ _/_/_/ _/ _/ + _/ _/ 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 $ @@ -25,36 +25,36 @@ (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), + 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=[], + 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', @@ -81,7 +81,7 @@ useFastTouch: true // Experimental. }; jQTSettings = $.extend({}, defaults, options); - + // Preload images if (jQTSettings.preloadImages) { for (var i = jQTSettings.preloadImages.length - 1; i >= 0; i--){ @@ -122,7 +122,7 @@ $.extend(publicObj, fn(publicObj)); } } - + // Add animations for (var i in defaultAnimations) { @@ -142,7 +142,7 @@ $(jQTSettings.submitSelector).tap(submitParentForm); $body = $('body'); - + if (jQTSettings.fullScreenClass && window.navigator.standalone == true) { $body.addClass(jQTSettings.fullScreenClass + ' ' + jQTSettings.statusBar); } @@ -153,7 +153,7 @@ .bind('orientationchange', updateOrientation) .trigger('orientationchange') .submit(submitForm); - + if (jQTSettings.useFastTouch && $.support.touch) { $body.click(function(e){ @@ -165,7 +165,7 @@ return false; } }); - + // This additionally gets rid of form focusses $body.mousedown(function(e){ var timeDiff = (new Date()).getTime() - lastAnimationTime; @@ -183,7 +183,7 @@ currentPage = $('body > .current:first'); $('body > .current').removeClass('current'); } - + // Go to the top of the "current" page $(currentPage).addClass('current'); location.hash = $(currentPage).attr('id'); @@ -192,7 +192,7 @@ dumbLoopStart(); }); } - + // PUBLIC FUNCTIONS function goBack(to) { // Init the param @@ -226,7 +226,7 @@ // Make the animations animatePages(fromPage, toPage, animation, true); - + return publicObj; } else { console.error('No pages in history.'); @@ -235,7 +235,7 @@ } function goTo(toPage, animation) { var fromPage = hist[0].page; - + if (typeof(toPage) === 'string') { toPage = $(toPage); } @@ -264,28 +264,28 @@ // 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'), + + 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)) { @@ -310,7 +310,7 @@ $el.addClass('loading active'); showPageByHref($el.attr('href'), { animation: animation, - callback: function(){ + callback: function(){ $el.removeClass('loading'); setTimeout($.fn.unselect, 250, $el); }, $referrer: $el @@ -324,8 +324,8 @@ // Prepend info to page history hist.unshift({ - page: page, - animation: animation, + page: page, + animation: animation, id: pageId }); } @@ -336,13 +336,13 @@ 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){ @@ -358,7 +358,7 @@ toPage.trigger('pageAnimationEnd', { direction: 'in' }); fromPage.trigger('pageAnimationEnd', { direction: 'out' }); - + clearInterval(dumbLoop); currentPage = toPage; location.hash = currentPage.attr('id'); @@ -430,7 +430,7 @@ callback: null, $referrer: null }; - + var settings = $.extend({}, defaults, options); if (href != '#') @@ -510,7 +510,7 @@ if (!$(e.target).is(touchSelectors.join(', '))) { var $link = $(e.target).closest('a'); - + if ($link.length){ $el = $link; } else { @@ -533,16 +533,16 @@ 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'); @@ -551,11 +551,11 @@ } clearTimeout(hoverTimeout); - } - + } + function touchend(){ updateChanges(); - + if (deltaY === 0 && deltaX === 0) { $el.makeActive(); // New approach: @@ -575,7 +575,7 @@ $el.unbind('touchmove touchend'); clearTimeout(hoverTimeout); } - + function updateChanges(){ var first = event.changedTouches[0] || null; deltaX = first.pageX - startX; @@ -600,7 +600,7 @@ if ($.isFunction(fn)) { return this.each(function(i, el){ - $(el).bind('swipe', fn); + $(el).bind('swipe', fn); }); } } @@ -613,7 +613,7 @@ $(this).trigger('tap'); } } - + publicObj = { getOrientation: getOrientation, goBack: goBack, @@ -624,7 +624,7 @@ return publicObj; } - + // Extensions directly manipulate the jQTouch object, before it's initialized. $.jQTouch.prototype.extensions = []; $.jQTouch.addExtension = function(extension){ diff --git a/closin/cache/jqt-r109/jqtouch/jqtouch.transitions.js b/closin/cache/jqt-r109/jqtouch/jqtouch.transitions.js index 9d8970f..5b6c6c3 100644 --- a/closin/cache/jqt-r109/jqtouch/jqtouch.transitions.js +++ b/closin/cache/jqt-r109/jqtouch/jqtouch.transitions.js @@ -1,26 +1,26 @@ /* - _/ _/_/ _/_/_/_/_/ _/ - _/ _/ _/ _/_/ _/ _/ _/_/_/ _/_/_/ - _/ _/ _/_/ _/ _/ _/ _/ _/ _/ _/ _/ - _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ - _/ _/_/ _/ _/ _/_/ _/_/_/ _/_/_/ _/ _/ - _/ + _/ _/_/ _/_/_/_/_/ _/ + _/ _/ _/ _/_/ _/ _/ _/_/_/ _/_/_/ + _/ _/ _/_/ _/ _/ _/ _/ _/ _/ _/ _/ + _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ + _/ _/_/ _/ _/ _/_/ _/_/_/ _/_/_/ _/ _/ + _/ _/ 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); @@ -41,8 +41,8 @@ s.push(i); } $el.css({ - webkitTransitionProperty: s.join(", "), - webkitTransitionDuration: settings.speed, + webkitTransitionProperty: s.join(", "), + webkitTransitionDuration: settings.speed, webkitTransitionTimingFunction: settings.ease }); if (settings.callback) { diff --git a/closin/cache/jqt-r109/themes/apple/theme.css b/closin/cache/jqt-r109/themes/apple/theme.css index 07d85eb..907de65 100644 --- a/closin/cache/jqt-r109/themes/apple/theme.css +++ b/closin/cache/jqt-r109/themes/apple/theme.css @@ -75,7 +75,7 @@ body.landscape .toolbar > h1 { } .button.active, .back.active, .cancel.active, .add.active { - -webkit-border-image: url(img/toolButton.png) 0 5 0 5; + -webkit-border-image: url(img/toolButton.png) 0 5 0 5; } .blueButton { diff --git a/closin/templates/bizi.html b/closin/templates/bizi.html index 44fc4db..aa3aadf 100644 --- a/closin/templates/bizi.html +++ b/closin/templates/bizi.html @@ -5,9 +5,9 @@

Parada {{ name }}

  • {{ numberofbizis }} bicicletas
  • {{ numberofparkings }} aparcamientos
    • -
+ -
    +
    • Cómo llegar
      • diff --git a/closin/templates/bus.html b/closin/templates/bus.html index 708e7aa..2deb7e8 100644 --- a/closin/templates/bus.html +++ b/closin/templates/bus.html @@ -2,7 +2,7 @@

      Poste {{ post }}

      Volver -
        +
          {% for line in lines.items %}
        • [{{ line.0 }}] {{line.1.name}} @@ -10,11 +10,11 @@

          Poste {{ post }}


          {{bus}} {% endfor %} -
          • + {% endfor %} -
        +
      -
        +
        • Cómo llegar
          • diff --git a/closin/templates/index-old.html b/closin/templates/index-old.html index 5e28b33..2fad364 100644 --- a/closin/templates/index-old.html +++ b/closin/templates/index-old.html @@ -17,15 +17,15 @@ body > .current { -webkit-transform: none !important; } - + #favorites { display:none; } - + #favoritos ul li { position: relative; } - + #favoritos ul li .delete { position: absolute; top: 5px; @@ -36,11 +36,11 @@ border-width: 0 5px; -webkit-border-image: url(/cache/jqt-r109/themes/jqt/img/button.png) 0 5 0 5; } - + div#home{background:#181818} - + @@ -50,7 +50,7 @@

          {{ cat.name|escape }}

          Volver - +
          @@ -68,7 +68,7 @@

          Tranvía

          - +

          Favoritos

          @@ -81,27 +81,27 @@

          Favoritos

        - +
        - +

        - + {% comment %} -
          + -
          -

          ¡Añade esta página tu página de inicio!

          +
        +
        +

        ¡Añade esta página tu página de inicio!

        {% endcomment %}
        @@ -119,11 +119,11 @@

        Favoritos

        '/cache/jqt-r109/themes/jqt/img/button_clicked.png' ] }); - + var db; var infowindow = null; var saddr = null; - + function addMarker(map, lat, lon, name, cat, id) { var marker = new google.maps.Marker({ position: new google.maps.LatLng(lat, lon), @@ -142,7 +142,7 @@

        Favoritos

        }); } } - + function initialize(cat, zoom, initialLocation, mark) { var center = initialLocation; if(mark) { @@ -158,7 +158,7 @@

        Favoritos

        mapTypeId: google.maps.MapTypeId.ROADMAP }; var map = new google.maps.Map(document.getElementById("map-"+cat), myOptions); - + if(mark) { var marker = new google.maps.Marker({ position: initialLocation, @@ -166,7 +166,7 @@

        Favoritos

        icon: '/cache/images-004/ico_localizacion.png' }); } - + $.ajax({ url: '/fetch?service='+cat, dataType: 'json', success: function(data) { @@ -181,9 +181,9 @@

        Favoritos

        } } }); - + } - + function loadDetail(service, id, lat, lon, name) { $("#detail").html("

        Cargando...

        ") jQT.goTo("#detail"); @@ -203,18 +203,18 @@

        Favoritos

        } }); } - + function supports_local_database() { return !!window.openDatabase; } - + function connectDatabase() { var shortName = 'dndzgz'; var version = '1.0'; var displayName = 'DNDzgz'; var maxSize = 65536; db = openDatabase(shortName, version, displayName, maxSize); - + db.transaction( function(transaction) { transaction.executeSql( @@ -229,19 +229,19 @@

        Favoritos

        ); } ); - + /*db.transaction( function(transaction) { transaction.executeSql( - 'INSERT INTO favorites (id, service, date, name, latitude, longitude) VALUES (?, ?, ?, ?, ?, ?);', + 'INSERT INTO favorites (id, service, date, name, latitude, longitude) VALUES (?, ?, ?, ?, ?, ?);', [1, 'bizi',new Date(), 'trolololo', 41.6602133829, -0.863670578642], - null, + null, errorHandler - ); + ); } );*/ } - + function favoritesList(){ $('#favoritos ul li:gt(0)').remove(); db.transaction( @@ -266,7 +266,7 @@

        Favoritos

        }); newEntryRow.find('a').attr('href','#'+row.service); } - }, + }, errorHandler ); } @@ -280,55 +280,55 @@

        Favoritos

        var latitude = $('#favLat').val(); var longitude = $('#favLon').val(); var values = [id, service, new Date(), name, latitude, longitude]; - + db.transaction( function(transaction) { transaction.executeSql( - 'INSERT INTO favorites (id, service, date, name, latitude, longitude) VALUES (?, ?, ?, ?, ?, ?);', - [id, service, new Date(), name, latitude, longitude], + 'INSERT INTO favorites (id, service, date, name, latitude, longitude) VALUES (?, ?, ?, ?, ?, ?);', + [id, service, new Date(), name, latitude, longitude], function(){ jQT.goBack(); favoritesList(); - }, + }, errorHandler ); } ); return false; } - + function deleteFavoriteById(id,service) { db.transaction( function(transaction) { - transaction.executeSql('DELETE FROM favorites WHERE id=? AND service=?;', + transaction.executeSql('DELETE FROM favorites WHERE id=? AND service=?;', [id,service], null, errorHandler); } ); } - + function errorHandler(transaction, error) { alert('Oops. Error was '+error.message+' (Code '+error.code+')'); return true; } - + function initializeAll(initialLocation, mark) { saddr = initialLocation; {% for cat in categories %} initialize('{{ cat.key }}', {{ cat.zoom }}, initialLocation, mark); {% endfor %} } - + $(document).ready(function() { if(supports_local_database()){ $('#favorites').show(); connectDatabase(); favoritesList(); } - + infowindow = new google.maps.InfoWindow({ content: "foobar" }); - + if(navigator.geolocation) { navigator.geolocation.getCurrentPosition(function(position) { var location = new google.maps.LatLng( @@ -336,7 +336,7 @@

        Favoritos

        position.coords.longitude); initializeAll(location, true); }); - + //TODO: Añadir el caso de error!! } else { initializeAll(new google.maps.LatLng(41.641184, -0.894032), false); diff --git a/closin/templates/index.html b/closin/templates/index.html index 1c43019..7086378 100644 --- a/closin/templates/index.html +++ b/closin/templates/index.html @@ -7,7 +7,7 @@ - + DNDzgz @@ -20,7 +20,7 @@ {% endfor %}
      - +

      ← Inicio @@ -29,7 +29,7 @@

      - +

      ← Mapa @@ -37,11 +37,11 @@ Cómo llegar

      - +
      - + @@ -50,7 +50,7 @@ showHome(); $('#back-home-button').click(function(){showHome()}); $('#back-map-button').click(function(){backToMap()}); - + {% for cat in categories %} $('#cat-{{ cat.key }}').click(function() { showMap('{{ cat.key }}') }); {% endfor %} diff --git a/closin/templates/test.html b/closin/templates/test.html index 115f8eb..238be81 100644 --- a/closin/templates/test.html +++ b/closin/templates/test.html @@ -10,12 +10,12 @@
      - +