Merge pull request #289 from warcraftlfg/bmagic

Bmagic
warcraftlfg · Feb 8, 2016 · 24f6d43 · 24f6d43
2 parents d96dc42 + 5ad8da2
commit 24f6d43
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 12 deletions.
diff --git a/client/app/blocks/wlfgTimezoneOffset/warcraft-lfg.timezone-offset.filter.js b/client/app/blocks/wlfgTimezoneOffset/warcraft-lfg.timezone-offset.filter.js
@@ -0,0 +1,18 @@
+angular
+    .module('blocks.wlfgTimezoneOffset')
+    .filter('wlfgTimezoneOffset', wlfgTimezoneOffset);
+
+function wlfgTimezoneOffset() {
+
+    return function (input) {
+        var zone = moment.tz.zone(input);
+        if (zone) {
+            var offset = zone.parse(Date.UTC()) / 60;
+            if (offset >= 0) {
+                return "+" + offset;
+            } else {
+                return offset;
+            }
+        }
+    };
+}
diff --git a/client/app/blocks/wlfgTimezoneOffset/warcraft-lfg.timezone-offset.module.js b/client/app/blocks/wlfgTimezoneOffset/warcraft-lfg.timezone-offset.module.js
@@ -0,0 +1,5 @@
+(function() {
+    'use strict';
+
+    angular.module('blocks.wlfgTimezoneOffset', []);
+})();
diff --git a/client/app/character/character-update.html b/client/app/character/character-update.html
@@ -94,7 +94,7 @@ <h1><span class="icon-medium faction-{{character.bnet.faction}}"></span><span cl
                     <label>{{"CHARACTER_CREATE_TIMEZONE"|translate}}</label>
                     <div class="css3-metro-dropdown css3-metro-dropdown-inverse">
                         <select ng-model="character.ad.timezone" class="form-control">
-                            <option ng-repeat="timezone in timezones" value="{{timezone}}">{{"TIMEZONE_"+timezone|uppercase|translate}}</option>
+                            <option ng-repeat="timezone in timezones" value="{{timezone}}">{{"TIMEZONE_"+timezone|uppercase|translate}} (GMT{{timezone | wlfgTimezoneOffset}})</option>
                         </select>
                     </div>
                 </div>

diff --git a/client/app/character/directive/menu/character.menu.directive.js b/client/app/character/directive/menu/character.menu.directive.js
@@ -11,7 +11,7 @@ function wlfgCharacterMenu() {
     return directive;
 
     function link($scope, element, attrs) {
-        $scope.menuContentShowed = false;
+        $scope.menuContentShowed = true;
     }
 
 }
diff --git a/client/app/core/constants.js b/client/app/core/constants.js
@@ -5,5 +5,5 @@
     angular
         .module('app.core')
 	    .constant("LANGUAGES",["en","de","fr","es","ru","bg","zh","hr","cs","da","nl","et","fi","el","he","hu","it","ja","ko","lv","lt","no","pl","pt","ro","sl","sv","tw","tr"])
-        .constant("TIMEZONES", ["America/Chicago","America/Los_Angeles","America/New_York","America/Denver","America/Sao_Paulo","Australia/Melbourne","Asia/Seoul","Asia/Taipei","Europe/London","Europe/Paris","Europe/Berlin","Europe/Madrid","Europe/Lisbon","Europe/Moscow"]);
+        .constant("TIMEZONES", ["Australia/Melbourne","Asia/Seoul","Asia/Taipei","Europe/Moscow","Europe/Paris","Europe/Berlin","Europe/Madrid","Europe/London","Europe/Lisbon","America/Sao_Paulo","America/New_York","America/Chicago","America/Denver","America/Los_Angeles","US/Hawaii"]);
 })();
diff --git a/client/app/core/core.module.js b/client/app/core/core.module.js
@@ -10,7 +10,7 @@
         /*
          * Our reusable cross app code modules
          */
-        'blocks.socket', 'blocks.wlfgConfirm', 'blocks.wlfgAppTitle', 'blocks.wlfgWCL',
+        'blocks.socket', 'blocks.wlfgConfirm', 'blocks.wlfgAppTitle', 'blocks.wlfgWCL','blocks.wlfgTimezoneOffset',
         //'blocks.exception', 'blocks.logger', 'blocks.router',
         /*
          * 3rd Party modules

diff --git a/client/app/filter/time/filter.day.directive.html b/client/app/filter/time/filter.day.directive.html
@@ -5,7 +5,7 @@
             <div class="col-md-12 p-l-5">
                 <div class="css3-metro-dropdown">
                     <select ng-model="timezone" class="form-control">
-                        <option ng-repeat="timezone in timezones" value="{{timezone}}">{{"TIMEZONE_"+timezone|uppercase|translate}}</option>
+                        <option ng-repeat="timezone in timezones" value="{{timezone}}">{{"TIMEZONE_"+timezone|uppercase|translate}} (GMT{{timezone | wlfgTimezoneOffset}})</option>
                     </select>
                 </div>
             </div>

diff --git a/client/app/guild/directive/menu/guild.menu.directive.js b/client/app/guild/directive/menu/guild.menu.directive.js
@@ -11,7 +11,7 @@ function wlfgGuildMenu() {
     return directive;
 
     function link($scope, element, attrs) {
-        $scope.menuContentShowed = false;
+        $scope.menuContentShowed = true;
     }
 
 }
diff --git a/client/app/guild/guild-update.html b/client/app/guild/guild-update.html
@@ -87,7 +87,7 @@ <h2>{{ guild.name }}</h2>
                         <label>{{"CHARACTER_CREATE_TIMEZONE"|translate}}</label>
                         <div class="css3-metro-dropdown css3-metro-dropdown-inverse">
                             <select ng-model="guild.ad.timezone" class="form-control">
-                                <option ng-repeat="timezone in timezones" value="{{timezone}}">{{"TIMEZONE_"+timezone|uppercase|translate}}</option>
+                                <option ng-repeat="timezone in timezones" value="{{timezone}}">{{"TIMEZONE_"+timezone|uppercase|translate}} (GMT{{timezone | wlfgTimezoneOffset}})</option>
                             </select>
                         </div>
                     </div>

diff --git a/client/app/guild/guild.js b/client/app/guild/guild.js
@@ -45,12 +45,16 @@
                         name: $stateParams.name
                     }, function (data) {
 
-                        if(data && data.rank && guild && guild.perms && guild.perms.ad && guild.perms.ad.edit){
-                            if(guild.perms.ad.edit.indexOf(data.rank)!=-1){
+                        if(guild && !guild.perms){
+                            //No perms set everyone can edit.
+                            $scope.userCanEdit = true;
+                        }
+                        if(data && guild && guild.perms && guild.perms.ad && guild.perms.ad.edit){
+                            if(guild.perms.ad.edit.indexOf(data.rank)>=0){
                                 $scope.userCanEdit = true;
-                                console.log('ici');
                             }
                         }
+
                         $scope.$parent.loading = false;
                     });
                 }

diff --git a/client/assets/locales/locale-en_US.json b/client/assets/locales/locale-en_US.json
@@ -250,6 +250,7 @@
   "TIMEZONE_EUROPE/MADRID": "Europe/Madrid",
   "TIMEZONE_EUROPE/LISBON": "Europe/Lisbon",
   "TIMEZONE_EUROPE/MOSCOW": "Europe/Moscow",
+  "TIMEZONE_US/HAWAII": "US/Hawaii",
   "BNET_API_CHARACTER_NOT_FOUND": "Unable to find this player on Battle.net.",
   "BNET_API_GUILD_NOT_FOUND": "Unable to find this guild on Battle.net.",
   "BNET_API_ERROR_DENY": "Authentication error with Battle.net. Please try later or check your security settings on Battle.net",

diff --git a/client/index.html b/client/index.html
@@ -102,6 +102,9 @@
         <script src="/app/blocks/wlfgConfirm/warcraft-lfg.confirm.controller.js"></script>
         <script src="/app/blocks/wlfgWCL/warcraft-lfg.warcraft-logs.module.js"></script>
         <script src="/app/blocks/wlfgWCL/warcraft-lfg.warcraft-logs.filter.js"></script>
+        <script src="/app/blocks/wlfgTimezoneOffset/warcraft-lfg.timezone-offset.module.js"></script>
+        <script src="/app/blocks/wlfgTimezoneOffset/warcraft-lfg.timezone-offset.filter.js"></script>
+
         <script src="/app/blocks/select.convert-to-number.directive.js"></script>
 
 

diff --git a/server/app/config/db/characterAdSchema.json b/server/app/config/db/characterAdSchema.json
@@ -100,7 +100,7 @@
     "timezone": {
       "type": "string",
       "default": "Europe/London",
-      "enum": ["America/Chicago","America/Los_Angeles","America/New_York","America/Denver","America/Sao_Paulo","Australia/Melbourne","Asia/Seoul","Asia/Taipei","Europe/London","Europe/Paris","Europe/Berlin","Europe/Madrid","Europe/Lisbon","Europe/Moscow"]
+      "enum": ["America/Chicago","America/Los_Angeles","America/New_York","America/Denver","America/Sao_Paulo","Australia/Melbourne","Asia/Seoul","Asia/Taipei","Europe/London","Europe/Paris","Europe/Berlin","Europe/Madrid","Europe/Lisbon","Europe/Moscow","US/Hawaii"]
     },
     "play_time": {
       "type": "object",

diff --git a/server/app/config/db/guildAdSchema.json b/server/app/config/db/guildAdSchema.json
@@ -157,7 +157,7 @@
     "timezone": {
       "type": "string",
       "default": "Europe/London",
-      "enum": ["America/Chicago","America/Los_Angeles","America/New_York","America/Denver","America/Sao_Paulo","Australia/Melbourne","Asia/Seoul","Asia/Taipei","Europe/London","Europe/Paris","Europe/Berlin","Europe/Madrid","Europe/Lisbon","Europe/Moscow"]
+      "enum": ["America/Chicago","America/Los_Angeles","America/New_York","America/Denver","America/Sao_Paulo","Australia/Melbourne","Asia/Seoul","Asia/Taipei","Europe/London","Europe/Paris","Europe/Berlin","Europe/Madrid","Europe/Lisbon","Europe/Moscow","US/Hawaii"]
     },
     "play_time": {
       "type": "object",