From 4b8d11c1ed121993a1dcc20532893a58bf2b1292 Mon Sep 17 00:00:00 2001
From: Gustavo Tandeciarz <gmt@gmtaz.com>
Date: Tue, 23 Feb 2016 22:26:15 +0100
Subject: [PATCH] Fixes broken icons introduced into the media library by
 upgrading FontAwesome

---
 .../Modules/Orchard.MediaLibrary/Views/Admin/Index.cshtml     | 4 ++--
 .../Modules/Orchard.MediaLibrary/Views/OEmbed/Index.cshtml    | 2 +-
 .../Views/Parts/MediaLibrary.Navigation.cshtml                | 2 +-
 .../Modules/Orchard.MediaLibrary/Views/WebSearch/Index.cshtml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Index.cshtml
index 83fabc58d..7f2905c88 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Index.cshtml
@@ -96,7 +96,7 @@ var mediaLibrarySettings = {
     moveActionUrl: '@Url.Action("Move", "Folder", new {area = "Orchard.MediaLibrary"})',
     deleteActionUrl: '@Url.Action("Delete", "Admin", new {area = "Orchard.MediaLibrary"})',
     cloneActionUrl: '@Url.Action("Clone", "Admin", new {area = "Orchard.MediaLibrary"})',
-    hasFolderPath: @(viewModel.FolderPath != null ? "true" : "false"),
+    hasFolderPath: @(!string.IsNullOrEmpty(viewModel.FolderPath) ? "true" : "false"),
     folderPath: '@HttpUtility.JavaScriptStringEncode(viewModel.FolderPath)',
     deleteConfirmationMessage: '@HttpUtility.JavaScriptStringEncode(T("Are you sure you want to delete these media items ?").Text)',
     cloneConfirmationMessage: '@HttpUtility.JavaScriptStringEncode(T("Are you sure you want to clone this media item ?").Text)',
@@ -110,7 +110,7 @@ var mediaLibrarySettings = {
     <li>
         <div class="media-library-folder" data-bind="css: { 'in-progress': $root.pendingRequest() }">
             <div class="media-library-folder-title" data-bind="click: folderClicked, attr: { 'data-media-path': folderPath() }, css: {selected: isSelected()}">
-                <a href="#" class="media-library-navigation-folder-link"><i data-bind="    css: {'icon-folder-open-alt': isExpanded(), 'icon-folder-close-alt': !isExpanded()}"></i><span data-bind="    text: name"></span></a>
+                <a href="#" class="media-library-navigation-folder-link"><i class="fa" data-bind="    css: {'fa-folder-open-o': isExpanded(), 'fa-folder-o': !isExpanded()}"></i><span data-bind="    text: name"></span></a>
             </div>
             <ul data-bind="template: { name: 'media-folder-template', foreach: childFolders, afterRender: afterRenderMediaFolderTemplate}, visible: isExpanded()">
             </ul>
diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/OEmbed/Index.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/OEmbed/Index.cshtml
index d2f46d5c7..a8940840d 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/OEmbed/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/OEmbed/Index.cshtml
@@ -53,7 +53,7 @@
                 <fieldset>
                     <legend>@T("Please enter the URL of the embeddable media you want to integrate (requires an oEmbed compatible media provider such as YouTube):")</legend>
                     <div id="icon">
-                        <button type="submit" class="icon-download">@T("Preview")</button>
+                        <button type="submit" class="fa fa-download">@T("Preview")</button>
                     </div>
                     <div id="query">
                         <input name="url" type="text" autofocus=autofocus autofocus=autofocus placeholder="@T("media url")" value="@Model.Url" />
diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/MediaLibrary.Navigation.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/MediaLibrary.Navigation.cshtml
index 2685b6803..d89ad7004 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/MediaLibrary.Navigation.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/MediaLibrary.Navigation.cshtml
@@ -1 +1 @@
-<li><a href="#" data-bind="click: selectRecent, css: { selected: !displayed() }" id="button-recent"><i class="icon-time"></i>@T("Recent")</a>
\ No newline at end of file
+<li><a href="#" data-bind="click: selectRecent, css: { selected: !displayed() }" id="button-recent"><i class="fa fa-clock-o"></i>@T("Recent")</a>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/WebSearch/Index.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/WebSearch/Index.cshtml
index 4512a6999..39520f175 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/WebSearch/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/WebSearch/Index.cshtml
@@ -37,7 +37,7 @@
         <form data-bind="submit: doSearch">
             <div class="query-container">
                 <div id="icon">
-                    <button type="submit" class="icon-search"></button>    
+                    <button type="submit" class="fa fa-search"></button>    
                 </div>
                 <div id="query">
                     <input type="text" autofocus placeholder="@T("search")"/>