team-alpha/railsgoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed broken js, it was due to a typo in an html comment

Browse Source
This commit is contained in:
Ken Johnson
2013-05-19 12:16:34 -04:00
parent f7dbc482bb
commit 168c19bdc5
2 changed files with 57 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/admin/dashboard.html.erb
+56 -6
View File
@@ -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(
app/views/layouts/shared/_sidebar.html.erb
+1 -1
View File
@@ -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>