Permalink
Browse files

Small modifications

  • Loading branch information...
1 parent 6a18462 commit 3a36c4ee189f3be0e51210a6bd2a93ba049989af @rvukovic committed Mar 29, 2012
Binary file not shown.
@@ -246,12 +246,13 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
- <UseIIS>False</UseIIS>
+ <UseIIS>True</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>52261</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
- <IISUrl>
- </IISUrl>
+ <IISUrl>http://localhost/FoodOrders</IISUrl>
+ <OverrideIISAppRootUrl>True</OverrideIISAppRootUrl>
+ <IISAppRootUrl>http://localhost/FoodOrders</IISAppRootUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
@@ -1,24 +1,21 @@
@model IEnumerable<Code9.FoodOrders.Data.Food>
-
@{
ViewBag.Title = "FoodList";
+ ViewBag.CurrentPage = 1;
Layout = "~/Views/Shared/_Layout.Mobile.cshtml";
+
}
<section id="login-page" data-role="page" >
<header data-role="header" data-position="fixed" >
<h1>Food List</h1>
@Html.ActionLink("Log Off", "LogOff", "Account",null, new{@class="ui-btn-right"})
</header>
<div data-role="content">
- <fieldset data-role="fieldcontain">
-
<p>
@Html.ActionLink("Create New", "Create",null,new{ data_role="button"})
</p>
-
<ul data-role="listview" >
-
@foreach (var item in Model) {
<li>
<a href="@Url.Action("AddFoodToOrder", new { foodId = item.Id })" data-transition="none">
@@ -28,7 +25,6 @@
</li>
}
</ul>
- </fieldset>
</div>
@Html.Partial("Footer.Mobile")
</section>
@@ -4,7 +4,7 @@
ViewBag.Title = "OrdersList";
Layout = "~/Views/Shared/_Layout.Mobile.cshtml";
}
-<section id="login-page" data-role="page" >
+<section id="login-page" data-role="dialog" >
<header data-role="header" data-position="fixed" >
<h1>Order complete</h1>
@Html.ActionLink("Log Off", "LogOff", "Account",null, new{@class="ui-btn-right"})
@@ -1,6 +1,7 @@
@model Code9.FoodOrders.Web.Models.OrderViewModel
@{
- ViewBag.Title = "FoodList";
+ ViewBag.Title = "Order";
+ ViewBag.CurrentPage = 3;
Layout = "~/Views/Shared/_Layout.Mobile.cshtml";
}
@@ -34,7 +35,7 @@
</ul>
</div>
<div data-role="fieldcontain">
- <input type="submit" data-role="button" data-icon="check" value="Complete this order" />
+ <input type="submit" data-role="button" data-icon="check" value="Complete this order" data-transition="flip" />
</div>
}
else
@@ -2,14 +2,15 @@
@{
ViewBag.Title = "OrdersList";
+ ViewBag.CurrentPage = 2;
Layout = "~/Views/Shared/_Layout.Mobile.cshtml";
}
-<section id="login-page" data-role="page" >
+<section id="login-page" data-role="page" data-add-back-btn="true">
<header data-role="header" data-position="fixed" >
<h1>OrdersList</h1>
@Html.ActionLink("Log Off", "LogOff", "Account",null, new{@class="ui-btn-right"})
</header>
- <div data-role="content">
+ <div data-role="content" >
<ul data-role="listview" >
@foreach ( var item in Model )
{
@@ -26,13 +27,5 @@
}
</ul>
</div>
- <footer data-role="footer">
- <nav data-role="navbar">
- <ul>
- <li>@Html.ActionLink("Foods", "Index", "Food")</li>
- <li>@Html.ActionLink("History", "Index", "Order")</li>
- <li>@Html.ActionLink("Orders", "CurrentOrder", "Order")</li>
- </ul>
- </nav>
- </footer>
+ @Html.Partial("Footer.Mobile")
</section>
@@ -1,9 +1,9 @@
<footer data-role="footer" data-position="fixed" >
<nav data-role="navbar">
<ul>
- <li>@Html.ActionLink("Foods", "Index", "Food")</li>
- <li>@Html.ActionLink("History", "Index", "Order")</li>
- <li>@Html.ActionLink("Orders", "CurrentOrder", "Order")</li>
+ <li>@Html.ActionLink("Foods", "Index", "Food", null, ViewBag.CurrentPage == 1 ? new {@class="ui-btn-active"} : null)</li>
+ <li>@Html.ActionLink("History", "Index", "Order", null, ViewBag.CurrentPage == 2 ? new { @class = "ui-btn-active" } : null)</li>
+ <li>@Html.ActionLink("Orders", "CurrentOrder", "Order", null, ViewBag.CurrentPage == 3 ? new { @class = "ui-btn-active" } : null)</li>
</ul>
</nav>
</footer>

0 comments on commit 3a36c4e

Please sign in to comment.