From 84f606bfd73c6ac4285e0c1c52c4caeb5085aa55 Mon Sep 17 00:00:00 2001 From: jowall Date: Tue, 5 Apr 2011 17:40:44 -0700 Subject: [PATCH] Added installed image to Gallery. --HG-- branch : 1.x --- .../Core/Dashboard/Views/Admin/Index.cshtml | 4 ++-- .../Orchard.Packaging.csproj | 1 + .../Styles/images/installed.gif | Bin 0 -> 239 bytes .../Styles/orchard-packaging-admin.css | 8 +++++--- .../Views/Gallery/Modules.cshtml | 19 ++++++++++-------- .../Themes/TheAdmin/Styles/site.css | 8 ++++++-- 6 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 src/Orchard.Web/Modules/Orchard.Packaging/Styles/images/installed.gif diff --git a/src/Orchard.Web/Core/Dashboard/Views/Admin/Index.cshtml b/src/Orchard.Web/Core/Dashboard/Views/Admin/Index.cshtml index f32e4a769..5a083c80d 100644 --- a/src/Orchard.Web/Core/Dashboard/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Core/Dashboard/Views/Admin/Index.cshtml @@ -26,7 +26,7 @@ -

@T("Advisory from {0}", "http://www.orchardproject.net/advisory")

- diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj index f4dfb8e72..6ff52628b 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj @@ -112,6 +112,7 @@ DataServiceClientGenerator Reference.cs + diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Styles/images/installed.gif b/src/Orchard.Web/Modules/Orchard.Packaging/Styles/images/installed.gif new file mode 100644 index 0000000000000000000000000000000000000000..39d435520b973ba3feb675e13327ec010cfee19a GIT binary patch literal 239 zcmZ?wbhEHbG-D88*v!T7zl-5~0ptH8_5c6>KY#xG?c2Bif4KK}b=K$4pSRcB0R!`22#hD0sR+ZxYs(c)~|_7@ptYwg;P`xf8a?N|T) z<+kr!<>%g)mNev4hJ`12r{uPk76r#nNQ|)REcBf2P&;F`#jH8=jSCdDmMmSyq~j_i ey=Lt?5l&k!4px?J+js2TwR_Lr?W}r&4AubmcVu+{ literal 0 HcmV?d00001 diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css b/src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css index 46e61bf33..42b940466 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css @@ -10,8 +10,12 @@ .extensionName { float:left; } +.extensionName.installed { + background: url("images/installed.gif") no-repeat 0px 8px #fff; + padding:0 0 0 60px; +} .contentItems .related { - padding: 1.2em 0.4em 0.5em + padding:6px 0 0 0; } .contentItems .properties { float: left; @@ -33,7 +37,6 @@ } .extensionThumbnail { margin-left: -100%; - padding-top: 20px; } .iconThumbnail .extensionThumbnail { width: 70px; @@ -77,6 +80,5 @@ float: right; display: inline; height: auto; - margin: 0 1.4em 0 0; padding-top: 0; } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml index 7f5453b66..3b3fbdf1a 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml @@ -47,9 +47,18 @@ } } +
+ @if (item.Notifications != null && item.Notifications.Count > 0) { +
+ @foreach (string notification in item.Notifications) { +
@notification
+ } +
+ } +
-
+
@if (!string.IsNullOrWhiteSpace(item.GalleryDetailsUrl)) {

@item.Title - @T("Version: {0}", item.Version)

@@ -59,19 +68,13 @@ }
+
@Html.ActionLink(T("Install").ToString(), "InstallGallery", "PackagingServices", new RouteValueDictionary { { "packageId", item.PackageId }, { "version", item.Version }, { "sourceId", item.Source.Id }, { "redirectUrl", HttpContext.Current.Request.RawUrl } }, null)@T(" | ") @T("Download")
- @if (item.Notifications != null && item.Notifications.Count > 0) { -
- @foreach (string notification in item.Notifications) { -
@notification
- } -
- }

@(item.Description == null ? T("(No description").Text : item.Description)

  • @T("Last Updated: {0}", item.LastUpdated)
    • diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index b2f9101a6..31d5365e1 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -490,6 +490,7 @@ ul.menuItems {margin:6px 0 0 0;} .message, .validation-summary-errors { margin:10px 0 4px 0; padding:4px; + clear:both; } messages div.message { clear:both; @@ -1069,7 +1070,7 @@ fieldset.delete-button { .dashboard .help-item { width: 245px; - min-height: 170px; + min-height: 180px; float: left; margin: 0 55px 55px 0; } @@ -1090,7 +1091,10 @@ fieldset.delete-button { padding: 6px; font-size: 16px; } - +.dashboard h2.advisory +{ + font-size: 16px; +} .dashboard .help-item h2.gallery { background: #f1f1f2 url('images/icon-gallery.png') no-repeat 5px 50%;