hobo 0.6.4 → 0.7.0

data/hobo_files/plugin/generators/hobo_rapid/templates/themes/clean/views/application.dryml

@@ -0,0 +1,10 @@
+<def tag="page" extend-with="theme">
+  <page-without-theme merge>
+    <stylesheets: param>
+      <stylesheet name="reset"/>
+      <theme-stylesheet/>
+      <theme-stylesheet name="rapid-ui"/>
+      <stylesheet name="application"/>
+    </stylesheets>
+  </page-without-theme>
+</def>  

data/hobo_files/plugin/generators/hobo_rapid/templates/themes/default/public/stylesheets/application.css

@@ -16,18 +16,18 @@ a img { border: none; }
 
 .clearer { clear:both; font-size: 1px; }
 
-body { margin: 10px 0 25px 0; background-color: #d2d2d2; }
+html, body { background-color: #d2d2d2; }
+body { margin: 10px 0 25px 0; }
 
 a { color: #677077; text-decoration: underline; padding:1px; cursor:pointer; }
 a:visited { color: #677077; }
 a:hover, a:active { color: #FFFFFF; text-decoration: none; background: #4b5257; }
-a:hover.no_hover { background: transparent; }
+a:hover.no-hover { background: transparent; }
 
-.front_page_title {
-    margin: 20px 0 15px 6px;
+.content-header h1 {
+		margin: 0; margin-bottom: 15px;
     background:url(../images/banner.gif) no-repeat top left;
     text-align: left;
-    padding-left: 20px;
     height: 32px;
     font-size: 28pt;
     padding: 65px 0 15px 20px;
@@ -37,10 +37,10 @@ a:hover.no_hover { background: transparent; }
 
 /* Main Page Body Window */
 
-#header .logo { position: absolute; top: 15px; left: 20px; }
-#header .logo a { background: transparent; }
+.page-header .logo { position: absolute; top: 15px; left: 20px; }
+.page-header .logo a { background: transparent; }
 
-#header { 
+.page-header { 
     position: relative;
     height: 80px;
 }
@@ -50,16 +50,16 @@ a:hover.no_hover { background: transparent; }
 }
 
 .nav ul { margin: 0; padding: 0; float: right; }
-ul.account_nav { font-size: 80%; clear:right; }
+ul.account-nav { font-size: 80%; clear:right; padding-top: 8px; }
 
-.nav li { list-style: none; margin: 0; padding: 0; float: left; padding: 5px; font-size: 130%; }
+.nav li { list-style: none; float: left; margin: 0; padding: 0; padding-left: 10px; font-size: 110%; }
 .nav a { text-decoration: none;}
 
-.main_nav li { text-transform: uppercase; }
+.main-nav li { text-transform: uppercase; }
 
 .flash { margin: 10px 30px; background: white; border: 2px solid #aaf; padding: 10px; text-align: center; }
 
-.page_wrapper  {
+.page-wrapper  {
     width:800px;
     background-color: white;
     margin-left:auto;
@@ -71,28 +71,28 @@ h1 { margin: 20px 0 20px 20px; font-size: 150%; } /* Main page heading (i.e. not
 
 p { margin-left: 10px; }
 
-#page_top { background:url(../images/bkg_shadow_top.gif) repeat-x top; }
-#page_right { background:url(../images/bkg_shadow_right.gif) repeat-y right; }
-#page_bottom { background:url(../images/bkg_shadow_bottom.gif) repeat-x bottom; }
-#page_left { background:url(../images/bkg_shadow_left.gif) repeat-y left; }
-#page_corner04 { background:url(../images/bkg_corner_04.gif) no-repeat bottom right; }
-#page_corner03 { background:url(../images/bkg_corner_03.gif) no-repeat bottom left; }
-#page_corner02 { background:url(../images/bkg_corner_02.gif) no-repeat top right; }
-#page_corner01 { background:url(../images/bkg_corner_01.gif) no-repeat top left; padding: 5px 0 10px 0; }
-#page_inner_top { background:url(../images/bkg_bodytop.gif) no-repeat top center;
+#page-top { background:url(../images/bkg-shadow-top.gif) repeat-x top; }
+#page-right { background:url(../images/bkg-shadow-right.gif) repeat-y right; }
+#page-bottom { background:url(../images/bkg-shadow-bottom.gif) repeat-x bottom; }
+#page-left { background:url(../images/bkg-shadow-left.gif) repeat-y left; }
+#page-corner04 { background:url(../images/bkg-corner-04.gif) no-repeat bottom right; }
+#page-corner03 { background:url(../images/bkg-corner-03.gif) no-repeat bottom left; }
+#page-corner02 { background:url(../images/bkg-corner-02.gif) no-repeat top right; }
+#page-corner01 { background:url(../images/bkg-corner-01.gif) no-repeat top left; padding: 5px 0 10px 0; }
+#page-inner-top { background:url(../images/bkg-bodytop.gif) no-repeat top center;
     margin: 22px 14px 10px; padding: 1px 10px; }
 
 
 /* Panel Styles */
 
-.panel_top { background:url(../images/window_shadow_top.gif) repeat-x top; height:100%; }
-.panel_right { background:url(../images/window_shadow_right.gif) repeat-y right; height:100%; }
-.panel_bottom { background:url(../images/window_shadow_bottom.gif) repeat-x bottom; height:100%; }
-.panel_left { background:url(../images/window_shadow_left.gif) repeat-y left; height:100%; }
-.panel_corner04 { background:url(../images/window_corner_04.gif) no-repeat bottom right; height:100%; }
-.panel_corner03 { background:url(../images/window_corner_03.gif) no-repeat bottom left; height:100%; }
-.panel_corner02 { background:url(../images/window_corner_02.gif) no-repeat top right; height:100%; }
-.panel_corner01 { background:url(../images/window_corner_01.gif) no-repeat top left; padding:12px; height:100%; }
+.panel-top { background:url(../images/window-shadow-top.gif) repeat-x top; height:100%; }
+.panel-right { background:url(../images/window-shadow-right.gif) repeat-y right; height:100%; }
+.panel-bottom { background:url(../images/window-shadow-bottom.gif) repeat-x bottom; height:100%; }
+.panel-left { background:url(../images/window-shadow-left.gif) repeat-y left; height:100%; }
+.panel-corner04 { background:url(../images/window-corner-04.gif) no-repeat bottom right; height:100%; }
+.panel-corner03 { background:url(../images/window-corner-03.gif) no-repeat bottom left; height:100%; }
+.panel-corner02 { background:url(../images/window-corner-02.gif) no-repeat top right; height:100%; }
+.panel-corner01 { background:url(../images/window-corner-01.gif) no-repeat top left; padding:12px; height:100%; }
 
 .panel { margin: 4px 0; }
 
@@ -105,23 +105,23 @@ p { margin-left: 10px; }
 .panel h4 { line-height:13px; font-weight:bold; color:#666; margin: 8px 0 2px 0; font-size: 100%; }
 
 .panel.green { background-color:#edf4e3; } /* light grey + green */
-.panel.green  h2 { background:url(../images/header_green.gif) repeat-x top; background-color:#87b841; color:#ffffff; }
+.panel.green  h2 { background:url(../images/header-green.gif) repeat-x top; background-color:#87b841; color:#ffffff; }
 .panel.green  h3 { color:#87b841; }
 
 .panel.purple { background-color:#f1f0f1; } /* very light grey */
-.panel.purple h2 { background:url(../images/header_purple.gif) repeat-x top; background-color:#883b67; color:#ffffff; }
+.panel.purple h2 { background:url(../images/header-purple.gif) repeat-x top; background-color:#883b67; color:#ffffff; }
 .panel.purple h3 { color:#883b67; }
 
 .panel.red { background-color:#fdf3f3; } /* very light red */
-.panel.red h2 { background:url(../images/header_red.gif) repeat-x top; background-color:#d93a40; color:#ffffff; }
+.panel.red h2 { background:url(../images/header-red.gif) repeat-x top; background-color:#d93a40; color:#ffffff; }
 .panel.red h3 { color:#d93a40; }
 
 .panel.blue { background-color:#e1f5fd; } /* light blue */
-.panel.blue h2 { background:url(../images/header_blue.gif) repeat-x top; background-color:#5ac6ef; color:#ffffff; }
+.panel.blue h2 { background:url(../images/header-blue.gif) repeat-x top; background-color:#5ac6ef; color:#ffffff; }
 .panel.blue h3 { color:#5ac6ef; }
 
 .panel.dblue { background-color:#f1f4fa; } /* very light blue */
-.panel.dblue h2 { background:url(../images/header_dblue.gif) repeat-x top; background-color:#3873e2; color:#ffffff; }
+.panel.dblue h2 { background:url(../images/header-dblue.gif) repeat-x top; background-color:#3873e2; color:#ffffff; }
 .panel.dblue h3 { color:#3873e2; }
 
 .panel.blank h2 { background-color:#f2f2f2; padding:40px 30px 25px 30px;}
@@ -130,7 +130,7 @@ p { margin-left: 10px; }
 
 /* panel with no colour-class defaults to red */
 .panel { background-color:#fdf3f3; } /* very light red */
-.panel h2 { background:url(../images/header_red.gif) repeat-x top; background-color:#d93a40; color:#ffffff; }
+.panel h2 { background:url(../images/header-red.gif) repeat-x top; background-color:#d93a40; color:#ffffff; }
 .panel h3 { color:#d93a40; }
 
 
@@ -138,12 +138,12 @@ p { margin-left: 10px; }
 
 .panel li { margin: 6pt 0; }
 
-.section { border-top: 6px solid white; padding: 5px 20px 5px 6px; }
+.section { border-top: 6px solid white; }
 
-ul.purple li { background-image: url(../images/txt_list_img_purple.gif); }
-ul.green li { background-image: url(../images/txt_list_img_green.gif); }
-ul.red li { background-image: url(../images/txt_list_img_red.gif); }
-ul.dblue li { background-image: url(../images/txt_list_img_dblue.gif); }
+ul.purple li { background-image: url(../images/txt-list-img-purple.gif); }
+ul.green li { background-image: url(../images/txt-list-img-green.gif); }
+ul.red li { background-image: url(../images/txt-list-img-red.gif); }
+ul.dblue li { background-image: url(../images/txt-list-img-dblue.gif); }
 
 /* main section and sidebar */
 
@@ -154,10 +154,10 @@ ul.dblue li { background-image: url(../images/txt_list_img_dblue.gif); }
 
 /* Nav Styles */
 
-.nav_menu a { margin: 4px 0 0 8px; }
+.nav-menu a { margin: 4px 0 0 8px; }
 .more { text-align:right; margin-top:6px; margin-right: -6px;} /* more button */
-img.nav_main { padding: 1px 0 2px 0; border-top: 1px solid transparent; border-bottom: 1px solid transparent; }
-img.nav_main.current { border-top: 1px solid grey; border-bottom: 1px solid grey; }
+img.nav-main { padding: 1px 0 2px 0; border-top: 1px solid transparent; border-bottom: 1px solid transparent; }
+img.nav-main.current { border-top: 1px solid grey; border-bottom: 1px solid grey; }
 
 /* Footer */
 
@@ -170,7 +170,7 @@ img.nav_main.current { border-top: 1px solid grey; border-bottom: 1px solid grey
 }
 
 
-#ajax_progress {
+#ajax-progress {
     color: grey;
     float: right;
     margin: 20px;
@@ -180,14 +180,14 @@ img.nav_main.current { border-top: 1px solid grey; border-bottom: 1px solid grey
     display: none;
 }
 
-#ajax_progress div {
+#ajax-progress div {
     border: 1px dashed grey;
     margin: 10px;
     padding: 3px;
     padding-top: -15px;
 }
 
-#ajax_progress img {
+#ajax-progress img {
     padding-left: 6px;
     vertical-align: middle;
 }
@@ -195,7 +195,7 @@ img.nav_main.current { border-top: 1px solid grey; border-bottom: 1px solid grey
 
 /* Scriptaculous Autocompleter ---*/
 
-div.completions_popup {
+div.completions-popup {
     position:absolute;
     width:250px;
     background-color:white;
@@ -203,13 +203,13 @@ div.completions_popup {
     margin:0px;
     padding:0px;
 }
-div.completions_popup ul {
+div.completions-popup ul {
     list-style-type:none;
     margin:0px;
     padding:0px;
 }
-div.completions_popup ul li.selected { background-color: #ffb;}
-div.completions_popup ul li {
+div.completions-popup ul li.selected { background-color: #ffb;}
+div.completions-popup ul li {
     list-style-type:none;
     display:block;
     margin:0;
@@ -219,22 +219,22 @@ div.completions_popup ul li {
 
 th { text-align: left; padding: 5px; }
 
-.field_list { width:95%; }
-.field_list td { padding: 5px; vertical-align: middle; }
-.field_list th {
+.field-list { width:95%; }
+.field-list td { padding: 5px; vertical-align: middle; }
+.field-list th {
     text-align: left; width: 1px; white-space: nowrap; vertical-align: top;
     padding-top: 10px; padding-bottom: 10px;
 }
-.field_list input[type=text] { width: 100%; }
-.field_list input, .field_list textarea { margin: -2px 0 0 0; }
-.field_list textarea { width: 100%; margin: 0; }
+.field-list input[type=text] { width: 100%; }
+.field-list input, .field-list textarea { margin: -2px 0 0 0; }
+.field-list textarea { width: 100%; margin: 0; }
 
-td span.in_place_textfield_bhv, td span.in_place_textarea_bhv, td span.in_place_html_textarea_bhv {
+td span.in-place-textfield-bhv, td span.in-place-textarea-bhv, td span.in-place-html-textarea-bhv {
     display: block; border: 1px solid #ddd;
     padding: 4px; background: #fafafa;
 }
 
-.login_table td.field_label { vertical-align: middle; }
+.login-table td.field-label { vertical-align: middle; }
 
 input[type=text].wide { width: 100%; }
 textarea { height: 200px; }
@@ -245,7 +245,7 @@ textarea.tall { height: 350px; }
 
 /* MESSY LOAD OF JUNK BELOW HERE---------------------------------------- */
 
-input.button_input {
+input.button {
     border: 1px solid black;
     border-top-color: #fff;
     border-left-color: #fff;
@@ -255,32 +255,32 @@ input.button_input {
     padding: 2px; 
 }
 
-input.button_input.text {
+input.button.text {
     background: transparent; border: none;
     padding: 0 0 0 0; margin: -2px 0 0 0;
     color: #677077; text-decoration: underline; cursor:pointer;
 }
 
-input.image_button_input {
+input.image-button-input {
     border: none;
     background: transparent;
     padding: 0; margin: 0;
 }
 
-input.create_button {
+input.create-button {
     padding-left: 20px;
     background:url(../../../images/plus.png) no-repeat center left;
     background-color: #e5e5e5;
 }
     
 
-.search_result { border: 1px dashed grey; margin: 15px 10px; padding: 5px; background: white; }
+.search-result { border: 1px dashed grey; margin: 15px 10px; padding: 5px; background: white; }
 
 .inplaceeditor-form { display: inline; margin: 0; padding: 0; }
 
 td { vertical-align: top; padding: 5px; }
 
-.edit_box { border-top: 1px dashed black; border-bottom: 1px dashed black; margin: 10px; }
+.edit-box { border-top: 1px dashed black; border-bottom: 1px dashed black; margin: 10px; }
 
 
 /* CALENDAR */
@@ -292,16 +292,16 @@ table.calendar td { padding: 4px; height: 35px; width: 50px; text-align:right; v
 table.calendar td.odd { background: #eaeaea; }
 table.calendar td.even { background: #e0e0e0; }
 
-table.calendar td.other_month { color: white; }
+table.calendar td.other-month { color: white; }
 
 /* ADD/REMOVE BOX */
 
-table.add_remove_box { width: 100%; border: 1px solid black; margin-top: 10px;}
-table.add_remove_box.spinner { background-image: url(../images/spinner.gif);
+table.add-remove-box { width: 100%; border: 1px solid black; margin-top: 10px;}
+table.add-remove-box.spinner { background-image: url(../images/spinner.gif);
                                background-repeat: no-repeat;
                                background-position: top right; }
-table.add_remove_box table { width: 100%;}
-table.add_remove_box td { vertical-align: top; width: 50%;}
+table.add-remove-box table { width: 100%;}
+table.add-remove-box td { vertical-align: top; width: 50%;}
 
 /* NAME-BOXES */
 

data/hobo_files/plugin/generators/hobo_rapid/templates/themes/default/views/application.dryml

@@ -1,63 +1,63 @@
 <include src="plugins/hobo/tags/rapid"/>
 
-<def tag="Page" extend_with="theme">
-  <PageWithoutTheme merge>
-    <wrapper>
-      <div id="page_top">
-        <div id="page_right">
-          <div id="page_bottom">
-            <div id="page_left">
-              <div id="page_corner02">
-                <div id="page_corner04">
-                  <div id="page_corner03">
-                    <div id="page_corner01">
-                      <div id="page_inner_top">
-                        <default_tagbody/>
+<def tag="page" extend-with="theme">
+  <page-without-theme merge>
+    <wrapper:>
+      <div id="page-top">
+        <div id="page-right">
+          <div id="page-bottom">
+            <div id="page-left">
+              <div id="page-corner02">
+                <div id="page-corner04">
+                  <div id="page-corner03">
+                    <div id="page-corner01">
+                      <div id="page-inner-top">
+                        <param-content/>
       </div></div></div></div></div></div></div></div></div>
     </wrapper>
 
-    <stylesheets><default_tagbody/><theme_stylesheet/></stylesheets>
+    <stylesheets:><param-content/><theme-stylesheet/></stylesheets>
 
-  </PageWithoutTheme>
+  </page-without-theme>
 </def>
 
 
-<def tag="OldPage" attrs="title_prefix, title">
+<def tag="old-page" attrs="title-prefix, title">
   <% title ||= type_name + ": " + name(:no_wrapper => true) %>
   <doctype version="HTML 4.01 Transitional"/>
   <html>
     <head param="head">
       <title><%= title_prefix %><%= title %></title>
-      <theme_stylesheet/>
+      <theme-stylesheet/>
       <%= javascript_include_tag :defaults %>
-      <hobo_rapid_javascripts param="rapid_javascripts"/>
+      <hobo-rapid-javascripts param="rapid-javascripts"/>
     </head>
 
     <body onload="Hobo.applyEvents()" param="body">
 
-      <ajax_progress/>
+      <ajax-progress/>
 
       <div id="page">
 
-        <div id="page_top">
-        <div id="page_right">
-        <div id="page_bottom">
-        <div id="page_left">
-        <div id="page_corner02">
-        <div id="page_corner04">
-        <div id="page_corner03">
-        <div id="page_corner01">
-        <div id="page_inner_top">
+        <div id="page-top">
+        <div id="page-right">
+        <div id="page-bottom">
+        <div id="page-left">
+        <div id="page-corner02">
+        <div id="page-corner04">
+        <div id="page-corner03">
+        <div id="page-corner01">
+        <div id="page-inner-top">
 
           <div id='header' param="header">
-            <div class="logo" param="logo"><theme_image src="logo.gif"/></div>
+            <div class="logo" param="logo"><theme-image src="logo.gif"/></div>
             <nav param>
-              <magic_nav class="main_nav" param="main_nav"/>
-              <if test="&defined_route? :login"><account_nav param/></if>
+              <magic-nav class="main-nav" param="main-nav"/>
+              <if test="&defined_route? :login"><account-nav param/></if>
             </nav>
           </div>
 
-          <flash_message/>
+          <flash-message/>
 
           <div param="intro"></div>
           <div param="main">
@@ -76,35 +76,21 @@
 
 
 <def tag="panel">
-  <div class="panel" merge_attrs="&true">
-    <div class="panel_top"><div class="panel_right">
-    <div class="panel_bottom"><div class="panel_left">
-    <div class="panel_corner02"><div class="panel_corner04">
-    <div class="panel_corner03"><div class="panel_corner01">
+  <div class="panel" merge-attrs="&true">
+    <div class="panel-top"><div class="panel-right">
+    <div class="panel-bottom"><div class="panel-left">
+    <div class="panel-corner02"><div class="panel-corner04">
+    <div class="panel-corner03"><div class="panel-corner01">
 
-        <tagbody/>
+        <do param="default"/>
 
     </div></div></div></div></div></div></div></div>
   </div>
 </def>
-<!-->
-<def tag="section">
-  <div class="section" merge_attrs="&true"><tagbody/></div>
-</def>
--->
 
 <def tag="navbar" attrs="items,current">
   <repeat with="&items">
-    <div class='nav_item <%= "current" if current == this[0] %>'><%= link_to this[0].upcase, this[1] %></div>
+    <div class='nav-item <%= "current" if current == this[0] %>'><%= link_to this[0].upcase, this[1] %></div>
   </repeat>
   <clearer/>
 </def>
-
-<!--
-<def tag="application_nav">
-  <% items = [['Home', base_url + '/']] +
-             Hobo.models[0..2].map{|m| [m.name.pluralize.titlecase, object_url(m)]} +
-             [['Search', (search_url rescue "")]] %>
-  <navbar items="&items"/>
-</def>
--->