Unify not connected pages
This commit is contained in:
flaburgan
parent
7de66abce9
commit
44649e9167
11 changed files with 187 additions and 239 deletions
|
|
@ -96,6 +96,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
|
|||
* Hide sign up button when registrations are disabled [#5612](https://github.com/diaspora/diaspora/pull/5612)
|
||||
* Standardize capitalization throughout the UI [#5588](https://github.com/diaspora/diaspora/pull/5588)
|
||||
* Display photos on the profile page as thumbnails [#5521](https://github.com/diaspora/diaspora/pull/5521)
|
||||
* Unify not connected pages (sign in, sign up, forgot password) [#5391](https://github.com/diaspora/diaspora/pull/5391)
|
||||
|
||||
## Bug fixes
|
||||
* orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)
|
||||
|
|
@ -1252,4 +1253,3 @@ The single-post view will also be revamped/reverted, but that didn't make it int
|
|||
|
||||
|
||||
## Cleanup in maintenance scripts and automated build environment
|
||||
|
||||
|
|
|
|||
|
|
@ -33,12 +33,6 @@ a { color : $link-blue }
|
|||
}
|
||||
}
|
||||
|
||||
#forgot_password,
|
||||
#reset_password {
|
||||
background-image : image_url("texture/light-bg.png");
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.author-name {
|
||||
color: inherit;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,47 +1,36 @@
|
|||
#login,
|
||||
#forgot_password,
|
||||
#reset_password {
|
||||
position : absolute;
|
||||
top : 0;
|
||||
left : 0;
|
||||
padding-top : 200px;
|
||||
min-width : 100%;
|
||||
|
||||
//color : #fff;
|
||||
text-align : center;
|
||||
|
||||
label {
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
input[type=text],
|
||||
input[type=password] {
|
||||
width : 120px;
|
||||
}
|
||||
|
||||
#huge-text {
|
||||
font-family : Roboto-Light;
|
||||
font-size : 200px;
|
||||
color : #ddd;
|
||||
text-shadow : 0 1px 0 #fff;
|
||||
}
|
||||
|
||||
#forgot_password_link {
|
||||
margin : 40px;
|
||||
color : $text-grey;
|
||||
clear : all;
|
||||
}
|
||||
}
|
||||
|
||||
#login {
|
||||
padding-top: 20px;
|
||||
|
||||
.branding-asterisk {
|
||||
margin: auto;
|
||||
width: 154px;
|
||||
height: 154px;
|
||||
}
|
||||
.form-signin {
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
|
||||
.span4.offset4 {
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
|
||||
label {
|
||||
text-transform: uppercase;
|
||||
text-align: right;
|
||||
padding: 10px 0;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
#new_user {
|
||||
display: block;
|
||||
margin: auto;
|
||||
max-width: 400px;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
#login {
|
||||
.form-signin {
|
||||
.form-control {
|
||||
font-size: 16px;
|
||||
height: auto;
|
||||
|
|
@ -74,8 +63,29 @@
|
|||
margin-bottom: -23px;
|
||||
border-radius: 0 0 5px 5px;
|
||||
}
|
||||
#forgot_password_link {
|
||||
margin-top: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
#forgot_password {
|
||||
label {
|
||||
width: 40%;
|
||||
}
|
||||
|
||||
input[type=password] {
|
||||
width: 60%;
|
||||
}
|
||||
}
|
||||
|
||||
#reset_password {
|
||||
label {
|
||||
width: 45%;
|
||||
}
|
||||
|
||||
input[type=password] {
|
||||
width: 55%;
|
||||
}
|
||||
|
||||
#new_user {
|
||||
width: 500px;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,35 +1,35 @@
|
|||
#registration {
|
||||
position:absolute;
|
||||
min-width: 100%;
|
||||
min-height: 100%;
|
||||
background-color : #afc652;
|
||||
color: #fff;
|
||||
|
||||
& > .container-fluid {
|
||||
margin-top: 5%;
|
||||
}
|
||||
|
||||
#create-something-text {
|
||||
font-family : Roboto-Light;
|
||||
font-size : 100px;
|
||||
line-height : 100px;
|
||||
white-space : nowrap;
|
||||
}
|
||||
|
||||
#diaspora-hearts {
|
||||
font-family : Roboto-Light;
|
||||
font-size : 24px;
|
||||
font-size : 30px;
|
||||
margin-top : 0.2em;
|
||||
margin-bottom : 1em;
|
||||
white-space : nowrap;
|
||||
}
|
||||
|
||||
#pod-name {
|
||||
text-align: center;
|
||||
margin: 12px;
|
||||
font-size : 35px;
|
||||
}
|
||||
|
||||
#sign-up-text {
|
||||
font-family : Roboto-Bold;
|
||||
color : #7f9448;
|
||||
margin-bottom : 0.5em;
|
||||
}
|
||||
|
||||
#collage {
|
||||
width : 344px;
|
||||
height : auto;
|
||||
max-width : 95%;
|
||||
#create-something-text,
|
||||
#diaspora-hearts,
|
||||
#sign-up-text {
|
||||
font-family : Roboto-Light;
|
||||
}
|
||||
|
||||
form {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
class PasswordsController < Devise::PasswordsController
|
||||
layout "application", :only => [:new]
|
||||
before_filter -> { @css_framework = :bootstrap }, only: [:new, :create, :edit]
|
||||
layout ->(c) { request.format == :mobile ? "application" : "with_header_with_footer" }
|
||||
before_filter -> { @css_framework = :bootstrap }
|
||||
end
|
||||
|
|
|
|||
|
|
@ -2,26 +2,28 @@
|
|||
= "#{AppConfig.settings.pod_name} / #{t('devise.passwords.edit.change_password')}"
|
||||
|
||||
#reset_password
|
||||
%h1{id: "huge-text"}= AppConfig.settings.pod_name
|
||||
.container-fluid
|
||||
.text-center
|
||||
.branding-asterisk
|
||||
%h1
|
||||
= AppConfig.settings.pod_name
|
||||
|
||||
= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => {:class => "form-horizontal block-form", :method => :put }, :autocomplete => 'off') do |f|
|
||||
= form_for(resource, as: resource_name, url: password_path(resource_name), html: {class: "form-horizontal block-form", method: :put }, autocomplete: 'off') do |f|
|
||||
%fieldset
|
||||
= f.hidden_field :reset_password_token
|
||||
.control-group
|
||||
%label{class: "control-label", for: "user_password", style: "width: 45%; text-align: right; padding: 10px 0; overflow: hidden"}
|
||||
%label{class: "control-label", for: "user_password"}
|
||||
= t('devise.passwords.edit.new_password')
|
||||
.controls
|
||||
= f.password_field :password, :required => true, :placeholder => "••••••••", :autocapitalize => "off", :autocorrect => "off", :autofocus => true, :style => "width: 55%;"
|
||||
= f.password_field :password, required: true, placeholder: "••••••••", autocapitalize: "off", autocorrect: "off", autofocus: true
|
||||
.control-group
|
||||
%label{class: "control-label", for: "user_password_confirmation", style: "width: 45%; text-align: right; padding: 10px 0; overflow: hidden"}
|
||||
%label{class: "control-label", for: "user_password_confirmation"}
|
||||
= t('devise.passwords.edit.confirm_password')
|
||||
.controls
|
||||
= f.password_field :password_confirmation, :required => true, :placeholder => "••••••••", :autocapitalize => "off", :autocorrect => "off", :style => "width: 55%;"
|
||||
= hidden_field(:user, :remember_me, :value => 1)
|
||||
= f.submit t('devise.passwords.edit.change_password'), :class => "new-btn"
|
||||
= f.password_field :password_confirmation, required: true, placeholder: "••••••••", autocapitalize: "off", autocorrect: "off"
|
||||
= hidden_field(:user, :remember_me, value: 1)
|
||||
= f.submit t('devise.passwords.edit.change_password'), class: "btn"
|
||||
|
||||
%br/
|
||||
%br/
|
||||
%br/
|
||||
.text-center
|
||||
= link_to t('devise.shared.links.sign_in'), new_session_path(resource_name)
|
||||
|
||||
|
|
|
|||
|
|
@ -2,21 +2,25 @@
|
|||
= "#{AppConfig.settings.pod_name} / #{t('devise.passwords.new.forgot_password')}"
|
||||
|
||||
#forgot_password
|
||||
%h1{id: "huge-text"}= AppConfig.settings.pod_name
|
||||
.container-fluid
|
||||
.text-center
|
||||
.branding-asterisk
|
||||
%h1
|
||||
= AppConfig.settings.pod_name
|
||||
|
||||
= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => {:class => "form-horizontal block-form"}, :autocomplete => 'off') do |f|
|
||||
= form_for(resource, as: resource_name, url: password_path(resource_name), html: {class: "form-horizontal block-form"}, autocomplete: 'off') do |f|
|
||||
- if !devise_error_messages!.empty?
|
||||
%legend
|
||||
%i= t('devise.passwords.new.no_account') unless devise_error_messages!.empty?
|
||||
%i
|
||||
= t('devise.passwords.new.no_account')
|
||||
%fieldset
|
||||
.control-group
|
||||
%label{class: "control-label", for: "user_email", style: "width: 40%; text-align: center; padding: 10px 0; overflow: hidden"}
|
||||
%label{class: "control-label", for: "user_email"}
|
||||
= t('devise.passwords.new.email')
|
||||
.controls
|
||||
= f.text_field :email, :required => true, :autocapitalize => "off", :placeholder => "••••••••", :autocorrect => "off", :autofocus => true, :style => "width: 60%;"
|
||||
= f.submit t('devise.passwords.new.send_password_instructions'), :class => "new-btn"
|
||||
= f.text_field :email, required: true, autocapitalize: "off", placeholder: "••••••••", autocorrect: "off", autofocus: true
|
||||
= f.submit t('devise.passwords.new.send_password_instructions'), class: "btn"
|
||||
|
||||
%br/
|
||||
%br/
|
||||
%br/
|
||||
.text-center
|
||||
= link_to t('devise.shared.links.sign_in'), new_session_path(resource_name)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
%h2
|
||||
= t('.edit', :name => resource_name.to_s.humanize)
|
||||
= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f|
|
||||
= devise_error_messages!
|
||||
%p
|
||||
= f.label :email
|
||||
%br/
|
||||
= f.text_field :email
|
||||
%p
|
||||
= f.label :password
|
||||
%i = t('.leave_blank')
|
||||
%br/
|
||||
= f.password_field :password
|
||||
%p
|
||||
= f.label :password_confirmation
|
||||
%br/
|
||||
= f.password_field :password_confirmation
|
||||
%p
|
||||
= f.label :current_password
|
||||
%i = t('.password_to_confirm')
|
||||
%br/
|
||||
= f.password_field :current_password
|
||||
%p
|
||||
= f.submit t('.update')
|
||||
%h3 t('.cancel_my_account')
|
||||
%p
|
||||
= t('.unhappy') #{link_to t('.cancel_my_account'), registration_path(resource_name), :data => { :confirm => t('are_you_sure') }, :method => :delete}.
|
||||
= link_to t('back'), :back
|
||||
51
app/views/registrations/new.haml
Normal file
51
app/views/registrations/new.haml
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
#registration
|
||||
.container-fluid
|
||||
.row-fluid
|
||||
.span10.offset1
|
||||
.span6
|
||||
%h1#create-something-text
|
||||
= t('.hey_make').html_safe
|
||||
%h3#diaspora-hearts
|
||||
= t('.diaspora')
|
||||
.span6
|
||||
.pull-right
|
||||
%h2#pod-name
|
||||
= AppConfig.settings.pod_name
|
||||
%h4#sign-up-text
|
||||
= t('.sign_up')
|
||||
= form_for(resource, url: registration_path(resource_name), html: {class: "form-horizontal block-form", autocomplete: "off"}) do |f|
|
||||
%fieldset
|
||||
.control-group
|
||||
%label.control-label{for: "user_email"}
|
||||
= t('.email')
|
||||
.controls
|
||||
= f.email_field :email, placeholder: "luke@hoth.net", title: t('registrations.new.enter_email'), required: true
|
||||
|
||||
.control-group
|
||||
%label.control-label{for: "user_username"}
|
||||
= t('.username')
|
||||
.controls
|
||||
= f.text_field :username, placeholder: "jedi_guy", title: t('registrations.new.enter_username'), required: true, pattern: "[A-Za-z0-9_]+"
|
||||
|
||||
.control-group
|
||||
%label.control-label{for: "user_password"}
|
||||
= t('.password')
|
||||
.controls
|
||||
= f.password_field :password, placeholder: "••••••••", title: t('registrations.new.enter_password'), required: true, pattern: "......+"
|
||||
|
||||
.control-group
|
||||
%label.control-label{for: "user_password_confirmation"}
|
||||
= t('.password_confirmation')
|
||||
.controls
|
||||
= f.password_field :password_confirmation, placeholder: "••••••••", title: t('registrations.new.enter_password_again'), required: true, pattern: "......+"
|
||||
|
||||
- if AppConfig.settings.captcha.enable?
|
||||
#captcha.control-group
|
||||
= show_simple_captcha(object: 'user', code_type: 'numeric')
|
||||
|
||||
= invite_hidden_tag(invite)
|
||||
|
||||
- if AppConfig.settings.terms.enable?
|
||||
%p#terms.text-center
|
||||
= t('.terms', terms_link: link_to(t('.terms_link'), terms_path, target: "_blank")).html_safe
|
||||
= f.submit t('.continue'), class: "btn", data: {disable_with: t('.submitting')}
|
||||
|
|
@ -1,81 +0,0 @@
|
|||
<div id="registration">
|
||||
<div class="container">
|
||||
|
||||
<div class="row">
|
||||
<div class="span4" id="image-container">
|
||||
<%= image_tag('signupimages@2x_mini.jpg', :id => "collage") %>
|
||||
</div>
|
||||
|
||||
<div class="span8">
|
||||
<h1 id="create-something-text">
|
||||
<%= t('.hey_make').html_safe %>
|
||||
</h1>
|
||||
|
||||
<h3 id="diaspora-hearts">
|
||||
<%= t('.diaspora') %>
|
||||
</h3>
|
||||
|
||||
<h4 id="sign-up-text">
|
||||
<%= t('.sign_up') %>
|
||||
</h4>
|
||||
|
||||
<%= form_for(resource, :url => registration_path(resource_name), :html => {:class => "form-horizontal block-form", :autocomplete => "off"}) do |f| %>
|
||||
<fieldset>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="user_email">
|
||||
<%= t('.email') %>
|
||||
</label>
|
||||
|
||||
<div class="controls">
|
||||
<%= f.email_field :email, :placeholder => "luke@hoth.net", :title => t('registrations.new.enter_email'), :required => true %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="user_username">
|
||||
<%= t('.username') %>
|
||||
</label>
|
||||
|
||||
<div class="controls">
|
||||
<%= f.text_field :username, :placeholder => "jedi_guy", :title => t('registrations.new.enter_username'), :required => true, :pattern => "[A-Za-z0-9_]+" %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="user_password">
|
||||
<%= t('.password') %>
|
||||
</label>
|
||||
|
||||
<div class="controls">
|
||||
<%= f.password_field :password, :placeholder => "••••••••", :title => t('registrations.new.enter_password'), :required => true, :pattern => "......+" %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="user_password_confirmation">
|
||||
<%= t('.password_confirmation') %>
|
||||
</label>
|
||||
|
||||
<div class="controls">
|
||||
<%= f.password_field :password_confirmation, :placeholder => "••••••••", :title => t('registrations.new.enter_password_again'), :required => true, :pattern => "......+" %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<% if AppConfig.settings.captcha.enable? %>
|
||||
<div class="control-group" id="captcha">
|
||||
<%= show_simple_captcha(:object => 'user', :code_type => 'numeric') %>
|
||||
</div>
|
||||
<% end %>
|
||||
<%= invite_hidden_tag(invite) %>
|
||||
</fieldset>
|
||||
<% if AppConfig.settings.terms.enable? %>
|
||||
<div id="terms" class="text-center">
|
||||
<%= t('.terms', terms_link: link_to(t('.terms_link'), terms_path, target: "_blank")).html_safe %>
|
||||
</div>
|
||||
<% end %>
|
||||
<%= f.submit t('.continue'), class: "new-btn", data: {disable_with: t('.submitting')} %>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -2,39 +2,35 @@
|
|||
= AppConfig.settings.pod_name + " / " + t('devise.sessions.new.sign_in')
|
||||
|
||||
.container-fluid#login
|
||||
.row-fluid
|
||||
.span12.text-center
|
||||
.text-center
|
||||
.branding-asterisk
|
||||
%h1
|
||||
= AppConfig.settings.pod_name
|
||||
|
||||
.row-fluid
|
||||
.span4.offset4
|
||||
= form_for resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'form-signin'}, :autocomplete => 'off' do |f|
|
||||
= form_for resource, as: resource_name, url: session_path(resource_name), html: {class: 'form-signin'}, autocomplete: 'off' do |f|
|
||||
%fieldset
|
||||
= f.text_field :username,
|
||||
:placeholder => t('registrations.new.username'),
|
||||
:class => 'input-block-level form-control',
|
||||
:required => true,
|
||||
:pattern => '[A-Za-z0-9_.@\-]+',
|
||||
:autocapitalize => 'off',
|
||||
:autocorrect => 'off',
|
||||
:autofocus => true
|
||||
placeholder: t('registrations.new.username'),
|
||||
class: 'input-block-level form-control',
|
||||
required: true,
|
||||
pattern: '[A-Za-z0-9_.@\-]+',
|
||||
autocapitalize: 'off',
|
||||
autocorrect: 'off',
|
||||
autofocus: true
|
||||
%i.entypo.user
|
||||
|
||||
= f.password_field :password,
|
||||
:placeholder => t('registrations.new.password'),
|
||||
:class => 'input-block-level form-control',
|
||||
:required => true
|
||||
placeholder: t('registrations.new.password'),
|
||||
class: 'input-block-level form-control',
|
||||
required: true
|
||||
%i.entypo.lock
|
||||
|
||||
= f.hidden_field :remember_me, :value => 1
|
||||
= f.submit t('devise.sessions.new.sign_in'), :class => 'btn btn-large btn-block green'
|
||||
= f.hidden_field :remember_me, value: 1
|
||||
= f.submit t('devise.sessions.new.sign_in'), class: 'btn btn-large btn-block green'
|
||||
|
||||
- if display_password_reset_link?
|
||||
.text-center
|
||||
= link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name), :id => "forgot_password_link"
|
||||
|
||||
- if display_registration_link?
|
||||
.text-center
|
||||
= link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)
|
||||
\-
|
||||
- if display_password_reset_link?
|
||||
= link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name), id: "forgot_password_link"
|
||||
|
|
|
|||
Loading…
Reference in a new issue