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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
4802bd51
Commit
4802bd51
authored
Feb 14, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Initial version of the user-callouts
parent
509ff2ab
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
83 additions
and
2 deletions
+83
-2
app/assets/javascripts/user_callout.js
app/assets/javascripts/user_callout.js
+22
-0
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+30
-0
app/views/dashboard/_projects_head.html.haml
app/views/dashboard/_projects_head.html.haml
+13
-0
app/views/users/show.html.haml
app/views/users/show.html.haml
+17
-2
No files found.
app/assets/javascripts/user_callout.js
0 → 100644
View file @
4802bd51
/* eslint-disable arrow-parens, class-methods-use-this, no-param-reassign */
/* global Cookies */
((
global
)
=>
{
const
userCalloutElementName
=
'
#user-callout
'
;
class
UserCallout
{
constructor
()
{
this
.
init
();
}
init
()
{
$
(
document
)
.
on
(
'
DOMContentLoaded
'
,
()
=>
{
const
element
=
$
(
userCalloutElementName
);
console
.
log
(
'
element:
'
,
element
);
});
}
}
global
.
UserCallout
=
UserCallout
;
})(
window
.
gl
||
(
window
.
gl
=
{}));
\ No newline at end of file
app/assets/stylesheets/framework/variables.scss
View file @
4802bd51
...
@@ -201,6 +201,7 @@ $table-permission-x-bg: #d9edf7;
...
@@ -201,6 +201,7 @@ $table-permission-x-bg: #d9edf7;
$username-color
:
#666
;
$username-color
:
#666
;
$description-color
:
#666
;
$description-color
:
#666
;
$profiler-border
:
#eee
;
$profiler-border
:
#eee
;
$user-callout-right
:
120px
;
/* tanuki logo colors */
/* tanuki logo colors */
$tanuki-red
:
#e24329
;
$tanuki-red
:
#e24329
;
...
...
app/assets/stylesheets/pages/profile.scss
View file @
4802bd51
...
@@ -277,3 +277,33 @@ table.u2f-registrations {
...
@@ -277,3 +277,33 @@ table.u2f-registrations {
padding-left
:
18px
;
padding-left
:
18px
;
}
}
}
}
#user-callout
{
margin
:
24px
auto
0
;
.bordered-box
{
border
:
1px
solid
$border-color
;
border-radius
:
$border-radius-default
;
}
.landing
{
margin-bottom
:
$gl-padding
;
overflow
:
hidden
;
.dismiss-icon
{
position
:
absolute
;
right
:
$user-callout-right
;
cursor
:
pointer
;
color
:
$cycle-analytics-dismiss-icon-color
;
}
.svg-container
{
text-align
:
center
;
svg
{
width
:
136px
;
height
:
136px
;
}
}
}
}
app/views/dashboard/_projects_head.html.haml
View file @
4802bd51
=
content_for
:flash_message
do
=
content_for
:flash_message
do
=
render
'shared/project_limit'
=
render
'shared/project_limit'
#user-callout
.bordered-box.landing.content-block
=
icon
(
"times"
,
class:
"dismiss-icon"
)
.row
.col-sm-3.col-xs-12.svg-container
=
custom_icon
(
'icon_cycle_analytics_splash'
)
.col-sm-8.col-xs-12.inner-content
%h4
Customize your experience
%p
Change syntax themes, default project pages, and more in preferences.
=
link_to
"Check it out"
,
profile_preferences_path
,
class:
'btn'
.top-area
.top-area
%ul
.nav-links
%ul
.nav-links
=
nav_link
(
page:
[
dashboard_projects_path
,
root_path
])
do
=
nav_link
(
page:
[
dashboard_projects_path
,
root_path
])
do
...
...
app/views/users/show.html.haml
View file @
4802bd51
...
@@ -98,7 +98,19 @@
...
@@ -98,7 +98,19 @@
Snippets
Snippets
%div
{
class:
container_class
}
%div
{
class:
container_class
}
.tab-content
#user-callout
.bordered-box.landing.content-block
=
icon
(
"times"
,
class:
"dismiss-icon"
)
.row
.col-sm-3.col-xs-12.svg-container
=
custom_icon
(
'icon_cycle_analytics_splash'
)
.col-sm-8.col-xs-12.inner-content
%h4
Customize your experience
%p
Change syntax themes, default project pages, and more in preferences.
=
link_to
"Check it out"
,
profile_preferences_path
,
class:
'btn'
#activity
.tab-pane
#activity
.tab-pane
.row-content-block.calender-block.white.second-block.hidden-xs
.row-content-block.calender-block.white.second-block.hidden-xs
.user-calendar
{
data:
{
href:
user_calendar_path
}
}
.user-calendar
{
data:
{
href:
user_calendar_path
}
}
...
@@ -127,8 +139,11 @@
...
@@ -127,8 +139,11 @@
=
spinner
=
spinner
:javascript
:javascript
var
userProfile
;
var
userProfile
,
userCallout
;
userProfile
=
new
gl
.
User
({
userProfile
=
new
gl
.
User
({
action
:
"
#{
controller
.
action_name
}
"
action
:
"
#{
controller
.
action_name
}
"
});
});
userCallout
=
new
gl
.
UserCallout
();
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