Merge branch 'temp8' into temp8-upgrade-angular

src/Umbraco.Web.UI.Client/setupgulp.bat

@@ -0,0 +1,23 @@
+@ECHO OFF
+
+ECHO.
+ECHO.
+ECHO This will only work when you have NPM available on the command line
+ECHO Works great with NodeJS Portable - https://gareth.flowers/nodejs-portable/
+ECHO.
+ECHO.
+set /P c=Are you sure you want to continue [Y/N]?
+if /I "%c%" EQU "Y" goto :setupgulp
+if /I "%c%" EQU "N" goto :eof
+
+:setupgulp
+call npm install
+call npm -g install bower
+call npm -g install gulp
+call npm -g install gulp-cli
+
+ECHO.
+ECHO.
+ECHO You should now be able to run: gulp build
+ECHO.
+ECHO.

src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html

@@ -36,7 +36,7 @@
                         </div>
 
                         <div class="umb-healthcheck-message" ng-if="group.totalWarning > 0">
-                            <i class="icon-alert color-yellow"></i>
+                            <i class="icon-alert color-orange"></i>
                             {{ group.totalWarning }}
                         </div>
 

src/Umbraco.Web.UI.Client/src/views/languages/edit.controller.js

@@ -41,7 +41,14 @@
 
                 if($routeParams.create) {
                     vm.page.name = vm.labels.addLanguage;
-                    languageResource.getCultures().then(function(cultures) {
+                    languageResource.getCultures().then(function (culturesDictionary) {
+                        var cultures = [];
+                        angular.forEach(culturesDictionary, function (value, key) {
+                            cultures.push({
+                                name: key,
+                                displayName: value
+                            });
+                        });
                         vm.availableCultures = cultures;
                     });
                 }

src/Umbraco.Web.UI.Client/src/views/languages/edit.html

@@ -25,7 +25,7 @@
                             <select name="newLang"
                                     class="input-block-level"
                                     ng-model="vm.language.culture"
-                                    ng-options="key as value for (key, value) in vm.availableCultures"
+                                    ng-options="culture.name as culture.displayName for culture in vm.availableCultures"
                                     val-server-field="IsoCode"
                                     required></select>
                             <span class="help-inline" val-msg-for="newLang" val-toggle-msg="required">Required</span>