Merge

--HG--
branch : dev

src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/orchard-archivelater-datetime.css

@@ -7,8 +7,18 @@ html.dyn input.hinted {
     font-style:italic;
 }
 input#ArchiveLater_ScheduledArchiveDate {
-    width:50%;
+    width:49%;
 }
 input#ArchiveLater_ScheduledArchiveTime {
-    width:36%;
+    width:43%;
+}
+
+.edit-item-sidebar fieldset.archive-later-datetime {
+    float:left;
+    padding:0 0 8px 0;
+}
+fieldset.archive-later-datetime input {
+    padding:1px;
+    text-align:center;
+    color:#666;
 }

src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml

@@ -8,7 +8,7 @@
     Script.Require("jQueryUtils_TimePicker");
 }
 
-<fieldset>
+<fieldset class="archive-later-datetime">
     <legend>@T("Archive Settings")</legend>
     <div>
         @Html.CheckBox("ArchiveLater", Model.ScheduledArchiveUtc.HasValue, new { id = ViewData.TemplateInfo.GetFullHtmlFieldId("Command_ArchiveLater") })

src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/orchard-contenttypes-admin.css

@@ -43,7 +43,6 @@
 .manage-type .manage-part .manage,
 .manage-type .manage-field .manage,
 .manage-part .manage-field .manage {
-    font-size:1.4em;
     margin-top:-2.4em;
 }
 .manage-field .details,

src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml

@@ -43,7 +43,11 @@
                     featureClassName += " last";
                 }
                 var dependencies = (from d in feature.Descriptor.Dependencies
-                                    select (from f in Model.Features where f.Descriptor.Id == d select f).Single()).OrderBy(f => f.Descriptor.Name);
+                                    select (from f in Model.Features where f.Descriptor.Id == d select f).SingleOrDefault()).Where(f => f != null).OrderBy(f => f.Descriptor.Name);                
+            @* todo: missingDependencies -- show them in a special way. Can be found like this:
+                var missingDependencies = feature.Descriptor.Dependencies
+                    .Where(d => !Model.Features.Any(f => f.Descriptor.Id == d));
+             *@
             <li class="@featureClassName" id="@featureId" title="@T("{0} is {1}", Html.AttributeEncode(featureName), featureState)">
                 <div class="summary">
                     <div class="properties">

src/Orchard.Web/Themes/TheAdmin/Styles/site.css

@@ -78,20 +78,20 @@ header, footer, aside, nav, article { display: block; }
 /* Default font settings. 
 The font-size 81.3% sets the base font to 13px 
 
-Pixels     EMs         Percent Points
-1px     0.077em     7.7%    1pt
-2px     0.154em     15.4%   2pt
-3px     0.231em     23.1%   3pt
-4px     0.308em     30.8%   3pt
-5px     0.385em     38.5%   4pt
-6px     0.462em     46.2%     5pt
-7px     0.538em     53.8%     5pt
-8px     0.615em     61.5%     6pt
-9px     0.692em     69.2%     7pt
-10px     0.769em     76.9%     8pt
-11px     0.846em     84.6%     8pt
-12px     0.923em     92.3%     9pt
-13px     1em         100%     10pt
+Pixels   EMs         Percent    Points
+1px      0.077em     7.7%       1pt
+2px      0.154em     15.4%      2pt
+3px      0.231em     23.1%      3pt
+4px      0.308em     30.8%      3pt
+5px      0.385em     38.5%      4pt
+6px      0.462em     46.2%      5pt
+7px      0.538em     53.8%      5pt
+8px      0.615em     61.5%      6pt
+9px      0.692em     69.2%      7pt
+10px     0.769em     76.9%      8pt
+11px     0.846em     84.6%      8pt
+12px     0.923em     92.3%      9pt
+13px     1em         100%       10pt
 14px     1.077em     107.7%     11pt
 15px     1.154em     115.4%     11pt
 16px     1.231em     123.1%     12pt
@@ -506,7 +506,7 @@ input.large.text, textarea, fieldset {
     clear:both;
 }
 fieldset {
-    margin:0 0 1.3em 0;
+    margin:0 0 1em 0;
     padding:6px 0 0;
 }
 textarea {
@@ -855,7 +855,7 @@ table.items th, table.items td {
 .orchard-blogs .edit-item-sidebar, .contents .edit-item-sidebar 
 {
     border:1px solid #d3d3d3;
-    padding:6px;
+    padding:8px;
     
     /*CSS3 properties*/
         filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#f7f7f7', endColorstr='#f5f5f5');
@@ -885,9 +885,7 @@ fieldset.save-button {
     width:auto;
 }
 fieldset.publish-later-datetime {
-    clear:none;
     float:left;
-    margin: 0 6px;
 }
 fieldset.publish-later-datetime legend {
     display:none;

src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css

@@ -120,10 +120,10 @@ body {
 /* Headings */
 h1,h2,h3,h4,h5,h6 { font-weight: normal; margin:.6em 0;}
 
-h1 { font-size: 1.231em; }
-h2 { font-size: 1.154em; }
-h3 { font-size: 1.077em; }
-h4 { font-size: 1em; }
+h1 { font-size: 1.308em; }
+h2 { font-size: 1.231em; }
+h3 { font-size: 1.154em; }
+h4 { font-size: 1.077em; }
 h5 { font-size: 1em; }
 h6 { font-size: 1em; }
 

src/Orchard/Mvc/Html/HtmlHelperExtensions.cs

@@ -67,74 +67,6 @@ namespace Orchard.Mvc.Html {
             return MvcHtmlString.Create(builder.ToString(TagRenderMode.Normal));
         }
 
-        #region Pager
-
-        public static IHtmlString Pager<T>(this HtmlHelper html, IPageOfItems<T> pageOfItems, int currentPage, int defaultPageSize, object values = null, string previousText = "<", string nextText = ">", bool alwaysShowPreviousAndNext = false) {
-            if (pageOfItems.TotalPageCount < 2)
-                return new HtmlString(string.Empty);
-
-            var sb = new StringBuilder(75);
-            var rvd = new RouteValueDictionary {{"q", ""},{"page", 0}};
-            var viewContext = html.ViewContext;
-            var urlHelper = new UrlHelper(viewContext.RequestContext);
-
-            if (pageOfItems.PageSize != defaultPageSize)
-                rvd.Add("pagesize", pageOfItems.PageSize);
-
-            foreach (var item in viewContext.RouteData.Values) {
-                rvd.Add(item.Key, item.Value);
-            }
-
-
-            if (values != null) {
-                var rvd2 = new RouteValueDictionary(values);
-
-                foreach (var item in rvd2) {
-                    rvd[item.Key] = item.Value;
-                }
-            }
-
-            sb.Append("<p class=\"pager\">");
-
-            if (currentPage > 1 || alwaysShowPreviousAndNext) {
-                if (currentPage == 2)
-                    rvd.Remove("page");
-                else
-                    rvd["page"] = currentPage - 1;
-
-                sb.AppendFormat(" <a href=\"{1}\" class=\"previous\">{0}</a>", previousText,
-                                urlHelper.RouteUrl(rvd));
-            }
-
-            //todo: when there are many pages (> 15?) maybe do something like 1 2 3...6 7 8...13 14 15
-            for (var p = 1; p <= pageOfItems.TotalPageCount; p++) {
-                if (p == currentPage) {
-                    sb.AppendFormat(" <span>{0}</span>", p);
-                }
-                else {
-                    if (p == 1)
-                        rvd.Remove("page");
-                    else
-                        rvd["page"] = p;
-
-                    sb.AppendFormat(" <a href=\"{1}\">{0}</a>", p,
-                                    urlHelper.RouteUrl(rvd));
-                }
-            }
-
-            if (currentPage < pageOfItems.TotalPageCount || alwaysShowPreviousAndNext) {
-                rvd["page"] = currentPage + 1;
-                sb.AppendFormat("<a href=\"{1}\" class=\"next\">{0}</a>", nextText,
-                                urlHelper.RouteUrl(rvd));
-            }
-
-            sb.Append("</p>");
-
-            return new HtmlString(sb.ToString());
-        }
-
-        #endregion
-
         #region UnorderedList
 
         public static IHtmlString UnorderedList<T>(this HtmlHelper htmlHelper, IEnumerable<T> items, Func<T, int, MvcHtmlString> generateContent, string cssClass) {