tkh_content 0.9.17 → 0.9.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 196660d06e8ea8145cd14796667136f660533cbe
-  data.tar.gz: 99db882adc8d6a6b09d6e3f3c38443a31e693061
+  metadata.gz: 8fddc83cfe5c0cfe205c5ce9f76e382ca68a596a
+  data.tar.gz: 8a74ed3add9e5b50178da709b5c740d85843f6b4
 SHA512:
-  metadata.gz: e32b81edf3904a604996aa39ae9d54feac74e607fe87be3bbeefb8f2092af353633298ec8cfbca280016899510c78f77ed09aef6eacd32e0f1a588ed5128238b
-  data.tar.gz: c93e7e46ffde7f0f00c72182a958a657b00510db11a30df77059c95e8df87a23f935eb37e993ce1aeccf0117b3b727a8414b996218f5307d3e6d0fb11987966d
+  metadata.gz: dbf1040682f0fff512a97279075ae6c13eda7026be7c14e2561eb51be0ce4b3f69c3b2e07c9c474045b740edf588c488c2814fd7ea094a4109046f693ac5afa1
+  data.tar.gz: c1f40705d2634781dc4415502071fc0f3056ccb19713075ce0531b72ac24a16ba11856388e719f0a7eab7aaddda97a4d0f151250b57a7d217696a634557642ff

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 
 
+## 0.9.18
+
+* Fixed up markup for 3 forms
+
+
 ## 0.9.17
 
 * Log comment creation to activity feed.

data/app/views/comments/_admin_individual_comment.html.erb

@@ -7,8 +7,7 @@
     <%= link_to l(comment.created_at, format: :tkh_default), p(comment.commentable, anchor: "comment-#{comment.id}") %>
     <br /><br />
     <p class="admin-comment-body"><%= sanitize comment.body.gsub(/\r\n?/, "<br>"), :tags => %w(br), :attributes => %w() %></p>
-    <strong><%= t("comments.status.#{comment.status}") %></strong><br />
-    <%= render 'comments/status_buttons', comment: comment %>
+    <strong><%= t("comments.status.#{comment.status}") %></strong> <%= render 'comments/status_buttons', comment: comment %>
     <br /><br />
     <%= link_to t('edit'), edit_comment_path(comment), class: 'btn btn-xs btn-default' %><%= link_to t('delete'), comment, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-xs btn-danger' %>
   </td>

data/app/views/comments/_form.html.erb

@@ -1,12 +1,12 @@
-<%= simple_form_for @comment, :html => { class: 'form-horizontal' } do |f| %>
+<h1>Created by <%= link_to @comment.author.name, detail_path(@comment.author) %> and attached to the <%= @comment.commentable.class.to_s.downcase %>: <%= link_to (@comment.commentable.try(:title) || @comment.commentable.try(:name)), @comment.commentable %></h1>
+
+<strong><%= t("comments.status.#{@comment.status}") %></strong> <%= render 'comments/status_buttons', comment: @comment %>
+
+<%= simple_form_for @comment do |f| %>
 	<%= f.error_notification %>
 
-		<%= @comment.author.name %><br />
-		<%= link_to (@comment.commentable.try(:title) || @comment.commentable.try(:name)), @comment.commentable %><br />
-		<%#= f.input :short_title, hint: 'ideally one word only, used for the menu' %><br />
-		<%= render 'comments/status_buttons', comment: @comment %><br />
 	  <%= f.input :body, :input_html => { rows: 3, cols: 55 } %>
-    <br />
+
     <%= f.button :submit, :class => 'btn btn-primary' %>
 
 <% end %>

data/app/views/contacts/_form.html.erb

@@ -1,14 +1,9 @@
-<%= simple_form_for Contact.new, :html => { class: 'form-horizontal' } do |f| %>
+<%= simple_form_for Contact.new do |f| %>
 	<%= f.error_notification %>
-	
-  <div class="form-inputs">
+
 		<%= f.input :sender_name, label: t('activerecord.attributes.contacts.sender_name') %>
 		<%= f.input :sender_email, label: t('activerecord.attributes.contacts.sender_email') %>
 		<%= f.input :body, label: t('activerecord.attributes.contacts.body'), :input_html => { :rows => 10 } %>
-	</div>
-	
-  <div class="form-actions">
-    <%= f.button :submit, t('contacts.send_message'), :class => 'btn btn-primary' %>
-  </div>
 
+    <%= f.button :submit, t('contacts.send_message'), :class => 'btn btn-primary' %>
 <% end %>

data/app/views/pages/_form.html.erb

@@ -1,17 +1,22 @@
-<%= simple_form_for @page, :html => { class: 'form-horizontal', role: 'form' } do |f| %>
+<%= simple_form_for @page, :html => { role: 'form' } do |f| %>
 	<%= f.error_notification %>
 
 		<%= f.input :title,
 								label: t('activerecord.attributes.pages.title'),
-								hint: t('pages.hint.title'),
-								input_html: { size: 45 } %>
-		<%= f.input :for_blog, label: t('activerecord.attributes.pages.for_the_blog') %>
+								hint: t('pages.hint.title') %>
+
+		<%= f.input :for_blog,
+								label: t('activerecord.attributes.pages.for_the_blog')
+								 %>
+
 		<%= f.input :tag_list,
 								label: t('tags.tag_list'),
 								hint: t('tags.hint.name'),
 								:wrapper_html => { :id => 'page-tag-list' },
-								input_html: { size: 45 } %>
+								input_html: { size: 25 } %>
+
 		<%= f.input :short_title, label: t('activerecord.attributes.pages.short_title'), hint: t('pages.hint.short_title'), :wrapper_html => { :id => 'page-short-title' } %>
+
 		<%= f.input :parent_page_title,
 								as: :string,
 								:wrapper_html => { :id => 'parent-page-title' },
@@ -21,6 +26,7 @@
 																:data => { 	provide: 'typeahead',
 																	 					source: Page.not_for_blog.by_title.map(&:title).to_json }
 																	} %>
+
 	  <%= f.input :description, label: t('activerecord.attributes.pages.description'), :input_html => { cols: 45, rows: 3 } %>
 		<%= f.input :body, label: t('activerecord.attributes.pages.body'), :input_html => { :rows => 35, :class => 'ckeditor' } %>
 
@@ -36,7 +42,6 @@
 																		} %>
 		<% end -%>
 
-		<br />
     <%= f.button :submit, :class => 'btn btn-primary' %>
 
 <% end %>

data/lib/tkh_content/version.rb

@@ -1,3 +1,3 @@
 module TkhContent
-  VERSION = "0.9.17"
+  VERSION = "0.9.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_content
 version: !ruby/object:Gem::Version
-  version: 0.9.17
+  version: 0.9.18
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails