Merge branch '1.x' into feature/audittrail

src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj

@@ -553,11 +553,6 @@
   <ItemGroup>
     <Content Include="Scripts\lib\MPEG Dash Notice.docx" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Styles\cloudmedia-edit-cloudvideopart.css.map">
-      <DependentUpon>cloudmedia-edit-cloudvideopart.css</DependentUpon>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="Scripts\cloudmedia-admin-common.js.map" />
     <Content Include="Scripts\cloudmedia-admin-job.js.map" />

src/Orchard.Web/Modules/Orchard.Modules/Scripts/features.admin.js

@@ -4,7 +4,7 @@
         var bulkActions = $(".bulk-actions-wrapper").addClass("visible");
         var theSwitch = $(".switch-for-switchable");
         theSwitch.prepend(bulkActions);
-        $("#search-box").focus().keyup(function() {
+        $("#search-box").keyup(function() {
             var text = $(this).val();
 
             if (text == '') {

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

@@ -22,7 +22,7 @@
     <div class="bulk-actions-wrapper">
         <fieldset class="bulk-actions">
             <label for="search-box">@T("Filter:")</label>
-            <input id="search-box" class="text" type="text" />
+            <input id="search-box" class="text" type="text" autofocus="autofocus" />
         </fieldset>
         <fieldset class="bulk-actions">
             <label for="publishActions">@T("Actions:")</label>

src/Orchard.Web/Modules/Orchard.Workflows/Module.txt

@@ -11,6 +11,7 @@ Features:
         Description: Provides tools to create custom workflows.
         Dependencies: Orchard.Tokens, Orchard.Forms, Orchard.jQuery
     Orchard.Workflows.Timer:
+		Name: Workflows Timer
         Description: Provides a Timer activity.
         Category: Workflows
         Dependencies: Orchard.Workflows

src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js

@@ -70,10 +70,54 @@
 
         return confirm(confirmRemoveMessage);
     });
-    
+
     $(".check-all").change(function () {
         $(this).parents("table.items").find(":checkbox:not(:disabled)").prop('checked', $(this).prop("checked"));
-    }); 
+    });
+
+    var generateMenuFilter = function () {
+        var adminMenu = $("ul.menu-admin");
+        var filterText = adminMenu.data("filter-watermark");
+        var filterMenuItem = $('<li><div class="admin-menu-filter"><input id="adminfilter" type="text" class="text-box" placeholder=' + filterText + '></div></li>');
+
+        $("ul.menu-admin").prepend(filterMenuItem);
+
+        // If no one else wants the focus, take it.
+        setTimeout(function () {
+            if ($("[autofocus]").length == 0) {
+                $("#adminfilter").focus();
+            }
+        }, 100);
+
+        var allListItems = $("ul.menu-admin li ul li").not("#NavFilter");
+        var itemHeading = $("ul.menu-admin li h3");
+
+        $("#adminfilter").keyup(function () {
+            var a = $(this).val();
+
+            var filteredItemHeading = itemHeading.filter(function (b, c) {
+                return $(c).text().toLowerCase().indexOf(a) !== -1;
+            });
+
+            itemHeading.show();
+            itemHeading.parent().hide();
+            filteredItemHeading.parent().show();
+            if (filteredItemHeading.length == 0) {
+                itemHeading.parent().hide();
+                var childListItem = allListItems.filter(function (b, c) {
+                    return $(c).text().toLowerCase().indexOf(a) !== -1;
+                });
+
+                allListItems.hide();
+                childListItem.parent().parent().show();
+                childListItem.show();
+            } else {
+                allListItems.show();
+            }
+        });
+    };
+
+    generateMenuFilter();
 })(jQuery);
 
 

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

@@ -366,6 +366,25 @@ ul.disc {list-style:disc inside; margin:12px 0;}
 }
 ul.menuItems {margin:6px 0 0 0;}
 
+.admin-menu-filter {
+    background: #2b2b2b url('./images/menu-filter.png') no-repeat 8px 6px;
+    border: 1px solid #404040;
+    -ms-border-radius: 2px;
+    border-radius: 2px;
+    -webkit-box-shadow: 0 0 1px rgba(64, 64, 64, 1) inset, 1px 1px 1px rgba(54, 54, 65, 1);
+    -ms-box-shadow: 0 0 1px rgba(64, 64, 64, 1) inset, 1px 1px 1px rgba(54, 54, 65, 1);
+    box-shadow: 0 0 1px rgba(64, 64, 64, 1) inset, 1px 1px 1px rgba(54, 54, 65, 1);
+    padding: 3px 0 3px 26px;
+    width: 180px;
+}
+
+.admin-menu-filter input#adminfilter {
+    border: none;
+    color: #8a8a8a;
+    width: 95%;
+    background: #2b2b2b;
+}
+
 /******Tabs******/
 #local-navigation {margin:8px 0 -8px 0;}
 

src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml

@@ -11,6 +11,7 @@
     }
 
     Model.Attributes.Add("role", "navigation");
+    Model.Attributes.Add("data-filter-watermark", T("filter").Text);
     var tag = Tag(Model, "ul");
 }
 @tag.StartElement

src/Orchard.Web/Themes/Themes.csproj

@@ -83,6 +83,7 @@
     <Content Include="TheAdmin\Styles\images\menuOpen.gif" />
     <Content Include="TheAdmin\Styles\images\menuOpenHover.gif" />
     <Content Include="TheAdmin\Styles\images\vinesBackgroundBottom.gif" />
+    <Content Include="TheAdmin\Styles\images\menu-filter.png" />
     <Content Include="TheThemeMachine\Styles\Site.css" />
     <Content Include="TheThemeMachine\Theme.png" />
     <Content Include="TheThemeMachine\Theme.txt" />