From 1c93ef76314501de032cdc94a14cf368472df957 Mon Sep 17 00:00:00 2001 From: jowall Date: Wed, 30 Mar 2011 11:07:04 -0700 Subject: [PATCH 1/3] Some fixes to admin buttons in the media picker. --HG-- branch : 1.x --- .../Styles/mediapicker.css | 8 +++--- .../Views/Admin/Index.cshtml | 1 + .../Themes/TheAdmin/Styles/site.css | 28 +++++++++++-------- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css index 533a51b64..8c38aa03a 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css @@ -42,9 +42,9 @@ body { overflow-x:hidden; } -input[disabled], input[disabled="disabled"], input.disabled { - color: White -} +/*input[disabled], input[disabled="disabled"], input.disabled { + color: #fff; +}*/ .media-largepreview { @@ -107,7 +107,7 @@ table.items td.media-thumbnail form { margin: 0; padding: 0; } legend { font-weight: normal; border:none; } fieldset { padding:0; margin: 0; border: 0px solid #dbdbdb; } -#orchardmediapicker label { font-weight:normal; display:block; padding: 0 0 0 0; margin:10px 0 0 0; } +#orchardmediapicker label { font-weight:normal; display:block; padding: 0 0 0 0; margin:12px 0 2px 0; } #orchardmediapicker label.forcheckbox { display: inline; margin: 10px 0 0 4px; } #orchardmediapicker .actions { margin:12px 0 0 0; clear:both; text-align:left; } diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Index.cshtml index 1b2f0541c..8320e9723 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Index.cshtml @@ -11,6 +11,7 @@ Script.Require("jQueryUI_Tabs").AtHead(); Script.Include("MediaBrowser.js").AtHead(); + SetMeta("X-UA-Compatible", "IE=edge,chrome=1"); Style.Include("~/themes/theadmin/styles/site.css"); Style.Include("~/themes/theadmin/styles/ie.css").UseCondition("lte IE 8").SetAttribute("media", "screen, projection"); Style.Include("~/themes/theadmin/styles/ie6.css").UseCondition("lte IE 6").SetAttribute("media", "screen, projection"); diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index c337844ce..de18f76ec 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -649,16 +649,6 @@ button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner { .delete.button { float:right; } -.button.disabled, .button.disabled:visited, .button.disabled:hover, .button.disabled:active, .button.disabled:focus { - background:#eee; - border:1px solid #ababab; - color:#ababab; - cursor:default; - text-shadow: none; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} .button.grey { color:#5d615d; background:#f5f5f5; @@ -674,6 +664,7 @@ button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner { /*----In ie the first couplet sets the alpha value so 00=transparent and ff=opaque)----*/ filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#fff5f5f5', endColorstr='#ffd9d9d9'); background: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(245, 245, 245, 1.0)), to(rgba(217, 217, 217, 1.0))); + background: -moz-linear-gradient(top, rgba(245, 245, 245, 1.0), rgba(217, 217, 217, 1.0)); -webkit-border-radius: 2px; -moz-border-radius: 2px; @@ -711,7 +702,6 @@ button, .button, a.button { background: -moz-linear-gradient(top, rgba(155, 179, 108, 1.0), rgba(128, 159, 67, 1.0)); /*test - base green in pallet is 155,179,108*/ - background: -moz-linear-gradient(top, rgba(166, 192, 116, 1.0), rgba(155, 179, 108, 1.0)); background: -moz-linear-gradient(top, rgba(155, 179, 108, 1.0), rgba(133, 154, 93, 1.0)); -webkit-border-radius: 2px; @@ -751,6 +741,22 @@ button:active, .buton:active, a.button:active { button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner { border: 1px dotted transparent; } +/*disabled*/ +.button.disabled, .button.disabled:visited, .button.disabled:hover, .button.disabled:active, .button.disabled:focus { + background-color:#eee; + border:1px solid #ababab; + color:#ababab; + cursor:default; + + filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#ffeeeeee', endColorstr='#ffeeeeee'); + background: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(238, 238, 238, 1.0)), to(rgba(238, 238, 238, 1.0))); + background: -moz-linear-gradient(top, rgba(238, 238, 238, 1.0), rgba(238, 238, 238, 1.0)); + + text-shadow: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} /* and allow all of that button style to be undone and beyond - to look like a link */ button.link { background:none; From 86edc22139b9e0290310e9e6829a20198e6633b8 Mon Sep 17 00:00:00 2001 From: Andre Rodrigues Date: Wed, 30 Mar 2011 11:18:09 -0700 Subject: [PATCH 2/3] Not showing update count in case it hasn't been determined yet. --HG-- branch : 1.x --- .../Orchard.Packaging/AdminMenuGalleryUpdates.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenuGalleryUpdates.cs b/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenuGalleryUpdates.cs index d054c4570..0cfb9faca 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenuGalleryUpdates.cs +++ b/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenuGalleryUpdates.cs @@ -23,8 +23,11 @@ namespace Orchard.Packaging { } public void GetNavigation(NavigationBuilder builder) { - var modulesCaption = T("Updates ({0})", GetUpdateCount(DefaultExtensionTypes.Module)); - var themesCaption = T("Updates ({0})", GetUpdateCount(DefaultExtensionTypes.Theme)); + int? modulesCount = GetUpdateCount(DefaultExtensionTypes.Module); + var modulesCaption = modulesCount == null ? T("Updates") : T("Updates ({0})", modulesCount); + + int? themesCount = GetUpdateCount(DefaultExtensionTypes.Theme); + var themesCaption = modulesCount == null ? T("Updates") : T("Updates ({0})", themesCount); builder .Add(T("Modules"), menu => menu @@ -33,22 +36,22 @@ namespace Orchard.Packaging { .Add(themesCaption, "8", item => Describe(item, "ThemesUpdates", "GalleryUpdates", true))); } - int GetUpdateCount(string extensionType) { + private int? GetUpdateCount(string extensionType) { try { // Admin menu should never block, so simply return the result from the background task if (_backgroundPackageUpdateStatus.Value == null) - return 0; + return null; return _backgroundPackageUpdateStatus.Value.Entries.Count(updatePackageEntry => updatePackageEntry.NewVersionToInstall != null && updatePackageEntry.ExtensionsDescriptor.ExtensionType == extensionType); } catch { - return 0; + return null; } } - static NavigationItemBuilder Describe(NavigationItemBuilder item, string actionName, string controllerName, bool localNav) { + private static NavigationItemBuilder Describe(NavigationItemBuilder item, string actionName, string controllerName, bool localNav) { item = item.Action(actionName, controllerName, new { area = "Orchard.Packaging" }).Permission(StandardPermissions.SiteOwner); if (localNav) item = item.LocalNav(); From b8a59e343274bbf9784f3aa8e0ea4b7475f25c1f Mon Sep 17 00:00:00 2001 From: jowall Date: Wed, 30 Mar 2011 11:45:27 -0700 Subject: [PATCH 3/3] Added alternate quad layout to TheThemeMachine CSS. --HG-- branch : 1.x --- .../Modules/Orchard.MediaPicker/Styles/mediapicker.css | 6 +----- src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css | 6 ++++++ src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css index 8c38aa03a..0dd9dd66d 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css @@ -41,11 +41,7 @@ body { overflow-y:scroll; overflow-x:hidden; } - -/*input[disabled], input[disabled="disabled"], input.disabled { - color: #fff; -}*/ - + .media-largepreview { width: 300px; diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css index c5bbbb447..f2fcb83e2 100644 --- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css +++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css @@ -417,6 +417,12 @@ nav ul .split-124 #footer-quad-fourth { width:480px; } /* If zones 1, 2, 4 are on */ .split-123 #footer-quad-third { width:480px; } /* If zones 1, 2, 3 are on */ +/*3 zones on - alternate layout*/ +/*.split-123 #footer-quad-first, .split-123 #footer-quad-second, .split-123 #footer-quad-third { width:320px; }*/ /* If zones 1, 2, 3 are on */ +/*.split-124 #footer-quad-first, .split-124 #footer-quad-second, .split-124 #footer-quad-fourth { width:320px; }*/ /* If zones 1, 2, 4 are on */ +/*.split-134 #footer-quad-first, .split-134 #footer-quad-third, .split-134 #footer-quad-fourth { width:320px; }*/ /* If zones 1, 3, 4 are on */ +/*.split-234 #footer-quad-second, .split-234 #footer-quad-third, .split-234 #footer-quad-fourth { width:320px; }*/ /* If zones 2, 3, 4 are on */ + /* Widgets diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml index 25b709817..34cdfd5de 100644 --- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml +++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml @@ -9,7 +9,8 @@ @{ /* Global includes for the theme ***************************************************************/ - + + SetMeta("X-UA-Compatible", "IE=edge,chrome=1"); Style.Include("http://fonts.googleapis.com/css?family=Lobster&subset=latin"); Style.Include("site.css");