tkh_admin_panel 0.3 → 0.3.1

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 
 
+## 0.3.1
+
+* Added context tab menu in site settings section
+* Set up some translations
+* Tidied up dependencies
+
+
 ## 0.3
 
 * Styled up the admin layout pretty good

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

@@ -1,28 +1,3 @@
 @import 'bootstrap_and_overrides.css.scss';
 @import 'united.css.scss';
-
-body {
-	margin-top: 35px;
-}
-
-footer {
-	margin: 2em 1em .5em;
-	text-align: center;
-}
-
-input, textarea {
-	width: 450px;
-}
-
-h1 {
-	text-align: center;
-}
-
-form {
-	margin: 2em .5em;
-}
-
-.form-horizontal .help-block {
-	color: #999;
-	margin-top: 1px;
-}
+@import 'custom.css.scss';

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

@@ -0,0 +1,26 @@
+body {
+	margin-top: 35px;
+}
+
+footer {
+	margin: 2em 1em .5em;
+	text-align: center;
+}
+
+input, textarea {
+	width: 450px;
+}
+
+h1 {
+	text-align: center;
+}
+
+form {
+	margin: 2em .5em;
+}
+
+.help-block { color: #999; }
+
+.form-horizontal input + .help-block, .form-horizontal select + .help-block, .form-horizontal textarea + .help-block, .form-horizontal .uneditable-input + .help-block, .form-horizontal .input-prepend + .help-block, .form-horizontal .input-append + .help-block { 
+	margin-top: 3px;
+}

data/app/controllers/settings_controller.rb

@@ -16,9 +16,9 @@ class SettingsController < ApplicationController
   def update
     @setting = Setting.first
     if @setting.update_attributes(params[:setting])
-      redirect_to @setting, notice: 'Settings were successfully updated.'
+      redirect_to @setting, notice: t('settings.update.notice')
     else
-      render action: "edit", layout: 'admin'
+      render action: "edit", warning: t('settings.update.warning')
     end
   end
 end

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

@@ -0,0 +1,15 @@
+<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>

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

@@ -1,4 +1,6 @@
-<h1>Edit Settings</h1>
+<h1><%= t('activerecord.models.settings') %></h1>
+
+<%= render 'tab_admin_menu' %>
 
 <%= simple_form_for @setting, :html => { class: 'form-horizontal' } do |f| %>
 	<%= f.error_notification %>

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

@@ -1,15 +1,17 @@
-<h1>Settings</h1>
+<h1><%= t('activerecord.models.settings') %></h1>
+
+<%= render 'tab_admin_menu' %>
 
 <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 />
-	<strong>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>Blog name:</strong> <%= @setting.blog_name %><br />
-	<strong>Blog tagline:</strong> <%= @setting.blog_tagline %><br />
-	<strong>Enable comments in blog?:</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.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 %>
 </p>
 
 <%= link_to t('edit'), edit_setting_path(@setting), class: 'btn btn-primary' %>

data/lib/generators/tkh_admin_panel/copy_files/templates/_admin_sidebar.html.erb

@@ -1,9 +1,12 @@
 <% content_for :admin_sidebar do %>
-	<h2>Sections</h2>
+	<h2><%= t('sections') %></h2>
 	<ul>
-		<li><%= link_to 'site settings', setting_path(1) %></li>
-		<li><%= link_to 'scaffold name', 'path' %></li>
-		<li>for example ...</li>
-		<li><%= link_to 'pages', pages_path %></li>
+		<li><%= link_to t('activerecord.models.pages'), pages_path %></li>
+		<li><%= link_to t('activerecord.models.comments'), comments_path %></li>
+		<li><%= link_to t('activerecord.models.illustrations'), illustrations_path %></li>
+		<li><%= link_to t('activerecord.models.menus'), menus_path %></li>
+		<li><%= link_to t('activerecord.models.users'), users_path %></li>
+		<li><%= link_to t('contacts.messages_from_forms'), contacts_path %></li>
+		<li><%= link_to t('activerecord.models.settings'), setting_path(1) %></li>
 	</ul>
 <% end %>

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

@@ -1,3 +1,30 @@
 de:
   admin_panel: 'Administratorschaltfläche'
-  admin_panel_for: "Administratorschaltfläche für"
+  admin_panel_for: "Administratorschaltfläche für"
+  
+  activerecord:
+    models:
+      settings: 'site settings'
+    
+    attributes:
+      settings:
+        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?'
+    
+    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

@@ -1,3 +1,30 @@
 en:
   admin_panel: 'Admin Panel'
-  admin_panel_for: "Admin Panel for "
+  admin_panel_for: "Admin Panel for "
+  
+  activerecord:
+    models:
+      settings: 'site settings'
+    
+    attributes:
+      settings:
+        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?'
+    
+    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

@@ -1,4 +1,32 @@
 es:
   admin_panel: "El panel de administración"
   admin_panel_with_site_name: "El panel de administración: "
+  
+  activerecord:
+    models:
+      settings: 'configuración del sitio'
+    
+    attributes:
+      settings:
+        site_name: 'nombre del sitio'
+        site_tagline: 'lema sitio'
+        enable_comments_in_pages: 'habilitar los comentarios en las páginas'
+        disable_blog: 'deshabilitar el blog'
+        blog_name: 'nombre del blog'
+        blog_tagline: 'blog lema'
+        enable_comments_in_blog: 'habilitar los comentarios en el blog'
+        contact_email: 'correo electrónico de contacto'
+        company_name: 'nombre de compañía'
+        
+  settings:
+    blog_enabled: '¿blogs habilitado?'
+    
+    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

@@ -1,4 +1,31 @@
 fr:
   admin_panel: "Panneau d'administration"
   admin_panel_for: "Panneau d'administration pour "
+  
+  activerecord:
+    models:
+      settings: 'options du site'
+      
+    attributes:
+      settings:
+        site_name: 'nom du site'
+        site_tagline: 'slogan du site'
+        enable_comments_in_pages: 'commentaires dans les pages'
+        disable_blog: 'désactiver blog'
+        blog_name: 'nom du blog'
+        blog_tagline: 'slogan du blog'
+        enable_comments_in_blog: 'commentaires dans le blog'
+        contact_email: 'email du contact'
+        company_name: 'raison sociale'
+
+  settings:
+    blog_enabled: 'activer le blog ?'
+
+    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/tkh_admin_panel/version.rb

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

data/lib/tkh_admin_panel.rb

@@ -2,8 +2,6 @@ require "tkh_admin_panel/version"
 require 'bootstrap-sass'
 require 'simple_form'
 require 'tkh_admin_panel/tkh_admin_panel_action_controller_extension'
-# require 'bootstrap-wysihtml5-rails'
-# require 'tkh_inline_editor'
 
 module TkhAdminPanel
   class Engine < ::Rails::Engine

data/tkh_admin_panel.gemspec

@@ -11,12 +11,6 @@ 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 'exception_notification'
-  
-  # This gem does not support p tags until wysihtml5 0.4 is released and linked to gem below
-  # gem.add_dependency 'bootstrap-wysihtml5-rails'
-  # try using my own tkh_inline_editor instead
-  # gem.add_dependency 'tkh_inline_editor'
 
   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'
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -59,22 +59,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: exception_notification
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Admin panel layout engine
 email:
 - swami@TenThousandHours.eu
@@ -94,12 +78,14 @@ files:
 - app/assets/javascripts/custom.js.coffee
 - app/assets/stylesheets/admin.css.scss
 - app/assets/stylesheets/bootstrap_and_overrides.css.scss
+- app/assets/stylesheets/custom.css.scss
 - app/assets/stylesheets/united.css.scss
 - app/controllers/settings_controller.rb
 - app/mailers/admin_mailer.rb
 - app/models/setting.rb
 - app/views/admin_mailer/rescued_exceptions.text.erb
 - app/views/layouts/admin.html.erb
+- app/views/settings/_tab_admin_menu.html.erb
 - app/views/settings/edit.html.erb
 - app/views/settings/show.html.erb
 - app/views/shared/_admin_sidebar.html.erb