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

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-07-22 22:12:03 -07:00
parent b46a2944ae 62b479a07a
commit b1e38c6785
27 changed files with 4120 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4826
src/Orchard.Web/Core/App_Data/Localization/fr/orchard.core.po
View File

File diff suppressed because it is too large Load Diff

6
src/Orchard.Web/Core/Localization/Styles/admin.css
View File

@@ -26,6 +26,12 @@
.culture-selection fieldset {
padding-top:0;
}
.culture-selection label {
padding-top:0;
display: inline;
}
.culture-selection div {
font-size:1.4em;
}

9
src/Orchard.Web/Core/Localization/Styles/base.css
View File

@@ -16,15 +16,22 @@
.content-localization .content-localizations>* {
display:inline;
}
/*
Removing the commas put in by the system by default and various other styling elements and putting the responsibility into the themes. [mibach]
.content-localization .content-localizations li {
border-bottom:0;
display:inline;
margin-left:.5em;
padding:0;
}
.content-localization .content-localizations li::after {
content:", ";
}
.content-localization .content-localizations li:last-child::after {
content:"";
}
}
*/

2
src/Orchard.Web/Core/Localization/Views/CultureSelection.ascx
View File

@@ -1,5 +1,5 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.Localization.ViewModels.AddLocalizationViewModel>" %>
<fieldset class="localization culture-selection">
<label for="SelectedCulture"><%:T("Translating to") %></label>
<label for="SelectedCulture"><%:T("Culture ") %></label>
<%:Html.DropDownList("SelectedCulture", new SelectList(Model.SiteCultures, Model.SelectedCulture)) %>
</fieldset>

16
src/Orchard.Web/Modules/Orchard.Sandbox/Controllers/PageController.cs
View File

@@ -22,7 +22,7 @@ namespace Orchard.Sandbox.Controllers {
public ActionResult Index() {
var model = new PageIndexViewModel {
Pages = Services.ContentManager.Query<SandboxPage, SandboxPageRecord>()
Pages = Services.ContentManager.Query<SandboxPagePart, SandboxPagePartRecord>()
.OrderBy(x => x.Name)
.List()
.Select(x => Services.ContentManager.BuildDisplayModel(x, "SummaryList"))
@@ -32,12 +32,12 @@ namespace Orchard.Sandbox.Controllers {
public ActionResult Show(int id) {
return View(new PageShowViewModel {
Page = Services.ContentManager.BuildDisplayModel<SandboxPage>(id, "Detail")
Page = Services.ContentManager.BuildDisplayModel<SandboxPagePart>(id, "Detail")
});
}
public ActionResult Create() {
var settings = CurrentSite.Get<ContentPart<SandboxSettingsRecord>>();
var settings = CurrentSite.Get<ContentPart<SandboxSettingsPartRecord>>();
if (settings.Record.AllowAnonymousEdits == false && CurrentUser == null) {
Services.Notifier.Error(T("Anonymous users can not create pages"));
return RedirectToAction("index");
@@ -49,13 +49,13 @@ namespace Orchard.Sandbox.Controllers {
[HttpPost]
public ActionResult Create(PageCreateViewModel model) {
var settings = CurrentSite.Get<ContentPart<SandboxSettingsRecord>>();
var settings = CurrentSite.Get<ContentPart<SandboxSettingsPartRecord>>();
if (settings.Record.AllowAnonymousEdits == false && CurrentUser == null) {
Services.Notifier.Error(T("Anonymous users can not create pages"));
return RedirectToAction("index");
}
var page = Services.ContentManager.Create<SandboxPage>(SandboxPageDriver.ContentType.Name, item => {
var page = Services.ContentManager.Create<SandboxPagePart>(SandboxPagePartDriver.ContentType.Name, item => {
item.Record.Name = model.Name;
});
return RedirectToAction("show", new { page.ContentItem.Id });
@@ -67,7 +67,7 @@ namespace Orchard.Sandbox.Controllers {
return RedirectToAction("show", new { id });
}
var latest = Services.ContentManager.GetLatest<SandboxPage>(id);
var latest = Services.ContentManager.GetLatest<SandboxPagePart>(id);
return View(new PageEditViewModel {
Page = Services.ContentManager.BuildEditorModel(latest)
});
@@ -78,7 +78,7 @@ namespace Orchard.Sandbox.Controllers {
if (IsEditAllowed() == false) {
return RedirectToAction("show", new { id });
}
var latest = Services.ContentManager.GetDraftRequired<SandboxPage>(id);
var latest = Services.ContentManager.GetDraftRequired<SandboxPagePart>(id);
var model = new PageEditViewModel {
Page = Services.ContentManager.UpdateEditorModel(latest, this)
};
@@ -91,7 +91,7 @@ namespace Orchard.Sandbox.Controllers {
}
bool IsEditAllowed() {
var settings = CurrentSite.Get<ContentPart<SandboxSettingsRecord>>();
var settings = CurrentSite.Get<ContentPart<SandboxSettingsPartRecord>>();
if (settings.Record.AllowAnonymousEdits == false && CurrentUser == null) {
Services.Notifier.Error(T("Anonymous users can not edit pages"));
return false;

6
src/Orchard.Web/Modules/Orchard.Sandbox/DataMigrations/SandBoxDataMigration.cs
View File

@@ -5,12 +5,12 @@ namespace Orchard.Sandbox.DataMigrations {
public class SandboxDataMigration : DataMigrationImpl {
public int Create() {
SchemaBuilder.CreateTable("SandboxPageRecord", table => table
SchemaBuilder.CreateTable("SandboxPagePartRecord", table => table
.ContentPartRecord()
.Column<string>("Name")
);
SchemaBuilder.CreateTable("SandboxSettingsRecord", table => table
SchemaBuilder.CreateTable("SandboxSettingsPartRecord", table => table
.ContentPartRecord()
.Column<bool>("AllowAnonymousEdits")
);
@@ -22,7 +22,7 @@ namespace Orchard.Sandbox.DataMigrations {
ContentDefinitionManager.AlterTypeDefinition("SandboxPage",
cfg => cfg
.WithPart("SandboxPage")
.WithPart("SandboxPagePart")
.WithPart("CommonPart")
.WithPart("IsRoutable")
.WithPart("BodyPart")

14
src/Orchard.Web/Modules/Orchard.Sandbox/Drivers/SandboxPageDriver.cs → src/Orchard.Web/Modules/Orchard.Sandbox/Drivers/SandboxPagePartDriver.cs
View File

@@ -8,7 +8,7 @@ using Orchard.Sandbox.Models;
namespace Orchard.Sandbox.Drivers {
[UsedImplicitly]
public class SandboxPageDriver : ContentItemDriver<SandboxPage> {
public class SandboxPagePartDriver : ContentItemDriver<SandboxPagePart> {
public readonly static ContentType ContentType = new ContentType {
Name = "SandboxPage",
DisplayName = "Sandbox Page"
@@ -17,11 +17,11 @@ namespace Orchard.Sandbox.Drivers {
protected override ContentType GetContentType() {
return ContentType;
}
protected override string GetDisplayText(SandboxPage item) {
protected override string GetDisplayText(SandboxPagePart item) {
return item.Record.Name;
}
public override RouteValueDictionary GetDisplayRouteValues(SandboxPage item) {
public override RouteValueDictionary GetDisplayRouteValues(SandboxPagePart item) {
return new RouteValueDictionary(
new {
area = "Orchard.Sandbox",
@@ -31,7 +31,7 @@ namespace Orchard.Sandbox.Drivers {
});
}
public override RouteValueDictionary GetEditorRouteValues(SandboxPage item) {
public override RouteValueDictionary GetEditorRouteValues(SandboxPagePart item) {
return new RouteValueDictionary(
new {
area = "Orchard.Sandbox",
@@ -41,17 +41,17 @@ namespace Orchard.Sandbox.Drivers {
});
}
protected override DriverResult Display(SandboxPage part, string displayType) {
protected override DriverResult Display(SandboxPagePart part, string displayType) {
return Combined(
ContentItemTemplate("Items/Sandbox.Page").LongestMatch(displayType, "Summary"),
ContentPartTemplate(part, "Parts/Sandbox.Page.Title").Location("title"));
}
protected override DriverResult Editor(ContentItemViewModel<SandboxPage> model) {
protected override DriverResult Editor(ContentItemViewModel<SandboxPagePart> model) {
return ContentItemTemplate("Items/Sandbox.Page");
}
protected override DriverResult Editor(ContentItemViewModel<SandboxPage> model, IUpdateModel updater) {
protected override DriverResult Editor(ContentItemViewModel<SandboxPagePart> model, IUpdateModel updater) {
updater.TryUpdateModel(model, Prefix, null, null);
return ContentItemTemplate("Items/Sandbox.Page");
}

8
src/Orchard.Web/Modules/Orchard.Sandbox/Handlers/SandboxContentHandler.cs → src/Orchard.Web/Modules/Orchard.Sandbox/Handlers/SandboxPagePartHandler.cs
View File

@@ -6,15 +6,15 @@ using Orchard.Sandbox.Models;
namespace Orchard.Sandbox.Handlers {
[UsedImplicitly]
public class SandboxContentHandler : ContentHandler {
public SandboxContentHandler(IRepository<SandboxPageRecord> pageRepository, IRepository<SandboxSettingsRecord> settingsRepository) {
public class SandboxPagePartHandler : ContentHandler {
public SandboxPagePartHandler(IRepository<SandboxPagePartRecord> pageRepository, IRepository<SandboxSettingsPartRecord> settingsRepository) {
// define the "SandboxPage" content type
Filters.Add(StorageFilter.For(pageRepository) );
// add settings to site, and simple record-template gui
Filters.Add(new ActivatingFilter<ContentPart<SandboxSettingsRecord>>("Site"));
Filters.Add(new ActivatingFilter<ContentPart<SandboxSettingsPartRecord>>("Site"));
Filters.Add(StorageFilter.For(settingsRepository));
Filters.Add(new TemplateFilterForRecord<SandboxSettingsRecord>("SandboxSettings", "Parts/Sandbox.SiteSettings"));
Filters.Add(new TemplateFilterForRecord<SandboxSettingsPartRecord>("SandboxSettings", "Parts/Sandbox.SiteSettings"));
}
}
}

6
src/Orchard.Web/Modules/Orchard.Sandbox/Models/SandboxPage.cs
View File

@@ -1,6 +0,0 @@
using Orchard.ContentManagement;
namespace Orchard.Sandbox.Models {
public class SandboxPage : ContentPart<SandboxPageRecord> {
}
}

6
src/Orchard.Web/Modules/Orchard.Sandbox/Models/SandboxPagePart.cs Normal file
View File

@@ -0,0 +1,6 @@
using Orchard.ContentManagement;
namespace Orchard.Sandbox.Models {
public class SandboxPagePart : ContentPart<SandboxPagePartRecord> {
}
}

2
src/Orchard.Web/Modules/Orchard.Sandbox/Models/SandboxPageRecord.cs → src/Orchard.Web/Modules/Orchard.Sandbox/Models/SandboxPagePartRecord.cs
View File

@@ -1,7 +1,7 @@
using Orchard.ContentManagement.Records;
namespace Orchard.Sandbox.Models {
public class SandboxPageRecord : ContentPartRecord {
public class SandboxPagePartRecord : ContentPartRecord {
public virtual string Name { get; set; }
}
}

2
src/Orchard.Web/Modules/Orchard.Sandbox/Models/SandboxSettingsRecord.cs → src/Orchard.Web/Modules/Orchard.Sandbox/Models/SandboxSettingsPartRecord.cs
View File

@@ -1,7 +1,7 @@
using Orchard.ContentManagement.Records;
namespace Orchard.Sandbox.Models {
public class SandboxSettingsRecord : ContentPartRecord {
public class SandboxSettingsPartRecord : ContentPartRecord {
public virtual bool AllowAnonymousEdits { get; set; }
}
}

10
src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj
View File

@@ -68,11 +68,11 @@
<Compile Include="Controllers\HomeController.cs" />
<Compile Include="Controllers\PageController.cs" />
<Compile Include="DataMigrations\SandBoxDataMigration.cs" />
<Compile Include="Drivers\SandboxPageDriver.cs" />
<Compile Include="Models\SandboxPage.cs" />
<Compile Include="Handlers\SandboxContentHandler.cs" />
<Compile Include="Models\SandboxPageRecord.cs" />
<Compile Include="Models\SandboxSettingsRecord.cs" />
<Compile Include="Drivers\SandboxPagePartDriver.cs" />
<Compile Include="Models\SandboxPagePart.cs" />
<Compile Include="Handlers\SandboxPagePartHandler.cs" />
<Compile Include="Models\SandboxPagePartRecord.cs" />
<Compile Include="Models\SandboxSettingsPartRecord.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ViewModels\PageEditViewModel.cs" />
<Compile Include="ViewModels\PageCreateViewModel.cs" />

2
src/Orchard.Web/Modules/Orchard.Sandbox/ViewModels/PageEditViewModel.cs
View File

@@ -5,6 +5,6 @@ using Orchard.Sandbox.Models;
namespace Orchard.Sandbox.ViewModels {
public class PageEditViewModel : BaseViewModel {
public ContentItemViewModel<SandboxPage> Page { get; set; }
public ContentItemViewModel<SandboxPagePart> Page { get; set; }
}
}

2
src/Orchard.Web/Modules/Orchard.Sandbox/ViewModels/PageIndexViewModel.cs
View File

@@ -4,6 +4,6 @@ using Orchard.Sandbox.Models;
namespace Orchard.Sandbox.ViewModels {
public class PageIndexViewModel : BaseViewModel {
public IEnumerable<ContentItemViewModel<SandboxPage>> Pages { get; set; }
public IEnumerable<ContentItemViewModel<SandboxPagePart>> Pages { get; set; }
}
}

2
src/Orchard.Web/Modules/Orchard.Sandbox/ViewModels/PageShowViewModel.cs
View File

@@ -3,6 +3,6 @@ using Orchard.Sandbox.Models;
namespace Orchard.Sandbox.ViewModels {
public class PageShowViewModel : BaseViewModel {
public ContentItemViewModel<SandboxPage> Page { get; set; }
public ContentItemViewModel<SandboxPagePart> Page { get; set; }
}
}

2
src/Orchard.Web/Modules/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.Summary.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<SandboxPage>>" %>
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<SandboxPagePart>>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<%@ Import Namespace="Orchard.Sandbox.Models" %>
<div class="item">

2
src/Orchard.Web/Modules/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<SandboxPage>>" %>
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<SandboxPagePart>>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<%@ Import Namespace="Orchard.Sandbox.Models" %>
<div class="item">

2
src/Orchard.Web/Modules/Orchard.Sandbox/Views/EditorTemplates/Items/Sandbox.Page.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ContentItemViewModel<SandboxPage>>" %>
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ContentItemViewModel<SandboxPagePart>>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<%@ Import Namespace="Orchard.Sandbox.Models"%>
<fieldset>

2
src/Orchard.Web/Modules/Orchard.Sandbox/Views/EditorTemplates/Parts/Sandbox.SiteSettings.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SandboxSettingsRecord>" %>
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SandboxSettingsPartRecord>" %>
<%@ Import Namespace="Orchard.Sandbox.Models"%>
<fieldset>
<legend>Sandbox</legend>

1
src/Orchard.Web/Orchard.Web.csproj
View File

@@ -99,6 +99,7 @@
<Content Include="Default.aspx" />
<Content Include="Global.asax" />
<Content Include="Refresh.html" />
<Content Include="Themes\Contoso\Views\DisplayTemplates\Items\Contents.Item.ascx" />
<Content Include="Themes\TheAdmin\Scripts\admin.js" />
<Content Include="Themes\TheAdmin\Styles\ie.css" />
<Content Include="Themes\TheAdmin\Styles\images\menuClosed.gif" />

29
src/Orchard.Web/Themes/Classic/Styles/site.css
View File

@@ -313,6 +313,35 @@ span.message {
content:"DEBUG » ";
}
/* Localization
-------------------------------------------------------------- */
.content-localization .content-localizations ul {
overflow: auto;
}
.content-localization .content-localizations li {
border-bottom: 1px;
float: left;
margin-left:.5em;
padding: 3px;
border: 1px solid #CCC;
}
.content-localization .content-localizations li:hover {
background-color: #ebebeb;
}
.content-localization .content-localizations li a {
text-decoration: none;
}
.content-localization .content-localizations li a:hover, .content-localization .content-localizations li a:visited {
text-decoration: none;
}
/* Misc classes
-------------------------------------------------------------- */

31
src/Orchard.Web/Themes/ClassicDark/Styles/site.css
View File

@@ -333,4 +333,33 @@ span.message {
/* ---------- Hide the edit link for blogs hack ---------- */
.manage {
display:none;
}
}
/* Localization
-------------------------------------------------------------- */
.content-localization .content-localizations ul {
overflow: auto;
}
.content-localization .content-localizations li {
border-bottom: 1px;
float: left;
margin-left:.5em;
padding: 3px;
border: 1px solid #CCC;
}
.content-localization .content-localizations li:hover {
background-color: #ebebeb;
}
.content-localization .content-localizations li a {
text-decoration: none;
}
.content-localization .content-localizations li a:hover, .content-localization .content-localizations li a:visited {
text-decoration: none;
}

30
src/Orchard.Web/Themes/Contoso/Styles/site.css
View File

@@ -372,6 +372,36 @@ body { background: #f3f4f4 url('../Content/Images/bkg.jpg') repeat-x; }
.tagCloud a:hover { display: block; float: left; padding: 3px 5px 5px 5px; background-color: #a5cc7a; color: #668b3e; text-shadow: 1px 1px 0px #c8e6a6; -moz-border-radius: 5px;
-webkit-border-radius: 5px; margin: 0px 10px 0px 0px; }
/* Localization
-------------------------------------------------------------- */
.content-localization .content-localizations ul {
overflow: auto;
}
.content-localization .content-localizations li {
border-bottom: 1px;
float: left;
margin-left:.5em;
padding: 3px;
border: 1px solid #CCC;
}
.content-localization .content-localizations li:hover {
background-color: #ebebeb;
}
.content-localization .content-localizations li a {
text-decoration: none;
}
.content-localization .content-localizations li a:hover, .content-localization .content-localizations li a:visited {
text-decoration: none;
}
/*========= PLUGINS =========*/
/*- Easy Slider -*/

6
src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Contents.Item.ascx Normal file
View File

@@ -0,0 +1,6 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels" %>
<h1 class="page-title"><%:Html.ItemDisplayText(Model.Item)%></h1>
<% Html.Zone("metadata");
Html.Zone("primary", ":manage :metadata");
Html.ZonesAny(); %>

29
src/Orchard.Web/Themes/Corporate/Styles/site.css
View File

@@ -383,6 +383,35 @@ html, body {background-color: #FFFFFF; background-image: url(../Content/Images/b
.tagCloud a:hover { display: block; float: left; padding: 3px 5px 5px 5px; background-color: #b7b7b7; color: #668b3e; text-shadow: 1px 1px 0px #c8e6a6; -moz-border-radius: 5px;
-webkit-border-radius: 5px; margin: 0px 10px 0px 0px; }
/* Localization
-------------------------------------------------------------- */
.content-localization .content-localizations ul {
overflow: auto;
}
.content-localization .content-localizations li {
border-bottom: 1px;
float: left;
margin-left:.5em;
padding: 3px;
border: 1px solid #CCC;
}
.content-localization .content-localizations li:hover {
background-color: #ebebeb;
}
.content-localization .content-localizations li a {
text-decoration: none;
}
.content-localization .content-localizations li a:hover, .content-localization .content-localizations li a:visited {
text-decoration: none;
}
/*========= PLUGINS =========*/
/*- Easy Slider -*/

30
src/Orchard.Web/Themes/Green/Styles/site.css
View File

@@ -343,6 +343,36 @@ span.message {
content:"DEBUG » ";
}
/* Localization
-------------------------------------------------------------- */
.content-localization .content-localizations ul {
overflow: auto;
}
.content-localization .content-localizations li {
border-bottom: 1px;
float: left;
margin-left:.5em;
padding: 3px;
border: 1px solid #CCC;
}
.content-localization .content-localizations li:hover {
background-color: #ebebeb;
}
.content-localization .content-localizations li a {
text-decoration: none;
}
.content-localization .content-localizations li a:hover, .content-localization .content-localizations li a:visited {
text-decoration: none;
}
/* Edit mode
----------------------------------------------------------*/
#yui-main div.managewrapper:hover, div.managewrapper:hover .manage {