Upstream

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http:https://semver.org/spec/v2.0.0.
 ### Changed
 - Design improvements https://github.com/consul/consul/pull/2170
 - Adds timestamps to polls https://github.com/consul/consul/pull/2180 (Run `rake polls:initialize_timestamps` to initialize attributes created_at and updated_at with the current time for all existing polls, or manually through console set correct values)
+- Improved Community design https://github.com/consul/consul/pull/1904
 
 ### Deprecated
 

app/assets/stylesheets/participation.scss

@@ -336,7 +336,8 @@
 .draft-panels,
 .debate-questions,
 .communities-show,
-.topic-show {
+.topic-show,
+.milestone-content {
 
  p {
  word-wrap: break-word;

app/controllers/admin/budget_investment_milestones_controller.rb

@@ -14,7 +14,8 @@ def create
  @milestone = Budget::Investment::Milestone.new(milestone_params)
  @milestone.investment = @investment
  if @milestone.save
- redirect_to admin_budget_budget_investment_path(@investment.budget, @investment), notice: t('admin.milestones.create.notice')
+ redirect_to admin_budget_budget_investment_path(@investment.budget, @investment),
+ notice: t('admin.milestones.create.notice')
  else
  render :new
  end
@@ -25,32 +26,34 @@ def edit
 
  def update
  if @milestone.update(milestone_params)
- redirect_to admin_budget_budget_investment_path(@investment.budget, @investment), notice: t('admin.milestones.update.notice')
+ redirect_to admin_budget_budget_investment_path(@investment.budget, @investment),
+ notice: t('admin.milestones.update.notice')
  else
  render :edit
  end
  end
 
  def destroy
  @milestone.destroy
- redirect_to admin_budget_budget_investment_path(@investment.budget, @investment), notice: t('admin.milestones.delete.notice')
+ redirect_to admin_budget_budget_investment_path(@investment.budget, @investment),
+ notice: t('admin.milestones.delete.notice')
  end
 
  private
 
  def milestone_params
  params.require(:budget_investment_milestone)
- .permit(:title, :description, :budget_investment_id,
- image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy])
+ .permit(:title, :description, :publication_date, :budget_investment_id,
+ image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy],
+ documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy])
  end
 
  def load_budget_investment
- @investment = Budget::Investment.find params[:budget_investment_id]
+ @investment = Budget::Investment.find(params[:budget_investment_id])
  end
 
  def load_budget_investment_milestone
- @milestone = Budget::Investment::Milestone.find params[:id]
+ @milestone = Budget::Investment::Milestone.find(params[:id])
  end
 
-
 end

app/models/budget/investment.rb

@@ -18,6 +18,7 @@ class Investment < ActiveRecord::Base
  acts_as_paranoid column: :hidden_at
  include ActsAsParanoidAliases
  include Relationable
+ include Notifiable
 
  belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id'
  belongs_to :heading

app/models/budget/investment/milestone.rb

@@ -2,11 +2,16 @@ class Budget
  class Investment
  class Milestone < ActiveRecord::Base
  include Imageable
+ include Documentable
+ documentable max_documents_allowed: 3,
+ max_file_size: 3.megabytes,
+ accepted_content_types: [ "application/pdf" ]
 
  belongs_to :investment
 
  validates :title, presence: true
  validates :investment, presence: true
+ validates :publication_date, presence: true
 
  def self.title_max_length
  80

app/models/comment.rb

@@ -2,8 +2,9 @@ class Comment < ActiveRecord::Base
  include Flaggable
  include HasPublicAuthor
  include Graphqlable
+ include Notifiable
 
- COMMENTABLE_TYPES = %w(Debate Proposal Budget::Investment Poll::Question Legislation::Question Legislation::Proposal Legislation::Annotation Topic SpendingProposal ProbeOption Poll).freeze
+ COMMENTABLE_TYPES = %w(Debate Proposal Budget::Investment Poll Poll::Question Topic Legislation::Question Legislation::Annotation Legislation::Proposal SpendingProposal ProbeOption).freeze
 
  acts_as_paranoid column: :hidden_at
  include ActsAsParanoidAliases

app/models/concerns/notifiable.rb

@@ -0,0 +1,35 @@
+module Notifiable
+ extend ActiveSupport::Concern
+
+ def notifiable_title
+ case self.class.name
+ when "ProposalNotification"
+ proposal.title
+ when "Comment"
+ commentable.title
+ else
+ title
+ end
+ end
+
+ def notifiable_available?
+ case self.class.name
+ when "ProposalNotification"
+ check_availability(proposal)
+ when "Comment"
+ check_availability(commentable)
+ else
+ check_availability(self)
+ end
+ end
+
+ def check_availability(resource)
+ resource.present? &&
+ resource.try(:hidden_at) == nil &&
+ resource.try(:retired_at) == nil
+ end
+
+ def linkable_resource
+ is_a?(ProposalNotification) ? proposal : self
+ end
+end

app/models/debate.rb

@@ -10,6 +10,7 @@ class Debate < ActiveRecord::Base
  include HasPublicAuthor
  include Graphqlable
  include Relationable
+ include Notifiable
 
  acts_as_votable
  acts_as_paranoid column: :hidden_at

app/models/legislation/proposal.rb

@@ -15,6 +15,7 @@ class Legislation::Proposal < ActiveRecord::Base
  include Followable
  include Communitable
  include Documentable
+ include Notifiable
 
  documentable max_documents_allowed: 3,
  max_file_size: 3.megabytes,

app/models/legislation/question.rb

@@ -1,6 +1,7 @@
 class Legislation::Question < ActiveRecord::Base
  acts_as_paranoid column: :hidden_at
  include ActsAsParanoidAliases
+ include Notifiable
 
  belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id'
  belongs_to :process, class_name: 'Legislation::Process', foreign_key: 'legislation_process_id'

app/models/notification.rb

@@ -1,4 +1,5 @@
 class Notification < ActiveRecord::Base
+
  belongs_to :user, counter_cache: true
  belongs_to :notifiable, polymorphic: true
 
@@ -7,6 +8,9 @@ class Notification < ActiveRecord::Base
  scope :not_emailed, -> { where(emailed_at: nil) }
  scope :for_render, -> { includes(:notifiable) }
 
+ delegate :notifiable_title, :notifiable_available?, :check_availability, :linkable_resource,
+ to: :notifiable, allow_nil: true
+
  def timestamp
  notifiable.created_at
  end
@@ -25,17 +29,6 @@ def self.add(user_id, notifiable)
  end
  end
 
- def notifiable_title
- case notifiable.class.name
- when "ProposalNotification"
- notifiable.proposal.title
- when "Comment"
- notifiable.commentable.title
- else
- notifiable.title
- end
- end
-
  def notifiable_action
  case notifiable_type
  when "ProposalNotification"
@@ -47,8 +40,4 @@ def notifiable_action
  end
  end
 
- def linkable_resource
- notifiable.is_a?(ProposalNotification) ? notifiable.proposal : notifiable
- end
-
-end
+end

app/models/poll.rb

@@ -5,6 +5,7 @@ class Poll < ActiveRecord::Base
  include Imageable
  acts_as_paranoid column: :hidden_at
  include ActsAsParanoidAliases
+ include Notifiable
 
  RECOUNT_DURATION = 1.week
 

app/models/proposal.rb

@@ -13,6 +13,7 @@ class Proposal < ActiveRecord::Base
  include Communitable
  include Imageable
  include Mappable
+ include Notifiable
  include Documentable
  documentable max_documents_allowed: 3,
  max_file_size: 3.megabytes,

app/models/proposal_notification.rb

@@ -1,6 +1,6 @@
 class ProposalNotification < ActiveRecord::Base
-
  include Graphqlable
+ include Notifiable
 
  belongs_to :author, class_name: 'User', foreign_key: 'author_id'
  belongs_to :proposal
@@ -35,4 +35,8 @@ def public_for_api?
  return true
  end
 
+ def notifiable
+ proposal
+ end
+
 end

app/models/topic.rb

@@ -1,6 +1,7 @@
 class Topic < ActiveRecord::Base
  acts_as_paranoid column: :hidden_at
  include ActsAsParanoidAliases
+ include Notifiable
 
  belongs_to :community
  belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id'

app/views/admin/budget_investment_milestones/_form.html.erb

@@ -2,7 +2,16 @@
 
  <%= f.text_field :title, maxlength: Budget::Investment::Milestone.title_max_length %>
  <%= f.text_area :description, rows: 5 %>
+ <%= f.text_field :publication_date,
+ value: @milestone.publication_date.present? ? l(@milestone.publication_date.to_date) : nil,
+ class: "js-calendar-full" %>
+
  <%= render 'images/admin_image', imageable: @milestone, f: f %>
 
+ <hr>
+ <div class="documents">
+ <%= render 'documents/nested_documents', documentable: @milestone, f: f %>
+ </div>
+
  <%= f.submit nil, class: "button success" %>
 <% end %>

app/views/admin/budget_investments/_milestones.html.erb

@@ -5,36 +5,53 @@
  <th><%= t("admin.milestones.index.table_id") %></th>
  <th><%= t("admin.milestones.index.table_title") %></th>
  <th><%= t("admin.milestones.index.table_description") %></th>
+ <th><%= t("admin.milestones.index.table_publication_date") %></th>
  <th><%= t("admin.milestones.index.image") %></th>
+ <th><%= t("admin.milestones.index.documents") %></th>
  <th><%= t("admin.milestones.index.table_actions") %></th>
  </tr>
  </thead>
  <tbody>
  <% @investment.milestones.each do |milestone| %>
  <tr id="<%= dom_id(milestone) %>" class="milestone">
+ <td><%= milestone.id %></td>
  <td>
- <%= milestone.id %>
- </td>
- <td>
- <%= link_to milestone.title, edit_admin_budget_budget_investment_budget_investment_milestone_path(@investment.budget, @investment, milestone) %>
+ <%= link_to milestone.title,
+  edit_admin_budget_budget_investment_budget_investment_milestone_path(@investment.budget,
+  @investment,
+   milestone) %>
  </td>
+ <td class="small"><%= milestone.description %></td>
+ <% if milestone.publication_date.present? %>
+ <td class="small"><%= l(milestone.publication_date.to_date) %></td>
+ <% end %>
  <td class="small">
- <%= milestone.description %>
+ <%= link_to t("admin.milestones.index.show_image"),
+ milestone.image_url(:large),
+ target: :_blank if milestone.image.present? %>
  </td>
  <td class="small">
- <%= link_to t("admin.milestones.index.show_image"), milestone.image_url(:large), target: :_blank if milestone.image.present? %>
+ <% if milestone.documents.present? %>
+ <% milestone.documents.each do |document| %>
+ <%= link_to document.title,
+ document.attachment.url,
+ target: "_blank",
+ rel: "" %><br>
+ <% end %>
+ <% end %>
  </td>
  <td>
- <%= link_to t("admin.milestones.index.delete"), admin_budget_budget_investment_budget_investment_milestone_path(@investment.budget, @investment, milestone),
+ <%= link_to t("admin.milestones.index.delete"),
+ admin_budget_budget_investment_budget_investment_milestone_path(@investment.budget,
+ @investment,
+ milestone),
  method: :delete,
- class: 'button hollow alert expanded' %>
+ class: "button hollow alert expanded" %>
  </td>
  </tr>
  <% end %>
  </tbody>
  </table>
 <% else %>
- <p>
- <%= t('admin.milestones.index.no_milestones') %>
- </p>
+ <p><%= t("admin.milestones.index.no_milestones") %></p>
 <% end %>

app/views/budgets/investments/_milestones.html.erb

@@ -12,11 +12,28 @@
  <li>
  <div class="milestone-content">
  <h3><%= milestone.title %></h3>
- <span class="milestone-date">
- <strong><%= t("budgets.investments.show.milestone_publish_date", publish_date: l(milestone.created_at.to_date)) %></strong>
- </span>
- <%= image_tag(milestone.image_url(:large), {alt: milestone.image.title, class: "margin", id: "image_#{milestone.id}"}) if milestone.image.present? %>
+ <% if milestone.publication_date.present? %>
+ <span class="milestone-date">
+ <strong><%= t("budgets.investments.show.milestone_publication_date",
+ publication_date: l(milestone.publication_date.to_date)) %></strong>
+ </span>
+ <% end %>
+ <%= image_tag(milestone.image_url(:large), { alt: milestone.image.title, class: "margin", id: "image_#{milestone.id}" }) if milestone.image.present? %>
  <p><%= milestone.description %></p>
+ <% if milestone.documents.present? %>
+ <div class="document-link text-center">
+ <p>
+ <span class="icon-document"></span>&nbsp;
+ <strong><%= t('proposals.show.title_external_url') %></strong>
+ </p>
+ <% milestone.documents.each do |document| %>
+ <%= link_to document.title,
+ document.attachment.url,
+ target: "_blank",
+ rel: "" %><br>
+ <% end %>
+ </div>
+ <% end %>
  </div>
  </li>
  <% end %>

app/views/comments/_form.html.erb

@@ -8,7 +8,7 @@
  <%= f.hidden_field :commentable_id, value: commentable.id %>
  <%= f.hidden_field :parent_id, value: parent_id %>
 
- <%= f.submit comment_button_text(parent_id, commentable), class: "button" %>
+ <%= f.submit comment_button_text(parent_id, commentable), class: "button", id: "publish_comment" %>
 
  <% if can? :comment_as_moderator, commentable %>
  <div class="float-right">

app/views/devise/menu/_login_items.html.erb

@@ -1,5 +1,5 @@
 <% if user_signed_in? %>
- <li>
+ <li id="notifications">
  <%= link_to notifications_path, rel: "", class: "notifications" do %>
  <span class="show-for-sr"><%= t("layouts.header.notifications") %></span>
  <% if current_user.notifications_count > 0 %>

app/views/notifications/_notification.html.erb

@@ -1,5 +1,5 @@
 <li id="<%= dom_id(notification) %>" class="notification">
- <% if notification.notifiable.present? %>
+ <% if notification.notifiable_available? %>
  <%= link_to notification do %>
  <p>
  <em>

config/locales/en/activerecord.yml

@@ -178,6 +178,7 @@ en:
  budget/investment/milestone:
  title: "Title"
  description: "Description"
+ publication_date: "Publication date"
  comment:
  body: "Comment"
  user: "User"