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

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
jowall
2010-03-01 15:57:56 -08:00
parent 3e07a70c6b 0cb9f7e2da
commit 6f46934fe0
5 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Orchard.Web/Core/Navigation/Drivers/MenuPartDriver.cs
View File

@@ -1,7 +1,9 @@
using JetBrains.Annotations;
using System;
using JetBrains.Annotations;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Drivers;
using Orchard.Core.Navigation.Models;
using Orchard.Localization;
using Orchard.Security;
using Orchard.UI.Navigation;
using Orchard.Utility;
@@ -15,9 +17,11 @@ namespace Orchard.Core.Navigation.Drivers {
public MenuPartDriver(IAuthorizationService authorizationService, INavigationManager navigationManager) {
_authorizationService = authorizationService;
_navigationManager = navigationManager;
T = NullLocalizer.Instance;
}
public virtual IUser CurrentUser { get; set; }
private Localizer T { get; set; }
protected override DriverResult Editor(MenuPart part) {
if (!_authorizationService.TryCheckAccess(Permissions.ManageMainMenu, CurrentUser, part))
@@ -34,6 +38,9 @@ namespace Orchard.Core.Navigation.Drivers {
part.MenuPosition = Position.GetNext(_navigationManager.BuildMenu("main"));
updater.TryUpdateModel(part, Prefix, null, null);
if (part.OnMainMenu && String.IsNullOrEmpty(part.MenuText)) {
updater.AddModelError("MenuText", T("The MenuText field is required"));
}
return ContentPartTemplate(part, "Parts/Navigation.EditMenuPart").Location("primary", "9");
}
}

1
src/Orchard.Web/Core/Navigation/Models/MenuPart.cs
View File

@@ -13,7 +13,6 @@ namespace Orchard.Core.Navigation.Models {
set { Record.OnMainMenu = value; }
}
[Required]
public string MenuText {
get { return Record.MenuText; }
set { Record.MenuText = value; }

BIN
src/Orchard.Web/Media/OrchardLogo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

2
src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx
View File

@@ -48,7 +48,7 @@
<tr>
<td>
<input type="checkbox" value="true" name="<%=_Encoded("Checkbox.File.{0}", mediaFile.Name) %>"/>
<input type="hidden" value="<%=_Encoded("Model.MediaPath") %>" name="<%=_Encoded("mediaFile.Name") %>" />
<input type="hidden" value="<%=_Encoded(Model.MediaPath) %>" name="<%=_Encoded(mediaFile.Name) %>" />
</td>
<td>
<%=Html.ActionLink(mediaFile.Name, "EditMedia", new { name = mediaFile.Name,

1
src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
View File

@@ -33,6 +33,7 @@ using (Html.BeginFormAntiForgeryPost()) { %>
<span>
<label for="DatabaseConnectionString"><%=_Encoded("Connection string") %></label>
<%=Html.EditorFor(svm => svm.DatabaseConnectionString)%>
<i class="hint"><%=_Encoded("Example: Data Source=sqlServerName;Initial Catalog=dbName;Persist Security Info=True;User ID=userName;Password=password") %></i>
</span>
</div>
</fieldset>