diff --git a/conf/manager.conf b/conf/manager.conf index 292af27c1ac78fc74bd445a11d9b0467c7ca8e23..35635671ab93125b30b03ac1eadeb2bc9f30ed40 100644 --- a/conf/manager.conf +++ b/conf/manager.conf @@ -3,6 +3,7 @@ support_email = support@my.fqdn name = eduGAIN Access Check url = https://access-check.my.fqdn login_url = https://access-check.my.fqdn/Shibboleth.sso/Login +cdn_url = https://cdn.renater.fr [setup] # templates theme diff --git a/lib/AccessCheck/App.pm b/lib/AccessCheck/App.pm index 284c4326ed21859322a451c9122640d3b8aadfb8..95237ae36dd568026c7702e18b026dbc94ce26c0 100644 --- a/lib/AccessCheck/App.pm +++ b/lib/AccessCheck/App.pm @@ -79,6 +79,7 @@ sub startup { support_email => $config->{app}->{support_email}, login_url => $config->{app}->{login_url}, logout_url => $config->{app}->{logout_url}, + cdn_url => $config->{app}->{cdn_url}, name => $config->{app}->{name}, version => ACCESSCHECK_VERSION }, diff --git a/public/css/renater.css b/public/css/renater.css index aa8a251cf908b246a0b07cb64910c0fc4e7adfbd..7c36a34b7f2e6c64a85cb5105df5507f74e5c9f5 100644 --- a/public/css/renater.css +++ b/public/css/renater.css @@ -892,16 +892,16 @@ footer aside *{ font-family: "foobar_proregular"; font-style: normal; font-weight: normal; - src: url("../font/foobar/foobar_pro-regular-webfont.woff") format("woff"), - url("../font/foobar/foobar_pro-regular-webfont.ttf") format("truetype"); + src: url("https://cdn.renater.fr/fonts/foobar/foobar_pro-regular-webfont.woff") format("woff"), + url("https://cdn.renater.fr/fonts/foobar/foobar_pro-regular-webfont.ttf") format("truetype"); } /* Webfont: Lato-Regular */ @font-face { font-family: 'LatoWeb'; - src: url('../font/Lato/Lato-Regular.woff2') format('woff2'), /* Modern Browsers */ - url('../font/Lato/Lato-Regular.woff') format('woff'), /* Modern Browsers */ - url('../font/Lato/Lato-Regular.ttf') format('truetype'); + src: url('https://cdn.renater.fr/fonts/lato/Lato-Regular.woff2') format('woff2'), /* Modern Browsers */ + url('https://cdn.renater.fr/fonts/lato/Lato-Regular.woff') format('woff'), /* Modern Browsers */ + url('https://cdn.renater.fr/fonts/lato/Lato-Regular.ttf') format('truetype'); font-style: normal; font-weight: normal; text-rendering: optimizeLegibility; diff --git a/templates/web/edugain/index.html.tt2 b/templates/web/edugain/index.html.tt2 index a72ff22afd5b790bb39030fa73dab8ea3dba080d..f94b940624bdf68e8a2f10ced017f14a56782b47 100644 --- a/templates/web/edugain/index.html.tt2 +++ b/templates/web/edugain/index.html.tt2 @@ -7,17 +7,17 @@ <link type="image/png" rel="icon" href="/images/favicon.png"/> - <link type="text/css" rel="stylesheet" href="/font-awesome/css/font-awesome.min.css" /> - <link type="text/css" rel="stylesheet" href="/foundation/css/foundation.min.css"/> - <link type="text/css" rel="stylesheet" href="/jquery-ui-1.12.1/jquery-ui.min.css"/> + <link type="text/css" rel="stylesheet" href="[% app.cdn_url %]/libs/font-awesome/6.5.2/css/all.min.css" /> + <link type="text/css" rel="stylesheet" href="[% app.cdn_url %]/libs/foundation/6.8.1/css/foundation.min.css"> + <link type="text/css" rel="stylesheet" href="[% app.cdn_url %]/libs/jquery-ui/1.13.3/jquery-ui.min.css" /> <link type="text/css" rel="stylesheet" href="/css/style.css"/> <link type="text/css" rel="stylesheet" href="/css/edugain.css" /> <link type="text/css" rel="stylesheet" href="/css/edugain-menu-min-600.css" media="(min-width: 800px)" /> <link type="text/css" rel="stylesheet" href="/css/edugain-min-800.css" media="(min-width: 800px)" /> - <script src="/jquery-3.3.1.min.js"></script> - <script src="/jquery-ui-1.12.1/jquery-ui.min.js"></script> - <script src="/jquery-validation-1.17.0.min.js"></script> + <script src="[% app.cdn_url %]/libs/jquery/3.7.1/jquery.min.js"></script> + <script src="[% app.cdn_url %]/libs/jquery-ui/1.13.3/jquery-ui.min.js"></script> + <script src="[% app.cdn_url %]/libs/jquery-validation/1.19.5/jquery.validate.min.js"></script> <title>[% app.name %]</title> </head> diff --git a/templates/web/renater/index.html.tt2 b/templates/web/renater/index.html.tt2 index 2667efb0cb3045ee28974e8c6daa0896feeef6a4..75f39421296878164b0529619f4d57350aac6181 100644 --- a/templates/web/renater/index.html.tt2 +++ b/templates/web/renater/index.html.tt2 @@ -6,17 +6,17 @@ <link type="image/png" rel="icon" href="/images/favicon-federation.png" /> - <link type="text/css" rel="stylesheet" href="/font-awesome/css/font-awesome.min.css" /> - <link type="text/css" rel="stylesheet" href="/foundation/css/foundation.min.css"> - <link type="text/css" rel="stylesheet" href="/jquery-ui-1.12.1/jquery-ui.min.css" /> + <link type="text/css" rel="stylesheet" href="[% app.cdn_url %]/libs/font-awesome/6.5.2/css/all.min.css" /> + <link type="text/css" rel="stylesheet" href="[% app.cdn_url %]/libs/foundation/6.8.1/css/foundation.min.css"> + <link type="text/css" rel="stylesheet" href="[% app.cdn_url %]/libs/jquery-ui/1.13.3/jquery-ui.min.css" /> <link type="text/css" rel="stylesheet" href="/css/style.css" /> <link type="text/css" rel="stylesheet" href="/css/renater.css" /> - <script src="/jquery-3.3.1.min.js"></script> - <script src="/jquery-ui-1.12.1/jquery-ui.min.js"></script> - <script src="/jquery-validation-1.17.0.min.js"></script> - <script src="/foundation/js/vendor/what-input.js"></script> - <script src="/foundation/js/vendor/foundation.min.js"></script> + <script src="[% app.cdn_url %]/libs/jquery/3.7.1/jquery.min.js"></script> + <script src="[% app.cdn_url %]/libs/jquery-ui/1.13.3/jquery-ui.min.js"></script> + <script src="[% app.cdn_url %]/libs/jquery-validation/1.19.5/jquery.validate.min.js"></script> + <script src="[% app.cdn_url %]/libs/foundation/6.8.1/js/vendor/what-input.js"></script> + <script src="[% app.cdn_url %]/libs/foundation/6.8.1/js/vendor/foundation.min.js"></script> <script src="/js/startup.js"></script> <title>[% app.name %]</title>