Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
guns-vip
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
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenjunxiong
guns-vip
Commits
8daacf2b
Commit
8daacf2b
authored
Nov 07, 2018
by
fengshuonan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
上传头像修改
parent
149354e4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
11 deletions
+20
-11
src/main/webapp/WEB-INF/system/user/user_view.html
+9
-9
src/main/webapp/assets/common/static/stylefeng/feng.css
+9
-1
src/main/webapp/assets/modular/system/user/user_view.js
+2
-1
No files found.
src/main/webapp/WEB-INF/system/user/user_view.html
View file @
8daacf2b
...
@@ -113,7 +113,6 @@
...
@@ -113,7 +113,6 @@
@ **/
@ **/
<div
class=
"tab-pane"
id=
"avatar"
role=
"tabpanel"
>
<div
class=
"tab-pane"
id=
"avatar"
role=
"tabpanel"
>
<div
class=
"card-block"
>
<div
class=
"card-block"
>
<div
class=
"container"
>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-md-12"
>
<div
class=
"col-md-12"
>
<div
class=
"img-container"
>
<div
class=
"img-container"
>
...
@@ -121,7 +120,7 @@
...
@@ -121,7 +120,7 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div
class=
"row
"
>
<div
class=
"row p-t-10
"
>
<div
class=
"col-md-12 docs-buttons"
>
<div
class=
"col-md-12 docs-buttons"
>
<div
class=
"btn-group"
>
<div
class=
"btn-group"
>
<button
type=
"button"
class=
"btn btn-primary"
data-method=
"setDragMode"
data-option=
"move"
title=
"Move"
>
<button
type=
"button"
class=
"btn btn-primary"
data-method=
"setDragMode"
data-option=
"move"
title=
"Move"
>
...
@@ -244,22 +243,24 @@
...
@@ -244,22 +243,24 @@
</div>
</div>
<div
class=
"btn-group btn-group-crop"
>
<div
class=
"btn-group btn-group-crop"
>
<button
type=
"button"
class=
"btn btn-success"
data-method=
"getCroppedCanvas"
data-option=
"{ "maxWidth": 4096, "maxHeight": 4096 }"
>
<button
type=
"button"
class=
"btn btn-info"
data-method=
"getCroppedCanvas"
data-option=
"{ "maxWidth": 4096, "maxHeight": 4096 }"
>
<span
class=
"docs-tooltip"
data-toggle=
"tooltip"
data-animation=
"false"
title=
"$().cropper("getCroppedCanvas", { maxWidth: 4096, maxHeight: 4096 })"
>
<span
class=
"docs-tooltip"
data-toggle=
"tooltip"
data-animation=
"false"
title=
"$().cropper("getCroppedCanvas", { maxWidth: 4096, maxHeight: 4096 })"
>
上传头像
</span>
Get Cropped Canvas
</span>
</button>
</button>
<button
type=
"button"
class=
"btn btn-success"
data-method=
"getCroppedCanvas"
data-option=
"{ "width": 160, "height": 90 }"
>
</div>
<div
class=
"btn-group btn-group-crop"
>
<button
type=
"button"
class=
"btn btn-info"
data-method=
"getCroppedCanvas"
data-option=
"{ "width": 160, "height": 90 }"
>
<span
class=
"docs-tooltip"
data-toggle=
"tooltip"
data-animation=
"false"
title=
"$().cropper("getCroppedCanvas", { width: 160, height: 90 })"
>
<span
class=
"docs-tooltip"
data-toggle=
"tooltip"
data-animation=
"false"
title=
"$().cropper("getCroppedCanvas", { width: 160, height: 90 })"
>
160
×
90
160
×
90
</span>
</span>
</button>
</button>
<button
type=
"button"
class=
"btn btn-success
"
data-method=
"getCroppedCanvas"
data-option=
"{ "width": 320, "height": 180 }"
>
<button
type=
"button"
class=
"btn btn-info
"
data-method=
"getCroppedCanvas"
data-option=
"{ "width": 320, "height": 180 }"
>
<span
class=
"docs-tooltip"
data-toggle=
"tooltip"
data-animation=
"false"
title=
"$().cropper("getCroppedCanvas", { width: 320, height: 180 })"
>
<span
class=
"docs-tooltip"
data-toggle=
"tooltip"
data-animation=
"false"
title=
"$().cropper("getCroppedCanvas", { width: 320, height: 180 })"
>
320
×
180
320
×
180
</span>
</span>
</button>
</button>
</div>
</div>
<div
class=
"modal fade docs-cropped"
id=
"getCroppedCanvasModal"
aria-hidden=
"true"
aria-labelledby=
"getCroppedCanvasTitle"
role=
"dialog"
tabindex=
"-1"
>
<div
class=
"modal fade docs-cropped"
id=
"getCroppedCanvasModal"
aria-hidden=
"true"
aria-labelledby=
"getCroppedCanvasTitle"
role=
"dialog"
tabindex=
"-1"
>
<div
class=
"modal-dialog"
>
<div
class=
"modal-dialog"
>
<div
class=
"modal-content"
>
<div
class=
"modal-content"
>
...
@@ -281,7 +282,6 @@
...
@@ -281,7 +282,6 @@
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@/**
@/**
@/* 登录日志
@/* 登录日志
...
...
src/main/webapp/assets/common/static/stylefeng/feng.css
View file @
8daacf2b
...
@@ -36,6 +36,13 @@
...
@@ -36,6 +36,13 @@
text-decoration
:
none
;
text-decoration
:
none
;
}
}
.fixed-table-pagination
.btn
{
.fixed-table-pagination
.btn
{
border-color
:
#DDDDDD
;
border-color
:
#DDDDDD
;
}
}
.div-center
{
width
:
auto
;
display
:
table
;
margin-left
:
auto
;
margin-right
:
auto
;
}
\ No newline at end of file
src/main/webapp/assets/modular/system/user/user_view.js
View file @
8daacf2b
...
@@ -13,8 +13,9 @@ $(function () {
...
@@ -13,8 +13,9 @@ $(function () {
var
$dataScaleX
=
$
(
'#dataScaleX'
);
var
$dataScaleX
=
$
(
'#dataScaleX'
);
var
$dataScaleY
=
$
(
'#dataScaleY'
);
var
$dataScaleY
=
$
(
'#dataScaleY'
);
var
options
=
{
var
options
=
{
aspectRatio
:
16
/
9
,
preview
:
'.img-preview'
,
preview
:
'.img-preview'
,
minContainerWidth
:
500
,
minContainerHeight
:
500
,
crop
:
function
(
e
)
{
crop
:
function
(
e
)
{
$dataX
.
val
(
Math
.
round
(
e
.
detail
.
x
));
$dataX
.
val
(
Math
.
round
(
e
.
detail
.
x
));
$dataY
.
val
(
Math
.
round
(
e
.
detail
.
y
));
$dataY
.
val
(
Math
.
round
(
e
.
detail
.
y
));
...
...
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