From 168c19bdc53788de105bc984dbcfbc9645f325d8 Mon Sep 17 00:00:00 2001
From: Ken Johnson <cktricky@Kens-MacBook-Pro.local>
Date: Sun, 19 May 2013 12:16:34 -0400
Subject: [PATCH] fixed broken js, it was due to a typo in an html comment

---
 app/views/admin/dashboard.html.erb         | 62 +++++++++++++++++++---
 app/views/layouts/shared/_sidebar.html.erb |  2 +-
 2 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/app/views/admin/dashboard.html.erb b/app/views/admin/dashboard.html.erb
index 39a95ed..e496aaf 100644
--- a/app/views/admin/dashboard.html.erb
+++ b/app/views/admin/dashboard.html.erb
@@ -38,24 +38,74 @@
 		                        	    <%= u.email%>
 		                        	  </td>
 		                        	  <td>
-		                        	    <%= u.admin ? "Yes" : nil %>
+		                        	    <%= u.admin ? %{<span class="fs1" aria-hidden="true" data-icon="&#xe0fe;"}.html_safe : nil %>
 		                        	  </td>
 		                        	  <td>
-		                        	    <%= link_to "Edit", "#", {:class => "btn btn-inverse"}%>	
+		                        	    <%= link_to "Edit", "#editAcct", {:role => "button", :class => "btn btn-inverse", "data-toggle" => "modal"}%>	
 										<%= link_to "Delete", "#", {:class => "btn btn-danger"}%>	
-									  </div>
 		                        	  </td>
 		                        	</tr>
 							   <% end %>
 		                      </tbody>
 		                    </table>
+							<!-- Begin Modal -->
+							<div id="editAcct" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel1" aria-hidden="true">
+			                    <div class="modal-header">
+			                      <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+			                        ×
+			                      </button>
+			                      <h4 id="myModalLabel1">
+			                        Account Settings
+			                      </h4>
+			                    </div>
+			                    <div class="modal-body">
+			                      <div class="row-fluid">  
+			                        <div class="span4">
+			                          <input type="text" class="span12" Placeholder="Frist name">
+			                        </div>
+			                        <div class="span4">
+			                          <input type="text" class="span12" Placeholder="Last name">
+			                        </div>
+			                        <div class="span4">
+			                          <input type="text" class="span12" Placeholder="email">
+			                        </div>
+			                      </div>
+			                      <div class="row-fluid">  
+			                        <div class="span6">
+			                          <button class="span12 btn btn-info">Edit name</button>
+			                        </div>
+			                        <div class="span6">
+			                          <button class="span12 input-top-margin btn btn-warning">Edit email</button>
+			                        </div>
+			                      </div>
+			                    </div>
+			                    <div class="modal-footer">
+			                      <div class="btn-group pull-left">
+			                        <button class="btn btn-warning2">
+			                          <span class="fs1" aria-hidden="true" data-icon="&#xe002;"></span>
+			                        </button>
+			                        <button class="btn btn-info">
+			                          <span class="fs1" aria-hidden="true" data-icon="&#xe06a;"></span>
+			                        </button>
+			                        <button class="btn btn-success">
+			                          <span class="fs1" aria-hidden="true" data-icon="&#xe090;"></span>
+			                        </button>
+			                      </div>
+			                      <button class="btn" data-dismiss="modal" aria-hidden="true">
+			                        Close
+			                      </button>
+			                      <button class="btn btn-primary">
+			                        Save changes
+			                      </button>
+			                    </div>
+			                  </div>
+							<!-- End Modal -->
 		                    <div class="clearfix">
 		                    </div>
-
 		                  </div>
 		                </div>
 					</div>
-				</div>
+				</div> <!-- End widget header-->
 			</div>
 		</div>
 	</div>
@@ -74,7 +124,7 @@ function dataTablePagination(){
 };
 
 function makeActive(){
-	$('li[id="admin_dashboard"]').addClass('active');
+	$('li[id="admin"]').addClass('active');
 };
 
 $(document).ready(
diff --git a/app/views/layouts/shared/_sidebar.html.erb b/app/views/layouts/shared/_sidebar.html.erb
index f4789d1..6f0cbef 100755
--- a/app/views/layouts/shared/_sidebar.html.erb
+++ b/app/views/layouts/shared/_sidebar.html.erb
@@ -9,7 +9,7 @@
           </a>
         </li>
         <% if is_admin? %>
-        <li id="admin_dashboard">
+        <li id='admin'>
            <%= link_to admin_dashboard_path(:admin_id => current_user.id) do %>
             <div class="icon">
               <span class="fs1" aria-hidden="true" data-icon="&#xe1c8;"></span>