Post upgrade fixes

Fixed MVC template issues after upgarde. Changed Feather version to official.

App_Data/Sitefinity/Configuration/EcommerceConfig.config

@@ -3,9 +3,9 @@
 	<supportedCurrencies>
 		<clear />
 		<add title="United States Dollar" culture="en-US" countryIsoCode="US" isActive="True" name="USD" />
-		<add title="Euro" culture="de-DE" countryIsoCode="DE" exchangeRate="0.9388" isActive="True" name="EUR" />
-		<add title="Pound sterling" culture="en-GB" countryIsoCode="GB" exchangeRate="0.7990" name="GBP" />
-		<add title="Canadian dollar" culture="en-CA" countryIsoCode="CA" exchangeRate="1.3016" name="CAD" />
+		<add title="Euro" culture="de-DE" countryIsoCode="DE" exchangeRate="0.9149" isActive="True" name="EUR" />
+		<add title="Pound sterling" culture="en-GB" countryIsoCode="GB" exchangeRate="0.7729" name="GBP" />
+		<add title="Canadian dollar" culture="en-CA" countryIsoCode="CA" exchangeRate="1.3645" name="CAD" />
 	</supportedCurrencies>
 	<multiCurrency dataSync="UseService" serviceId="db4b3f14-14a9-4553-88da-2cd8b3d736ba" lastSyncDate="2016-08-23 14:08:52Z" lastSyncCurrency="USD" />
 </ecommerceConfig>

App_Data/Sitefinity/Configuration/ToolboxesConfig.config

@@ -168,17 +168,17 @@
 						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-12-blue" cssClass="sfL100Blue" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-12-blue.html" name="grid-12-blue" />
 						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-12-green" cssClass="sfL100Green" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-12-green.html" name="grid-12-green" />
 						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="slider" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/slider.html" name="slider" />
-						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-9+3" cssClass="sfL75_25" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-9+3.html" name="grid-9+3" />
-						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-8+4" cssClass="sfL67_33" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-8+4.html" name="grid-8+4" />
-						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-6+6" cssClass="sfL50_50" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-6+6.html" name="grid-6+6" />
-						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-4+8" cssClass="sfL33_67" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-4+8.html" name="grid-4+8" />
-						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-4+4+4" cssClass="sfL33_34_33" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-4+4+4.html" name="grid-4+4+4" />
-						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-3+9" cssClass="sfL25_75" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-3+9.html" name="grid-3+9" />
-						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-3+6+3" cssClass="sfL25_50_25" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-3+6+3.html" name="grid-3+6+3" />
-						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-3+3+3+3" cssClass="sfL25_25_25_25" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-3+3+3+3.html" name="grid-3+3+3+3" />
-						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-2+3+2+3+2" cssClass="sfL20_20_20_20_20" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-2+3+2+3+2.html" name="grid-2+3+2+3+2" />
-						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-12" cssClass="sfL100" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-12.html" name="grid-12" />
 						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="container" cssClass="sfL100" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/container.html" name="container" />
+						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-12" cssClass="sfL100" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-12.html" name="grid-12" />
+						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-2+3+2+3+2" cssClass="sfL20_20_20_20_20" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-2+3+2+3+2.html" name="grid-2+3+2+3+2" />
+						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-3+3+3+3" cssClass="sfL25_25_25_25" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-3+3+3+3.html" name="grid-3+3+3+3" />
+						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-3+6+3" cssClass="sfL25_50_25" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-3+6+3.html" name="grid-3+6+3" />
+						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-3+9" cssClass="sfL25_75" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-3+9.html" name="grid-3+9" />
+						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-4+4+4" cssClass="sfL33_34_33" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-4+4+4.html" name="grid-4+4+4" />
+						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-4+8" cssClass="sfL33_67" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-4+8.html" name="grid-4+8" />
+						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-6+6" cssClass="sfL50_50" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-6+6.html" name="grid-6+6" />
+						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-8+4" cssClass="sfL67_33" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-8+4.html" name="grid-8+4" />
+						<add type="Telerik.Sitefinity.Frontend.GridSystem.GridControl, Telerik.Sitefinity.Frontend" title="grid-9+3" cssClass="sfL75_25" layoutTemplate="~/Frontend-Assembly/Telerik.Sitefinity.Frontend/GridSystem/Templates/grid-9+3.html" name="grid-9+3" />
 					</tools>
 				</add>
 			</sections>

ResourcePackages/Bootstrap/MVC/Views/BlogPost/List.BlogPostList.cshtml

@@ -12,9 +12,9 @@
 
         @foreach (var item in Model.Items)
         {
-			var navigateUrl = HyperLinkHelpers.GetDetailPageUrl(item, ViewBag.DetailsPageId, ViewBag.OpenInSamePage, Model.UrlKeyPrefix);
-		
-            <li @Html.InlineEditingAttributes(Model.ProviderName, Model.ContentType.FullName, (Guid)item.Fields.Id)>
+            var navigateUrl = HyperLinkHelpers.GetDetailPageUrl(item, ViewBag.DetailsPageId, ViewBag.OpenInSamePage, Model.UrlKeyPrefix);
+
+            <li class="news_item" @Html.InlineEditingAttributes(Model.ProviderName, Model.ContentType.FullName, (Guid)item.Fields.Id)>
                 <h3>
                     <a @Html.InlineEditingFieldAttributes("Title", "ShortText") href="@navigateUrl">@item.Fields.Title</a>
                 </h3>
@@ -24,7 +24,7 @@
                     @item.GetDateTime("PublicationDate", "MMM d, yyyy, HH:mm tt")
                     @Html.Resource("By")
                     @DataResolver.Resolve(item.DataItem, "Author", null)
-					@Html.CommentsCount((string)navigateUrl, item.DataItem)
+                    @Html.CommentsCount((string)navigateUrl, item.DataItem)
                 </div>
 
                 <div @Html.InlineEditingFieldAttributes("Summary", "ShortText")>@Html.Raw(item.Fields.Summary)</div>
@@ -37,10 +37,10 @@
     @if (Model.ShowPager)
     {
         @Html.Action("Index", "ContentPager", new
-           {
-               currentPage = Model.CurrentPage,
-               totalPagesCount = Model.TotalPagesCount.Value,
-               redirectUrlTemplate = ViewBag.RedirectPageUrlTemplate
-           })
+   {
+       currentPage = Model.CurrentPage,
+       totalPagesCount = Model.TotalPagesCount.Value,
+       redirectUrlTemplate = ViewBag.RedirectPageUrlTemplate
+   })
     }
-</div>
+</div>

ResourcePackages/Bootstrap/MVC/Views/ImageGallery/Detail.DetailPage.cshtml

@@ -20,8 +20,8 @@
     <div @Html.InlineEditingFieldAttributes("Description", "LongText")>@Html.Raw(Model.Item.Fields.Description)</div>
 
     <img src="@Html.Raw(Model.MediaUrl)" alt='@System.Text.RegularExpressions.Regex.Replace(Model.Item.Fields.AlternativeText, @"[^\w\d_-]", "")'
-                 @Html.GetWidthAttributeIfPresents(Model.Width)
-                 @Html.GetHeightAttributeIfPresents(Model.Height) />
+                 @Html.GetWidthAttributeIfExists(Model.Width)
+                 @Html.GetHeightAttributeIfExists(Model.Height) />
 
     @if (ViewBag.ItemIndex != null)
     {

ResourcePackages/Bootstrap/MVC/Views/ImageGallery/List.ImageGallery.cshtml

@@ -24,8 +24,8 @@
              href="@detailPageUrl"
        title="@(string.IsNullOrEmpty(item.Fields.Description) ? item.Fields.Title : item.Fields.Description)">
             <img src="@(thumbnailViewModel.ThumbnailUrl)" alt='@System.Text.RegularExpressions.Regex.Replace(item.Fields.AlternativeText, @"[^\w\d_-]", "")'
-                      @Html.GetWidthAttributeIfPresents(thumbnailViewModel.Width)
-                      @Html.GetHeightAttributeIfPresents(thumbnailViewModel.Height) />
+                      @Html.GetWidthAttributeIfExists(thumbnailViewModel.Width)
+                      @Html.GetHeightAttributeIfExists(thumbnailViewModel.Height) />
       </a>
       }
   </div>

ResourcePackages/Bootstrap/MVC/Views/ImageGallery/List.OverlayGallery.cshtml

@@ -26,8 +26,8 @@
             <img src="@(thumbnailViewModel.ThumbnailUrl)" 
                  data-detail-url="@HyperLinkHelpers.GetDetailPageUrl(item, ViewBag.DetailsPageId, ViewBag.OpenInSamePage, Model.UrlKeyPrefix, itemIndex)" 
                  alt="@item.Fields.AlternativeText"
-                      @Html.GetWidthAttributeIfPresents(thumbnailViewModel.Width)
-                      @Html.GetHeightAttributeIfPresents(thumbnailViewModel.Height) />
+                      @Html.GetWidthAttributeIfExists(thumbnailViewModel.Width)
+                      @Html.GetHeightAttributeIfExists(thumbnailViewModel.Height) @Html.GetDetailsImageWidthAttributeIfExists(thumbnailViewModel.DetailsImageWidth) />
         </a>
         itemIndex++;
     }

ResourcePackages/Bootstrap/MVC/Views/ImageGallery/List.SimpleList.cshtml

@@ -16,8 +16,8 @@
 
     <a class="text-center" title="@(string.IsNullOrEmpty(item.Fields.Description) ? item.Fields.Title : item.Fields.Description)">
       <img src="@(thumbnailViewModel.ThumbnailUrl)" alt='@System.Text.RegularExpressions.Regex.Replace(item.Fields.AlternativeText, @"[^\w\d_-]", "")' 
-                @Html.GetWidthAttributeIfPresents(thumbnailViewModel.Width)
-                @Html.GetHeightAttributeIfPresents(thumbnailViewModel.Height) />
+                @Html.GetWidthAttributeIfExists(thumbnailViewModel.Width)
+                @Html.GetHeightAttributeIfExists(thumbnailViewModel.Height) />
     </a>
     }
 </div>

ResourcePackages/Bootstrap/MVC/Views/ImageGallery/List.ThumbnailStrip.cshtml

@@ -42,8 +42,8 @@
 		<a class='js-Gallery-prev sf-Gallery-prev'><span class="glyphicon glyphicon-chevron-left"></span></a>
 		<a class='js-Gallery-next sf-Gallery-next'><span class="glyphicon glyphicon-chevron-right"></span></a>
         <img src="@(thumbnailViewModel.MediaUrl)" title="@firstItem.DataItem.Title" alt="@firstItem.DataItem.AlternativeText" 
-                  @Html.GetWidthAttributeIfPresents(thumbnailViewModel.Width)
-                  @Html.GetHeightAttributeIfPresents(thumbnailViewModel.Height) />
+                  @Html.GetWidthAttributeIfExists(thumbnailViewModel.Width)
+                  @Html.GetHeightAttributeIfExists(thumbnailViewModel.Height) />
 
 	</p>
 		}
@@ -74,8 +74,8 @@
 
 			<a class="text-center" title="@item.Fields.Title" data-item="@Html.GetSerializedImage(item)" data-detail-url="@HyperLinkHelpers.GetDetailPageUrl(item, ViewBag.DetailsPageId, ViewBag.OpenInSamePage, Model.UrlKeyPrefix, itemIndex)">
         <img src="@(itemViewModel.ThumbnailUrl)" alt="@item.Fields.AlternativeText" 
-                      @Html.GetWidthAttributeIfPresents(itemViewModel.Width)
-                      @Html.GetHeightAttributeIfPresents(itemViewModel.Height) />
+                      @Html.GetWidthAttributeIfExists(itemViewModel.Width)
+                      @Html.GetHeightAttributeIfExists(itemViewModel.Height) />
 			</a>
 			itemIndex++;
 		}

ResourcePackages/Bootstrap/MVC/Views/Layouts/quantum.cshtml

@@ -47,7 +47,7 @@
 
     }
 
-    @Html.Script(Url.Content("~/ResourcePackages/Bootstrap/assets/dist/js/bootstrap.min.js"), "bottom")
+    @Html.Script(Url.Content("~/ResourcePackages/Bootstrap/assets/dist/js/project.min.js"), "bottom")
     @Html.Script(Url.Content("~/ResourcePackages/Bootstrap/assets/dist/js/quantum.js"), "bottom")
 </body>
 </html>

ResourcePackages/Bootstrap/MVC/Views/LoginForm/LoginForm.LoginForm.cshtml

@@ -90,10 +90,9 @@
 
             @if (Model.ShowRegistrationLink)
             {
-                <div class="sf-registration-link">
-                    <div>@Html.Resource("NotRegisteredYet")</div>
-                    <a href="@Model.RegisterPageUrl">@Html.Resource("LoginFormRegisterNow")</a>
-                </div>
+                <h4>
+ -                  <strong><a href="@Model.RegisterPageUrl">@Html.Resource("LoginFormRegisterNow")</a></strong>
+ -              </h4>
             }
             </div>
 

ResourcePackages/Bootstrap/MVC/Views/LoginStatus/LoginStatus.LoginButton.cshtml

@@ -1,22 +1,23 @@
-@model Telerik.Sitefinity.Frontend.Identity.Mvc.Models.LoginStatus.LoginStatusViewModel
+@model Telerik.Sitefinity.Frontend.Identity.Mvc.Models.LoginStatus.LoginStatusViewModel
 
 @using Telerik.Sitefinity.Frontend.Mvc.Helpers
 @using Telerik.Sitefinity.Modules.Pages;
 
-@Html.Script(ScriptRef.JQuery, "top", false)
+@Html.Script(ScriptRef.JQuery, "top")
 
 <div class="@Model.CssClass">
-    <div class="media" data-sf-role="sf-logged-in-view" style="display: none">
-        <div class="media-left sf-pr-xl">
-            <div class="media-object">
-                <img data-sf-role="sf-logged-in-avatar" width="100" height="100" />
-            </div>
+    <div data-sf-role="sf-logged-in-view" style="display: none" class="media">
+
+        <div class="media-left">
+            <img data-sf-role="sf-logged-in-avatar" width="80" height="80" class="media-object"  />
         </div>
         <div class="media-body">
+
             <a href="@(Model.ProfilePageUrl ?? "#")" data-sf-role="sf-logged-in-name"></a>
-            <p data-sf-role="sf-logged-in-email"></p>      
-            @Html.ActionLink(Html.Resource("Logout"), "SignOut", null, new { @class = "btn btn-default" })
+            <p data-sf-role="sf-logged-in-email"></p>
+            <button class="btn btn-default" data-sf-role="sf-logged-in-log-out-btn">@Html.Resource("Logout")</button>
         </div>
+
     </div>
 
     <div data-sf-role="sf-logged-out-view" style="display: none">
@@ -32,4 +33,4 @@
 <input type="hidden" data-sf-role="sf-login-redirect-url" value="@Model.LoginPageUrl" />
 <input type="hidden" data-sf-role="sf-is-design-mode-value" value="@ViewBag.IsDesignMode.ToString()" />
 
-@Html.Script(Url.WidgetContent("Mvc/Scripts/LoginStatus/login-status.js"), "bottom", false)
+@Html.Script(Url.WidgetContent("Mvc/Scripts/LoginStatus/login-status.js"), "bottom")

ResourcePackages/Bootstrap/MVC/Views/LoginStatus/LoginStatus.LoginName.cshtml

@@ -1,4 +1,4 @@
-@model Telerik.Sitefinity.Frontend.Identity.Mvc.Models.LoginStatus.LoginStatusViewModel
+@model Telerik.Sitefinity.Frontend.Identity.Mvc.Models.LoginStatus.LoginStatusViewModel
 
 @using Telerik.Sitefinity.Frontend.Mvc.Helpers
 @using Telerik.Sitefinity.Modules.Pages;
@@ -8,12 +8,12 @@
 <div class="@Model.CssClass">
     <div data-sf-role="sf-logged-in-view" style="display: none">
         <span>@Html.Resource("LoggedAs") </span>
-        <a href="@(Model.ProfilePageUrl ?? "#")" data-sf-role="sf-logged-in-name" class="sf-mr-m"></a>
-        @Html.ActionLink(Html.Resource("Logout"), "SignOut")
+        <a href="@(Model.ProfilePageUrl ?? "#")" data-sf-role="sf-logged-in-name"></a>
+        <a data-sf-role="sf-logged-in-log-out-btn">@Html.Resource("Logout")</a>
     </div>
 
     <div data-sf-role="sf-logged-out-view" style="display: none">
-        <a href="@(Model.LoginPageUrl ?? "#")" class="sf-mr-m">@Html.Resource("Login")</a>
+        <a href="@(Model.LoginPageUrl ?? "#")">@Html.Resource("Login")</a>
         <a href="@(Model.RegistrationPageUrl ?? "#")">@Html.Resource("RegisterNow")</a>
     </div>
 </div>

ResourcePackages/Bootstrap/MVC/Views/Registration/Registration.RegistrationForm.cshtml

@@ -165,11 +165,6 @@
                 {
                     <button type="submit" class="btn btn-primary">@Html.Resource("Register")</button>
                 }
-
-                <div class="sf-mt-l">
-                    <div>Already registered?</div>
-                    <a href="@Model.LoginPageUrl">@Html.Resource("BackToLogin")</a>
-                </div>
             </div>
 
 			if (Model.ExternalProviders != null && Model.ExternalProviders.Count() > 0)