[hotfix] change made to add another palette

rgolea · rgolea · commit 3dd2a6f922ed · 2015-05-22T19:08:17.000+02:00
diff --git a/public/app/settings/controller/routes.js b/public/app/settings/controller/routes.js
@@ -1,20 +1,26 @@
 //app.constant('PALETTES', ['red', 'purple', 'deep-purple', 'indigo', 'blue', 'light-blue', 'cyan', 'teal', 'green', 'light-green', 'lime', 'yellow', 'amber', 'orange', 'deep-orange', 'brown', 'grey', 'blue-grey']);
 
-app.constant('PALETTES', ['red', 'blue', 'blue-grey', 'lime']);
+app.constant('PALETTES', ['red', 'purple', 'deep-purple', 'indigo']);
 
 app.config(['$stateProvider', '$mdThemingProvider', 'PALETTES', function ($stateProvider, $mdThemingProvider, PALETTES) {
 
+    $mdThemingProvider.alwaysWatchTheme(true);
+
+
     PALETTES.forEach(function (primary, i) {
         PALETTES.forEach(function (accent, j) {
-            if (i !== j) {
-                $mdThemingProvider.theme(primary + '_' + accent)
-                    .primaryPalette(primary)
-                    .accentPalette(accent);
-            }
+            PALETTES.forEach(function (warn, k) {
+                if (i !== j || j !== k || i !== k) {
+                    $mdThemingProvider.theme(primary + '_' + accent + '_' + warn)
+                        .primaryPalette(primary)
+                        .accentPalette(accent)
+                        .warnPalette(warn);
+                }
+
+            });
         });
     });
 
-    $mdThemingProvider.alwaysWatchTheme(true);
 
     $stateProvider
         .state('dashboard.settings', {
diff --git a/public/app/settings/partials/dashboard.settings.html b/public/app/settings/partials/dashboard.settings.html
@@ -31,6 +31,9 @@ <h3>{{setting.name | uppercase}}</h3>
             <md-select placeholder="Accent palette" ng-model="newSetting.accent" style="width:100%;">
                 <md-option ng-repeat="palette in palettes" value="{{palette}}">{{palette | uppercase}}</md-option>
             </md-select>
+            <md-select placeholder="Warn palette" ng-model="newSetting.warn" style="width:100%;">
+                <md-option ng-repeat="palette in palettes" value="{{palette}}">{{palette | uppercase}}</md-option>
+            </md-select>
             <md-switch ng-model="newSetting.active">Active</md-switch>
             <md-button type="submit" class="md-raised md-primary">Submit</md-button>
             <md-button type="button" ng-click="reset()" class="md-raised">Reset</md-button>
diff --git a/public/index.html b/public/index.html
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="dist/style.min.css">
 </head>
 
-<body md-theme="{{settings.primary}}_{{settings.accent}}">
+<body md-theme="{{settings.primary}}_{{settings.accent}}_{{settings.warn}}">
     <ui-view></ui-view>
     <script src="dpd.js"></script>
     <script src="dist/script.min.js"></script>
diff --git a/resources/settings/config.json b/resources/settings/config.json
@@ -40,6 +40,14 @@
 			"required": true,
 			"id": "accent",
 			"order": 4
+		},
+		"warn": {
+			"name": "warn",
+			"type": "string",
+			"typeLabel": "string",
+			"required": true,
+			"id": "warn",
+			"order": 5
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,14 @@`
`40`	`40`	`"required": true,`
`41`	`41`	`"id": "accent",`
`42`	`42`	`"order": 4`
	`43`	`+ },`
	`44`	`+ "warn": {`
	`45`	`+ "name": "warn",`
	`46`	`+ "type": "string",`
	`47`	`+ "typeLabel": "string",`
	`48`	`+ "required": true,`
	`49`	`+ "id": "warn",`
	`50`	`+ "order": 5`
`43`	`51`	`}`
`44`	`52`	`}`
`45`	`53`	`}`