Merge branch '1.9.x' into dev

Conflicts: src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs src/Orchard.Web/Core/Navigation/Scripts/navigation-admin.js src/Orchard.Web/Core/Navigation/Styles/navigation-admin.css src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml src/Orchard.Web/Modules/Orchard.Workflows/Styles/orchard-workflows-admin.css src/Orchard/Commands/CommandBackgroundService.cs.rej
2025-10-15 19:54:57 +08:00 · 2015-12-03 00:07:28 +01:00
parent 33484ae31a 15d27043d7
commit d173816619
13 changed files with 1806 additions and 1805 deletions
--- a/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef
+++ b/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef
@@ -28,7 +28,7 @@
    <Startup>
      <Task commandLine="Startup\SetIdleTimeout.cmd" executionContext="elevated" taskType="simple">
        <Environment>
-          <!-- Create the environment variable that informs the startup task whether it is running 
+          <!-- Create the environment variable that informs the startup task whether it is running 
 			   in the compute emulator or in the cloud. -->
          <Variable name="ComputeEmulatorRunning">
            <RoleInstanceValue xpath="/RoleEnvironment/Deployment/@emulated" />
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
@@ -82,10 +82,10 @@ namespace Orchard.Blogs {
                    .WithPart("CommonPart")
                    .WithPart("WidgetPart")
                    .WithSetting("Stereotype", "Widget")
-                    .WithPart("IdentityPart")
+                    .WithPart("IdentityPart")
                );

-            return 7;
+            return 7;
        }

        public int UpdateFrom1() {
@@ -132,14 +132,14 @@ namespace Orchard.Blogs {

            return 6;
        }
-
-        public int UpdateFrom6() {
-            ContentDefinitionManager.AlterTypeDefinition("BlogArchives",
-                cfg => cfg
-                    .WithPart("IdentityPart")
-                );
-
-           return 7;
-       }
+
+        public int UpdateFrom6() {
+            ContentDefinitionManager.AlterTypeDefinition("BlogArchives",
+                cfg => cfg
+                    .WithPart("IdentityPart")
+                );
+
+           return 7;
+       }
    }
 }
--- a/src/Orchard.Web/Modules/Orchard.ImageEditor/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.ImageEditor/Placement.info
@@ -10,8 +10,8 @@
    <Place Parts_Image_Editor_CropOptions="Options"/>
    <Place Parts_Image_Editor_Resize="Buttons:6"/>
    <Place Parts_Image_Editor_ResizeOptions="Options"/>
-    <Place Parts_Image_Editor_Rotate="Buttons:7"/>
-    <Place Parts_Image_Editor_RotateOptions="Options"/>
+    <Place Parts_Image_Editor_Rotate="Buttons:7"/>
+    <Place Parts_Image_Editor_RotateOptions="Options"/>

    <Place Parts_Image_Editor_Filter="Buttons:7"/>
    <Place Parts_Image_Editor_FilterOptions="Options"/>
--- a/src/Orchard.Web/Modules/Orchard.Search/Views/Parts/Search.MediaLibrary.Actions.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Parts/Search.MediaLibrary.Actions.cshtml
@@ -23,5 +23,6 @@
    };
    
    //]]>
-</script>
+</script>
+
 }
--- a/src/Orchard.Web/Modules/Orchard.Setup/Annotations/SetupValidationAttributes.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Annotations/SetupValidationAttributes.cs
@@ -68,8 +68,8 @@ namespace Orchard.Setup.Annotations {
            if (string.IsNullOrEmpty(_value))
                return T("Password is required.").Text;

-            return _value.Length < (int)Minimum
-                ? T("Password must be at least {0} characters.", Minimum).Text
+            return _value.Length < (int)Minimum
+                ? T("Password must be at least {0} characters.", Minimum).Text
                : T("Password can be no longer than {0} characters.", Maximum).Text;
        }
    }
--- a/src/Orchard.Web/Modules/Orchard.Tokens/Scripts/orchard-tokens-admin.js
+++ b/src/Orchard.Web/Modules/Orchard.Tokens/Scripts/orchard-tokens-admin.js
@@ -25,27 +25,27 @@
    }
 });

-jQuery.fn.extend({
-    tokenized : function () {
-        return $(this).each(function () {
-            var _this = $(this);
+jQuery.fn.extend({
+    tokenized : function () {
+        return $(this).each(function () {
+            var _this = $(this);

-            // add an icon to tokenized inputs
-            _this.wrap('<span class="token-wrapper"></span>');
-            var popup = $('<div><span class="tokenized-popup">&nbsp;</span></div>')
-            _this.parent().prepend(popup);
-
-            // show the full list of tokens when the icon is clicked
-            popup.children('.tokenized-popup').click(function () {
-                var input = $(this).parent().next();
-                // pass empty string as value to search for, displaying all results
-                input.autocomplete("search", "");
-                input.focus();
-            });
-
-            $(this).autocomplete({
+            // add an icon to tokenized inputs
+            _this.wrap('<span class="token-wrapper"></span>');
+            var popup = $('<div><span class="tokenized-popup">&nbsp;</span></div>')
+            _this.parent().prepend(popup);
+
+            // show the full list of tokens when the icon is clicked
+            popup.children('.tokenized-popup').click(function () {
+                var input = $(this).parent().next();
+                // pass empty string as value to search for, displaying all results
+                input.autocomplete("search", "");
+                input.focus();
+            });
+
+            $(this).autocomplete({
                minLength: 0,
-                source: $.tokens,
+                source: $.tokens,
                select: function (event, ui) {
                    $(this).insertAtCaret(ui.item.value);
                    return false;
@@ -62,18 +62,18 @@ jQuery.fn.extend({
                        .appendTo(ul);
                };
            });
-        });
-    },
-});
+        });
+    },
+});

-$(function() {
+$(function() {

-    $.tokens = {};
+    $.tokens = {};

-    // provide autocomplete behavior to tokenized inputs
-    // tokensUrl is initialized from the view
-    $.get(tokensUrl, function (data) {
-        $.tokens = data;
-        $('.tokenized').tokenized();
+    // provide autocomplete behavior to tokenized inputs
+    // tokensUrl is initialized from the view
+    $.get(tokensUrl, function (data) {
+        $.tokens = data;
+        $('.tokenized').tokenized();
    });
 });
--- a/src/Orchard.Web/Modules/Orchard.jQuery/Scripts/calendars/jquery.calendars-me.js
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Scripts/calendars/jquery.calendars-me.js
@@ -1,5 +1,5 @@
 /* http://keith-wood.name/calendars.html
-   Montenegrin localisation for Gregorian/Julian calendars for jQuery.
+   Montenegrin localisation for Gregorian/Julian calendars for jQuery.
   By Miloš Milošević - fleka d.o.o. */
 (function($) {
 	$.calendars.calendars.gregorian.prototype.regionalOptions['me'] = {
--- a/src/Orchard.Web/Modules/Orchard.jQuery/Scripts/calendars/jquery.calendars.lang.js
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Scripts/calendars/jquery.calendars.lang.js
@@ -1014,7 +1014,7 @@
 	}
 })(jQuery);
 /* http://keith-wood.name/calendars.html
-   Montenegrin localisation for Gregorian/Julian calendars for jQuery.
+   Montenegrin localisation for Gregorian/Julian calendars for jQuery.
   By Miloš Milošević - fleka d.o.o. */
 (function($) {
 	$.calendars.calendars.gregorian.prototype.regionalOptions['me-ME'] = {
@@ -1037,7 +1037,7 @@
 	}
 })(jQuery);
 /* http://keith-wood.name/calendars.html
-   Montenegrin localisation for Gregorian/Julian calendars for jQuery.
+   Montenegrin localisation for Gregorian/Julian calendars for jQuery.
   By Miloš Milošević - fleka d.o.o. */
 (function($) {
 	$.calendars.calendars.gregorian.prototype.regionalOptions['me'] = {
--- a/src/Orchard.Web/Modules/Orchard.jQuery/Scripts/calendars/jquery.calendars.picker.lang.js
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Scripts/calendars/jquery.calendars.picker.lang.js
@@ -933,48 +933,48 @@
 	};
 	$.calendarsPicker.setDefaults($.calendarsPicker.regionalOptions['lv']);
 })(jQuery);
-/* http://keith-wood.name/calendars.html
-   Montenegrin localisation for calendars datepicker for jQuery.
-   Written by Miloš Milošević - fleka d.o.o. */
-(function($) {
-	$.calendarsPicker.regionalOptions['me-ME'] = {
-		renderer: $.calendarsPicker.defaultRenderer,
-		prevText: '&#x3c;', prevStatus: 'Prikaži prethodni mjesec',
-		prevJumpText: '&#x3c;&#x3c;', prevJumpStatus: 'Prikaži prethodnu godinu',
-		nextText: '&#x3e;', nextStatus: 'Prikaži sljedeći mjesec',
-		nextJumpText: '&#x3e;&#x3e;', nextJumpStatus: 'Prikaži sljedeću godinu',
-		currentText: 'Danas', currentStatus: 'Tekući mjesec',
-		todayText: 'Danas', todayStatus: 'Tekući mjesec',
-		clearText: 'Obriši', clearStatus: 'Obriši trenutni datum',
-		closeText: 'Zatvori', closeStatus: 'Zatvori kalendar',
-		yearStatus: 'Prikaži godine', monthStatus: 'Prikaži mjesece',
-		weekText: 'Sed', weekStatus: 'Sedmica',
-		dayStatus: '\'Datum\' DD, M d', defaultStatus: 'Odaberi datum',
-		isRTL: false
-	};
-	$.calendarsPicker.setDefaults($.calendarsPicker.regionalOptions['me-ME']);
-})(jQuery);
-/* http://keith-wood.name/calendars.html
-   Montenegrin localisation for calendars datepicker for jQuery.
-   Written by Miloš Milošević - fleka d.o.o. */
-(function($) {
-	$.calendarsPicker.regionalOptions['me'] = {
-		renderer: $.calendarsPicker.defaultRenderer,
-		prevText: '&#x3c;', prevStatus: 'Прикажи претходни мјесец',
-		prevJumpText: '&#x3c;&#x3c;', prevJumpStatus: 'Прикажи претходну годину',
-		nextText: '&#x3e;', nextStatus: 'Прикажи сљедећи мјесец',
-		nextJumpText: '&#x3e;&#x3e;', nextJumpStatus: 'Прикажи сљедећу годину',
-		currentText: 'Данас', currentStatus: 'Текући мјесец',
-		todayText: 'Данас', todayStatus: 'Текући мјесец',
-		clearText: 'Обриши', clearStatus: 'Обриши тренутни датум',
-		closeText: 'Затвори', closeStatus: 'Затвори календар',
-		yearStatus: 'Прикажи године', monthStatus: 'Прикажи мјесеце',
-		weekText: 'Сед', weekStatus: 'Седмица',
-		dayStatus: '\'Датум\' DD d MM', defaultStatus: 'Одабери датум',
-		isRTL: false
-	};
-	$.calendarsPicker.setDefaults($.calendarsPicker.regionalOptions['me']);
-})(jQuery);
+/* http://keith-wood.name/calendars.html
+   Montenegrin localisation for calendars datepicker for jQuery.
+   Written by Miloš Milošević - fleka d.o.o. */
+(function($) {
+	$.calendarsPicker.regionalOptions['me-ME'] = {
+		renderer: $.calendarsPicker.defaultRenderer,
+		prevText: '&#x3c;', prevStatus: 'Prikaži prethodni mjesec',
+		prevJumpText: '&#x3c;&#x3c;', prevJumpStatus: 'Prikaži prethodnu godinu',
+		nextText: '&#x3e;', nextStatus: 'Prikaži sljedeći mjesec',
+		nextJumpText: '&#x3e;&#x3e;', nextJumpStatus: 'Prikaži sljedeću godinu',
+		currentText: 'Danas', currentStatus: 'Tekući mjesec',
+		todayText: 'Danas', todayStatus: 'Tekući mjesec',
+		clearText: 'Obriši', clearStatus: 'Obriši trenutni datum',
+		closeText: 'Zatvori', closeStatus: 'Zatvori kalendar',
+		yearStatus: 'Prikaži godine', monthStatus: 'Prikaži mjesece',
+		weekText: 'Sed', weekStatus: 'Sedmica',
+		dayStatus: '\'Datum\' DD, M d', defaultStatus: 'Odaberi datum',
+		isRTL: false
+	};
+	$.calendarsPicker.setDefaults($.calendarsPicker.regionalOptions['me-ME']);
+})(jQuery);
+/* http://keith-wood.name/calendars.html
+   Montenegrin localisation for calendars datepicker for jQuery.
+   Written by Miloš Milošević - fleka d.o.o. */
+(function($) {
+	$.calendarsPicker.regionalOptions['me'] = {
+		renderer: $.calendarsPicker.defaultRenderer,
+		prevText: '&#x3c;', prevStatus: 'Прикажи претходни мјесец',
+		prevJumpText: '&#x3c;&#x3c;', prevJumpStatus: 'Прикажи претходну годину',
+		nextText: '&#x3e;', nextStatus: 'Прикажи сљедећи мјесец',
+		nextJumpText: '&#x3e;&#x3e;', nextJumpStatus: 'Прикажи сљедећу годину',
+		currentText: 'Данас', currentStatus: 'Текући мјесец',
+		todayText: 'Данас', todayStatus: 'Текући мјесец',
+		clearText: 'Обриши', clearStatus: 'Обриши тренутни датум',
+		closeText: 'Затвори', closeStatus: 'Затвори календар',
+		yearStatus: 'Прикажи године', monthStatus: 'Прикажи мјесеце',
+		weekText: 'Сед', weekStatus: 'Седмица',
+		dayStatus: '\'Датум\' DD d MM', defaultStatus: 'Одабери датум',
+		isRTL: false
+	};
+	$.calendarsPicker.setDefaults($.calendarsPicker.regionalOptions['me']);
+})(jQuery);
 /* http://keith-wood.name/calendars.html
   Македонски MK localisation for calendars datepicker for jQuery.
   Hajan Selmani (hajan [at] live [dot] com). */
--- a/src/Orchard.Web/Modules/Orchard.jQuery/Scripts/calendars/jquery.calendars.ummalqura-ar.js
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Scripts/calendars/jquery.calendars.ummalqura-ar.js
@@ -1,5 +1,5 @@
-/* http://keith-wood.name/calendars.html
-   Arabic localisation for UmmAlQura calendar for jQuery v2.0.0.
+/* http://keith-wood.name/calendars.html
+   Arabic localisation for UmmAlQura calendar for jQuery v2.0.0.
   Written by Amro Osama March 2013. */
 (function ($) {
 	$.calendars.calendars.ummalqura.prototype.regionalOptions['ar'] = {
@@ -14,4 +14,4 @@
 		firstDay: 6, // The first day of the week, Sat = 0, Sun = 1, ...
 		isRTL: true // True if right-to-left language, false if left-to-right
 	};
-})(jQuery);
+})(jQuery);