decidim-core 0.27.8 → 0.28.0.rc4

data/app/helpers/decidim/decidim_form_helper.rb

@@ -10,12 +10,12 @@ module Decidim
     # &block - The block to execute as content of the form.
     #
     # Returns a String.
-    def decidim_form_for(record, options = {}, &block)
+    def decidim_form_for(record, options = {}, &)
       options[:data] ||= {}
       options[:data].update(abide: true, "live-validate" => true, "validate-on-blur" => true)
 
       options[:html] ||= {}
-      options[:html].update(novalidate: true)
+      options[:html].update(novalidate: true) unless options[:html].has_key?(:novalidate)
 
       # Generally called by form_for but we need the :url option generated
       # already before that.
@@ -31,7 +31,7 @@ module Decidim
 
       output = ""
       output += base_error_messages(record).to_s
-      output += form_for(record, options, &block).to_s
+      output += form_for(record, options, &).to_s
 
       output.html_safe
     end
@@ -75,7 +75,7 @@ module Decidim
       picker_options = {
         id: id || sanitize_to_id(name),
         class: "picker-single",
-        name: name
+        name:
       }
 
       prompt_params = yield(nil)
@@ -84,10 +84,9 @@ module Decidim
 
       template = ""
       template += render("decidim/scopes/scopes_picker_input",
-                         values_options: { delete_button: false },
-                         picker_options: picker_options,
-                         prompt_params: prompt_params,
-                         scopes: scopes,
+                         picker_options:,
+                         prompt_params:,
+                         scopes:,
                          values_on_top: true)
       template.html_safe
     end
@@ -202,7 +201,7 @@ module Decidim
     #
     # Returns an HTML-safe String.
     def form_required_explanation
-      content_tag(:div, class: "help-text help-text-form-required-fields") do
+      content_tag(:div, class: "help-text") do
         I18n.t("forms.required_explanation")
       end
     end
@@ -211,7 +210,7 @@ module Decidim
       return unless record.respond_to?(:errors)
       return unless record.errors[:base].any?
 
-      alert_box(record.errors.full_messages_for(:base).join(","), "alert", false)
+      alert_box(record.errors.full_messages_for(:base).join(","), :alert, false)
     end
 
     # Handle which collection to pass to Decidim::FilterFormBuilder.areas_select
@@ -221,5 +220,20 @@ module Decidim
 
       organization.area_types
     end
+
+    def ordered_scopes_descendants(root = nil)
+      root = try(:current_participatory_space)&.scope if root == false
+      if root.present?
+        root.descendants
+      else
+        current_organization.scopes
+      end.sort { |a, b| a.part_of.reverse <=> b.part_of.reverse }
+    end
+
+    def ordered_scopes_descendants_for_select(root = nil)
+      ordered_scopes_descendants(root).map do |scope|
+        [" #{"&nbsp;" * 4 * (scope.part_of.count - 1)} #{translated_attribute(scope.name)}".html_safe, scope&.id]
+      end
+    end
   end
 end

data/app/helpers/decidim/endorsable_helper.rb

@@ -5,7 +5,7 @@ module Decidim
   module EndorsableHelper
     # Invokes the decidim/endorsement_buttons cell.
     def endorsement_buttons_cell(resource)
-      cell("decidim/endorsement_buttons", resource)
+      cell("decidim/endorsement_block", resource)
     end
 
     # Invokes the decidim/endorsers_list cell.
@@ -85,8 +85,8 @@ module Decidim
       end
       http_method = selected ? :delete : :post
       render partial: "decidim/endorsements/identity", locals:
-      { identity: presenter, selected: selected,
-        http_method: http_method,
+      { identity: presenter, selected:,
+        http_method:,
         create_url: path_to_create_endorsement(resource, user_group),
         destroy_url: path_to_destroy_endorsement(resource, user_group) }
     end

data/app/helpers/decidim/filters_helper.rb

@@ -3,6 +3,8 @@
 module Decidim
   # Helper that provides a single method to create filter resource forms
   module FiltersHelper
+    include IconHelper
+
     # This method wraps everything in a div with class filters and calls
     # the form_for helper with a custom builder
     #
@@ -13,23 +15,20 @@ module Decidim
     #
     # Returns the filter resource form wrapped in a div
     def filter_form_for(filter, url = url_for, html_options = {})
-      content_tag :div, class: "filters" do
-        form_for(
-          filter,
-          namespace: filter_form_namespace,
-          builder: FilterFormBuilder,
-          url: url,
-          as: :filter,
-          method: :get,
-          remote: true,
-          html: { id: nil }.merge(html_options)
-        ) do |form|
-          # Cannot use `concat()` here because it's not available in cells
-          inner = []
-          inner << hidden_field_tag("per_page", params[:per_page], id: nil) if params[:per_page]
-          inner << capture { yield form }
-          inner.join.html_safe
-        end
+      form_for(
+        filter,
+        namespace: filter_form_namespace,
+        builder: FilterFormBuilder,
+        url:,
+        as: :filter,
+        method: :get,
+        remote: true,
+        html: { id: nil }.merge(html_options)
+      ) do |form|
+        inner = []
+        inner << hidden_field_tag("per_page", params[:per_page], id: nil) if params[:per_page]
+        inner << capture { yield form }
+        inner.join.html_safe
       end
     end
 

data/app/helpers/decidim/followable_helper.rb

@@ -4,8 +4,11 @@ module Decidim
   # A Helper for views with Followable resources.
   module FollowableHelper
     # Invokes the decidim/shared/follow_button partial.
-    def follow_button_for(model, large = nil)
-      controller.view_context.render partial: "decidim/shared/follow_button", locals: { followable: model, large: large }
+    def follow_button_for(model, large = nil, opts = {})
+      controller.view_context.render(
+        partial: "decidim/shared/follow_button",
+        locals: { followable: model, large:, opts: opts.slice(:button_classes, :text_classes, :icon_classes) }
+      )
     end
   end
 end

data/app/helpers/decidim/icon_helper.rb

@@ -41,16 +41,33 @@ module Decidim
     # Returns an HTML tag with the icon.
     def resource_icon(resource, options = {})
       if resource.instance_of?(Decidim::Comments::Comment)
-        icon "comment-square", options
+        icon "chat-1-line", options
       elsif resource.respond_to?(:component) && resource.component.present?
         component_icon(resource.component, options)
       elsif resource.respond_to?(:manifest) && resource.manifest.present?
         manifest_icon(resource.manifest, options)
       elsif resource.is_a?(Decidim::User)
-        icon "person", options
+        icon "user-line", options
       else
-        icon "bell", options
+        icon "notification-3-line", options
       end
     end
+
+    def resource_type_icon(resource_type, options = {})
+      icon resource_type_icon_key(resource_type), options
+    end
+
+    def resource_type_icon_key(resource_type)
+      return resource_type.to_s if Decidim.icons.all[resource_type.to_s]
+
+      "other"
+    end
+
+    def text_with_resource_icon(resource_name, text)
+      output = ""
+      output += resource_type_icon resource_name
+      output += content_tag :span, text
+      output.html_safe
+    end
   end
 end

data/app/helpers/decidim/layout_helper.rb

@@ -3,6 +3,9 @@
 module Decidim
   # View helpers related to the layout.
   module LayoutHelper
+    include Decidim::ModalHelper
+    include Decidim::TooltipHelper
+
     # Public: Generates a set of meta tags that generate the different favicon
     # versions for an organization.
     #
@@ -23,10 +26,11 @@ module Decidim
     end
 
     def legacy_favicon
-      icon_image = current_organization.attached_uploader(:favicon).variant_url(:small, host: current_organization.host)
+      variant = :favicon if current_organization.favicon.content_type != "image/vnd.microsoft.icon"
+      icon_image = current_organization.attached_uploader(:favicon).variant_url(variant, host: current_organization.host)
       return unless icon_image
 
-      favicon_link_tag(icon_image.gsub(".png", ".ico"), rel: "icon", sizes: "any", type: nil)
+      favicon_link_tag(icon_image, rel: "icon", sizes: "any", type: nil)
     end
 
     # Outputs an SVG-based icon.
@@ -43,37 +47,22 @@ module Decidim
     #
     # Returns a String.
     def icon(name, options = {})
-      options = options.with_indifferent_access
-      html_properties = {}
-
-      html_properties["width"] = options[:width]
-      html_properties["height"] = options[:height]
-      html_properties["aria-label"] = options[:aria_label] || options[:"aria-label"]
-      html_properties["role"] = options[:role] || "img"
-      html_properties["aria-hidden"] = options[:aria_hidden] || options[:"aria-hidden"]
-
-      html_properties["class"] = (["icon--#{name}"] + _icon_classes(options)).join(" ")
-
-      title = options["title"] || html_properties["aria-label"]
-      if title.blank? && html_properties["role"] == "img"
-        # This will make the accessibility audit tools happy as with the "img"
-        # role, the alternative text (aria-label) and title are required for the
-        # element. This will also force the SVG to be hidden because otherwise
-        # the screen reader would announce the icon name which can be in
-        # different language (English) than the page language which is not
-        # allowed.
-        title = name
-        html_properties["aria-label"] = title
-        html_properties["aria-hidden"] = true
-      end
+      name = Decidim.icons.find(name)["icon"] unless options[:ignore_missing]
 
-      href = Decidim.cors_enabled ? "" : asset_pack_path("media/images/icons.svg")
+      default_html_properties = {
+        "width" => "1em",
+        "height" => "1em",
+        "role" => "img",
+        "aria-hidden" => "true"
+      }
 
-      content_tag :svg, html_properties do
-        inner = content_tag :title, title
-        inner += content_tag :use, nil, "href" => "#{href}#icon-#{name}"
+      html_properties = options.with_indifferent_access.transform_keys(&:dasherize).slice("width", "height", "aria-label", "role", "aria-hidden", "class", "style")
+      html_properties = default_html_properties.merge(html_properties)
 
-        inner
+      href = Decidim.cors_enabled ? "" : asset_pack_path("media/images/remixicon.symbol.svg")
+
+      content_tag :svg, html_properties do
+        content_tag :use, nil, "href" => "#{href}#ri-#{name}", tabindex: -1
       end
     end
 
@@ -109,7 +98,7 @@ module Decidim
       return unless File.exist?(path)
 
       path
-    rescue ::Webpacker::Manifest::MissingEntryError
+    rescue ::Shakapacker::Manifest::MissingEntryError
       nil
     end
 
@@ -133,21 +122,21 @@ module Decidim
       active_item = items.find { |item| item[:active] }
 
       controller.view_context.render partial: "decidim/shared/extended_navigation_bar", locals: {
-        items: items,
-        extra_items: extra_items,
-        active_item: active_item,
-        max_items: max_items
+        items:,
+        extra_items:,
+        active_item:,
+        max_items:
       }
     end
 
     # Renders a view with the customizable CSS variables in two flavours:
     # 1. as a hexadecimal valid CSS color (ie: #ff0000)
-    # 2. as a disassembled RGB components (ie: 255,0,0)
+    # 2. as a disassembled RGB components (ie: 255 0 0)
     #
     # Example:
     #
     # --primary: #ff0000;
-    # --primary-rgb: 255,0,0
+    # --primary-rgb: 255 0 0
     #
     # Hexadecimal variables can be used as a normal CSS color:
     #
@@ -158,12 +147,36 @@ module Decidim
     #
     # background-color: rgba(var(--primary-rgb), 0.5)
     def organization_colors
-      css = current_organization.colors.each.map { |k, v| "--#{k}: #{v};--#{k}-rgb: #{v[1..2].hex},#{v[3..4].hex},#{v[5..6].hex};" }.join
-      render partial: "layouts/decidim/organization_colors", locals: { css: css }
+      css = current_organization.colors.each.map { |k, v| "--#{k}: #{v};--#{k}-rgb: #{v[1..2].hex} #{v[3..4].hex} #{v[5..6].hex};" }.join
+      render partial: "layouts/decidim/organization_colors", locals: { css: }
+    end
+
+    def current_user_unread_data
+      return {} if current_user.blank?
+
+      {}.tap do |d|
+        d.merge!(unread_notifications: true) if current_user.notifications.any?
+        d.merge!(unread_conversations: true) if current_user.unread_conversations.any?
+        d.merge!(unread_items: d.present?)
+      end
+    end
+
+    def organization_description_label
+      @organization_description_label ||= if empty_organization_description?
+                                            t("decidim.pages.home.footer_sub_hero.footer_sub_hero_body_html")
+                                          else
+                                            decidim_sanitize_admin(translated_attribute(current_organization.description))
+                                          end
     end
 
     private
 
+    def empty_organization_description?
+      organization_description = translated_attribute(current_organization.description)
+
+      organization_description.blank? || organization_description == "<p></p>"
+    end
+
     def tag_builder
       @tag_builder ||= ActionView::Helpers::TagHelper::TagBuilder.new(self)
     end

data/app/helpers/decidim/map_helper.rb

@@ -9,26 +9,32 @@ module Decidim
     # resource - A geolocalizable resource
     # options - An optional hash of options (default: { zoom: 17 })
     #           * zoom: A number to represent the zoom value of the map
-    def static_map_link(resource, options = {}, map_html_options = {}, &block)
+    def static_map_link(resource, options = {}, map_html_options = {}, &)
       return unless resource.geocoded_and_valid?
       return unless map_utility_static || map_utility_dynamic
 
       address_text = resource.try(:address)
-      address_text ||= t("latlng_text", latitude: latitude, longitude: longitude, scope: "decidim.map.static")
+      address_text ||= t("latlng_text", latitude:, longitude:, scope: "decidim.map.static")
       map_service_brand = t("map_service_brand", scope: "decidim.map.static")
 
       if map_utility_static
         map_url = map_utility_static.link(
           latitude: resource.latitude,
           longitude: resource.longitude,
-          options: options
+          options:
         )
 
         # Check that the static map utility actually returns a URL before
         # creating the static map utility. If it does not, the image would be
         # otherwise blank.
         if map_utility_static.url(latitude: resource.latitude, longitude: resource.longitude)
-          return link_to map_url, target: "_blank", rel: "noopener" do
+          html_options = {
+            class: "static-map",
+            target: "_blank",
+            rel: "noopener",
+            data: { "external-link": false }
+          }.merge(map_html_options)
+          return link_to(map_url, html_options) do
             image_tag decidim.static_map_path(sgid: resource.to_sgid.to_s), alt: "#{map_service_brand} - #{address_text}"
           end
         end
@@ -45,23 +51,13 @@ module Decidim
         link: map_url
       }.merge(options))
 
-      unless snippets.any?(:map_styles) || snippets.any?(:map_scripts)
-        snippets.add(:map_styles, builder.stylesheet_snippets)
-        snippets.add(:map_scripts, builder.javascript_snippets)
-
-        # This will display the snippets in the <head> part of the page.
-        snippets.add(:head, snippets.for(:map_styles))
-        # This will display the snippets in the bottom part of the page.
-        snippets.add(:foot, snippets.for(:map_scripts))
-      end
-
       builder.map_element(
         { class: "static-map", tabindex: "0" }.merge(map_html_options),
-        &block
+        &
       )
     end
 
-    def dynamic_map_for(options_or_markers = {}, html_options = {}, &block)
+    def dynamic_map_for(options_or_markers = {}, html_options = {}, &)
       return unless map_utility_dynamic
 
       options = {
@@ -75,42 +71,20 @@ module Decidim
 
       builder = map_utility_dynamic.create_builder(self, options)
 
-      # The map snippets are stored to the snippets utility in order to ensure
-      # that they are only loaded once during each page load. In case they were
-      # loaded multiple times, the maps would break. We store the map assets to
-      # a special "map" snippets category in order to avoid displaying them
-      # multiple times. Then we inject them to the "head" category during the
-      # first load which will actually display them in the <head> section of the
-      # view.
-      #
-      # Ideally we would use Rails' native content_for here (which is exactly
-      # for this purpose) but unfortunately it does not work in the cells which
-      # also need to display maps.
-      unless snippets.any?(:map_styles) || snippets.any?(:map_scripts)
-        snippets.add(:map_styles, builder.stylesheet_snippets)
-        snippets.add(:map_scripts, builder.javascript_snippets)
-
-        # This will display the snippets in the <head> part of the page.
-        snippets.add(:head, snippets.for(:map_styles))
-        # This will display the snippets in the bottom part of the page.
-        snippets.add(:foot, snippets.for(:map_scripts))
-      end
-
-      map_html_options = { id: "map", class: "google-map" }.merge(html_options)
+      map_html_options = { id: "map" }.merge(html_options)
       bottom_id = "#{map_html_options[:id]}_bottom"
 
-      help = content_tag(:div, class: "map__help") do
-        sr_content = content_tag(:p, t("screen_reader_explanation", scope: "decidim.map.dynamic"), class: "show-for-sr")
-        link = link_to(t("skip_button", scope: "decidim.map.dynamic"), "##{bottom_id}", class: "skip")
+      help = content_tag(:div, class: "map__skip-container") do
+        sr_content = content_tag(:p, t("screen_reader_explanation", scope: "decidim.map.dynamic"), class: "sr-only")
+        link = link_to(t("skip_button", scope: "decidim.map.dynamic"), "##{bottom_id}", class: "map__skip")
 
         sr_content + link
       end
-      content_tag :div, class: "row column" do
-        map = builder.map_element(map_html_options, &block)
-        bottom = content_tag(:div, "", id: bottom_id)
 
-        help + map + bottom
-      end
+      map = builder.map_element(map_html_options, &)
+      bottom = content_tag(:div, "", id: bottom_id)
+
+      content_tag(:div, help + map + bottom)
     end
 
     private

data/app/helpers/decidim/menu_helper.rb

@@ -14,6 +14,16 @@ module Decidim
       )
     end
 
+    def main_menu_modules
+      @main_menu ||= ::Decidim::MenuPresenter.new(
+        :menu,
+        self,
+        element_class: "main-nav__link-modules",
+        active_class: "main-nav__link-modules--active",
+        label: t("layouts.decidim.header.main_menu")
+      )
+    end
+
     # Public: Returns the user menu presenter object
     def user_menu
       @user_menu ||= ::Decidim::InlineMenuPresenter.new(
@@ -24,5 +34,42 @@ module Decidim
         label: t("layouts.decidim.user_menu.title")
       )
     end
+
+    def breadcrumb_root_menu
+      @breadcrumb_root_menu ||= ::Decidim::BreadcrumbRootMenuPresenter.new(
+        :menu,
+        self,
+        container_options: { class: "menu-bar__main-dropdown__menu" }
+      )
+    end
+
+    def footer_menu
+      @footer_menu ||= ::Decidim::FooterMenuPresenter.new(
+        :menu,
+        self,
+        element_class: "font-semibold underline",
+        active_class: "is-active",
+        container_options: { class: "space-y-4 break-inside-avoid" },
+        label: t("layouts.decidim.footer.decidim_title")
+      )
+    end
+
+    def menu_highlighted_participatory_process
+      @menu_highlighted_participatory_process ||= (
+        # The queries already include the order by weight
+        Decidim::ParticipatoryProcesses::OrganizationParticipatoryProcesses.new(current_organization) |
+        Decidim::ParticipatoryProcesses::PromotedParticipatoryProcesses.new
+      ).first
+    end
+
+    def home_content_block_menu
+      @home_content_block_menu ||= ::Decidim::MenuPresenter.new(
+        :home_content_block_menu,
+        self,
+        element_class: "main-nav__link",
+        active_class: "main-nav__link--active",
+        label: t("layouts.decidim.header.main_menu")
+      )
+    end
   end
 end

data/app/helpers/decidim/messaging/conversation_helper.rb

@@ -3,6 +3,7 @@
 module Decidim
   module Messaging
     module ConversationHelper
+      # deprecated
       def conversation_name_for(users)
         return content_tag(:span, t("decidim.profile.deleted"), class: "label label--small label--basic") if users.first.deleted?
 
@@ -30,15 +31,14 @@ module Decidim
       def username_list(users, shorten: false)
         content_tags = []
         first_users = shorten ? users.first(3) : users
-        deleted_user_tag = content_tag(:span, t("decidim.profile.deleted"), class: "label label--small label--basic")
         first_users.each do |u|
-          content_tags.push(u.deleted? ? deleted_user_tag : content_tag(:strong, u.name))
+          content_tags.push(u.deleted? ? t("decidim.profile.deleted") : u.name)
         end
 
         return content_tags.join(", ") unless shorten
         return content_tags.join(", ") unless users.count > 3
 
-        content_tags.push(content_tag(:strong, " + #{users.count - 3}"))
+        content_tags.push(" + #{users.count - 3}")
         content_tags.join(", ")
       end
 
@@ -48,12 +48,12 @@ module Decidim
       def link_to_current_or_new_conversation_with(user, title = t("decidim.contact"))
         conversation_path = current_or_new_conversation_path_with(user)
         if conversation_path
-          link_to conversation_path, title: title do
-            icon "envelope-closed", aria_label: title, class: "icon--small"
+          link_to(conversation_path, title:) do
+            icon "mail-send-line", aria_label: title, class: "icon--small"
           end
         else
           content_tag :span, title: t("decidim.user_contact_disabled"), data: { tooltip: true } do
-            icon "envelope-closed", aria_label: title, class: "icon--small muted"
+            icon "mail-send-line", aria_label: title, class: "icon--small muted"
           end
         end
       end
@@ -63,6 +63,7 @@ module Decidim
       #
       # Links to the conversation between the current user and another user
       #
+      # deprecated ?
       def text_link_to_current_or_new_conversation_with(user, body = t("decidim.profiles.show.send_private_message"))
         conversation_path = current_or_new_conversation_path_with(user)
         link_to body, conversation_path, title: body if conversation_path
@@ -72,12 +73,12 @@ module Decidim
       # Finds the right path to the conversation the current user and another
       # user (the interlocutor).
       #
-      # * If there's no current user, it returns to the login form path.
+      # * If there is no current user, it returns to the login form path.
       #
-      # * If there's a prior existing conversation between the users it returns
+      # * If there is a prior existing conversation between the users it returns
       #   the path to the existing conversation.
       #
-      # * If there's no prior conversation between the users, it checks if the
+      # * If there is no prior conversation between the users, it checks if the
       #   the interlocutor accepts the current user to new conversation.
       #   If affirmative, it returns the new conversation form path.
       #
@@ -89,7 +90,6 @@ module Decidim
       # @return [String] The resulting route
       #
       def current_or_new_conversation_path_with(user)
-        decidim_routes = Decidim::Core::Engine.routes.url_helpers
         return decidim_routes.new_user_session_path unless user_signed_in?
 
         conversation = conversation_between(current_user, user)
@@ -119,17 +119,17 @@ module Decidim
       #
       # Links to the conversation between the current user and another users group
       #
-      def current_or_new_conversation_path_with_multiple(users)
-        decidim_routes = Decidim::Core::Engine.routes.url_helpers
+      def current_or_new_conversation_path_with_multiple(users, opts = {})
         return decidim_routes.new_user_session_path unless user_signed_in?
 
-        participants = users.to_a.prepend(current_user)
+        active_participant = opts[:nickname].present? ? Decidim::UserBaseEntity.find_by(nickname: opts[:nickname]) : current_user
+        participants = users.to_a.prepend(active_participant)
         conversation = conversation_between_multiple(participants)
 
-        if conversation
-          decidim_routes.conversation_path(conversation)
+        if opts[:nickname].present?
+          current_or_new_profile_conversation_path(opts[:nickname], users, conversation)
         else
-          decidim_routes.new_conversation_path(recipient_id: users.pluck(:id))
+          current_or_new_user_conversation_path(users, conversation)
         end
       end
 
@@ -147,6 +147,24 @@ module Decidim
           conversation.participants.to_set == participants.to_set
         end
       end
+
+      def current_or_new_profile_conversation_path(nickname, users, conversation = nil)
+        return decidim_routes.profile_conversation_path(conversation, nickname:) if conversation.present?
+
+        decidim_routes.new_profile_conversation_path(nickname:, recipient_id: users.pluck(:id))
+      end
+
+      def current_or_new_user_conversation_path(users, conversation = nil)
+        return decidim_routes.conversation_path(conversation) if conversation.present?
+
+        decidim_routes.new_conversation_path(recipient_id: users.pluck(:id))
+      end
+
+      private
+
+      def decidim_routes
+        @decidim_routes ||= Decidim::Core::Engine.routes.url_helpers
+      end
     end
   end
 end

data/app/helpers/decidim/meta_tags_helper.rb

@@ -3,7 +3,7 @@
 module Decidim
   # Helper that provides convenient methods to deal with the page meta tags.
   module MetaTagsHelper
-    # Public: Sets the given metatags for the page. It's a wrapper for the individual
+    # Public: Sets the given metatags for the page. It is a wrapper for the individual
     # methods, so that you can set multiple values with a single call. See the docs for
     # the other methods to see how they work.
     #
@@ -18,9 +18,9 @@ module Decidim
       add_decidim_meta_image_url(add_base_url_to(tags[:image_url]))
     end
 
-    # Public: Add base url to path if path doesn't include host.
+    # Public: Add base url to path if path does not include host.
     # path - A String containing path (e.g. "/proposals/1" )
-    # Returns a String of URL including base URL and path, or path if it's blank.
+    # Returns a String of URL including base URL and path, or path if it is blank.
     def add_base_url_to(path)
       return path if path.blank?
       return path if URI.parse(path).host.present?