decidim-pages 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4cb9966f001e80a7f85d09731cb37897069dc23
-  data.tar.gz: 3418ba52c6aeccba37ff1881ae3b2ac1479a3c7a
+  metadata.gz: c468e40c810b95529efbdb20abc871bb1195e248
+  data.tar.gz: 22c3657f71c92fca6c88e6c8f6ec977190d51f2f
 SHA512:
-  metadata.gz: 5129bb77a3e0bba79905b304bf0eff586ed296aa246140c9cab1fc89abf0a850e8bc751da5adb25c33aaf6164967182cb876511b765f54b25c440bccd6d407e6
-  data.tar.gz: b8d725a8a4fb0a7ed726ce0e881631db27ec8dc050d12784267798979c8dfd0bbad58070b7d9bb08b52779049eea16c1ff970b1751323e93d523d3653e40fcef
+  metadata.gz: fb3d3d50a3e812d0736254c5c1a6ae4b82a16db586546a98f67a436253738559887aee91ab7975b9b32c0b755502337ccd9eb0423f37c844e906048cfb51bc2e
+  data.tar.gz: 308b8d4c0b96aca0ae7a40233eb47e87c966e939498e8ac4bc04d3e3e08635567be5e3d048d8fb2becd8b54bc063edfb450ea07dd3f06b1299436c062d7d6101

data/app/assets/images/decidim/pages/icon.svg

@@ -1 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36.02 36.02"><path d="M373,545.54a18,18,0,1,1,18-18A18,18,0,0,1,373,545.54Zm0-34a16,16,0,1,0,16,16A16,16,0,0,0,373,511.53Z" transform="translate(-354.99 -509.53)"/><path d="M377.73,536.41h-9.46a1,1,0,1,1,0-2h9.46A1,1,0,0,1,377.73,536.41Z" transform="translate(-354.99 -509.53)"/><path d="M375,525.54h-6.73a1,1,0,1,1,0-2H375A1,1,0,1,1,375,525.54Z" transform="translate(-354.99 -509.53)"/><path d="M375,535.41a1,1,0,0,1-1-1v-9.87a1,1,0,1,1,2,0v9.87A1,1,0,0,1,375,535.41Z" transform="translate(-354.99 -509.53)"/><path d="M373,523a3,3,0,1,1,3-3A3,3,0,0,1,373,523Zm0-4a1,1,0,1,0,1,1A1,1,0,0,0,373,519Z" transform="translate(-354.99 -509.53)"/><path d="M371,535.41a1,1,0,0,1-1-1v-9.87a1,1,0,1,1,2,0v9.87A1,1,0,0,1,371,535.41Z" transform="translate(-354.99 -509.53)"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36.02 36.02">
+  <path d="M373,545.54a18,18,0,1,1,18-18A18,18,0,0,1,373,545.54Zm0-34a16,16,0,1,0,16,16A16,16,0,0,0,373,511.53Z" transform="translate(-354.99 -509.53)"/>
+  <path d="M377.73,536.41h-9.46a1,1,0,1,1,0-2h9.46A1,1,0,0,1,377.73,536.41Z" transform="translate(-354.99 -509.53)"/>
+  <path d="M375,525.54h-6.73a1,1,0,1,1,0-2H375A1,1,0,1,1,375,525.54Z" transform="translate(-354.99 -509.53)"/>
+  <path d="M375,535.41a1,1,0,0,1-1-1v-9.87a1,1,0,1,1,2,0v9.87A1,1,0,0,1,375,535.41Z" transform="translate(-354.99 -509.53)"/>
+  <path d="M373,523a3,3,0,1,1,3-3A3,3,0,0,1,373,523Zm0-4a1,1,0,1,0,1,1A1,1,0,0,0,373,519Z" transform="translate(-354.99 -509.53)"/>
+  <path d="M371,535.41a1,1,0,0,1-1-1v-9.87a1,1,0,1,1,2,0v9.87A1,1,0,0,1,371,535.41Z" transform="translate(-354.99 -509.53)"/>
+</svg>

data/app/helpers/decidim/pages/application_helper.rb

@@ -5,7 +5,6 @@ module Decidim
     # Custom helpers, scoped to the pages engine.
     #
     module ApplicationHelper
-      include Decidim::Comments::CommentsHelper
     end
   end
 end

data/app/models/decidim/pages/page.rb

@@ -7,7 +7,6 @@ module Decidim
     class Page < Pages::ApplicationRecord
       include Decidim::Resourceable
       include Decidim::HasFeature
-      include Decidim::Comments::Commentable
 
       feature_manifest_name "pages"
 
@@ -15,31 +14,6 @@ module Decidim
       def title
         feature.name
       end
-
-      # Public: Overrides the `commentable?` Commentable concern method.
-      def commentable?
-        feature.settings.comments_enabled?
-      end
-
-      # Public: Overrides the `accepts_new_comments?` Commentable concern method.
-      def accepts_new_comments?
-        commentable? && !feature.active_step_settings.comments_blocked
-      end
-
-      # Public: Overrides the `comments_have_alignment?` Commentable concern method.
-      def comments_have_alignment?
-        true
-      end
-
-      # Public: Overrides the `comments_have_votes?` Commentable concern method.
-      def comments_have_votes?
-        true
-      end
-
-      # Public: Overrides the `notifiable?` Notifiable concern method.
-      def notifiable?(_context)
-        false
-      end
     end
   end
 end

data/app/views/decidim/pages/application/show.html.erb

@@ -13,5 +13,3 @@
     </div>
   </div>
 </div>
-
-<%= comments_for @page %>

data/config/locales/ca.yml

@@ -1,3 +1,4 @@
+---
 ca:
   decidim:
     features:
@@ -5,9 +6,9 @@ ca:
         name: Pàgina
         settings:
           global:
-            comments_enabled: Comentaris habilitats
+            announcement: Avís
           step:
-            comments_blocked: Comentaris bloquejats
+            announcement: Avís
     pages:
       admin:
         models:

data/config/locales/en.yml

@@ -7,10 +7,8 @@ en:
         settings:
           global:
             announcement: Announcement
-            comments_enabled: Comments enabled
           step:
             announcement: Announcement
-            comments_blocked: Comments blocked
     pages:
       admin:
         models:

data/config/locales/es.yml

@@ -1,3 +1,4 @@
+---
 es:
   decidim:
     features:
@@ -5,9 +6,9 @@ es:
         name: Página
         settings:
           global:
-            comments_enabled: Comentarios habilitados
+            announcement: Aviso
           step:
-            comments_blocked: Comentarios bloqueados
+            announcement: Aviso
     pages:
       admin:
         models:

data/config/locales/eu.yml

@@ -5,14 +5,14 @@ eu:
         name: Orria
         settings:
           global:
-            comments_enabled: Iruzkinak gaituta
+            announcement: Oharra
           step:
-            comments_blocked: Iruzkinak blokeatuta
+            announcement: Oharra
     pages:
       admin:
         models:
           components:
-            body: Testu-gorputza
+            body: Testua
         pages:
           edit:
             save: Eguneratu

data/config/locales/fi.yml

@@ -5,9 +5,9 @@ fi:
         name: Sivu
         settings:
           global:
-            comments_enabled: Kommentointi sallittu
+            announcement: Ilmoitus
           step:
-            comments_blocked: Kommentointi estetty
+            announcement: Ilmoitus
     pages:
       admin:
         models:
@@ -15,6 +15,7 @@ fi:
             body: Runko
         pages:
           edit:
+            save: Päivitä
             title: Muokkaa sivua
           update:
             invalid: Sivun tallennuksessa oli virheitä.

data/config/locales/fr.yml

@@ -5,9 +5,9 @@ fr:
         name: Page
         settings:
           global:
-            comments_enabled: Commentaires activés
+            announcement: Annonce
           step:
-            comments_blocked: Commentaires bloqués
+            announcement: Annonce
     pages:
       admin:
         models:
@@ -15,7 +15,7 @@ fr:
             body: Corps de texte
         pages:
           edit:
-            save: Mettre à jour
+            save: Mise à jour
             title: Modifier la page
           update:
             invalid: Il y a eu des erreurs lors de la sauvegarde de la page.

data/config/locales/it.yml

@@ -5,9 +5,9 @@ it:
         name: Pagina
         settings:
           global:
-            comments_enabled: Commenti abilitati
+            announcement: Annuncio
           step:
-            comments_blocked: Commenti bloccati
+            announcement: Annuncio
     pages:
       admin:
         models:

data/config/locales/nl.yml

@@ -3,3 +3,20 @@ nl:
     features:
       pages:
         name: Pagina
+        settings:
+          global:
+            announcement: Aankondiging
+          step:
+            announcement: Aankondiging
+    pages:
+      admin:
+        models:
+          components:
+            body: Lichaam
+        pages:
+          edit:
+            save: Bijwerken
+            title: Pagina bewerken
+          update:
+            invalid: Er zijn fouten geweest bij het opslaan van de pagina.
+            success: Pagina is succesvol opgeslagen.

data/config/locales/pl.yml

@@ -3,3 +3,20 @@ pl:
     features:
       pages:
         name: Strona
+        settings:
+          global:
+            announcement: Ogłoszenie
+          step:
+            announcement: Ogłoszenie
+    pages:
+      admin:
+        models:
+          components:
+            body: Treść
+        pages:
+          edit:
+            save: Aktualizuj
+            title: Edytuj stronę
+          update:
+            invalid: Podczas zapisywania strony wystąpiły błędy.
+            success: Strona została zapisana pomyślnie.

data/config/locales/uk.yml

@@ -0,0 +1,22 @@
+uk:
+  decidim:
+    features:
+      pages:
+        name: Сторінка
+        settings:
+          global:
+            announcement: Оголошення
+          step:
+            announcement: Оголошення
+    pages:
+      admin:
+        models:
+          components:
+            body: Основний текст
+        pages:
+          edit:
+            save: Оновити
+            title: Редагувати сторінку
+          update:
+            invalid: При збереженні цієї сторінки сталися помилки.
+            success: Сторінку успішно збережено.

data/lib/decidim/pages/feature.rb

@@ -32,20 +32,11 @@ Decidim.register_feature(:pages) do |feature|
     pages.count
   end
 
-  feature.register_stat :comments_count, tag: :comments do |features, start_at, end_at|
-    pages = Decidim::Pages::Page.where(feature: features)
-    pages = pages.where("created_at >= ?", start_at) if start_at.present?
-    pages = pages.where("created_at <= ?", end_at) if end_at.present?
-    Decidim::Comments::Comment.where(root_commentable: pages).count
-  end
-
   feature.settings(:global) do |settings|
-    settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
   feature.settings(:step) do |settings|
-    settings.attribute :comments_blocked, type: :boolean, default: false
     settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
@@ -53,21 +44,19 @@ Decidim.register_feature(:pages) do |feature|
     resource.model_class_name = "Decidim::Pages::Page"
   end
 
-  feature.seeds do |process|
+  feature.seeds do |participatory_space|
     feature = Decidim::Feature.create!(
-      name: Decidim::Features::Namer.new(process.organization.available_locales, :pages).i18n_name,
+      name: Decidim::Features::Namer.new(participatory_space.organization.available_locales, :pages).i18n_name,
       manifest_name: :pages,
       published_at: Time.current,
-      participatory_process: process
+      participatory_space: participatory_space
     )
 
-    page = Decidim::Pages::Page.create!(
+    Decidim::Pages::Page.create!(
       feature: feature,
       body: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
         Decidim::Faker::Localized.paragraph(3)
       end
     )
-
-    Decidim::Comments::Seed.comments_for(page)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-pages
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: decidim-comments
+  name: rectify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: rectify
+  name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :runtime
+        version: 0.6.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: decidim-dev
+  name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 description: A pages component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -94,7 +94,6 @@ files:
 - app/views/decidim/pages/admin/pages/_form.html.erb
 - app/views/decidim/pages/admin/pages/edit.html.erb
 - app/views/decidim/pages/application/show.html.erb
-- config/i18n-tasks.yml
 - config/locales/ca.yml
 - config/locales/en.yml
 - config/locales/es.yml
@@ -104,6 +103,7 @@ files:
 - config/locales/it.yml
 - config/locales/nl.yml
 - config/locales/pl.yml
+- config/locales/uk.yml
 - db/migrate/20161116121353_create_decidim_pages.rb
 - db/migrate/20161214150429_add_commentable_to_pages.rb
 - db/migrate/20170110145040_remove_commentable_flag_from_pages.rb

data/config/i18n-tasks.yml

@@ -1,6 +0,0 @@
-base_locale: en
-ignore_unused:
-- "decidim.features.pages.name"
-- "decidim.features.pages.settings.*"
-search:
-  strict: false