Download as
Browse Code »

Commit 7ee5afd218372fa3d6523d983ee58a16888cfba7

Authored by Rafael Manzo
1 parent 4e7a04a6
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Layout adjusts

Showing 22 changed files with 80 additions and 52 deletions   Show diff stats
app/assets/images/fork-me.png 0 → 100644
View file @7ee5afd

1.55 KB
app/views/devise/confirmations/new.html.erb
  Diff comments   View file @7ee5afd
1 -<h1>Resend confirmation instructions</h1> 1 +<div class="page-header">
  2 + <h1>Resend confirmation instructions</h1>
  3 +</div>
2 4
3 <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %> 5 <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
4 <%= devise_error_messages! %> 6 <%= devise_error_messages! %>
app/views/devise/passwords/edit.html.erb
  Diff comments   View file @7ee5afd
1 -<h1>Change your password</h1> 1 +<div class="page-header">
  2 + <h1>Change your password</h1>
  3 +</div>
2 4
3 <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %> 5 <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
4 <%= devise_error_messages! %> 6 <%= devise_error_messages! %>
app/views/devise/passwords/new.html.erb
  Diff comments   View file @7ee5afd
1 -<h1>Forgot your password?</h1> 1 +<div class="page-header">
  2 + <h1>Forgot your password?</h1>
  3 +</div>
2 4
3 <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %> 5 <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
4 <%= devise_error_messages! %> 6 <%= devise_error_messages! %>
app/views/devise/registrations/edit.html.erb
  Diff comments   View file @7ee5afd
1 -<h1>Edit <%= resource_name.to_s.humanize %></h1> 1 +<div class="page-header">
  2 + <h1>Edit <%= resource_name.to_s.humanize %></h1>
  3 +</div>
2 4
3 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %> 5 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
4 <%= devise_error_messages! %> 6 <%= devise_error_messages! %>
@@ -25,6 +27,8 @@ @@ -25,6 +27,8 @@
25 <div><%= f.submit "Update", class: 'btn btn-primary' %></div> 27 <div><%= f.submit "Update", class: 'btn btn-primary' %></div>
26 <% end %> 28 <% end %>
27 29
  30 +<hr />
  31 +
28 <h2>Cancel my account</h2> 32 <h2>Cancel my account</h2>
29 33
30 <p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete, class: 'btn btn-danger' %></p> 34 <p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete, class: 'btn btn-danger' %></p>
app/views/devise/registrations/new.html.erb
  Diff comments   View file @7ee5afd
1 -<h1>Sign up</h1> 1 +<div class="page-header">
  2 + <h1>Sign up</h1>
  3 +</div>
2 4
3 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %> 5 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
4 <%= devise_error_messages! %> 6 <%= devise_error_messages! %>
5 7
6 - <div><%= f.label :name %><br />  
7 - <%= f.text_field :name, :autofocus => true %></div> 8 + <div><%= f.label :name, class: 'control-label' %><br />
  9 + <%= f.text_field :name, :autofocus => true, class: 'form-control' %></div>
8 10
9 - <div><%= f.label :email %><br />  
10 - <%= f.email_field :email %></div> 11 + <div><%= f.label :email, class: 'control-label' %><br />
  12 + <%= f.email_field :email, class: 'form-control' %></div>
11 13
12 - <div><%= f.label :password %><br />  
13 - <%= f.password_field :password %></div> 14 + <div><%= f.label :password, class: 'control-label' %><br />
  15 + <%= f.password_field :password, class: 'form-control' %></div>
14 16
15 - <div><%= f.label :password_confirmation %><br />  
16 - <%= f.password_field :password_confirmation %></div> 17 + <div><%= f.label :password_confirmation, class: 'control-label' %><br />
  18 + <%= f.password_field :password_confirmation, class: 'form-control' %></div>
17 19
18 <div><%= f.submit "Sign up", class: 'btn btn-primary' %></div> 20 <div><%= f.submit "Sign up", class: 'btn btn-primary' %></div>
19 <% end %> 21 <% end %>
20 -  
21 -<%= render "devise/shared/links" %>  
app/views/devise/sessions/new.html.erb
  Diff comments   View file @7ee5afd
1 -<h1>Sign in</h1> 1 +<div class="page-header">
  2 + <h1>Sign in</h1>
  3 +</div>
2 4
3 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> 5 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
4 <div><%= f.label :email %><br /> 6 <div><%= f.label :email %><br />
app/views/devise/shared/_links.erb
  Diff comments   View file @7ee5afd
1 <%- if controller_name != 'sessions' %> 1 <%- if controller_name != 'sessions' %>
2 - <%= link_to "Sign in", new_session_path(resource_name) %><br /> 2 + <%= link_to "Sign in", new_session_path(resource_name), class: 'btn btn-info' %>
3 <% end -%> 3 <% end -%>
4 4
5 <%- if devise_mapping.registerable? && controller_name != 'registrations' %> 5 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
6 - <%= link_to "Sign up", new_registration_path(resource_name) %><br /> 6 + <%= link_to "Sign up", new_registration_path(resource_name), class: 'btn btn-info' %>
7 <% end -%> 7 <% end -%>
8 8
9 <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> 9 <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
10 - <%= link_to "Forgot your password?", new_password_path(resource_name) %><br /> 10 + <%= link_to "Forgot your password?", new_password_path(resource_name), class: 'btn btn-info' %>
11 <% end -%> 11 <% end -%>
12 12
13 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> 13 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
14 - <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br /> 14 + <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: 'btn btn-info' %>
15 <% end -%> 15 <% end -%>
16 16
17 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> 17 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
18 - <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br /> 18 + <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name), class: 'btn btn-info' %>
19 <% end -%> 19 <% end -%>
20 20
21 <%- if devise_mapping.omniauthable? %> 21 <%- if devise_mapping.omniauthable? %>
22 <%- resource_class.omniauth_providers.each do |provider| %> 22 <%- resource_class.omniauth_providers.each do |provider| %>
23 - <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br /> 23 + <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), class: 'btn btn-info' %>
24 <% end -%> 24 <% end -%>
25 <% end -%> 25 <% end -%>
app/views/devise/unlocks/new.html.erb
  Diff comments   View file @7ee5afd
1 -<h1>Resend unlock instructions</h1> 1 +<div class="page-header">
  2 + <h1>Resend unlock instructions</h1>
  3 +</div>
2 4
3 <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %> 5 <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
4 <%= devise_error_messages! %> 6 <%= devise_error_messages! %>
app/views/layouts/application.html.erb
  Diff comments   View file @7ee5afd
@@ -96,8 +96,8 @@ @@ -96,8 +96,8 @@
96 </div><!--/row--> 96 </div><!--/row-->
97 97
98 <footer> 98 <footer>
99 - <div class="footer-left">&copy; <%= link_to "The Mezuro Team", "humans.txt" %> 2013</div>  
100 - <div class="footer-right"><%= link_to(image_tag('agplv3-88x31.png'), 'http://www.gnu.org/licenses/agpl-3.0-standalone.html') %> <%= link_to "Fork me", "https://github.com/mezuro/mezuro-standalone" %></div> 99 + <div class="footer-left">&copy; <%= link_to "The Mezuro Team", "/humans.txt" %> 2013</div>
  100 + <div class="footer-right"><%= link_to(image_tag('agplv3-88x31.png'), 'http://www.gnu.org/licenses/agpl-3.0-standalone.html') %> <%= link_to image_tag('fork-me.png'), "https://github.com/mezuro/mezuro-standalone" %></div>
101 </footer> 101 </footer>
102 102
103 </div> <!-- /container --> 103 </div> <!-- /container -->
app/views/projects/_form.html.erb
  Diff comments   View file @7ee5afd
@@ -11,5 +11,5 @@ @@ -11,5 +11,5 @@
11 <%= f.text_area :description, class: 'form-control' %> 11 <%= f.text_area :description, class: 'form-control' %>
12 </div> 12 </div>
13 13
14 - <%= f.submit 'Save', class: 'btn btn-default' %> 14 + <%= f.submit 'Save', class: 'btn btn-primary' %>
15 <% end %> 15 <% end %>
app/views/projects/edit.html.erb
  Diff comments   View file @7ee5afd
1 -<h1>Edit Project</h1> 1 +<div class="page-header">
  2 + <h1>Edit Project</h1>
  3 +</div>
2 4
3 <%= render 'form' %> 5 <%= render 'form' %>
4 6
app/views/projects/index.html.erb
  Diff comments   View file @7ee5afd
1 -<h1>Listing Projects</h1> 1 +<div class="page-header">
  2 + <h1>Projects</h1>
  3 +</div>
2 4
3 <p><%= link_to 'New Project', new_project_path, class: 'btn btn-primary' %></p> 5 <p><%= link_to 'New Project', new_project_path, class: 'btn btn-primary' %></p>
4 6
@@ -7,7 +9,7 @@ @@ -7,7 +9,7 @@
7 <tr> 9 <tr>
8 <th>Name</th> 10 <th>Name</th>
9 <th>Description</th> 11 <th>Description</th>
10 - <th colspan="2">Options</th> 12 + <th colspan="2"></th>
11 </tr> 13 </tr>
12 </thead> 14 </thead>
13 15
app/views/projects/new.html.erb
  Diff comments   View file @7ee5afd
1 -<h1>New Project</h1> 1 +<div class="page-header">
  2 + <h1>New Project</h1>
  3 +</div>
2 4
3 <%= render 'form' %> 5 <%= render 'form' %>
app/views/projects/show.html.erb
  Diff comments   View file @7ee5afd
1 -<p>  
2 - <strong>Name:</strong>  
3 - <%= @project.name %>  
4 -</p> 1 +<div class="page-header">
  2 + <h1><%= @project.name %></h1>
  3 +</div>
5 4
6 <p> 5 <p>
7 <strong>Description:</strong> 6 <strong>Description:</strong>
8 <%= @project.description %> 7 <%= @project.description %>
9 </p> 8 </p>
10 9
  10 +<hr />
  11 +
11 <h2>Repositories</h2> 12 <h2>Repositories</h2>
12 13
13 <% if project_owner? @project.id %><%= link_to 'New Repository', new_project_repository_path(@project,), class: 'btn btn-primary' %><% end %> 14 <% if project_owner? @project.id %><%= link_to 'New Repository', new_project_repository_path(@project,), class: 'btn btn-primary' %><% end %>
@@ -18,7 +19,7 @@ @@ -18,7 +19,7 @@
18 <th>Name</th> 19 <th>Name</th>
19 <th>Type</th> 20 <th>Type</th>
20 <th>Address</th> 21 <th>Address</th>
21 - <th colspan="2">Options</th> 22 + <th colspan="2"></th>
22 </tr> 23 </tr>
23 </thead> 24 </thead>
24 25
@@ -30,7 +31,7 @@ @@ -30,7 +31,7 @@
30 <td><%= repository.address %></td> 31 <td><%= repository.address %></td>
31 <td> 32 <td>
32 <% if project_owner? @project.id %> 33 <% if project_owner? @project.id %>
33 - <%= link_to 'Edit', edit_project_repository_path(@project, repository.id) %> 34 + <%= link_to 'Edit', edit_project_repository_path(@project, repository.id), class: 'btn btn-info' %>
34 <% end %> 35 <% end %>
35 </td> 36 </td>
36 <td> 37 <td>
@@ -41,8 +42,10 @@ @@ -41,8 +42,10 @@
41 </tbody> 42 </tbody>
42 </table> 43 </table>
43 44
  45 +<hr />
  46 +
44 <p> 47 <p>
45 <% if project_owner? @project.id %> 48 <% if project_owner? @project.id %>
46 - <%= link_to 'Destroy', project_path(@project.id), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger' %> 49 + <%= link_to 'Destroy project', project_path(@project.id), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger' %>
47 <% end %> 50 <% end %>
48 </p> 51 </p>
app/views/repositories/_form.html.erb
  Diff comments   View file @7ee5afd
@@ -21,7 +21,4 @@ @@ -21,7 +21,4 @@
21 <%= f.select( :configuration_id, configuration_list, {class: 'form-control'} ) %> 21 <%= f.select( :configuration_id, configuration_list, {class: 'form-control'} ) %>
22 </div> 22 </div>
23 23
24 -<div class="actions">  
25 - <%= f.submit %>  
26 -</div>  
27 - 24 +<%= f.submit 'Save', class: 'btn btn-primary' %>
app/views/repositories/edit.html.erb
  Diff comments   View file @7ee5afd
1 -<h1>Editing repository</h1> 1 +<div class="page-header">
  2 + <h1>Editing repository</h1>
  3 +</div>
  4 +
2 <%= form_for(@repository, :url => project_repository_update_url(@project_id, @repository.id), method: :put) do |f| %> 5 <%= form_for(@repository, :url => project_repository_update_url(@project_id, @repository.id), method: :put) do |f| %>
3 <%= render partial: 'form', locals: {f: f} %> 6 <%= render partial: 'form', locals: {f: f} %>
  7 + <%= link_to 'Back', project_path(@project_id), class: 'btn btn-default' %>
4 <% end %> 8 <% end %>
5 9
6 -<%= link_to 'Show', project_repository_path(@project_id, @repository) %> |  
7 -<%= link_to 'Back', project_repositories_path(@project_id) %>  
app/views/repositories/new.html.erb
  Diff comments   View file @7ee5afd
1 -<h1>New Repository</h1> 1 +<div class="page-header">
  2 + <h1>New Repository</h1>
  3 +</div>
2 4
3 <%= form_for(@repository, :url => project_repositories_url(@project_id)) do |f| %> 5 <%= form_for(@repository, :url => project_repositories_url(@project_id)) do |f| %>
4 <%= render partial: 'form', locals: {f: f} %> 6 <%= render partial: 'form', locals: {f: f} %>
  7 + <%= link_to 'Back', project_path(@project_id), class: 'btn btn-default' %>
5 <% end %> 8 <% end %>
6 9
7 -<%= link_to 'Back', project_path(@project_id)%>  
8 -  
9 -  
app/views/repositories/show.html.erb
  Diff comments   View file @7ee5afd
1 -<h1><%= @repository.name %></h1> 1 +<div class="page-header">
  2 + <h1><%= @repository.name %></h1>
  3 +</div>
2 4
3 <p> 5 <p>
4 <strong>Description:</strong> 6 <strong>Description:</strong>
@@ -15,6 +17,8 @@ @@ -15,6 +17,8 @@
15 <%= @configuration.name %> 17 <%= @configuration.name %>
16 </p> 18 </p>
17 19
  20 +<hr/>
  21 +
18 <h2>Processing information</h2> 22 <h2>Processing information</h2>
19 23
20 <p> 24 <p>
@@ -36,6 +40,8 @@ @@ -36,6 +40,8 @@
36 <% end %> 40 <% end %>
37 <% end %> 41 <% end %>
38 42
  43 +<hr/>
  44 +
39 <%= link_to 'Back', project_path(@repository.project_id), class: 'btn btn-default' %> 45 <%= link_to 'Back', project_path(@repository.project_id), class: 'btn btn-default' %>
40 <% if project_owner? @repository.project_id %> 46 <% if project_owner? @repository.project_id %>
41 <%= link_to 'Destroy', project_repository_path(@repository.project_id, @repository.id), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger' %> 47 <%= link_to 'Destroy', project_repository_path(@repository.project_id, @repository.id), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger' %>
features/project/deletion.feature
  Diff comments   View file @7ee5afd
@@ -23,6 +23,6 @@ Feature: Project Deletion @@ -23,6 +23,6 @@ Feature: Project Deletion
23 And I am signed in 23 And I am signed in
24 And I own a sample project 24 And I own a sample project
25 And I am at the Sample Project page 25 And I am at the Sample Project page
26 - When I click the Destroy link 26 + When I click the Destroy project link
27 Then I should be in the All Projects page 27 Then I should be in the All Projects page
28 And the sample project should not be there 28 And the sample project should not be there
29 \ No newline at end of file 29 \ No newline at end of file
features/project/listing.feature
  Diff comments   View file @7ee5afd
@@ -6,7 +6,7 @@ Feature: Project listing @@ -6,7 +6,7 @@ Feature: Project listing
6 Scenario: Listing projects 6 Scenario: Listing projects
7 Given I am at the homepage 7 Given I am at the homepage
8 When I click the Project link 8 When I click the Project link
9 - Then I should see "Listing Projects" 9 + Then I should see "Projects"
10 And I should see "Name" 10 And I should see "Name"
11 And I should see "Description" 11 And I should see "Description"
12 12
features/step_definitions/project_steps.rb
  Diff comments   View file @7ee5afd
@@ -52,7 +52,7 @@ Then(/^the sample project should be there$/) do @@ -52,7 +52,7 @@ Then(/^the sample project should be there$/) do
52 end 52 end
53 53
54 Then(/^I should be in the All Projects page$/) do 54 Then(/^I should be in the All Projects page$/) do
55 - page.should have_content("Listing Projects") 55 + page.should have_content("Projects")
56 end 56 end
57 57
58 Then(/^I should be in the Edit Project page$/) do 58 Then(/^I should be in the Edit Project page$/) do