masterview_generator 0.0.16 → 0.0.17

data/masterview_generator.rb

@@ -159,6 +159,20 @@ class MasterviewGenerator < Rails::Generator::NamedBase
     t << "\n"
   end
 
+  def stylesheets
+    ss = ''
+    if full_options[:stylesheets]
+      full_options[:stylesheets].each do |stylesheet|
+        ss << %Q(      <link rel="stylesheet" type="text/css" href="../../../public/stylesheets/#{stylesheet}.css" mv:stylesheet_link="#{stylesheet}"/>\n)
+      end
+    else # unless --style option was present we output the default stylesheets
+      ss << %Q{      <link rel="stylesheet" type="text/css" href="../../../public/stylesheets/scaffold.css" mv:stylesheet_link="scaffold"/>\n}
+      ss << %Q{      <link rel="stylesheet" type="text/css" href="../../../public/stylesheets/sidebox.css" mv:stylesheet_link="sidebox"/>\n}
+      ss << %Q{      <link rel="stylesheet" type="text/css" href="../../../public/stylesheets/color-scheme.css" mv:stylesheet_link="color-scheme"/>\n}
+    end
+    ss
+  end
+
   def manifest
     record do |m|
       # Depend on model generator but skip if the model exists.
@@ -202,7 +216,7 @@ class MasterviewGenerator < Rails::Generator::NamedBase
              :mark_id => singular_name
             },
           'list_head_inclusion' => 
-            { :insert => 'fields_scaffold.rhtml',
+            { :insert => 'list_head_scaffold.rhtml',
              :sandbox => lambda { create_multi_sandbox('ListHeadScaffoldingSandbox') },
              :begin_mark => 'listhead',
              :end_mark => 'eolisthead',
@@ -225,6 +239,8 @@ class MasterviewGenerator < Rails::Generator::NamedBase
       }
 
       m.template 'style.css', 'public/stylesheets/scaffold.css'
+      m.template 'sidebox.css', 'public/stylesheets/sidebox.css'
+      m.template 'color-scheme.css', 'public/stylesheets/color-scheme.css'
 
       # design time files
       m.template 'mvpreview.js',      'app/views/masterview/extra/mvpreview.js'
@@ -241,13 +257,25 @@ class MasterviewGenerator < Rails::Generator::NamedBase
   protected
     # Override with your own usage banner.
     def banner
-      "Usage: #{$0} masterview ModelName [ControllerName] [action, ...] [--showAll | --showOnlyNew | --showOnlyList]"
+      "Usage: #{$0} masterview ModelName [ControllerName] [action, ...] [--show-all | --show-only list] [--style [cssStylesheet]]"
     end
 
     def add_options!(opt)
-      opt.on('-A', '--showAll', 'Generate with ALL sections visible at design time (no css hiding)') { options[:showSection] = :all }
-      opt.on('-N', '--showOnlyNew', 'Geneate with only NEW section visible at design time (rest hidden with css)') { options[:showSection] = :new }
-      opt.on('-L', '--showOnlyList', 'Geneate with only LIST section visible at design time (rest hidden with css)') { options[:showSection] = :list }
+      opt.on('-A', '--show-all', 'Generate with ALL sections visible at design time (no css hiding)') { options[:showSection] = :all }
+      opt.on("-O", "--show-only SECTION_NAME",
+              "Generate with only sectionName section visible at design time (rest hidden with css)",
+              "  (Valid options are: new, list)",
+              "  (example: --showOnly list  - would generate to show only 'list' section at design time)" ) do |section|
+        options[:showSection] = section.to_sym
+      end
+
+      opt.on("-S", "--style [CSS_STYLESHEET]",
+              "Add this stylesheet instead of defaults",
+              "  (You may add this option multiple times for each stylesheet to add)",
+              "  (If you omit the cssStylesheet then no default stylesheets will be added)" ) do |stylesheet|
+        options[:stylesheets] ||= []
+        options[:stylesheets] << File.basename(stylesheet, File.extname(stylesheet)) if stylesheet #get only the base part, so if /home/foo.css get foo
+      end
     end
 
     def scaffold_views

data/templates/color-scheme.css

@@ -0,0 +1,71 @@
+/* ------------------------------------------------------------------------
+   Five basic colors are used. These are:
+     1. Text Color
+     2. Border Color
+     3. Background Color (darker)
+     4. Background Color (lighter)
+     5. Message Color
+   
+   To change the above colors, just edit their respective values below.
+------------------------------------------------------------------------ */
+
+
+/* ###### General Color Scheme ###### */
+
+h1, h2, h3, th, label, #header div, #header div *, #footer *, .headerTitle, .sidebar *
+{ /* Text Color: */  color: #008500; }
+
+h1, table, td, th, #header, .sidebar, .sidebar h2
+{ /* Border Color: */  border-color: #008500; }
+
+#header, th, .sidebar div, .sidebar h2
+{ /* Background Color (darker): */  background-color: #F3FFED; }
+
+.sidebar span
+{ /* Background Color (lighter): */  background-color: #F6FFF2; }
+
+
+/* ###### Special Colors ###### */
+
+#header a {  
+  color: #008500;
+}
+
+#header a:hover{ 
+  color: #008500;
+  background-color: #F6FFF2;
+}
+
+.sidebar a {  
+  color: #008500;
+}
+
+.messages { 
+  /* Message Color */ color: #3a89af;
+}
+
+.sidebar a:hover {  
+  color: #008500;
+  background-color: #F3FFED;
+}
+
+.content a {
+  color: #008500;
+  background-color: #F6FFF2;
+}
+
+.operation{ 
+  background-color: #F6FFF2;
+}
+
+#footer {
+  background-color: #F6FFF2;
+}
+
+#footer a { 
+  color: #008500;
+}
+
+#footer div {  
+  color: #008500;
+}

data/templates/list_line_scaffold.rhtml

@@ -1,6 +1,6 @@
 
 <%= all_input_tags(@model_instance, @singular_name, {}) %>
-<td><a class="show_link" href="#" mv:link_to=":action => 'show<%= suffix %>', :id => <%= singular_name %>">Show</a></td>
-<td><a class="edit_link" href="#" mv:link_to=":action => 'edit<%= suffix %>', :id => <%= singular_name %>">Edit</a></td>
-<td><a class="destroy_link" href="#" mv:link_to=":action => 'destroy', :id => <%= singular_name %>">Destroy</a></td>
+<td class="operation"><a class="show_link" href="#" mv:link_to=":action => 'show<%= suffix %>', :id => <%= singular_name %>">Show</a></td>
+<td class="operation"><a class="edit_link" href="#" mv:link_to=":action => 'edit<%= suffix %>', :id => <%= singular_name %>">Edit</a></td>
+<td class="operation"><a class="destroy_link" href="#" mv:link_to=":action => 'destroy', :id => <%= singular_name %>">Destroy</a></td>
 

data/templates/masterview.rhtml

@@ -1,7 +1,8 @@
 <html mv:generate="layouts/<%= controller_file_name %>.rhtml">
   <head>
-    <title><%= controller_class_name %>: {{{= controller.action_name }}}</title>
-    <link rel="stylesheet" type="text/css" href="../../../public/stylesheets/scaffold.css" mv:stylesheet_link="scaffold"/>
+      <title><%= controller_class_name %>: {{{= controller.action_name }}}</title>
+
+<%= stylesheets -%>
 
       <!--
            These stylesheets below are for design time use to allow working with only one visible section at a time, especially 
@@ -18,28 +19,45 @@
   </head>
   <body>
 
-    <div id="<%= controller_file_name %>_messages" class="messages" mv:if="@flash[:notice]" mv:content="@flash[:notice]">
-      messages here - Note: Other page sections in this MasterView file are hidden at design time, disable the stylesheet &apos;extra/show_only_new.css&apos; or uncomment different extra/*.css to work with other page sections (other stylesheets are show_only_edit.css, show_only_show.css, show_only_list.css, show_only_destroy.css and they are commented out in this masterview file&apos;s head section)
+    <!-- ###### Header ###### -->    
+
+    <div id="header"> 
+      <span class="headerTitle"><%= controller_class_name %></span> 
+      <div class="menuBar">
+        <a href="#" mv:link_to=":action => :index">Home</a>
+	<!-- | <a href="">Another link</a> -->
+      </div>
     </div>
 
+
     <div class="main">
       <div id="<%= controller_file_name %>_content" mv:replace="@content_for_layout">
+
+
+
+        <!-- ###### New ###### -->
+
 	<div id="<%= controller_file_name %>_new" mv:generate="<%= controller_view_dir_name %>/new.rhtml" mv:preview="showOne" class="new_div">
-	  <div class="<%= controller_file_name %>_new sidebar">
-	    <h1>Tasks:</h1>
+
+	  <div class="<%= controller_file_name %>_new sidebar LHS">
+	    <h2>Tasks:</h2>
 	    <ul>
 	      <li><a class="list_link" href="#" mv:link_to=":action => 'list<%= suffix %>'">Back to overview</a></li>
 	    </ul> 
 	  </div>
 
 	  <div class="<%= controller_file_name %>_new content">
-	    <h1><%= plural_name.capitalize %></h1>
+	    <h1><%= plural_name.capitalize %></h1> 
 
 	    <form mv:form=":action => 'new'">
 
 	    <div class="form">	
 	      <h2>Creating <%= singular_name %></h2>
 
+              <div id="<%= controller_file_name %>_messages" class="messages" mv:gen_render=":partial => '<%= controller_view_dir_name %>/messages'" mv:if="@flash[:notice]" mv:content="@flash[:notice]">
+                 messages here - Note: Other page sections in this MasterView file are hidden at design time, disable the stylesheet &apos;extra/show_only_new.css&apos; or uncomment different extra/*.css to work with other page sections (other stylesheets are show_only_edit.css, show_only_show.css, show_only_list.css, show_only_destroy.css and they are commented out in this masterview file&apos;s head section)
+              </div>
+
 	      <div id="<%= controller_file_name %>_form" mv:gen_render=":partial => '<%= controller_view_dir_name %>/form'">
 		<div class="error_messages" mv:replace="error_messages_for :<%= singular_name %>">
 		  error messages
@@ -61,9 +79,12 @@
 	</div>
 
 
+
+	<!-- ###### Edit ###### -->
+
 	<div id="<%= controller_file_name %>_edit" mv:generate="<%= controller_view_dir_name %>/edit.rhtml" mv:preview="showOne" class="edit_div">
-	  <div class="<%= controller_file_name %>_edit sidebar">
-	    <h1>Tasks:</h1>
+	  <div class="<%= controller_file_name %>_edit sidebar LHS">
+	    <h2>Tasks:</h2>
 	    <ul>
 	      <li><a class="list_link" href="#" mv:link_to=":action => 'list<%= suffix %>'">Back to overview</a></li>
 	    </ul> 
@@ -72,10 +93,16 @@
 	  <div class="<%= controller_file_name %>_edit content">
 	    <h1><%= plural_name.capitalize %></h1>
 
+
 	    <form mv:form=":action => 'edit', :id => @<%=singular_name%>.id">
 
 	    <div class="form">	
 	      <h2>Editing <%= singular_name %></h2>
+
+	      <div class="messages" mv:replace="render :partial => 'messages'" mv:preview="copyOf:<%= controller_file_name %>_messages">
+		copyOf:<%= controller_file_name %>_messages
+	      </div>
+
 	      <div mv:replace="render :partial => 'form'" mv:preview="copyOf:<%= controller_file_name %>_form">
 		copyOf:<%= controller_file_name %>_form
 	      </div>
@@ -91,9 +118,12 @@
 	</div>
 
 
+
+	<!-- ###### List ###### -->
+
 	<div id="<%= controller_file_name %>_list" mv:generate="<%= controller_view_dir_name %>/list.rhtml" mv:preview="showOne" class="list_div">
-	  <div class="<%= controller_file_name %>_list sidebar">
-	    <h1>Tasks:</h1>
+	  <div class="<%= controller_file_name %>_list sidebar LHS">
+	    <h2>Tasks:</h2>
 	    <ul>
 	      <li><a class="new_link" href="#" mv:link_to=":action => 'new<%= suffix %>'">Create new <%= singular_name %></a></li>
 	    </ul> 
@@ -102,6 +132,10 @@
 	  <div class="<%= controller_file_name %>_list content">
 	    <h1><%= plural_name.capitalize %></h1>
 
+	    <div class="messages" mv:replace="render :partial => 'messages'" mv:preview="copyOf:<%= controller_file_name %>_messages">
+	      copyOf:<%= controller_file_name %>_messages
+	    </div>
+
 	    <div class="list">	
 	      <table border="1" class="<%= controller_file_name %>_list_table" cellpadding="5">
 	      <tr>
@@ -120,9 +154,12 @@
 	</div>
 
 
+
+	<!-- ###### Show ###### -->
+
 	<div id="<%= controller_file_name %>_show" mv:generate="<%= controller_view_dir_name %>/show.rhtml" mv:preview="showOne" class="show_div">
-	  <div class="<%= controller_file_name %>_show sidebar">
-	    <h1>Tasks:</h1>
+	  <div class="<%= controller_file_name %>_show sidebar LHS">
+	    <h2>Tasks:</h2>
 	    <ul>
 	      <li><a class="list_link" href="#" mv:link_to=":action => 'list<%= suffix %>'">Back to overview</a></li>
 	      <li><a class="edit_link" href="#" mv:link_to=":action => 'edit<%= suffix %>', :id => @<%= singular_name %>.id">Edit this <%= singular_name %></a></li>
@@ -132,6 +169,10 @@
 	  <div class="<%= controller_file_name %>_show content">
 	    <h1><%= plural_name.capitalize %></h1>
 
+	    <div class="messages" mv:replace="render :partial => 'messages'" mv:preview="copyOf:<%= controller_file_name %>_messages">
+	      copyOf:<%= controller_file_name %>_messages
+	    </div>
+
 	    <div id="<%= controller_file_name %>_show_partial" class="form" mv:gen_render=":partial => '<%= controller_view_dir_name %>/show'">
 		<%= show_inclusion %>
 	    </div>
@@ -139,9 +180,13 @@
 	  </div>
 	</div>
 
+
+
+	<!-- ###### Destroy ###### -->
+
       <div id="<%= controller_file_name %>_destroy" mv:generate="<%= controller_view_dir_name %>/destroy.rhtml" mv:preview="showOne" class="destroy_div">
-	<div class="<%= controller_file_name %>_destroy sidebar">
-	  <h1>Tasks:</h1>
+	<div class="<%= controller_file_name %>_destroy sidebar LHS">
+	  <h2>Tasks:</h2>
 	  <ul>
 	    <li><a class="list_link" href="#" mv:link_to=":action => 'list<%= suffix %>'">Back to overview</a></li>
 	    <li><a class="show_link" href="#" mv:link_to=":action => 'show<%= suffix %>', :id => @<%= singular_name %>.id">Show this <%= singular_name %></a></li>
@@ -151,6 +196,10 @@
 	<div class="<%= controller_file_name %>_destroy content">
 	  <h1><%= plural_name.capitalize %></h1>
 
+	  <div class="messages" mv:replace="render :partial => 'messages'" mv:preview="copyOf:<%= controller_file_name %>_messages">
+	    copyOf:<%= controller_file_name %>_messages
+	  </div>
+
 	  <div class="error_messages" mv:replace="error_messages_for :<%= singular_name %>">
 	    error messages
 	  </div>
@@ -173,6 +222,29 @@
       </div>
     </div>
 
+
+
+    <!-- ###### Footer ###### -->
+
+    <div id="footer">
+      <div class="footerLHS">
+        <a href="http://validator.w3.org/check/referer">Valid XHTML 1.0 Strict</a>
+      </div>
+      
+      <div class="footerLHS">
+        <a href="http://jigsaw.w3.org/css-validator/check/referer">Valid CSS 2</a>
+      </div>
+      
+      <div>
+        Copyright
+      </div>
+
+      <div>
+        Website by 
+      </div>
+    </div>
+
+
     <script type="text/javascript" mv:replace="" src="./extra/mvpreview.js"></script>
     <script type="text/javascript" mv:replace="">
       mvpreview.preparePage( '<%= controller_file_name %>', {showOneSection: '<%= controller_file_name %>_list' } );  

data/templates/sidebox.css

@@ -0,0 +1,178 @@
+
+/* ###### Browser-specific Styles ###### */
+
+/* For IE & Mozilla-based browsers: */
+
+.LHS {
+  margin-left: 2.5mm;
+  float: left;
+  clear: left;
+}
+
+.RHS {
+  margin-right: 2.5mm;
+  float: right;
+  clear: right;
+}
+
+/* For Mozilla-based (CSS2-fully complaint) browsers only: */
+
+[class~="LHS"] {
+  margin-left: 5mm;
+}
+
+[class~="RHS"] {
+  margin-right: 5mm;
+}
+
+
+/* ###### Body Text ###### */
+
+body {
+  background-color: white;
+  color: black;
+  font-family: verdana, tahoma, helvetica, arial, sans-serif;
+  font-size: 95%;
+  margin: 0;
+  background-repeat: no-repeat;
+  background-attachment: scroll;
+}
+
+h1, h2, h3 {
+  font-family: "trebuchet ms", tahoma, sans-serif;
+}
+
+h1 {
+  font-weight: bold;
+  font-size: 150%;
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
+  padding-bottom: 0.5ex;
+}
+
+h2 { 
+  font-size: 120%;
+}
+
+img {
+  border: none;
+}
+
+
+.content {
+  text-align: justify;
+  line-height: 1.5em;
+  margin: 0 14em 0 14em;
+  padding: 0 1em 1ex 1em;
+}
+
+.content p {
+  padding-bottom: 2ex;
+}
+
+.content a {
+  font-weight: bold;
+  font-size: 90%;
+}
+
+.record { 
+ clear: none;
+}
+
+table,td,th{
+  border-width: 1px;
+  border-style: solid;
+  border-collapse:collapse;
+  margin:0;
+  padding:0;
+}
+
+td,th{
+  padding:.2em .5em;
+  vertical-align:top;
+}
+
+a { 
+  text-decoration: none;
+}
+
+a:hover { 
+  text-decoration: underline;
+}
+
+/* ###### Header ###### */
+
+#header {
+  border-bottom-style: solid;
+  border-bottom-width: 2px;
+  height: 5.5em;
+  margin-bottom: 5mm;
+  padding: 0 2.5mm 0 5mm;
+  background-repeat: no-repeat;
+}
+
+.headerTitle {
+  font-size: 300%;
+  font-weight: bold;
+  line-height: 1.25em;
+}
+
+/* ###### Side Box ###### */
+
+div.sidebar {
+  border-style: solid none solid none;
+  border-width: 2px 0 2px 0;
+  width: 12em;
+  margin-top: 0; 
+  margin-bottom: 1.25ex; 
+}
+
+.sidebar h2 {
+  font-size: 95%;
+  font-weight: bold;
+  border-bottom-style: dashed;
+  border-bottom-width: 1px;
+  margin-top: 0;
+  padding: 0.25ex 0.25em 0.25ex 0.75em;
+}
+
+.sidebar a {
+  text-decoration: none;
+  display: block;
+  padding: 0.35ex 0.35em 0.35ex 0.35em;
+}
+
+.sidebar a:hover { 
+  text-decoration: underline;
+  display: block;
+  padding: 0.35ex 0.35em 0.35ex 0.35em;
+}
+
+.sidebar ul { 
+  font-size: 85%;
+  line-height: 80%;
+  position: relative;
+  left: -2em;
+  list-style-type: none;
+}
+
+/* ###### Footer ###### */
+
+#footer {
+  padding-top: 0.75ex;
+  padding-bottom: 0.75ex;
+  clear: left;
+}
+
+#footer div {
+  font-size: 85%;
+  line-height: 1.25em;
+  text-align: right;
+  padding-right: 3mm;
+}
+
+.footerLHS {
+  float: left;
+  clear: left;
+  padding-left: 3mm;
+}

data/templates/style.css

@@ -2,21 +2,8 @@ body { background-color: #fff; color: #333; }
 
 body, p, ol, ul, td {
   font-family: verdana, arial, helvetica, sans-serif;
-  font-size:   13px;
-  line-height: 18px;
 }
 
-pre {
-  background-color: #eee;
-  padding: 10px;
-  font-size: 11px;
-}
-
-a { color: #000; }
-a:visited { color: #666; }
-a:hover { color: #fff; background-color:#000; }
-
-
 /* content div containing form or list */
 .content { 
 }

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: masterview_generator
 version: !ruby/object:Gem::Version 
-  version: 0.0.16
-date: 2006-04-28 00:00:00 -05:00
+  version: 0.0.17
+date: 2006-05-04 00:00:00 -05:00
 summary: A (x)html friendly template engine for rails with the power of layouts, and partials. MasterView Generator for GEM
 require_paths: 
 - .
@@ -33,8 +33,10 @@ files:
 - templates/mvpreview.js
 - templates/helper.rb
 - templates/layout.rhtml
+- templates/sidebox.css
 - templates/list_head_scaffold.rhtml
 - templates/functional_test.rb
+- templates/color-scheme.css
 - templates/show_scaffold.rhtml
 - templates/style.css
 - templates/list_line_scaffold.rhtml