Fixes #137

Edit button moved to dashboard.
Added button that publishes the proposal.

app/assets/stylesheets/proposals_dashboard.scss

@@ -1,8 +1,5 @@
 .proposals-dashboard {
   display: flex;
-  // flex-flow: row nowrap;
-  // justify-content: flex-start;
-  // align-items: flex-start;
   flex-direction: column;
   margin-top: -1.5rem;
 
@@ -14,9 +11,7 @@
       flex: 0 0 150pt;
       background: lightgray;
       margin-right: 5px;
-      // width: 150pt;
       padding: 5pt;
-      // min-height: 775px;
 
       .state-box {
         .logo {
@@ -50,7 +45,7 @@
         }
       }
 
-      .menu {
+      .dashboard-menu {
         color: #a9a9a9;
         font-size: 16pt;
 

app/controllers/proposals_dashboard_controller.rb

@@ -12,6 +12,13 @@ class ProposalsDashboardController < ApplicationController
     authorize! :dashboard, proposal
   end
 
+  def publish
+    authorize! :publish, proposal
+
+    proposal.publish
+    redirect_to proposal_dashboard_index_path(proposal), notice: t('proposals.notice.published')
+  end
+
   private
 
   def proposal

app/views/proposals/show.html.erb

@@ -132,15 +132,14 @@
       </div>
 
       <aside class="small-12 medium-3 column">
-        <% if author_of_proposal?(@proposal) || current_editable?(@proposal) || can_destroy_image?(@proposal) %>
+        <% if author_of_proposal?(@proposal) || can?(:dashboard, @proposal) || can_destroy_image?(@proposal) %>
           <div class="sidebar-divider"></div>
           <h2><%= t("proposals.show.author") %></h2>
           <div class="show-actions-menu">
-
+            <% if can? :dashboard, @proposal %>
-            <% if current_editable?(@proposal) %>
+              <%= link_to proposal_dashboard_index_path(@proposal), class: 'button hollow expanded' do %>
-              <%= link_to edit_proposal_path(@proposal), class: 'button hollow expanded' do %>
                           <span class="icon-edit"></span>
-                          <%= t("proposals.show.edit_proposal_link") %>
+                          <%= t("proposals.show.dashboard_proposal_link") %>
               <% end %>
             <% end %>
 

app/views/proposals_dashboard/index.html.erb

@@ -11,7 +11,16 @@
           <div class="status draft"><%= t '.draft' %></div>
         <% end %>
       </div>
-      <div class="menu">
+      <div class="dashboard-menu">
+        <% if current_editable?(proposal) || can?(:publish, proposal) %>
+          <div class="menu-title"><span class="icon-user"></span><%= t '.general' %></div>
+          <% if current_editable?(proposal) %>
+            <%= link_to t('.edit_proposal_link'), edit_proposal_path(proposal), class: 'menu-entry', target: '_blank' %>
+          <% end %>
+
+          <%= link_to t('.publish'), publish_proposal_dashboard_index_path(proposal), method: :patch, class: 'menu-entry' if can?(:publish, proposal) %>
+        <% end %>
+
         <!-- 
         <div class="menu-title"><span class="icon-user"></span> Progreso</div>
         <a href='#' class="menu-entry">Meta actual</a>

config/locales/en/general.yml

@@ -469,7 +469,7 @@ en:
         other: "%{count} comments"
         zero: No comments
       comments_tab: Comments
-      edit_proposal_link: Edit
+      dashboard_proposal_link: Dashboard
       flag: This proposal has been flagged as inappropriate by several users.
       login_to_comment: You must %{signin} or %{signup} to leave a comment.
       notifications_tab: Notifications
@@ -490,6 +490,9 @@ en:
     index:
       draft: Draft
       published: Published
+      general: General
+      publish: Publish
+      edit_proposal_link: Edit
   polls:
     all: "All"
     no_dates: "no date assigned"

config/locales/es/general.yml

@@ -469,7 +469,7 @@ es:
         one: 1 Comentario
         other: "%{count} Comentarios"
       comments_tab: Comentarios
-      edit_proposal_link: Editar propuesta
+      dashboard_proposal_link: Panel de control
       flag: Esta propuesta ha sido marcada como inapropiada por varios usuarios.
       login_to_comment: Necesitas %{signin} o %{signup} para comentar.
       notifications_tab: Notificaciones
@@ -490,6 +490,9 @@ es:
     index:
       draft: Borrador
       published: Publicada
+      general: General
+      publish: Publicar
+      edit_proposal_link: Editar propuesta
   polls:
     all: "Todas"
     no_dates: "sin fecha asignada"

config/routes/proposal.rb

@@ -1,5 +1,9 @@
 resources :proposals do
-  resources :proposals_dashboard, as: :dashboard, path: :dashboard, only: %i[index]
+  resources :proposals_dashboard, as: :dashboard, path: :dashboard, only: %i[index] do
+    collection do
+      patch :publish
+    end
+  end
 
   member do
     post :vote