From f44af10cddb8cca5b565b8a7e63f75c998b2c5bc Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 31 Jul 2015 15:40:00 -0400
Subject: [PATCH] (feat) integrated the color picker in the pref module

---
 UI/Templates/PreferencesUI/UIxPreferences.wox | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 26e2cbf15..829679b62 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -328,7 +328,9 @@
               <md-list-item ng-repeat="item in
                                        app.preferences.defaults.SOGoCalendarCategories
                                        track by $index">
-                <i class="md-avatar" ng-style="{'background-color': '{{app.preferences.defaults.SOGoCalendarCategoriesColors[item]}}'}"><!-- category color --></i>
+                <i class="md-avatar" ng-style="{'background-color': app.preferences.defaults.SOGoCalendarCategoriesColors[item]}">
+                  <sg-color-picker sg-on-select="app.preferences.defaults.SOGoCalendarCategoriesColors[item] = color"><!-- color picker--></sg-color-picker>
+                </i>
                 <md-input-container>
 	          <input type="text" label:aria-label="Calendar Category" ng-model="app.preferences.defaults.SOGoCalendarCategories[$index]"/>
                 </md-input-container>
@@ -615,7 +617,9 @@
                   <md-list>
                     <md-list-item ng-repeat="(key, value) in
                                              app.preferences.defaults.SOGoMailLabelsColors">
-                      <i class="md-avatar" ng-style="{'background-color': '{{value[1]}}'}"><!-- label color --></i>
+                      <i class="md-avatar" ng-style="{'background-color': value[1]}">
+                        <sg-color-picker sg-on-select="value[1] = color"><!-- color picker--></sg-color-picker>
+                      </i>
                       <md-input-container>
 	                <input type="text"
                                label:aria-label="Label"