Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
V
VenShop
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Truong Ba Dieu
VenShop
Commits
6a0dc392
Commit
6a0dc392
authored
Jul 23, 2015
by
Truong Ba Dieu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix layout devise
parent
265d4a89
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
191 additions
and
96 deletions
+191
-96
app/assets/stylesheets/components/devise.css.scss
+12
-0
app/assets/stylesheets/components/responsive.css.scss
+5
-0
app/views/layouts/share_social.html.erb
+63
-0
app/views/users/registrations/edit.html.slim
+39
-41
app/views/users/registrations/new.html.slim
+37
-28
app/views/users/sessions/new.html.slim
+26
-18
app/views/users/shared/_links.html.slim
+9
-9
No files found.
app/assets/stylesheets/components/devise.css.scss
0 → 100644
View file @
6a0dc392
.form-devise
{
width
:
800px
;
margin
:
auto
;
display
:
block
;
padding
:
50px
;
border
:
1px
solid
#ccc
;
background-color
:
#EAD6D6
;
border-radius
:
6px
;
-moz-border-radius
:
6px
;
-webkit-border-radius
:
6px
;
}
\ No newline at end of file
app/assets/stylesheets/components/responsive.css.scss
View file @
6a0dc392
...
...
@@ -7,4 +7,8 @@
padding-left
:
76px
;
}
}
.form-devise
{
width
:
auto
;
padding
:
20px
;
}
}
\ No newline at end of file
app/views/layouts/share_social.html.erb
0 → 100644
View file @
6a0dc392
<!DOCTYPE html>
<html
itemscope
itemtype=
"http://schema.org/Article"
>
<head>
<title>
<%=
@title
||
"Venshop"
%>
</title>
<%=
stylesheet_link_tag
'application'
,
media:
'all'
,
'data-turbolinks-track'
=>
true
%>
<%=
javascript_include_tag
'application'
,
'data-turbolinks-track'
=>
true
%>
<%=
csrf_meta_tags
%>
<!-- Place this data between the <head> tags of your website -->
<meta
name=
"description"
content=
"
<%=
@description
%>
"
/>
<!-- Schema.org markup for Google+ -->
<meta
itemprop=
"name"
content=
"
<%=
@title
%>
"
>
<meta
itemprop=
"description"
content=
"
<%=
@description
%>
"
"
>
<meta
itemprop=
"image"
content=
"
<%=
@image
%>
"
"
>
<!-- Open Graph data -->
<meta
property=
"og:title"
content=
"Title Here"
/>
<meta
property=
"og:type"
content=
"article"
/>
<meta
property=
"og:url"
content=
"http://www.example.com/"
/>
<meta
property=
"og:image"
content=
"http://example.com/image.jpg"
/>
<meta
property=
"og:description"
content=
"Description Here"
/>
<meta
property=
"og:site_name"
content=
"Site Name, i.e. Moz"
/>
<meta
property=
"article:published_time"
content=
"2013-09-17T05:59:00+01:00"
/>
<meta
property=
"article:modified_time"
content=
"2013-09-16T19:08:47+01:00"
/>
<meta
property=
"article:section"
content=
"Article Section"
/>
<meta
property=
"article:tag"
content=
"Article Tag"
/>
<meta
property=
"fb:admins"
content=
"Facebook numberic ID"
/>
</head>
<body>
<div
id=
"wrap"
>
<header>
<%=
render
'layouts/navigation'
%>
</header>
<div
class=
"container"
>
<div
class=
"row"
>
<div
class=
"col-sm-12 text-center"
>
<%=
render
'shared/messages'
%>
</div>
</div>
<%=
render
'shared/search_bar'
%>
<%=
render_breadcrumbs
:separator
=>
' / '
%>
<div
class=
"row mar-top-20"
>
<div
class=
"col-sm-3"
>
<%=
render
'shared/categories'
%>
</div>
<div
class=
"col-sm-9"
>
<%=
yield
%>
</div>
</div>
</div>
<div
class=
"cleafix"
></div>
</div>
<%=
render
'layouts/footer'
%>
</body>
</html>
app/views/users/registrations/edit.html.slim
View file @
6a0dc392
h2
|
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!
.field
=
f
.
label
:name
br
=
f
.
text_field
:name
,
autofocus:
true
.field
=
f
.
label
:email
br
=
f
.
email_field
:email
,
autofocus:
true
-
if
devise_mapping
.
confirmable?
&&
resource
.
pending_reconfirmation?
div
|
Currently waiting confirmation for:
=
resource
.
unconfirmed_email
.field
=
f
.
label
:password
i
|
(leave blank if you don't want to change it)
br
=
f
.
password_field
:password
,
autocomplete:
"off"
.field
=
f
.
label
:password_confirmation
br
=
f
.
password_field
:password_confirmation
,
autocomplete:
"off"
.field
=
f
.
label
:current_password
i
|
(we need your current password to confirm your changes)
br
=
f
.
password_field
:current_password
,
autocomplete:
"off"
.actions
=
f
.
submit
"Update"
h3
|
Cancel my account
p
|
Unhappy?
=
button_to
"Cancel my account"
,
registration_path
(
resource_name
),
data:
{
confirm:
"Are you sure?"
},
method: :delete
=
link_to
"Back"
,
:back
.form-devise
h2
|
Edit
=
form_for
(
resource
,
as:
resource_name
,
url:
registration_path
(
resource_name
),
html:
{
method: :put
,
class
:"form-horizontal"
})
do
|
f
|
.col-sm-offset-3.col-sm-9
=
devise_error_messages!
.form-group
=
f
.
label
:name
,
class:
"control-label col-sm-3"
.col-sm-9
=
f
.
text_field
:name
,
autofocus:
true
,
class:
"form-control"
.form-group
=
f
.
label
:email
,
class:
"control-label col-sm-3"
.col-sm-9
=
f
.
email_field
:email
,
class:
"form-control"
-
if
devise_mapping
.
confirmable?
&&
resource
.
pending_reconfirmation?
div
|
Currently waiting confirmation for:
=
resource
.
unconfirmed_email
.form-group
=
f
.
label
:password
,
class:
"control-label col-sm-3"
.col-sm-9
=
f
.
password_field
:password
,
autocomplete:
"off"
,
class:
"form-control"
i
|
(leave blank if you don't want to change it)
.form-group
=
f
.
label
:password_confirmation
,
class:
"control-label col-sm-3"
.col-sm-9
=
f
.
password_field
:password_confirmation
,
autocomplete:
"off"
,
class:
"form-control"
.form-group
=
f
.
label
:current_password
,
class:
"control-label col-sm-3"
.col-sm-9
=
f
.
password_field
:current_password
,
autocomplete:
"off"
,
class:
"form-control"
i
|
(we need your current password to confirm your changes)
.form-group
.col-sm-offset-3.col-sm-9
=
f
.
submit
"Update"
,
class:
"btn btn-primary"
app/views/users/registrations/new.html.slim
View file @
6a0dc392
h2
|
Sign up
=
form_for
(
resource
,
as:
resource_name
,
url:
registration_path
(
resource_name
))
do
|
f
|
=
devise_error_messages!
.field
=
f
.
label
:name
br
=
f
.
text_field
:name
,
autofocus:
true
.field
=
f
.
label
:email
br
=
f
.
email_field
:email
.field
=
f
.
label
:password
-
if
@validatable
em
|
(
=
@minimum_password_length
|
characters minimum)
br
=
f
.
password_field
:password
,
autocomplete:
"off"
.field
=
f
.
label
:password_confirmation
br
=
f
.
password_field
:password_confirmation
,
autocomplete:
"off"
.actions
=
f
.
submit
"Sign up"
=
render
"users/shared/links"
.form-devise
h2
|
Sign up
=
form_for
(
resource
,
as:
resource_name
,
url:
registration_path
(
resource_name
),
html:
{
class
:"form-horizontal"
})
do
|
f
|
.col-sm-offset-3.col-sm-9
=
devise_error_messages!
.form-group
=
f
.
label
:name
,
class:
"control-label col-sm-3"
.col-sm-9
=
f
.
text_field
:name
,
autofocus:
true
,
class:
"form-control"
.form-group
=
f
.
label
:email
,
class:
"control-label col-sm-3"
.col-sm-9
=
f
.
email_field
:email
,
class:
"form-control"
.form-group
=
f
.
label
:password
,
class:
"control-label col-sm-3"
.col-sm-9
=
f
.
password_field
:password
,
autocomplete:
"off"
,
class:
"form-control"
-
if
@validatable
em
|
(
=
@minimum_password_length
|
characters minimum)
-
if
devise_mapping
.
rememberable?
.form-group
.col-sm-offset-3.col-sm-9
.checkbox
label
=
f
.
check_box
:remember_me
'
Remember
me
.form-group
.col-sm-offset-3.col-sm-9
=
f
.
submit
"Sign up"
,
class:
"btn btn-primary"
.clearfix
br
=
render
"users/shared/links"
app/views/users/sessions/new.html.slim
View file @
6a0dc392
h2
|
Log in
=
form_for
(
resource
,
as:
resource_name
,
url:
session_path
(
resource_name
))
do
|
f
|
.field
=
f
.
label
:email
br
=
f
.
email_field
:email
,
autofocus:
true
.field
=
f
.
label
:password
br
=
f
.
password_field
:password
,
autocomplete:
"off"
-
if
devise_mapping
.
rememberable?
.field
=
f
.
check_box
:remember_me
=
f
.
label
:remember_me
.actions
=
f
.
submit
"Log in"
=
render
"users/shared/links"
.form-devise
h2
|
Log in
=
form_for
(
resource
,
as:
resource_name
,
url:
session_path
(
resource_name
),
html:
{
class
:"form-horizontal"
})
do
|
f
|
.form-group
=
f
.
label
:email
,
class:
"control-label col-sm-3"
.col-sm-9
=
f
.
email_field
:email
,
autofocus:
true
,
class:
"form-control"
.form-group
=
f
.
label
:password
,
class:
"control-label col-sm-3"
.col-sm-9
=
f
.
password_field
:password
,
autocomplete:
"off"
,
class:
"form-control"
-
if
devise_mapping
.
rememberable?
.form-group
.col-sm-offset-3.col-sm-9
.checkbox
label
=
f
.
check_box
:remember_me
'
Remember
me
.form-group
.col-sm-offset-3.col-sm-9
=
f
.
submit
"Log in"
,
class:
"btn btn-primary"
.clearfix
br
=
render
"users/shared/links"
app/views/users/shared/_links.html.slim
View file @
6a0dc392
...
...
@@ -4,15 +4,15 @@
-
if
devise_mapping
.
registerable?
&&
controller_name
!=
'registrations'
=
link_to
"Sign up"
,
new_registration_path
(
resource_name
)
br
-
if
devise_mapping
.
recoverable?
&&
controller_name
!=
'passwords'
&&
controller_name
!=
'registrations'
=
link_to
"Forgot your password?"
,
new_password_path
(
resource_name
)
br
-
if
devise_mapping
.
confirmable?
&&
controller_name
!=
'confirmations'
=
link_to
"Didn't receive confirmation instructions?"
,
new_confirmation_path
(
resource_name
)
br
-
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
)
br
-
#-
if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations'
-
#
= link_to "Forgot your password?", new_password_path(resource_name)
-
#
br
-
#-
if devise_mapping.confirmable? && controller_name != 'confirmations'
-
#
= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
-
#
br
-
#-
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)
-
#
br
-
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment