merb-ui 0.4.8 → 0.4.9

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

data/app/helpers/global_helpers.rb

@@ -63,6 +63,7 @@ module Merb::GlobalHelpers
     if script_window || script_message
       script << tag(:script, "$(document).ready(function(){#{script_window}#{script_message}});", :type => 'text/javascript')
     end
+    body << mui_password_status if mui_password?
     tag(:div, body, :class => 'mui') + script
   end
   
@@ -250,6 +251,16 @@ module Merb::GlobalHelpers
     password_field(name, attributes)
   end
   
+  def mui_password?
+    session[:mui_password_id] ? true : false
+  end
+
+  def mui_password_status
+    update_button = mui_button(:title => 'Update Password', :title_size => '0.75em', :url => url(:merb_words_password_update), :window => 'open')
+    exit_button = mui_button(:title => 'Exit', :title_size => '0.75em', :tone => 'positive', :url => url(:merb_words_password_exit))
+    mui_status{"#{update_button} #{exit_button}"}
+  end
+
   def mui_path(type)
     ::MerbUi.public_path_for type
   end

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

@@ -53,29 +53,16 @@ body {
   border-bottom: 1px solid <%= color(0.2, 0.2, 0.2) %>;
   border-top: 1px solid <%= color(0.6, 0.6, 0.6) %>;
   color: <%= color(1, 1, 1) %>;
-  padding: 0.5em 1.5em 0.5em 1.5em;
+  padding: 0 1em 1em 0;
 }
 
 /* block */
 
 .mui_block {
-  margin: 0.5em;
+  margin: 1em 0 0 1em;
 }
 .mui_block .mui_block, .mui_block .mui_tray {
-  margin: 0;
-}
-.mui_block_status {
-  background-image: url('<%= mui_path :image %>/glass.png');
-  border: 1px solid <%= color(0, 0, 0) %>;
-  color: <%= color(0.5, 0.5, 0.5) %>;
-  padding: 0.5em;
-  position: absolute;
-  right: 1.5em;
-  top: 0;
-  <%= round %>
-}
-div.mui_block+div.mui_block {
-  margin-top: 1em;
+  margin: 0.5em 0 0 0.5em;
 }
 span.mui_block {
   display: inline-block;
@@ -154,7 +141,7 @@ button.mui_button td {
 /* desktop */
 
 .mui_desktop {
-  padding: 1.5em 1.5em 0 1.5em;
+  padding: 0 1em 1em 0;
 }
 
 /* divider */
@@ -163,7 +150,7 @@ button.mui_button td {
   background: <%= color(0.85, 0.85, 0.85) %>;
   border: none;
   height: 1px;
-  margin: 2em 0.5em 1em 0.5em;
+  margin: 1em 0 0 1em;
 }
 
 /* gallery */
@@ -322,10 +309,18 @@ p.mui_paragraph+p.mui_paragraph {
   border: 1px solid <%= color(0.1, 0.1, 0.1) %>;
   border-bottom-color: <%= color(0.5, 0.5, 0.5) %>;
   border-top-color: <%= color(0, 0, 0) %>;
+  padding: 0 0.5em 0.5em 0;
   white-space: nowrap;
 }
+.mui_sidebar .mui_block {
+  margin: 0.5em 0 0 0.5em;
+}
+.mui_sidebar .mui_divider {
+  margin: 0.5em 0 0 0.5em;
+}
 .mui_sidebar .mui_link {
   color: <%= color(1, 1, 1) %>;
+  font-size: 0.9em;
 }
 
 /* status */
@@ -336,8 +331,8 @@ p.mui_paragraph+p.mui_paragraph {
   color: <%= color(0.5, 0.5, 0.5) %>;
   padding: 0.5em;
   position: absolute;
-  right: 1.5em;
-  top: 0.5em;
+  right: 1em;
+  top: 1em;
   <%= round %>
 }
 
@@ -380,7 +375,7 @@ p.mui_paragraph+p.mui_paragraph {
 
 .mui_tab_group {
   display: inline-block;
-  margin: 0.5em;
+  margin: 1em 0 0 1em;
   white-space: nowrap;
 }
 
@@ -391,7 +386,6 @@ p.mui_paragraph+p.mui_paragraph {
   border: 1px solid <%= color(0.9, 0.9, 0.9) %>;
   display: inline-block;
   height: 20em;
-  margin-right: 0.5em;
   line-height: 1.7em;
   padding: 0 0.4em 0 0.4em;
   width: 40em;
@@ -412,24 +406,15 @@ p.mui_paragraph+p.mui_paragraph {
   border: 1px solid <%= color(0.9, 0.9, 0.9) %>;
   border-left-color: <%= color(0.8, 0.8, 0.8) %>;
   border-top-color: <%= color(0.8, 0.8, 0.8) %>;
-  margin: 0.5em;
-  padding: 0 0 0.5em; 0;
+  margin: 1em 0 0 1em;
+  padding: 0 0.5em 0.5em 0;
   <%= round %>
 }
-.mui_tray .mui_block, .mui_tray .mui_tray {
-  margin: 0.5em 1em 0 1em;
+.mui_tray .mui_block, .mui_tray .mui_divider, .mui_tray .mui_tray {
+  margin: 0.5em 0 0 0.5em;
 }
 .mui_tray .mui_subtle {
-  margin: 0 1em 0 1em !important;
-}
-.mui_tray .mui_divider {
-  margin-bottom: 1em;
-  margin-left: 0;
-  margin-right: 0;
-  margin-top: 1.5em;
-}
-div.mui_tray+div.mui_tray {
-  margin-top: 1em;
+  margin: 0 0 0 0.5em !important;
 }
 span.mui_tray {
   display: inline-block;
@@ -438,7 +423,7 @@ span.mui_tray {
 .mui_tray_title {
   border-bottom: 1px solid <%= color(1, 1, 1) %>;
   font-size: 1.125em;
-  padding: 0.25em 1em 0.25em 1em;
+  padding: 0.25em 0.5em 0.25em 0.5em;
   white-space: nowrap;
 }
 a.mui_tray_title {
@@ -472,7 +457,7 @@ a.mui_tray_title {
 .mui_window_content {
   background: url('<%= mui_path :image %>/glass.png');
   color: <%= color(1, 1, 1) %>;
-  padding: 0.5em;
+  padding: 0 1em 1em 0;
   <%= round(:bottom_left => true, :bottom_right => true) %>
 }
 .mui_window_target {

metadata

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