Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gyuricska Milán
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
f51d9638
authored
Jan 13, 2015
by
Bach Dániel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: add :heavy_exclamation_mark: emoji :heavy_exclamation_mark: support
parent
db42d716
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
0 deletions
+21
-0
circle/bower.json
+1
-0
circle/circle/settings/base.py
+2
-0
circle/dashboard/static/dashboard/dashboard.js
+14
-0
circle/dashboard/static/dashboard/dashboard.less
+4
-0
No files found.
circle/bower.json
View file @
f51d9638
...
...
@@ -19,6 +19,7 @@
"jquery-simple-slider"
:
"https://github.com/BME-IK/jquery-simple-slider.git"
,
"bootbox"
:
"~4.3.0"
,
"intro.js"
:
"0.9.0"
,
"emojify"
:
"~0.9.5"
,
"favico.js"
:
"~0.3.5"
}
}
circle/circle/settings/base.py
View file @
f51d9638
...
...
@@ -185,6 +185,7 @@ PIPELINE_CSS = {
"dashboard/dashboard.less"
,
"network/network.less"
,
"autocomplete_light/style.css"
,
"emojify/emojify.css"
,
),
"output_filename"
:
"all.css"
,
}
...
...
@@ -198,6 +199,7 @@ PIPELINE_JS = {
"jquery-knob/dist/jquery.knob.min.js"
,
"jquery-simple-slider/js/simple-slider.js"
,
"favico.js/favico.js"
,
"emojify/emojify.js"
,
"dashboard/dashboard.js"
,
"dashboard/activity.js"
,
"dashboard/group-details.js"
,
...
...
circle/dashboard/static/dashboard/dashboard.js
View file @
f51d9638
...
...
@@ -362,6 +362,20 @@ $(function () {
li
.
addClass
(
'panel-primary'
).
find
(
'input'
).
prop
(
"checked"
,
true
);
return
true
;
});
emojify
.
setConfig
({
'img_dir'
:
"/static/emojify/images/emoji"
,
'ignored_tags'
:
{
'script'
:
1
,
'textarea'
:
1
,
'a'
:
0
,
'pre'
:
0
,
'code'
:
0
,
},
'ignore_emoticons'
:
true
,
});
emojify
.
run
();
});
function
generateVmHTML
(
pk
,
name
,
host
,
icon
,
_status
,
fav
,
is_last
)
{
...
...
circle/dashboard/static/dashboard/dashboard.less
View file @
f51d9638
...
...
@@ -1217,3 +1217,7 @@ textarea[name="new_members"] {
padding: 25px;
}
}
.emoji {
max-width: 20px;
}
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