From 39fb6f6704c657b956f4c9b79d043c7bfa51b5cc Mon Sep 17 00:00:00 2001
From: Beatriz Rezener <beatrizrezener@gmail.com>
Date: Fri, 10 Oct 2014 13:57:48 -0300
Subject: [PATCH] Changing application layout and tests. Ref bootstrap removed. #124.

---
 Gemfile                                | 2 +-
 Gemfile.lock                           | 1 -
 app/views/layouts/application.html.erb | 5 ++---
 features/homepage.feature              | 2 +-
 features/project/create.feature        | 2 +-
 features/users/user_projects.feature   | 2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 57f8bf8..e55e5d0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,7 @@ gem 'kalibro_gatekeeper_client', '~> 1.0.0'
 gem "pg", "~> 0.17.0"
 
 # Twitter Bootstrap for layout
-gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git', :ref => '3edf24d' #Fixed the ref so it does not update accidentaly and breaks
+gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git'
 
 # Chart generation
 gem "chart-js-rails", "~> 0.0.6"
diff --git a/Gemfile.lock b/Gemfile.lock
index 00f5662..48d5aa8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,6 @@
 GIT
   remote: git://github.com/seyhunak/twitter-bootstrap-rails.git
   revision: 3edf24de985d946f16a2781644289cfdc51ba95b
-  ref: 3edf24d
   specs:
     twitter-bootstrap-rails (3.2.0)
       actionpack (>= 3.1)
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index f4984d6..2ce2dc5 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -83,9 +83,8 @@
           <div class="well sidebar-nav">
             <ul class="list-group">
               <% if user_signed_in? %>
-                <li class="nav-header">User info</li>
-                <li class="list-group-item">Hello, <strong><%= current_user.name %></strong></li>
-                <li class="list-group-item"><%= link_to 'My projects', user_projects_path(current_user.id) %></li>
+                <li class="nav-header">Hello, <strong><%= current_user.name %></strong></li>
+                <li class="list-group-item"><%= link_to 'Your projects', user_projects_path(current_user.id) %></li>
               <% end %>
               <li class="nav-header">Tutorials</li>
               <li class="list-group-item"><%= link_to 'Analysis', tutorials_path('analyzing') %></li>
diff --git a/features/homepage.feature b/features/homepage.feature
index a8fdfd5..f1dda5a 100644
--- a/features/homepage.feature
+++ b/features/homepage.feature
@@ -18,4 +18,4 @@ Feature: Homepage
     And I should see "Sign Out"
     And I should see "Latest projects"
     And I should see "Project"
-    And I should see "My projects"
\ No newline at end of file
+    And I should see "Your projects"
\ No newline at end of file
diff --git a/features/project/create.feature b/features/project/create.feature
index ef70ec4..f15848b 100644
--- a/features/project/create.feature
+++ b/features/project/create.feature
@@ -42,6 +42,6 @@ Feature: Project Creation
     Given I am a regular user
     And I am signed in
     And I am at the homepage
-    And I click the My projects link
+    And I click the Your projects link
     When I click the New Project link
     Then I should see "New Project"
\ No newline at end of file
diff --git a/features/users/user_projects.feature b/features/users/user_projects.feature
index 5a2716e..75a5e1d 100644
--- a/features/users/user_projects.feature
+++ b/features/users/user_projects.feature
@@ -9,6 +9,6 @@ Feature: User projects list
     And I own a sample project
     And I am signed in
     And I am at the homepage
-    When I click the My projects link
+    When I click the Your projects link
     Then I should be in the User Projects page
     And the sample project should be there
\ No newline at end of file
--
libgit2 0.21.2