Skip to content

Commit

Permalink
Fix #18160: update demos/mobileGallery to use ios7 theme
Browse files Browse the repository at this point in the history
  • Loading branch information
dmandrioli committed Jul 21, 2014
1 parent f296e87 commit f162dcb
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 1 deletion.
1 change: 1 addition & 0 deletions mobileGallery/cache.appcache
Expand Up @@ -4,6 +4,7 @@ CACHE:
demo.html
# all dojo mobile theme files on supported platforms
../../dojox/mobile/themes/iphone/iphone.css
../../dojox/mobile/themes/ios7/ios7.css
../../dojox/mobile/themes/iphone/ipad.css
../../dojox/mobile/themes/android/android.css
# demo theme files
Expand Down
87 changes: 87 additions & 0 deletions mobileGallery/demo-ios7.html
@@ -0,0 +1,87 @@
<!DOCTYPE HTML>
<html manifest="cache.appcache">
<!-- Main file using the iPhone theme. The source code for each view is located in
mobileGallery/views (HTML files), mobileGallery/src (JavaScript files),
and mobileGallery/css (CSS files). -->
<head>
<meta name="viewport"
content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"/>
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta names="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Showcase</title>
<link rel="stylesheet" type="text/css" href="../../dojox/mobile/themes/ios7/ios7.css"></link>
<link rel="stylesheet" type="text/css" href="../../demos/mobileGallery/css/themes/iphone/gallery.css"></link>
<link rel="stylesheet" type="text/css" href="demo.css"/>
<link rel="apple-touch-icon" href="images/MobileShow_App_57.png"/>
<link rel="apple-touch-icon" sizes="114x114" href="images/MobileShow_App_114.png"/>
<link rel="shortcut icon" href="images/MobileShow_Fav_16.png"/>
<style>
html, body{
height: 100%;
overflow: hidden;
}

</style>
</head>
<body>
<div id="splitter" dojoType="dojox.mobile.FixedSplitter" orientation="H">
<div id="leftPane" dojoType="dojox.mobile.Container">
<h1 id="leftHeader" dojoType="dojox.mobile.Heading" fixed="top">
<div style="height:42px;float: left;margin-left:6px"></div>
<span id="leftHeaderLabel">Showcase</span>
</h1>
<div id="navigation" dojoType="dojox.mobile.ScrollableView"></div>
</div>

<div dojoType="dojox.mobile.Container">
<h1 id="header" dojoType="dojox.mobile.Heading" fixed="top">
<button id="navButton" dojoType="dojox.mobile.ToolBarButton"
data-dojo-props="arrow:'left'">Back</button>
<span id="headerLabel" style="float:center;">Welcome</span>
<button id="sourceButton" dojoType="dojox.mobile.ToolBarButton"
toggle="true">Source</button>
</h1>
<div id="rightPane" dojoType="dojox.mobile.View" selected="true" style="overflow:hidden;">
<div id="welcome" dojoType="dojox.mobile.ScrollableView">
<h1 dojoType="dojox.mobile.RoundRectCategory"
style="text-align:center;vertical-align:middle;margin-left:0px;padding-left:0px">
<div>Welcome to Dojo Mobile Showcase</div>
<img src="images/welcomeLogo.png"/>
</h1>
</div>
<div id="source" dojoType="dojox.mobile.View">
<ul id="srcTabBar" dojoType="dojox.mobile.TabBar" barType="segmentedControl">
<li id="htmlSrcTab" dojoType="dojox.mobile.TabBarButton"
moveTo="htmlSrcView" selected="true">HTML</li>
<li id="jsSrcTab" dojoType="dojox.mobile.TabBarButton" moveTo="jsSrcView">JavaScript</li>
</ul>
<div>
<div id="htmlSrcView" dojoType="dojox.mobile.ScrollableView" scrollDir="hv">
<pre id="htmlContent"></pre>
</div>
<div id="jsSrcView" dojoType="dojox.mobile.ScrollableView" scrollDir="hv">
<pre id="jsContent"></pre>
</div>
</div>
</div>
</div>
</div>
</div>
<div id="loadDiv" style="position:absolute;left:0px;top:0px;width:100%;height:100%;z-index:999;">
<span>Loading...</span></div>
<script type="text/javascript" src="../../dojo/dojo.js"
data-dojo-config="parseOnLoad:false,mblAlwaysHideAddressBar:true,async:true"></script>
<script type="text/javascript">
require(["dojox/mobile", "dojox/mobile/parser", "dojo/ready",
"demos/mobileGallery/src", "dojox/mobile/compat", "dojox/mobile/Button",
"dojox/mobile/ToolBarButton", "dojox/mobile/FixedSplitter", "dojox/mobile/Container",
"dojox/mobile/ScrollableView", "dojox/mobile/SwapView", "dojox/mobile/TabBar",
"dojo/domReady!"], function(mobile, parser, ready, src){
ready(function(){
src.init();
});
});
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion mobileGallery/demo.html
Expand Up @@ -10,7 +10,7 @@
} else if (userAgent.indexOf("MSIE") > -1) {
window.location.href = "demo-windows.html";
} else {
window.location.href = "demo-iphone.html";
window.location.href = "demo-ios7.html";
}
</script>
</head>
Expand Down

0 comments on commit f162dcb

Please sign in to comment.