Merge branch 'legislation-module-stable' into 27-answer-questions

app/assets/stylesheets/layout.scss

@@ -1065,10 +1065,6 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
   background: #C0392B;
 }
 
-.is-deleted {
-  background: #E7E7E7;
-}
-
 .level-1 {
   background: #1ABC9C;
 }
@@ -1657,20 +1653,12 @@ table {
       }
     }
 
-    .is-deleted {
-      background: #E7E7E7;
-      margin-left: $line-height;
-      padding: $line-height/2;
-    }
-
     .comment-children {
       border-left: 1px dashed $border;
-      margin-left: $line-height;
-      padding-left: $line-height/4;
-
-      @media only screen and (max-width: 40em) {
+      display: inline-block;
       margin-left: rem-calc(16);
-      }
+      padding-left: rem-calc(8);
+      width: 100%;
     }
 
     .comment-info {
@@ -1710,6 +1698,11 @@ table {
   }
 }
 
+.comment-form {
+  display: inline-block;
+  width: 100%;
+}
+
 // 16. Flags
 // ---------
 

app/models/signature_sheet.rb

@@ -22,14 +22,14 @@ class SignatureSheet < ActiveRecord::Base
 
   def verify_signatures
     parsed_document_numbers.each do |document_number|
-      signature = signatures.create(document_number: document_number)
+      signature = self.signatures.where(document_number: document_number).first_or_create
       signature.verify
     end
     update(processed: true)
   end
 
   def parsed_document_numbers
-    document_numbers.split(/\W+/)
+    document_numbers.split(/\r\n|\n|[,]/).collect {|d| d.gsub(/\s+/, '') }
   end
 
   def signable_found

app/views/admin/signature_sheets/show.html.erb

@@ -8,6 +8,11 @@
   <strong><%= @signature_sheet.author.name %></strong>
 </div>
 
+<h3 id="document_count" class="block">
+  <%= t("admin.signature_sheets.show.document_count") %>
+  <%= @signature_sheet.signatures.count %>
+</h3>
+
 <div class="callout margin-top">
   <p><strong><%= t("admin.signature_sheets.show.documents") %></strong></p>
   <%= simple_format @signature_sheet.document_numbers %>

app/views/comments/_comment.html.erb

@@ -1,10 +1,9 @@
 <% cache [locale_and_user_status(comment), comment, commentable_cache_key(comment.commentable), comment.author, (@comment_flags[comment.id] if @comment_flags)] do %>
-  <div class="row">
-    <ul id="<%= dom_id(comment) %>" class="comment no-bullet small-12 column">
+  <ul id="<%= dom_id(comment) %>" class="comment no-bullet small-12">
     <li class="comment-body">
       <% if comment.hidden? || comment.user.hidden? %>
         <% if comment.children.size > 0 %>
-            <div class="is-deleted">
+          <div class="callout secondary">
             <p><%= t("comments.comment.deleted") %></p>
           </div>
         <% end %>
@@ -96,10 +95,11 @@
     <li>
       <ul id="<%= dom_id(comment) %>_children" class="no-bullet comment-children">
         <% child_comments_of(comment).each do |child| %>
+          <li>
             <%= render 'comments/comment', comment: child %>
+          </li>
         <% end %>
       </ul>
     </li>
   </ul>
-  </div>
 <% end %>

app/views/comments/_form.html.erb

@@ -1,6 +1,6 @@
 <% cache [locale_and_user_status, parent_id, commentable_cache_key(commentable)] do %>
   <% css_id = parent_or_commentable_dom_id(parent_id, commentable) %>
-  <div id="js-comment-form-<%= css_id %>" <%= "style='display:none'".html_safe if toggeable %>>
+  <div id="js-comment-form-<%= css_id %>" <%= "style='display:none'".html_safe if toggeable %> class="comment-form">
     <%= form_for Comment.new, remote: true do |f| %>
       <%= label_tag "comment-body-#{css_id}", t("comments.form.leave_comment") %>
       <%= f.text_area :body, id: "comment-body-#{css_id}", maxlength: Comment.body_max_length, label: false %>

config/initializers/delayed_job_config.rb

@@ -6,7 +6,7 @@ end
 Delayed::Worker.destroy_failed_jobs = false
 Delayed::Worker.sleep_delay = 2
 Delayed::Worker.max_attempts = 3
-Delayed::Worker.max_run_time = 30.seconds
+Delayed::Worker.max_run_time = 30.minutes
 Delayed::Worker.read_ahead = 10
 Delayed::Worker.default_queue_name = 'default'
 Delayed::Worker.raise_signal_exceptions = :term

config/locales/admin.en.yml

@@ -389,6 +389,7 @@ en:
         created_at: Created
         author: Author
         documents: Documents
+        document_count: "Number of documents:"
         verified:
           one: "There is %{count} valid signature"
           other: "There are %{count} valid signatures"

config/locales/admin.es.yml

@@ -387,6 +387,7 @@ es:
         created_at: Creado
         author: Autor
         documents: Documentos
+        document_count: "Número de documentos:"
         verified:
           one: "Hay %{count} firma válida"
           other: "Hay %{count} firmas válidas"

spec/features/admin/signature_sheets_spec.rb

@@ -59,6 +59,10 @@ feature 'Signature sheets' do
     expect(page).to have_content signature_sheet.created_at.strftime("%d %b %H:%M")
     expect(page).to have_content user.name
 
+    within("#document_count") do
+      expect(page).to have_content 3
+    end
+
     within("#verified_signatures") do
       expect(page).to have_content 1
     end

spec/models/signature_sheet_spec.rb

@@ -76,6 +76,12 @@ describe SignatureSheet do
 
       expect(signature_sheet.parsed_document_numbers).to eq(['123A', '456B', '789C', '123B'])
     end
+
+    it "strips spaces between number and letter" do
+      signature_sheet.document_numbers = "123 A\n456 B \n 789C"
+
+      expect(signature_sheet.parsed_document_numbers).to eq(['123A', '456B', '789C'])
+    end
   end
 
 end