Skip to content
Snippets Groups Projects
Commit 477a068f authored by Piotr Gawron's avatar Piotr Gawron
Browse files

font-awesome moved to npm dependency

parent 0bde71a2
No related branches found
No related tags found
1 merge request!290Frontend dependencies moved to npm
Hide whitespace changes
Inline Side-by-side
Showing
with 31 additions and 28 deletions
smash/package-lock.json
+ 5
− 0
View file @ 477a068f
......@@ -497,6 +497,11 @@
"version": "github:andyinabox/FileSaver.js#973b433b8fbaee9a11d53b9ae423b046742cfe32",
"from": "github:andyinabox/FileSaver.js"
},
"font-awesome": {
"version": "4.7.0",
"resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
"integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
},
"fontkit": {
"version": "1.8.1",
"resolved": "https://registry.npmjs.org/fontkit/-/fontkit-1.8.1.tgz",
......
smash/package.json
+ 1
− 0
View file @ 477a068f
......@@ -17,6 +17,7 @@
"datatables.net-buttons": "^1.6.5",
"datatables.net-buttons-bs": "^1.6.5",
"eonasdan-bootstrap-datetimepicker": "^4.17.47",
"font-awesome": "^4.7.0",
"fullcalendar": "^3.4.0",
"fullcalendar-scheduler": "^1.6.2",
"html2canvas": "^0.5.0-beta3",
......
smash/smash/settings.py
+ 1
− 0
View file @ 477a068f
......@@ -128,6 +128,7 @@ NPM_FILE_PATTERNS = {
'datatables.net-buttons': ['js/*', 'License.txt'],
'datatables.net-buttons-bs': ['js/*', 'css/*', 'License.txt'],
'eonasdan-bootstrap-datetimepicker': ['build/*', 'LICENSE'],
'font-awesome': ['css/*', 'fonts/*', 'less/*', 'scss/*'],
'fullcalendar': ['dist/*', 'license.txt'],
'fullcalendar-scheduler': ['dist/*', 'LICENSE.md'],
'html2canvas': ['dist/*', 'LICENSE'],
......
smash/web/templates/_base.html
+ 19
− 18
View file @ 477a068f
......@@ -11,8 +11,7 @@
<link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}">
<!-- Font Awesome -->
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}">
<!-- Ionicons -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
......@@ -76,15 +75,17 @@ desired effect
<span class="sr-only">Toggle navigation</span>
</a>
<div class="col-xs-7 navbar-text" style="margin-left: 0px">
<div class="col-xs-7 navbar-text" style="margin-left: 0px">
<div class="warning_ticker">
<div class="ticker_list">
{% if user.is_authenticated and role == '<No worker information>' %}
<div class="warning"><i class="fa fa-exclamation-triangle"></i>Some features might not work, <b>{{ user.get_username }}</b> has no worker associated.</div>
{% endif %}
</div>
<div class="ticker_list">
{% if user.is_authenticated and role == '<No worker information>' %}
<div class="warning"><i class="fa fa-exclamation-triangle"></i>Some features might not work,
<b>{{ user.get_username }}</b> has no worker associated.
</div>
{% endif %}
</div>
</div>
</div>
</div>
<!-- Navbar Right Menu -->
<div class="navbar-custom-menu">
......@@ -186,7 +187,7 @@ desired effect
<div style="display: inline-block;">
<a href="{% url 'change_password' %}" class="btn btn-default btn-flat">
<i class="fa fa-key" aria-hidden="true"></i> Change Password</a>
<i class="fa fa-key" aria-hidden="true"></i> Change Password</a>
</div>
<div class="pull-right">
......@@ -203,7 +204,7 @@ desired effect
<a href="#" data-toggle="control-sidebar"><i class="fa fa-gears"></i></a>
</li>
{% endcomment %}
</ul>
</ul>
</div>
</nav>
</header>
......@@ -369,23 +370,23 @@ desired effect
<script src="{% static 'moment/min/moment.min.js' %}"></script>
<script src="{% static 'moment-range/dist/moment-range.js' %}"></script>
<script type="text/javascript">
window['moment-range'].extendMoment(moment);
window['moment-range'].extendMoment(moment);
</script>
<script>
//vertical ticker marquee. This could be used for other messages as well :-)
if($('.ticker_list').children().length > 1){
if ($('.ticker_list').children().length > 1) {
console.log("Not implemented");
}else if($('.ticker_list').children().length === 1){
} else if ($('.ticker_list').children().length === 1) {
}else{
$('.warning_ticker').css('display', 'none');
} else {
$('.warning_ticker').css('display', 'none');
}
var activate = function (page_to_activate) {
var $e = $(".sidebar-menu li[data-desc='" + page_to_activate + "']");
$e.addClass("active");
if($($e).parents('li[data-desc]').length > 0){ //if there is a parent, it should also be active
$($e).parents('li[data-desc]').addClass("active");
if ($($e).parents('li[data-desc]').length > 0) { //if there is a parent, it should also be active
$($e).parents('li[data-desc]').addClass("active");
}
};
......
smash/web/templates/errors/400.html
+ 1
− 2
View file @ 477a068f
......@@ -11,8 +11,7 @@
<link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}">
<!-- Font Awesome -->
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}">
<!-- Ionicons -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
......
smash/web/templates/errors/403.html
+ 1
− 2
View file @ 477a068f
......@@ -11,8 +11,7 @@
<link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}">
<!-- Font Awesome -->
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}">
<!-- Ionicons -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
......
smash/web/templates/errors/404.html
+ 1
− 2
View file @ 477a068f
......@@ -11,8 +11,7 @@
<link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}">
<!-- Font Awesome -->
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}">
<!-- Ionicons -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
......
smash/web/templates/errors/500.html
+ 1
− 2
View file @ 477a068f
......@@ -11,8 +11,7 @@
<link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}">
<!-- Font Awesome -->
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}">
<!-- Ionicons -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
......
smash/web/templates/login.html
+ 1
− 2
View file @ 477a068f
......@@ -14,8 +14,7 @@
<link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}">
<!-- Font Awesome -->
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}">
<!-- Ionicons -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment