lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixing Date Time field spacing in view and tests

Browse Source 
--HG--
branch : 1.x
extra : rebase_source : 40a3aa5bdcbbf68e2d3d9b32b0b9c42d756fb5cc
This commit is contained in:
Sebastien Ros
2012-10-17 14:11:13 -07:00
parent 514c9a8881
commit 57ef04276c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Fields/Specs/DateTime.feature
View File

@@ -55,7 +55,7 @@ Scenario: Creating and using Date fields
Then I should see "Your Event has been created." Then I should see "Your Event has been created."
When I go to "Admin/Contents/List" When I go to "Admin/Contents/List"
Then I should see "Date of the event:" 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 # The hint should be displayed
When I go to "Admin/ContentTypes/Edit/Event" When I go to "Admin/ContentTypes/Edit/Event"

4
src/Orchard.Web/Modules/Orchard.Fields/Specs/DateTime.feature.cs generated
View File

@@ -3,7 +3,7 @@
// This code was generated by SpecFlow (http://www.specflow.org/). // This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.9.0.77 // SpecFlow Version:1.9.0.77
// SpecFlow Generator Version:1.9.0.0 // 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 // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -178,7 +178,7 @@ this.ScenarioSetup(scenarioInfo);
#line 57 #line 57
testRunner.Then("I should see \"Date of the event:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); testRunner.Then("I should see \"Date of the event:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 58 #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 #line 61
testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden #line hidden

2
src/Orchard.Web/Modules/Orchard.Fields/Views/Fields/DateTime.cshtml
View File

@@ -5,5 +5,5 @@
} }
<p class="date-time-field date-time-field-@name.HtmlClassify()"> <p class="date-time-field date-time-field-@name.HtmlClassify()">
<span class="name">@name.CamelFriendly():</span> <span class="name">@name.CamelFriendly():</span>
<span class="value">@if (Model.Model.ShowDate) { <text>@Model.Model.Date</text> } @if (Model.Model.ShowTime) { <text>@Model.Model.Time</text> }</span> <span class="value">@if (Model.Model.ShowDate) {<text>@Model.Model.Date</text>} @if (Model.Model.ShowTime) {<text>@Model.Model.Time</text>}</span>
</p> </p>