merb-ui 0.1.1 → 0.2

data/Rakefile

@@ -8,7 +8,7 @@ AUTHOR = 'uipoet'
 EMAIL = 'dont.tase@me.com'
 HOMEPAGE = 'http://uipoet.com/projects'
 SUMMARY = 'User Interface Components for Merb'
-GEM_VERSION = '0.1.1'
+GEM_VERSION = '0.2'
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = AUTHOR

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

@@ -15,12 +15,30 @@ b, em, h1, label, strong {
   font-family: "Lucida Grande", "Lucida Sans", "Lucida Sans Unicode", sans-serif;
   font-weight: bold;
 }
+code {
+  background-color: <%= color(0.1, 0.1, 0.1) %>;
+  color: <%= color(1, 1, 1) %>;
+  display: block;
+  font-family: "Bitstream Vera Sans Mono", "Monaco", "Andale Mono", "Courier New", "Courier", fixed;
+  font-size: 0.85em;
+  overflow: auto;
+  padding: 1em;
+  white-space: nowrap;
+}
+kbd {
+  background-color: <%= color(0.9, 0.9, 0.9) %>;
+  border-color: <%= color(0.8, 0.8, 0.8) %>;
+  border-style: solid;
+  border-width: 1px;
+  padding: 0 0.5em 0.2em 0.5em;
+  <%= border_radius %>
+}
 
 /* bar */
 
 div.mui_bar {
   background-color: <%= color(0.1, 0.1, 0.1) %>;
-  background-image: url('/slices/merb-ui/images/reflection.png');
+  background-image: url('<%= image_path('reflection.png') %>');
   background-position: center center;
   background-repeat: repeat-x;
   border-collapse: collapse;
@@ -38,7 +56,7 @@ span.mui_block {
   vertical-align: top;
 }
 div.mui_block_status {
-  background-image: url('/slices/merb-ui/images/transparency.png');
+  background-image: url('<%= image_path('transparency.png') %>');
   border-color: <%= color(0, 0, 0) %>;
   border-style: solid;
   border-width: 1px;
@@ -71,7 +89,7 @@ div.mui_block_tray *.mui_block {
 /* button */
 
 *.mui_button {
-  background-image: url('/slices/merb-ui/images/reflection.png');
+  background-image: url('<%= image_path('reflection.png') %>');
   background-position: center center;
   background-repeat: repeat-x;
   border-style: solid;
@@ -291,11 +309,6 @@ img.mui_image_border {
   border-width: 1px;
 }
 
-/* key */
-
-kbd.mui_key {
-}
-
 /* link */
 
 a.mui_link {
@@ -338,7 +351,7 @@ select.mui_menu {
 /* message */
 
 div.mui_message {
-  background-image: url('/slices/merb-ui/images/transparency.png');
+  background-image: url('<%= image_path('transparency.png') %>');
   border-style: solid;
   border-bottom-width: 1px;
   border-left-width: 1px;
@@ -389,7 +402,7 @@ blockquote.mui_quote {
 
 a.mui_tab {
   background-color: <%= color(0.1, 0.1, 0.1) %>;
-  background-image: url('/slices/merb-ui/images/reflection.png');
+  background-image: url('<%= image_path('reflection.png') %>');
   background-position: center center;
   background-repeat: repeat-x;
   border-bottom: none;
@@ -438,23 +451,21 @@ table.mui_window {
 }
 table.mui_window_bar {
   background-color: <%= color(0.1, 0.1, 0.1) %>;
-  background-image: url('/slices/merb-ui/images/reflection.png');
+  background-image: url('<%= image_path('reflection.png') %>');
   background-position: center center;
   background-repeat: repeat-x;
   color: <%= color(1, 1, 1) %>;
   height: 2em;
+  padding-left: 0.75em;
+  padding-right: 0.75em;
   width: 100%;
   <%= border_radius(:edge => 'top') %>
 }
 td.mui_window_bar_end {
-  padding-right: 0.75em;
   text-align: right;
 }
-td.mui_window_title {
-  padding-left: 0.75em;
-}
 td.mui_window_content {
-  background-image: url('/slices/merb-ui/images/transparency.png');
+  background-image: url('<%= image_path('transparency.png') %>');
   color: <%= color(1, 1, 1) %>;
   padding: 0.5em;
   <%= border_radius(:edge => 'bottom') %>

data/public/javascripts/desktop.js

@@ -1,3 +1,6 @@
+// Set the status of the window. 0 == closed, 1 == opened
+var windowStatus = 0;
+
 // Position message at top center.
 function messagePosition(){
   var browserWidth = $(window).width();
@@ -7,41 +10,42 @@ function messagePosition(){
 
 // Close window.
 function windowClose(url){
-  var target = $('.mui_window_target');
-  target.fadeOut(function(){
-	  target.empty;
-    $('.mui_focus:first').focus();
+  $('.mui_window_target').fadeOut(function(){
+    windowStatus = 0;
 	});
 }
 
 // Open window and give the first input with class of mui_focus focus, if one exists.
 function windowOpen(url){
-  var target = $('.mui_window_target');
-  target.fadeOut(function(){
-	  target.load(url, function(){
-	    target.fadeIn();
-      $('.mui_focus:first').focus();
-  	});
+  var target = $('.mui_window_target')
+  target.load(url, function(){
+    if(windowStatus == 0){
+      target.fadeIn();
+  	}
+    $('.mui_focus:first').focus();
+    windowStatus = 1;
 	});
 }
 
 // Position window at middle center.
 function windowPosition(){
-  var browserWidth = $(window).width();
-  var browserHeight = $(window).height();
-  var windowWidth = $('.mui_window_target').width();
-  var windowHeight = $('.mui_window_target').height();
-  if (windowWidth > browserWidth){
-    $('.mui_window_target').css({position:'absolute', left:'1em'});
-  }
-  else{
-    $('.mui_window_target').css({position:'fixed', left:(browserWidth/2)+(windowWidth/2)*(-1)});
-  }
-  if (windowHeight > browserHeight){
-    $('.mui_window_target').css({position:'absolute', top:'1em'});
-  }
-  else{
-    $('.mui_window_target').css({position:'fixed', top:(browserHeight/2)+(windowHeight/2)*(-1)});
+  if(windowStatus == 0){
+    var browserWidth = $(window).width();
+    var browserHeight = $(window).height();
+    var windowWidth = $('.mui_window_target').width();
+    var windowHeight = $('.mui_window_target').height();
+    if (windowWidth > browserWidth){
+      $('.mui_window_target').css({position:'absolute', left:'1em'});
+    }
+    else{
+      $('.mui_window_target').css({position:'fixed', left:(browserWidth/2)+(windowWidth/2)*(-1)});
+    }
+    if (windowHeight > browserHeight){
+      $('.mui_window_target').css({position:'absolute', top:'1em'});
+    }
+    else{
+      $('.mui_window_target').css({position:'fixed', top:(browserHeight/2)+(windowHeight/2)*(-1)});
+    }
   }
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-ui
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: "0.2"
 platform: ruby
 authors: 
 - uipoet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-26 00:00:00 -08:00
+date: 2008-11-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency