tkh_admin_panel 0.3.2 → 0.3.5

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 
 
+## 0.3.5
+
+* Cleaned up the settings form
+* The navbar login info has been extracted to the tkh_authentication gem
+
+
+## 0.3.4
+
+* Debugged the de locale
+
+
+## 0.3.3
+
+* Flash messages DRYed up and extracted to the tkh_toolbox gem
+* Hyphenation of the admin layout
+* Slight debugging
+
+
 ## 0.3.2
 
 * Refactored tab admin context navigation of site settings section

data/app/assets/stylesheets/custom.css.scss

@@ -1,5 +1,6 @@
 body {
 	margin-top: 35px;
+	@include hyphens;
 }
 
 footer {

data/app/mailers/admin_mailer.rb

@@ -3,6 +3,6 @@ class AdminMailer < ActionMailer::Base
   
   def rescued_exceptions(exception, message)
     @exception, @message = exception, message
-    mail to: "Swami Atma <swami@TenThousandHours.eu>", subject: "Rescued Exception - #{Setting.first.site_name}"
+    mail to: "Swami Atma <swami@TenThousandHours.eu>", subject: "Rescued Exception - #{Setting.first.try(:site_name)}"
   end
 end

data/app/views/layouts/admin.html.erb

@@ -27,13 +27,8 @@
 		    <div class="container">
 		    	<ul class="nav">
 						<%= content_tag :li, link_to(Setting.first.try(:site_name), root_path)  %>
-						<%= content_tag :li, link_to(t('blog'), blog_path) %>
-						<li class='dropdown'>
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= current_user.email %> <b class="caret"></b></a>
-							<ul class="dropdown-menu">
-								<%= content_tag :li, link_to(t('logout'), logout_path) %>
-							</ul>
-						</li>
+						<%= content_tag :li, link_to(t('blog.itself'), blog_path) %>
+						<%= render 'shared/login_info_for_navbar' %>
 			    </ul>
 		    </div>
 	    </div>
@@ -46,13 +41,7 @@
 						<%= t "admin_panel" %><br />
 						<%= image_tag 'admin-logo.png', alt: 'Ten Thousand Hours logo' %>
 					</h1>
-					
-					<% flash.each do |name, msg| %>
-					  <div class="alert alert-<%= name == :notice ? "success" : "error" %>">
-					    <a class="close" data-dismiss="alert">×</a>
-					    <%= msg %>
-					  </div>
-					<% end %>
+					<%= render 'shared/flash_messages' %>
 				</div>
 			</div>
 			

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

@@ -7,13 +7,13 @@
 	
   <div class="form-inputs">
 		<%= f.input :company_name %><br />
-		<%= f.input :contact_email, hint: t('settings.hint.contact_email') %><br />
-		<%= f.input :site_name, hint: t('settings.hint.site_name') %><br />
-		<%= f.input :site_tagline, hint: t('settings.hint.site_tagline') %><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: t('settings.hint.disable_blog') %><br />
-		<%= f.input :blog_name %><br />
-		<%= f.input :blog_tagline, hint: t('settings.hint.blog_tagline') %><br />
+		<%= f.input :contact_email, hint: t('settings.hint.contact_email') %>
+		<%= f.input :site_name, hint: t('settings.hint.site_name') %>
+		<%= f.input :site_tagline, hint: t('settings.hint.site_tagline') %>
+		<%= f.input :enable_comments_in_pages, as: :boolean, inline_label: true, label: false  %>
+		<%= f.input :disable_blog, as: :boolean, inline_label: true, label: false, hint: t('settings.hint.disable_blog') %>
+		<%= f.input :blog_name %>
+		<%= f.input :blog_tagline, hint: t('settings.hint.blog_tagline') %>
 		<%= f.input :enable_comments_in_blog, as: :boolean, inline_label: true, label: false  %>
 	</div>
 	

data/lib/generators/tkh_admin_panel/create_or_update_locales/templates/de.yml

@@ -4,29 +4,29 @@ de:
   
   activerecord:
     models:
-      settings: 'site settings'
-    
+      settings: 'Seiten Einstellungen'
+
     attributes:
       setting:
-        site_name: 'site name'
-        site_tagline: 'site tagline'
-        enable_comments_in_pages: 'enable comments in pages'
-        disable_blog: 'disable blog'
-        blog_name: 'blog name'
-        blog_tagline: 'blog tagline'
-        enable_comments_in_blog: 'enable comments in blog'
-        contact_email: 'contact email'
-        company_name: 'company name'
-        
+        site_name: 'Seitenname'
+        site_tagline: 'Seiten-Überschrift'
+        enable_comments_in_pages: 'Kommentare auf der Seite aktivieren'
+        disable_blog: 'Blog ausschalten'
+        blog_name: 'Blogname'
+        blog_tagline: 'Blog-Überschrift'
+        enable_comments_in_blog: 'Kommentare im Blog aktivieren'
+        contact_email: 'Kontaktemail'
+        company_name: 'Firmenname'
+
   settings:
-    blog_enabled: 'blog enabled?'
+    blog_enabled: 'Blog aktiviert?'
     hint:
-      contact_email: 'this is used to get the messages from the contact form and for other things as well.'
-      site_name: 'this is often the same as the company name'
-      site_tagline: 'a small descriptive sentence'
-      disable_blog: 'should be checked if you do NOT want a blog'
-      blog_tagline:  'a small descriptive sentence'
-    
+      contact_email: 'dies wird benötigt, um die Nachrichten des Kontaktformulars zu erhalten und auch für ander Dinge.'
+      site_name: 'Ist häufig identisch mit dem Firmennamen'
+      site_tagline: 'ein kurzer beschreibender Satz'
+      disable_blog: 'sollte markiert sein, wenn du KEINEN Blog willst'
+      blog_tagline:  'ein kurzer beschreibender Satz'
+
     update:
-      notice: 'Site Settings were successfully updated.'
-      warning: 'There was a problem saving your changes.'
+      notice: 'Die Seiteneinstellungen wurden aktualisiert.'
+      warning: 'Beim Speichern der Änderungen ist ein Fehler aufgetreten.'

data/lib/tkh_admin_panel.rb

@@ -2,6 +2,7 @@ require "tkh_admin_panel/version"
 require 'bootstrap-sass'
 require 'simple_form'
 require 'tkh_admin_panel/tkh_admin_panel_action_controller_extension'
+require 'tkh_authentication'
 
 module TkhAdminPanel
   class Engine < ::Rails::Engine

data/lib/tkh_admin_panel/version.rb

@@ -1,3 +1,3 @@
 module TkhAdminPanel
-  VERSION = "0.3.2"
+  VERSION = "0.3.5"
 end

data/tkh_admin_panel.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "railties", "~> 3.2"
   gem.add_dependency "bootstrap-sass", '~> 2.0'
   gem.add_dependency "simple_form", '~> 2.0'
+  gem.add_dependency "tkh_authentication", '~> 0.1'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_admin_panel
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: tkh_authentication
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: Admin panel layout engine
 email:
 - swami@TenThousandHours.eu