Commit f51d9638 by Bach Dániel

dashboard: add :heavy_exclamation_mark: emoji :heavy_exclamation_mark: support

parent db42d716
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
"jquery-simple-slider": "https://github.com/BME-IK/jquery-simple-slider.git", "jquery-simple-slider": "https://github.com/BME-IK/jquery-simple-slider.git",
"bootbox": "~4.3.0", "bootbox": "~4.3.0",
"intro.js": "0.9.0", "intro.js": "0.9.0",
"emojify": "~0.9.5",
"favico.js": "~0.3.5" "favico.js": "~0.3.5"
} }
} }
...@@ -185,6 +185,7 @@ PIPELINE_CSS = { ...@@ -185,6 +185,7 @@ PIPELINE_CSS = {
"dashboard/dashboard.less", "dashboard/dashboard.less",
"network/network.less", "network/network.less",
"autocomplete_light/style.css", "autocomplete_light/style.css",
"emojify/emojify.css",
), ),
"output_filename": "all.css", "output_filename": "all.css",
} }
...@@ -198,6 +199,7 @@ PIPELINE_JS = { ...@@ -198,6 +199,7 @@ PIPELINE_JS = {
"jquery-knob/dist/jquery.knob.min.js", "jquery-knob/dist/jquery.knob.min.js",
"jquery-simple-slider/js/simple-slider.js", "jquery-simple-slider/js/simple-slider.js",
"favico.js/favico.js", "favico.js/favico.js",
"emojify/emojify.js",
"dashboard/dashboard.js", "dashboard/dashboard.js",
"dashboard/activity.js", "dashboard/activity.js",
"dashboard/group-details.js", "dashboard/group-details.js",
......
...@@ -362,6 +362,20 @@ $(function () { ...@@ -362,6 +362,20 @@ $(function () {
li.addClass('panel-primary').find('input').prop("checked", true); li.addClass('panel-primary').find('input').prop("checked", true);
return 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) { function generateVmHTML(pk, name, host, icon, _status, fav, is_last) {
......
...@@ -1217,3 +1217,7 @@ textarea[name="new_members"] { ...@@ -1217,3 +1217,7 @@ textarea[name="new_members"] {
padding: 25px; padding: 25px;
} }
} }
.emoji {
max-width: 20px;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment