Merge

--HG--
branch : dev

src/Orchard.Web/Core/Navigation/Drivers/MenuPartDriver.cs

@@ -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");
         }
     }

src/Orchard.Web/Core/Navigation/Models/MenuPart.cs

@@ -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; }

src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx

@@ -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, 

src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx

@@ -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>