Skip to content

Commit

Permalink
normalize headings and cleanup a few admin templates
Browse files Browse the repository at this point in the history
  • Loading branch information
trvsdnn committed Nov 14, 2012
1 parent 736c441 commit 38314a4
Show file tree
Hide file tree
Showing 20 changed files with 31 additions and 37 deletions.
12 changes: 6 additions & 6 deletions app/assets/stylesheets/application.css
Expand Up @@ -12,11 +12,11 @@
*= require_tree .
*/

h2 { position: relative; }
h3 { position: relative; }

h2 .btn-danger { margin-left: 10px; }
h3 .btn-danger { margin-left: 10px; }

h2 .favorite {
h3 .favorite {
color: #FF50A1;
font-size: 14px;
position: absolute;
Expand All @@ -25,7 +25,7 @@
text-decoration: none;
}

h2 .favorite:hover {
h3 .favorite:hover {
text-decoration: none;
}

Expand All @@ -39,10 +39,10 @@
color: #ccc;
}

.licenses th.title, .notes th.title {
.licenses th.title, .notes th.title, .groups th.name {
width: 70%;
}

.results th.title {
width: 70% !important;
}
}
2 changes: 1 addition & 1 deletion app/views/accounts/generic_accounts/edit.html.erb
@@ -1,5 +1,5 @@
<div class="page-header">
<h2>Edit &ldquo;<%= @account.title %>&rdquo;</h2>
<h3>Edit &ldquo;<%= @account.title %>&rdquo;</h3>
</div>

<%= render 'form' %>
2 changes: 1 addition & 1 deletion app/views/accounts/generic_accounts/new.html.erb
@@ -1,5 +1,5 @@
<div class="page-header">
<h2>Add a New Generic Account</h2>
<h3>Add a New Generic Account</h3>
</div>

<%= render 'form' %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/accounts/generic_accounts/show.html.erb
@@ -1,12 +1,12 @@
<div class="page-header">
<h2>
<h3>
<%= render 'shared/favorite', :item => @account %>
<%= @account.title %>
<% if @account.groups.present? %><small><%= @account.groups.map(&:name).join(', ') %></small><% end %>
<%= link_to 'Delete', accounts_generic_account_path, :class => 'btn btn-small btn-danger pull-right', :confirm => 'Are you sure you want to delete this account?', :method => :delete %>
<%= link_to 'Edit', edit_accounts_generic_account_path, :class => 'btn btn-small pull-right' %>
</h2>
</h3>
</div>

<%= render 'form' %>
2 changes: 1 addition & 1 deletion app/views/accounts/web_accounts/edit.html.erb
@@ -1,5 +1,5 @@
<div class="page-header">
<h2>Edit &ldquo;<%= @account.title %>&rdquo;</h2>
<h3>Edit &ldquo;<%= @account.title %>&rdquo;</h3>
</div>

<%= render 'form' %>
2 changes: 1 addition & 1 deletion app/views/accounts/web_accounts/new.html.erb
@@ -1,5 +1,5 @@
<div class="page-header">
<h2>Add a New Web Account</h2>
<h3>Add a New Web Account</h3>
</div>

<%= render 'form' %>
4 changes: 2 additions & 2 deletions app/views/accounts/web_accounts/show.html.erb
@@ -1,12 +1,12 @@
<div class="page-header">
<h2>
<h3>
<%= render 'shared/favorite', :item => @account %>
<%= @account.title %>
<% if @account.groups.present? %><small><%= @account.groups.map(&:name).join(', ') %></small><% end %>
<%= link_to 'Delete', accounts_web_account_path, :class => 'btn btn-small btn-danger pull-right', :confirm => 'Are you sure you want to delete this account?', :method => :delete %>
<%= link_to 'Edit', edit_accounts_web_account_path, :class => 'btn btn-small pull-right' %>
</h2>
</h3>
</div>

<%= render 'form' %>
2 changes: 1 addition & 1 deletion app/views/admin/groups/edit.html.erb
@@ -1,5 +1,5 @@
<div class="page-header">
<h2>Edit Group &ldquo;<%= @group.name %>&rdquo;</h2>
<h3>Edit Group &ldquo;<%= @group.name %>&rdquo;</h3>
</div>

<div class="span6">
Expand Down
6 changes: 2 additions & 4 deletions app/views/admin/groups/index.html.erb
Expand Up @@ -9,17 +9,15 @@
<table class='table table-striped table-bordered table-condensed'>
<thead>
<tr>
<th>Name</th>
<th class='name'>Name</th>
<th>Modified</th>
<th></th>
</tr>
</thead>
<tbody>
<% @groups.each do |group| %>
<tr>
<td><%= group.name %></td>
<td><%= link_to group.name, edit_admin_group_path(group) %></td>
<td><%= fmt_datetime(group.updated_at) %></td>
<td><%= link_to 'Edit', edit_admin_group_path(group) %></td>
</tr>
<% end %>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/groups/new.html.erb
@@ -1,5 +1,5 @@
<div class="page-header">
<h2>New Group</h2>
<h3>New Group</h3>
</div>

<div class="span6">
Expand Down
3 changes: 2 additions & 1 deletion app/views/admin/users/edit.html.erb
@@ -1,5 +1,6 @@
<div class="page-header">
<h2>Edit user &ldquo;<%= @user.username %>&rdquo;</h2>
<h3>Edit user &ldquo;<%= @user.username %>&rdquo;
<%= link_to 'Delete', admin_user_path(@user), :confirm => "Are you sure you want to delete user `#{@user.username}'", :method => :delete, :class => 'btn btn-danger pull-right' %></h3>
</div>

<div class="span6">
Expand Down
7 changes: 1 addition & 6 deletions app/views/admin/users/index.html.erb
Expand Up @@ -13,20 +13,15 @@
<th>Admin</th>
<th>Groups</th>
<th>Modified</th>
<th></th>
</tr>
</thead>
<tbody>
<% @users.each do |user| %>
<tr>
<td><%= user.username %></td>
<td><%= link_to user.username, edit_admin_user_path(user) %></td>
<td><%= user.admin? %></td>
<td><%= user.groups.map(&:name).join(', ') %></td>
<td><%= fmt_datetime(user.updated_at) %></td>
<td>
<%= link_to 'Edit', edit_admin_user_path(user) %> |
<%= link_to 'Delete', admin_user_path(user), :confirm => "Are you sure you want to delete user `#{user.username}'", :method => :delete %>
</td>
</tr>
<% end %>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/users/new.html.erb
@@ -1,5 +1,5 @@
<div class="page-header">
<h2>New User</h2>
<h3>New User</h3>
</div>

<div class="span6">
Expand Down
2 changes: 1 addition & 1 deletion app/views/notes/edit.html.erb
@@ -1,5 +1,5 @@
<div class="page-header">
<h2>Edit &ldquo;<%= @note.title %>&rdquo;</h2>
<h3>Edit &ldquo;<%= @note.title %>&rdquo;</h3>
</div>

<%= render 'form' %>
2 changes: 1 addition & 1 deletion app/views/notes/new.html.erb
@@ -1,5 +1,5 @@
<div class="page-header">
<h2>Add a New Note</h2>
<h3>Add a New Note</h3>
</div>

<%= render 'form' %>
4 changes: 2 additions & 2 deletions app/views/notes/show.html.erb
@@ -1,12 +1,12 @@
<div class="page-header">
<h2>
<h3>
<%= render 'shared/favorite', :item => @note %>
<%= @note.title %>
<% if @note.groups.present? %><small><%= @note.groups.map(&:name).join(', ') %></small><% end %>
<%= link_to 'Delete', note_path, :class => 'btn btn-small btn-danger pull-right', :confirm => 'Are you sure you want to delete this note?', :method => :delete %>
<%= link_to 'Edit', edit_note_path, :class=> 'btn btn-small pull-right' %>
</h2>
</h3>
</div>

<%= render 'form' %>
2 changes: 1 addition & 1 deletion app/views/sessions/new.html.erb
@@ -1,5 +1,5 @@
<div class="page-header offset">
<h2>Login</h2>
<h3>Login</h3>
</div>

<%= form_tag sessions_path, :class => 'span3 offset4' do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/software_licenses/edit.html.erb
@@ -1,5 +1,5 @@
<div class="page-header">
<h2>Edit &ldquo;<%= @license.title %>&rdquo;</h2>
<h3>Edit &ldquo;<%= @license.title %>&rdquo;</h3>
</div>

<%= render 'form' %>
2 changes: 1 addition & 1 deletion app/views/software_licenses/new.html.erb
@@ -1,5 +1,5 @@
<div class="page-header">
<h2>Add a New License</h2>
<h3>Add a New License</h3>
</div>

<%= render 'form' %>
4 changes: 2 additions & 2 deletions app/views/software_licenses/show.html.erb
@@ -1,12 +1,12 @@
<div class="page-header">
<h2>
<h3>
<%= render 'shared/favorite', :item => @license %>
<%= @license.title %>
<% if @license.groups.present? %><small><%= @license.groups.map(&:name).join(', ') %></small><% end %>
<%= link_to 'Delete', software_license_path, :class => 'btn btn-small btn-danger pull-right', :confirm => 'Are you sure you want to delete this license?', :method => :delete %>
<%= link_to 'Edit', edit_software_license_path, :class=> 'btn btn-small pull-right' %>
</h2>
</h3>
</div>

<%= render 'form' %>

0 comments on commit 38314a4

Please sign in to comment.