Commit 9d5e5911 authored by MARGERY David's avatar MARGERY David
Browse files

Make reference to exhibit relative

Context of this commit can be found in bug #8542

The code of exhibit seems to have been modified upon import to directly
reference a copy of the library installed at https://api.grid5000.fr.
This commit makes the reference relative, to reference the copy
distributed by g5k-api at an url that will support proxying
parent 684a45fe
......@@ -248,7 +248,7 @@ if (typeof SimileAjax == "undefined") {
];
if (!("jQuery" in window) && !("$" in window)) {
// javascriptFiles.unshift("jquery-1.4.2.min.js");
SimileAjax.includeJavascriptFile(document, "https://api.grid5000.fr/exhibitv2/jquery/1.7.1/jquery.min.js");
SimileAjax.includeJavascriptFile(document, "./javascripts/vendor/exhibitv2/jquery/1.7.1/jquery.min.js");
}
......
......@@ -186,7 +186,7 @@
}
if (useLocalResources) {
Exhibit.urlPrefix = "https://api.grid5000.fr/exhibitv2/exhibit/api/";
Exhibit.urlPrefix = "./javascripts/vendor/exhibitv2/exhibit/api/";
}
if (Exhibit.params.locale) { // ISO-639 language codes,
......@@ -268,7 +268,7 @@
window.SimileAjax_onLoad = loadMe;
var url = useLocalResources ?
"https://api.grid5000.fr/exhibitv2/ajax/api/simile-ajax-api.js?bundle=false" :
"./javascripts/vendor/exhibitv2/ajax/api/simile-ajax-api.js?bundle=false" :
"http://api.simile-widgets.org/ajax/2.2.3/simile-ajax-api.js";
var createScriptElement = function() {
......
/*==================================================
* French localization
*==================================================
*/
(function() {
var isCompiled = ("Exhibit_isCompiled" in window) && window.Exhibit_isCompiled;
if (!isCompiled) {
var javascriptFiles = [
"exhibit-l10n.js",
"data/database-l10n.js",
"ui/ui-context-l10n.js",
"ui/lens-l10n.js",
"ui/formatter-l10n.js",
"ui/widgets/collection-summary-widget-l10n.js",
"ui/views/view-panel-l10n.js",
"ui/views/ordered-view-frame-l10n.js",
"ui/views/tile-view-l10n.js",
"ui/views/thumbnail-view-l10n.js",
"ui/views/tabular-view-l10n.js",
"util/coders-l10n.js",
"util/facets-l10n.js",
"util/views-l10n.js"
];
var cssFiles = [
];
var urlPrefix = Exhibit.urlPrefix + "locales/fr/";
if (Exhibit.params.bundle) {
SimileAjax.includeJavascriptFiles(document, urlPrefix, [ "exhibit-fr-bundle.js" ]);
if (cssFiles.length > 0) {
SimileAjax.includeCssFiles(document, urlPrefix, [ "exhibit-fr-bundle.css" ]);
}
} else {
SimileAjax.includeJavascriptFiles(document, urlPrefix + "scripts/", javascriptFiles);
SimileAjax.includeCssFiles(document, urlPrefix + "styles/", cssFiles);
}
}
})();
Supports Markdown
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