decidim-decidim_awesome 0.6.3 → 0.7.0

data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/markers.js.es6

@@ -0,0 +1,56 @@
+// = require jsrender.min
+// = require decidim/decidim_awesome/awesome_map/layers
+// = require decidim/decidim_awesome/awesome_map/categories
+
+((exports) => {
+  const { getCategory, layers } = exports.AwesomeMap;
+
+  const popupMeetingTemplateId = "marker-meeting-popup";
+  const popupProposalTemplateId = "marker-proposal-popup";
+  const allMarkers = [];
+
+  const drawMarker = (element, marker, component) => {
+    let tmpl = component.type === "proposals" ? popupProposalTemplateId : popupMeetingTemplateId,
+        node = document.createElement("div");
+
+    $($.templates(`#${tmpl}`).render(element)).appendTo(node);
+
+    marker.bindPopup(node, {
+      maxwidth: 640,
+      minWidth: 500,
+      keepInView: true,
+      className: "map-info"
+    }).openPopup();
+
+    allMarkers.push({
+      marker: marker,
+      component: component,
+      element: element
+    });
+
+    // Add to category layer
+    let cat = getCategory(element.category);
+    if(layers[cat.id]) {
+      $('#awesome_map-categories-control').show();
+      marker.addTo(layers[cat.id].group);
+      // show category if hidden
+      const $label = $(`label.awesome_map-category-${cat.id}`);
+      const $parent = $(`label.awesome_map-category-${cat.parent}`);
+      $label.show();
+      // update number of items
+      $label.attr("title", (parseInt($label.attr("title") || 0) + 1) + " " +  window.DecidimAwesome.texts.items);
+      // show parent if apply
+      $parent.show();
+      $parent.attr("title", (parseInt($parent.attr("title") || 0) + 1) + " " +  window.DecidimAwesome.texts.items);
+    }
+
+    // update component stats
+    const $component = $(`#awesome_map-component_${component.id}`);
+    $component.attr("title", parseInt($component.attr("title") || 0) + 1);
+
+    return marker;
+  };
+
+  exports.AwesomeMap.allMarkers = allMarkers;
+  exports.AwesomeMap.drawMarker = drawMarker;
+})(window);

data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/meetings.js.es6

@@ -1,8 +1,9 @@
 // = require decidim/decidim_awesome/awesome_map/api_fetcher
 // = require decidim/decidim_awesome/awesome_map/categories
+// = require decidim/decidim_awesome/awesome_map/utilities
 
 ((exports) => {
-  const { getCategory } = exports.AwesomeMap;
+  const { getCategory, truncate } = exports.AwesomeMap;
   const query = `query ($id: ID!, $after: String!) {
     component(id: $id) {
         id
@@ -59,7 +60,7 @@
   const MeetingIcon = L.DivIcon.SVGIcon.extend({
     options: {
       fillColor: "#ef604d",
-      iconSize: {x: 300, y:150},
+      iconSize: { x: 300, y: 150 },
       opacity: 0
     },
     _createPathDescription: function() {
@@ -93,14 +94,14 @@
     });
 
     element.title.translation = ApiFetcher.findTranslation(element.title.translations);
-    element.description.translation = ApiFetcher.findTranslation(element.description.translations).replace(/\n/g, "<br>");;
+    element.description.translation = truncate(ApiFetcher.findTranslation(element.description.translations)).replace(/\n/g, "<br>");
     element.location.translation = ApiFetcher.findTranslation(element.location.translations);
     element.locationHints.translation = ApiFetcher.findTranslation(element.locationHints.translations);
     callback(element, marker);
   };
 
   const fetchMeetings = (component, after, callback, finalCall = () => {}) => {
-    
+
     const variables = {
       "id": component.id,
       "after": after
@@ -110,7 +111,7 @@
       if(result) {
         result.component.meetings.edges.forEach((element) => {
           if(!element.node) return;
-          
+
           if(element.node.coordinates) {
             element.node.link = component.url + '/meetings/' + element.node.id;
             createMarker(element.node, callback);

data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/proposals.js.es6

@@ -1,8 +1,10 @@
 // = require decidim/decidim_awesome/awesome_map/api_fetcher
 // = require decidim/decidim_awesome/awesome_map/categories
+// = require decidim/decidim_awesome/awesome_map/hashtags
+// = require decidim/decidim_awesome/awesome_map/utilities
 
 ((exports) => {
-  const { getCategory } = exports.AwesomeMap;
+  const { getCategory, truncate, collectHashtags, removeHashtags, appendHtmlHashtags } = exports.AwesomeMap;
   const query = `query ($id: ID!, $after: String!) {
     component(id: $id) {
         id
@@ -14,7 +16,7 @@
               endCursor
             }
             edges {
-              node {  
+              node {
                 id
                 state
                 title {
@@ -49,6 +51,7 @@
       }
     }`;
 
+  let amendments = [];
   const ProposalIcon = L.DivIcon.SVGIcon.DecidimIcon;
 
   const createMarker = (element, callback) => {
@@ -59,7 +62,9 @@
     });
 
     element.title.translation = ApiFetcher.findTranslation(element.title.translations);
-    element.body.translation = ApiFetcher.findTranslation(element.body.translations).replace(/\n/g, "<br>");
+    const body = ApiFetcher.findTranslation(element.body.translations);
+    element.hashtags = collectHashtags(body);
+    element.body.translation = appendHtmlHashtags(truncate(removeHashtags(body)).replace(/\n/g, "<br>"), element.hashtags);
 
     callback(element, marker);
   };
@@ -74,11 +79,18 @@
       if(result) {
         result.component.proposals.edges.forEach((element) => {
           if(!element.node) return;
-          
+
           if(element.node.coordinates) {
             element.node.link = component.url + '/proposals/' + element.node.id;
             createMarker(element.node, callback);
           }
+
+          // Check if it has amendments, add it to a list
+          if(element.node.amendments && element.node.amendments.length) {
+            element.node.amendments.forEach((amendment) => {
+              amendments.push(amendment.emendation.id);
+            });
+          }
         });
         if (result.component.proposals.pageInfo.hasNextPage) {
           fetchProposals(component, result.component.proposals.pageInfo.endCursor, callback, finalCall);
@@ -91,4 +103,5 @@
 
   exports.AwesomeMap = exports.AwesomeMap || {};
   exports.AwesomeMap.fetchProposals = fetchProposals;
+  exports.AwesomeMap.amendments = amendments;
 })(window);

data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/utilities.js.es6

@@ -0,0 +1,48 @@
+//= require jquery.truncate
+
+((exports) => {
+  const sanitizeCenter = (string) => {
+    const parts = string.split(",")
+    if (parts.length >= 2) {
+      const lat = parseFloat(parts[0]);
+      const lng = parseFloat(parts[1]);
+      if(lat && lng) {
+        return [lat, lng];
+      }
+    }
+    return null
+  };
+
+  const options = {
+    length: $("#awesome-map").data("truncate") || 255,
+    center: sanitizeCenter($("#awesome-map").data("map-center")),
+    zoom: $("#awesome-map").data("map-zoom"),
+    menu: {
+      amendments: $("#awesome-map").data("menu-amendments"),
+      meetings: $("#awesome-map").data("menu-meetings"),
+      hashtags: $("#awesome-map").data("menu-hashtags")
+    }
+  };
+
+  const truncate = (string) => {
+    return $.truncate(string, options);
+  };
+
+  const show = {
+    withdrawn: $("#awesome-map").data("show-withdrawn"),
+    accepted: $("#awesome-map").data("show-accepted"),
+    evaluating: $("#awesome-map").data("show-evaluating"),
+    notAnswered: $("#awesome-map").data("show-not-answered"),
+    rejected: $("#awesome-map").data("show-rejected")
+  };
+
+  const collapsedMenu = $("#awesome-map").data("collapsed");
+  const components = $("#awesome-map").data("components");
+
+  exports.AwesomeMap = exports.AwesomeMap || {};
+  exports.AwesomeMap.truncate = truncate;
+  exports.AwesomeMap.options = options;
+  exports.AwesomeMap.show = show;
+  exports.AwesomeMap.collapsedMenu = collapsedMenu;
+  exports.AwesomeMap.components = components;
+})(window);

data/app/assets/javascripts/decidim/decidim_awesome/editors/legacy_quill_editor.js.es6

@@ -0,0 +1,160 @@
+// = require image-upload.min
+// = require image-resize.min
+// = require inscrybmde.min.js
+// = require inline-attachment.js
+// = require codemirror-4.inline-attachment.js
+// = require jquery.inline-attachment.js
+// = require_self
+
+((exports) => {
+  exports.DecidimAwesome = exports.DecidimAwesome || {};
+
+  // Redefines Quill editor with images
+  if(exports.DecidimAwesome.allow_images_in_full_editor  || exports.DecidimAwesome.allow_images_in_small_editor || exports.DecidimAwesome.use_markdown_editor) {
+
+    const quillFormats = ["bold", "italic", "link", "underline", "header", "list", "video", "image", "alt"];
+
+    const createQuillEditor = (container) => {
+      const toolbar = $(container).data("toolbar");
+      const disabled = $(container).data("disabled");
+
+      let quillToolbar = [
+        ["bold", "italic", "underline"],
+        [{ list: "ordered" }, { list: "bullet" }],
+        ["link", "clean"]
+      ];
+
+      let addImage = false;
+
+      if (toolbar === "full") {
+        quillToolbar = [
+          [{ header: [1, 2, 3, 4, 5, 6, false] }],
+          ...quillToolbar
+        ];
+          if(exports.DecidimAwesome.allow_images_in_full_editor) {
+            quillToolbar.push(["video", "image"]);
+            addImage = true;
+          } else {
+            quillToolbar.push(["video"]);
+          }
+      } else if (toolbar === "basic") {
+          if(exports.DecidimAwesome.allow_images_in_small_editor) {
+            quillToolbar.push(["video", "image"]);
+            addImage = true;
+          } else {
+            quillToolbar.push(["video"]);
+          }
+      } else if(exports.DecidimAwesome.allow_images_in_small_editor) {
+        quillToolbar.push(["image"]);
+        addImage = true;
+      }
+
+      let modules = {
+        toolbar: quillToolbar
+      };
+      const $input = $(container).siblings('input[type="hidden"]');
+      container.innerHTML = $input.val() || "";
+      const token = $( 'meta[name="csrf-token"]' ).attr( 'content' );
+
+      if(addImage) {
+        modules.imageResize = {
+          modules: ["Resize", "DisplaySize"]
+        }
+        modules.imageUpload = {
+          url: exports.DecidimAwesome.editor_uploader_path, // server url. If the url is empty then the base64 returns
+          method: 'POST', // change query method, default 'POST'
+          name: 'image', // custom form name
+          withCredentials: false, // withCredentials
+          headers: { 'X-CSRF-Token': token }, // add custom headers, example { token: 'your-token'}
+          // personalize successful callback and call next function to insert new url to the editor
+          callbackOK: (serverResponse, next) => {
+            $(quill.getModule("toolbar").container).last().removeClass('editor-loading')
+            next(serverResponse.url);
+          },
+          // personalize failed callback
+          callbackKO: serverError => {
+            $(quill.getModule("toolbar").container).last().removeClass('editor-loading')
+            alert(serverError.message);
+          },
+          checkBeforeSend: (file, next) => {
+            $(quill.getModule("toolbar").container).last().addClass('editor-loading')
+            next(file); // go back to component and send to the server
+          }
+        }
+      }
+
+      const quill = new Quill(container, {
+        modules: modules,
+        formats: quillFormats,
+        theme: "snow"
+      });
+
+      if (disabled) {
+        quill.disable();
+      }
+
+      quill.on("text-change", () => {
+        const text = quill.getText();
+
+        // Triggers CustomEvent with the cursor position
+        // It is required in input_mentions.js
+        let event = new CustomEvent("quill-position", {
+          detail: quill.getSelection()
+        });
+        container.dispatchEvent(event);
+
+        if (text === "\n") {
+          $input.val("");
+        } else {
+          $input.val(quill.root.innerHTML);
+        }
+      });
+
+      if(addImage) {
+        const t = window.DecidimAwesome.texts["drag_and_drop_image"];
+        $(container).after(`<p class="help-text" style="margin-top:-1.5rem;">${t}</p>`);
+      }
+    };
+
+    const createMarkdownEditor = (container) => {
+      $(container).hide();
+      const t = window.DecidimAwesome.texts["drag_and_drop_image"];
+      const token = $( 'meta[name="csrf-token"]' ).attr( 'content' );
+      const $input = $(container).siblings('input[type="hidden"]');
+      const inscrybmde = new InscrybMDE({
+        element: $input[0],
+        spellChecker: false,
+        renderingConfig: {
+          codeSyntaxHighlighting: true
+        }
+      });
+
+      // Allow image upload
+      if(window.DecidimAwesome.allow_images_in_markdown_editor) {
+        $(inscrybmde.gui.statusbar).prepend(`<span class="help-text" style="float:left;margin:0;text-align:left;">${t}</span>`);
+        inlineAttachment.editors.codemirror4.attach(inscrybmde.codemirror, {
+          uploadUrl: window.DecidimAwesome.editor_uploader_path,
+          uploadFieldName: "image",
+          jsonFieldName: "url",
+          extraHeaders: { "X-CSRF-Token": token }
+        });
+      }
+    };
+
+    const quillEditor = () => {
+      $(".editor-container").each((idx, container) => {
+        if(exports.DecidimAwesome.use_markdown_editor) {
+          createMarkdownEditor(container);
+        } else {
+          createQuillEditor(container);
+        }
+      });
+    };
+
+    exports.Decidim = exports.Decidim || {};
+    exports.Decidim.quillEditor = quillEditor;
+    exports.Decidim.createQuillEditor = createQuillEditor;
+    exports.Decidim.createMarkdownEditor = createMarkdownEditor;
+
+  }
+})(window);

data/app/assets/javascripts/decidim/decidim_awesome/editors/quill_editor.js.es6

@@ -12,14 +12,14 @@
   // Redefines Quill editor with images
   if(exports.DecidimAwesome.allow_images_in_full_editor  || exports.DecidimAwesome.allow_images_in_small_editor || exports.DecidimAwesome.use_markdown_editor) {
 
-    const quillFormats = ["bold", "italic", "link", "underline", "header", "list", "video", "image", "alt"];
+    const quillFormats = ["bold", "italic", "link", "underline", "header", "list", "video", "image", "alt", "break"];
 
     const createQuillEditor = (container) => {
       const toolbar = $(container).data("toolbar");
       const disabled = $(container).data("disabled");
 
       let quillToolbar = [
-        ["bold", "italic", "underline"],
+        ["bold", "italic", "underline", "linebreak"],
         [{ list: "ordered" }, { list: "bullet" }],
         ["link", "clean"]
       ];
@@ -50,7 +50,13 @@
       }
 
       let modules = {
-        toolbar: quillToolbar
+        linebreak: {},
+        toolbar: {
+          container: quillToolbar,
+          handlers: {
+            "linebreak": exports.Decidim.Editor.lineBreakButtonHandler
+          }
+        }
       };
       const $input = $(container).siblings('input[type="hidden"]');
       container.innerHTML = $input.val() || "";
@@ -109,11 +115,16 @@
           $input.val(quill.root.innerHTML);
         }
       });
-     
+
       if(addImage) {
         const t = window.DecidimAwesome.texts["drag_and_drop_image"];
         $(container).after(`<p class="help-text" style="margin-top:-1.5rem;">${t}</p>`);
       }
+
+      // After editor is ready, linebreak_module deletes two extraneous new lines
+      quill.emitter.emit("editor-ready");
+
+      return quill;
     };
 
     const createMarkdownEditor = (container) => {
@@ -157,4 +168,4 @@
     exports.Decidim.createMarkdownEditor = createMarkdownEditor;
 
   }
-})(window);
+})(window);

data/app/assets/javascripts/decidim/decidim_awesome/legacy_admin.js

@@ -0,0 +1,3 @@
+// = require decidim/decidim_awesome/admin/constraints
+// = require decidim/decidim_awesome/admin/codemirror
+// = require decidim/decidim_awesome/editors/legacy_quill_editor

data/app/assets/javascripts/decidim/decidim_awesome/legacy_application.js

@@ -0,0 +1,4 @@
+// = require decidim/decidim_awesome/proposals/images
+// = require decidim/decidim_awesome/editors/legacy_quill_editor
+// = require decidim/decidim_awesome/editors/markdown_view
+// = require decidim/decidim_awesome/forms/autosave

data/app/assets/stylesheets/decidim/decidim_awesome/admin.scss

@@ -1,4 +1,5 @@
 //= require github.min
+//= require codemirror
 //= require inscrybmde.min
 //= require_self
 
@@ -6,6 +7,7 @@
 @import "decidim/utils/settings";
 @import "decidim/utils/mixins";
 @import "./admin/constraints";
+@import "./admin/codemirror";
 @import "./editors/quill_editor";
 @import "./editors/markdown_editor";
 
@@ -17,7 +19,7 @@
   font-size: .8em;
 }
 
-.decidim_awesome {
+.decidim_awesome{
   &.modal{
     .spinner{
       @include spinner(25px, #aaa, var(--secondary), 800ms);
@@ -33,13 +35,18 @@
     }
   }
 
-  &-form {
+  &-form{
     margin-bottom: 2em;
     border-bottom: 1px solid #999;
     padding-bottom: 1.5em;
   }
-  &-form:last-child {
+
+  &-form:last-child{
     border-bottom: none;
     padding-bottom: 0;
   }
 }
+
+tbody tr.menu_hack-addition{
+  background: rgb(255, 248, 222);
+}