decidim-core 0.8.4 → 0.9.0

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

@@ -1,10 +1,9 @@
 /* global spyOn */
 /* eslint-disable id-length */
 window.$ = require('jquery');
-require('select2');
 
 require('./history.js.es6');
-require('./select2.field.js.es6');
+require('./data_picker.js.es6');
 require('./form_filter.component.js.es6');
 
 const { Decidim: { FormFilterComponent } } = window;
@@ -12,16 +11,25 @@ const { Decidim: { FormFilterComponent } } = window;
 describe('FormFilterComponent', () => {
   const selector = 'form#new_filter';
   let subject = null;
+  let scopesPickerState = {filter_scope_id: [{ url: "picker_url_3", value: 3, text: "Scope 3"}, { url: "picker_url_4", value: 4, text: "Scope 4"}]} // eslint-disable-line camelcase
 
   beforeEach(() => {
     let form = `
       <form id="new_filter" action="/filters" method="get">
         <fieldset>
-          <select id="filter_scope_id" name="filter[scope_id]" class="select2" multiple>
-            <option value="1">Scope 1</option>
-            <option value="2">Scope 2</option>
-            <option value="3">Scope 3</option>
-          </select>
+          <div id="filter_scope_id" class="data-picker picker-multiple" data-picker-name="filter[scope_id]">
+            <div class="picker-values">
+              <div>
+                <a href="picker_url_1" data-picker-value="1">Scope 1</a>
+              </div>
+              <div>
+                <a href="picker_url_2" data-picker-value="1">Scope 2</a>
+              </div>
+            </div>
+            <div class="picker-prompt">
+              <a href="picker_url">Seleccione un ámbito</a>
+            </div>
+          </div>
         </fieldset>
 
         <fieldset>
@@ -34,6 +42,7 @@ describe('FormFilterComponent', () => {
     `;
     $('body').append(form);
 
+    window.theDataPicker = new window.Decidim.DataPicker($(".data-picker"));
     subject = new FormFilterComponent($(document).find('form'));
   });
 
@@ -64,7 +73,7 @@ describe('FormFilterComponent', () => {
     });
 
     it('binds the form change event', () => {
-      expect(subject.$form.on).toHaveBeenCalledWith('change', 'input:not(.select2-search__field), select', subject._onFormChange);
+      expect(subject.$form.on).toHaveBeenCalledWith('change', 'input, select', subject._onFormChange);
     });
 
     describe('onpopstate event', () => {
@@ -75,17 +84,19 @@ describe('FormFilterComponent', () => {
       it('clears the form data', () => {
         spyOn(subject, '_clearForm');
 
-        window.onpopstate({ isTrusted: true });
+        window.onpopstate({ isTrusted: true, state: scopesPickerState});
 
         expect(subject._clearForm).toHaveBeenCalled();
       });
 
       it('sets the correct form fields based on the current location', () => {
-        spyOn(subject, '_getLocation').and.returnValue('/filters?filter[scope_id][]=1&scope_id[]=2&filter[category_id]=2');
-        window.onpopstate({ isTrusted: true });
+        spyOn(subject, '_getLocation').and.returnValue('/filters?filter[scope_id][]=3&filter[scope_id][]=4&filter[category_id]=2');
+        window.onpopstate({ isTrusted: true, state: scopesPickerState});
 
         expect($(selector).find('select#filter_category_id').val()).toEqual('2');
-        expect($(selector).find('select#filter_scope_id').val()).toEqual(['1']);
+        expect($(`${selector} #filter_scope_id .picker-values div input`).map(function(_index, input) {
+          return $(input).val();
+        }).get()).toEqual(['3', '4']);
       });
     });
   });
@@ -102,7 +113,7 @@ describe('FormFilterComponent', () => {
     });
 
     it('unbinds the form change event', () => {
-      expect(subject.$form.off).toHaveBeenCalledWith('change', 'input:not(.select2-search__field), select', subject._onFormChange);
+      expect(subject.$form.off).toHaveBeenCalledWith('change', 'input, select', subject._onFormChange);
     });
   });
 

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

@@ -9,7 +9,7 @@
     if (event.isTrusted) {
       for (let callbackId in callbacks) {
         if (callbacks.hasOwnProperty(callbackId)) {
-          callbacks[callbackId]();
+          callbacks[callbackId](event.state);
         }
       }
     }
@@ -23,9 +23,9 @@
     callbacks[callbackId] = null;
   }
 
-  const pushState = (url) => {
+  const pushState = (url, state = null) => {
     if (window.history) {
-      window.history.pushState(null, null, url);
+      window.history.pushState(state, null, url);
     }
   };
 

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

@@ -1,12 +1,9 @@
 @import "variables";
+@import "foundation";
 @import "utils/*";
 
-@import "foundation";
 @include foundation-everything($flex: false);
 
-@import "select2";
-@import "plugins/select2";
-
 @import "modules/modules";
 @import "layouts/*";
 @import "extras/*";

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

@@ -6,10 +6,10 @@ $success: #57d685 !default;
 $warning: #ffae00 !default;
 $alert: #ec5840 !default;
 
-$proposals: #238FF7 !default;
-$actions: #57D685 !default;
-$debates: #FA6C96 !default;
-$meetings: #FABC6C !default;
+$proposals: #238ff7 !default;
+$actions: #57d685 !default;
+$debates: #fa6c96 !default;
+$meetings: #fabc6c !default;
 
 $twitter: #55acee !default;
 $facebook: #3b5998 !default;

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

@@ -0,0 +1,13 @@
+@import "quill.snow";
+@import "variables";
+@import "utils/settings";
+
+.editor-container{
+  margin-bottom: 1.5rem;
+
+  p{
+    line-height: $paragraph-lineheight;
+    margin-bottom: $paragraph-margin-bottom;
+    text-rendering: $paragraph-text-rendering;
+  }
+}

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

@@ -783,6 +783,12 @@ th.float-center {
   float: none;
   text-align: center; }
 
+th.float-right {
+  margin: 0 auto;
+  Margin: 0 auto;
+  float: right;
+  text-align: center; }
+
 .hide-for-large {
   display: none !important;
   mso-hide: all;
@@ -1385,11 +1391,13 @@ table.body{
   margin-top: 16px;
 }
 
-.footnote {
+.footnote, .headnote {
   padding-top: 10px;
   color: #666;
+  font-size: 12px;
 }
 
+
 table.container.main {
   background: #fefefe;
 }

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

@@ -1,8 +1,8 @@
-.add-comment {
-  .remaining-character-count {
+.add-comment{
+  .remaining-character-count{
     border: 0;
     color: $body-font-color;
-    padding: 0.85em 1em;
+    padding: .85em 1em;
     vertical-align: middle;
     display: inline-block;
   }

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

@@ -1,3 +1,3 @@
-.callout.announcement {
+.callout.announcement{
   margin-bottom: 1em;
 }

data/app/assets/stylesheets/decidim/extras/_collection-sort-controls.scss

@@ -1,5 +1,5 @@
-.collection-sort-controls {
-  .column {
+.collection-sort-controls{
+  .column{
     margin-bottom: 0;
   }
 }

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

@@ -1,6 +1,7 @@
-.reveal--embed {
+.reveal--embed{
   overflow-y: hidden;
-  .embed__code {
+
+  .embed__code{
     font-family: monospace;
     background: $light-gray-dark;
     padding: 1em;
@@ -12,7 +13,7 @@
 
 $widget-padding: 8px;
 
-body.widget {
+body.widget{
   background: #fff;
   padding: $widget-padding;
   margin: 0;
@@ -21,11 +22,11 @@ body.widget {
     margin-bottom: $widget-padding;
   }
 
-  .card {
+  .card{
     margin: 0;
   }
 
-  .organization {
+  .organization{
     margin-top: $widget-padding;
     text-align: right;
   }

data/app/assets/stylesheets/decidim/extras/_impersonation-bar.scss

@@ -2,6 +2,7 @@
   background: $medium-gray;
   padding: .5em 1em;
   text-align: center;
+
   a{
     color: darken($anchor-color, 10%);
   }
@@ -9,12 +10,15 @@
 
 .impersonation-warning__action{
   text-align: center;
+
   .button{
     margin: .5em 0;
   }
+
   @include breakpoint(mediumlarge){
     vertical-align: baseline;
     display: inline-block;
+
     .button{
       margin: 0 0 0 1em;
     }

data/app/assets/stylesheets/decidim/extras/_label-required.scss

@@ -1,3 +1,3 @@
-.label-required {
+.label-required{
   margin-left: 5px;
 }

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

@@ -1,14 +1,16 @@
-.leaflet-container {
-  .map-info {
+.leaflet-container{
+  .map-info{
     border: 1px solid $primary;
 
-    .leaflet-popup-content-wrapper {
+    .leaflet-popup-content-wrapper{
       border-radius: 2px;
     }
-    a.button {
+
+    a.button{
       color: #fff;
     }
   }
+
   .leaflet-popup-tip{
     border: 1px solid $primary;
   }

data/app/assets/stylesheets/decidim/extras/_meeting-registrations.scss

@@ -1,11 +1,11 @@
-#meeting-registration-confirm {
-  .help-text {
+#meeting-registration-confirm{
+  .help-text{
     border: 1px solid #eee;
     background: #fff;
-    padding: 0.5em;
+    padding: .5em;
     overflow-y: scroll;
     margin-bottom: 1em;
-    margin-top: 0.5em;
+    margin-top: .5em;
     height: 20em;
   }
 }

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

@@ -4,33 +4,40 @@
 
 .process_stats{
   padding: 0;
+
   .process_stats-item{
     width: 33.3%;
+
     @include breakpoint(large down){
       width: 33.3%;
     }
+
     @include breakpoint(medium down){
       width: 49.9%;
     }
+
     @include breakpoint(smallmedium down){
       width: 100%;
     }
+
     display: inline-block;
     padding: 1em;
     border: $border;
     background: $white;
-    .icon {
+
+    .icon{
       width: 1.5em;
       height: 1.5em;
       color: #599aa6;
       vertical-align: middle;
-      margin-right: 0.5rem;
+      margin-right: .5rem;
     }
+
     .process_stats-text{
       text-transform: uppercase;
-      letter-spacing: 0.03em;
+      letter-spacing: .03em;
       font-size: 90%;
-      color: #3D393C;
+      color: #3d393c;
       font-weight: 600;
       line-height: 1;
     }

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

@@ -1,7 +1,7 @@
-form.new_proposal {
-  fieldset {
+form.new_proposal{
+  fieldset{
     border: 1px solid #e8e8e8;
-    padding: 0.5em;
+    padding: .5em;
     margin-bottom: 1em;
   }
 }

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

@@ -1,4 +1,4 @@
-.ql-video {
+.ql-video{
   max-width: 600px;
   width: 100%;
   height: 450px;

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

@@ -1,3 +1,3 @@
-  .reference--text-left {
-    text-align: left;
-  }
+.tech-info--text-left{
+  text-align: left;
+}

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

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

data/app/assets/stylesheets/decidim/extras/_results-per-page.scss

@@ -1,7 +1,7 @@
 //Variables
 $order-border: $border;
 
-/*Results per page styles*/
+/* Results per page styles */
 .results-per-page{
   margin-bottom: 1rem;
   display: flex;
@@ -12,6 +12,7 @@ $order-border: $border;
 .results-per-page__dropdown{
   display: flex;
   flex-wrap: wrap;
+
   .menu{
     .is-dropdown-submenu-parent > a{
       padding: 0;
@@ -22,30 +23,26 @@ $order-border: $border;
 }
 
 .results-per-page__dropdown--right{
-	margin-left: auto;
+  margin-left: auto;
 }
 
 .results-per-page__action{
   margin-left: auto;
   justify-content: flex-end;
+
   .button{
     margin-bottom: 0;
   }
 }
 
-/*.results-per-page__text{
-	@include breakpoint(medium down){
-		font-size: 18px;
-	}
-}*/
-
 .results-per-page__tabs{
   display: inline-block;
 }
 
 .results-per-page__tab{
   color: $muted;
-  &:after{
+
+  &::after{
     content: "";
     display: inline-block;
     height: .75em;
@@ -53,13 +50,16 @@ $order-border: $border;
     margin: 0 .2em 0 .5em;
     vertical-align: middle;
   }
+
   &.is-active{
     color: $anchor-color;
   }
+
   &:first-of-type{
     padding-left: 0;
   }
-  &:last-of-type:after{
+
+  &:last-of-type::after{
     border-left: none;
   }
 }