decidim-core 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a032ffa156def30465db5d8b3d20ca95a7ea2dc0
-  data.tar.gz: 855965c6e8eecfbe557440501e0d717c4a7a4a80
+  metadata.gz: 48f0431d35a86ad18b3150daa3eb86220cdd95ff
+  data.tar.gz: 62ed99da05742f4543482e60c63f836d284b4aa2
 SHA512:
-  metadata.gz: 1552bb8342aebc959620e05d4934651d0a54aa61d508a6b2c3db634e27418b3d28211173fdddea6a3964a07decb467da0ea87a439ea63de0b81cfb1ae749bff6
-  data.tar.gz: 246850a6564065e2f2ee93b0c49c1a41f5cfbf902cdd3675f114e9648eecd24011665141115fdd609681b98bea1219f69344583870d6f6440c451ca2a86a6e40
+  metadata.gz: 4e0c2a51aa16df05edbac2e0ba457d2d45c196a16df81ed93592397c845aabedb4ffca95d3dfb8defb75e295f8ae759e796df817dffd4049fb9a3454c1ce7079
+  data.tar.gz: 911e75063269ab61745d32e9dfe035a2fc6da51d6f67847753bd65ee30f0fc4fab4d57485a008a8c6c2ddcff49e04067362d711109992b0240882ce155e4ef23

data/app/assets/config/decidim_core_manifest.js

@@ -2,3 +2,4 @@
 //= link_directory ../fonts/decidim/
 //= link_directory ../images/decidim/
 //= link decidim/filters
+//= link decidim/orders

data/app/assets/images/decidim/process.svg

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36.02 36.02">
+  <path d="M883.8,543.84a18,18,0,1,1,18-18A18,18,0,0,1,883.8,543.84Zm0-34a16,16,0,1,0,16,16A16,16,0,0,0,883.8,509.83Z" transform="translate(-865.8 -507.83)"/>
+<g transform="rotate(60 18.1 18.1)">
+  <path d="M883.8,528.75a2.91,2.91,0,1,1,2.91-2.91A2.92,2.92,0,0,1,883.8,528.75Zm0-3.83a0.91,0.91,0,1,0,.91.92A0.92,0.92,0,0,0,883.8,524.92Z" transform="translate(-865.8 -507.83)"/>
+  <path d="M883.8,521.18a2.91,2.91,0,1,1,2.91-2.91A2.92,2.92,0,0,1,883.8,521.18Zm0-3.83a0.91,0.91,0,1,0,.91.92A0.92,0.92,0,0,0,883.8,517.35Z" transform="translate(-865.8 -507.83)"/>
+  <path d="M883.8,536.32a2.92,2.92,0,1,1,2.91-2.91A2.92,2.92,0,0,1,883.8,536.32Zm0-3.83a0.92,0.92,0,1,0,.91.92A0.92,0.92,0,0,0,883.8,532.49Z" transform="translate(-865.8 -507.83)"/>
+  <path d="M881.52,526.85a4.79,4.79,0,1,1,0-9.59,1,1,0,0,1,0,2,2.79,2.79,0,1,0,0,5.59A1,1,0,0,1,881.52,526.85Z" transform="translate(-865.8 -507.83)"/>
+  <path d="M886.09,534.47a1,1,0,0,1,0-2,2.79,2.79,0,0,0,0-5.59,1,1,0,0,1,0-2A4.79,4.79,0,0,1,886.09,534.47Z" transform="translate(-865.8 -507.83)"/>
+</g>
+</svg>

data/app/assets/javascripts/decidim.js.es6

@@ -1,6 +1,8 @@
 // = require decidim/foundation
 // = require modernizr
 // = require svg4everybody.min
+// = require morphdom
+// = require decidim/history
 // = require decidim/append_elements
 // = require decidim/user_registrations
 

data/app/assets/javascripts/decidim/editor.js.es6

@@ -3,7 +3,7 @@
 
 $(() => {
   const $container = $('.editor-container');
-  const quillFormats = ['bold', 'italic', 'link', 'underline', 'header', 'list'];
+  const quillFormats = ['bold', 'italic', 'link', 'underline', 'header', 'list', 'video'];
 
   $container.each((idx, container) => {
     const toolbar = $(container).data('toolbar');
@@ -11,7 +11,7 @@ $(() => {
     let quillToolbar = [
       ['bold', 'italic', 'underline'],
       [{ list: 'ordered' }, { list: 'bullet' }],
-      ['link', 'clean']
+      ['link', 'video', 'clean']
     ];
 
     if (toolbar === 'full') {

data/app/assets/javascripts/decidim/filters.js.es6

@@ -5,7 +5,7 @@
 // Initializes the form filter.
 ((exports) => {
   const { Decidim: { FormFilterComponent } } = exports;
-  
+
   $(() => {
     $('form.new_filter').each(function () {
       const formFilter = new FormFilterComponent($(this));

data/app/assets/javascripts/decidim/form_filter.component.js.es6

@@ -27,8 +27,7 @@
       if (this.mounted) {
         this.mounted = false;
         this.$form.off('change', 'input, select', this._onFormChange);
-
-        exports.onpopstate = null;
+        exports.Decidim.History.unregisterCallback(`filters-${this.$form.attr('id')}`)
       }
     }
 
@@ -41,8 +40,9 @@
       if (this.$form.length > 0 && !this.mounted) {
         this.mounted = true;
         this.$form.on('change', 'input, select', this._onFormChange);
-
-        exports.onpopstate = this._onPopState;
+        exports.Decidim.History.registerCallback(`filters-${this.$form.attr('id')}`, () => {
+          this._onPopState();
+        });
       }
     }
 
@@ -94,6 +94,24 @@
       return null;
     }
 
+     /**
+     * Parse current location and get the current order.
+     * @private
+     * @returns {string} - The current order
+     */
+    _parseLocationOrderValue() {
+      const url = this._getLocation();
+      const match = url.match(/order=([^&]*)/);
+      const $orderMenu = $('.order-by .menu');
+      let order = $orderMenu.find('.menu a:first').data('order');
+
+      if (match) {
+        order = match[1];
+      }
+
+      return order;
+    }
+
     /**
      * Clears the form to start with a clean state.
      * @private
@@ -120,6 +138,9 @@
       this._clearForm();
 
       const filterParams = this._parseLocationFilterValues();
+      const currentOrder = this._parseLocationOrderValue();
+
+      this.$form.find('input.order_filter').val(currentOrder);
 
       if (filterParams) {
         const fieldIds = Object.keys(filterParams);
@@ -167,7 +188,7 @@
         newUrl = `${formAction}&${params}`;
       }
 
-      exports.history.pushState(null, null, newUrl);
+      exports.Decidim.History.pushState(newUrl);
     }
   }
 

data/app/assets/javascripts/decidim/form_filter.component.test.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-unused-expressions */
 require('jquery');
+require('./history.js.es6');
 require('./form_filter.component.js.es6');
 
 const { Decidim: { FormFilterComponent } } = window;
@@ -31,9 +32,6 @@ describe('FormFilterComponent', () => {
       </form>
     `;
     $('body').append(form);
-    window.history = {
-      pushState: sinon.stub()
-    };
     subject = new FormFilterComponent($(document).find('form'));
   });
 
@@ -64,10 +62,6 @@ describe('FormFilterComponent', () => {
       expect(subject.mounted).to.be.truthy;
     });
 
-    it('mounts the component', () => {
-      expect(window.onpopstate).to.equal(subject._onPopState);
-    });
-
     it('binds the form change event', () => {
       expect(subject.$form.on).to.have.been.calledWith('change', 'input, select', subject._onFormChange);
     });
@@ -84,13 +78,6 @@ describe('FormFilterComponent', () => {
 
         expect(stub).to.have.been.calledOnce;
       })
-
-      it('sets the onpopostate callback', () => {
-        sinon.stub(subject.$form, 'serialize').returns('order_start_time=desc')
-        $(selector).find('input[name=order_start_time][value=desc]').trigger('change');
-
-        expect(window.history.pushState).to.have.been.calledWith(null, null, '/filters?order_start_time=desc');
-      });
     });
 
     describe('onpopstate event', () => {
@@ -139,10 +126,6 @@ describe('FormFilterComponent', () => {
     it('unbinds the form change event', () => {
       expect(subject.$form.off).to.have.been.calledWith('change', 'input, select', subject._onFormChange);
     });
-
-    it('removes the onpopostate callback', () => {
-      expect(window.onpopstate).not.to.exist;
-    });
   });
 
   afterEach(() => {

data/app/assets/javascripts/decidim/foundation.js.es6

@@ -15,3 +15,4 @@
 // = require foundation.util.nest.js
 // = require foundation.util.touch.js
 // = require foundation.util.triggers.js
+// = require foundation.abide.js

data/app/assets/javascripts/decidim/history.js.es6

@@ -0,0 +1,35 @@
+/* eslint-disable no-prototype-builtins, no-restricted-syntax, no-param-reassign */
+// require self
+
+((exports) => {
+  let callbacks = {};
+
+  exports.onpopstate = () => {
+    for (let callbackId in callbacks) {
+      if (callbacks.hasOwnProperty(callbackId)) {
+        callbacks[callbackId]();
+      }
+    }
+  };
+
+  const registerCallback = (callbackId, callback) => {
+    callbacks[callbackId] = callback;
+  };
+
+  const unregisterCallback = (callbackId) => {
+    callbacks[callbackId] = null;
+  }
+
+  const pushState = (url) => {
+    if (window.history) {
+      window.history.pushState(null, null, url);
+    }
+  };
+
+  exports.Decidim = exports.Decidim || {};
+  exports.Decidim.History = {
+    registerCallback,
+    unregisterCallback,
+    pushState
+  };
+})(window);

data/app/assets/javascripts/decidim/orders.js.es6

@@ -0,0 +1,28 @@
+// = require_self
+
+$(() => {
+  const { pushState, registerCallback } = window.Decidim.History;
+
+  $(document).on("click", ".order-by a", (event) => {
+    const $target = $(event.target);
+
+    $target.parents('.menu').find('a:first').text($target.text());
+
+    pushState($target.attr('href'));
+  })
+
+  registerCallback("orders", () => {
+    const url = window.location.toString();
+    const match = url.match(/order=([^&]*)/);
+    const $orderMenu = $('.order-by .menu');
+    let order = $orderMenu.find('.menu a:first').data('order');
+
+    if (match) {
+      order = match[1];
+    }
+
+    const linkText = $orderMenu.find(`.menu a[data-order="${order}"]`).text();
+
+    $orderMenu.find('a:first').text(linkText);
+  });
+});

data/app/assets/stylesheets/decidim/_decidim.scss

@@ -7,3 +7,4 @@
 
 @import "modules/modules";
 @import "layouts/*";
+@import "extras/*";

data/app/assets/stylesheets/decidim/email.css

@@ -88,7 +88,6 @@ table.body {
   width: 100%; }
 
 table.container {
-  background: #fefefe;
   width: 580px;
   margin: 0 auto;
   Margin: 0 auto;
@@ -1358,15 +1357,25 @@ body.outlook p {
 
 /* 2 - Custom styles ---------*/
 
-.decidim-bar{
+table.body th.decidim-bar, table.body td.decidim-bar{
+  padding: 10px 0;
   background-color: #1a181d;
 }
 
+table.body{
+  background-color: #f3f3f3;
+  margin: 20px 0;
+}
 
 .decidim-logo{
   margin-top: 16px;
 }
 
+.decidim-logo a{
+  display: inline-block;
+  height: 30px;
+}
+
 .cityhall-bar{
   background-color: #2c2930;
 }
@@ -1374,4 +1383,13 @@ body.outlook p {
 .cityhall-logo{
   width: 150px;
   margin-top: 16px;
-}
+}
+
+.footnote {
+  padding-top: 10px;
+  color: #666;
+}
+
+table.container.main {
+  background: #fefefe;
+}

data/app/assets/stylesheets/decidim/extras/_leaflet.scss

@@ -3,11 +3,13 @@
     border: 1px solid $primary;
 
     .leaflet-popup-content-wrapper {
-      border-radius: 0;
+      border-radius: 2px;
     }
-
     a.button {
       color: #fff;
     }
   }
+  .leaflet-popup-tip{
+    border: 1px solid $primary;
+  }
 }

data/app/assets/stylesheets/decidim/extras/_quill.scss

@@ -0,0 +1,8 @@
+.ql-video {
+  max-width: 600px;
+  width: 100%;
+  height: 450px;
+  max-height: 70vh;
+  margin: 40px auto;
+  display: block;
+}

data/app/assets/stylesheets/decidim/extras/_register_form.scss

@@ -0,0 +1,9 @@
+.lopd-text {
+  padding: 0.5rem;
+  border: 1px solid #e8e8e8;
+  margin: 1rem 0;
+  max-height: 10rem;
+  overflow: auto;
+  font-size: 0.8rem;
+  font-style: italic;
+}

data/app/assets/stylesheets/decidim/modules/_buttons.scss

@@ -9,14 +9,30 @@
     padding-top: .25rem;
     padding-bottom: .25rem;
   }
+}
 
-  &:disabled{
-    @extend .button;
-    @extend .button.disabled;
+// Overwrite Foundation hover styles in hollow disabled buttons
+.button.hollow:disabled:hover,
+.button.hollow.disabled:hover{
+  background-color: transparent;
+  border-color: inherit;
+  color: $primary;
+  &.secondary{
+    color: $secondary;
+  }
+  &.success{
+    color: $success;
+  }
+  &.alert{
+    color: $alert;
+  }
+  &.warning{
+    color: $warning;
   }
 }
 
 
+
 /*Extra buttons styles*/
 
 .button--icon{

data/app/assets/stylesheets/decidim/utils/_mixins.scss

@@ -30,8 +30,12 @@
   background: rgba(#27353B, 0.6);
 }
 
-// Usefull Compass mixins
+/// Slightly lighten a color
+@function tint($color, $percentage) {
+  @return mix(white, $color, $percentage);
+}
 
-// +font-face
-// +ellipsis
-// +clearfix
+/// Slightly darken a color
+@function shade($color, $percentage) {
+  @return mix(black, $color, $percentage);
+}

data/app/commands/decidim/authorize_user.rb

@@ -27,19 +27,24 @@ module Decidim
     attr_reader :handler
 
     def create_authorization
-      Authorization.create!(
+      authorization = Authorization.find_or_initialize_by(
         user: handler.user,
+        name: handler.handler_name
+      )
+
+      authorization.attributes = {
         unique_id: handler.unique_id,
-        name: handler.handler_name,
         metadata: handler.metadata
-      )
+      }
+
+      authorization.save!
     end
 
     def unique?
       return true if handler.unique_id.nil?
 
       duplicates = Authorization.where(
-        user: User.where(organization: handler.user.organization.id),
+        user: User.where.not(id: handler.user.id).where(organization: handler.user.organization.id),
         name: handler.handler_name,
         unique_id: handler.unique_id
       )

data/app/commands/decidim/create_omniauth_registration.rb

@@ -29,8 +29,8 @@ module Decidim
         end
 
         broadcast(:ok, @user)
-      rescue ActiveRecord::RecordInvalid
-        broadcast(:invalid)
+      rescue ActiveRecord::RecordInvalid => error
+        broadcast(:error, error.record)
       end
     end
 
@@ -52,6 +52,8 @@ module Decidim
         @user.password = generated_password
         @user.password_confirmation = generated_password
         @user.skip_confirmation! if verified_email
+        @user.comments_notifications = true
+        @user.replies_notifications = true
       end
 
       @user.tos_agreement = "1"