playground
/
entrydns
mirror of https://github.com/EntryDNS/entrydns.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

signery fixes

pull/1/head
Nicolae Claudius 11 years ago
parent
b4f5305dd6
commit
7b2f299e36
7 changed files with 138 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      app/assets/stylesheets/theme/navbar.css.scss
  2. 31
      app/views/users/confirmations/new.html.erb
  3. 31
      app/views/users/passwords/new.html.erb
  4. 13
      app/views/users/registrations/new.html.erb
  5. 65
      app/views/users/sessions/new.html.erb
  6. 32
      app/views/users/shared/_links.erb
  7. 31
      app/views/users/unlocks/new.html.erb

13
app/assets/stylesheets/theme/navbar.css.scss
Unescape View File

@ -9,3 +9,16 @@
color: yellow;
}
}
.navbar-vertical {
.navbar-collapse {
padding: 0;
}
.nav-stacked.navbar-nav {
float: none;
margin: 0;
> li {
float: none;
}
}
}

31
app/views/users/confirmations/new.html.erb
Unescape View File

@ -1,20 +1,27 @@
<%= render :partial => "users/shared/links" %>
<br>
<div class="row">
<div class="col-lg-offset-4 col-lg-4 well">
<%= simple_form_for(resource,
as: resource_name,
url: confirmation_path(resource_name),
method: :post
) do |f| %>
<div class="col-md-3">
<%= render 'users/shared/links' %>
</div>
<div class="col-md-offset-2 col-md-4">
<div class="well">
<%= simple_form_for(resource,
as: resource_name,
url: confirmation_path(resource_name),
method: :post
) do |f| %>
<%= devise_error_messages! %>
<%= devise_error_messages! %>
<%= f.input :email, required: true %>
<%= f.input :email, required: true %>
<%= f.submit "Resend confirmation instructions", class: 'btn btn-primary' %>
<% end %>
<%= f.submit "Resend confirmation instructions", class: 'btn btn-primary' %>
<% end %>
</div>
</div>
</div>

31
app/views/users/passwords/new.html.erb
Unescape View File

@ -1,20 +1,27 @@
<%= render :partial => "users/shared/links" %>
<br>
<div class="row">
<div class="col-lg-offset-4 col-lg-4 well">
<%= simple_form_for(resource,
as: resource_name,
url: password_path(resource_name),
method: :post
) do |f| %>
<div class="col-md-3">
<%= render 'users/shared/links' %>
</div>
<div class="col-md-offset-2 col-md-4">
<div class="well">
<%= simple_form_for(resource,
as: resource_name,
url: password_path(resource_name),
method: :post
) do |f| %>
<%= devise_error_messages! %>
<%= devise_error_messages! %>
<%= f.input :email, required: true %>
<%= f.input :email, required: true %>
<%= f.submit "Send me reset password instructions", class: 'btn btn-primary' %>
<% end %>
<%= f.submit "Send reset password instructions", class: 'btn btn-primary' %>
<% end %>
</div>
</div>
</div>

13
app/views/users/registrations/new.html.erb
Unescape View File

@ -1,9 +1,16 @@
<%= render 'users/shared/links' %>
<br>
<div class="row">
<div class="col-lg-offset-4 col-lg-4 well">
<div class="col-md-3">
<%= render 'users/registrations/new' %>
<%= render 'users/shared/links' %>
</div>
<div class="col-md-offset-2 col-md-4">
<div class="well">
<%= render 'users/registrations/new' %>
</div>
</div>
</div>

65
app/views/users/sessions/new.html.erb
Unescape View File

@ -1,36 +1,43 @@
<%= render 'users/shared/links' %>
<br>
<div class="row">
<div class="col-lg-offset-4 col-lg-4 well">
<div class="col-md-3">
<%= render 'users/shared/links' %>
</div>
<div class="col-md-offset-2 col-md-4">
<div class="well">
<p>
<%= link_to user_omniauth_authorize_path(:google_oauth2),
class: 'btn btn-block btn-social btn-google-plus',
'data-no-turbolink' => true do %>
<i class="fa fa-google-plus"></i> Sign in with Google
<% end %>
</p>
<h5 class="text-info text-center text-separator">Or use the form below</h5>
<%= simple_form_for(resource,
as: resource_name,
url: session_path(resource_name)
) do |f| %>
<%= f.input :email, required: true %>
<%= f.input :password, required: true %>
<% if devise_mapping.rememberable? -%>
<%= f.input :remember_me, as: :boolean %>
<% end -%>
<%= f.submit "Sign in", class: 'btn btn-primary' %>
<small>
or <%= link_to "Sign up", new_registration_path(resource_name) %>
/ <%= link_to 'Forgot password', new_password_path(resource_name) %>
</small>
<p>
<%= link_to user_omniauth_authorize_path(:google_oauth2),
class: 'btn btn-block btn-social btn-google-plus',
'data-no-turbolink' => true do %>
<i class="fa fa-google-plus"></i> Sign in with Google
<% end %>
</p>
<h5 class="text-info text-center text-separator">Or use the form below</h5>
<%= simple_form_for(resource,
as: resource_name,
url: session_path(resource_name)
) do |f| %>
<%= f.input :email, required: true %>
<%= f.input :password, required: true %>
<% if devise_mapping.rememberable? -%>
<%= f.input :remember_me, as: :boolean %>
<% end -%>
<%= f.submit "Sign in", class: 'btn btn-primary' %>
<small>
or <%= link_to "Sign up", new_registration_path(resource_name) %>
/ <%= link_to 'Forgot password', new_password_path(resource_name) %>
</small>
<% end %>
</div>
</div>
</div>

32
app/views/users/shared/_links.erb
Unescape View File

@ -1,10 +1,22 @@
<br />
<% semantic_navigation :devise_nav, html: { class: 'nav nav-tabs nav-justified' } do |n| %>
<%= n.item "Sign in", link: new_session_path(resource_name) %>
<%= n.item "Sign up", link: new_registration_path(resource_name) %>
<%= n.item "Forgot password", link: new_password_path(resource_name),
highlights_on: [{ controller: 'devise/passwords' }] %>
<%= n.item "Resend confirmation instructions", link: new_confirmation_path(resource_name) %>
<%= n.item "Resend unlock instructions", link: new_unlock_path(resource_name) %>
<% end %>
</br>
<div class="navbar navbar-vertical navbar-default navbar-links" role="navigation">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-links-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<span class="navbar-brand visible-sm">Menu</span>
</div>
<div class="collapse navbar-collapse navbar-links-collapse">
<% semantic_navigation :devise_nav, html: { class: 'nav nav-stacked navbar-nav' } do |n| %>
<%= n.item "Sign in", link: new_session_path(resource_name) %>
<%= n.item "Sign up", link: new_registration_path(resource_name) %>
<%= n.item "Forgot password", link: new_password_path(resource_name),
highlights_on: [{ controller: 'devise/passwords' }] %>
<%= n.item "Resend confirmation instructions", link: new_confirmation_path(resource_name) %>
<%= n.item "Resend unlock instructions", link: new_unlock_path(resource_name) %>
<% end %>
</div>
</div>

31
app/views/users/unlocks/new.html.erb
Unescape View File

@ -1,20 +1,27 @@
<%= render :partial => "users/shared/links" %>
<br>
<div class="row">
<div class="col-lg-offset-4 col-lg-4 well">
<%= simple_form_for(resource,
as: resource_name,
url: unlock_path(resource_name),
method: :post
) do |f| %>
<div class="col-md-3">
<%= render 'users/shared/links' %>
</div>
<div class="col-md-offset-2 col-md-4">
<div class="well">
<%= simple_form_for(resource,
as: resource_name,
url: unlock_path(resource_name),
method: :post
) do |f| %>
<%= devise_error_messages! %>
<%= devise_error_messages! %>
<%= f.input :email, required: true %>
<%= f.input :email, required: true %>
<%= f.submit "Resend unlock instructions", class: 'btn btn-primary' %>
<% end %>
<%= f.submit "Resend unlock instructions", class: 'btn btn-primary' %>
<% end %>
</div>
</div>
</div>
Write Preview
Loading…
Cancel
Save