fume 0.2.1 → 0.2.2

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
 :minor: 2
-:patch: 1
+:patch: 2
 :major: 0

data/fume.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fume}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sunteya"]
-  s.date = %q{2009-12-18}
+  s.date = %q{2009-12-21}
   s.email = %q{Sunteya@gmail.com}
   s.extra_rdoc_files = [
     "README"
@@ -43,42 +43,19 @@ Gem::Specification.new do |s|
      "generators/fume/simple_theme/templates/public/javascripts/jquery-1.3.2.js",
      "generators/fume/simple_theme/templates/public/javascripts/jquery-ui-1.7.2.js",
      "generators/fume/simple_theme/templates/public/javascripts/jquery-ui-i18n-1.7.2.js",
-     "generators/fume/simple_theme/templates/public/stylesheets/base.less",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/ie.css",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/buttons/icons/cross.png",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/buttons/icons/key.png",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/buttons/icons/tick.png",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/buttons/readme.txt",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/buttons/screen.css",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/fancy-type/readme.txt",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/fancy-type/screen.css",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/link-icons/icons/doc.png",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/link-icons/icons/email.png",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/link-icons/icons/external.png",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/link-icons/icons/feed.png",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/link-icons/icons/im.png",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/link-icons/icons/pdf.png",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/link-icons/icons/visited.png",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/link-icons/icons/xls.png",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/link-icons/readme.txt",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/link-icons/screen.css",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/rtl/readme.txt",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/plugins/rtl/screen.css",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/print.css",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/screen.css",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/src/forms.css",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/src/grid.css",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/src/grid.png",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/src/ie.css",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/src/print.css",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/src/reset.css",
-     "generators/fume/simple_theme/templates/public/stylesheets/blueprint-0.9.1/src/typography.css",
-     "generators/fume/simple_theme/templates/public/stylesheets/drastic-dark.less",
-     "generators/fume/simple_theme/templates/public/stylesheets/ie_patch.less",
+     "generators/fume/simple_theme/templates/public/javascripts/jquery.corner-2.03.js",
+     "generators/fume/simple_theme/templates/public/javascripts/jquery.timepicker-0.2.1.js",
+     "generators/fume/simple_theme/templates/public/javascripts/simple-theme-ie-patch.js",
      "generators/fume/simple_theme/templates/public/stylesheets/jquery-ui-1.7.2.ui-darkness.css",
-     "generators/fume/simple_theme/templates/public/stylesheets/layout.less",
      "generators/fume/simple_theme/templates/public/stylesheets/simple-theme.css",
      "generators/fume/simple_theme/templates/public/stylesheets/simple-theme.less",
+     "generators/fume/simple_theme/templates/public/stylesheets/src/base.less",
+     "generators/fume/simple_theme/templates/public/stylesheets/src/function.less",
+     "generators/fume/simple_theme/templates/public/stylesheets/src/layout.less",
+     "generators/fume/simple_theme/templates/public/stylesheets/src/reset.less",
+     "generators/fume/simple_theme/templates/public/stylesheets/src/vendor/yui-3.0/base.css",
+     "generators/fume/simple_theme/templates/public/stylesheets/src/vendor/yui-3.0/fonts.css",
+     "generators/fume/simple_theme/templates/public/stylesheets/src/vendor/yui-3.0/reset.css",
      "init.rb",
      "lib/fume.rb",
      "lib/fume/authlogic.rb",

data/generators/fume/simple_theme/templates/public/demo.html

@@ -3,7 +3,42 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title>Web App Theme</title>
+	<link rel="stylesheet" href="stylesheets/jquery-ui-1.7.2.ui-darkness.css" type="text/css" media="screen" charset="utf-8">
 	<link rel="stylesheet" href="stylesheets/simple-theme.css" type="text/css" media="screen" />
+
+	<script type="text/javascript" charset="utf-8" src="javascripts/jquery-1.3.2.js"></script>
+	<script type="text/javascript" charset="utf-8" src="javascripts/jquery-ui-1.7.2.js"></script>
+	<script type="text/javascript" charset="utf-8" src="javascripts/jquery-ui-i18n-1.7.2.js"></script>
+	<script type="text/javascript" charset="utf-8" src="javascripts/jquery.corner-2.03.js"></script>
+	<script type="text/javascript" charset="utf-8" src="javascripts/jquery.timepicker-0.2.1.js"></script>
+	<script type="text/javascript" charset="utf-8" src="javascripts/simple-theme-ie-patch.js"></script>
+	<script type="text/javascript" charset="utf-8">
+		$(function() {
+			$.datepicker.setDefaults($.datepicker.regional['zh-CN']);
+
+			$('.datepicker').datepicker({
+				changeMonth: true,
+				changeYear: true,
+				showButtonPanel: true,
+				duration: 0,
+				dateFormat: 'yy-mm-dd'
+			});
+			
+			$('.datetimepicker').datepicker({
+				changeMonth: true,
+				changeYear: true,
+				dateFormat: 'yy-mm-dd',
+				duration: 0,
+				showTime: true,
+				constrainInput: false,
+				// stepMinutes: 1,
+				// stepHours: 1,
+				time24h: true
+			});
+			$("#ui-timepicker-div table th:first").text("时");
+			$("#ui-timepicker-div table th:last").text("分");
+		});
+	</script>
 </head>
 <body class="sidebar">
 <div id="container">
@@ -77,7 +112,7 @@
 			<div class="content">
 				<h2 class="title">Tables</h2>
 				<div class="inner">
-					<form action="#" class="form">
+					<!-- <form action="#" class="form"> -->
 						<table class="table">
 							<tr>
 								<th class="first"><input type="checkbox" class="checkbox toggle" /></th>
@@ -102,14 +137,15 @@
 						</table>
 						<div class="actions-bar">
 							<div class="actions">
-								<input type="submit" class="button" value="Delete" />
+								<!-- <input type="submit" class="button" value="Delete" /> -->
+								<a href="#">New Account</a>
 							</div>
 							<div class="pagination">
 								<span class="disabled prev_page">« Previous</span><span class="current">1</span><a rel="next" href="#">2</a><a href="#">3</a><a href="#">4</a><a href="#">5</a><a href="#">6</a><a href="#">7</a><a href="#">8</a><a href="#">9</a><a href="#">10</a><a href="#">11</a><a rel="next" class="next_page" href="#">Next »</a>
 							</div>
 							<div class="clear"></div>
 						</div>
-					</form>
+					<!-- </form> -->
 				</div>
 			</div>
 		</div>
@@ -267,9 +303,9 @@
 						<fieldset class="inputs"><legend><span>影片信息</span></legend><ol>
 
 							<li class="string required error" id="vod_program_title_input"><label for="vod_program_title">节目名称<abbr title="required">*</abbr></label><input id="vod_program_title" maxlength="100" name="vod_program[title]" size="50" type="text" /><p class="inline-errors">不能为空字符</p></li>
-							<li class="string optional" id="vod_program_player_input"><label for="vod_program_player">主演</label><input id="vod_program_player" maxlength="200" name="vod_program[player]" size="50" type="text" /><p class="inline-hints">刘嘉玲, 张曼玉</p></li>
-							<li class="string required" id="vod_program_director_input"><label for="vod_program_director">导演<abbr title="required">*</abbr></label><input id="vod_program_director" maxlength="200" name="vod_program[director]" size="50" type="text" /></li>
-							<li class="string optional" id="vod_program_company_input"><label for="vod_program_company">出品公司</label><input id="vod_program_company" maxlength="200" name="vod_program[company]" size="50" type="text" /></li>
+							<li class="string optional" id="vod_program_player_input"><label for="vod_program_player">主演</label><input id="vod_program_player" class="datepicker" maxlength="200" name="vod_program[player]" size="50" type="text" /><p class="inline-hints">刘嘉玲, 张曼玉</p></li>
+							<li class="string required" id="vod_program_director_input"><label for="vod_program_director">导演<abbr title="required">*</abbr></label><input class="datetimepicker" id="vod_program_director" maxlength="200" name="vod_program[director]" size="50" type="text" /></li>
+							<li class="string optional" id="vod_program_company_input"><label for="vod_program_company">出品公司</label><input id="vod_program_company" class="datetimepicker" maxlength="200" name="vod_program[company]" size="50" type="text" /></li>
 							<li class="string optional" id="vod_program_country_input"><label for="vod_program_country">出品国家</label><input id="vod_program_country" maxlength="100" name="vod_program[country]" size="50" type="text" /></li>
 							<li class="text optional" id="vod_program_summary_input"><label for="vod_program_summary">节目概要</label><textarea cols="40" id="vod_program_summary" name="vod_program[summary]" rows="20"></textarea><p class="inline-hints">在浩瀚的海洋世界，各种鲨鱼和鱼类有自己的喜怒哀乐，演绎着令人思索的故事。</p></li>
 

data/generators/fume/simple_theme/templates/public/javascripts/jquery.corner-2.03.js

@@ -0,0 +1,203 @@
+/*!
+ * jQuery corner plugin: simple corner rounding
+ * Examples and documentation at: http://jquery.malsup.com/corner/
+ * version 2.03 (05-DEC-2009)
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+/**
+ *  corner() takes a single string argument:  $('#myDiv').corner("effect corners width")
+ *
+ *  effect:  name of the effect to apply, such as round, bevel, notch, bite, etc (default is round). 
+ *  corners: one or more of: top, bottom, tr, tl, br, or bl. 
+ *           by default, all four corners are adorned. 
+ *  width:   width of the effect; in the case of rounded corners this is the radius. 
+ *           specify this value using the px suffix such as 10px (and yes, it must be pixels).
+ *
+ * @author Dave Methvin (http://methvin.com/jquery/jq-corner.html)
+ * @author Mike Alsup   (http://jquery.malsup.com/corner/)
+ */
+;(function($) { 
+
+var ua = navigator.userAgent;
+var moz = $.browser.mozilla && /gecko/i.test(ua);
+var webkit = $.browser.safari && /Safari\/[5-9]/.test(ua);
+
+var expr = $.browser.msie && (function() {
+    var div = document.createElement('div');
+    try { div.style.setExpression('width','0+0'); div.style.removeExpression('width'); }
+    catch(e) { return false; }
+    return true;
+})();
+    
+function sz(el, p) { 
+    return parseInt($.css(el,p))||0; 
+};
+function hex2(s) {
+    var s = parseInt(s).toString(16);
+    return ( s.length < 2 ) ? '0'+s : s;
+};
+function gpc(node) {
+    for ( ; node && node.nodeName.toLowerCase() != 'html'; node = node.parentNode ) {
+        var v = $.css(node,'backgroundColor');
+        if (v == 'rgba(0, 0, 0, 0)')
+            continue; // webkit
+        if (v.indexOf('rgb') >= 0) { 
+            var rgb = v.match(/\d+/g); 
+            return '#'+ hex2(rgb[0]) + hex2(rgb[1]) + hex2(rgb[2]);
+        }
+        if ( v && v != 'transparent' )
+            return v;
+    }
+    return '#ffffff';
+};
+
+function getWidth(fx, i, width) {
+    switch(fx) {
+    case 'round':  return Math.round(width*(1-Math.cos(Math.asin(i/width))));
+    case 'cool':   return Math.round(width*(1+Math.cos(Math.asin(i/width))));
+    case 'sharp':  return Math.round(width*(1-Math.cos(Math.acos(i/width))));
+    case 'bite':   return Math.round(width*(Math.cos(Math.asin((width-i-1)/width))));
+    case 'slide':  return Math.round(width*(Math.atan2(i,width/i)));
+    case 'jut':    return Math.round(width*(Math.atan2(width,(width-i-1))));
+    case 'curl':   return Math.round(width*(Math.atan(i)));
+    case 'tear':   return Math.round(width*(Math.cos(i)));
+    case 'wicked': return Math.round(width*(Math.tan(i)));
+    case 'long':   return Math.round(width*(Math.sqrt(i)));
+    case 'sculpt': return Math.round(width*(Math.log((width-i-1),width)));
+    case 'dog':    return (i&1) ? (i+1) : width;
+    case 'dog2':   return (i&2) ? (i+1) : width;
+    case 'dog3':   return (i&3) ? (i+1) : width;
+    case 'fray':   return (i%2)*width;
+    case 'notch':  return width; 
+    case 'bevel':  return i+1;
+    }
+};
+
+$.fn.corner = function(options) {
+    // in 1.3+ we can fix mistakes with the ready state
+	if (this.length == 0) {
+        if (!$.isReady && this.selector) {
+            var s = this.selector, c = this.context;
+            $(function() {
+                $(s,c).corner(options);
+            });
+        }
+        return this;
+	}
+
+    return this.each(function(index){
+		var $this = $(this);
+		var o = [ options || '', $this.attr($.fn.corner.defaults.metaAttr) || ''].join(' ').toLowerCase();
+		//var o = (options || $this.attr($.fn.corner.defaults.metaAttr) || '').toLowerCase();
+		var keep = /keep/.test(o);                       // keep borders?
+		var cc = ((o.match(/cc:(#[0-9a-f]+)/)||[])[1]);  // corner color
+		var sc = ((o.match(/sc:(#[0-9a-f]+)/)||[])[1]);  // strip color
+		var width = parseInt((o.match(/(\d+)px/)||[])[1]) || 10; // corner width
+		var re = /round|bevel|notch|bite|cool|sharp|slide|jut|curl|tear|fray|wicked|sculpt|long|dog3|dog2|dog/;
+		var fx = ((o.match(re)||['round'])[0]);
+		var edges = { T:0, B:1 };
+		var opts = {
+			TL:  /top|tl|left/.test(o),       TR:  /top|tr|right/.test(o),
+			BL:  /bottom|bl|left/.test(o),    BR:  /bottom|br|right/.test(o)
+		};
+		if ( !opts.TL && !opts.TR && !opts.BL && !opts.BR )
+			opts = { TL:1, TR:1, BL:1, BR:1 };
+			
+		// support native rounding
+		if ($.fn.corner.defaults.useNative && fx == 'round' && (moz || webkit) && !cc && !sc) {
+			if (opts.TL)
+				$this.css(moz ? '-moz-border-radius-topleft' : '-webkit-border-top-left-radius', width + 'px');
+			if (opts.TR)
+				$this.css(moz ? '-moz-border-radius-topright' : '-webkit-border-top-right-radius', width + 'px');
+			if (opts.BL)
+				$this.css(moz ? '-moz-border-radius-bottomleft' : '-webkit-border-bottom-left-radius', width + 'px');
+			if (opts.BR)
+				$this.css(moz ? '-moz-border-radius-bottomright' : '-webkit-border-bottom-right-radius', width + 'px');
+			return;
+		}
+			
+		var strip = document.createElement('div');
+		strip.style.overflow = 'hidden';
+		strip.style.height = '1px';
+		strip.style.backgroundColor = sc || 'transparent';
+		strip.style.borderStyle = 'solid';
+	
+        var pad = {
+            T: parseInt($.css(this,'paddingTop'))||0,     R: parseInt($.css(this,'paddingRight'))||0,
+            B: parseInt($.css(this,'paddingBottom'))||0,  L: parseInt($.css(this,'paddingLeft'))||0
+        };
+
+        if (typeof this.style.zoom != undefined) this.style.zoom = 1; // force 'hasLayout' in IE
+        if (!keep) this.style.border = 'none';
+        strip.style.borderColor = cc || gpc(this.parentNode);
+        var cssHeight = $.curCSS(this, 'height');
+
+        for (var j in edges) {
+            var bot = edges[j];
+            // only add stips if needed
+            if ((bot && (opts.BL || opts.BR)) || (!bot && (opts.TL || opts.TR))) {
+                strip.style.borderStyle = 'none '+(opts[j+'R']?'solid':'none')+' none '+(opts[j+'L']?'solid':'none');
+                var d = document.createElement('div');
+                $(d).addClass('jquery-corner');
+                var ds = d.style;
+
+                bot ? this.appendChild(d) : this.insertBefore(d, this.firstChild);
+
+                if (bot && cssHeight != 'auto') {
+                    if ($.css(this,'position') == 'static')
+                        this.style.position = 'relative';
+                    ds.position = 'absolute';
+                    ds.bottom = ds.left = ds.padding = ds.margin = '0';
+                    if (expr)
+                        ds.setExpression('width', 'this.parentNode.offsetWidth');
+                    else
+                        ds.width = '100%';
+                }
+                else if (!bot && $.browser.msie) {
+                    if ($.css(this,'position') == 'static')
+                        this.style.position = 'relative';
+                    ds.position = 'absolute';
+                    ds.top = ds.left = ds.right = ds.padding = ds.margin = '0';
+                    
+                    // fix ie6 problem when blocked element has a border width
+                    if (expr) {
+                        var bw = sz(this,'borderLeftWidth') + sz(this,'borderRightWidth');
+                        ds.setExpression('width', 'this.parentNode.offsetWidth - '+bw+'+ "px"');
+                    }
+                    else
+                        ds.width = '100%';
+                }
+                else {
+                	ds.position = 'relative';
+                    ds.margin = !bot ? '-'+pad.T+'px -'+pad.R+'px '+(pad.T-width)+'px -'+pad.L+'px' : 
+                                        (pad.B-width)+'px -'+pad.R+'px -'+pad.B+'px -'+pad.L+'px';                
+                }
+
+                for (var i=0; i < width; i++) {
+                    var w = Math.max(0,getWidth(fx,i, width));
+                    var e = strip.cloneNode(false);
+                    e.style.borderWidth = '0 '+(opts[j+'R']?w:0)+'px 0 '+(opts[j+'L']?w:0)+'px';
+                    bot ? d.appendChild(e) : d.insertBefore(e, d.firstChild);
+                }
+            }
+        }
+    });
+};
+
+$.fn.uncorner = function() { 
+	if (moz || webkit)
+		this.css(moz ? '-moz-border-radius' : '-webkit-border-radius', 0);
+	$('div.jquery-corner', this).remove();
+	return this;
+};
+
+// expose options
+$.fn.corner.defaults = {
+	useNative: true, // true if plugin should attempt to use native browser support for border radius rounding
+	metaAttr:  'data-corner' // name of meta attribute to use for options
+};
+    
+})(jQuery);