Merge branch 'legislation-module-stable' into 107-social-share-for-annotations

app/views/legislation/annotations/index.html.erb

@@ -7,7 +7,7 @@
 <div class="column row">
   <div class="draft-panels small-12 column row">
     <%= render 'version_chooser', process: @process, draft_version: @draft_version %>
-    
+
     <aside class="small-12 medium-3 column absolute">
       <div class="sidebar-divider"></div>
       <h2>Compartir</h2>
@@ -16,9 +16,9 @@
       </div>
     </aside>
   </div>
-  
+
   <div class="small-12 medium-8 column row legislation-comments end">
-    
+
     <% @annotations.each do |annotation| %>
       <div class="comment">
         <strong><%= t('.comments_about') %></strong>
@@ -28,7 +28,7 @@
           <% end %>
         </span>
         <div class="comment-section">
-          <%= annotation.quote %>
+          <%= annotation.context.try(:html_safe).presence || annotation.quote %>
         </div>
         <%= link_to legislation_process_draft_version_annotation_path(@process, @draft_version, annotation) do %>
           <span class="icon-comments" aria-hidden="true"></span> <span><%= t('.comments_count', count: annotation.comments_count) %></span></a>

app/views/legislation/annotations/show.html.erb

@@ -15,7 +15,7 @@
           <div class="comment-section">
             <div class="row">
               <div class="small-12 medium-10 column legislation-comment">
-                <%= @annotation.quote %>
+                <%= @annotation.context.try(:html_safe).presence || @annotation.quote %>
               </div>
               <div class="small-12 medium-2 column legislation-comment">
                 <span class="pull-right">

app/views/legislation/processes/_key_dates.html.erb

@@ -1,32 +1,43 @@
-<nav class="legislation-process-categories">  
+<nav class="legislation-process-categories">
   <div class="legislation-process-list">
     <ul>
       <%= render 'legislation/processes/key_dates_svg' %>
-      
-      <li <%= "class=active" if phase == :debate %>>
-        <%= link_to process do %>
-          <h4><%= t('legislation.processes.shared.debate_dates') %></h4>
-          <p><%= format_date(process.debate_start_date) %> - <%= format_date(process.debate_end_date) %></p>
-        <% end %>
-      </li>
-      <li <%= "class=active" if phase == :draft_publication %>>
-        <%= link_to legislation_process_draft_publication_path(process) do %>
-          <h4><%= t('legislation.processes.shared.draft_publication_date') %></h4>
-          <p><%= format_date(process.draft_publication_date) %></p>
-        <% end %>
-      </li>
-      <li <%= "class=active" if phase == :allegations %>>
-        <%= link_to legislation_process_allegations_path(process) do %>
-          <h4><%= t('legislation.processes.shared.allegations_dates') %></h4>
-          <p><%= format_date(process.allegations_start_date) %> - <%= format_date(process.allegations_end_date) %></p>
-        <% end %>
-      </li>
-      <li <%= "class=active" if phase == :final_version_publication %>>
-        <%= link_to legislation_process_final_version_publication_path(process) do %>
-          <h4><%= t('legislation.processes.shared.final_publication_date') %></h4>
-          <p><%= format_date(process.final_publication_date) %></p>
-        <% end %>
-      </li>
+
+      <% if process.active_phase?(:debate) %>
+        <li <%= "class=active" if phase == :debate %>>
+          <%= link_to legislation_process_debate_path(process) do %>
+            <h4><%= t('legislation.processes.shared.debate_dates') %></h4>
+            <p><%= format_date(process.debate_start_date) %> - <%= format_date(process.debate_end_date) %></p>
+          <% end %>
+        </li>
+      <% end %>
+
+      <% if process.active_phase?(:draft_publication) %>
+        <li <%= "class=active" if phase == :draft_publication %>>
+          <%= link_to legislation_process_draft_publication_path(process) do %>
+            <h4><%= t('legislation.processes.shared.draft_publication_date') %></h4>
+            <p><%= format_date(process.draft_publication_date) %></p>
+          <% end %>
+        </li>
+      <% end %>
+
+      <% if process.active_phase?(:allegations) %>
+        <li <%= "class=active" if phase == :allegations %>>
+          <%= link_to legislation_process_allegations_path(process) do %>
+            <h4><%= t('legislation.processes.shared.allegations_dates') %></h4>
+            <p><%= format_date(process.allegations_start_date) %> - <%= format_date(process.allegations_end_date) %></p>
+          <% end %>
+        </li>
+      <% end %>
+
+      <% if process.active_phase?(:final_version_publication) %>
+        <li <%= "class=active" if phase == :final_version_publication %>>
+          <%= link_to legislation_process_final_version_publication_path(process) do %>
+            <h4><%= t('legislation.processes.shared.final_publication_date') %></h4>
+            <p><%= format_date(process.final_publication_date) %></p>
+          <% end %>
+        </li>
+      <% end %>
     </ul>
   </div>
 </nav>

app/views/legislation/processes/debate.html.erb

@@ -0,0 +1,25 @@
+<% provide :title do %><%= @process.title %><% end %>
+
+<%= render 'legislation/processes/header', process: @process, header: :full %>
+
+<%= render 'key_dates', process: @process, phase: :debate %>
+
+<div class="row">
+  <div class="debate-chooser">
+    <div class="row">
+      <div class="small-12 medium-9 column">
+        <div class="debate-list">
+          <% if @process.questions.empty? %>
+            <p><%= t('.empty_questions') %></p>
+          <% else %>
+            <%= render @process.questions %>
+          <% end %>
+        </div>
+      </div>
+
+      <div class="small-12 medium-3 column">
+        <div class="debate-info"><%= t('.participate') %></div>
+      </div>
+    </div>
+  </div>
+</div>

app/views/legislation/processes/phase_not_open.html.erb

@@ -10,14 +10,9 @@
       <div class="debate-draft">
         <div class="small-12 medium-7 column">
           <h3><%= t('.not_open') %></h3>
-          <p>Suscríbete al proceso para recibir un aviso en el momento en que se abra.</p>
         </div>
 
         <div class="small-12 medium-5 column">
-          <button class="button-subscribe expanded button strong" title="Suscríbete al proceso" data-remote="true" rel="nofollow" data-method="post" href="/proposals/6-soluta-sed-sapiente-dolores/vote?value=yes">
-            <h3>Suscríbete al proceso</h3>
-            <p>Recibe notificaciones clave sobre el proceso</p>
-          </button>
         </div>
       </div>
     </div>

app/views/legislation/processes/show.html.erb

@@ -1,13 +0,0 @@
-<% provide :title do %><%= @process.title %><% end %>
-
-<%= render 'legislation/processes/header', process: @process, header: :full %>
-
-<%= render 'key_dates', process: @process, phase: :debate %>
-
-<div class="row">
-  <div class="debate-chooser">
-    <div class="row">
-      <%= render 'debate', process: @process %>
-    </div>
-  </div>
-</div>