merb-ui 0.4.5 → 0.4.6

data/Rakefile

@@ -14,7 +14,7 @@ spec = Gem::Specification.new do |s|
   s.name = 'merb-ui'
   s.rubyforge_project = 'uipoet'
   s.summary = 'User Interface Components for Merb'
-  s.version = '0.4.5'
+  s.version = '0.4.6'
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/app/helpers/global_helpers.rb

@@ -43,7 +43,12 @@ module Merb::GlobalHelpers
     copyright_owner = " #{MerbUi[:owner]}" if MerbUi[:owner]
     copyright_text = "Copyright © #{copyright_years}#{copyright_owner}. All rights reserved."
     copyright = tag(:div, copyright_text, :class => 'mui_copyright')
-    body << tag(:div, catch_content(:for_layout) + copyright, attributes)
+    content = tag(:div, catch_content(:for_layout) + copyright, attributes)
+    if thrown_content? :mui_sidebar
+      body << tag(:table, tag(:tr, tag(:td, catch_content(:mui_sidebar), :class => 'mui_sidebar') + tag(:td, content), :valign => 'top'), :class => 'mui_grid')
+    else
+      body << content
+    end
     body << tag(:div, :class => 'mui_window_target')
     body << tag(:div, :class => 'mui_message_target')
     if session[:mui_window]
@@ -178,14 +183,6 @@ module Merb::GlobalHelpers
     jquery + jquery_ui + include_required_js + include_required_css + catch_content(:feeds)
   end
   
-  def mui_textarea(name, options = {})
-    attributes = {}
-    attributes[:class] = 'mui_textarea'
-    attributes[:class] << ' mui_focus' if options[:focus] == true
-    attributes[:label] = options[:title]
-    text_area(name, attributes)
-  end
-
   def mui_image(options={})
     attributes={}
     attributes[:align] = options[:align] if options[:align]
@@ -260,6 +257,7 @@ module Merb::GlobalHelpers
   def mui_search(options = {})
     attributes = {}
     attributes[:class] = 'mui_input mui_search'
+    attributes[:class] << ' mui_focus' if options[:focus] == true
     attributes[:name] = :q
     attributes[:style] = "width:#{options[:width]};" if options[:width]
     attributes[:type] = :text
@@ -317,6 +315,14 @@ module Merb::GlobalHelpers
     text_field(name, attributes)
   end
   
+  def mui_textarea(name, options = {})
+    attributes = {}
+    attributes[:class] = 'mui_textarea'
+    attributes[:class] << ' mui_focus' if options[:focus] == true
+    attributes[:label] = options[:title]
+    text_area(name, attributes)
+  end
+
   def mui_title(options = {})
     size = options[:title_size] || '1.5em'
     attributes = {}

data/app/views/styles/index.css.erb

@@ -316,6 +316,18 @@ p.mui_paragraph+p.mui_paragraph {
   margin-right: 0.5em;
 }
 
+/* sidebar */
+
+.mui_sidebar {
+  background-color: <%= color(0.25, 0.25, 0.25) %>;
+  border: 0 solid <%= color(0, 0, 0) %>;
+  border-right-width: 1px;
+  white-space: nowrap;
+}
+.mui_sidebar .mui_link {
+  color: <%= color(1, 1, 1) %>;
+}
+
 /* status */
 
 .mui_status {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-ui
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - UiPoet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-22 00:00:00 -08:00
+date: 2008-12-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency