Permalink
Browse files

css change for iphone and ipad

  • Loading branch information...
1 parent 48a4b5d commit 11835cf6d2081cd4d7ba0578f915f488f4bf4290 @ryanki1 committed Feb 28, 2013
@@ -214,9 +214,6 @@
<Content Include="Content\jquery.mobile.acTravelSales.css" />
<Content Include="Content\jquery.mobile.acTravelSales.min.css" />
<Content Include="Content\oocss_all.css" />
- <Content Include="Content\main.css">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
<Content Include="Content\fonts\cabinsketch-regular.svg" />
<Content Include="Content\images\ajax-loader.gif" />
<Content Include="Content\images\ajax-loader.png" />
@@ -238,6 +235,7 @@
<Content Include="Content\jquery.mobile-1.1.0.min.css">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="Content\oocss_core\content.css" />
<Content Include="Content\oocss_core\core.css" />
<Content Include="Content\oocss_core\grid\grids.css" />
<Content Include="Content\oocss_core\grid\grids_all.html" />
@@ -246,6 +244,8 @@
<Content Include="Content\oocss_core\grid\grids_gutter.css" />
<Content Include="Content\oocss_core\grid\grids_iphone.css" />
<Content Include="Content\oocss_core\grid\grid_rtl.css" />
+ <Content Include="Content\oocss_core\libraries.css" />
+ <Content Include="Content\oocss_core\template\template.css" />
<Content Include="Content\qunit-1.11.0.css">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -433,17 +433,19 @@
<Content Include="SignalR.Sample\SignalR.StockTicker.js" />
<Content Include="SignalR.Sample\StockTicker.css" />
<Content Include="SignalR.Sample\StockTicker.html" />
- <Content Include="Spec\GeoOffice_xyz.html" />
+ <Content Include="Spec\GeoOffice_xyz_iPad_iOS4.html" />
+ <Content Include="Spec\GeoOffice_xyz_iPhone_iOS4.html" />
<Content Include="Spec\GeoOffice_NearestIndustrySalesman.html" />
<Content Include="Spec\GeoOffice_NearestProductSalesman.html" />
<Content Include="Spec\GeoOffice_NearestSalesman.html" />
<Content Include="Spec\GeoOffice_Route.html" />
<Content Include="Test\commonTest.js" />
+ <Content Include="Test\GeoOffice_xyz_iPad_iOS4.js" />
<Content Include="Test\GeoOffice_NearestIndustrySalesman.js" />
<Content Include="Test\GeoOffice_NearestProductSalesman.js" />
<Content Include="Test\GeoOffice_NearestSalesman.js" />
<Content Include="Test\GeoOffice_Route.js" />
- <Content Include="Test\GeoOffice_xyz.js" />
+ <Content Include="Test\GeoOffice_xyz_iPhone_iOS4.js" />
<Content Include="TrainingCRUD.svc" />
<Content Include="Web.config">
<SubType>Designer</SubType>
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectView>ProjectFiles</ProjectView>
+ </PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -38,8 +38,6 @@ public static void RegisterBundles(BundleCollection bundles)
bundles.Add(new StyleBundle("~/Content/css").Include("~/Content/ts.css"));
- bundles.Add(new StyleBundle("~/Content/app").Include("~/Content/main.css"));
-
bundles.Add(new StyleBundle("~/Content/mobilecss").Include("~/Content/jquery.mobile*"));
bundles.Add(new StyleBundle("~/Content/themes/base/css").Include(
@@ -3,11 +3,11 @@
.unitRight{float:right;}
.size1of1{float:none;}
.size1of2{width:50%;}
-.size1of3{width:33.33333%; min-width:320px}
+.size1of3{width:33.33333%; min-width:290px}
.size2of3{width:66.66666%;}
.size1of4{width:25%;}
.size3of4{width:75%;}
-.size1of5{width:20%;}
+.size1of5{width:20%; min-width:290px}
.size2of5{width:40%;}
.size3of5{width:60%;}
.size4of5{width:80%;}
@@ -150,6 +150,7 @@
margin: 0;
white-space: pre-wrap;
word-wrap: break-word;
+ width: 200px;
}
#qunit-tests del {
@@ -199,7 +200,7 @@
color: #710909;
background-color: #fff;
border-left: 10px solid #EE5757;
- white-space: pre;
+ /*white-space: pre;*/
}
#qunit-tests > li:last-child {
@@ -27,8 +27,8 @@
<script src="../Scripts/qunit-1.11.0.js"></script>
<script src="../Scripts/tutScript.js"></script>
<!--<script src="../Scripts/App/geo.js"></script>-->
- <script src="../Scripts/App/app.js"></script>
<script src="../Test/commonTest.js"></script>
+ <script src="../Scripts/App/app.js"></script>
<script src="../Scripts/App/common.js"></script>
<script src="../Test/GeoOffice_NearestIndustrySalesman.js"></script>
</body>
@@ -27,8 +27,8 @@
<script src="../Scripts/qunit-1.11.0.js"></script>
<script src="../Scripts/tutScript.js"></script>
<!--<script src="../Scripts/App/geo.js"></script>-->
- <script src="../Scripts/App/app.js"></script>
<script src="../Test/commonTest.js"></script>
+ <script src="../Scripts/App/app.js"></script>
<script src="../Scripts/App/common.js"></script>
<script src="../Test/GeoOffice_NearestProductSalesman.js"></script>
</body>
@@ -27,8 +27,8 @@
<script src="../Scripts/qunit-1.11.0.js"></script>
<script src="../Scripts/tutScript.js"></script>
<!--<script src="../Scripts/App/geo.js"></script>-->
- <script src="../Scripts/App/app.js"></script>
<script src="../Test/commonTest.js"></script>
+ <script src="../Scripts/App/app.js"></script>
<script src="../Scripts/App/common.js"></script>
<script src="../Test/GeoOffice_NearestSalesman.js"></script>
</body>
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html class="tut">
-<head>
-<meta charset="utf-8">
-<title>Nearest Salesman Test</title>
-<link rel="stylesheet" href="../Content/qunit-1.11.0.css">
-<link rel="stylesheet" href="../Content/app/main.css">
-</head>
-<body>
- <div id="qunit"></div>
- <div id="qunit-fixture" class="nomaps">
- <div>
- </div>
- </div>
- <div>
- <div id="salesmanList" class="menu-buttonlist"></div>
- </div>
- <div>
- <article id="map" class="maps info-box" style=" float:left">
- <div></div>
- </article>
- <article id="route" class="mapsRoute info-box" style=" float:right">
- <div></div>
- </article>
- </div>
- <script src="../Scripts/jquery-1.8.2.js"></script>
- <script src="../Scripts/qunit-1.11.0.js"></script>
- <script src="../Scripts/tutScript.js"></script>
- <!--<script src="../Scripts/App/geo.js"></script>-->
- <script src="../Scripts/App/app.js"></script>
- <script src="../Test/commonTest.js"></script>
- <script src="../Scripts/App/common.js"></script>
- <script src="../Test/GeoOffice_xyz.js"></script>
-</body>
-</html>
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html class="tut">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Nearest Salesman Test</title>
+<!--<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />-->
+<link rel="stylesheet" href="../Content/qunit-1.11.0.css">
+<link rel="stylesheet" href="../Content/jquery.mobile-1.1.0.css">
+<link rel="stylesheet" href="../Content/jquery.mobile.acTravelSales.css">
+<link rel="stylesheet" href="../Content/oocss_core/core.css">
+<link rel="stylesheet" href="../Content/oocss_core/content.css">
+<link rel="stylesheet" href="../Content/oocss_core/libraries.css">
+<link rel="stylesheet" href="../Content/oocss_core/template/template.css">
+</head>
+<body>
+ <div data-role="page" data-theme="a" id="salesmanTravelling">
+ <div id="qunit"></div>
+ <div id="qunit-fixture" class="nomaps">
+ <div>
+ </div>
+ </div>
+ <div>
+ <article id="map" class="maps info-box" style=" float:left">
+ <div></div>
+ </article>
+ <article id="route" class="mapsRoute info-box" style=" float:right">
+ <div></div>
+ </article>
+ </div>
+ <div data-role="content">
+ <div class="main">
+ <h2>Main</h2>
+ <div id="salesmanList" data-enhance="true"></div>
+ </div>
+ </div>
+ </div>
+ <script src="../Scripts/jquery-1.8.2.js"></script>
+ <script src="../Scripts/qunit-1.11.0.js"></script>
+ <script src="../Scripts/tutScript.js"></script>
+ <!--<script src="../Scripts/App/geo.js"></script>-->
+ <script src="../Test/commonTest.js"></script>
+ <script src="../Scripts/App/config.js"></script>
+ <script src="../Scripts/App/app.js"></script>
+ <script src="../Scripts/App/common.js"></script>
+ <script src="../Test/GeoOffice_xyz_iPad_iOS4.js"></script>
+ <script src="../Scripts/jquery.mobile-1.1.0.js"></script>
+</body>
+</html>
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html class="tut">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Nearest Salesman Test</title>
+<!--<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />-->
+<link rel="stylesheet" href="../Content/qunit-1.11.0.css">
+<link rel="stylesheet" href="../Content/jquery.mobile-1.1.0.css">
+<link rel="stylesheet" href="../Content/jquery.mobile.acTravelSales.css">
+<link rel="stylesheet" href="../Content/oocss_core/core.css">
+<link rel="stylesheet" href="../Content/oocss_core/content.css">
+<link rel="stylesheet" href="../Content/oocss_core/libraries.css">
+<link rel="stylesheet" href="../Content/oocss_core/template/template.css">
+</head>
+<body>
+ <div data-role="page" data-theme="a" id="salesmanTravelling">
+ <div id="qunit"></div>
+ <div id="qunit-fixture" class="nomaps">
+ <div>
+ </div>
+ </div>
+ <div>
+ <article id="map" class="maps info-box" style=" float:left">
+ <div></div>
+ </article>
+ <article id="route" class="mapsRoute info-box" style=" float:right">
+ <div></div>
+ </article>
+ </div>
+ <div data-role="content">
+ <div class="main">
+ <h2>Main</h2>
+ <div id="salesmanList" data-enhance="true"></div>
+ </div>
+ </div>
+ </div>
+ <script src="../Scripts/jquery-1.8.2.js"></script>
+ <script src="../Scripts/qunit-1.11.0.js"></script>
+ <script src="../Scripts/tutScript.js"></script>
+ <!--<script src="../Scripts/App/geo.js"></script>-->
+ <script src="../Test/commonTest.js"></script>
+ <script src="../Scripts/App/config.js"></script>
+ <script src="../Scripts/App/app.js"></script>
+ <script src="../Scripts/App/common.js"></script>
+ <script src="../Test/GeoOffice_xyz_iPhone_iOS4.js"></script>
+ <script src="../Scripts/jquery.mobile-1.1.0.js"></script>
+</body>
+</html>
@@ -7,6 +7,7 @@
}
});
+// Behaviour Tests
test("As already discussed list should show salesman by amount of product expertise", function () {
ok(true === true, "Success");
})
@@ -19,46 +19,6 @@ function geoTestCBError() {
common_geoTestCBError();
}
-function geoTestCBSequenceSalesmanSuccess(position) {
- debugger;
- app.geoRankingCallbackSuccess(position);
- ok(app.userHasLocation() === true, "User now has a location");
- app.showNearestFirstJSON(sequenceSalesmanSuccess, sequenceSalesmanError);
-}
-
-function geoTestCBSequenceSalesmanError() {
- ok(true === true, "Dummy TestCBSequenceSalesmanError");
- start();
-}
-
-function sequenceSalesmanSuccess(data, textStatus, jqXHR) {
- debugger;
- ok(data[0].LastName.toLowerCase() === "weinfurtner", "Nearest identified");
- ok(data[1].LastName.toLowerCase() === "rensing", "2nd nearest identified");
- ok(data[2].LastName.toLowerCase() === "joachim-knak", "3rd nearest identified");
- ok(data[3].LastName.toLowerCase() === "fischer", "Furthest identified");
- ok(data[3].Distance !== "undefined", "Distance in km available");
- start();
-}
-
-function sequenceSalesmanError(jqXHR, testStatus, errorThrown) {
- debugger;
- ok(true === true, "Dummy test error");
- start();
-}
-
-function geoTestCSSCBSequenceSalesmanSuccess(position) {
- debugger;
- app.geoRankingCallbackSuccess(position);
- ok(app.userHasLocation() === true, "User now has a location");
- app.showNearestFirst(sequenceSalesmanCSSSuccess, sequenceSalesmanCSSError);
-}
-
-function geoTestCSSCBSequenceSalesmanError() {
- ok(true === true, "Dummy TestCBSequenceSalesmanError");
- start();
-}
-
function sequenceSalesmanCSSSuccess(responseHTML) {
debugger;
$("#salesmanList").html(responseHTML + "<p>Ordered by nearest first :-)</p>").trigger("create");
@@ -1,37 +0,0 @@
-module("GeoOffice on a iPod", {
-});
-
-test("As already discussed flicking to left or right should show salesman by distance, product and industry", function () {
- ok(true === true, "Success");
-})
-
-test("As already discussed rotating to landscape should show location by distance, product and industry", function () {
- ok(true === true, "Success");
-})
-
-test("As already discussed rotating from portrait should show salesman in terms of distance, product and industry", function () {
- ok(true === true, "Success");
-})
-
-test("As already discussed tapping salesman should show details by distance, product and industry", function () {
- ok(true === true, "Success");
-})
-
-test("As already discussed holding unselected salesman should fix him in the list when scrolling", function () {
- ok(true === true, "Success");
-})
-
-test("As already discussed holding selected salesman should unfix him in the list when scrolling", function () {
- ok(true === true, "Success");
-})
-
-module("GeoOffice on a iPad", {
-});
-
-test("As already discussed salesman list should show columns for distance, product and industry", function () {
- ok(true === true, "Success");
-})
-
-test("As already discussed salesman list should show bigger version of ipad", function () {
- ok(true === true, "Success");
-})
Oops, something went wrong.

0 comments on commit 11835cf

Please sign in to comment.