From 7ee5afd218372fa3d6523d983ee58a16888cfba7 Mon Sep 17 00:00:00 2001 From: Rafael Reggiani Manzo Date: Sat, 26 Oct 2013 09:57:29 -0200 Subject: [PATCH] Layout adjusts --- app/assets/images/fork-me.png | Bin 0 -> 1587 bytes app/views/devise/confirmations/new.html.erb | 4 +++- app/views/devise/passwords/edit.html.erb | 4 +++- app/views/devise/passwords/new.html.erb | 4 +++- app/views/devise/registrations/edit.html.erb | 6 +++++- app/views/devise/registrations/new.html.erb | 22 +++++++++++----------- app/views/devise/sessions/new.html.erb | 4 +++- app/views/devise/shared/_links.erb | 12 ++++++------ app/views/devise/unlocks/new.html.erb | 4 +++- app/views/layouts/application.html.erb | 4 ++-- app/views/projects/_form.html.erb | 2 +- app/views/projects/edit.html.erb | 4 +++- app/views/projects/index.html.erb | 6 ++++-- app/views/projects/new.html.erb | 4 +++- app/views/projects/show.html.erb | 17 ++++++++++------- app/views/repositories/_form.html.erb | 5 +---- app/views/repositories/edit.html.erb | 8 +++++--- app/views/repositories/new.html.erb | 8 ++++---- app/views/repositories/show.html.erb | 8 +++++++- features/project/deletion.feature | 2 +- features/project/listing.feature | 2 +- features/step_definitions/project_steps.rb | 2 +- 22 files changed, 80 insertions(+), 52 deletions(-) create mode 100644 app/assets/images/fork-me.png diff --git a/app/assets/images/fork-me.png b/app/assets/images/fork-me.png new file mode 100644 index 0000000..cfdc5be Binary files /dev/null and b/app/assets/images/fork-me.png differ diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index 5eaafcd..1a6c202 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -1,4 +1,6 @@ -

Resend confirmation instructions

+
+

Resend confirmation instructions

+
<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %> <%= devise_error_messages! %> diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb index 07a1901..5ccfcfb 100644 --- a/app/views/devise/passwords/edit.html.erb +++ b/app/views/devise/passwords/edit.html.erb @@ -1,4 +1,6 @@ -

Change your password

+
+

Change your password

+
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %> <%= devise_error_messages! %> diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 1b7d872..9cf19a7 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,4 +1,6 @@ -

Forgot your password?

+
+

Forgot your password?

+
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %> <%= devise_error_messages! %> diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index 7acec70..7b54cde 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -1,4 +1,6 @@ -

Edit <%= resource_name.to_s.humanize %>

+
+

Edit <%= resource_name.to_s.humanize %>

+
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %> <%= devise_error_messages! %> @@ -25,6 +27,8 @@
<%= f.submit "Update", class: 'btn btn-primary' %>
<% end %> +
+

Cancel my account

Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete, class: 'btn btn-danger' %>

diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 307c920..3ef3f7a 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,21 +1,21 @@ -

Sign up

+
+

Sign up

+
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %> <%= devise_error_messages! %> -
<%= f.label :name %>
- <%= f.text_field :name, :autofocus => true %>
+
<%= f.label :name, class: 'control-label' %>
+ <%= f.text_field :name, :autofocus => true, class: 'form-control' %>
-
<%= f.label :email %>
- <%= f.email_field :email %>
+
<%= f.label :email, class: 'control-label' %>
+ <%= f.email_field :email, class: 'form-control' %>
-
<%= f.label :password %>
- <%= f.password_field :password %>
+
<%= f.label :password, class: 'control-label' %>
+ <%= f.password_field :password, class: 'form-control' %>
-
<%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation %>
+
<%= f.label :password_confirmation, class: 'control-label' %>
+ <%= f.password_field :password_confirmation, class: 'form-control' %>
<%= f.submit "Sign up", class: 'btn btn-primary' %>
<% end %> - -<%= render "devise/shared/links" %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index cd75405..d3d9f33 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,4 +1,6 @@ -

Sign in

+
+

Sign in

+
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<%= f.label :email %>
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb index d84bdde..b7b6bdc 100644 --- a/app/views/devise/shared/_links.erb +++ b/app/views/devise/shared/_links.erb @@ -1,25 +1,25 @@ <%- if controller_name != 'sessions' %> - <%= link_to "Sign in", new_session_path(resource_name) %>
+ <%= link_to "Sign in", new_session_path(resource_name), class: 'btn btn-info' %> <% end -%> <%- if devise_mapping.registerable? && controller_name != 'registrations' %> - <%= link_to "Sign up", new_registration_path(resource_name) %>
+ <%= link_to "Sign up", new_registration_path(resource_name), class: 'btn btn-info' %> <% end -%> <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> - <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+ <%= link_to "Forgot your password?", new_password_path(resource_name), class: 'btn btn-info' %> <% end -%> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> - <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+ <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: 'btn btn-info' %> <% end -%> <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> - <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+ <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name), class: 'btn btn-info' %> <% end -%> <%- if devise_mapping.omniauthable? %> <%- resource_class.omniauth_providers.each do |provider| %> - <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
+ <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), class: 'btn btn-info' %> <% end -%> <% end -%> diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb index 9482404..b061eb0 100644 --- a/app/views/devise/unlocks/new.html.erb +++ b/app/views/devise/unlocks/new.html.erb @@ -1,4 +1,6 @@ -

Resend unlock instructions

+
+

Resend unlock instructions

+
<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %> <%= devise_error_messages! %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 07ba868..21b68b5 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -96,8 +96,8 @@
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb index ad0a359..0f457f9 100644 --- a/app/views/projects/_form.html.erb +++ b/app/views/projects/_form.html.erb @@ -11,5 +11,5 @@ <%= f.text_area :description, class: 'form-control' %> - <%= f.submit 'Save', class: 'btn btn-default' %> + <%= f.submit 'Save', class: 'btn btn-primary' %> <% end %> diff --git a/app/views/projects/edit.html.erb b/app/views/projects/edit.html.erb index c817177..d6956e4 100644 --- a/app/views/projects/edit.html.erb +++ b/app/views/projects/edit.html.erb @@ -1,4 +1,6 @@ -

Edit Project

+
+

Edit Project

+
<%= render 'form' %> diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index 6c18d32..17527f2 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -1,4 +1,6 @@ -

Listing Projects

+
+

Projects

+

<%= link_to 'New Project', new_project_path, class: 'btn btn-primary' %>

@@ -7,7 +9,7 @@ Name Description - Options + diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb index 90fbe5e..8df6de4 100644 --- a/app/views/projects/new.html.erb +++ b/app/views/projects/new.html.erb @@ -1,3 +1,5 @@ -

New Project

+
+

New Project

+
<%= render 'form' %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index bf7bcab..478e1fd 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -1,13 +1,14 @@ -

- Name: - <%= @project.name %> -

+
+

<%= @project.name %>

+

Description: <%= @project.description %>

+
+

Repositories

<% if project_owner? @project.id %><%= link_to 'New Repository', new_project_repository_path(@project,), class: 'btn btn-primary' %><% end %> @@ -18,7 +19,7 @@ Name Type Address - Options + @@ -30,7 +31,7 @@ <%= repository.address %> <% if project_owner? @project.id %> - <%= link_to 'Edit', edit_project_repository_path(@project, repository.id) %> + <%= link_to 'Edit', edit_project_repository_path(@project, repository.id), class: 'btn btn-info' %> <% end %> @@ -41,8 +42,10 @@ +
+

<% if project_owner? @project.id %> - <%= link_to 'Destroy', project_path(@project.id), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger' %> + <%= link_to 'Destroy project', project_path(@project.id), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger' %> <% end %>

diff --git a/app/views/repositories/_form.html.erb b/app/views/repositories/_form.html.erb index 0061704..96bf605 100644 --- a/app/views/repositories/_form.html.erb +++ b/app/views/repositories/_form.html.erb @@ -21,7 +21,4 @@ <%= f.select( :configuration_id, configuration_list, {class: 'form-control'} ) %> -
- <%= f.submit %> -
- +<%= f.submit 'Save', class: 'btn btn-primary' %> diff --git a/app/views/repositories/edit.html.erb b/app/views/repositories/edit.html.erb index fc82c38..8d54907 100644 --- a/app/views/repositories/edit.html.erb +++ b/app/views/repositories/edit.html.erb @@ -1,7 +1,9 @@ -

Editing repository

+
+

Editing repository

+
+ <%= form_for(@repository, :url => project_repository_update_url(@project_id, @repository.id), method: :put) do |f| %> <%= render partial: 'form', locals: {f: f} %> + <%= link_to 'Back', project_path(@project_id), class: 'btn btn-default' %> <% end %> -<%= link_to 'Show', project_repository_path(@project_id, @repository) %> | -<%= link_to 'Back', project_repositories_path(@project_id) %> diff --git a/app/views/repositories/new.html.erb b/app/views/repositories/new.html.erb index 70b5602..a021b13 100644 --- a/app/views/repositories/new.html.erb +++ b/app/views/repositories/new.html.erb @@ -1,9 +1,9 @@ -

New Repository

+
+

New Repository

+
<%= form_for(@repository, :url => project_repositories_url(@project_id)) do |f| %> <%= render partial: 'form', locals: {f: f} %> + <%= link_to 'Back', project_path(@project_id), class: 'btn btn-default' %> <% end %> -<%= link_to 'Back', project_path(@project_id)%> - - diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index a27d867..33a534a 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -1,4 +1,6 @@ -

<%= @repository.name %>

+
+

<%= @repository.name %>

+

Description: @@ -15,6 +17,8 @@ <%= @configuration.name %>

+
+

Processing information

@@ -36,6 +40,8 @@ <% end %> <% end %> +

+ <%= link_to 'Back', project_path(@repository.project_id), class: 'btn btn-default' %> <% if project_owner? @repository.project_id %> <%= link_to 'Destroy', project_repository_path(@repository.project_id, @repository.id), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger' %> diff --git a/features/project/deletion.feature b/features/project/deletion.feature index bccaad0..d3b66bb 100644 --- a/features/project/deletion.feature +++ b/features/project/deletion.feature @@ -23,6 +23,6 @@ Feature: Project Deletion And I am signed in And I own a sample project And I am at the Sample Project page - When I click the Destroy link + When I click the Destroy project link Then I should be in the All Projects page And the sample project should not be there \ No newline at end of file diff --git a/features/project/listing.feature b/features/project/listing.feature index 474fe8c..47a90fa 100644 --- a/features/project/listing.feature +++ b/features/project/listing.feature @@ -6,7 +6,7 @@ Feature: Project listing Scenario: Listing projects Given I am at the homepage When I click the Project link - Then I should see "Listing Projects" + Then I should see "Projects" And I should see "Name" And I should see "Description" diff --git a/features/step_definitions/project_steps.rb b/features/step_definitions/project_steps.rb index a57c590..52c23ff 100644 --- a/features/step_definitions/project_steps.rb +++ b/features/step_definitions/project_steps.rb @@ -52,7 +52,7 @@ Then(/^the sample project should be there$/) do end Then(/^I should be in the All Projects page$/) do - page.should have_content("Listing Projects") + page.should have_content("Projects") end Then(/^I should be in the Edit Project page$/) do -- libgit2 0.21.2