Skip to content
Snippets Groups Projects
Commit 8bf15dff authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

Merge branch 'master' into 'WIP'

Master

See merge request !2319
parents 950a3b46 294b4c4a
1 merge request!2319Master
Pipeline #2390 passed with stage
in 20 minutes and 42 seconds
......@@ -22,11 +22,12 @@
class ZendAfi_View_Helper_AjaxRedirect extends ZendAfi_View_Helper_BaseHelper {
public function ajaxRedirect() {
Class_Admin_Skin::current()
->renderJQueryCssOn(Class_ScriptLoader::getInstance());
$script_loader = Class_ScriptLoader::getInstance();
Class_Admin_Skin::current()->renderJQueryCssOn($script_loader);
return
$this->_tag('div',
$script_loader->html()
. $this->_tag('div',
$this->_tag('p',
$this->_('Veuillez patienter ...'))
. $this->view->tagLoadingImg(),
......
......@@ -258,5 +258,58 @@
"desc": "Orphea Studio vous propose des offres de gestion de contenus multimédias adaptées à vos problématiques métiers",
"features": ["HARVEST", "SSO"],
"sales_contact": {"url": "https://www.orphea.com/contact", "name":"Orphéa", "mail":"info@orphea.com"}
},
"MEDIAPART": {
"label" : "Médiapart",
"enabled": "PROVIDER",
"url" : "https://www.mediapart.fr",
"image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/logo_mediapart.png",
"desc": "Mediapart est un journal d'information numérique, indépendant et participatif.",
"features": [],
"sales_contact": {"mail" : "",
"name" : "",
"url" : "https://www.mediapart.fr"}
},
"UNIVERSALIS": {
"label" : "Universalis",
"enabled": "PROVIDER",
"url" : "http://www.universalis-edu.com/",
"image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/logo_universalis.jpg",
"desc": "Encyclopédie francophone proposant des contenus couvrant tous les domaines de la connaissance illustrés par de nombreux médias.",
"features": [],
"sales_contact": {"mail" : "",
"name" : "",
"url" : "http://www.encyclopaedia-universalis.fr/bibliotheques-et-entreprises/universalis-fr/"}
},
"REFERENCES": {
"label" : "Références par Indexpresse",
"enabled": "PROVIDER",
"url" : "http://www.references-indexpresse.com",
"image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/logo_references.png",
"desc": "Références est le moteur de recherche dédié aux revues et magazines français « grand public ».",
"features": [],
"sales_contact": {"mail" : "",
"name" : "",
"url" : "http://www.indexpresse.fr/project/references/"}
},
"SCIENCESENLIGNE": {
"label" : "Sciences en ligne",
"enabled": "PROVIDER",
"url" : "http://www.sciences-en-ligne.com",
"image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/logo_sciencesenligne.png",
"desc": "Ressources encyclopédique scientifique et technique, en français.",
"features": [],
"sales_contact": {"mail" : "",
"name" : "",
"url" : "http://www.sciences-en-ligne.com/comm/documentaliste-bibliothecaire-mediatheques/"}
}
}
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