Merge master

dev/publicRouteMiddleware.js

@@ -31,6 +31,7 @@ const routes = [
   'help',
   'helpus',
   'invite',
+  'spread',
   'legacy',
   'livemap',
   'localstorage',

dev/webpack.appfd.config.js

@@ -73,7 +73,7 @@ module.exports = new Config().extend({
     }),
     // CC new FaviconsPlugin('images/user_logo.png'),
     new webpack.DefinePlugin({
-      APP_VERSION: JSON.stringify('1.4.12, 20 March 2019'),
+      APP_VERSION: JSON.stringify('1.4.13, 15 April 2019'),
       // CC SET ABOVE: API: JSON.stringify(BASE_URL+'/api/'),
       FACEBOOK_APPID: JSON.stringify('134980666550322'),
       FACEBOOK_GRAFFITI_APPID: JSON.stringify('115376591981611'),

http/css/style.less

@@ -699,6 +699,12 @@ a.nodecor, a.nodecor:hover, a.nodecor:visited, a.nodecor:link, a.nodecor:active
     border-radius: 12px;
 }
 
+.img-largethumbnail {
+    min-width:250px !important;
+    max-width:250px !important;
+    width:250px !important;
+}
+
 .img-mediumthumbnail {
     min-width:125px !important;
     max-width:125px !important;

http/js/iznik/base.js

@@ -309,7 +309,7 @@ define([
   Iznik.wbr = function (str, num) {
     var re = RegExp('([^\\s]{' + num + '})(\\w)', 'g')
     return str.replace(re, function (all, text, char) {
-      return text + '<wbr>' + char
+      return text + "\n" + char
     })
   }
 

http/js/iznik/models/admin.js

@@ -1,28 +1,46 @@
 define([
-    'jquery',
-    'underscore',
-    'backbone',
-    'iznik/base'
-], function($, _, Backbone, Iznik) {
-    Iznik.Models.Admin = Iznik.Model.extend({
-        urlRoot: API + 'admin',
+  'jquery',
+  'underscore',
+  'backbone',
+  'iznik/base'
+], function ($, _, Backbone, Iznik) {
+  Iznik.Models.Admin = Iznik.Model.extend({
+    urlRoot: API + 'admin',
 
-        parse: function (ret) {
-            if (ret.hasOwnProperty('admin')) {
-                return(ret.admin);
-            } else {
-                return(ret);
-            }
+    parse: function (ret) {
+      if (ret.hasOwnProperty('admin')) {
+        return (ret.admin)
+      } else {
+        return (ret)
+      }
+    },
+
+    delete: function (reason) {
+      var self = this
+
+      return $.ajax({
+        type: 'POST',
+        headers: {
+          'X-HTTP-Method-Override': 'DELETE'
+        },
+        url: API + 'admin/' + self.get('id'),
+        data: {
+          id: self.get('id'),
+          reason: reason
+        }, success: function (ret) {
+          self.destroy()
         }
-    });
+      })
+    }
+  })
 
-    Iznik.Collections.Admin = Iznik.Collection.extend({
-        url: API + 'admin',
+  Iznik.Collections.Admin = Iznik.Collection.extend({
+    url: API + 'admin',
 
-        model: Iznik.Models.Admin,
+    model: Iznik.Models.Admin,
 
-        parse: function (ret) {
-            return (ret.admins);
-        }
-    });
-});
+    parse: function (ret) {
+      return (ret.admins)
+    }
+  })
+})

http/js/iznik/models/session.js

@@ -413,6 +413,13 @@ define([
                                     ev: 'newsletterstoriescountchanged',
                                     window: false,
                                     sound: false
+                                },
+                                {
+                                  fi: 'pendingadmins',
+                                  el: '.js-pendingadminscount',
+                                  ev: 'pendingadminscountchanged',
+                                  window: false,
+                                  sound: false
                                 }
                             ];
 

http/js/iznik/router.js

@@ -204,6 +204,7 @@ define([
       'help': 'userContact',
       'invite/:id': 'userInvited',
       'invite': 'userInvite',
+      'spread': 'userInvite',
       'newsfeed/:id': 'userNewsfeedSingle',
       'newsfeed': 'userNewsfeed',
       'chitchat/:id': 'userNewsfeedSingle',
@@ -228,6 +229,7 @@ define([
       'councils/volunteers': 'userCouncilsVolunteers',
       'councils/keylinks(/:section)': 'userCouncilsKeyLinks',
       'councils/workbest(/:section)': 'userCouncilsWorkBest',
+      'councils/giveandtake(/:section)': 'userCouncilsGiveAndTake',
       'councils/graphics(/:section)': 'userCouncilsGraphics',
       'councils/photosvideos(/:section)': 'userCouncilsPhotosVideos',
       'councils/posters': 'userCouncilsPosters',
@@ -293,6 +295,7 @@ define([
     },
 
     userHome: function () {
+      console.log("User home")
       if (!MODTOOLS) {
         var self = this
 
@@ -2006,6 +2009,7 @@ define([
         self.listenToOnce(Iznik.Session, 'loggedIn', function () {
           require(['iznik/views/teams'], function () {
             var page = new Iznik.Views.ModTools.Pages.Teams()
+            page.modtools = false;
             self.loadRoute({page: page})
           })
         })
@@ -2173,6 +2177,19 @@ define([
       }
     },
 
+    userCouncilsGiveAndTake: function (section) {
+      if (!MODTOOLS) {
+        var self = this
+
+        require(['iznik/views/pages/user/councils'], function () {
+          var page = new Iznik.Views.User.Pages.Councils.GiveAndTake({
+            section: section
+          })
+          self.loadRoute({page: page})
+        })
+      }
+    },
+
     userCouncilsGraphics: function (section) {
       if (!MODTOOLS) {
         var self = this

http/js/iznik/views/chat/chat.js

@@ -1631,14 +1631,16 @@ define([
     render: function () {
       var self = this
       var p
-      // console.log("Render chat message", this.model.get('id'), this.model.attributes);
 
       if (this.model.get('id')) {
         var message = this.model.get('message')
         if (message) {
           // Unescape emojis.
           message = Iznik.twem(message)
 
+          // Incomplete HTML
+          message = (message+'').replace(/\<br \//g, "\n");
+
           // Remove duplicate newlines.  Make sure we have a string - might not if the message was just a digit.
           message += ''
           message = message.replace(/\n\s*\n\s*\n/g, '\n\n')
@@ -1648,7 +1650,9 @@ define([
 
           // Insert some wbrs to allow us to word break long words (e.g. URLs).
           // It might have line breaks in if it comes originally from an email.
-          message = Iznik.wbr(message, 20).replace(/(?:\r\n|\r|\n)/g, '<br />')
+          message = Iznik.wbr(message, 20).replace(/(?:\r\n|\r|\n)/g, "\n")
+
+          message = message.replace(/\n/g, "<br />")
 
           this.model.set('message', message)
         }
@@ -1736,6 +1740,9 @@ define([
 
         p = Iznik.View.Timeago.prototype.render.call(this)
         p.then(function (self) {
+          // Set message.  Do this here as it contains HTML
+          self.$('.js-chatmessage').html(self.model.get('message'))
+
           // Expand emojis.
           twemoji.parse(self.el)