Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added data-role="button" to travSales list

  • Loading branch information...
commit cce60ccba79b4db16ebcd7f331a0b2152fc0eba6 1 parent 7c884f3
@ryanki1 authored
View
2  AddCon_TravellingSalesman/AddCon_TravellingSalesman.csproj
@@ -211,6 +211,8 @@
<Compile Include="Utilities\ExtensionMethods.cs" />
</ItemGroup>
<ItemGroup>
+ <Content Include="Content\oocss_all.css" />
+ <Content Include="Content\oocss_content.css" />
<Content Include="Content\main.css">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
View
3  AddCon_TravellingSalesman/App_Start/BundleConfig.cs
@@ -32,6 +32,9 @@ public static void RegisterBundles(BundleCollection bundles)
bundles.Add(new ScriptBundle("~/bundles/jquerymobile").Include("~/Scripts/jquery.mobile*"));
+ bundles.Add(new StyleBundle("~/Content/oocss").Include("~/Content/oocss_all.css"
+ ,"~/Content/oocss_content"));
+
bundles.Add(new StyleBundle("~/Content/css").Include("~/Content/ts.css"));
bundles.Add(new StyleBundle("~/Content/app").Include("~/Content/main.css"));
View
2  AddCon_TravellingSalesman/Content/oocss_all.css
@@ -0,0 +1,2 @@
+@import url("core/core.css");
+@import url("plugins/plugins.css");
View
38 AddCon_TravellingSalesman/Content/oocss_content.css
@@ -0,0 +1,38 @@
+body{font-family:"Myriad Pro","Segoe UI",Helvetica, Arial, sans-serif;}
+/* **************** CONTENT OBJECTS ***************** */
+
+/* ====== Elements ====== */
+img{display:block;}
+em{font-style: italic;}
+strong{font-weight:bold;}
+hr{border: 5px solid #e2e2e2; border-width: 0 0 5px 0; margin: 20px 10px 10px 10px;}
+code{color:#0B8C8F;}
+
+.important a{font-weight:bold;}/* what is this? */
+/* links */
+a {color: #2c4460; text-decoration: none;}
+a:focus, a:hover {text-decoration: underline;}
+a:focus{background-color:#FFFFCC;}
+a:visited { color:#005a9c; }
+/* ====== Lists ======*/
+/* numbered list */
+ol.simpleList li{list-style-type: decimal; margin-left:40px;}
+/* standard list */
+ul.simpleList li{list-style-type:disc; margin-left:40px;}
+/* ====== blockquote ====== */
+cite{display:block; text-align:right; padding-top: 10px;}
+/* ====== callout ====== */
+.callout{font-size:189%;color:#999999; font-style:italic;}
+.callout cite{display:block; text-align:right;padding-top: 30px; font-size:69.25%;}
+.callout span.quot{font-size: 500%; vertical-align: sub; color:#e2e2e2; line-height:25px; font-weight:bold;}
+.callout span.quotLast{vertical-align:middle;}
+/* ====== image treatments (get more from jason santa maria) ====== */
+.caption{font-size:13px; color:#666666; font-style:italic;padding-top:0;}
+/* will need to either
+1. find a way to capture the width of the caption in the width of the image or flash
+2. Set some default widths, mby use flickr widths?
+*/
+/* ====== special formatting classes ====== */
+.detail{color: #777; font-size:11px;display:block;}
+/* ====== images ====== */
+.icon{margin-right: 5px;}
View
4 AddCon_TravellingSalesman/Controllers/SalesmanModelsController.cs
@@ -80,8 +80,8 @@ public PartialViewResult SequenceSalesman(string lat, string lng)
return d;
}
//
- // GET: /SalesmanModels/Details/5
-
+ // POST: /SalesmanModels/Details/5
+ [HttpPost]
public ViewResult Details(int id)
{
SalesmanModel salesmanmodel = context.SalesmanModels.Single(x => x.ID == id);
View
24 AddCon_TravellingSalesman/Views/SalesmanModels/Index.cshtml
@@ -14,13 +14,27 @@
@Html.Partial("_LoginPartial")
}
-
-<div id='salesmanList' class="menu-buttonlist" data-enhance="false">
- @{ Html.RenderPartial("SalesmanListControl", Model); }
+<div class="leftCol">
+ <h2>Left Column</h2>
+ <p>Left column is 250px by default. It can be extended by several classes to allow for additional layouts.</p>
+ <ul>
+ <li>.gMail = 160px</li>
+ <li>.gCal = 180px</li>
+ <li>.yahoo = 240px</li>
+ <li>.myYahoo = 300px</li>
+ </ul>
</div>
-
-<div id='salesmanAdvert' class="advert">
+<div class="rightCol">
+ <h2>Right Column</h2>
+ <div id='salesmanAdvert' class="advert">
@{ Html.RenderPartial("SalesmanAdvert"); }
</div>
+</div>
+<div class="main">
+ <h2>Main</h2>
+ <div id='salesmanList' class="menu-buttonlist" data-enhance="false">
+ @{ Html.RenderPartial("SalesmanListControl", Model); }
+ </div>
+</div>
@Html.Partial("_geoRanking")
View
5 AddCon_TravellingSalesman/Views/SalesmanModels/SalesmanListControl.cshtml
@@ -1,8 +1,9 @@
@model IEnumerable<AddCon_TravellingSalesman.Models.SalesmanModel>
-<ul data-role="listview" data-inset="true">
+<ul data-role="listview" data-inset="true" class="simpleList">
@foreach (var item in Model) {
- <li>@Html.ActionLink(@item.EMail, "Details", new { id=item.ID })</li>
+ <li>@Html.ActionLink(@item.EMail, "Details", new { id=item.ID }, htmlAttributes: new{ data_role="button" })</li>
+ @*<li><button formaction='@Url.Action("Details",new { id=item.ID })' type="button">@item.EMail</button></li>*@
}
</ul>
View
4 AddCon_TravellingSalesman/Views/Shared/_Layout.cshtml
@@ -1,12 +1,14 @@
<!DOCTYPE html>
<html lang="en">
<head>
- <meta charset="utf-8" />
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>@ViewBag.Title</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+ <link rel="stylesheet" type="text/css" media="all" href="../../all.css" />
@*<link href="~/Content/ts.css" rel="stylesheet" type="text/css" />*@
@Styles.Render("~/Content/mobileCss", "~/Content/css")
+ @*@Styles.Render("~/Content/oocss")*@
@Styles.Render("~/Content/app")
@Scripts.Render("~/bundles/jquery")
@Scripts.Render("~/bundles/geo")
View
BIN  AddCon_TravellingSalesman/bin/AddCon_TravellingSalesman.dll
Binary file not shown
View
BIN  AddCon_TravellingSalesman/bin/AddCon_TravellingSalesman.pdb
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.