tkh_admin_panel 0.1 → 0.1.1

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 
 
+## 0.1.1
+
+* Cleaned up CSS file
+* Added li tag to items of the language switcher dropdown menu
+* Minor text improvements in admin layout
+
+
 ## 0.1
 
 * Added an update rake task.

data/README.md

@@ -4,11 +4,13 @@ This is a Rails engine with an admin panel layout, assets and basic functionalit
 
 Primarily developed for Ten Thousand Hours but we are happy to share if anybody finds it useful.
 
-Please note that this gem is still in its infancy. I'm just getting started.
+It's primarily developed to work in sync with the tkh_cms gem suite but over time more and more effort will be made to make it work in isolation.
+
+Please note that this gem is still in its infancy. I'm just getting started. 
 
 ## Installation
 
-This gem was created in sync with Rails 3.2.6 and there is a railties dependency of "~> 3.2". Add this line to your application's Gemfile:
+This gem was created when Rails 3.2.6 was the latest release and there is a railties dependency of "~> 3.2". Add this line to your application's Gemfile:
 
     gem 'tkh_admin_panel', '~> 0.0'
 
@@ -31,7 +33,7 @@ Update the gem:
 
     $ bundle update tkh_admin_panel
 
-Update locale files. This is only needed with a new minor version number ( second level from left )
+Update locale files.
 
 		$ rake tkh_admin_panel:update
 
@@ -47,7 +49,7 @@ You need an authentication system with the current_user helper method
 
 ## Usage
 
-In your controller's relevant methods:
+Add this to your controller's relevant methods:
 
     switch_to_admin_layout
 

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

@@ -1,4 +1,4 @@
 jQuery ->
   $("a[rel=popover]").popover()
   $(".tooltip").tooltip()
-  $("a[rel=tooltip]").tooltip()
+  $("a[rel=tooltip]").tooltip()

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

@@ -1,38 +1,5 @@
 @import 'bootstrap_and_overrides.css.scss';
 
-//body { 
-//	margin: 0;
-//	padding: 0;
-//}
-//
-//h1, h2, h3, h4, p, ul, ol { padding-left: 1%; padding-right: 2%; }
-//blockquote {
-//	border-left: 3px solid $red;
-//	margin: 2em 0 2em 5%; 
-//	padding-right: 2%;
-//	cite {
-//		font-style: italic;
-//		font-weight: bold;
-//	}
-//	cite:before { content:" ~ "; }
-//}
-//
-//p, ul, ol { font-size: 1em; }
-//
-//h1 {
-//	color: $purple;
-//}
-//
-//h2, h3, h4 {
-//	color: $blue;
-//}
-//
-//ul {
-//	list-style-image: image_url('main/bullet.png');
-//}
-//
-//a { text-decoration: underline; }
-//
 footer {
 	margin: 2em 1em .5em;
 	text-align: center;
@@ -45,138 +12,4 @@ input, textarea {
 .login-info {
 	margin: 1em;
 	text-align: left;
-}
-//
-//.navbar { margin-bottom: 0; }
-//
-//.navbar, .navbar-inner {
-//	border-radius: 0;
-//	.brand { 
-//		font-weight: bold;
-//		text-decoration: none;
-//	}
-//}
-//
-//.navbar .nav li > a { text-decoration: underline; }
-//
-//.navbar .nav .active > a { 
-//	color: #fff;
-//	font-weight: bold;
-//	text-decoration: none;
-//}
-//
-//
-//#main-content {
-//	padding: 1.75em 0;
-//	img {
-//		margin: 0 0 5px 3px;
-//		width: 40%;
-//	}
-//}
-//
-//footer {
-//	background-color: $purple;
-//	color: #fff;
-//	margin: 0;
-//	padding: .33em 0 .15em;
-//	width: 100%;
-//	a {
-//		color: #fff;
-//	}
-//	a:hover { color: #fff; font-weight: bold; }
-//}
-//
-//caption { // table titles
-//	color: $blue;
-//	font-size: 1.7em;
-//	font-weight: bold;
-//	padding: .2em 1em;
-//}
-//
-//th {
-//	background-color: $red;
-//	color: $white;
-//}
-//
-//@media (max-width: 480px) {
-//	#big-header {
-//		display: none;
-//	}
-//}
-//@media (max-width: 767px) {
-//	#big-header {
-//		margin: 0;
-//		padding: 0;
-//		img {
-//			width: 100%;
-//		}
-//	}
-//}
-//
-//@media (min-width: 768px) {
-//	html {
-//		background-color: #dcd3e5;
-//	}
-//	
-//	body {
-//		margin: 0 auto 2em;
-//		border-radius: 0 0 10px 10px;
-//		width: 95%;
-//		@include box-shadow(5px 8px 18px 3px rgba(0,0,0,.25));
-//	}
-//	
-//	#big-header {
-//		margin: 0;
-//		padding: 0;
-//		img {
-//			width: 100%;
-//		}
-//	}
-//	
-//	#main-content {
-//		background: image_url('main/swooshes-big.jpg') top right no-repeat;
-//		img {
-//			margin: 0 0 6px 4px;
-//			width: 35%;
-//		}
-//	}
-//	
-//	footer { border-radius: 0 0 10px 10px; }
-//	
-//	.table-narrow {
-//		margin: .2em auto 1em;
-//		width: 50%;
-//	}
-//	
-//}
-//
-//@media (min-width: 768px) and (max-width: 979px) {
-//	#main-content {
-//		background: image_url('main/swooshes.jpg') top right no-repeat;
-//	}
-//}
-//
-//@media (min-width: 980px) {
-//	body { 	width: 84%; }
-//	p, ul, ol { font-size: 1.05em; }
-//	#main-content {
-//		background: image_url('main/swooshes-big.jpg') top right no-repeat;
-//		img {
-//			margin: 0 0 8px 6px;
-//			width: 30%;
-//		}
-//	}
-//}
-//
-//@media (min-width: 1200px) {
-//	body { 	width: 78%; }
-//	p, ul, ol { font-size: 1.1em; }
-//	#main-content img {
-//		margin: 0 0 9px 7px;
-//		width: 21%;
-//	}
-//}
-//
-//
-//// generic classes
-//.text-right { text-align: right; }
+}

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

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>
 			<% if defined?(APP_SETTINGS) && APP_SETTINGS['site_name'] %>
-				<%= t("admin_panel_for") + APP_SETTINGS['site_name'] %>
+				<%= t("admin_panel_for") + ' ' + APP_SETTINGS['site_name'] %>
 			<% else %>
 				<%= t 'admin_panel' %>
 			<% end %>
@@ -32,7 +32,7 @@
 					<%= render 'shared/login_info' %>
 					<h1>
 						<% if defined?(APP_SETTINGS) && APP_SETTINGS['site_name'] %>
-							<%= (t("admin_panel_for") + link_to(APP_SETTINGS['site_name'], root_path)).html_safe %>
+							<%= (t("admin_panel_for") + ' ' + link_to(APP_SETTINGS['site_name'], root_path)).html_safe %>
 						<% else %>
 							<%= t 'admin_panel' %>
 						<% end %>

data/app/views/shared/_language_switcher.html.erb

@@ -16,7 +16,7 @@
 	  </a>
 	  <ul class="dropdown-menu">
 	  	<% for loc in I18n.available_locales %>
-	    	<%= link_to full_language_name(loc), :locale => loc unless loc.to_s == I18n.locale.to_s %>
+	    	<%= content_tag( :li, link_to( full_language_name(loc), :locale => loc ))  unless loc.to_s == I18n.locale.to_s %>
 	  	<% end %>
 	  </ul>
   </div>

data/lib/tkh_admin_panel/version.rb

@@ -1,3 +1,3 @@
 module TkhAdminPanel
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_admin_panel
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties