will/Open-Source-Access-Control-Web-Interface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjusting profile display

Browse Source
This commit is contained in:
Will Bradley 2013-08-29 01:38:40 -07:00
parent f4868a32ae
commit d1ba469767
3 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/application.css
View File

@ -46,9 +46,12 @@ box-shadow: inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);
cursor: pointer; cursor: pointer;
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
} }
.member-status-symbol { .member-status-symbol, .social-icon {
vertical-align: middle; vertical-align: middle;
} }
a.social-link:hover {
background: transparent;
}
.lined-table td { .lined-table td {
border-bottom: 1px dashed black; border-bottom: 1px dashed black;
} }

2
app/views/user_certifications/index.html.erb
View File

@ -1,6 +1,6 @@
<h1>User Certifications</h1> <h1>User Certifications</h1>
<%= link_to 'New User Certification', new_user_certification_path %> <%= link_to 'New User Certification', new_user_certification_path if can? :create, UserCertification %>
<% @grouped_user_certs.sort.each do |cert, user_certifications| %> <% @grouped_user_certs.sort.each do |cert, user_certifications| %>
<dl class="collapsible"> <dl class="collapsible">

61
app/views/users/show.html.erb
View File

@ -1,16 +1,13 @@
<h2><%= @user.name %></h2>
<%= image_tag @user.gravatar_url(:default => "http://members.heatsynclabs.org/assets/nil.png") %> <%= image_tag @user.gravatar_url(:default => "http://members.heatsynclabs.org/assets/nil.png") %>
<p> <p>
<%= raw(@user.member_status_symbol) %> <%= raw(@user.member_status_symbol) %>
<%= link_to image_tag 'twitter.png', @user.twitter_url if @user.twitter_url.present? %> <%= link_to image_tag('/twitter.png', :class => 'social-icon', :title => "Twitter"), @user.twitter_url, :class => 'social-link' if @user.twitter_url.present? %>
<%= link_to image_tag 'facebook.png', @user.facebook_url if @user.facebook_url.present? %> <%= link_to image_tag('/facebook.png', :class => 'social-icon', :title => "Facebook"), @user.facebook_url, :class => 'social-link' if @user.facebook_url.present? %>
<%= link_to image_tag 'github.png', @user.github_url if @user.github_url.present? %> <%= link_to image_tag('/github.png', :class => 'social-icon', :title => "Github"), @user.github_url, :class => 'social-link' if @user.github_url.present? %>
<%= link_to image_tag 'website.png', @user.website_url if @user.website_url.present? %> <%= link_to image_tag('/website.png', :class => 'social-icon', :title => "Website"), @user.website_url, :class => 'social-link' if @user.website_url.present? %>
</p>
<p>
<b>Name:</b>
<%= @user.name %>
</p> </p>
<% if current_user.admin? || @user.email_visible %> <% if current_user.admin? || @user.email_visible %>
@ -26,15 +23,13 @@
<%= @user.phone %> <%= @user.phone %>
</p> </p>
<% end %> <% end %>
<p> <p>
<b>Waiver?</b> <b>Current Skills:</b>
<%= @user.waiver.strftime("%B %d %Y") unless @user.waiver.blank? %> <%= simple_format @user.current_skills %>
</p> </p>
<p> <p>
<b>Instructor?</b> <b>Desired Skills:</b>
<%= @user.instructor? %> <%= simple_format @user.desired_skills %>
</p> </p>
<% if current_user.admin? then %> <% if current_user.admin? then %>
@ -67,14 +62,7 @@
<%= @user.payee %> <%= @user.payee %>
</p> </p>
<% end %> <% end %>
<p>
<b>Current Skills:</b>
<%= simple_format @user.current_skills %>
</p>
<p>
<b>Desired Skills:</b>
<%= simple_format @user.desired_skills %>
</p>
<% if current_user.admin? then %> <% if current_user.admin? then %>
<p> <p>
<b>Found HeatSync via:</b> <b>Found HeatSync via:</b>
@ -85,6 +73,14 @@
<%= simple_format @user.exit_reason %> <%= simple_format @user.exit_reason %>
</p> </p>
<% end %> <% end %>
<b>Certifications: </b><%= link_to "+ Add", (new_user_certification_path+"?user="+@user.id.to_s), :class => 'btn' if can? :create, UserCertification %>
<ul>
<% @user.certifications.each do |certification| %>
<li><%= link_to certification.name, certification %></li>
<% end %>
<% if @user.certifications.blank? %><li>n/a</li><% end %>
</ul>
<p> <p>
<b>Card: </b><%= link_to "+ Add", (new_card_path+"?user="+@user.id.to_s), :class => 'btn' if can? :create, Card %> <b>Card: </b><%= link_to "+ Add", (new_card_path+"?user="+@user.id.to_s), :class => 'btn' if can? :create, Card %>
<% if current_user.admin? then %> <% if current_user.admin? then %>
@ -98,14 +94,6 @@
<% end %> <% end %>
</p> </p>
<b>Certifications: </b><%= link_to "+ Add", (new_user_certification_path+"?user="+@user.id.to_s), :class => 'btn' if can? :create, UserCertification %>
<ul>
<% @user.certifications.each do |certification| %>
<li><%= link_to certification.name, certification %></li>
<% end %>
<% if @user.certifications.blank? %><li>n/a</li><% end %>
</ul>
<p> <p>
<% if current_user.admin? then %> <% if current_user.admin? then %>
<b>Payments:</b> <b>Payments:</b>
@ -125,6 +113,17 @@
<% end %> <% end %>
</p> </p>
<p>
<b>Waiver?</b>
<%= @user.waiver.strftime("%B %d %Y") unless @user.waiver.blank? %>
</p>
<p>
<b>Instructor?</b>
<%= @user.instructor? %>
</p>
<% if current_user.admin? then %> <% if current_user.admin? then %>
<p> <p>
<b>Created:</b> <b>Created:</b>