Switch to using string instead of bool for checkbox values

WebCms/Content/style.css

@@ -234,7 +234,7 @@ code, pre {
 .alert {
   position: absolute;
   left: 30%;
-  top: 10em;
+  top: 15em;
   width: 40%;
   z-index: 1; }
 

WebCms/Content/style.min.css

@@ -1 +1 @@
-html{position:relative;min-height:100%;}body{margin-bottom:60px;}body header{padding:15px 0;}body.debug header{background:repeating-linear-gradient(to right,#990,#090 10px,#333 10px,#333 20px);}body.debug header .navbar-brand{position:relative;}body.debug header .navbar-brand:before{content:"";font-family:FontAwesome;font-style:normal;font-weight:normal;text-decoration:inherit;color:#f00;font-size:60px;padding-right:.5em;position:absolute;top:10px;left:0;}h1{padding:24px 0 12px 0;}p{padding:12px 0;}i{cursor:default;}.footer{position:absolute;bottom:0;width:100%;height:60px;line-height:60px;}.row-no-padding [class*="col-"]{padding-left:0 !important;padding-right:0 !important;}.home .dark .row:first-child .column:first-child h1{padding-top:0;}.home .blogarchive{padding-top:20px;}.top-buffer{margin-top:20px;}.detail-actions>a,.detail-actions>form>button{margin-top:20px;float:left;clear:left;}.banner-link{white-space:normal;padding:20px;background:#000;background:rgba(0,0,0,.5);-moz-border-radius:10px;border-radius:10px;}.banner-link .glyphicon,.banner-link .fa{color:#8cc641;}a.banner-link:hover{text-decoration:none;background:rgba(0,0,0,.6);}a.banner-link:hover .glyphicon{color:#a8ed4f;}h1.headline{font-size:2.9em;text-align:center;text-shadow:-1px -1px 0 rgba(255,255,255,.8),1px 1px 0 rgba(0,0,0,.4),5px 5px 10px rgba(0,0,0,.4);}.headline-icon h1:after{color:rgba(172,214,118,.8);font-family:"FontAwesome";font-size:.8em;padding-left:10px;text-shadow:-1px -1px 0 rgba(255,255,255,.8),1px 1px 0 rgba(0,0,0,.4),5px 5px 10px rgba(0,0,0,.4);}.headline-icon.headline-icon-file h1:after{content:"";}.headline-icon.headline-icon-leaf h1:after{content:"";}.headline-icon.headline-icon-question h1:after{content:"";}.headline-icon.headline-icon-stats h1:after{content:"";}.headline-icon.headline-icon-user h1:after{content:"";}.headline-icon.headline-icon-list h1:after{content:"";}.status{white-space:nowrap;cursor:default;}.status:before{font-family:"FontAwesome";font-size:1em;padding-right:6px;}.status.status-pending{color:#f0ad4e;}.status.status-pending:before{content:"";}.status.status-complete{color:#337ab7;}.status.status-complete:before{content:"";}.status.status-exception{color:#a94442;}.status.status-exception:before{content:"";}.status.status-unresponsive{color:#66512c;}.status.status-unresponsive:before{content:"";}.status.status-running,.status.status-starting,.status.status-finishing{color:#3c763d;}.status.status-running:before{content:"";}.status.status-starting:before{content:"";}.status.status-finishing:before{content:"";}.status.status-cancelpending:before,.status.status-cancelling:before{content:"";}.status.status-cancelled{color:#ec971f;}.status.status-cancelled:before{content:"";}#chart{padding-top:20px;}.btn-file{position:relative;overflow:hidden;}.btn-file input[type=file]{position:absolute;top:0;right:0;min-width:100%;min-height:100%;font-size:100px;text-align:right;filter:alpha(opacity=0);opacity:0;outline:none;background:#fff;cursor:inherit;display:block;}form .validation-summary-errors ul{list-style-type:none;}form .validation-summary-errors ul li{color:#dc3545;}.autocomplete-suggestions{border:1px solid #999;background:#fff;overflow:auto;}.autocomplete-suggestion{padding:2px 5px;white-space:nowrap;overflow:hidden;}.autocomplete-selected{background:#f0f0f0;}.autocomplete-suggestions strong{font-weight:normal;color:#39f;}.autocomplete-group{padding:2px 5px;}.autocomplete-group strong{display:block;border-bottom:1px solid #000;}.toggle{width:15px;}.dropdown-menu li form .btn-link{display:block;color:#333;clear:both;float:left;font-size:1rem;font-weight:normal;line-height:1.42857;min-width:160px;padding:3px 20px;text-align:left;white-space:nowrap;}.dropdown-menu li form .btn-link:focus,.dropdown-menu li form .btn-link:hover{text-decoration:none;color:#262626;background-color:#f5f5f5;}.divider-right{border-right:1px dashed #333;}.read{overflow:hidden;font-size:16px !important;transition:all .3s;margin-bottom:10px;}.read-less{height:90px !important;}code,pre{line-height:1;}.alert{position:absolute;left:30%;top:10em;width:40%;z-index:1;}.copyright{font-size:.8em;color:#777 !important;cursor:default;}.withshadow{text-shadow:2px 2px 4px #000;}.files td{vertical-align:middle;}
+html{position:relative;min-height:100%;}body{margin-bottom:60px;}body header{padding:15px 0;}body.debug header{background:repeating-linear-gradient(to right,#990,#090 10px,#333 10px,#333 20px);}body.debug header .navbar-brand{position:relative;}body.debug header .navbar-brand:before{content:"";font-family:FontAwesome;font-style:normal;font-weight:normal;text-decoration:inherit;color:#f00;font-size:60px;padding-right:.5em;position:absolute;top:10px;left:0;}h1{padding:24px 0 12px 0;}p{padding:12px 0;}i{cursor:default;}.footer{position:absolute;bottom:0;width:100%;height:60px;line-height:60px;}.row-no-padding [class*="col-"]{padding-left:0 !important;padding-right:0 !important;}.home .dark .row:first-child .column:first-child h1{padding-top:0;}.home .blogarchive{padding-top:20px;}.top-buffer{margin-top:20px;}.detail-actions>a,.detail-actions>form>button{margin-top:20px;float:left;clear:left;}.banner-link{white-space:normal;padding:20px;background:#000;background:rgba(0,0,0,.5);-moz-border-radius:10px;border-radius:10px;}.banner-link .glyphicon,.banner-link .fa{color:#8cc641;}a.banner-link:hover{text-decoration:none;background:rgba(0,0,0,.6);}a.banner-link:hover .glyphicon{color:#a8ed4f;}h1.headline{font-size:2.9em;text-align:center;text-shadow:-1px -1px 0 rgba(255,255,255,.8),1px 1px 0 rgba(0,0,0,.4),5px 5px 10px rgba(0,0,0,.4);}.headline-icon h1:after{color:rgba(172,214,118,.8);font-family:"FontAwesome";font-size:.8em;padding-left:10px;text-shadow:-1px -1px 0 rgba(255,255,255,.8),1px 1px 0 rgba(0,0,0,.4),5px 5px 10px rgba(0,0,0,.4);}.headline-icon.headline-icon-file h1:after{content:"";}.headline-icon.headline-icon-leaf h1:after{content:"";}.headline-icon.headline-icon-question h1:after{content:"";}.headline-icon.headline-icon-stats h1:after{content:"";}.headline-icon.headline-icon-user h1:after{content:"";}.headline-icon.headline-icon-list h1:after{content:"";}.status{white-space:nowrap;cursor:default;}.status:before{font-family:"FontAwesome";font-size:1em;padding-right:6px;}.status.status-pending{color:#f0ad4e;}.status.status-pending:before{content:"";}.status.status-complete{color:#337ab7;}.status.status-complete:before{content:"";}.status.status-exception{color:#a94442;}.status.status-exception:before{content:"";}.status.status-unresponsive{color:#66512c;}.status.status-unresponsive:before{content:"";}.status.status-running,.status.status-starting,.status.status-finishing{color:#3c763d;}.status.status-running:before{content:"";}.status.status-starting:before{content:"";}.status.status-finishing:before{content:"";}.status.status-cancelpending:before,.status.status-cancelling:before{content:"";}.status.status-cancelled{color:#ec971f;}.status.status-cancelled:before{content:"";}#chart{padding-top:20px;}.btn-file{position:relative;overflow:hidden;}.btn-file input[type=file]{position:absolute;top:0;right:0;min-width:100%;min-height:100%;font-size:100px;text-align:right;filter:alpha(opacity=0);opacity:0;outline:none;background:#fff;cursor:inherit;display:block;}form .validation-summary-errors ul{list-style-type:none;}form .validation-summary-errors ul li{color:#dc3545;}.autocomplete-suggestions{border:1px solid #999;background:#fff;overflow:auto;}.autocomplete-suggestion{padding:2px 5px;white-space:nowrap;overflow:hidden;}.autocomplete-selected{background:#f0f0f0;}.autocomplete-suggestions strong{font-weight:normal;color:#39f;}.autocomplete-group{padding:2px 5px;}.autocomplete-group strong{display:block;border-bottom:1px solid #000;}.toggle{width:15px;}.dropdown-menu li form .btn-link{display:block;color:#333;clear:both;float:left;font-size:1rem;font-weight:normal;line-height:1.42857;min-width:160px;padding:3px 20px;text-align:left;white-space:nowrap;}.dropdown-menu li form .btn-link:focus,.dropdown-menu li form .btn-link:hover{text-decoration:none;color:#262626;background-color:#f5f5f5;}.divider-right{border-right:1px dashed #333;}.read{overflow:hidden;font-size:16px !important;transition:all .3s;margin-bottom:10px;}.read-less{height:90px !important;}code,pre{line-height:1;}.alert{position:absolute;left:30%;top:15em;width:40%;z-index:1;}.copyright{font-size:.8em;color:#777 !important;cursor:default;}.withshadow{text-shadow:2px 2px 4px #000;}.files td{vertical-align:middle;}

WebCms/Content/style.scss

@@ -314,7 +314,7 @@ code,pre {
 .alert {
     position: absolute;
     left: 30%;
-    top: 10em;
+    top: 15em;
     width: 40%;
     z-index:1;
 }

WebCms/Controllers/ResultsController.cs

@@ -13,7 +13,7 @@ namespace LeafWeb.WebCms.Controllers
         public ActionResult Index(LeafDataQuery model)
         {
             if (!model.HasParameters && !TempData.ContainsKey("Posted"))
-                model.usr = true;
+                model.usr = "on";
 
             var resultItems =
                 DataService.GetLeafInputsOrdered();

WebCms/Models/LeafDataQuery.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 
 namespace LeafWeb.WebCms.Models
 {
@@ -57,10 +58,17 @@ namespace LeafWeb.WebCms.Models
         public string phips2 { get; set; }
 
         [Display(Name = "Show Only Successfully Completed")]
-        public bool? compl { get; set; }
+        [UIHint("Checkbox")]
+        public string compl { get; set; }
+
+        public bool ShowOnlySuccessfullyCompleted => !string.IsNullOrEmpty(compl);
 
         [Display(Name = "Only my data")]
-        public bool? usr { get; set; }
+        [UIHint("Checkbox")]
+        public string usr { get; set; }
+
+        public bool OnlyUserData => !string.IsNullOrEmpty(usr);
+
 
         public bool HasExtendedParameters =>
             !(
@@ -74,12 +82,12 @@ namespace LeafWeb.WebCms.Models
                 && string.IsNullOrEmpty(pari)
                 && string.IsNullOrEmpty(tleaf)
                 && string.IsNullOrEmpty(phips2)
-                && !(compl.HasValue && compl.Value)
+                && string.IsNullOrEmpty(compl)
             );
 
         public bool HasParameters =>
             HasExtendedParameters 
             || !string.IsNullOrEmpty(q) 
-            || usr.HasValue && usr.Value;
+            || !string.IsNullOrEmpty(usr);
     }
 }

WebCms/Utility/QueryFilter.cs

@@ -143,7 +143,7 @@ namespace LeafWeb.WebCms.Utility
                     select li;
             }
 
-            if (query.compl.HasValue && query.compl.Value)
+            if (query.ShowOnlySuccessfullyCompleted)
             {
                 resultItems =
                     from li in resultItems
@@ -154,7 +154,7 @@ namespace LeafWeb.WebCms.Utility
                     select li;
             }
 
-            if (query.usr.HasValue && query.usr.Value && !string.IsNullOrEmpty(currentUserEmail))
+            if (query.OnlyUserData && !string.IsNullOrEmpty(currentUserEmail))
             {
                 resultItems =
                     from li in resultItems

WebCms/Views/Shared/Boolean.cshtml

@@ -0,0 +1,22 @@
+@model Boolean?
+
+@{
+    Layout = "_FieldLayout.cshtml";
+
+    var htmlAttributes = new RouteValueDictionary();
+    if (ViewBag.@class != null)
+    {
+        htmlAttributes.Add("class", ViewBag.@class);
+    }
+}
+
+@if (Model.HasValue && Model.Value)
+{
+    <input id="@ViewData.TemplateInfo.GetFullHtmlFieldId("")" name="@ViewData.TemplateInfo.GetFullHtmlFieldId("")"
+           type="checkbox" checked="checked" />
+}
+else
+{
+    <input id="@ViewData.TemplateInfo.GetFullHtmlFieldId("")" name="@ViewData.TemplateInfo.GetFullHtmlFieldId("")"
+           type="checkbox" />
+}

WebCms/Views/Shared/EditorTemplates/Checkbox.cshtml

@@ -0,0 +1,15 @@
+@model string
+@{
+    Layout = "_FieldLayout.cshtml";
+
+    var htmlAttributes = new RouteValueDictionary();
+    if (ViewBag.@class != null)
+    {
+        htmlAttributes.Add("class", ViewBag.@class);
+    }
+
+    var isChecked = !string.IsNullOrEmpty(Model);
+    var id = ViewData.TemplateInfo.GetFullHtmlFieldId("");
+}
+
+<input id="@id" name="@id" type="checkbox" @if(isChecked) {<text>checked="checked"</text>} />

WebCms/Views/Shared/_StatusMessage.cshtml

@@ -1,14 +1,14 @@
 @if (TempData.ContainsKey("StatusMessage"))
 {
-    <p class="alert @Html.Raw(TempData["StatusMessage-Type"]) alert-dismissible fade show">
+    <div class="alert @Html.Raw(TempData["StatusMessage-Type"]) alert-dismissible fade show">
         <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         @Html.Raw(TempData["StatusMessage"])
-    </p>
+    </div>
 }
 else if (ViewBag.StatusMessage != null)
 {
-    <p class="alert alert-dismissible fade show">
+    <div class="alert alert-dismissible fade show">
         <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         @ViewBag.StatusMessage
-    </p>
+    </div>
 }

WebCms/WebCms.csproj

@@ -1075,6 +1075,8 @@
     <Content Include="Views\Shared\DisplayTemplates\_Details_ResultsLink.cshtml" />
     <Content Include="Views\Results\Details.cshtml" />
     <Content Include="Views\MacroPartials\ResultsDetails.cshtml" />
+    <Content Include="Views\Shared\Boolean.cshtml" />
+    <Content Include="Views\Shared\EditorTemplates\Checkbox.cshtml" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>