Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
60827162
Commit
60827162
authored
Jun 20, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix admin appearance settings preview
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
44b8b77e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
28 deletions
+9
-28
app/controllers/admin/appearances_controller.rb
app/controllers/admin/appearances_controller.rb
+1
-0
app/views/admin/appearances/_form.html.haml
app/views/admin/appearances/_form.html.haml
+1
-1
app/views/admin/appearances/preview.html.haml
app/views/admin/appearances/preview.html.haml
+7
-27
No files found.
app/controllers/admin/appearances_controller.rb
View file @
60827162
...
@@ -5,6 +5,7 @@ class Admin::AppearancesController < Admin::ApplicationController
...
@@ -5,6 +5,7 @@ class Admin::AppearancesController < Admin::ApplicationController
end
end
def
preview
def
preview
render
'preview'
,
layout:
'devise'
end
end
def
create
def
create
...
...
app/views/admin/appearances/_form.html.haml
View file @
60827162
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
Maximum file size is 1MB. Pages are optimized for a 72x72 px header logo
Maximum file size is 1MB. Pages are optimized for a 72x72 px header logo
.form-actions
.form-actions
=
f
.
submit
'Save'
,
class:
'btn btn-save'
=
f
.
submit
'Save'
,
class:
'btn btn-save
append-right-10
'
-
if
@appearance
.
persisted?
-
if
@appearance
.
persisted?
=
link_to
'Preview last save'
,
preview_admin_appearances_path
,
class:
'btn'
,
target:
'_blank'
=
link_to
'Preview last save'
,
preview_admin_appearances_path
,
class:
'btn'
,
target:
'_blank'
...
...
app/views/admin/appearances/preview.html.haml
View file @
60827162
-
page_title
"Preview | Appearance"
-
page_title
"Preview | Appearance"
%h3
.page-title
.login-box
Appearance settings - Preview
.login-heading
%hr
%h3
Existing user? Sign in
%form
=
text_field_tag
:login
,
nil
,
class:
"form-control top"
,
placeholder:
"Username or Email"
=
password_field_tag
:password
,
nil
,
class:
"form-control bottom"
,
placeholder:
"Password"
=
button_tag
"Sign in"
,
class:
"btn-create btn"
.ui-box
.title
Sign-in page
%div
.login-page
.container
.content
.login-title
%h1
=
brand_title
%hr
.container
.content
.row
.col-sm-7
.brand-image
=
brand_image
.brand_text
=
brand_text
.col-sm-4
.login-box
%h3
.page-title
Sign in
=
text_field_tag
:login
,
nil
,
class:
"form-control top"
,
placeholder:
"Username or Email"
=
password_field_tag
:password
,
nil
,
class:
"form-control bottom"
,
placeholder:
"Password"
=
button_tag
"Sign in"
,
class:
"btn-create btn"
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