merb-ui 0.4 → 0.4.1

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

data/app/helpers/global_helpers.rb

@@ -8,6 +8,8 @@ module Merb::GlobalHelpers
     attributes = {}
     attributes[:align] = options[:align] if options[:align]
     attributes[:class] = 'mui_block'
+    attributes[:class] << ' mui_subtle' if options[:subtle]
+    attributes[:class] << ' mui_truncate' if options[:truncate]
     if options[:inline]
       tag_type = :span
     else
@@ -323,7 +325,18 @@ module Merb::GlobalHelpers
       attributes[:style] << "width:#{options[:width]};" if options[:width]
     end
     content = ''
-    content << mui_title(:title => options[:title], :title_size => options[:title_size]) if options[:title]
+    if options[:title]
+      title_attributes = {}
+      title_attributes[:class] = 'mui_tray_title mui_truncate'
+      if options[:title_url]
+        title_attributes[:class] << ' mui_link'
+        title_attributes[:href] = options[:title_url]
+        title_type = :a
+      else
+        title_type = :div
+      end
+      content << tag(title_type, options[:title], title_attributes)
+    end
     content << capture(&block) if block_given?
     tag(tag_type, content, attributes)
   end

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

@@ -258,19 +258,19 @@ button.mui_button td {
 /* link */
 
 .mui_link {
-  color: #0066ff;
+  color: <%= color(0, 0.2, 1) %>;
   text-decoration: none;
 }
 .mui_link:visited {
-  color: #993399;
+  color: <%= color(0.5, 0.25, 0.5) %>;
 }
 .mui_link:active {
-  color: #3399ff;
+  color: <%= color(0.1, 0.6, 1) %>;
   outline: 0;
   text-decoration: underline;
 }
 .mui_link:focus {
-  color: #3399ff;
+  color: <%= color(0.1, 0.6, 1) %>;
   outline: 0;
 }
 .mui_link:hover {
@@ -359,6 +359,16 @@ p.mui_paragraph+p.mui_paragraph {
   <%= round %>
 }
 
+/* subtle */
+
+.mui_subtle {
+  color: <%= color(0.25, 0.25, 0.25) %>;
+  font-size: 0.85em;
+}
+.mui_subtle b {
+  color: <%= color(0, 0, 0) %>;
+}
+
 /* tab */
 
 .mui_tab {
@@ -409,19 +419,25 @@ p.mui_paragraph+p.mui_paragraph {
 /* tray */
 
 .mui_tray {
-  background-color: <%= color(0.95, 0.95, 0.95) %>;
+  background-image: url('<%= mui_path :image %>/bezel.png');
+  background-color: <%= color(1, 1, 1) %>;
+  background-position: top center;
+  background-repeat: repeat-x;
   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-top-color: <%= color(0.6, 0.6, 0.6) %>;
   border-width: 1px;
   margin: 0.5em;
-  padding: 1em;
+  padding: 0 0 0.5em; 0;
   <%= round %>
 }
 .mui_tray .mui_block, .mui_tray .mui_tray {
-  margin: 0;
+  margin: 0.5em 1em 0 1em;
+}
+.mui_tray .mui_subtle {
+  margin: 0 1em 0 1em !important;
 }
 .mui_tray .mui_divider {
   margin-bottom: 1em;
@@ -436,19 +452,33 @@ span.mui_tray {
   display: inline-block;
   vertical-align: top;
 }
+.mui_tray_title {
+  background-color: <%= color(0.95, 0.95, 0.95) %>;
+  background-image: url('<%= mui_path :image %>/bezel.png');
+  background-position: top center;
+  background-repeat: repeat-x;
+  border-bottom-color: <%= color(1, 1, 1) %>;
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
+  font-size: 1.125em;
+  padding: 0.25em 1em 0.25em 1em;
+  white-space: nowrap;
+  <%= round(:top_left => true, :top_right => true) %>
+}
+a.mui_tray_title {
+  display: block;
+}
+a.mui_tray_title:hover {
+  background-color: <%= color(1, 1, 1) %>;
+  cursor: pointer;
+}
 
 /* truncate */
 
 .mui_truncate {
-  color: <%= color(0.5, 0.5, 0.5) %>;
-  font-size: 0.85em;
-}
-
-/* url */
-
-.mui_url {
-  color: <%= color(0.5, 0.5, 0.5) %>;
-  font-size: 0.85em;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 /* window */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-ui
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: 0.4.1
 platform: ruby
 authors: 
 - UiPoet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-15 00:00:00 -08:00
+date: 2008-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,7 +57,9 @@ files:
 - lib/merb-ui/spectasks.rb
 - lib/merb-ui.rb
 - public/images
+- public/images/bezel.png
 - public/images/glass.png
+- public/images/metal.png
 - public/images/nil.png
 - public/images/plastic.png
 - public/images/rubber.png