diff --git a/lib/proposals_discussion_plugin/proposals_list_helper.rb b/lib/proposals_discussion_plugin/proposals_list_helper.rb
new file mode 100644
index 0000000..7a37027
--- /dev/null
+++ b/lib/proposals_discussion_plugin/proposals_list_helper.rb
@@ -0,0 +1,7 @@
+module ProposalsDiscussionPlugin::ProposalsListHelper
+
+ def more_proposals(text, holder, order, page=1)
+ link_to '', url_for({:controller => 'proposals_discussion_plugin_public', :action => 'load_proposals', :holder_id => holder.id, :profile => profile.identifier, :order => order, :page => page })
+ end
+
+end
diff --git a/public/style.css b/public/style.css
index ae82319..33a5e6f 100644
--- a/public/style.css
+++ b/public/style.css
@@ -117,6 +117,7 @@ form .proposals-discussion-plugin .body textarea {
text-decoration: none;
border-left: 1px solid rgb(185, 185, 185);
padding: 0 5px;
+ color: #555753;
}
.proposals_list .filters a.selected {
font-weight: bold;
diff --git a/views/content_viewer/_proposals_list.html.erb b/views/content_viewer/_proposals_list.html.erb
index b5e1f60..1b9c9d9 100644
--- a/views/content_viewer/_proposals_list.html.erb
+++ b/views/content_viewer/_proposals_list.html.erb
@@ -18,9 +18,10 @@
proposalsScroll();
});
});
-
+<% extend ProposalsDiscussionPlugin::ProposalsListHelper %>
+
<% private_proposals = user ? @page.proposals.private(user) : [] %>
<% unless private_proposals.empty? %>
@@ -33,8 +34,8 @@
<%= _('Proposals') %>
- <% [[_('Random'), :random], [_('Aplhabetical'), :alphabetical]].each do |order| %>
- <%= link_to order.first, url_for({:controller => 'proposals_discussion_plugin_public', :action => 'load_proposals', :holder_id => holder.id, :profile => profile.identifier, :order => order.second}), :remote => true, :class => 'order' %>
+ <% [[_('Random'), :random], [_('Aplhabetical'), :alphabetical]].each_with_index do |order, i| %>
+ <%= link_to order.first, url_for({:controller => 'proposals_discussion_plugin_public', :action => 'load_proposals', :holder_id => holder.id, :profile => profile.identifier, :order => order.second}), :remote => true, :class => "order #{order.second} #{i==0 ? 'selected':''}" %>
<% end %>
@@ -42,7 +43,7 @@

<%= _("Loading...") %>
- <%= link_to '', url_for({:controller => 'proposals_discussion_plugin_public', :action => 'load_proposals', :holder_id => holder.id, :profile => profile.identifier, :order => order }) %>
+ <%= more_proposals('', holder, order) %>
diff --git a/views/content_viewer/_proposals_list_content.html.erb b/views/content_viewer/_proposals_list_content.html.erb
index 5031b3a..03d44ff 100644
--- a/views/content_viewer/_proposals_list_content.html.erb
+++ b/views/content_viewer/_proposals_list_content.html.erb
@@ -1,5 +1,7 @@
<%= render :partial => 'content_viewer/proposal_card', :collection => proposals %>
+<% extend ProposalsDiscussionPlugin::ProposalsListHelper %>
+
- <%= link_to _('More'), url_for({:controller => 'proposals_discussion_plugin_public', :action => 'load_proposals', :holder_id => holder.id, :profile => profile.identifier, :page => page, :order => order }) %>
+ <%= more_proposals(_('More'), holder, order, page) %>
diff --git a/views/content_viewer/proposal.html.erb b/views/content_viewer/proposal.html.erb
index 44e0f9e..4a6375c 100644
--- a/views/content_viewer/proposal.html.erb
+++ b/views/content_viewer/proposal.html.erb
@@ -20,7 +20,7 @@
<% if @page.allow_edit?(user) && !@page.published %>
- <%= link_to url_for({:controller => 'proposals_discussion_plugin_myprofile', :action => 'publish_proposal', :proposal_id => @page.id}), :class => 'button with-text icon-add' do %>
+ <%= link_to url_for({:controller => 'proposals_discussion_plugin_myprofile', :action => 'publish_proposal', :proposal_id => @page.id}), :class => 'button with-text icon-suggest' do %>
<%= _("Publish") %>
<% end %>
--
libgit2 0.21.2