RubyGems - tkh_admin_panel - Versions diffs - 0.3.1 → 0.3.2 - Mend

tkh_admin_panel 0.3.1 → 0.3.2

Files changed (14) hide show

data/CHANGELOG.md CHANGED Viewed

@@ -2,6 +2,12 @@
+## 0.3.2
+* Refactored tab admin context navigation of site settings section
+* Lots of work on translations
 ## 0.3.1
 * Added context tab menu in site settings section

data/app/mailers/admin_mailer.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 class AdminMailer < ActionMailer::Base
-  default from: "Exception Notifier <deploy@ohlalaweb.com>"
+  default from: "Exception Notifier <deploy@ohlalaweb.pragmaticyoga.org>"
   def rescued_exceptions(exception, message)
     @exception, @message = exception, message

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="<%= I18n.locale.to_s || 'en' %>">
+<html lang="<%= I18n.locale.to_s %>">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -27,11 +27,11 @@
 		    <div class="container">
 		    	<ul class="nav">
 						<%= content_tag :li, link_to(Setting.first.try(:site_name), root_path)  %>
-						<%= content_tag :li, link_to('blog', blog_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('logout', logout_path) %>
+								<%= content_tag :li, link_to(t('logout'), logout_path) %>
 							</ul>
 						</li>
 			    </ul>

data/app/views/settings/_tab_admin_menu.html.erb CHANGED Viewed

@@ -1,15 +1,4 @@
-<ul class="nav nav-tabs" id="admin-menu-tab">
-	<% if controller.action_name.to_s == 'show' %>
-		<%= content_tag :li, link_to(t('view'), Setting.first), class: 'active' %>
-	<% else %>
-			<%= content_tag :li, link_to(t('view'), Setting.first) %>
-	<% end -%>
-	<% if controller.action_name.to_s == 'edit' %>
-		<%= content_tag :li, link_to(t('edit'), Setting.first), class: 'active' %>
-	<% else %>
-			<%= content_tag :li, link_to(t('edit'), edit_setting_path(Setting.first)) %>
-	<% end -%>
+<ul class="nav nav-tabs" id="admin-menu-tab">
+	<%= content_tag :li, link_to(t('view'), Setting.first), ({ class: 'active' } if controller.action_name.to_s == 'show' ) %>
+	<%= content_tag :li, link_to(t('edit'), edit_setting_path(Setting.first)), ({ class: 'active' } if controller.action_name.to_s == 'edit') %>
 </ul>

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

@@ -7,13 +7,13 @@
   <div class="form-inputs">
 		<%= 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 :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: 'should be checked if you do NOT want a blog' %><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: 'a small descriptive sentence' %><br />
+		<%= f.input :blog_tagline, hint: t('settings.hint.blog_tagline') %><br />
 		<%= f.input :enable_comments_in_blog, as: :boolean, inline_label: true, label: false  %>
 	</div>

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

@@ -3,15 +3,15 @@
 <%= render 'tab_admin_menu' %>
 <p>
-	<strong><%= t('activerecord.attributes.settings.company_name') + t('colon') %></strong> <%= @setting.company_name %><br />
-	<strong><%= t('activerecord.attributes.settings.contact_email') + t('colon') %></strong> <%= @setting.contact_email %><br />
-	<strong><%= t('activerecord.attributes.settings.site_name') + t('colon') %></strong> <%= @setting.site_name %><br />
-	<strong><%= t('activerecord.attributes.settings.site_tagline') + t('colon') %></strong> <%= @setting.site_tagline %><br />
-	<strong><%= t('activerecord.attributes.settings.enable_comments_in_pages') + t('questionmark') %></strong> <%= @setting.enable_comments_in_pages? ? "<span class=\"label label-success\">✓</span>".html_safe : "<span class=\"label label-important\">X</span>".html_safe %><br />
-	<strong><%= t('settings.blog_enabled') %></strong> <%= @setting.disable_blog? ? "<span class=\"label label-important\">X</span>".html_safe : "<span class=\"label label-success\">✓</span>".html_safe %><br />
-	<strong><%= t('activerecord.attributes.settings.blog_name') + t('colon') %></strong> <%= @setting.blog_name %><br />
-	<strong><%= t('activerecord.attributes.settings.blog_tagline') + t('colon') %></strong> <%= @setting.blog_tagline %><br />
-	<strong><%= t('activerecord.attributes.settings.enable_comments_in_blog') + t('questionmark') %></strong> <%= @setting.enable_comments_in_blog? ? "<span class=\"label label-success\">✓</span>".html_safe : "<span class=\"label label-important\">X</span>".html_safe %>
+	<strong><%= t('activerecord.attributes.setting.company_name') + t('colon') %></strong> <%= @setting.company_name %><br />
+	<strong><%= t('activerecord.attributes.setting.contact_email') + t('colon') %></strong> <%= @setting.contact_email %><br />
+	<strong><%= t('activerecord.attributes.setting.site_name') + t('colon') %></strong> <%= @setting.site_name %><br />
+	<strong><%= t('activerecord.attributes.setting.site_tagline') + t('colon') %></strong> <%= @setting.site_tagline %><br />
+	<strong><%= t('question_mark_inverted') + t('activerecord.attributes.setting.enable_comments_in_pages') + t('question_mark') %></strong> <%= @setting.enable_comments_in_pages? ? "<span class=\"label label-success\">✓</span>".html_safe : "<span class=\"label label-important\">X</span>".html_safe %><br />
+	<strong><%= t('question_mark_inverted') + t('settings.blog_enabled') %></strong> <%= @setting.disable_blog? ? "<span class=\"label label-important\">X</span>".html_safe : "<span class=\"label label-success\">✓</span>".html_safe %><br />
+	<strong><%= t('activerecord.attributes.setting.blog_name') + t('colon') %></strong> <%= @setting.blog_name %><br />
+	<strong><%= t('activerecord.attributes.setting.blog_tagline') + t('colon') %></strong> <%= @setting.blog_tagline %><br />
+	<strong><%= t('question_mark_inverted') + t('activerecord.attributes.setting.enable_comments_in_blog') + t('question_mark') %></strong> <%= @setting.enable_comments_in_blog? ? "<span class=\"label label-success\">✓</span>".html_safe : "<span class=\"label label-important\">X</span>".html_safe %>
 </p>
 <%= link_to t('edit'), edit_setting_path(@setting), class: 'btn btn-primary' %>

data/app/views/shared/_admin_sidebar.html.erb CHANGED Viewed

@@ -5,5 +5,5 @@
 		<li>other links go here</li>
 	</ul>
-	<p>To override this, run "rake tkh_admin_panel:setup" and customize the new partial to your liking.</p>
+	<p>Make your own if don't use the tkh_cms gem which has a fully populated, and localized, example</p>
 <% end %>

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

@@ -7,7 +7,7 @@ de:
       settings: 'site settings'
     attributes:
-      settings:
+      setting:
         site_name: 'site name'
         site_tagline: 'site tagline'
         enable_comments_in_pages: 'enable comments in pages'
@@ -20,11 +20,13 @@ de:
   settings:
     blog_enabled: 'blog enabled?'
+    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'
     update:
       notice: 'Site Settings were successfully updated.'
       warning: 'There was a problem saving your changes.'
-  colon: ':'
-  questionmark: '?'
-  view: 'view'

data/lib/generators/tkh_admin_panel/create_or_update_locales/templates/en.yml CHANGED Viewed

@@ -7,7 +7,7 @@ en:
       settings: 'site settings'
     attributes:
-      settings:
+      setting:
         site_name: 'site name'
         site_tagline: 'site tagline'
         enable_comments_in_pages: 'enable comments in pages'
@@ -20,11 +20,13 @@ en:
   settings:
     blog_enabled: 'blog enabled?'
+    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'
     update:
       notice: 'Site Settings were successfully updated.'
       warning: 'There was a problem saving your changes.'
-  colon: ':'
-  questionmark: '?'
-  view: 'view'

data/lib/generators/tkh_admin_panel/create_or_update_locales/templates/es.yml CHANGED Viewed

@@ -7,7 +7,7 @@ es:
       settings: 'configuración del sitio'
     attributes:
-      settings:
+      setting:
         site_name: 'nombre del sitio'
         site_tagline: 'lema sitio'
         enable_comments_in_pages: 'habilitar los comentarios en las páginas'
@@ -20,13 +20,13 @@ es:
   settings:
     blog_enabled: '¿blogs habilitado?'
+    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'
     update:
       notice: 'Configuración del sitio se han actualizado con éxito.'
       warning: 'Hubo un problema al guardar los cambios.'
-  colon: ':'
-  questionmark: '?'
-  view: 'ver'

data/lib/generators/tkh_admin_panel/create_or_update_locales/templates/fr.yml CHANGED Viewed

@@ -7,7 +7,7 @@ fr:
       settings: 'options du site'
     attributes:
-      settings:
+      setting:
         site_name: 'nom du site'
         site_tagline: 'slogan du site'
         enable_comments_in_pages: 'commentaires dans les pages'
@@ -20,12 +20,13 @@ fr:
   settings:
     blog_enabled: 'activer le blog ?'
+    hint:
+      contact_email: 'nous utilisons celle-ci pour les messages envoyés depuis le formulaire de contact'
+      site_name: "c'est souvent le même que la raison sociale. Pas toujours"
+      site_tagline: 'une phrase courte et bien pensée'
+      disable_blog: 'cochez si vous ne voulez PAS un blog'
+      blog_tagline:  'une phrase courte et bien pensée'
     update:
       notice: 'Succes: les options du site ont été mises à jour.'
       warning: "Il y'a eu un problem et vos modifications n'ont pas été sauvegardées."
-  colon: ' :'
-  questionmark: ' ?'
-  view: 'voir'

data/lib/generators/tkh_admin_panel/create_or_update_locales/templates/it.yml ADDED Viewed

@@ -0,0 +1,32 @@
+it:
+  admin_panel: 'Admin Panel'
+  admin_panel_for: "Admin Panel for "
+  activerecord:
+    models:
+      settings: 'site settings'
+    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'
+  settings:
+    blog_enabled: 'blog enabled?'
+    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'
+    update:
+      notice: 'Site Settings were successfully updated.'
+      warning: 'There was a problem saving your changes.'

data/lib/tkh_admin_panel/version.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_admin_panel
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -97,6 +97,7 @@ files:
 - lib/generators/tkh_admin_panel/create_or_update_locales/templates/en.yml
 - 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_locales/templates/it.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