Permalink
Browse files

navbar cleaning and mentor table improved

  • Loading branch information...
natem345 committed Apr 14, 2011
1 parent ac7aae8 commit 84690060c7f73b77a71be04b4f5fb3dd5284bb0e
@@ -1,39 +0,0 @@
-<%= form_for(@experience) do |f| %>
- <% if @experience.errors.any? %>
- <div id="error_explanation">
- <h2><%= pluralize(@experience.errors.count, "error") %> prohibited this experience from being saved:</h2>
-
- <ul>
- <% @experience.errors.full_messages.each do |msg| %>
- <li><%= msg %></li>
- <% end %>
- </ul>
- </div>
- <% end %>
-
- <table cellspacing=5>
- <tr>
- <td align="left" valign="top">
- <%= f.label :ability, "Skill" %>
- </td>
- <td align="left">
- <%= select "experience", "ability", Experience::ABILITIES.sort %>
- </td>
- </tr>
- <tr>
- <td align="left" valign="top">
- <%= f.label :comfort_level, "Level of experience" %>
- </td>
- <td align="left">
- <%= select "experience", "comfort_level", (1..10) %><br/>
- 1 is completely unfamiliar, 10 is completely familiar
- </td>
- </tr>
- </table>
- <br/>
-
- <div class="actions">
- <%= f.submit "Save Skill" %>
- </div>
- <br/>
-<% end %>
@@ -1,5 +0,0 @@
-<h1>Edit your skill set</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Back', experiences_path %>
@@ -1,23 +0,0 @@
-<h1>Listing Skills</h1>
-
-<table>
- <tr>
- <th>Skill</th>
- <th>Level of experience (scale of 1-10)</th>
- <th></th>
- <th></th>
- </tr>
-
-<% @experiences.each do |experience| %>
- <tr>
- <td><%= experience.ability %></td>
- <td><%= experience.comfort_level %></td>
- <td><%= link_to 'Edit', edit_experience_path(experience) %></td>
- <td><%= link_to 'Remove', experience, :confirm => 'Are you sure?', :method => :delete %></td>
- </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to 'Add a Skill', new_experience_path %>
@@ -1,5 +0,0 @@
-<h1>Add a Skill</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Back', experiences_path %>
@@ -1,15 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<p>
- <b>Skill:</b>
- <%= @experience.ability %>
-</p>
-
-<p>
- <b>Level of experience:</b>
- <%= @experience.comfort_level %>
-</p>
-
-
-<%= link_to 'Edit', edit_experience_path(@experience) %> |
-<%= link_to 'Back', experiences_path %>
@@ -17,22 +17,20 @@
<a href="/"><img id="navbarLogo" src="/images/corporate_logo.png" /></a>
<ul>
<li><a href="/">Home</a></li>
-<li><a href="/mentors">Browse Mentors</a></li>
-<li><a href="/mentees">Browse Mentees</a></li>
<% if ! session[:usertype] %>
+<li><a href="/mentors">Browse Mentors</a></li>
<li><a href="/users/register">Sign Up</a></li>
<li><a href="/users/login">Login</a></li>
<% else %>
<% if session[:usertype] == :mentor %>
- <li><a href="/mentors/<%= session[:id] %>">My Profile</a></li>
+ <li><a href="/mentees">Browse Mentees</a></li>
<li><a href="/mentors/<%= session[:id] %>/edit">Edit Profile</a></li>
- <li><a href="/availability_calendars/new">Update Availability</a></li>
<li><a href="/requests/">Mentorship Requests</a></li>
<li><a href="/mentorships/">Mentorships</a></li>
<% end %>
<% if session[:usertype] == :mentee %>
- <li><a href="/mentees/<%= session[:id] %>">My Profile</a></li>
+ <li><a href="/mentors">Browse Mentors</a></li>
<li><a href="/mentees/<%= session[:id] %>/edit">Edit Profile</a></li>
<% end %>
<li><a href="/users/logout">Logout</a></li>
@@ -1,3 +1,4 @@
<h1>Edit your Mentee profile</h1>
<%= render 'form' %>
+<a href="/mentees/<%= session[:id] %>">View My Profile</a>
@@ -1,3 +1,6 @@
<h1>Edit your Mentor Profile</h1>
<%= render 'form' %>
+
+<a href="/availability_calendars/new" target="_blank">Update Availability Calendar</a><br />
+<a href="/mentors/<%= session[:id] %>">View My Profile</a>
@@ -1,7 +1,8 @@
<style type="text/css">
#FilterDiv {
-float: left;
+/*float: left; */
width: 200px;
+position:absolute;
}
#FilterDiv label {
display:block;
@@ -12,7 +13,6 @@ color: white;
</style>
<h1>Mentors</h1>
-<br /><br />
<div id="FilterDiv" style="">
<strong>Filter</strong>
<%= form_tag "/mentors", :method => "get" do %>
@@ -40,15 +40,13 @@ color: white;
<a href="/mentors">Clear Filter</a>
</div>
-<table>
+<!--<table>
<tr>
<th>First Name</th>
<th>Location</th>
<th>Current Position</th>
<th>Total Years of Experience</th>
<th></th>
- <!-- <th></th> -->
- <!-- <th></th> -->
</tr>
<% @mentors.each do |mentor| %>
@@ -58,11 +56,50 @@ color: white;
<td><%= mentor.current_position %></td>
<td><%= mentor.total_years_experience %></td>
<td><%= link_to 'View Profile', mentor %></td>
- <!-- <td><%= link_to 'Edit', edit_mentor_path(mentor) %></td> -->
- <!-- <td><%= link_to 'Destroy', mentor, :confirm => 'Are you sure?', :method => :delete %></td> -->
</tr>
<% end %>
-</table>
+</table>-->
+<style>
+.mentorRowCol {
+ display: inline-block;
+ width:200px;
+ vertical-align:top;
+ padding:5px;
+}
+.mentorRowColFirst {
+ width:155px !important;
+}
+.mentorRow {
+ position:relative;
+ left:200px;
+ width:620px;
+ border: 2px red solid;
+ padding:3px;
+ margin:12px 0px;
+}
+</style>
+<% @mentors.each do |mentor| %>
+<div class="mentorRow">
+ <div class="mentorRowCol mentorRowColFirst">
+ <%= link_to mentor.name, mentor %><br />
+ <a href="<%=url_for(mentor) %>"><img src="http://www.actionsportshub.com/uploads/profile/orig/default_profile.gif" width="50" /></a>
+ </div>
+ <div class="mentorRowCol">
+ Location: <%= mentor.location %><br />
+ Current Position: <%= mentor.current_position %><br />
+ Total Years Experience: <%= mentor.total_years_experience %>
+ </div>
+ <div class="mentorRowCol">
+ Skill Set:
+ <% mentor.skills.each do |e| %>
+ <br/><%=e.title%> (<%=e.comfort_level%>)
+ <% end %>
+ </div>
+</div>
+<% end %>
+
<br />
<!-- <%= link_to 'New Mentor', new_mentor_path %> -->
+
+

0 comments on commit 8469006

Please sign in to comment.