- <%= link_to t('.see_changes'), legislation_process_draft_version_changes_path(@process, @draft_version) %>
-
+ <%= render 'legislation/processes/key_dates', process: @process, phase: :allegations %>
- <% toc, body = @draft_version.body_in_html %>
-
-
- <%= toc.html_safe %>
-
-
-
-
-
-
- <%= body.html_safe %>
+
+
+
+
<%= t('.seeing_version') %>
+
+ <%= form_tag go_to_version_legislation_process_draft_versions_path(@process), method: :get, id: "draft_version_go_to_version" do %>
+ <%= select_tag "draft_version_id", options_from_collection_for_select(@process.draft_versions, 'id', 'title', @draft_version.id), "aria-label": t('.select_draft_version') %>
+ <%= submit_tag t('.select_version_submit'), class: "button" %>
+ <% end %>
+ <%= link_to t('.see_changes'), legislation_process_draft_version_changes_path(@process, @draft_version) %>
+
+
<%= t('.updated_at', date: format_date(@draft_version.updated_at)) %>
-
+
+ <%= link_to t('.see_comments'), legislation_process_draft_version_annotations_path(@process, @draft_version), title: t('.see_comments'), class: "button strong" %>
+
+
+
+
+
+
+
+ <%= t('.text_index') %>
+
+
+
+
+ <%= t('.text_index') %>
+
+
+
+ <%= @draft_version.toc_html.html_safe %>
+
+
+
+
+
<%= t('.text_body') %>
+
+
+ <%= @draft_version.body_html.html_safe %>
+
+
+
+
+
+
+
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c3a60ff67..6328a2e20 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -226,9 +226,18 @@ en:
draft_versions:
changes:
title: Changes
- see_text: See text
+ seeing_changelog_version: Revision changes summary
+ see_text: See text draft
show:
- see_changes: See changes
+ seeing_version: You're seeing draft version
+ select_draft_version: Select draft
+ select_version_submit: see
+ updated_at: updated at %{date}
+ see_changes: see changes summary
+ see_comments: See all comments
+ text_index: Index
+ text_body: Text
+ text_comments: Comments
processes:
debate:
empty_questions: There aren't any questions
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 6c8a99e1d..8427146cc 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -226,9 +226,18 @@ es:
draft_versions:
changes:
title: Cambios
- see_text: Ver texto
+ seeing_changelog_version: Resumen de cambios de la revisión
+ see_text: Ver borrador del texto
show:
- see_changes: Ver cambios
+ seeing_version: Estás viendo la revisión
+ select_draft_version: Seleccionar borrador
+ select_version_submit: ver
+ updated_at: actualizada el %{date}
+ see_changes: ver resumen de cambios
+ see_comments: Ver todos los comentarios
+ text_index: Índice
+ text_body: Texto
+ text_comments: Comentarios
processes:
debate:
empty_questions: No hay preguntas
diff --git a/config/routes.rb b/config/routes.rb
index 5b2fcf9d6..0ef0187f6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -99,6 +99,7 @@ Rails.application.routes.draw do
resources :answers, only: [:create]
end
resources :draft_versions, only: [:show] do
+ get :go_to_version, on: :collection
get :changes
resources :annotations
end
diff --git a/db/migrate/20161229213217_add_toc_html_to_draft_versions.rb b/db/migrate/20161229213217_add_toc_html_to_draft_versions.rb
new file mode 100644
index 000000000..f71070e52
--- /dev/null
+++ b/db/migrate/20161229213217_add_toc_html_to_draft_versions.rb
@@ -0,0 +1,5 @@
+class AddTocHtmlToDraftVersions < ActiveRecord::Migration
+ def change
+ add_column :legislation_draft_versions, :toc_html, :text
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5a23f5839..d949dbb3a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20161229110336) do
+ActiveRecord::Schema.define(version: 20161229213217) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -123,10 +123,10 @@ ActiveRecord::Schema.define(version: 20161229110336) do
t.string "visit_id"
t.datetime "hidden_at"
t.integer "flags_count", default: 0
- t.datetime "ignored_flag_at"
t.integer "cached_votes_total", default: 0
t.integer "cached_votes_up", default: 0
t.integer "cached_votes_down", default: 0
+ t.datetime "ignored_flag_at"
t.integer "comments_count", default: 0
t.datetime "confirmed_hide_at"
t.integer "cached_anonymous_votes_total", default: 0
@@ -145,6 +145,7 @@ ActiveRecord::Schema.define(version: 20161229110336) do
add_index "debates", ["cached_votes_total"], name: "index_debates_on_cached_votes_total", using: :btree
add_index "debates", ["cached_votes_up"], name: "index_debates_on_cached_votes_up", using: :btree
add_index "debates", ["confidence_score"], name: "index_debates_on_confidence_score", using: :btree
+ add_index "debates", ["description"], name: "index_debates_on_description", using: :btree
add_index "debates", ["geozone_id"], name: "index_debates_on_geozone_id", using: :btree
add_index "debates", ["hidden_at"], name: "index_debates_on_hidden_at", using: :btree
add_index "debates", ["hot_score"], name: "index_debates_on_hot_score", using: :btree
@@ -252,6 +253,7 @@ ActiveRecord::Schema.define(version: 20161229110336) do
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.text "body_html"
+ t.text "toc_html"
end
add_index "legislation_draft_versions", ["hidden_at"], name: "index_legislation_draft_versions_on_hidden_at", using: :btree
@@ -394,6 +396,7 @@ ActiveRecord::Schema.define(version: 20161229110336) do
add_index "proposals", ["author_id"], name: "index_proposals_on_author_id", using: :btree
add_index "proposals", ["cached_votes_up"], name: "index_proposals_on_cached_votes_up", using: :btree
add_index "proposals", ["confidence_score"], name: "index_proposals_on_confidence_score", using: :btree
+ add_index "proposals", ["description"], name: "index_proposals_on_description", using: :btree
add_index "proposals", ["geozone_id"], name: "index_proposals_on_geozone_id", using: :btree
add_index "proposals", ["hidden_at"], name: "index_proposals_on_hidden_at", using: :btree
add_index "proposals", ["hot_score"], name: "index_proposals_on_hot_score", using: :btree
@@ -566,7 +569,7 @@ ActiveRecord::Schema.define(version: 20161229110336) do
t.boolean "email_digest", default: true
t.boolean "email_on_direct_message", default: true
t.boolean "official_position_badge", default: false
- t.datetime "password_changed_at", default: '2016-12-21 17:55:08', null: false
+ t.datetime "password_changed_at", default: '2016-11-02 13:51:14', null: false
t.boolean "created_from_signature", default: false
end
diff --git a/spec/features/admin/legislation/draft_versions_spec.rb b/spec/features/admin/legislation/draft_versions_spec.rb
index 0a61f5d97..e1088f24f 100644
--- a/spec/features/admin/legislation/draft_versions_spec.rb
+++ b/spec/features/admin/legislation/draft_versions_spec.rb
@@ -87,12 +87,11 @@ feature 'Admin legislation draft versions' do
click_link 'Version 1'
fill_in 'legislation_draft_version_title', with: 'Version 1b'
- fill_in 'legislation_draft_version_body', with: '# Version 1 body\r\nParagraph\r\n>Quote'
+ fill_in 'legislation_draft_version_body', with: '# Version 1 body\r\n\r\nParagraph\r\n\r\n>Quote'
click_button 'Save changes'
expect(page).to have_content 'Version 1b'
- expect(draft_version.reload.body_html).to eq("
Version 1 body\\r\\nParagraph\\r\\n>Quote
\r\n")
end
end
end
diff --git a/spec/models/legislation/draft_version_spec.rb b/spec/models/legislation/draft_version_spec.rb
index a6709110a..384fc4513 100644
--- a/spec/models/legislation/draft_version_spec.rb
+++ b/spec/models/legislation/draft_version_spec.rb
@@ -6,4 +6,75 @@ RSpec.describe Legislation::DraftVersion, type: :model do
it "should be valid" do
expect(legislation_draft_version).to be_valid
end
+
+ it "renders and saves the html from the markdown body field" do
+ legislation_draft_version.body = body_markdown
+
+ legislation_draft_version.save!
+
+ expect(legislation_draft_version.body_html).to eq(body_html)
+ expect(legislation_draft_version.toc_html).to eq(toc_html)
+ end
+
+ def body_markdown
+<<-BODY_MARKDOWN
+# Title 1
+
+Some paragraph.
+
+A list:
+
+- item 1
+- item 2
+
+## Subtitle
+
+Another paragraph.
+
+# Title 2
+
+Something about this.
+BODY_MARKDOWN
+ end
+
+ def body_html
+<<-BODY_HTML
+
Title 1
+
+
Some paragraph.
+
+
A list:
+
+
+
+
Subtitle
+
+
Another paragraph.
+
+
Title 2
+
+
Something about this.
+BODY_HTML
+ end
+
+ def toc_html
+<<-TOC_HTML
+
+TOC_HTML
+ end
end