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

Revert "#6140 Added NotifyType.Success and replaced most usages of NotifyType.Information with it. Added appropriate styles in css files."

Browse Source 
This reverts commit dd37d8693c.
This commit is contained in:
Szymon Seliga
2016-03-22 21:19:09 +01:00
parent dd37d8693c
commit 4cda6672f9
71 changed files with 186 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
View File

@@ -69,7 +69,7 @@ namespace Orchard.Packaging.Controllers {
return new HttpUnauthorizedResult();
_packagingSourceManager.RemoveSource(id);
Services.Notifier.Success(T("The feed has been removed successfully."));
Services.Notifier.Information(T("The feed has been removed successfully."));
return RedirectToAction("Sources");
}
@@ -115,7 +115,7 @@ namespace Orchard.Packaging.Controllers {
return View(new PackagingAddSourceViewModel { Url = url });
_packagingSourceManager.AddSource(title, url);
Services.Notifier.Success(T("The feed has been added successfully."));
Services.Notifier.Information(T("The feed has been added successfully."));
return RedirectToAction("Sources");
}

10
src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingServicesController.cs
View File

@@ -131,10 +131,10 @@ namespace Orchard.Packaging.Controllers {
PackageInfo packageInfo = _packageManager.Install(packageId, version, source.FeedUrl, MapAppRoot());
if (DefaultExtensionTypes.IsTheme(packageInfo.ExtensionType)) {
Services.Notifier.Success(T("The theme has been successfully installed. It can be enabled in the \"Themes\" page accessible from the menu."));
Services.Notifier.Information(T("The theme has been successfully installed. It can be enabled in the \"Themes\" page accessible from the menu."));
}
else if (DefaultExtensionTypes.IsModule(packageInfo.ExtensionType)) {
Services.Notifier.Success(T("The module has been successfully installed."));
Services.Notifier.Information(T("The module has been successfully installed."));
IPackageRepository packageRepository = PackageRepositoryFactory.Default.CreateRepository(new PackageSource(source.FeedUrl, "Default"));
IPackage package = packageRepository.FindPackage(packageId);
@@ -175,10 +175,10 @@ namespace Orchard.Packaging.Controllers {
System.IO.File.Delete(fullFileName);
if (DefaultExtensionTypes.IsTheme(extensionDescriptor.ExtensionType)) {
Services.Notifier.Success(T("The theme has been successfully installed. It can be enabled in the \"Themes\" page accessible from the menu."));
Services.Notifier.Information(T("The theme has been successfully installed. It can be enabled in the \"Themes\" page accessible from the menu."));
}
else if (DefaultExtensionTypes.IsModule(extensionDescriptor.ExtensionType)) {
Services.Notifier.Success(T("The module has been successfully installed."));
Services.Notifier.Information(T("The module has been successfully installed."));
return InstallPackageDetails(extensionDescriptor, redirectUrl);
}
@@ -281,7 +281,7 @@ namespace Orchard.Packaging.Controllers {
return Redirect(!String.IsNullOrEmpty(retryUrl) ? retryUrl : returnUrl);
}
Services.Notifier.Success(T("Uninstalled package \"{0}\"", id));
Services.Notifier.Information(T("Uninstalled package \"{0}\"", id));
return this.RedirectLocal(returnUrl, "~/");
}

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

@@ -270,7 +270,7 @@ namespace Orchard.Packaging.Services {
var backupFolder = new DirectoryInfo(localTempPath);
_folderUpdater.Restore(backupFolder, source);
_notifier.Success(T("Successfully restored local package to local folder \"{0}\"", source));
_notifier.Information(T("Successfully restored local package to local folder \"{0}\"", source));
return true;
}
@@ -299,7 +299,7 @@ namespace Orchard.Packaging.Services {
var backupFolder = new DirectoryInfo(localTempPath);
_folderUpdater.Backup(source, backupFolder);
_notifier.Success(T("Successfully backed up local package to local folder \"{0}\"", backupFolder));
_notifier.Information(T("Successfully backed up local package to local folder \"{0}\"", backupFolder));
return true;
}
@@ -312,7 +312,7 @@ namespace Orchard.Packaging.Services {
// package is the same version or an older version
try {
Uninstall(package.Id, _virtualPathProvider.MapPath("~\\"));
_notifier.Success(T("Successfully un-installed local package {0}", package.ExtensionId()));
_notifier.Information(T("Successfully un-installed local package {0}", package.ExtensionId()));
}
catch {}
}