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

Renaming inventory to shapetable

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2010-09-29 16:45:23 -07:00
parent b49f3b82ce
commit 9cf6dce05d
12 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Profile/Readme.txt
View File

@@ -6,7 +6,7 @@ From the base of the checkout, execute
* the ./orchard.proj creates an orchard web site at ./build/Profiling
* the ./src/Orchard.Profile/profiling-setup-commands.txt holds the additional orchard.exe steps used to initialize
* the ./src/Orchard.DevTools/Commands/ProfilingCommands.cs holds an additional handful of steps to populate items
* the ./src/Orchard.Experimental/Commands/ProfilingCommands.cs holds an additional handful of steps to populate items
The localhost:80 web server should be pointed to the ./build/Profiling folder at this point
The "admin" password is "profiling-secret" without quotes

4
src/Orchard.Profile/profiling-setup-commands.txt
View File

@@ -1,3 +1,3 @@
setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SqlCe /EnabledFeatures:Profiling,Orchard.Framework,Routable,Common,Dashboard,Feeds,PublishLater,HomePage,Contents,ContentsLocation,Navigation,Reports,Scheduling,Indexing,Settings,Localization,XmlRpc,Orchard.Users,Orchard.Roles,TinyMce,Orchard.Themes,Orchard.MultiTenancy,Orchard.Blogs,Orchard.Comments,Orchard.Modules,Orchard.Widgets,Orchard.Media,Orchard.Tags,Orchard.DevTools
setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SqlCe /EnabledFeatures:Profiling,Orchard.Framework,Routable,Common,Dashboard,Feeds,PublishLater,HomePage,Contents,ContentsLocation,Navigation,Reports,Scheduling,Indexing,Settings,Localization,XmlRpc,Orchard.Users,Orchard.Roles,TinyMce,Orchard.Themes,Orchard.MultiTenancy,Orchard.Blogs,Orchard.Comments,Orchard.Modules,Orchard.Widgets,Orchard.Media,Orchard.Tags,Orchard.Experimental
add profiling data
feature disable Orchard.DevTools
feature disable Orchard.Experimental

4
src/Orchard.Tests/DataMigration/SchemaCommandGeneratorTests.cs
View File

@@ -1,5 +1,5 @@
#if REFACTORING
#error This must move to the Modules tests to accomodateOrchard.DevTools assembly reference
#error This must move to the Modules tests to accomodateOrchard.Experimental assembly reference
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@@ -114,7 +114,7 @@ features:
}
public class StubLoaders : IExtensionLoader {
#region Implementation of IExtensionLoader
#region Implementation of IExtensionLoader
public int Order {
get { return 1; }

30
src/Orchard.Web/Core/App_Data/Localization/en-US/orchard.core.po
View File

@@ -498,77 +498,77 @@ msgstr "Allow new comments"
msgid "Enable to show the comment form. Disabling still allows the existing comments to be shown but does not allow the conversation to continue."
msgstr "Enable to show the comment form. Disabling still allows the existing comments to be shown but does not allow the conversation to continue."
#: ~/Modules/Orchard.DevTools/Controllers/HomeController.cs
#: ~/Modules/Orchard.Experimental/Controllers/HomeController.cs
#| msgid : "Notifier works without BaseViewModel"
msgid "Notifier works without BaseViewModel"
msgstr "Notifier works without BaseViewModel"
#: ~/Modules/Orchard.DevTools/Views/Content/Details.aspx
#: ~/Modules/Orchard.Experimental/Views/Content/Details.aspx
#| msgid : "{0} Content Type"
msgid "{0} Content Type"
msgstr "{0} Content Type"
#: ~/Modules/Orchard.DevTools/Views/Content/Details.aspx
#: ~/Modules/Orchard.Experimental/Views/Content/Details.aspx
#| msgid : "Content"
msgid "Content"
msgstr "Content"
#: ~/Modules/Orchard.DevTools/Views/Content/Details.aspx
#: ~/Modules/Orchard.Experimental/Views/Content/Details.aspx
#| msgid : "view"
msgid "view"
msgstr "view"
#: ~/Modules/Orchard.DevTools/Views/Content/Details.aspx
#: ~/Modules/Orchard.Experimental/Views/Content/Details.aspx
#| msgid : "edit"
msgid "edit"
msgstr "edit"
#: ~/Modules/Orchard.DevTools/Views/Content/Details.aspx
#: ~/Modules/Orchard.Experimental/Views/Content/Details.aspx
#| msgid : "{0} #{1} v{2}"
msgid "{0} #{1} v{2}"
msgstr "{0} #{1} v{2}"
#: ~/Modules/Orchard.DevTools/Views/Content/Index.aspx
#: ~/Modules/Orchard.Experimental/Views/Content/Index.aspx
#| msgid : "Content"
msgid "Content"
msgstr "Content"
#: ~/Modules/Orchard.DevTools/Views/Content/Index.aspx
#: ~/Modules/Orchard.Experimental/Views/Content/Index.aspx
#| msgid : "{0}: {1}"
msgid "{0}: {1}"
msgstr "{0}: {1}"
#: ~/Modules/Orchard.DevTools/Views/Content/Index.aspx
#: ~/Modules/Orchard.Experimental/Views/Content/Index.aspx
#| msgid : "view"
msgid "view"
msgstr "view"
#: ~/Modules/Orchard.DevTools/Views/Content/Index.aspx
#: ~/Modules/Orchard.Experimental/Views/Content/Index.aspx
#| msgid : "edit"
msgid "edit"
msgstr "edit"
#: ~/Modules/Orchard.DevTools/Views/DisplayTemplates/Parts/DevTools.ShowDebugLink.ascx
#: ~/Modules/Orchard.Experimental/Views/DisplayTemplates/Parts/Experimental.ShowDebugLink.ascx
#| msgid : "{0} #{1} v{2}"
msgid "{0} #{1} v{2}"
msgstr "{0} #{1} v{2}"
#: ~/Modules/Orchard.DevTools/Views/EditorTemplates/Parts/DevTools.ShowDebugLink.ascx
#: ~/Modules/Orchard.Experimental/Views/EditorTemplates/Parts/Experimental.ShowDebugLink.ascx
#| msgid : "{0} #{1} v{2}"
msgid "{0} #{1} v{2}"
msgstr "{0} #{1} v{2}"
#: ~/Modules/Orchard.DevTools/Views/Home/Index.aspx
#: ~/Modules/Orchard.Experimental/Views/Home/Index.aspx
#| msgid : "Dev Tools"
msgid "Dev Tools"
msgstr "Dev Tools"
#: ~/Modules/Orchard.DevTools/Views/Home/Index.aspx
#: ~/Modules/Orchard.Experimental/Views/Home/Index.aspx
#| msgid : "Contents"
msgid "Contents"
msgstr "Contents"
#: ~/Modules/Orchard.DevTools/Views/Home/Index.aspx
#: ~/Modules/Orchard.Experimental/Views/Home/Index.aspx
#| msgid : "Test Unauthorized Request"
msgid "Test Unauthorized Request"
msgstr "Test Unauthorized Request"

4
src/Orchard.Web/Modules/Orchard.Experimental/Controllers/InventoryController.cs → src/Orchard.Web/Modules/Orchard.Experimental/Controllers/ShapeTableController.cs
View File

@@ -5,10 +5,10 @@ using Orchard.UI.Admin;
namespace Orchard.Experimental.Controllers {
[Themed, Admin]
public class InventoryController : Controller {
public class ShapeTableController : Controller {
private readonly IShapeTableManager _shapeTableManager;
public InventoryController(IShapeTableManager shapeTableManager) {
public ShapeTableController(IShapeTableManager shapeTableManager) {
_shapeTableManager = shapeTableManager;
}

4
src/Orchard.Web/Modules/Orchard.Experimental/Handlers/DebugLinkHandler.cs
View File

@@ -11,8 +11,8 @@ namespace Orchard.Experimental.Handlers {
context.Model.Zones["Recap"].Add(new ShowDebugLink { ContentItem = context.ContentItem }, "9999");
}
protected override void BuildEditorShape(BuildEditorModelContext context) {
var devToolsSettings = context.ContentItem.TypeDefinition.Settings.GetModel<Settings.ExperimentalSettings>();
if (devToolsSettings.ShowDebugLinks)
var experimentalSettings = context.ContentItem.TypeDefinition.Settings.GetModel<Settings.ExperimentalSettings>();
if (experimentalSettings.ShowDebugLinks)
context.Model.Zones["Recap"].Add(new ShowDebugLink { ContentItem = context.ContentItem }, "9999");
}
}

4
src/Orchard.Web/Modules/Orchard.Experimental/Orchard.Experimental.csproj
View File

@@ -76,7 +76,7 @@
<Compile Include="Controllers\CommandsController.cs" />
<Compile Include="Controllers\ContentController.cs" />
<Compile Include="Controllers\HomeController.cs" />
<Compile Include="Controllers\InventoryController.cs" />
<Compile Include="Controllers\ShapeTableController.cs" />
<Compile Include="Controllers\MetadataController.cs" />
<Compile Include="DebugFilter.cs" />
<Compile Include="Handlers\DebugLinkHandler.cs" />
@@ -131,7 +131,7 @@
<Content Include="Views\Home\UsingShapes.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Inventory\ShapeTable.cshtml" />
<Content Include="Views\ShapeTable\ShapeTable.cshtml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

2
src/Orchard.Web/Modules/Orchard.Experimental/Views/DisplayTemplates/Parts/Experimental.ShowDebugLink.ascx
View File

@@ -1,6 +1,6 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ShowDebugLink>" %>
<%@ Import Namespace="Orchard.Experimental.Models" %>
<div class="debug message"><%=T(
"DevTools: displaying {0}",
"Experimental: displaying {0}",
Html.ActionLink(T("{0} #{1} v{2}", Model.ContentItem.ContentType, Model.ContentItem.Id, Model.ContentItem.Version).ToString(), "details", "content", new { area = "Orchard.Experimental", Model.ContentItem.Id, Model.ContentItem.Version }, new { })
) %></div>

2
src/Orchard.Web/Modules/Orchard.Experimental/Views/EditorTemplates/Parts/Experimental.ShowDebugLink.ascx
View File

@@ -2,7 +2,7 @@
<%@ Import Namespace="Orchard.Experimental.Models" %>
<% if (Model.ContentItem.Id > 0) { %>
<div class="debug message"><%=T(
"DevTools: editing {0}",
"Experimental: editing {0}",
Html.ActionLink(T("{0} #{1} v{2}", Model.ContentItem.ContentType, Model.ContentItem.Id, Model.ContentItem.Version).ToString(), "details", "content", new { area = "Orchard.Experimental", Model.ContentItem.Id, Model.ContentItem.Version }, new { })
) %></div>
<% } %>

2
src/Orchard.Web/Modules/Orchard.Experimental/Views/Inventory/ShapeTable.cshtml → src/Orchard.Web/Modules/Orchard.Experimental/Views/ShapeTable/ShapeTable.cshtml
View File

@@ -9,4 +9,4 @@
</li>
}
</ul>
</div>
</div>

1
src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
View File

@@ -92,7 +92,6 @@ namespace Orchard.Setup.Services {
"Orchard.Tags",
"Orchard.Media",
"Orchard.Widgets",
"Orchard.DevTools",
"Orchard.jQuery"
};

4
src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml
View File

@@ -107,9 +107,9 @@
<Project>{14C049FD-B35B-415A-A824-87F26B26E7FD}</Project>
<Name>Orchard.Comments</Name>
</ProjectReference>
<ProjectReference Include="Modules\Orchard.DevTools\Orchard.DevTools.csproj">
<ProjectReference Include="Modules\Orchard.Experimetnal\Orchard.Experimental.csproj">
<Project>{67C1D3AF-A0EC-46B2-BAE1-DF1DA8E0B890}</Project>
<Name>Orchard.DevTools</Name>
<Name>Orchard.Experimental</Name>
</ProjectReference>
<ProjectReference Include="Modules\Orchard.Media\Orchard.Media.csproj">
<Project>{D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB}</Project>