From 57ef04276cbd44ad6d2c8406b3079a659d2cabc7 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Wed, 17 Oct 2012 14:11:13 -0700 Subject: [PATCH] Fixing Date Time field spacing in view and tests --HG-- branch : 1.x extra : rebase_source : 40a3aa5bdcbbf68e2d3d9b32b0b9c42d756fb5cc --- src/Orchard.Web/Modules/Orchard.Fields/Specs/DateTime.feature | 2 +- .../Modules/Orchard.Fields/Specs/DateTime.feature.cs | 4 ++-- .../Modules/Orchard.Fields/Views/Fields/DateTime.cshtml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Specs/DateTime.feature b/src/Orchard.Web/Modules/Orchard.Fields/Specs/DateTime.feature index 238954842..2a05100b3 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Specs/DateTime.feature +++ b/src/Orchard.Web/Modules/Orchard.Fields/Specs/DateTime.feature @@ -55,7 +55,7 @@ Scenario: Creating and using Date fields Then I should see "Your Event has been created." When I go to "Admin/Contents/List" Then I should see "Date of the event:" - And I should see "1/31/2012 12:00" + And I should see "1/31/2012 12:00" # The hint should be displayed When I go to "Admin/ContentTypes/Edit/Event" diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Specs/DateTime.feature.cs b/src/Orchard.Web/Modules/Orchard.Fields/Specs/DateTime.feature.cs index 9c6506387..8c64f326f 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Specs/DateTime.feature.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Specs/DateTime.feature.cs @@ -3,7 +3,7 @@ // This code was generated by SpecFlow (http://www.specflow.org/). // SpecFlow Version:1.9.0.77 // SpecFlow Generator Version:1.9.0.0 -// Runtime Version:4.0.30319.17929 +// Runtime Version:4.0.30319.18010 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -178,7 +178,7 @@ this.ScenarioSetup(scenarioInfo); #line 57 testRunner.Then("I should see \"Date of the event:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); #line 58 - testRunner.And("I should see \"1/31/2012 12:00\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I should see \"1/31/2012 12:00\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 61 testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Views/Fields/DateTime.cshtml b/src/Orchard.Web/Modules/Orchard.Fields/Views/Fields/DateTime.cshtml index 693e1efcf..2d858ea3e 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Views/Fields/DateTime.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Fields/Views/Fields/DateTime.cshtml @@ -5,5 +5,5 @@ }

@name.CamelFriendly(): - @if (Model.Model.ShowDate) { @Model.Model.Date } @if (Model.Model.ShowTime) { @Model.Model.Time } + @if (Model.Model.ShowDate) {@Model.Model.Date} @if (Model.Model.ShowTime) {@Model.Model.Time}