Skip to content
Snippets Groups Projects
Commit b7a4533a authored by srosse's avatar srosse
Browse files

Merge OpenOLAT 10.4 to OpenOLAT default branch with cf474859804a3846ab3d1172cb5e65705a839c59

parents 15f4f75a 4083a95a
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 96 additions and 79 deletions
src/main/java/org/olat/core/commons/modules/glossary/_spring/glossaryCorecontext.xml
+ 4
− 2
View file @ b7a4533a
......@@ -17,17 +17,19 @@
Roman Haag, frentix GmbH, http://www.frentix.com
-->
<!--
<bean id="MorphologicalServiceDEImpl" class="org.olat.core.commons.modules.glossary.morphService.MorphologicalServiceDEImpl" />
<bean id="MorphologicalServiceFRImpl" class="org.olat.core.commons.modules.glossary.morphService.MorphologicalServiceFRImpl" />
<bean id="MorphologicalServiceLocalImpl" class="org.olat.core.commons.modules.glossary.morphService.MorphologicalServiceLocalImpl" />
-->
<bean id="org.olat.core.commons.modules.glossary.GlossaryModule" class="org.olat.core.commons.modules.glossary.GlossaryModule" >
<property name="morphologicalServices">
<list>
<!--
<ref bean="MorphologicalServiceDEImpl" />
<ref bean="MorphologicalServiceFRImpl" />
-->
<!-- use this local test Service to test with a local xml file instead of web-service -->
<!-- <ref bean="MorphologicalServiceLocalImpl" /> -->
</list>
......
src/main/webapp/static/js/tinymce4/BTinyHelper.js
+ 23
− 19
View file @ b7a4533a
......@@ -60,29 +60,33 @@ var BTinyHelper = {
// - relative links: media and links relative to the root folder
// - relative-absolute links: media that belong to the framework from the static dir
// - absolute links: media an links to external sites
linkConverter : function (url, node, on_save) {
linkConverter : function (url, node, on_save, name) {
var orig = url + '';
var editor = top.tinymce.activeEditor;
var settings = editor.settings;
if (!settings.convert_urls || (node && node.nodeName == 'LINK') || url.indexOf('file:') === 0) {
// Don't convert link href since thats the CSS files that gets loaded into the editor also skip local file URLs
} else if (settings.relative_urls) {
// Convert to relative, but only if not a brasato framework URL. Relative links are removed by the XSS filter.
if (url.indexOf('/') == 0
|| url.indexOf(o_info.uriprefix.replace(/auth/g,'url')) != -1
|| (-1 < url.indexOf(o_info.uriprefix) < url.indexOf("/go?"))) {
// Don't convert special brasato framework URL that are relative-absolute:
// 1) /olat/raw/_noversion_/... or /olat/secstatic/...
// 2) http://localhost/olat/classpath/62x/org.olat.core.gui.components.form.flexible.impl.elements.richText/js/tinymce/
// 3) http://localhost/olat/url/RepositoryEntry/27361280/ (REST URL and permalinks)
// 4) http://localhost/olat/auth/abc/go?xyz (old jump in URL's)
if(editor === undefined) {
//do nothing
} else {
var settings = editor.settings;
if (!settings.convert_urls || (node && node.nodeName == 'LINK') || url.indexOf('file:') === 0) {
// Don't convert link href since thats the CSS files that gets loaded into the editor also skip local file URLs
} else if (settings.relative_urls) {
// Convert to relative, but only if not a brasato framework URL. Relative links are removed by the XSS filter.
if (url.indexOf('/') == 0
|| url.indexOf(o_info.uriprefix.replace(/auth/g,'url')) != -1
|| (-1 < url.indexOf(o_info.uriprefix) < url.indexOf("/go?"))) {
// Don't convert special brasato framework URL that are relative-absolute:
// 1) /olat/raw/_noversion_/... or /olat/secstatic/...
// 2) http://localhost/olat/classpath/62x/org.olat.core.gui.components.form.flexible.impl.elements.richText/js/tinymce/
// 3) http://localhost/olat/url/RepositoryEntry/27361280/ (REST URL and permalinks)
// 4) http://localhost/olat/auth/abc/go?xyz (old jump in URL's)
} else {
// convert to relative path using TinyMCE standard conversion
url = editor.documentBaseURI.toRelative(url);
}
} else {
// convert to relative path using TinyMCE standard conversion
url = editor.documentBaseURI.toRelative(url);
// Convert to absolute
url = editor.documentBaseURI.toAbsolute(url, settings.remove_script_host);
}
} else {
// Convert to absolute
url = editor.documentBaseURI.toAbsolute(url, settings.remove_script_host);
}
return url;
......
src/main/webapp/static/js/tinymce4/tinymce/plugins/olatmovieviewer/plugin.js
+ 12
− 12
View file @ b7a4533a
......@@ -14,7 +14,7 @@
author : 'frentix GmbH',
authorurl : 'http://www.frentix.com',
infourl : 'http://www.frentix.com',
version : '2.3.3'
version : '2.3.4'
};
},
......@@ -92,11 +92,11 @@
setStr(pl, null, 'width');
setStr(pl, null, 'height');
if ((val = top.tinymce.activeEditor.dom.getAttrib(fe, "width")) != "") {
if ((val = ed.dom.getAttrib(fe, "width")) != "") {
pl.width = val;
}
if ((val = top.tinymce.activeEditor.dom.getAttrib(fe, "height")) != "") {
if ((val = ed.dom.getAttrib(fe, "height")) != "") {
pl.height = val;
}
......@@ -114,7 +114,7 @@
function getNextDomId() {
var count = 0;
var domIdentity = "olatFlashMovieViewer";
var placeHolders = top.tinymce.activeEditor.dom.select("img.mceItemOlatMovieViewer");
var placeHolders = ed.dom.select("img.mceItemOlatMovieViewer");
do {
domIdentity = "olatFlashMovieViewer" + (count++);
if(count > 20) {
......@@ -186,8 +186,8 @@
function _getEmbed(p) {
// player configuration
var playerOffsetHeight = top.tinymce.activeEditor.getParam("olatmovieviewer_playerOffsetHeight");
var playerOffsetWidth = top.tinymce.activeEditor.getParam("olatmovieviewer_playerOffsetWidth");
var playerOffsetHeight = ed.getParam("olatmovieviewer_playerOffsetHeight");
var playerOffsetWidth = ed.getParam("olatmovieviewer_playerOffsetWidth");
var playerWidth = typeof(p.width) != "undefined" ? (parseInt(p.width) + parseInt(playerOffsetWidth)) : '320';
var playerHeight = typeof(p.height) != "undefined" ? (parseInt(p.height) + parseInt(playerOffsetHeight)) : '240';
var start = typeof(p.starttime) != "undefined" ? p.starttime : "00:00:00.000";
......@@ -217,7 +217,7 @@
if(p.address != undefined) {
if(p.address.indexOf('://') < 0 && ((provider != "rtmp" && provider != "http") ||
((provider == "rtmp" || provider == "http") && (streamer == undefined || streamer.length == 0)))) {
videoUrl = top.tinymce.activeEditor.documentBaseURI.toAbsolute(p.address);
videoUrl = ed.documentBaseURI.toAbsolute(p.address);
}
}
......@@ -328,7 +328,7 @@
}
var helpButton = coreTranslator().translate('help');
var helpLink = top.tinymce.activeEditor.getParam("olatmovieviewer_helpUrl" + o_getMainWin().o_info.locale);
var helpLink = ed.getParam("olatmovieviewer_helpUrl" + o_getMainWin().o_info.locale);
jQuery(".mce-tabs").append("<span class='o_chelp_wrapper'><a href='" + helpLink + "' class='o_chelp' target='_blank'><i class='mce-ico mce-i-help'> </i> " + helpButton + "</a></span>")
}
......@@ -361,8 +361,8 @@
function getPlayerHtmlNode(editor,p) {
var h = '', n, l = '';
// player configuration
var playerOffsetHeight = top.tinymce.activeEditor.getParam("olatmovieviewer_playerOffsetHeight");
var playerOffsetWidth = top.tinymce.activeEditor.getParam("olatmovieviewer_playerOffsetWidth");
var playerOffsetHeight = ed.getParam("olatmovieviewer_playerOffsetHeight");
var playerOffsetWidth = ed.getParam("olatmovieviewer_playerOffsetWidth");
var playerWidth = typeof(p.width) != "undefined" ? (parseInt(p.width) + parseInt(playerOffsetWidth)) : '';
var playerHeight = typeof(p.height) != "undefined" ? (parseInt(p.height) + parseInt(playerOffsetHeight)) : '';
var starttime = typeof(p.starttime) != "undefined" ? '"' + p.starttime + '"' : 0;
......@@ -373,7 +373,7 @@
var streamer = typeof(p.streamer) != "undefined" ? '"' + p.streamer + '"' : 'undefined';
var domIdentity = typeof(p.domIdentity) != "undefined" ? p.domIdentity : getNextDomId();
var poster = typeof(p.poster) != "undefined" ? '"' + p.poster + '"' : 'undefined';
var playerScriptUrl = top.tinymce.activeEditor.getParam("olatmovieviewer_playerScript");
var playerScriptUrl = ed.getParam("olatmovieviewer_playerScript");
var h = '<script src="' + playerScriptUrl + '" type="text/javascript"></script>';
h += '<script type="text/javascript" defer="defer">';
......@@ -445,7 +445,7 @@
//fallback for the old movies with settings in comments
ed.on('BeforeSetContent',function(e) {
if(e.content.indexOf('--omvs::') > 0) {
var imgUrl = top.tinymce.activeEditor.getParam("olatmovieviewer_transparentImage");
var imgUrl = ed.getParam("olatmovieviewer_transparentImage");
e.content = e.content.replace(/\n/gi, "");
var widthMatch = e.content.match(/(?:<!--omvs::.*?width:')([0-9]+)(?:'.*?<!--omve-->)/i);
var width = ((widthMatch != null) && (widthMatch.length == 2)) ? parseInt(widthMatch[1]) : 320;
......
src/main/webapp/static/js/tinymce4/tinymce/plugins/olatsmileys/plugin.js
+ 55
− 44
View file @ b7a4533a
......@@ -7,51 +7,62 @@
* 18.06.2009 timo.wuersch@frentix.com
*/
(function() {
// Load OLAT translator
function findMainWindow(win) {
if (win.o_info) return win;
else if (win.opener) return findMainWindow(opener);
else return null;
}
var mainWin = findMainWindow(window);
var translator;
if (mainWin) {
translator = jQuery(document).ooTranslator().getTranslator(mainWin.o_info.locale, 'org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.olatsmileys')
} else {
// implement dummy-translator
translator = { translate : function(key) { return key; } }
}
function getHtml() {
var smileyNames = [
["smile","sad","blushing","confused","cool","cry"],
["devil","grin","kiss","ohoh","angry","sick"],
["angel","tongue","ugly","weird","wink","worried"]
];
var transparentImg = top.tinymce.activeEditor.getParam("olatsmileys_transparentImage");
var emoticonsHtml = '<table border="0" cellspacing="4" cellpadding="4" id="smileystable">';
for (var row=0; row<smileyNames.length; row++) {
emoticonsHtml += "<tr>";
for (var col=0; col<smileyNames[row].length; col++) {
var n = smileyNames[row][col];
// use OLAT translator for OALT image
var altText = translator.translate('olatsmileys.icon.' + n);
emoticonsHtml += "<td><a href='#'>";
emoticonsHtml += "<img class='o_emoticons_" + n + "' src='" + transparentImg +"' width='18' height='18' border='0' ";
emoticonsHtml += "alt='" + n + "' title='" + altText + "' /></a></td>";
}
emoticonsHtml += "</tr>";
}
emoticonsHtml += '</table>';
return emoticonsHtml;
}
// Create plugin object
tinymce.create('org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.olatsmileys', {
init : function(ed, url) {
var cachedTrans, cachedCoreTrans;
var cachedHelp;
// Load the OLAT translator.
function translator() {
if(cachedTrans) return cachedTrans;
var mainWin = o_getMainWin();
if (mainWin) {
cachedTrans = jQuery(document).ooTranslator().getTranslator(mainWin.o_info.locale, 'org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.olatsmileys');
} else {
cachedTrans = { translate : function(key) { return key; } }
}
return cachedTrans;
}
function coreTranslator() {
if(cachedCoreTrans) return cachedCoreTrans;
var mainWin = o_getMainWin();
if (mainWin) {
cachedCoreTrans = jQuery(document).ooTranslator().getTranslator(mainWin.o_info.locale, 'org.olat.core');
} else {
cachedCoreTrans = { translate : function(key) { return key; } }
}
return cachedCoreTrans;
}
function getHtml() {
var smileyNames = [
["smile","sad","blushing","confused","cool","cry"],
["devil","grin","kiss","ohoh","angry","sick"],
["angel","tongue","ugly","weird","wink","worried"]
];
var transparentImg = ed.getParam("olatsmileys_transparentImage");
var emoticonsHtml = '<table border="0" cellspacing="4" cellpadding="4" id="smileystable">';
for (var row=0; row<smileyNames.length; row++) {
emoticonsHtml += "<tr>";
for (var col=0; col<smileyNames[row].length; col++) {
var n = smileyNames[row][col];
// use OLAT translator for OALT image
var altText = translator().translate('olatsmileys.icon.' + n);
emoticonsHtml += "<td><a href='#'>";
emoticonsHtml += "<img class='o_emoticons_" + n + "' src='" + transparentImg +"' width='18' height='18' border='0' ";
emoticonsHtml += "alt='" + n + "' title='" + altText + "' /></a></td>";
}
emoticonsHtml += "</tr>";
}
emoticonsHtml += '</table>';
return emoticonsHtml;
}
// Register button
ed.addButton('olatsmileys', {
......@@ -65,7 +76,7 @@
onclick: function(e) {
var type = jQuery(e.target).attr('class');
if (type) {
var tag = '<img src="' + top.tinymce.activeEditor.getParam("olatsmileys_transparentImage") + '" class="' + type + '">';
var tag = '<img src="' + ed.getParam("olatsmileys_transparentImage") + '" class="' + type + '">';
ed.insertContent(tag);
this.hide();
}
......@@ -85,7 +96,7 @@
onclick: function(e) {
var type = jQuery(e.target).attr('class');
if (type) {
var tag = '<img src="' + top.tinymce.activeEditor.getParam("olatsmileys_transparentImage") + '" class="' + type + '">';
var tag = '<img src="' + ed.getParam("olatsmileys_transparentImage") + '" class="' + type + '">';
ed.insertContent(tag);
this.parent().cancel();//close parent menu
}
......@@ -101,7 +112,7 @@
author : 'frentix GmbH',
authorurl : 'http://www.frentix.com',
infourl : 'http://www.frentix.com',
version : "1.1.1"
version : "1.1.2"
};
}
});
......
src/main/webapp/static/js/tinymce4/tinymce/plugins/olatsmileys/plugin.min.js
+ 1
− 1
View file @ b7a4533a
(function(){function b(e){if(e.o_info){return e}else{if(e.opener){return b(opener)}else{return null}}}var a=b(window);var c;if(a){c=jQuery(document).ooTranslator().getTranslator(a.o_info.locale,"org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.olatsmileys")}else{c={translate:function(e){return e}}}function d(){var g=[["smile","sad","blushing","confused","cool","cry"],["devil","grin","kiss","ohoh","angry","sick"],["angel","tongue","ugly","weird","wink","worried"]];var f=top.tinymce.activeEditor.getParam("olatsmileys_transparentImage");var i='<table border="0" cellspacing="4" cellpadding="4" id="smileystable">';for(var j=0;j<g.length;j++){i+="<tr>";for(var h=0;h<g[j].length;h++){var k=g[j][h];var e=c.translate("olatsmileys.icon."+k);i+="<td><a href='#'>";i+="<img class='o_emoticons_"+k+"' src='"+f+"' width='18' height='18' border='0' ";i+="alt='"+k+"' title='"+e+"' /></a></td>"}i+="</tr>"}i+="</table>";return i}tinymce.create("org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.olatsmileys",{init:function(e,f){e.addButton("olatsmileys",{title:"Smileys",image:f+"/img/smiley-smile.gif",type:"panelbutton",popoverAlign:"bc-tl",panel:{autohide:true,html:d,onclick:function(i){var h=jQuery(i.target).attr("class");if(h){var g='<img src="'+top.tinymce.activeEditor.getParam("olatsmileys_transparentImage")+'" class="'+h+'">';e.insertContent(g);this.hide()}}},tooltip:"Smileys"});e.addMenuItem("olatsmileys",{text:"Smileys",image:f+"/img/smiley-smile.gif",context:"insert",menu:[{type:"container",html:d(),onclick:function(i){var h=jQuery(i.target).attr("class");if(h){var g='<img src="'+top.tinymce.activeEditor.getParam("olatsmileys_transparentImage")+'" class="'+h+'">';e.insertContent(g);this.parent().cancel()}}}]})},getInfo:function(){return{longname:"OpenOLAT Smileys",author:"frentix GmbH",authorurl:"http://www.frentix.com",infourl:"http://www.frentix.com",version:"1.1.1"}}});tinymce.PluginManager.add("olatsmileys",org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.olatsmileys)})();
\ No newline at end of file
(function(){tinymce.create("org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.olatsmileys",{init:function(b,e){var f,a;var d;function c(){if(f){return f}var i=o_getMainWin();if(i){f=jQuery(document).ooTranslator().getTranslator(i.o_info.locale,"org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.olatsmileys")}else{f={translate:function(j){return j}}}return f}function g(){if(a){return a}var i=o_getMainWin();if(i){a=jQuery(document).ooTranslator().getTranslator(i.o_info.locale,"org.olat.core")}else{a={translate:function(j){return j}}}return a}function h(){var k=[["smile","sad","blushing","confused","cool","cry"],["devil","grin","kiss","ohoh","angry","sick"],["angel","tongue","ugly","weird","wink","worried"]];var j=b.getParam("olatsmileys_transparentImage");var m='<table border="0" cellspacing="4" cellpadding="4" id="smileystable">';for(var o=0;o<k.length;o++){m+="<tr>";for(var l=0;l<k[o].length;l++){var p=k[o][l];var i=c().translate("olatsmileys.icon."+p);m+="<td><a href='#'>";m+="<img class='o_emoticons_"+p+"' src='"+j+"' width='18' height='18' border='0' ";m+="alt='"+p+"' title='"+i+"' /></a></td>"}m+="</tr>"}m+="</table>";return m}b.addButton("olatsmileys",{title:"Smileys",image:e+"/img/smiley-smile.gif",type:"panelbutton",popoverAlign:"bc-tl",panel:{autohide:true,html:h,onclick:function(k){var j=jQuery(k.target).attr("class");if(j){var i='<img src="'+b.getParam("olatsmileys_transparentImage")+'" class="'+j+'">';b.insertContent(i);this.hide()}}},tooltip:"Smileys"});b.addMenuItem("olatsmileys",{text:"Smileys",image:e+"/img/smiley-smile.gif",context:"insert",menu:[{type:"container",html:h(),onclick:function(k){var j=jQuery(k.target).attr("class");if(j){var i='<img src="'+b.getParam("olatsmileys_transparentImage")+'" class="'+j+'">';b.insertContent(i);this.parent().cancel()}}}]})},getInfo:function(){return{longname:"OpenOLAT Smileys",author:"frentix GmbH",authorurl:"http://www.frentix.com",infourl:"http://www.frentix.com",version:"1.1.2"}}});tinymce.PluginManager.add("olatsmileys",org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.olatsmileys)})();
\ No newline at end of file
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