Download as
Browse Code »

Commit 39fb6f6704c657b956f4c9b79d043c7bfa51b5cc

Authored by Beatriz Rezener
1 parent 062fb840
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Changing application layout and tests. Ref bootstrap removed. #124. 

Signed-off-by:Beatriz Rezener <beatrizrezener@gmail.com>
Showing 6 changed files with 6 additions and 8 deletions   Show diff stats
@@ -37,7 +37,7 @@ gem &#39;kalibro_gatekeeper_client&#39;, &#39;~&gt; 1.0.0&#39; @@ -37,7 +37,7 @@ gem &#39;kalibro_gatekeeper_client&#39;, &#39;~&gt; 1.0.0&#39;
37 gem "pg", "~> 0.17.0" 37 gem "pg", "~> 0.17.0"
38 38
39 # Twitter Bootstrap for layout 39 # Twitter Bootstrap for layout
40 -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 40 +gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git'
41 41
42 # Chart generation 42 # Chart generation
43 gem "chart-js-rails", "~> 0.0.6" 43 gem "chart-js-rails", "~> 0.0.6"
1 GIT 1 GIT
2 remote: git://github.com/seyhunak/twitter-bootstrap-rails.git 2 remote: git://github.com/seyhunak/twitter-bootstrap-rails.git
3 revision: 3edf24de985d946f16a2781644289cfdc51ba95b 3 revision: 3edf24de985d946f16a2781644289cfdc51ba95b
4 - ref: 3edf24d  
5 specs: 4 specs:
6 twitter-bootstrap-rails (3.2.0) 5 twitter-bootstrap-rails (3.2.0)
7 actionpack (>= 3.1) 6 actionpack (>= 3.1)
app/views/layouts/application.html.erb
  Diff comments   View file @39fb6f6
@@ -83,9 +83,8 @@ @@ -83,9 +83,8 @@
83 <div class="well sidebar-nav"> 83 <div class="well sidebar-nav">
84 <ul class="list-group"> 84 <ul class="list-group">
85 <% if user_signed_in? %> 85 <% if user_signed_in? %>
86 - <li class="nav-header">User info</li>  
87 - <li class="list-group-item">Hello, <strong><%= current_user.name %></strong></li>  
88 - <li class="list-group-item"><%= link_to 'My projects', user_projects_path(current_user.id) %></li> 86 + <li class="nav-header">Hello, <strong><%= current_user.name %></strong></li>
  87 + <li class="list-group-item"><%= link_to 'Your projects', user_projects_path(current_user.id) %></li>
89 <% end %> 88 <% end %>
90 <li class="nav-header">Tutorials</li> 89 <li class="nav-header">Tutorials</li>
91 <li class="list-group-item"><%= link_to 'Analysis', tutorials_path('analyzing') %></li> 90 <li class="list-group-item"><%= link_to 'Analysis', tutorials_path('analyzing') %></li>
features/homepage.feature
  Diff comments   View file @39fb6f6
@@ -18,4 +18,4 @@ Feature: Homepage @@ -18,4 +18,4 @@ Feature: Homepage
18 And I should see "Sign Out" 18 And I should see "Sign Out"
19 And I should see "Latest projects" 19 And I should see "Latest projects"
20 And I should see "Project" 20 And I should see "Project"
21 - And I should see "My projects"  
22 \ No newline at end of file 21 \ No newline at end of file
  22 + And I should see "Your projects"
23 \ No newline at end of file 23 \ No newline at end of file
features/project/create.feature
  Diff comments   View file @39fb6f6
@@ -42,6 +42,6 @@ Feature: Project Creation @@ -42,6 +42,6 @@ Feature: Project Creation
42 Given I am a regular user 42 Given I am a regular user
43 And I am signed in 43 And I am signed in
44 And I am at the homepage 44 And I am at the homepage
45 - And I click the My projects link 45 + And I click the Your projects link
46 When I click the New Project link 46 When I click the New Project link
47 Then I should see "New Project" 47 Then I should see "New Project"
48 \ No newline at end of file 48 \ No newline at end of file
features/users/user_projects.feature
  Diff comments   View file @39fb6f6
@@ -9,6 +9,6 @@ Feature: User projects list @@ -9,6 +9,6 @@ Feature: User projects list
9 And I own a sample project 9 And I own a sample project
10 And I am signed in 10 And I am signed in
11 And I am at the homepage 11 And I am at the homepage
12 - When I click the My projects link 12 + When I click the Your projects link
13 Then I should be in the User Projects page 13 Then I should be in the User Projects page
14 And the sample project should be there 14 And the sample project should be there
15 \ No newline at end of file 15 \ No newline at end of file