small markup changes, adding soemthing to the layout to show version

Oleg committed May 05, 2011

commit 1b180f852c3695297ba7a38ae932b74cf48026df

app/views/layouts/cms_admin/_body.html.erb +4 -0

@@	@@ -13,5 +13,9 @@
	<div class='center_column'>
	<%= render :partial => 'layouts/cms_admin/center' %>
	</div>
+	<div class='sofa'>
+	<a href='http://comfortablemexicansofa.twg.ca' target='_blank'>ComfortableMexicanSofa</a>
+	<span class='version'><%= ComfortableMexicanSofa::VERSION %></span>
+	</div>
	</div>
	</body>
	\ No newline at end of file

app/views/layouts/cms_admin/_left.html.erb +9 -7

@@	@@ -1,7 +1,9 @@
-	<% if ComfortableMexicanSofa.config.enable_multiple_sites %>
-	<%= active_link_to 'Sites', cms_admin_sites_path %>
-	<% end %>
-	<%= active_link_to 'Layouts', cms_admin_layouts_path %>
-	<%= active_link_to 'Pages', cms_admin_pages_path %>
-	<%= active_link_to 'Snippets', cms_admin_snippets_path %>
-	<%= cms_hook :navigation %>
	\ No newline at end of file
+	<ul class='nav'>
+	<% if ComfortableMexicanSofa.config.enable_multiple_sites %>
+	<li><%= active_link_to 'Sites', cms_admin_sites_path %></li>
+	<% end %>
+	<li><%= active_link_to 'Layouts', cms_admin_layouts_path %></li>
+	<li><%= active_link_to 'Pages', cms_admin_pages_path %></li>
+	<li><%= active_link_to 'Snippets', cms_admin_snippets_path %></li>
+	<%= cms_hook :navigation %>
+	</ul>
	\ No newline at end of file

comfortable_mexican_sofa.rb b/lib/comfortable_mexican_sofa.rb +2 -1

@@	@@ -3,7 +3,8 @@ unless defined? ComfortableMexicanSofa::Application
	require File.expand_path('comfortable_mexican_sofa/engine', File.dirname(__FILE__))
	end

-	[ 'comfortable_mexican_sofa/configuration',
+	[ 'comfortable_mexican_sofa/version',
+	'comfortable_mexican_sofa/configuration',
	'comfortable_mexican_sofa/http_auth',
	'comfortable_mexican_sofa/rails_extensions',
	'comfortable_mexican_sofa/controller_methods',

comfortable_mexican_sofa/http_auth.rb b/lib/comfortable_mexican_sofa/http_auth.rb +1 -0

@@	@@ -14,4 +14,5 @@ module ComfortableMexicanSofa::HttpAuth
	username == self.username && password == self.password
	end
	end
+
	end
	\ No newline at end of file

comfortable_mexican_sofa/version.rb b/lib/comfortable_mexican_sofa/version.rb +7 -0

@@	@@ -0,0 +1,7 @@
+	module ComfortableMexicanSofa
+	VERSION = begin
+	IO.read(File.join(File.dirname(__FILE__), '/../../VERSION')).chomp
+	rescue
+	'UNKNOWN'
+	end
+	end
	\ No newline at end of file

public/stylesheets/comfortable_mexican_sofa/structure.css +25 -5

@@	@@ -11,6 +11,7 @@ html, body {
	float: left;
	}
	.center_column {
+	position: relative;
	margin: 0px 250px 0px 175px;
	min-height: 100%;
	overflow: hidden;
@@	@@ -18,7 +19,7 @@ html, body {
	border-left: 1px solid #484848;
	border-right: 1px solid #484848;
	}
-	.center_column_content {
+	.center_column .center_column_content {
	padding: 25px;
	}
	.right_column {
@@	@@ -35,7 +36,7 @@ html, body {
	width: 165px;
	position: fixed;
	}
-	.left_column_content a {
+	.left_column_content ul.nav a {
	display: block;
	padding: 3px 10px;
	margin-bottom: 5px;
@@	@@ -50,12 +51,11 @@ html, body {
	color: #fff;
	opacity: 0.3;
	}
-	.left_column_content a:hover,
-	.left_column_content a.active {
+	.left_column_content ul.nav a:hover,
+	.left_column_content ul.nav a.active {
	color: #fff;
	opacity: 1;
	}
-
	.right_column_content .box {
	background-color: #484848;
	padding: 5px;
@@	@@ -125,4 +125,24 @@ input[type='file'] {
	}
	a.button.big {
	float: right;
+	}
+	.body_wrapper .sofa {
+	position: absolute;
+	background: #000;
+	bottom: 0px;
+	left: 0px;
+	width: 155px;
+	padding: 5px 10px;
+	font-size: 10px;
+	}
+	.body_wrapper .sofa a {
+	color: #484848;
+	}
+	.body_wrapper .sofa a:hover {
+	color: #f1f1f1;
+	}
+	.body_wrapper .sofa span.version {
+	color: #f1f1f1;
+	font-size: 9px;
+	margin-left: 2px;
	}
	\ No newline at end of file

test/unit/configuration_test.rb +4 -0

@@	@@ -21,4 +21,8 @@ class ConfigurationTest < ActiveSupport::TestCase
	assert_equal 'New Title', ComfortableMexicanSofa.configuration.cms_title
	end

+	def test_version
+	assert ComfortableMexicanSofa::VERSION
+	end
+
	end
	\ No newline at end of file