w2tags 0.9.57 → 0.9.58

data/Manifest.txt

@@ -28,19 +28,20 @@ lib/w2tags/try/public/css
 lib/w2tags/try/public/img
 lib/w2tags/try/public/javascripts
 lib/w2tags/try/public/js
+lib/w2tags/try/public/skyeight.jpeg
+lib/w2tags/try/public/stylesheets
 lib/w2tags/try/public/w2
 lib/w2tags/try/public/css/csscolors.css
-lib/w2tags/try/public/css/jquery.cluetip.css
 lib/w2tags/try/public/css/jscolors.css
 lib/w2tags/try/public/css/rubycolors.css
 lib/w2tags/try/public/css/xmlcolors.css
 lib/w2tags/try/public/img/loading.gif
+lib/w2tags/try/public/javascripts/jquery.cluetip.js
 lib/w2tags/try/public/javascripts/jquery.js
+lib/w2tags/try/public/javascripts/jquery.live.accordion.js
 lib/w2tags/try/public/js/codemirror.js
 lib/w2tags/try/public/js/editor.js
 lib/w2tags/try/public/js/highlight.js
-lib/w2tags/try/public/js/jquery.cluetip.js
-lib/w2tags/try/public/js/jquery.js
 lib/w2tags/try/public/js/mirrorframe.js
 lib/w2tags/try/public/js/parsecss.js
 lib/w2tags/try/public/js/parsehtmlmixed.js
@@ -53,12 +54,24 @@ lib/w2tags/try/public/js/tokenize.js
 lib/w2tags/try/public/js/tokenizejavascript.js
 lib/w2tags/try/public/js/undo.js
 lib/w2tags/try/public/js/util.js
+lib/w2tags/try/public/stylesheets/back
+lib/w2tags/try/public/stylesheets/icons
+lib/w2tags/try/public/stylesheets/jquery.cluetip.css
+lib/w2tags/try/public/stylesheets/jquery.live.accordion.css
+lib/w2tags/try/public/stylesheets/back/back_menu.gif
+lib/w2tags/try/public/stylesheets/icons/folder-closed.gif
+lib/w2tags/try/public/stylesheets/icons/folder-open.gif
+lib/w2tags/try/public/stylesheets/icons/leaf.gif
 lib/w2tags/try/public/w2/basic.w2erb
 lib/w2tags/try/public/w2/basic1.w2erb
 lib/w2tags/try/public/w2/basic2.w2erb
 lib/w2tags/try/public/w2/basic3.w2erb
 lib/w2tags/try/public/w2/basic4.w2erb
+lib/w2tags/try/public/w2/checkbox.w2erb
+lib/w2tags/try/public/w2/check_onhot.w2erb
 lib/w2tags/try/public/w2/combobox.w2erb
+lib/w2tags/try/public/w2/combo_onhot.w2erb
+lib/w2tags/try/public/w2/demo.hot.html
 lib/w2tags/try/public/w2/diet.w2erb
 lib/w2tags/try/public/w2/diet1.w2erb
 lib/w2tags/try/public/w2/each.w2erb
@@ -70,17 +83,23 @@ lib/w2tags/try/public/w2/if.w2erb
 lib/w2tags/try/public/w2/layout.w2erb
 lib/w2tags/try/public/w2/layout1.w2erb
 lib/w2tags/try/public/w2/layout2.w2erb
+lib/w2tags/try/public/w2/navigation.w2erb
 lib/w2tags/try/public/w2/nestli.w2erb
 lib/w2tags/try/public/w2/params.erb
 lib/w2tags/try/public/w2/params.w2erb
 lib/w2tags/try/public/w2/popup.w2erb
 lib/w2tags/try/public/w2/popup2.w2erb
 lib/w2tags/try/public/w2/rails.hot.html
+lib/w2tags/try/public/w2/table_each2.w2erb
+lib/w2tags/try/public/w2/table_onhot.w2erb
+lib/w2tags/try/public/w2/table_simple.w2erb
 lib/w2tags/try/public/w2/try.rb.hot.html
 lib/w2tags/try/public/w2/upload.w2erb
+lib/w2tags/try/public/w2/vcard.w2erb
 lib/w2tags/try/views/index.erb
 lib/w2tags/try/views/layout.erb
 lib/w2tags/try/views/parse.erb
+hot/demo.hot
 hot/erb.hot
 hot/erb_base.hot
 hot/erb_form.hot

data/hot/demo.hot

@@ -0,0 +1,30 @@
+>>_nav
+ %ul$#
+   -itm$. $*
+
+>>_itm
+%li$. <a href="#">$0</a>
+ 
+>>_hdr
+%tr
+  ^ $*
+
+>>_dtl
+-each @recs;r
+  %tr
+    ^= $*
+    
+>>_select
+%select$$
+  -each @*.;r
+    ^{value="=$1"}= $2
+
+>>_check
+%label{for="*#"}
+  %input$#{type="checkbox"}
+  $0
+
+>>_area
+%label{for="*#"} $0<
+  %textarea$$
+

data/lib/w2tags/parser.rb

@@ -702,9 +702,7 @@ module W2Tags
               if @doc_out[-1] and @doc_out[-1].strip=='<% end %>'
                  @doc_out.pop if %w[else elsif].include? prms.split(' ')[0]
               end
-              while prms[-1,1]=='\\' do #concenation line if params end with \
-                prms.gsub!(/\\$/,'') << @doc_src.shift.strip
-              end
+              params_inline prms #concenation line if params end with \
               @mem_var["$tag"] = @key
               if @tg_hot[@key]
                 hots = @tg_hot[@key] 
@@ -867,7 +865,8 @@ module W2Tags
           opt=''
           @mem_hot=nil
         end
-        
+        params_inline prms #concenation line if params end with \
+
         @new = @mem_tag[keys].split(' ')
         @new[0] << tmp
         @new = @new.join(" ") << "\n"
@@ -951,6 +950,7 @@ module W2Tags
           p "W2Tag: try closing tag by indentation..." if @dbg[:parse]
           return true
         else
+          params_inline @txt #concenation line if params end with \
           @mem_var["$tag"] = @key
           nameidclass_var()
           srcs = @rgx.to_s.gsub!(/^[ \t]*/,'')
@@ -989,5 +989,12 @@ module W2Tags
       end
       @rgx
     end
+    
+    #concenation line if params end with \
+    def params_inline prms
+      while prms[-1,1]=='\\' do 
+        prms.gsub!(/\\$/,'') << @doc_src.shift.strip
+      end
+    end
   end  
 end

data/lib/w2tags/try/public/javascripts/jquery.live.accordion.js

@@ -0,0 +1,19 @@
+(function($){
+ $(function(){
+	//HIDE THE DIVS ON PAGE LOAD	
+	$("div.accordionContent").hide();
+  $("#wrapper div.accordionContent>a").prepend('<img src="/stylesheets/icons/leaf.gif"/>');
+
+	//ACCORDION BUTTON ACTION	
+	$('div.accordionButton').live('click',function() {
+    var prn = $(this).parent();
+    prn.find('>div.accordionContent').slideUp('normal');
+    prn.find('>div.accordionButton.open').removeClass('open');
+		$(this).addClass('open').next().slideDown('normal');
+	});
+ });
+ $(function(){
+  $('#wrapper>.accordionButton:eq(2)').click();
+  $('#wrapper>.accordionContent').find('.accordionButton:eq(0)').click();
+ });
+})(jQuery);

data/lib/w2tags/try/public/stylesheets/jquery.live.accordion.css

@@ -0,0 +1,52 @@
+body, p, ol, ul, td, tr {
+  font-family:arial,verdana,helvetica,sans-serif;
+  font-size:12px;}
+
+a {
+  color:#566CA5;
+  text-decoration:none;}
+
+img {
+  border:medium none;}
+
+#wrapper {
+	width: 200px;
+  overflow:hidden;
+  background-color:#DDDDFF;}
+ 
+.accordionContent {	
+  padding-left:8px;}
+  
+.accordionContent>a{
+  display:block;}
+  
+.accordionContent>a:hover{
+  background-color:#FFECEC;}
+ 
+#wrapper>.accordionButton {	
+	width:199px;
+  height:19px;
+  font-weight:bold;
+  padding:5px;
+  background-image:url(back/back_menu.gif);
+  background-position: 0px -3px; 
+	cursor: pointer;}
+ 
+#wrapper>.accordionContent {	
+	width: 210px;
+	display: none;}
+  
+#wrapper>.accordionContent>.accordionButton {	
+  font-family:arial,verdana,helvetica,sans-serif;
+  font-size:11px;
+  font-weight:bold;
+  height:15px;
+  background-repeat:no-repeat;
+  padding:2px 0 0 18px;
+	cursor: pointer;}
+  
+#wrapper>.accordionContent>.accordionButton {	
+  background-image:url("icons/folder-closed.gif");}
+  
+#wrapper>.accordionContent>.accordionButton.open {	
+  background-image:url("icons/folder-open.gif");}

data/lib/w2tags/try/public/w2/check_onhot.w2erb

@@ -0,0 +1,10 @@
+!hot!demo
+%fieldset
+  %legend Which of the following sports do you enjoy?
+  -check#football   Football
+  -check#golf       Golf
+  -check#rugby      Rugby
+  -check#tennis     Tennis
+  -check#basketball Basketball
+  -check#boxing     Boxing
+  -area#comments{rows="7" cols="25"} Comments

data/lib/w2tags/try/public/w2/checkbox.w2erb

@@ -0,0 +1,22 @@
+%fieldset
+  %legend Which of the following sports do you enjoy?
+  %label{for="football"}
+    %input#football{type="checkbox"}
+    Football
+  %label{for="golf"}
+    %input#golf{type="checkbox"}
+    Golf
+  %label{for="rugby"}
+    %input#rugby{type="checkbox"}
+    Rugby
+  %label{for="tennis"}
+    %input#tennis{type="checkbox"}
+    Tennis
+  %label{for="basketball"}
+    %input#basketball{type="checkbox"}
+    Basketball
+  %label{for="boxing"}
+    %input#boxing{type="checkbox"}
+    Boxing
+  %label{for="comments"} Comments<
+    %textarea#comments{rows="7" cols="25"}

data/lib/w2tags/try/public/w2/combo_onhot.w2erb

@@ -0,0 +1,3 @@
+!hot!demo
+-select.country r[:ctr_id];r[:ctr_name]
+-select.region  r[:reg_id];r[:reg_name]

data/lib/w2tags/try/public/w2/combobox.w2erb

@@ -1,11 +1,3 @@
-!H!_td_cmbx
- %td
-  %select$$
-    %option{value=""} --Please select--
-    -each @$0;r
-      %option{value="<%=r[:$1] %>"}= r[:$2]
-
-%table
-  %tr
-    -td_cmbx.count  country;ctr_id;ctr_name
-    -td_cmbx.cities city;cty_id;cty_name
+%select.region
+  -each @region;r
+    ^{value="<%=r[:reg_id] %>"}= r[:reg_name]

data/lib/w2tags/try/public/w2/demo.hot.html

@@ -0,0 +1,73 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+<META http-equiv=Content-Type content="text/html; charset=windows-1252">
+<title>Exported from Notepad++</title>
+<style type="text/css">
+body{margin:0;} 
+span {
+	font-family: 'Inconsolata';
+	font-size: 10pt;
+	color: #FFFFFF;
+}
+.sc0 {
+}
+.sc4 {
+	color: #FF0000;
+}
+.sc5 {
+	font-size: 11pt;
+	font-weight: bold;
+	text-decoration: underline;
+	color: #FF8040;
+}
+.sc6 {
+	font-size: 9pt;
+	font-weight: bold;
+	text-decoration: underline;
+	color: #FFFF00;
+}
+.sc7 {
+	color: #FFFF00;
+}
+.sc10 {
+	font-weight: bold;
+	color: #80FFFF;
+}
+.sc11 {
+}
+</style>
+</head>
+<body>
+<div style="width:600px;height:535px;overflow:auto;float: left; white-space: pre; line-height: 1; background: #000000; "><span class="sc5">&gt;&gt;_nav</span><span class="sc0">
+ </span><span class="sc6">%ul</span><span class="sc10">$#</span><span class="sc0">
+   </span><span class="sc6">-itm</span><span class="sc10">$.</span><span class="sc0"> </span><span class="sc10">$*</span><span class="sc0">
+
+</span><span class="sc5">&gt;&gt;_itm</span><span class="sc0">
+</span><span class="sc6">%li</span><span class="sc10">$.</span><span class="sc0"> </span><span class="sc11">&lt;a</span><span class="sc0"> </span><span class="sc7">href</span><span class="sc10">=</span><span class="sc11">"</span><span class="sc10">#</span><span class="sc11">"&gt;</span><span class="sc10">$</span><span class="sc4">0</span><span class="sc11">&lt;/a&gt;</span><span class="sc0">
+ 
+</span><span class="sc5">&gt;&gt;_hdr</span><span class="sc0">
+</span><span class="sc6">%tr</span><span class="sc0">
+  </span><span class="sc10">^</span><span class="sc0"> </span><span class="sc10">$*</span><span class="sc0">
+
+</span><span class="sc5">&gt;&gt;_dtl</span><span class="sc0">
+</span><span class="sc6">-each</span><span class="sc0"> </span><span class="sc11">@recs</span><span class="sc10">;</span><span class="sc11">r</span><span class="sc0">
+  </span><span class="sc6">%tr</span><span class="sc0">
+    </span><span class="sc10">^=</span><span class="sc0"> </span><span class="sc10">$*</span><span class="sc0">
+    
+</span><span class="sc5">&gt;&gt;_select</span><span class="sc0">
+</span><span class="sc6">%select</span><span class="sc10">$$</span><span class="sc0">
+  </span><span class="sc6">-each</span><span class="sc0"> </span><span class="sc11">@</span><span class="sc10">*.;</span><span class="sc11">r</span><span class="sc0">
+    </span><span class="sc10">^{</span><span class="sc7">value</span><span class="sc10">=</span><span class="sc11">"</span><span class="sc10">=$</span><span class="sc4">1</span><span class="sc11">"</span><span class="sc10">}=</span><span class="sc0"> </span><span class="sc10">$</span><span class="sc4">2</span><span class="sc0">
+
+</span><span class="sc5">&gt;&gt;_check</span><span class="sc0">
+</span><span class="sc6">%label</span><span class="sc10">{</span><span class="sc11">for</span><span class="sc10">=</span><span class="sc11">"</span><span class="sc10">*#</span><span class="sc11">"</span><span class="sc10">}</span><span class="sc0">
+  </span><span class="sc6">%input</span><span class="sc10">$#{</span><span class="sc7">type</span><span class="sc10">=</span><span class="sc11">"checkbox"</span><span class="sc10">}</span><span class="sc0">
+  </span><span class="sc10">$</span><span class="sc4">0</span><span class="sc0">
+
+</span><span class="sc5">&gt;&gt;_area</span><span class="sc0">
+</span><span class="sc6">%label</span><span class="sc10">{</span><span class="sc11">for</span><span class="sc10">=</span><span class="sc11">"</span><span class="sc10">*#</span><span class="sc11">"</span><span class="sc10">}</span><span class="sc0"> </span><span class="sc10">$</span><span class="sc4">0</span><span class="sc11">&lt;</span><span class="sc0">
+  </span><span class="sc6">%textarea</span><span class="sc10">$$</span><span class="sc0">
+
+</span></div></body>
+</html>

data/lib/w2tags/try/public/w2/erb_base.hot.html

@@ -4,9 +4,10 @@
 <META http-equiv=Content-Type content="text/html; charset=windows-1252">
 <title>Exported from Notepad++</title>
 <style type="text/css">
+body{margin:0;} 
 span {
-	font-family: 'Consolas';
-	font-size: 8pt;
+	font-family: 'Inconsolata';
+	font-size: 10pt;
 	color: #FFFFFF;
 }
 .sc0 {
@@ -45,7 +46,7 @@ span {
 </style>
 </head>
 <body>
-<div style="float: left; white-space: pre; line-height: 1; background: #000000; "><span class="sc5">&gt;&gt;_if</span><span class="sc0">
+<div style="width:600px;height:535px;overflow:auto;float: left; white-space: pre; line-height: 1; background: #000000; "><span class="sc5">&gt;&gt;_if</span><span class="sc0">
 </span><span class="sc6">-</span><span class="sc0"> </span><span class="sc11">if</span><span class="sc0"> </span><span class="sc10">$</span><span class="sc4">0</span><span class="sc0">
 </span><span class="sc6">-end</span><span class="sc0">
 

data/lib/w2tags/try/public/w2/erb_rails.hot.html

@@ -4,6 +4,7 @@
 <META http-equiv=Content-Type content="text/html; charset=windows-1252">
 <title>Exported from Notepad++</title>
 <style type="text/css">
+body{margin:0;} 
 span {
 	font-family: 'Consolas';
 	font-size: 8pt;
@@ -38,7 +39,7 @@ span {
 </style>
 </head>
 <body>
-<div style="float: left; white-space: pre; line-height: 1; background: #000000; "><span class="sc5">&gt;&gt;_js</span><span class="sc0">
+<div style="width:600px;height:535px;float: left; white-space: pre; line-height: 1; background: #000000; "><span class="sc5">&gt;&gt;_js</span><span class="sc0">
 </span><span class="sc6">%js</span><span class="sc0"> </span><span class="sc11">/javascripts/</span><span class="sc10">$</span><span class="sc4">0</span><span class="sc0">
 
 </span><span class="sc5">&gt;&gt;_css</span><span class="sc0">

data/lib/w2tags/try/public/w2/html.hot.html

@@ -4,7 +4,7 @@
 <META http-equiv=Content-Type content="text/html; charset=windows-1252">
 <title>Exported from Notepad++</title>
 <style type="text/css">
-body{margin:2px 0 0 0;}
+body{margin:0;}
 span {
 	font-family: 'Consolas';
 	font-size: 8pt;

data/lib/w2tags/try/public/w2/navigation.w2erb

@@ -0,0 +1,2 @@
+!hot!demo
+-nav#navi.items Home;About;Client;Contact Us

data/lib/w2tags/try/public/w2/rails.hot.html

@@ -4,6 +4,7 @@
 <META http-equiv=Content-Type content="text/html; charset=windows-1252">
 <title>Exported from Notepad++</title>
 <style type="text/css">
+body{margin:0;} 
 span {
 	font-family: 'Consolas';
 	font-size: 8pt;
@@ -26,7 +27,7 @@ span {
 </style>
 </head>
 <body>
-<div style="float: left; white-space: pre; line-height: 1; background: #000000; "><span class="sc5">&gt;&gt;initialize</span><span class="sc0">
+<div style="width:600px;height:535px;float: left; white-space: pre; line-height: 1; background: #000000; "><span class="sc5">&gt;&gt;initialize</span><span class="sc0">
 </span><span class="sc11">!hot!html</span><span class="sc0">
 </span><span class="sc11">!hot!erb_base</span><span class="sc0">
 </span><span class="sc11">!hot!erb_rails</span><span class="sc0">

data/lib/w2tags/try/public/w2/table_each2.w2erb

@@ -0,0 +1,12 @@
+%table
+  %tr
+    ^ No;\
+      Name;\
+      Address;\
+      Phone
+ -each2 @recs;r,i
+  %tr
+    ^= i+1;\
+       r[:name];\
+       r[:address];\
+       r[:phone]

data/lib/w2tags/try/public/w2/table_onhot.w2erb

@@ -0,0 +1,10 @@
+!hot!demo
+%table
+ -hdr Id;\
+      Name;\
+      Address;\
+      Phone
+ -dtl r[:id];\
+      r[:name];\
+      r[:address];\
+      r[:phone]

data/lib/w2tags/try/public/w2/table_simple.w2erb

@@ -0,0 +1,9 @@
+%table
+  %tr
+    ^ Id;Name;Address;Phone
+ -each @recs;r
+  %tr
+    ^= r[:id];\
+       r[:name];\
+       r[:address];\
+       r[:phone]

data/lib/w2tags/try/public/w2/try.rb.hot.html

@@ -4,6 +4,7 @@
 <META http-equiv=Content-Type content="text/html; charset=windows-1252">
 <title>Exported from Notepad++</title>
 <style type="text/css">
+body{margin:0;} 
 span {
 	font-family: 'Consolas';
 	font-size: 8pt;
@@ -34,7 +35,7 @@ span {
 </style>
 </head>
 <body>
-<div style="float: left; white-space: pre; line-height: 1; background: #000000; "><span class="sc11">require</span><span class="sc0"> </span><span class="sc7">'sinatra'</span><span class="sc0">
+<div style="width:600px;height:535px;overflow:auto;float: left; white-space: pre; line-height: 1; background: #000000; "><span class="sc11">require</span><span class="sc0"> </span><span class="sc7">'sinatra'</span><span class="sc0">
 
 </span><span class="sc11">W2</span><span class="sc0"> </span><span class="sc10">=</span><span class="sc0"> </span><span class="sc11">W2Tags</span><span class="sc10">::</span><span class="sc11">Parser</span><span class="sc10">.</span><span class="sc11">new</span><span class="sc10">(</span><span class="sc7">'rails'</span><span class="sc10">)</span><span class="sc0">
 

data/lib/w2tags/try/public/w2/vcard.w2erb

@@ -0,0 +1,9 @@
+.vcard
+ .fn Company Name
+ %a.org.url{href="http://www.domain.com"}/
+ %span.adr
+   %span.street-address 1 Main Road
+   %span.type.hide Work
+   %span.locality Town or City
+   %span.region Region or Country
+   %span.postal-code Postal or ZIP code

data/lib/w2tags/try/try.rb

@@ -1,4 +1,5 @@
 require 'sinatra'
+#require 'w2tags/sinatra_hook'
 
 W2 = W2Tags::Parser.new('rails')