merb-ui 0.3.1 → 0.3.2

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.3.1'
+  s.version = '0.3.2'
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/app/helpers/global_helpers.rb

@@ -12,6 +12,9 @@ module Merb::GlobalHelpers
     if type = options[:type]
       if type == 'inline'
         tag_type = :span
+      elsif type == 'tray_inline'
+        tag_type = :span
+        attributes[:class] << %{ mui_block_tray}
       else
         tag_type = :div
         attributes[:class] << %{ mui_block_#{type}}
@@ -100,7 +103,7 @@ module Merb::GlobalHelpers
   end
   
   def mui_cell(options = {}, &block)
-    return unless block_given?
+    return unless block_given? and @mui_grid
     @mui_grid[:count] += 1
     attributes = {}
     attributes[:align] = @mui_grid[:align] || options[:align] || nil
@@ -243,14 +246,17 @@ module Merb::GlobalHelpers
   def mui_search(options = {})
     attributes = {}
     attributes[:class] = 'mui_search'
-    attributes[:name] = :search
-    attributes[:style] = %{width:#{options[:width]};} if options[:width]
+    attributes[:name] = :query
+    attributes[:style] = "width:#{options[:width]};" if options[:width]
     attributes[:type] = :text
-    attributes[:value] = params[:search]
-    box = mui_cell(:valign => 'middle'){self_closing_tag(:input, attributes)}
-    button =  mui_cell(:align => 'right', :valign => 'middle', :wrap => false){%{#{mui_button(:submit => true, :title => 'Search')}}}
-    table = mui_grid(:columns => 2){box + button}
-    tag(:form, table, :action => options[:action])
+    attributes[:value] = params[:query]
+    input = self_closing_tag(:input, attributes)
+    button = mui_button(:submit => true, :title => 'Search')
+    grid = mui_grid(:columns => 2){
+      mui_cell(:valign => 'middle'){input} +
+      mui_cell(:align => 'right', :valign => 'middle', :wrap => false){button}
+    }
+    tag(:form, grid, :action => options[:action])
   end
   
   def mui_tab(options = {}, &block)

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

@@ -64,6 +64,19 @@ span.mui_block {
   display: inline-block;
   vertical-align: top;
 }
+span.mui_block_tray {
+  background-color: <%= color(0.95, 0.95, 0.95) %>;
+  border-bottom-color: <%= color(0.9, 0.9, 0.9) %>;
+  border-left-color: <%= color(0.8, 0.8, 0.8) %>;
+  border-right-color: <%= color(0.8, 0.8, 0.8) %>;
+  border-top-color: <%= color(0.7, 0.7, 0.7) %>;
+  border-style: solid;
+  border-width: 1px;
+  display: inline-block;
+  padding: 1em;
+  vertical-align: top;
+  <%= border_radius %>
+}
 div.mui_block_status {
   background-image: url('<%= mui_path :image %>/transparency.png');
   border-color: <%= color(0, 0, 0) %>;
@@ -453,6 +466,13 @@ span.mui_truncate {
   font-size: 0.85em;
 }
 
+/* url */
+
+div.mui_url {
+  color: <%= color(0.5, 0.5, 0.5) %>;
+  font-size: 0.85em;
+}
+
 /* window */
 
 table.mui_window {

data/lib/merb-ui.rb

@@ -2,76 +2,22 @@ if defined?(Merb::Plugins)
 
   $:.unshift File.dirname(__FILE__)
 
-  load_dependencies('merb-slices', 'merb-helpers')
-  Merb::Plugins.add_rakefiles "merb-ui/merbtasks", "merb-ui/slicetasks", "merb-ui/spectasks"
+  dependencies('merb-helpers', 'merb-slices')
+
+  Merb::Plugins.add_rakefiles('merb-ui/merbtasks', 'merb-ui/slicetasks', 'merb-ui/spectasks')
 
-  # Register the Slice for the current host application
   Merb::Slices::register(__FILE__)
   
-  # Slice configuration - set this in a before_app_loads callback.
-  # By default a Slice uses its own layout, so you can swicht to 
-  # the main application layout or no layout at all if needed.
-  # 
-  # Configuration options:
-  # :layout - the layout to use; defaults to :merb-ui
-  # :mirror - which path component types to use on copy operations; defaults to all
   Merb::Slices::config[:merb_ui][:layout] ||= :application
   
-  # All Slice code is expected to be namespaced inside a module
   module MerbUi
     
-    # Slice metadata
-    self.description = "Merb UI"
-    self.version = "1.0"
-    self.author = "UI Poet"
-    
-    # Stub classes loaded hook - runs before LoadClasses BootLoader
-    # right after a slice's classes have been loaded internally.
-    def self.loaded
-    end
-    
-    # Initialization hook - runs before AfterAppLoads BootLoader
-    def self.init
-    end
-    
-    # Activation hook - runs after AfterAppLoads BootLoader
-    def self.activate
-    end
-    
-    # Deactivation hook - triggered by Merb::Slices.deactivate(MerbUi)
-    def self.deactivate
-    end
-    
-    # Setup routes inside the host application
-    #
-    # @param scope<Merb::Router::Behaviour>
-    #  Routes will be added within this scope (namespace). In fact, any 
-    #  router behaviour is a valid namespace, so you can attach
-    #  routes at any level of your router setup.
-    #
-    # @note prefix your named routes with :merb_ui_
-    #   to avoid potential conflicts with global named routes.
     def self.setup_router(scope)
       scope.match('/stylesheets/mui.css').to(:controller => 'styles', :action => 'index')
     end
     
   end
   
-  # Setup the slice layout for MerbUi
-  #
-  # Use MerbUi.push_path and MerbUi.push_app_path
-  # to set paths to merb-ui-level and app-level paths. Example:
-  #
-  # MerbUi.push_path(:application, MerbUi.root)
-  # MerbUi.push_app_path(:application, Merb.root / 'slices' / 'merb-ui')
-  # ...
-  #
-  # Any component path that hasn't been set will default to MerbUi.root
-  #
-  # Or just call setup_default_structure! to setup a basic Merb MVC structure.
   MerbUi.setup_default_structure!
   
-  # Add dependencies for other MerbUi classes below. Example:
-  # dependency "merb-ui/other"
-  
 end

metadata

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