Merge branch 'metaprogramming'

app/controllers/messages_controller.rb

@@ -2,6 +2,7 @@ class MessagesController < ApplicationController
 
   def index
     @messages = current_user.messages
+    @message = Message.new
   end
 
   def show
@@ -19,10 +20,6 @@ class MessagesController < ApplicationController
     end
   end
 
-  def new
-    @message = Message.new
-  end
-
   def create
     if Message.create(params[:message])
       respond_to do |format|

app/controllers/tutorials_controller.rb

@@ -93,7 +93,7 @@ class TutorialsController < ApplicationController
     
   end
   
-  def constantize
+  def metaprogramming
   end
   
 end

app/views/layouts/tutorial/_sidebar.html.erb

@@ -103,23 +103,15 @@
         <li id="guard">
          <%= link_to "Guard", guard_tutorials_path %>
         </li>
-        <!--<li>
-          <a href="#">Session Secret</a>
-        </li>-->
 		<li id="mass_assignment">
           <%= link_to "Mass Assignment", mass_assignment_tutorials_path %>
         </li>
-        <li id="constantize">
-		  <%= link_to "Constantize", constantize_tutorials_path %>
-	    </li>
 		<li id="logic_flaws">
 			<%= link_to "Logic Flaws", logic_flaws_tutorials_path %>
 		</li>	
-	    <!--
+		<li id="metaprogramming">
-        <li>
+			<%= link_to "Meta- Programming", metaprogramming_tutorials_path %>
-          <a href="#">DB Sessions</a>
+		</li>
-        </li>
- 		-->
       </ul>
     </li>
   </ul>

app/views/messages/index.html.erb

@@ -1,12 +1,14 @@
 <div class="dashboard-wrapper">
   <div class="main-container">
+	<!-- Begin Row -->
     <div class="row-fluid">
+		<!-- Begin Span12 -->
         <div class="span12">
           <div class="widget">
             <div class="widget-header">
               <div class="title">
                 <span class="fs1" aria-hidden="true" data-icon="&#xe022;"></span> Messages for <%= current_user.full_name %>
-                  <span class="fs1" aria-hidden="true" data-icon="&#xe006;"><%= link_to "Send Message", new_user_message_path %></span>
+                  <!--<span class="fs1" aria-hidden="true" data-icon="&#xe006;"><%#= link_to "Send Message", new_user_message_path %></span>-->
               </div>
             </div>
             <div class="widget-body">
@@ -37,13 +39,94 @@
             </div>
           </div>
         </div>
+ 		<!-- End Span12 -->
     </div>
+    <!-- End Row -->
+	<!-- Begin Row -->
+    <div class="row-fluid">
+		<!-- Begin Span12 -->
+        <div class="span12">
+          <div class="widget">
+            <div class="widget-header">
+              <div class="title">
+                  <span class="fs1" aria-hidden="true" data-icon="&#xe006;"></span> Send Message
+              </div>
+            </div>
+            <div class="widget-body">
+				<div id="success" style="display: none;" class="alert alert-block alert-success fade in">
+		            <h4 class="alert-heading">
+		              Success!
+		            </h4>
+		            <p>
+		              Message successfully sent.
+		            </p>
+		       </div>
+				<div id="failure" style="display: none;" class="alert alert-block alert-error fade in">
+                    <h4 class="alert-heading">
+                      Error!
+                    </h4>
+                    <p>
+                      Failed to send message.
+                    </p>
+               </div>
+				<div class="row-fluid">
+					<div class="span8">
+					<!-- Begin Message Draft Content-->	
+					<%= form_for @message, :url => user_messages_path, :method => :post, :html => {:id => "send_message"} do |f|%>
+						<%= f.hidden_field :creator_id, :value => current_user.id %>
+						<%= f.hidden_field :read, :value => '0' %>
+					   <div class="control-group">
+					     <%= f.label "To:", nil, {:class => "control-label"}%>
+					     <%= f.select(:receiver_id, options_from_collection_for_select(User.all, :id, :full_name)) %>
+					   </div>
+            		
+					   <div class="control-group">
+					     <%= f.label :message, nil, {:class => "control-label"}%>
+					     <%= f.text_area :message, {:class => "span12"} %>
+					   </div>
+            		
+					   <div class="form-actions no-margin">
+					     <%= f.submit "Submit", {:id => 'submit_button', :class => "btn btn-info pull-right"} %>
+					   </div>
+            		
+					   <div class="clearfix"></div>
+					<% end %>	
+					<!-- End Message Draft Content-->
+					</div>
+			    </div>		
+            </div>
+          </div>
+        </div>
+ 		<!-- End Span12 -->
+    </div>
+    <!-- End Row -->
   </div>
 </div>      
 </body>
 </html>
 
-<script>
+<script type="text/javascript">
+
+$("#submit_button").click(function(event) {
+  	var valuesToSubmit = $("#send_message").serialize();
+    event.preventDefault();
+    $.ajax({
+      url: <%= "/users/#{current_user.user_id}/messages.json".inspect.html_safe %>,  
+	  data: valuesToSubmit,
+	  type: "POST",
+	  success: function(response) {
+		if (response.msg == "failure") {
+		  $('#failure').show(500).delay(1500).fadeOut();
+		} else {
+		  $('#success').show(500).delay(1500).fadeOut();
+		}
+	  },
+	  error: function(event) {
+		$('#failure').show(500).delay(1500).fadeOut();
+	  }
+	});
+});
+
 function makeActive(){
 	$('li[id="messages"]').addClass('active');
 };

app/views/messages/new.html.erb

@@ -1,96 +0,0 @@
-<div class="dashboard-wrapper">
-	<div class="main-container">
-		<div class="row-fluid">
-			<div class="span12">
-				<div id="success" style="display: none;" class="alert alert-block alert-success fade in">
-		            <h4 class="alert-heading">
-		              Success!
-		            </h4>
-		            <p>
-		              Message successfully sent.
-		            </p>
-		          </div>
-			</div>
-		</div>	
-		<div class="row-fluid">
-			<div class="span12">
-				<div id="failure" style="display: none;" class="alert alert-block alert-error fade in">
-                    <h4 class="alert-heading">
-                      Error!
-                    </h4>
-                    <p>
-                      Failed to send message.
-                    </p>
-                  </div>
-			</div>
-		</div>
-		<div class="row-fluid">
-		    <div class="span6">
-		      <div class="widget">
-		        <div class="widget-header">
-		          <div class="title">
-		            <span class="fs1" aria-hidden="true" data-icon="&#xe006;"></span> New Message</span>
-		          </div>
-		        </div>
-		        <div class="widget-body">
-			     <%= form_for @message, :url => user_messages_path, :method => :post, :html => {:id => "send_message"} do |f|%>
-			     	<%= f.hidden_field :creator_id, :value => current_user.id %>
-			     	<%= f.hidden_field :read, :value => '0' %>
-					<div class="control-group">
-		              <%= f.label "To:", nil, {:class => "control-label"}%>
-					  <%= f.select(:receiver_id, options_from_collection_for_select(User.all, :id, :full_name)) %>
-					</div>
-					
-					<div class="control-group">
-					  <%= f.label :message, nil, {:class => "control-label"}%>
-					  <%= f.text_area :message, {:class => "span12"} %>
-					</div>
-				
-					<div class="form-actions no-margin">
-					  <%= f.submit "Submit", {:id => 'submit_button', :class => "btn btn-info pull-right"} %>
-					</div>
-					
-					<div class="clearfix"></div>
-			     <% end %>	
-			</div>
-		</div>
-	</div>
-</div>		
-
-<%= javascript_include_tag ('validation.js')%>
-           
-<script type="text/javascript">
-
-$("#submit_button").click(function(event) {
-  	var valuesToSubmit = $("#send_message").serialize();
-    event.preventDefault();
-    $.ajax({
-      url: <%= "/users/#{current_user.user_id}/messages.json".inspect.html_safe %>,  
-	  data: valuesToSubmit,
-	  type: "POST",
-	  success: function(response) {
-		if (response.msg == "failure") {
-		  $('#failure').show(500).delay(1500).fadeOut();
-		} else {
-		  $('#success').show(500).delay(1500).fadeOut();
-		}
-	  },
-	  error: function(event) {
-		$('#failure').show(500).delay(1500).fadeOut();
-	  }
-	});
-});
-
-function makeActive(){
-	$('li[id="messages"]').addClass('active');
-};
-
-$(document).ready(function () {
-  makeActive()
-});
-
-</script>
-
-            
-            
-

app/views/tutorials/metaprogramming.html.erb

@@ -2,7 +2,7 @@
 	<div class="main-container">
 		<div class="row-fluid">
 		    <div class="span12">
-		      <%= render :partial => ("layouts/tutorial/constantize/benefit_forms_constantize")%>
+		      <%= render :partial => ("layouts/tutorial/metaprogramming/benefit_forms_constantize")%>
 		    </div> <!-- End Span12-->
 		</div>
 	</div>
@@ -10,7 +10,7 @@
 
 <script type="text/javascript">
 function makeActive(){
-	$('li[id="constantize"]').addClass('active');
+	$('li[id="metaprogramming"]').addClass('active');
 	$('li[id="submenu"]').addClass('active open');
 };
 

config/routes.rb

@@ -63,9 +63,9 @@ Railsgoat::Application.routes.draw do
       get "redirects"
       get "guard"
       get "mass_assignment"
-      get "constantize"
       get "gauntlt"
       get "logic_flaws"
+      get "metaprogramming"
     end
   end