Commit f081e48c authored by André Anjos's avatar André Anjos 💬

Merge branch 'fix_cdn_sources' into 'master'

Don't use CDN

See merge request !289
parents 9826b044 97f83d32
Pipeline #31422 passed with stages
in 21 minutes and 59 seconds
......@@ -2,21 +2,21 @@
{% comment %}
* Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
* Contact: beat.support@idiap.ch
*
*
* This file is part of the beat.web module of the BEAT platform.
*
*
* Commercial License Usage
* Licensees holding valid commercial BEAT licenses may use this file in
* accordance with the terms contained in a written agreement between you
* and Idiap. For further information contact tto@idiap.ch
*
*
* Alternatively, this file may be used under the terms of the GNU Affero
* Public License version 3 as published by the Free Software and appearing
* in the file LICENSE.AGPL included in the packaging of this file.
* The BEAT platform is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE.
*
*
* You should have received a copy of the GNU Affero Public License along
* with the BEAT platform. If not, see http://www.gnu.org/licenses/.
{% endcomment %}
......@@ -33,7 +33,7 @@
{{ block.super }}
<link rel="stylesheet" href="{% fingerprint "accounts/css/dialogs.css" %}" type="text/css" media="screen" />
<link rel="stylesheet" href="{% fingerprint "jquery-ui/themes/base/minified/jquery-ui.min.css" %}" type="text/css" media="screen" />
<link href="https://gitcdn.github.io/bootstrap-toggle/2.2.2/css/bootstrap-toggle.min.css" rel="stylesheet">
<link href="{% fingerprint "/bootstrap-toggle/css/bootstrap-toggle.min.css" %}" rel="stylesheet">
<link rel="stylesheet" href="{% fingerprint "datatables/media/css/dataTables.bootstrap.min.css" %}" type="text/css" media="screen" />
{% endblock %}
......
......@@ -2,21 +2,21 @@
{% comment %}
* Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
* Contact: beat.support@idiap.ch
*
*
* This file is part of the beat.web module of the BEAT platform.
*
*
* Commercial License Usage
* Licensees holding valid commercial BEAT licenses may use this file in
* accordance with the terms contained in a written agreement between you
* and Idiap. For further information contact tto@idiap.ch
*
*
* Alternatively, this file may be used under the terms of the GNU Affero
* Public License version 3 as published by the Free Software and appearing
* in the file LICENSE.AGPL included in the packaging of this file.
* The BEAT platform is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE.
*
*
* You should have received a copy of the GNU Affero Public License along
* with the BEAT platform. If not, see http://www.gnu.org/licenses/.
{% endcomment %}
......@@ -60,10 +60,9 @@
<script src="{% fingerprint "ui/js/history.js" %}" type="text/javascript" charset="utf-8"></script>
<script src="{% fingerprint "raphael/raphael-min.js" %}" type="text/javascript" charset="utf-8"></script>
<!-- Use Google's CDN for angular-js with a local fallback -->
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.5/angular.min.js"></script>
<script>window.angular || document.write('<script src="{% fingerprint "angular/angular.min.js" %}"><\/script>');</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-filter/0.5.8/angular-filter.min.js"></script>
<!-- angular-js -->
<script src="{% fingerprint "angular/angular.min.js" %}"></script>
<script src="{% fingerprint "angular-filter/dist/angular-filter.min.js" %}"></script>
<script src="{% fingerprint "angular-ui-router/release/angular-ui-router.min.js" %}" type="text/javascript" charset="utf-8"></script>
<script src="{% fingerprint "jquery-ui/ui/minified/jquery.ui.core.min.js" %}" type="text/javascript" charset="utf-8"></script>
<script src="{% fingerprint "jquery-ui/ui/minified/jquery.ui.position.min.js" %}" type="text/javascript" charset="utf-8"></script>
......
......@@ -55,10 +55,9 @@
<script src="{% fingerprint "datatables/media/js/jquery.dataTables.min.js" %}" type="text/javascript" charset="utf-8"></script>
<script src="{% fingerprint "datatables/media/js/dataTables.bootstrap.min.js" %}" type="text/javascript" charset="utf-8"></script>
<!-- Use Google's CDN for angular-js with a local fallback -->
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"></script>
<script>window.angular || document.write('<script src="{% fingerprint "angular/angular.min.js" %}"><\/script>');</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-filter/0.5.8/angular-filter.min.js"></script>
<!-- angular-js -->
<script src="{% fingerprint "angular/angular.min.js" %}"></script>
<script src="{% fingerprint "angular-filter/dist/angular-filter.min.js" %}"></script>
<script src="{% fingerprint "angular-ui-router/release/angular-ui-router.min.js" %}" type="text/javascript" charset="utf-8"></script>
<script src="{% fingerprint "jquery-ui/ui/minified/jquery.ui.core.min.js" %}" type="text/javascript" charset="utf-8"></script>
<script src="{% fingerprint "jquery-ui/ui/minified/jquery.ui.position.min.js" %}" type="text/javascript" charset="utf-8"></script>
......
{% comment %}
* Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
* Contact: beat.support@idiap.ch
*
*
* This file is part of the beat.web module of the BEAT platform.
*
*
* Commercial License Usage
* Licensees holding valid commercial BEAT licenses may use this file in
* accordance with the terms contained in a written agreement between you
* and Idiap. For further information contact tto@idiap.ch
*
*
* Alternatively, this file may be used under the terms of the GNU Affero
* Public License version 3 as published by the Free Software and appearing
* in the file LICENSE.AGPL included in the packaging of this file.
* The BEAT platform is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE.
*
*
* You should have received a copy of the GNU Affero Public License along
* with the BEAT platform. If not, see http://www.gnu.org/licenses/.
{% endcomment %}
......@@ -33,9 +33,9 @@
{% block meta %}{% endblock %}
<!-- stylesheets must come before the javascripts as to speed-up perf -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
<link rel="stylesheet" href="{% fingerprint "font-awesome/css/font-awesome.min.css" %}" type="text/css"/>
<link rel="stylesheet" href="{% fingerprint "bootstrap/dist/css/bootstrap.min.css" %}" type="text/css"/>
<link rel="stylesheet" href="{% fingerprint "bootstrap3-dialog/dist/css/bootstrap-dialog.min.css" %}" type="text/css" media="screen"/>
<link rel="icon" type="ui/image/x-icon" href="{% fingerprint "ui/images/icons/ico/beat.ico" %}" />
<link rel="stylesheet" href="{% fingerprint "ui/css/style.css" %}" type="text/css" media="screen"/>
......@@ -43,19 +43,14 @@
<!-- BEAT-page-specific content -->
{% block stylesheets %}{% endblock %}
<!-- jquery 1.11.x from Google CDN with fallback on our installation -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<!-- jquery fallback -->
<script>window.jQuery || document.write('<script src="{% fingerprint "jquery/dist/jquery.min.js" %}"><\/script>')</script>
<!-- jquery -->
<script src="{% fingerprint "jquery/dist/jquery.min.js" %}"></script>
<!-- JQuery Cookie plugin from jsdelivr CDN with fallback -->
<script src="https://cdn.jsdelivr.net/jquery.cookie/1.4.1/jquery.cookie.min.js"></script>
<script>$.cookie || document.write('<script src="{% fingerprint "jquery.cookie/jquery.cookie.js" %}"><\/script>')</script>
<!-- JQuery Cookie plugin -->
<script src="{% fingerprint "jquery.cookie/jquery.cookie.js" %}"></script>
<!-- Bootstrap and Font-Awesome with fallback from bootstrapcdn -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
<!-- Bootstrap/Font-Awesome local fallback -->
<script>if(typeof($.fn.modal) === 'undefined'){document.write('<link rel="stylesheet" href="{% fingerprint "font-awesome/css/font-awesome.min.css" %}"><\/link><link rel="stylesheet" href="{% fingerprint "bootstrap/dist/css/bootstrap.min.css" %}"><\/link><link rel="stylesheet" href="{% fingerprint "ui/css/style.css" %}"><\/link><script src="{% fingerprint "bootstrap/dist/js/bootstrap.min.js" %}"><\/script>')}</script>
<!-- Bootstrap and Font-Awesome -->
<script src="{% fingerprint "/bootstrap/dist/js/bootstrap.min.js" %}"></script>
<!-- project: https://github.com/phstc/jquery-dateFormat -->
<script src="{% fingerprint "jquery-dateFormat/dist/jquery-dateFormat.min.js" %}" type="text/javascript" charset="utf-8"></script>
......
......@@ -45,6 +45,7 @@ packages = jquery#~1.11.3
bootstrap3-dialog#~1.34.9
bootstrap3-typeahead#~4.0.0
bootstrap-datepicker#~1.5.1
bootstrap-toggle#~2.2.2
mousetrap#~1.5.3
mustache#2.3.0
raphael#~2.1.4
......@@ -58,5 +59,6 @@ packages = jquery#~1.11.3
datatables#~1.10.10
angular-ui-sortable#~0.14
angular-ui-codemirror
angular-filter#~0.5.8
executable = ${buildout:bin-directory}/bower --config.interactive=false
downloads = static
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 to comment