From dfbcc7c00e4807d25024e97135db8e9a9491bede Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Sat, 11 May 2013 13:09:20 -0700 Subject: [PATCH] Using FontAwesome in Media Library --HG-- branch : 1.x --- CREDITS.txt | 6 +++ .../Orchard.MediaLibrary/ResourceManifest.cs | 1 + .../menu.clientstorage-mediaproviders.css | 12 +++++- .../Styles/menu.oembed-mediaproviders.css | 12 +++++- .../Styles/menu.websearch-mediaproviders.css | 12 +++++- .../Styles/orchard-medialibrary-admin.css | 2 +- .../Styles/orchard-oembed-admin.css | 29 +++++++++++--- .../Styles/orchard-websearch-admin.css | 39 ++++++++++++++++--- .../Views/Admin/Import.cshtml | 2 + .../Views/OEmbed/Index.cshtml | 34 +++++++++------- .../Views/WebSearch/Index.cshtml | 12 +++++- 11 files changed, 128 insertions(+), 33 deletions(-) diff --git a/CREDITS.txt b/CREDITS.txt index 7488f9248..2f4b6930d 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -87,6 +87,12 @@ Website: http://fluentpath.codeplex.com/ Copyright: Copyright (c) 2011 Bertrand Le Roy License: MS-PL +Font Awesome +----- +Author: Dave Gandy +Website: http://fontawesome.io +License: MIT License + Html Agility Pack ----- Website: http://htmlagilitypack.codeplex.com/ diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.MediaLibrary/ResourceManifest.cs index 2531d40d7..42b72fd15 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/ResourceManifest.cs +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/ResourceManifest.cs @@ -4,6 +4,7 @@ namespace Orchard.MediaLibrary { public class ResourceManifest : IResourceManifestProvider { public void BuildManifests(ResourceManifestBuilder builder) { builder.Add().DefineStyle("MediaManagerAdmin").SetUrl("orchard-medialibrary-admin.css").SetDependencies("~/Themes/TheAdmin/Styles/Site.css"); + builder.Add().DefineStyle("FontAwesome").SetUrl("//netdna.bootstrapcdn.com/font-awesome/3.1.1/css/font-awesome.css"); } } } diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/menu.clientstorage-mediaproviders.css b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/menu.clientstorage-mediaproviders.css index c7f0756be..6f9ffa654 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/menu.clientstorage-mediaproviders.css +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/menu.clientstorage-mediaproviders.css @@ -1,3 +1,11 @@ -.navicon-my-computer { - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAPCAYAAAACsSQRAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAQpJREFUOE+dk7EKgzAQQDXSvfRHOvgDbgU3v8NPcHVxdfUH6uziLri6OAl+QycnkWvuyIUkxLZUeJjTu5e7iAEA+AgdIie28q3gX7wPDcxdfZ3QmgMfou97iOMY2raFfd+DLMsgSRLYto1FHyVh0zQkqOua7mVZgiHReXg3C4njOERRFJS8riukaQrLspAAZV8lsuU7Jud5DtM0UREzDAOwXEqeSnDBOi2Y55mSq6oCPgsXPBsecxxHWQbCkmChmXQGdtl1HeXKyzvOlWc/Q41zUwK7E4Q/Ixeo3R6yy5cj4RrdCS0QKREeCY16IiGsQEqiHyV6Y8SSSPAlgj8cg3PT7ApLgFjBf0DwBrFhrWGsTyEzAAAAAElFTkSuQmCC'); +.navicon-my-computer:before { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + display: inline-block; + text-decoration: inherit; + content: '\f015'; + font-size: 14px; + color: black; + padding-right: 5px; } diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/menu.oembed-mediaproviders.css b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/menu.oembed-mediaproviders.css index d7bbd5d63..895c6fef2 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/menu.oembed-mediaproviders.css +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/menu.oembed-mediaproviders.css @@ -1,3 +1,11 @@ -.navicon-media-url { - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAPCAYAAAACsSQRAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAQpJREFUOE+dk7EKgzAQQDXSvfRHOvgDbgU3v8NPcHVxdfUH6uziLri6OAl+QycnkWvuyIUkxLZUeJjTu5e7iAEA+AgdIie28q3gX7wPDcxdfZ3QmgMfou97iOMY2raFfd+DLMsgSRLYto1FHyVh0zQkqOua7mVZgiHReXg3C4njOERRFJS8riukaQrLspAAZV8lsuU7Jud5DtM0UREzDAOwXEqeSnDBOi2Y55mSq6oCPgsXPBsecxxHWQbCkmChmXQGdtl1HeXKyzvOlWc/Q41zUwK7E4Q/Ixeo3R6yy5cj4RrdCS0QKREeCY16IiGsQEqiHyV6Y8SSSPAlgj8cg3PT7ApLgFjBf0DwBrFhrWGsTyEzAAAAAElFTkSuQmCC'); +.navicon-media-url:before { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + display: inline-block; + text-decoration: inherit; + content: '\f01a'; + font-size: 14px; + color: black; + padding-right: 5px; } diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/menu.websearch-mediaproviders.css b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/menu.websearch-mediaproviders.css index fa9dd2d7f..4daf20847 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/menu.websearch-mediaproviders.css +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/menu.websearch-mediaproviders.css @@ -1,3 +1,11 @@ -.navicon-web-search { - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAQCAYAAADwMZRfAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAM9JREFUOE+tkjEOhCAQRbmTpYVW1usZtvQInoAzeB9OQE1ruZWJwZjZmUlgQVCzweJN9PP5kK8CAIrJiv+SCPu+N+M4QlVVnmEYwFqbeB3hS6O1jjYfUUqhLQ4g/MM8z9B1HZullCj9TNM0sV7XNRhjojUiMR4DHFfrPLAHQT2cnUS4m+b64bFtm+j7Htq2hWVZUIoDCPRA4InWeDxyE6K4E+KRr4O87v4TItdbGMK4fsKN1MO6rm/UP7mgJOQKPICCfLArODHe4YKKQlJAfAEg9PCE10BWgwAAAABJRU5ErkJggg=='); +.navicon-web-search:before { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + display: inline-block; + text-decoration: inherit; + content: '\f002'; + font-size: 14px; + color: black; + padding-right: 5px; } diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-medialibrary-admin.css b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-medialibrary-admin.css index c64c20b15..df8dc738e 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-medialibrary-admin.css +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-medialibrary-admin.css @@ -352,7 +352,7 @@ } #media-library-main-navigation .navicon { - padding:0 0 0 20px; + padding:0 0 0 0; background-repeat: no-repeat; background-position: left; display: block; diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-oembed-admin.css b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-oembed-admin.css index acd8f2a7b..e1cfd23e0 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-oembed-admin.css +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-oembed-admin.css @@ -18,11 +18,30 @@ } #query { - background-position: right center; - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAARCAIAAABbzbuTAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAKdJREFUOE+lkcEJAyEQRe0pRy+evFuHJViBNdiPFXj2agULooiZzbjGuIYgeSALf+aps5K6yR9CKUUp9biQUqaUWm2gCc651viJtRYbOqcQQuCcQ1lrjSlgjIGEUuq9b9GLU8Da2I0sc4JXv+8E4MnTMCTnLIRgjB3H0bKLZWn/BFh7M8Da/kvAt3cA5hnad/XSMUZMRuctLOm79NF/CAA6G8LEplDrE2p/mfIGi8fEAAAAAElFTkSuQmCC'); - background-repeat: no-repeat; - padding-right: 20px; - box-sizing: border-box; margin-bottom: 10px; + margin-right: 40px; +} +#query input { + width: 100%; + box-sizing: border-box; + height: 28px; +} + +#icon { + float: right; + width:40px; +} + +#icon button { + height: 28px; + width: 40px; + border: none; + cursor: pointer; + color: white; + background-color:black; + margin-bottom: 0; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + font-size: 18px; } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-websearch-admin.css b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-websearch-admin.css index 3a5f516c1..07f993c75 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-websearch-admin.css +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-websearch-admin.css @@ -17,6 +17,9 @@ overflow: auto; background: #fff; } +#websearch-results { + padding-left: 3px; +} #websearch-results li { margin-right: 4px; @@ -149,12 +152,38 @@ /* SEARCH */ -#query { - background-position: right center; - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAARCAIAAABbzbuTAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAKdJREFUOE+lkcEJAyEQRe0pRy+evFuHJViBNdiPFXj2agULooiZzbjGuIYgeSALf+aps5K6yR9CKUUp9biQUqaUWm2gCc651viJtRYbOqcQQuCcQ1lrjSlgjIGEUuq9b9GLU8Da2I0sc4JXv+8E4MnTMCTnLIRgjB3H0bKLZWn/BFh7M8Da/kvAt3cA5hnad/XSMUZMRuctLOm79NF/CAA6G8LEplDrE2p/mfIGi8fEAAAAAElFTkSuQmCC'); - background-repeat: no-repeat; - padding-right: 20px; +.query-container { margin: 5px; + width: 90%; + margin-bottom: 10px; +} + +#query { + margin-right: 40px; +} + +#query input { + width: 100%; + box-sizing: border-box; + height: 28px; +} + +#icon { + float: right; + width:40px; +} + +#icon button { + height: 28px; + width: 40px; + border: none; + cursor: pointer; + color: white; + background-color:black; + margin-bottom: 0; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + font-size: 18px; } .actions { diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Import.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Import.cshtml index 65735541b..9b030a09b 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Import.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Import.cshtml @@ -13,6 +13,8 @@ RegisterImageSet("menu." + imageSet, "mediaproviders" /* style */, 16 /* bounding box */); } } + + Style.Require("FontAwesome"); } 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 e1a372f85..254dc05c4 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/OEmbed/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/OEmbed/Index.cshtml @@ -12,8 +12,9 @@ Style.Include("orchard-medialibrary-admin.css"); Style.Include("orchard-mediaproviders-admin.css"); - Style.Include("orchard-oembed-admin.css"); + Style.Require("FontAwesome"); + Style.Include("orchard-oembed-admin.css"); } @Display.Metas() @@ -24,9 +25,14 @@
-
+
@using (Html.BeginFormAntiForgeryPost()) { - +
+ +
+
+ +
}
@@ -35,27 +41,27 @@ var type = oembed.Element("type").Value; switch (oembed.Element("type").Value) { - case "photo": + case "photo": - break; - case "video": + break; + case "video": @Html.Raw(oembed.Element("html").Value) - break; - case "link": + break; + case "link": oembed.Element("title").Value - break; - case "rich": + break; + case "rich": @Html.Raw(oembed.Element("html").Value) - break; - } + break; + } -using (Html.BeginFormAntiForgeryPost(Url.Action("MediaPost"))) { + using (Html.BeginFormAntiForgeryPost(Url.Action("MediaPost"))) { @Html.Hidden("url", Model.Url) @Html.Hidden("id", Model.Id) @Html.Hidden("document", Model.Content.ToString()) -} + } }
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 1e8af9903..f26930ab1 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/WebSearch/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/WebSearch/Index.cshtml @@ -9,6 +9,7 @@ Style.Include("orchard-mediaproviders-admin.css"); Style.Include("orchard-websearch-admin.css"); + Style.Require("FontAwesome"); } @Display.Metas() @@ -22,7 +23,14 @@
- +
+
+ +
+
+ +
+