3 files changed, 19 insertions, 1 deletions

diff --git a/app/helpers/content_helper.rb b/app/helpers/content_helper.rb
index 21cc579..53bf5b2 100644
--- a/app/helpers/content_helper.rb
+++ b/app/helpers/content_helper.rb
@@ -80,7 +80,7 @@ module ContentHelper
     begin
       if content =~ /\[aggregate([^\]]*)\]/
         tag = $~.to_s
-        matched_data = $1.scan(/\w+\="[a-zA-Z\s\/_\d,.=]*"/)
+        matched_data = $1.scan(/\w+\="[a-zA-Z\s\/_\d,.=-]*"/)
 
         matched_data.each do |data|
           splitted_data = data.split("=", 2)
diff --git a/app/models/page.rb b/app/models/page.rb
index e6baf20..385b3f6 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -63,6 +63,14 @@ class Page < ApplicationRecord
       end
     end
 
+    if options[:order_by] == "title"
+      return scope
+        .joins(:translations)
+        .where(page_translations: { locale: I18n.locale })
+        .order("page_translations.title #{options[:order_direction]}")
+        .paginate(:page => page, :per_page => options[:limit])
+    end
+
     scope.order("#{options[:order_by]} #{options[:order_direction]}")
       .paginate(:page => page, :per_page => options[:limit])
   end
diff --git a/app/views/custom/partials/_chapter.html.erb b/app/views/custom/partials/_chapter.html.erb
new file mode 100644
index 0000000..a5b8662
--- /dev/null
+++ b/app/views/custom/partials/_chapter.html.erb
@@ -0,0 +1,10 @@
+<div class="article_partial chapter_partial" lang="<%= page.effective_lang %>">
+  <h2 class="headline"><%= link_to_path page.title, page.node.unique_name %></h2>
+  <% if page.abstract.present? %>
+    <div class="chapter_location"><%= page.abstract %></div>
+  <% end %>
+  <% if page.node.external_url.present? %>
+    <div class="chapter_url"><%= link_to page.node.external_url, page.node.external_url, target: '_blank', rel: 'noopener' %></div>
+  <% end %>
+  <p class="excerpt"><%= sanitize page.body %></p>
+</div>