Menu
▾
▴
[Collective-checkins] r251120 - in plonetheme.porseleinplaats/trunk: . docs plonetheme/porseleinplaats/browser plonetheme/porseleinplaats/browser/javascripts plonetheme/porseleinplaats/browser/stylesheets plonetheme/porseleinplaats/profiles/default
|
From: David J. C. <svn...@pl...> - 2012-09-25 16:35:45
|
Author: davidjonas
Date: Tue Sep 25 16:35:33 2012
New Revision: 251120
Modified:
plonetheme.porseleinplaats/trunk/docs/HISTORY.txt
plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/app_view_home.pt
plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/app_view_object.pt
plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/app_view_vitrine.pt
plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/app_view_vitrines_list.pt
plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/javascripts/app.js
plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/stylesheets/app.css
plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/profiles/default/metadata.xml
plonetheme.porseleinplaats/trunk/setup.py
Log:
fixed scrolling problem
Modified: plonetheme.porseleinplaats/trunk/docs/HISTORY.txt
==============================================================================
--- plonetheme.porseleinplaats/trunk/docs/HISTORY.txt (original)
+++ plonetheme.porseleinplaats/trunk/docs/HISTORY.txt Tue Sep 25 16:35:33 2012
@@ -1,5 +1,9 @@
Changelog
=========
+0.47 (2012-09-25)
+---------------------
+- Fixed scrolling on the app mode.
+
0.46 (2012-09-25)
---------------------
- Fixed disqus accounts for live data.
Modified: plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/app_view_home.pt
==============================================================================
--- plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/app_view_home.pt (original)
+++ plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/app_view_home.pt Tue Sep 25 16:35:33 2012
@@ -5,10 +5,10 @@
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="default" />
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0" />
- <link href="++resource++plonetheme.porseleinplaats.stylesheets/app.css" media="screen" type="text/css" rel="stylesheet">
- <script src="++resource++plonetheme.porseleinplaats.javascripts/jquery-1.8.0.min.js" type="text/javascript"></script>
- <script src="++resource++plonetheme.porseleinplaats.javascripts/jquery-ui-1.8.23.custom.min.js" type="text/javascript"></script>
- <script src="++resource++plonetheme.porseleinplaats.javascripts/app.js" type="text/javascript" ></script>
+ <link href="++resource++plonetheme.porseleinplaats.stylesheets/app.css?v=9" media="screen" type="text/css" rel="stylesheet">
+ <script src="++resource++plonetheme.porseleinplaats.javascripts/jquery-1.8.0.min.js?v=1" type="text/javascript"></script>
+ <script src="++resource++plonetheme.porseleinplaats.javascripts/jquery-ui-1.8.23.custom.min.js?v=1" type="text/javascript"></script>
+ <script src="++resource++plonetheme.porseleinplaats.javascripts/app.js?v=6" type="text/javascript" ></script>
<link rel="apple-touch-icon-precomposed" href="++resource++plonetheme.porseleinplaats.images/IconPorselein114.png" sizes="114x114">
<!-- iPad (portrait) -->
Modified: plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/app_view_object.pt
==============================================================================
--- plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/app_view_object.pt (original)
+++ plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/app_view_object.pt Tue Sep 25 16:35:33 2012
@@ -11,18 +11,18 @@
<link href="" tal:attributes="href python:context.absolute_url() + '/ploneglossary.css'" media="screen" type="text/css" rel="stylesheet">
<link href="" tal:attributes="href python:context.absolute_url() + '/ploneglossary_popup.css'" media="screen" type="text/css" rel="stylesheet">
- <link href="++resource++plonetheme.porseleinplaats.stylesheets/app.css" media="screen" type="text/css" rel="stylesheet">
- <script src="++resource++plonetheme.porseleinplaats.javascripts/jquery-1.8.0.min.js" type="text/javascript"></script>
- <script src="++resource++collective.mediaShow.javascripts/jquery.touchwipe.min.js" type="text/javascript"></script>
- <script src="++resource++collective.mediaShow.javascripts/mediaShow.js" type="text/javascript"></script>
- <script src="++resource++plonetheme.porseleinplaats.javascripts/slideshowTweaks.js" async="async" type="text/javascript" ></script>
- <script src="++resource++plonetheme.porseleinplaats.javascripts/youtube.js" async="async" type="text/javascript" ></script>
+ <link href="++resource++plonetheme.porseleinplaats.stylesheets/app.css?v=9" media="screen" type="text/css" rel="stylesheet">
+ <script src="++resource++plonetheme.porseleinplaats.javascripts/jquery-1.8.0.min.js?v=1" type="text/javascript"></script>
+ <script src="++resource++collective.mediaShow.javascripts/jquery.touchwipe.min.js?v=1" type="text/javascript"></script>
+ <script src="++resource++collective.mediaShow.javascripts/mediaShow.js?v=1" type="text/javascript"></script>
+ <script src="++resource++plonetheme.porseleinplaats.javascripts/slideshowTweaks.js?v=1" async="async" type="text/javascript" ></script>
+ <script src="++resource++plonetheme.porseleinplaats.javascripts/youtube.js?v=1" async="async" type="text/javascript" ></script>
- <script src="" tal:attributes="src python:context.absolute_url() + '/register_function.js'" type="text/javascript" ></script>
- <script src="" tal:attributes="src python:context.absolute_url() + '/ploneglossary.js'" type="text/javascript" ></script>
- <script src="" tal:attributes="src python:context.absolute_url() + '/ploneglossary_definitions.js'" type="text/javascript" ></script>
+ <script src="" tal:attributes="src python:context.absolute_url() + '/register_function.js?v=1'" type="text/javascript" ></script>
+ <script src="" tal:attributes="src python:context.absolute_url() + '/ploneglossary.js?v=1'" type="text/javascript" ></script>
+ <script src="" tal:attributes="src python:context.absolute_url() + '/ploneglossary_definitions.js?v=1'" type="text/javascript" ></script>
- <script src="++resource++plonetheme.porseleinplaats.javascripts/app.js" async="async" type="text/javascript" ></script>
+ <script src="++resource++plonetheme.porseleinplaats.javascripts/app.js?v=6" async="async" type="text/javascript" ></script>
<script async="" src="http://www.google-analytics.com/ga.js"></script>
<script src="http://www.google.com/jsapi" type="text/javascript"></script>
<script type="text/javascript">
@@ -115,8 +115,7 @@
<script type="text/javascript" tal:content="python: 'var disqus_shortname = \'porseleinplaats\'; var disqus_url = \'%s\';(function() {var dsq = document.createElement(\'script\'); dsq.type = \'text/javascript\'; dsq.async = true; dsq.src = \'http://\' + disqus_shortname + \'.disqus.com/embed.js\'; (document.getElementsByTagName(\'head\')[0] || document.getElementsByTagName(\'body\')[0]).appendChild(dsq);})();'%context.absolute_url()">
DISQUS SCRIPT
</script>
-
-
+
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
Modified: plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/app_view_vitrine.pt
==============================================================================
--- plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/app_view_vitrine.pt (original)
+++ plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/app_view_vitrine.pt Tue Sep 25 16:35:33 2012
@@ -5,9 +5,9 @@
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="default" />
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0" />
- <link href="++resource++plonetheme.porseleinplaats.stylesheets/app.css" media="screen" type="text/css" rel="stylesheet">
- <script src="++resource++plonetheme.porseleinplaats.javascripts/jquery-1.8.0.min.js" type="text/javascript"></script>
- <script src="++resource++plonetheme.porseleinplaats.javascripts/app.js" type="text/javascript" ></script>
+ <link href="++resource++plonetheme.porseleinplaats.stylesheets/app.css?v=9" media="screen" type="text/css" rel="stylesheet">
+ <script src="++resource++plonetheme.porseleinplaats.javascripts/jquery-1.8.0.min.js?v=1" type="text/javascript"></script>
+ <script src="++resource++plonetheme.porseleinplaats.javascripts/app.js?v=6" type="text/javascript" ></script>
<script async="" src="http://www.google-analytics.com/ga.js"></script>
<script src="http://www.google.com/jsapi" type="text/javascript"></script>
@@ -37,7 +37,7 @@
</div>
<h1 class="title" tal:content="here/Title">Kies een porselein</h1>
</div>
- <div class="content_wrapper h_scroll">
+ <div class="content_wrapper scroll horizontal h_scroll">
<tal:block
define="contentFilter contentFilter|request/contentFilter|nothing;
limit_display limit_display|request/limit_display|nothing;
Modified: plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/app_view_vitrines_list.pt
==============================================================================
--- plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/app_view_vitrines_list.pt (original)
+++ plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/app_view_vitrines_list.pt Tue Sep 25 16:35:33 2012
@@ -5,10 +5,10 @@
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="default" />
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0" />
- <link href="++resource++plonetheme.porseleinplaats.stylesheets/app.css" media="screen" type="text/css" rel="stylesheet">
- <script src="++resource++plonetheme.porseleinplaats.javascripts/jquery-1.8.0.min.js" type="text/javascript"></script>
- <script src="++resource++plonetheme.porseleinplaats.javascripts/jquery-ui-1.8.23.custom.min.js" type="text/javascript"></script>
- <script src="++resource++plonetheme.porseleinplaats.javascripts/app.js" type="text/javascript" ></script>
+ <link href="++resource++plonetheme.porseleinplaats.stylesheets/app.css?v=9" media="screen" type="text/css" rel="stylesheet">
+ <script src="++resource++plonetheme.porseleinplaats.javascripts/jquery-1.8.0.min.js?v=1" type="text/javascript"></script>
+ <script src="++resource++plonetheme.porseleinplaats.javascripts/jquery-ui-1.8.23.custom.min.js?v=1" type="text/javascript"></script>
+ <script src="++resource++plonetheme.porseleinplaats.javascripts/app.js?v=6" type="text/javascript" ></script>
<script async="" src="http://www.google-analytics.com/ga.js"></script>
<script src="http://www.google.com/jsapi" type="text/javascript"></script>
@@ -28,12 +28,15 @@
<img id="spinner" src="++resource++plonetheme.porseleinplaats.images/spinner.gif" />
<div class="main_wrapper">
- <h1 class="title">Kies een vitrine</h1>
+
+ <div class="header">
<div class="backbuttonContainer">
<div class="backButton" onclick="window.location = '/app'" tal:attributes="onclick python: 'window.location = \'%s/app\''%portal.absolute_url()"><div class="-back-btn__arrow"></div>Zalen</div>
</div>
+ <h1 class="title">Kies een vitrine</h1>
+ </div>
- <div class="content_wrapper h_scroll">
+ <div class="content_wrapper scroll horizontal h_scroll">
<tal:block
define="contentFilter contentFilter|request/contentFilter|nothing;
limit_display limit_display|request/limit_display|nothing;
Modified: plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/javascripts/app.js
==============================================================================
--- plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/javascripts/app.js (original)
+++ plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/javascripts/app.js Tue Sep 25 16:35:33 2012
@@ -114,7 +114,7 @@
var xMovement = Math.abs(e.touches[0].screenX - xStart);
var yMovement = Math.abs(e.touches[0].screenY - yStart);
//console.log("mov: " + xMovement + " / " + yMovement);
- if (xMovement <= yMovement)
+ if (xMovement <= yMovement*3)
{
e.preventDefault();
}
@@ -294,10 +294,45 @@
PorseleinApp.setCookie('closedTipBox', true, 30)
}
+PorseleinApp.fixHeight = function ()
+{
+ var height = $(window).height()-130;
+ var padding = (height/2)-300;
+ if (padding > 0)
+ {
+ $(".scroll").css('padding-top', padding + "px");
+ $(".scroll").css('height', height - padding + "px");
+ }
+ else
+ {
+ $(".scroll").css('height', height + "px");
+ $(".scroll").css('height', "0px");
+ }
+
+ if ($("body.template_home").length == 1)
+ {
+ var height = $(window).height()-130;
+ var padding = (height/2)-300;
+
+ if (padding > 0)
+ {
+ $(".content_wrapper").css('padding-top', padding + "px");
+ $(".content_wrapper").css('height', height - padding + "px");
+ }
+ else
+ {
+ $(".content_wrapper").css('height', height + "px");
+ $(".content_wrapper").css('padding-top', "0px");
+ }
+ }
+};
+
$(function(){
PorseleinApp.loader();
PorseleinApp.fixLinks();
- PorseleinApp.stopBounce();
+ PorseleinApp.fixHeight();
+ $(window).resize(PorseleinApp.fixHeight);
+ //PorseleinApp.stopBounce();
//PorseleinApp.selfScroll();
//PorseleinApp.iscroll();
});
Modified: plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/stylesheets/app.css
==============================================================================
--- plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/stylesheets/app.css (original)
+++ plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/browser/stylesheets/app.css Tue Sep 25 16:35:33 2012
@@ -31,6 +31,7 @@
font-size: 17px;
/*position: relative;*/
-webkit-tap-highlight-color: #28af97;
+ -webkit-user-select: none;
}
p
@@ -71,9 +72,9 @@
font-size: 50px;
font-weight: lighter;
margin: 26px 15%;
- position: fixed;
text-align: center;
width: 70%;
+ -webkit-user-select: text;
}
.content_wrapper
@@ -81,7 +82,6 @@
margin: 0px auto;
text-align: center;
white-space: nowrap;
- padding-top: 130px;
line-height: 21px;
}
@@ -134,12 +134,12 @@
vertical-align: middle;
}
-body.template_object .backButton {
+.backButton {
margin-top: 9px;
margin-left: 51px;
}
-.backButton:active
+.backButton:active, .backButton:hover
{
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#766E68', endColorstr='#9D9793'); /* for IE */
background: -webkit-gradient(linear, center top, center bottom, from(#766E68), to(#9D9793)); /* for webkit browsers */
@@ -157,15 +157,14 @@
z-index: 999;
}
-.backButton:active > .-back-btn__arrow {
+.backButton:active > .-back-btn__arrow, .backButton:hover > .-back-btn__arrow
+{
background-position: -12px 0;
}
.backbuttonContainer
{
- position: fixed;
- top: 0px;
- left: 6px;
+ float: left;
-webkit-tap-highlight-color: rgba(0,0,0,0);
}
@@ -177,12 +176,12 @@
}*/
-.header
+/*.header
{
position: fixed;
top:0;
left: 0;
-}
+}*/
/* ======= Home tiles crop ======*/
@@ -326,6 +325,7 @@
body.App.template_object .bodyText
{
margin: 40px 40px 40px 40px;
+ -webkit-user-select:text;
}
.inlineImage
@@ -536,3 +536,51 @@
margin: 20px 40px;
}
+
+/* ======= SCROLLING ======= */
+
+body.template_object .header
+{
+ height: auto;
+}
+
+.header
+{
+ width: 100%;
+ height: 100px;
+}
+
+.scroll
+{
+ -webkit-overflow-scrolling: touch;
+}
+
+.scroll.vertical
+{
+ height:540px;
+ width: 100%;
+ overflow-y: scroll;
+
+}
+
+.scroll.horizontal
+{
+ height:540px;
+ width: 100%;
+ overflow-x: scroll;
+ overflow-y: hidden;
+}
+
+/* ======= ORIENTATION ON HOME ======== */
+
+@media only screen and (max-device-width: 1024px) and (orientation:portrait) {
+ body.App.template_home .item_wrapper
+ {
+ padding-right: 20px !important;
+ }
+
+ .item_wrapper {
+ margin: 20px 0 20px 20px;
+ }
+}
+
Modified: plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/profiles/default/metadata.xml
==============================================================================
--- plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/profiles/default/metadata.xml (original)
+++ plonetheme.porseleinplaats/trunk/plonetheme/porseleinplaats/profiles/default/metadata.xml Tue Sep 25 16:35:33 2012
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<metadata>
- <version>0.46</version>
+ <version>0.47</version>
<dependencies>
<dependency>profile-plonetheme.intkBase:default</dependency>
<dependency>profile-Products.Object:default</dependency>
Modified: plonetheme.porseleinplaats/trunk/setup.py
==============================================================================
--- plonetheme.porseleinplaats/trunk/setup.py (original)
+++ plonetheme.porseleinplaats/trunk/setup.py Tue Sep 25 16:35:33 2012
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import os
-version = '0.46'
+version = '0.47'
setup(name='plonetheme.porseleinplaats',
version=version,
|