tkh_admin_panel 0.2.3 → 0.2.4

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 
 
+## 0.2.4
+
+* Disabled tkh_editor - Will replace it soon
+* Added 'company name' and 'contact email' attributes to Setting model
+
+
+## 0.2.3
+
+* Minor debugging
+
+
 ## 0.2.2
 
 * Require page javascript file to support autocompletion of page parent

data/app/assets/javascripts/custom.js.coffee

@@ -2,6 +2,6 @@ jQuery ->
   $("a[rel=popover]").popover()
   $(".tooltip").tooltip()
   $("a[rel=tooltip]").tooltip()
-  $('#editable').wysihtml5()
+  # $('#editable').wysihtml5()
   $('.typeahead').typeahead()
   $('.whatever-man').tooltip()

data/app/models/setting.rb

@@ -5,7 +5,7 @@ end
 
 class Setting < ActiveRecord::Base
   
-  attr_accessible :site_name, :site_tagline, :blog_name, :blog_tagline, :disable_blog, :enable_comments_in_pages, :enable_comments_in_blog
+  attr_accessible :company_name, :contact_email, :site_name, :site_tagline, :blog_name, :blog_tagline, :disable_blog, :enable_comments_in_pages, :enable_comments_in_blog
   
   translates :site_name, :site_tagline, :blog_name, :blog_tagline
   

data/app/views/settings/edit.html.erb

@@ -4,7 +4,9 @@
 	<%= f.error_notification %>
 	
   <div class="form-inputs">
-		<%= f.input :site_name %><br />
+		<%= f.input :company_name %><br />
+		<%= f.input :contact_email, hint: 'this is used to get the messages from the contact form and for other things as well.' %><br />
+		<%= f.input :site_name, hint: 'this is often the same as the company name' %><br />
 		<%= f.input :site_tagline, hint: 'a small descriptive sentence' %><br />
 		<%= f.input :enable_comments_in_pages, as: :boolean, inline_label: true, label: false  %><br />
 		<%= f.input :disable_blog, as: :boolean, inline_label: true, label: false, hint: 'should be checked if you do NOT want a blog' %><br />

data/app/views/settings/show.html.erb

@@ -1,6 +1,8 @@
 <h1>Settings</h1>
 
 <p>
+	<strong>Company name:</strong> <%= @setting.company_name %><br />
+	<strong>Contact email:</strong> <%= @setting.contact_email %><br />
 	<strong>Site name:</strong> <%= @setting.site_name %><br />
 	<strong>Site tagline:</strong> <%= @setting.site_tagline %><br />
 	<strong>Enable comments in pages?:</strong> <%= @setting.enable_comments_in_pages? ? "<span class=\"label label-success\">✓</span>".html_safe : "<span class=\"label label-important\">X</span>".html_safe %><br />

data/lib/generators/tkh_admin_panel/create_or_update_migrations/create_or_update_migrations_generator.rb

@@ -18,6 +18,7 @@ module TkhAdminPanel
       def copy_migrations
         puts 'creating or updating setting migrations'
         migration_template "create_settings.rb", "db/migrate/create_settings.rb"
+        migration_template "add_contact_email_to_settings.rb", "db/migrate/add_contact_email_to_settings.rb"
       end
  
     end

data/lib/generators/tkh_admin_panel/create_or_update_migrations/templates/add_contact_email_to_settings.rb

@@ -0,0 +1,6 @@
+class AddContactEmailToSettings < ActiveRecord::Migration
+  def change
+    add_column :settings, :contact_email, :string
+    add_column :settings, :company_name, :string
+  end
+end

data/lib/tkh_admin_panel/version.rb

@@ -1,3 +1,3 @@
 module TkhAdminPanel
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_admin_panel
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -109,6 +109,7 @@ files:
 - lib/generators/tkh_admin_panel/create_or_update_locales/templates/es.yml
 - lib/generators/tkh_admin_panel/create_or_update_locales/templates/fr.yml
 - lib/generators/tkh_admin_panel/create_or_update_migrations/create_or_update_migrations_generator.rb
+- lib/generators/tkh_admin_panel/create_or_update_migrations/templates/add_contact_email_to_settings.rb
 - lib/generators/tkh_admin_panel/create_or_update_migrations/templates/create_settings.rb
 - lib/tasks/tkh_admin_panel_tasks.rake
 - lib/tkh_admin_panel.rb