lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-23 04:43:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Changing "Themes"/"Modules" to "Theme"/"Module" as is in the extension type.

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Andre Rodrigues
2011-01-07 16:42:03 -08:00
parent bdd3727804
commit 9a729df1c2
4 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Orchard.Web/Core/Shapes/Views/User.cshtml
View File

@@ -2,14 +2,14 @@
<div class="user-display">
@if (Request.IsAuthenticated) {
<span class="user-actions welcome">
@T("Welcome, <strong>{0}</strong>!", new HtmlString(Html.ActionLink( WorkContext.CurrentUser.UserName, "ChangePassword", new { Controller = "Account", Area = "Orchard.Users" }).ToString()))
</span>
<span class="user-actions">
@Html.ActionLink(T("Sign Out").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl })
@Html.ActionLink("Dashboard", "Index", new { Area = "Dashboard", Controller = "Admin" })
</span>
<span class="user-actions welcome">
@T("Welcome, <strong>{0}</strong>!", new HtmlString(Html.ActionLink( WorkContext.CurrentUser.UserName, "ChangePassword", new { Controller = "Account", Area = "Orchard.Users" }).ToString()))
</span>
<span class="user-actions">
@Html.ActionLink(T("Sign Out").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl })
@Html.ActionLink("Dashboard", "Index", new { Area = "Dashboard", Controller = "Admin" })
</span>
} else {
<span class="user-actions">@Html.ActionLink(T("Sign In").ToString(), "LogOn", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl })</span>
<span class="user-actions">@Html.ActionLink(T("Sign In").ToString(), "LogOn", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl })</span>
}
</div>

12
src/Orchard.Web/Modules/Orchard.Packaging/Commands/PackagingCommands.cs
View File

@@ -4,7 +4,6 @@ using System.Web;
using System.Web.Hosting;
using Orchard.Commands;
using Orchard.Environment.Extensions;
using Orchard.Environment.Extensions.Models;
using Orchard.Packaging.Services;
using Orchard.UI.Notify;
@@ -28,9 +27,9 @@ namespace Orchard.Packaging.Commands {
Create a package for the extension <extensionName>
(an extension being a module or a theme).
The package will be output at the <path> specified.
The default filename is Orchard.[Modules|Themes].<extensionName>.<extensionVersion>.nupkg.
The default filename is Orchard.[Module|Theme].<extensionName>.<extensionVersion>.nupkg.
For example, ""package create SampleModule c:\temp"" will create the package
""c:\temp\Orchard.Modules.SampleModule.1.0.0.nupkg"".")]
""c:\temp\Orchard.Module.SampleModule.1.0.0.nupkg"".")]
[CommandName("package create")]
public void CreatePackage(string extensionName, string path) {
var packageData = _packageManager.Harvest(extensionName);
@@ -76,8 +75,11 @@ namespace Orchard.Packaging.Commands {
}
}
[CommandHelp(@"package uninstall <packageId>
Uninstall a module or a theme.
[CommandHelp(@"package uninstall <packageId>
Uninstall a module or a theme.
The <packageId> should take the format Orchard.[Module|Theme].<extensionName>.
For example, ""package uninstall Orchard.Module.SampleModule"" will uninstall the Module under the ""~/Modules/SampleModule"" directory and
""package uninstall Orchard.Theme.SampleTheme"" will uninstall the Theme under the ""~/Themes/SampleTheme"" directory.")]
[CommandName("package uninstall")]
public void UninstallPackage(string packageId) {
try {

10
src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageInstaller.cs
View File

@@ -93,7 +93,7 @@ namespace Orchard.Packaging.Services {
return new PackageInfo {
ExtensionName = package.Title ?? package.Id,
ExtensionVersion = package.Version.ToString(),
ExtensionType = package.Id.StartsWith(PackagingSourceManager.ThemesPrefix) ? DefaultExtensionTypes.Theme : DefaultExtensionTypes.Module,
ExtensionType = package.Id.StartsWith(PackagingSourceManager.GetExtensionPrefix(DefaultExtensionTypes.Theme)) ? DefaultExtensionTypes.Theme : DefaultExtensionTypes.Module,
ExtensionPath = applicationPath
};
}
@@ -102,10 +102,10 @@ namespace Orchard.Packaging.Services {
string solutionPath;
string extensionFullPath = string.Empty;
if (packageId.StartsWith(PackagingSourceManager.ThemesPrefix)) {
extensionFullPath = HostingEnvironment.MapPath("~/Themes/" + packageId.Substring(PackagingSourceManager.ThemesPrefix.Length));
} else if (packageId.StartsWith(PackagingSourceManager.ModulesPrefix)) {
extensionFullPath = HostingEnvironment.MapPath("~/Modules/" + packageId.Substring(PackagingSourceManager.ModulesPrefix.Length));
if (packageId.StartsWith(PackagingSourceManager.GetExtensionPrefix(DefaultExtensionTypes.Theme))) {
extensionFullPath = HostingEnvironment.MapPath("~/Themes/" + packageId.Substring(PackagingSourceManager.GetExtensionPrefix(DefaultExtensionTypes.Theme).Length));
} else if (packageId.StartsWith(PackagingSourceManager.GetExtensionPrefix(DefaultExtensionTypes.Module))) {
extensionFullPath = HostingEnvironment.MapPath("~/Modules/" + packageId.Substring(PackagingSourceManager.GetExtensionPrefix(DefaultExtensionTypes.Module).Length));
}
if (string.IsNullOrEmpty(extensionFullPath) ||

12
src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSourceManager.cs
View File

@@ -11,18 +11,8 @@ using Orchard.Packaging.Models;
namespace Orchard.Packaging.Services {
[OrchardFeature("Gallery")]
public class PackagingSourceManager : IPackagingSourceManager {
public const string ThemesPrefix = "Orchard.Themes.";
public const string ModulesPrefix = "Orchard.Modules.";
public static string GetExtensionPrefix(string extensionType) {
switch (extensionType) {
case DefaultExtensionTypes.Theme:
return ThemesPrefix;
case DefaultExtensionTypes.Module:
return ModulesPrefix;
default:
throw new ArgumentException();
}
return string.Format("Orchard.{0}.", extensionType);
}
private readonly IRepository<PackagingSource> _packagingSourceRecordRepository;