Merge

--HG--
branch : 1.x

src/Orchard.Web/Core/Shapes/Views/User.cshtml

@@ -1,7 +1,7 @@
 @using System.Web.Mvc;
 
 <div class="user-display">
-    @if (Request.IsAuthenticated) {
+    @if (WorkContext.CurrentUser != null) {
         <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>

src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comments.cshtml

@@ -25,13 +25,13 @@
         </div>
     }
 }
-else if(!Request.IsAuthenticated && !AuthorizedFor(Permissions.AddComment)) {
+else if (WorkContext.CurrentUser == null && !AuthorizedFor(Permissions.AddComment)) {
 <h2 id="add-comment">@T("Add a Comment")</h2>
 <p class="info message">@T("You must {0} to comment.", Html.ActionLink(T("log on").ToString(), "LogOn", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = string.Format("{0}#addacomment", Context.Request.RawUrl) }))</p>
 } else {
 using (Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, FormMethod.Post, new { @class = "comment-form" })) { 
     @Html.ValidationSummary() 
-    if (!Request.IsAuthenticated) {
+    if (WorkContext.CurrentUser == null) {
 
     <fieldset class="who">
         <legend id="add-comment">@T("Add a Comment")</legend> 
@@ -55,7 +55,7 @@ using (Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, Fo
         @Html.Hidden("Email", WorkContext.CurrentUser.Email ?? "")
     }
 
-    <h2 id="commenter">@if (Request.IsAuthenticated) { @T("Hi, {0}!", Html.Encode(WorkContext.CurrentUser.UserName))}</h2>
+    <h2 id="commenter">@if (WorkContext.CurrentUser != null) { @T("Hi, {0}!", Html.Encode(WorkContext.CurrentUser.UserName))}</h2>
     <fieldset class="what">
     <ol>
         <li>

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

@@ -59,8 +59,8 @@
             @foreach (var mediaFile in Model.MediaFiles) {
                 <tr>
                     <td>
-                        <input type="checkbox" value="true" name="@T("Checkbox.File.{0}", mediaFile.Name)"/>
-                        <input type="hidden" value="@T(Model.MediaPath)" name="@T(mediaFile.Name)" />
+                        <input type="checkbox" value="true" name="Checkbox.File.@mediaFile.Name"/>
+                        <input type="hidden" value="@Model.MediaPath" name="@mediaFile.Name" />
                     </td>
                     <td>
                         @Html.ActionLink(mediaFile.Name, "EditMedia", new { name = mediaFile.Name, 
@@ -79,7 +79,7 @@
             @foreach (var mediaFolder in Model.MediaFolders) {
                 <tr>
                     <td>
-                        <input type="checkbox" value="true" name="@T("Checkbox.Folder.{0}", mediaFolder.Name)"/>
+                        <input type="checkbox" value="true" name="Checkbox.Folder.@mediaFolder.Name"/>
                         <input type="hidden" value="@mediaFolder.MediaPath" name="@mediaFolder.Name" />
                     </td>
                     <td>

src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.cshtml

@@ -37,7 +37,7 @@
             </thead>
             @foreach (var mediaFolder in Model.MediaFolders) {
             <tr>
-                <td><input type="checkbox" value="true" name="@T("Checkbox.{0}", mediaFolder.Name)"/></td>
+                <td><input type="checkbox" value="true" name="Checkbox.@mediaFolder.Name"/></td>
                 @* todo: (heskew) this URL needs to be determined from current module location *@
                 <td>
                     <img src="@Href("~/Modules/Orchard.Media/Content/Admin/images/folder.gif")" height="16" width="16" class="mediaTypeIcon" alt="@T("Folder")" />

src/Orchard.Web/Modules/Orchard.Widgets/Filters/WidgetFilter.cs

@@ -65,7 +65,12 @@ namespace Orchard.Widgets.Filters {
             // Build and add shape to zone.
             var zones = workContext.Layout.Zones;
             foreach (var widgetPart in widgetParts) {
-                if (activeLayerIds.Contains(widgetPart.As<ICommonPart>().Container.ContentItem.Id)) {
+                var commonPart = widgetPart.As<ICommonPart>();
+                if (commonPart == null || commonPart.Container == null) {
+                    Logger.Warning(T("The widget '{0}' is has no assigned layer or the layer does not exist.", widgetPart.Title).Text);
+                    continue;
+                }
+                if (activeLayerIds.Contains(commonPart.Container.ContentItem.Id)) {
                     var widgetShape = _contentManager.BuildDisplay(widgetPart);
                     zones[widgetPart.Record.Zone].Add(widgetShape, widgetPart.Record.Position);
                 }

src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj

@@ -47,8 +47,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Scripts\jquery-1.5.2.js" />
-    <Content Include="Scripts\jquery-1.5.2.min.js" />
+    <Content Include="Scripts\jquery-1.6.1.js" />
+    <Content Include="Scripts\jquery-1.6.1.min.js" />
     <Content Include="Scripts\jquery.effects.blind.js" />
     <Content Include="Scripts\jquery.effects.blind.min.js" />
     <Content Include="Scripts\jquery.effects.bounce.js" />

src/Orchard.Web/Modules/Orchard.jQuery/ResourceManifest.cs

@@ -2,7 +2,7 @@ namespace Orchard.UI.Resources {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
             var manifest = builder.Add();
-            manifest.DefineScript("jQuery").SetUrl("jquery-1.5.2.min.js", "jquery-1.5.2.js").SetVersion("1.5.2");
+            manifest.DefineScript("jQuery").SetUrl("jquery-1.6.1.min.js", "jquery-1.6.1.js").SetVersion("1.6.1");
 
             // UI Core
             manifest.DefineScript("jQueryUI_Core").SetUrl("jquery.ui.core.min.js", "jquery.ui.core.js").SetVersion("1.8.10").SetDependencies("jQuery");