Lightbox Content
';
-if(C=="lightrounded"){D+=this.roundedlightbottom(B,A)
-}else{if(C=="rounded"){D+=this.roundedbottom(B,A)
-}else{D+='';
-return C
-},roundedlighttop:function(A,B){var C='
';
-return C
-},lightboxlink:function(B,A){var C='"+B+"";
-return C
-}});
\ No newline at end of file
+Lightbox = Class.create({
+ initialize: function (C, A, B) {
+ this.formUrl = C;
+ this.saveUrl = A;
+ this.redirectUrl = B;
+ this.formData = "";
+ this.loadedForms = new Object();
+ this.lbinit();
+ this.lbShow();
+ this.lbLoadForm(C);
+ },
+ lbShow: function () {
+ this.lbLoading();
+ toggleClass($("lb-bg"), "hidden");
+ toggleClass($("lb-align"), "hidden");
+ $("lb-bg").style.height = document.body.offsetHeight + 35 + "px";
+ },
+ lbHide: function () {
+ toggleClass($("lb-bg"), "hidden");
+ toggleClass($("lb-align"), "hidden");
+ },
+ lbLoading: function () {
+ if (this.currentUrl) {
+ this.loadedForms[this.currentUrl] =
+ $("lb-content").firstChild.cloneNode(true);
+ }
+ $("lb-content").innerHTML = this.getWaiting();
+ },
+ lbLoadForm: function (url) {
+ this.currentUrl = url;
+ if (this.loadedForms[url]) {
+ var c = $("lb-content");
+ $("lb-content").innerHTML = "";
+ $("lb-content").appendChild(this.loadedForms[url]);
+ this.form = c.getElementsByTagName("form")[0];
+ var scripts = c.getElementsByTagName("script");
+ for (var i = 0; i < scripts.length; ++i) {
+ eval(scripts[i].text);
+ }
+ } else {
+ new Ajax.Request(url, { onSuccess: this.lbFormDataLoaded.bind(this) });
+ }
+ },
+ lbFormDataLoaded: function (transport) {
+ var c = $("lb-content");
+ c.innerHTML = "
" + transport.responseText + "
";
+ this.form = c.getElementsByTagName("form")[0];
+ var scripts = c.getElementsByTagName("script");
+ for (var i = 0; i < scripts.length; ++i) {
+ eval(scripts[i].text);
+ }
+ $("lb-bg").style.height = document.body.offsetHeight + 35 + "px";
+ },
+ lbSaveForm: function () {
+ this.lbSaveData();
+ Form.disable(this.form);
+ this.lbSaveSync(this.saveUrl);
+ this.lbHide();
+ window.location = this.redirectUrl;
+ },
+ lbNext: function (A) {
+ this.lbSaveData();
+ this.lbLoading();
+ this.lbLoadForm(A);
+ },
+ lbSaveData: function () {
+ this.formData += "&" + Form.serialize(this.form);
+ this.formData = this.formData.replace("_segmentChief=&", "=&");
+ this.formData = this.formData.replace("_periodicity=&", "=&");
+ },
+ lbSave: function (A) {
+ this.lbSaveData();
+ new Ajax.Request(A + "?ajax=1", {
+ parameters: this.formData,
+ onSuccess: this.lbSaveDone.bind(this),
+ });
+ },
+ lbSaveSync: function (A) {
+ new Ajax.Request(A + "?ajax=1", {
+ parameters: this.formData,
+ asynchronous: false,
+ });
+ },
+ lbSaveDone: function (A) {
+ this.lbHide();
+ },
+ lbClearData: function () {
+ this.formData = "";
+ },
+ lbClose: function () {
+ this.lbHide();
+ if (this.redirectUrl !== undefined) {
+ window.location = this.redirectUrl;
+ }
+ },
+ lbSetNext: function (A) {
+ this.nextURL = A;
+ },
+ getWaiting: function () {
+ return '
Lightbox Content
';
+ if (C == "lightrounded") {
+ D += this.roundedlightbottom(B, A);
+ } else {
+ if (C == "rounded") {
+ D += this.roundedbottom(B, A);
+ } else {
+ D +=
+ '';
+ return C;
+ },
+ roundedlighttop: function (A, B) {
+ var C =
+ '
';
+ return C;
+ },
+ lightboxlink: function (B, A) {
+ var C =
+ '" +
+ B +
+ "";
+ return C;
+ },
+});
diff --git a/src/main/webapp/resources/js/xwiki/lightbox/lightboxIE.css b/src/main/webapp/resources/js/xwiki/lightbox/lightboxIE.css
index 77c5c2b0d..6b53414b2 100644
--- a/src/main/webapp/resources/js/xwiki/lightbox/lightboxIE.css
+++ b/src/main/webapp/resources/js/xwiki/lightbox/lightboxIE.css
@@ -1,40 +1,212 @@
-.rounded .top *,.rounded .bottom *,.roundedlight .top *,.roundedlight .bottom *{display:block;overflow:hidden;border-color:#A9B6C3;border-style:solid;background:#EEF3F6 none repeat scroll 0 50%;height:1px;border-width:0 1px;margin:0;padding:0;zoom:1;line-height:1px;}
-.rounded,.rounded .top,.rounded .bottom{height:16px;}
-.roundedlight,.roundedlight .top,.roundedlight .bottom{height:5px;}
-.roundedlight .b1,.roundedlight .b1b{background:#A9B6C3 none repeat scroll 0 50%;margin:0 5px;border-width:0;}
-.roundedlight .b2,.roundedlight .b2b{border-width:0 2px;margin:0 3px;}
-.roundedlight .b3,.roundedlight .b3b{margin:0 2px;}
-.roundedlight .b4,.roundedlight .b4b{height:2px;margin:0 1px;}
-.rounded .b1,.rounded .b1b{border-width:0;margin:0 16px;background:#A9B6C3 none repeat scroll 0 50%;}
-.rounded .b2,.rounded .b2b{border-width:0 3px;margin:0 13px;}
-.rounded .b3,.rounded .b3b{border-width:0 2px;margin:0 11px;}
-.rounded .b4,.rounded .b4b{border-width:0 2px;margin:0 9px;}
-.rounded .b5,.rounded .b5b{margin:0 8px;}
-.rounded .b6,.rounded .b6b{margin:0 7px;}
-.rounded .b7,.rounded .b7b{margin:0 6px;}
-.rounded .b8,.rounded .b8b{margin:0 5px;}
-.rounded .b9,.rounded .b9b{margin:0 4px;}
-.rounded .b10,.rounded .b10b{height:2px;margin:0 3px;}
-.rounded .b11,.rounded .b11b{height:2px;margin:0 2px;}
-.rounded .b12,.rounded .b12b{height:3px;margin:0 1px;}
-#lb-bg{background-color:#000;height:100%;left:0;position:absolute;top:0;width:100%;z-index:100000;filter:alpha(opacity=70);opacity:.7;overflow:auto;}
-#lb input[type=text],#lb textarea{cursor:text;}
-#lb button{cursor:hand;}
-#lb-align{min-height:100%;position:absolute;width:100%;left:0;text-align:center;vertical-align:middle;z-index:100002;}
-#lb{position:absolute;left:50%;top:50px;margin-left:-450px;z-index:100005;width:900px;}
-.lb-content{background:#eef3f6;border:1px solid #A9B6C3;border-width:0 1px;padding:0;text-align:center;}
-#lb ul li{_zoom:1;}
-.lb-squarred{background:#eef3f6;border:1px solid #A9B6C3;}
-#lb-bottom .lb-squarred{border-top-width:0;}
-#lb-top .lb-squarred{border-bottom-width:0;}
-#lb-content h1,#lb-content h2,#lb-content h3{margin-top:0;padding-top:0;}
-#lb-top .roundedlight{margin-bottom:-0.15em;margin-top:-0.9em;}
-#lb-bottom .roundedlight{margin-top:-0.75em;}
-#lb-top .rounded{margin-bottom:0;margin-top:0;}
-#lb-bottom .rounded{margin-top:-0.2em;}
-*+html #lb-top .rounded .b1,* html #lb-top .rounded .b1,*+html #lb-top .roundedlight .b1,* html #lb-top .roundedlight .b1{margin-bottom:-1em;}
-*+html #lb-bottom .rounded .b12b,* html #lb-bottom .rounded .b12b,*+html #lb-bottom .roundedlight .b4b,* html #lb-bottom .roundedlight .b4b{margin-bottom:-1em;}
-#lb .lb-content{padding:4px 18px;}
-.lb-content{overflow:hidden;text-align:left;}
-#close-wrap{position:relative;top:18px;right:7px;text-align:right;cursor:default;}
-#lb-close{margin-left:auto;margin-right:10px;width:30px;cursor:pointer;background-image:url($xwiki.getSkinFile("js/xwiki/lightbox/btnClose.png", true));background-repeat:no-repeat;}
\ No newline at end of file
+.rounded .top *,
+.rounded .bottom *,
+.roundedlight .top *,
+.roundedlight .bottom * {
+ display: block;
+ overflow: hidden;
+ border-color: #a9b6c3;
+ border-style: solid;
+ background: #eef3f6 none repeat scroll 0 50%;
+ height: 1px;
+ border-width: 0 1px;
+ margin: 0;
+ padding: 0;
+ zoom: 1;
+ line-height: 1px;
+}
+.rounded,
+.rounded .top,
+.rounded .bottom {
+ height: 16px;
+}
+.roundedlight,
+.roundedlight .top,
+.roundedlight .bottom {
+ height: 5px;
+}
+.roundedlight .b1,
+.roundedlight .b1b {
+ background: #a9b6c3 none repeat scroll 0 50%;
+ margin: 0 5px;
+ border-width: 0;
+}
+.roundedlight .b2,
+.roundedlight .b2b {
+ border-width: 0 2px;
+ margin: 0 3px;
+}
+.roundedlight .b3,
+.roundedlight .b3b {
+ margin: 0 2px;
+}
+.roundedlight .b4,
+.roundedlight .b4b {
+ height: 2px;
+ margin: 0 1px;
+}
+.rounded .b1,
+.rounded .b1b {
+ border-width: 0;
+ margin: 0 16px;
+ background: #a9b6c3 none repeat scroll 0 50%;
+}
+.rounded .b2,
+.rounded .b2b {
+ border-width: 0 3px;
+ margin: 0 13px;
+}
+.rounded .b3,
+.rounded .b3b {
+ border-width: 0 2px;
+ margin: 0 11px;
+}
+.rounded .b4,
+.rounded .b4b {
+ border-width: 0 2px;
+ margin: 0 9px;
+}
+.rounded .b5,
+.rounded .b5b {
+ margin: 0 8px;
+}
+.rounded .b6,
+.rounded .b6b {
+ margin: 0 7px;
+}
+.rounded .b7,
+.rounded .b7b {
+ margin: 0 6px;
+}
+.rounded .b8,
+.rounded .b8b {
+ margin: 0 5px;
+}
+.rounded .b9,
+.rounded .b9b {
+ margin: 0 4px;
+}
+.rounded .b10,
+.rounded .b10b {
+ height: 2px;
+ margin: 0 3px;
+}
+.rounded .b11,
+.rounded .b11b {
+ height: 2px;
+ margin: 0 2px;
+}
+.rounded .b12,
+.rounded .b12b {
+ height: 3px;
+ margin: 0 1px;
+}
+#lb-bg {
+ background-color: #000;
+ height: 100%;
+ left: 0;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ z-index: 100000;
+ filter: alpha(opacity=70);
+ opacity: 0.7;
+ overflow: auto;
+}
+#lb input[type="text"],
+#lb textarea {
+ cursor: text;
+}
+#lb button {
+ cursor: hand;
+}
+#lb-align {
+ min-height: 100%;
+ position: absolute;
+ width: 100%;
+ left: 0;
+ text-align: center;
+ vertical-align: middle;
+ z-index: 100002;
+}
+#lb {
+ position: absolute;
+ left: 50%;
+ top: 50px;
+ margin-left: -450px;
+ z-index: 100005;
+ width: 900px;
+}
+.lb-content {
+ background: #eef3f6;
+ border: 1px solid #a9b6c3;
+ border-width: 0 1px;
+ padding: 0;
+ text-align: center;
+}
+#lb ul li {
+ _zoom: 1;
+}
+.lb-squarred {
+ background: #eef3f6;
+ border: 1px solid #a9b6c3;
+}
+#lb-bottom .lb-squarred {
+ border-top-width: 0;
+}
+#lb-top .lb-squarred {
+ border-bottom-width: 0;
+}
+#lb-content h1,
+#lb-content h2,
+#lb-content h3 {
+ margin-top: 0;
+ padding-top: 0;
+}
+#lb-top .roundedlight {
+ margin-bottom: -0.15em;
+ margin-top: -0.9em;
+}
+#lb-bottom .roundedlight {
+ margin-top: -0.75em;
+}
+#lb-top .rounded {
+ margin-bottom: 0;
+ margin-top: 0;
+}
+#lb-bottom .rounded {
+ margin-top: -0.2em;
+}
+* + html #lb-top .rounded .b1,
+* html #lb-top .rounded .b1,
+* + html #lb-top .roundedlight .b1,
+* html #lb-top .roundedlight .b1 {
+ margin-bottom: -1em;
+}
+* + html #lb-bottom .rounded .b12b,
+* html #lb-bottom .rounded .b12b,
+* + html #lb-bottom .roundedlight .b4b,
+* html #lb-bottom .roundedlight .b4b {
+ margin-bottom: -1em;
+}
+#lb .lb-content {
+ padding: 4px 18px;
+}
+.lb-content {
+ overflow: hidden;
+ text-align: left;
+}
+#close-wrap {
+ position: relative;
+ top: 18px;
+ right: 7px;
+ text-align: right;
+ cursor: default;
+}
+#lb-close {
+ margin-left: auto;
+ margin-right: 10px;
+ width: 30px;
+ cursor: pointer;
+ background-image: url(/skin/resources/js/xwiki/lightbox/btnClose.png);
+ background-repeat: no-repeat;
+}
diff --git a/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.css b/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.css
deleted file mode 100644
index f1e846c3f..000000000
--- a/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.css
+++ /dev/null
@@ -1,66 +0,0 @@
-#template('colorThemeInit.vm')
-
-.xhover {
- background:red;
-}
-
-input[type="text"].suggest {
- border-width: 1px;
-}
-
-body {
- position: relative;
-}
-
-div.suggestItems {
- position:absolute;
- border: 1px solid $theme.borderColor;
- border-top: none;
- background: white; /* theme color ? */
- z-index: 100013;
- text-align:left;
-}
-
-div.suggestItems ul {
- margin: 0px;
-}
-
-div.suggestItems li {
- overflow:hidden;
- white-space:nowrap;
- margin-right:2px;
-}
-
-ul.suggestList {
- margin:0px !important;
- text-transform:none;
- color:$theme.textColor;
- font-weight:normal;
-}
-
-ul.suggestList .xhighlight {
- background-color: $theme.highlightColor;
-}
-
-div.suggestItemName {
- text-indent: 0;
-}
-
-div.suggestItemInfo {
- color: #556677;
- font-size: 0.8em;
- padding-left: 20px;
- text-indent: 0;
-}
-
-div.suggestItemName,
-div.suggestItemInfo {
- text-decoration: inherit;
-}
-
-.highlight {
- background-color: $theme.highlightColor;
- font-weight:bold;
- text-decoration: inherit;
-}
-
diff --git a/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.js b/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.js
deleted file mode 100644
index ff6f545b2..000000000
--- a/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.js
+++ /dev/null
@@ -1,561 +0,0 @@
-var XWiki = (function(XWiki){
-
- var widgets = XWiki.widgets = XWiki.widgets || {};
-
- if (typeof widgets.XList == 'undefined') {
- if (typeof console != "undefined" && typeof console.warn == "function") {
- console.warn("[Suggest widget] Required class missing: XWiki.widgets.XList");
- }
- } else {
-
-/**
- * Suggest class.
- * Provide value suggestions to users when starting to type in a text input.
- */
- widgets.Suggest = Class.create({
- options : {
- // The minimum number of characters after which to trigger the suggest
- minchars : 1,
- // The HTTP method for the AJAX request
- method : "get",
- // The name of the request parameter holding the input stub
- varname : "input",
- // The CSS classname of the suggest list
- className : "ajaxsuggest",
- timeout : 2500,
- delay : 500,
- offsety : 0,
- // Display a "no results" message, or simply hide the suggest box when no suggestions are available
- shownoresults : true,
- // The message to display as the "no results" message
- noresults : "No results!",
- maxheight : 250,
- cache : false,
- seps : "",
- icon : null,
- // The name of the JSON variable or XML element holding the results.
- // "results" for the old suggest, "searchResults" for the REST search.
- resultsParameter : "results",
- // The name of the JSON parameter or XML attribute holding the result identifier.
- // "id" for both the old suggest and the REST search.
- resultId : "id",
- // The name of the JSON parameter or XML attribute holding the result value.
- // "value" for the old suggest, "pageFullName" for the REST page search.
- resultValue : "value",
- // The name of the JSON parameter or XML attribute holding the result auxiliary information.
- // "info" for the old suggest, "pageFullName" for the REST search.
- resultInfo : "info",
- // The id of the element that will hold the suggest element
- parentContainer : "body"
- },
- sInput : "",
- nInputChars : 0,
- aSuggestions : [],
- iHighlighted : 0,
-
- /**
- * Initialize the suggest
- *
- * @param {Object} fld the suggest field
- * @param {Object} param the options
- */
- initialize: function (fld, param){
- this.fld = $(fld);
-
- if (!this.fld) {
- return false;
- }
-
- // Clone default options from the prototype so that they are not shared and extend options with passed parameters
- this.options = Object.extend(Object.clone(this.options), param || { });
-
- // Reset the container if the configured parameter is not valid
- if (!$(this.options.parentContainer)) {
- this.options.parentContainer = $(document.body);
- }
-
- if (this.options.seps) {
- this.seps = this.options.seps;
- } else {
- this.seps = "";
- }
- // Bind the key listeners on the input field.
- this.fld.observe("keyup", this.onKeyUp.bindAsEventListener(this));
- if (Prototype.Browser.IE || Prototype.Browser.WebKit) {
- this.fld.observe("keydown", this.onKeyPress.bindAsEventListener(this));
- } else {
- this.fld.observe("keypress", this.onKeyPress.bindAsEventListener(this));
- }
-
- // Prevent normal browser autocomplete
- this.fld.setAttribute("autocomplete", "off");
- },
-
- /**
- * Treats normal characters and triggers the autocompletion behavior. This is needed since the field value is not
- * updated when keydown/keypress are called, so the suggest would work with the previous value. The disadvantage is
- * that keyUp is not fired for each stroke in a long keypress, but only once at the end. This is not a real problem,
- * though.
- */
- onKeyUp: function(event)
- {
- var key = event.keyCode;
- switch(key) {
- // Ignore special keys, which are treated in onKeyPress
- case Event.KEY_RETURN:
- case Event.KEY_ESC:
- case Event.KEY_UP:
- case Event.KEY_DOWN:
- break;
- default: {
- // If there are separators in the input string, get suggestions only for the text after the last separator
- // TODO The user might be typing in the middle of the field, not in the last item. Do a better detection by
- // comparing the new value with the old one.
- if(this.seps) {
- var lastIndx = -1;
- for(var i = 0; i < this.seps.length; i++) {
- if(this.fld.value.lastIndexOf(this.seps.charAt(i)) > lastIndx) {
- lastIndx = this.fld.value.lastIndexOf(this.seps.charAt(i));
- }
- }
- if(lastIndx == -1) {
- this.getSuggestions(this.fld.value);
- } else {
- this.getSuggestions(this.fld.value.substring(lastIndx+1));
- }
- } else {
- this.getSuggestions(this.fld.value);
- }
- }
- }
- },
- /**
- * Treats Up and Down arrows, Enter and Escape, affecting the UI meta-behavior. Enter puts the currently selected
- * value inside the target field, Escape closes the suggest dropdown, Up and Down move the current selection.
- */
- onKeyPress: function(event) {
- if(!$(this.suggest)) {
- // Let the key events pass through if the UI is not displayed
- return;
- }
- var key = event.keyCode;
-
- switch(key) {
- case Event.KEY_RETURN:
- if(this.aSuggestions.length == 1) {
- this.highlightFirst();
- }
- this.setHighlightedValue();
- Event.stop(event);
- break;
- case Event.KEY_ESC:
- this.clearSuggestions();
- Event.stop(event);
- break;
- case Event.KEY_UP:
- this.changeHighlight(key);
- Event.stop(event);
- break;
- case Event.KEY_DOWN:
- this.changeHighlight(key);
- Event.stop(event);
- break;
- default:
- break;
- }
- },
-
- /**
- * Get suggestions
- *
- * @param {Object} val the value to get suggestions for
- */
- getSuggestions: function (val)
- {
- // if input stays the same, do nothing
- //
- val = val.strip();
- if (val == this.sInput) {
- return false;
- }
-
- // input length is less than the min required to trigger a request
- // reset input string
- // do nothing
- //
- if (val.length < this.options.minchars) {
- this.sInput = "";
- return false;
- }
-
- // if caching enabled, and user is typing (ie. length of input is increasing)
- // filter results out of aSuggestions from last request
- //
- if (val.length>this.nInputChars && this.aSuggestions.length && this.options.cache)
- {
- var arr = [];
- for (var i=0;i
-
- *
- "limit" the maximum number of row entries in the table - *
- "maxPages" the maximum number of pages to display at the same time in the pagination section. - *
-
+ *
- "limit" the maximum number of row entries in the table + *
- "maxPages" the maximum number of pages to display at the same time in the pagination section. + *
\n'; + // Let code know displaying is finished + // 1. Named event (for code interested by that table only) + document.fire("xwiki:livetable:" + this.domNodeName + ":displayComplete") + // 2. Generic event (for code potentially interested in any livetable) + document.fire("xwiki:livetable:displayComplete", { + "tableId" : this.domNodeName + }); + }, - // If no rows fetched yet, get all we need - if (this.totalRows == -1) { - this.getRows(offset, limit, offset, limit, delay); - buff += 'table is empty so we get all rows'; - return buff; - } + /** + * Fetch and display rows. This method checks the existing fetched data to determine which (if + * any) rows should be fetched from the server, then forwards the call to {@link #displayRows}. + * @param offset Starting offset; the index of the first row that should be displayed. + * @param limit Maximum number of rows to display. + * @param in case we need to fetch rows, an optional delay before the rows are actually fetched + * against the server (allows submission throttling) + */ + showRows: function(offset, limit, delay) + { + this.lastOffset = offset; + + // Update permalinks + this.permalinks.update(); + + // This is some debugging string. + var buff = 'request to display rows '+offset+' to '+(offset+limit)+'
\n'; - // Make a range of required rows - var min = -1; - var max = -1; + // If no rows fetched yet, get all we need + if (this.totalRows == -1) { + this.getRows(offset, limit, offset, limit, delay); + buff += 'table is empty so we get all rows'; + return buff; + } + + // Make a range of required rows + var min = -1; + var max = -1; - for (var i = offset; i < (offset + limit); ++i) { - if (this.fetchedRows[i] == undefined) { - if (min == -1) { - min = i; + for (var i = offset; i < (offset + limit); ++i) { + if (this.fetchedRows[i] == undefined) { + if (min == -1) { + min = i; + } + max = i; } - max = i; } - } - // If we don't need any new row - if (min == -1) { - buff += 'no need to get new rows
\n'; - this.displayRows(offset, limit); - } else { - // We need to get new rows - buff += 'we need to get rows '+min+' to '+ (max+1) +'
\n'; - this.getRows(min, max - min + 1, offset, limit); - } - - if(this.paginator) this.paginator.refreshPagination(); + // If we don't need any new row + if (min == -1) { + buff += 'no need to get new rows
\n'; + this.displayRows(offset, limit); + } else { + // We need to get new rows + buff += 'we need to get rows '+min+' to '+ (max+1) +'
\n'; + this.getRows(min, max - min + 1, offset, limit); + } + + if(this.paginator) this.paginator.refreshPagination(); - return buff; - }, + return buff; + }, - /** - * Delete a row from the fetch cache, shifting the remaining rows accordingly. - */ - deleteAndShiftRows: function(indx) - { - for(var i in this.fetchedRows) { - if(i >= indx) - this.fetchedRows[i] = this.fetchedRows[''+(parseInt(i)+1)]; - } - }, + /** + * Delete a row from the fetch cache, shifting the remaining rows accordingly. + */ + deleteAndShiftRows: function(indx) + { + for(var i in this.fetchedRows) { + if(i >= indx) + this.fetchedRows[i] = this.fetchedRows[''+(parseInt(i)+1)]; + } + }, - /** - * Debug method. Dumps the content of the fetch cache (row indexes only). - */ - debugFetchedRows: function() { - var buf = ''; - for (var i in this.fetchedRows) { - if (this.fetchedRows[i] != undefined) { - buf += i+' '; + /** + * Debug method. Dumps the content of the fetch cache (row indexes only). + */ + debugFetchedRows: function() { + var buf = ''; + for (var i in this.fetchedRows) { + if (this.fetchedRows[i] != undefined) { + buf += i+' '; + } } - } - return buf; - }, + return buf; + }, - /** - * Delete a row and redisplay the table. - * @param indx The index of the row that must be deleted. - */ - deleteRow: function(indx) { - this.deleteAndShiftRows(indx); + /** + * Delete a row and redisplay the table. + * @param indx The index of the row that must be deleted. + */ + deleteRow: function(indx) { + this.deleteAndShiftRows(indx); + + // Compute new refresh offset + var newoffset = this.lastOffset; + if(indx > this.totalRows - this.limit - 1) { + newoffset -= 1; + } + if(newoffset <= 0) { + newoffset = 1; + } + this.totalRows -= 1; + if(this.totalRows < this.limit) { + this.showRows(newoffset, this.totalRows); + } + else { + this.showRows(newoffset, this.limit); + } + + if (this.paginator) this.paginator.refreshPagination(); - // Compute new refresh offset - var newoffset = this.lastOffset; - if(indx > this.totalRows - this.limit - 1) { - newoffset -= 1; - } - if(newoffset <= 0) { - newoffset = 1; - } - this.totalRows -= 1; - if(this.totalRows < this.limit) { - this.showRows(newoffset, this.totalRows); - } - else { - this.showRows(newoffset, this.limit); - } - - if (this.paginator) this.paginator.refreshPagination(); - - // Let code know displaying is finished - // 1. Named event (for code interested by that table only) - document.fire("xwiki:livetable:" + this.domNodeName + ":displayComplete") - // 2. Generic event (for code potentially interested in any livetable) - document.fire("xwiki:livetable:displayComplete", { - "tableId" : this.domNodeName - }); - }, + // Let code know displaying is finished + // 1. Named event (for code interested by that table only) + document.fire("xwiki:livetable:" + this.domNodeName + ":displayComplete") + // 2. Generic event (for code potentially interested in any livetable) + document.fire("xwiki:livetable:displayComplete", { + "tableId" : this.domNodeName + }); + }, - /** - * Return the URL fragment with sort parameters depending on the state of the table. - */ - getSortURLFragment:function() - { - var column = this.getSortColumn(); - var fragment = ""; - if( column != null ) { - fragment += "&sort=" + column; - var direction = this.getSortDirection(); - if( direction != null ) { - return fragment += "&dir=" + direction; + /** + * Return the URL fragment with sort parameters depending on the state of the table. + */ + getSortURLFragment:function() + { + var column = this.getSortColumn(); + var fragment = ""; + if( column != null ) { + fragment += "&sort=" + column; + var direction = this.getSortDirection(); + if( direction != null ) { + return fragment += "&dir=" + direction; + } } - } - return fragment; - }, + return fragment; + }, - /** - * Return the name of the current sorted column, null if no sortable column is selected - */ - getSortColumn: function() - { - if (!this.selectedColumn) { - return null; - } - var a = this.selectedColumn.down("a"); - if (!a) { - return null; - } - return a.getAttribute('rel'); - }, + /** + * Return the name of the current sorted column, null if no sortable column is selected + */ + getSortColumn: function() + { + if (!this.selectedColumn) { + return null; + } + var a = this.selectedColumn.down("a"); + if (!a) { + return null; + } + return a.getAttribute('rel'); + }, - /** - * Return the sorting direction of the current sorted column, null if no sortable column is selected - */ - getSortDirection: function() - { - if (!this.selectedColumn) { - return null; - } - return (this.selectedColumn.hasClassName('desc') ? 'desc' : 'asc'); - }, + /** + * Return the sorting direction of the current sorted column, null if no sortable column is selected + */ + getSortDirection: function() + { + if (!this.selectedColumn) { + return null; + } + return (this.selectedColumn.hasClassName('desc') ? 'desc' : 'asc'); + }, - /** - * Remove all the fetched data from the cache. - */ - clearCache: function() - { - this.fetchedRows.clear(); - this.totalRows = -1; - }, + /** + * Remove all the fetched data from the cache. + */ + clearCache: function() + { + this.fetchedRows.clear(); + this.totalRows = -1; + }, - /** - * Iterate over the column headers that have the sortable class to observe sort changes when user clicks the column header. - * - * @param column the sort column to select initially - * @param direction the sort direction for the sort column selected - */ - observeSortableColumns: function(column, direction) - { - var self = this; - $(this.domNodeName).select('th.sortable').each(function(el) { - var colname = el.down("a") ? el.down("a").getAttribute("rel") : null; - if (colname == column) { - self.selectedColumn = el; - el.addClassName('selected'); - if (direction == "asc") { - if (el.hasClassName('desc')) { - el.removeClassName('desc'); + /** + * Iterate over the column headers that have the sortable class to observe sort changes when user clicks the column header. + * + * @param column the sort column to select initially + * @param direction the sort direction for the sort column selected + */ + observeSortableColumns: function(column, direction) + { + var self = this; + $(this.domNodeName).select('th.sortable').each(function(el) { + var colname = el.down("a") ? el.down("a").getAttribute("rel") : null; + if (colname == column) { + self.selectedColumn = el; + el.addClassName('selected'); + if (direction == "asc") { + if (el.hasClassName('desc')) { + el.removeClassName('desc'); + } + el.addClassName("asc") + } else { + if (el.hasClassName('asc')) { + el.removeClassName('asc'); + } + el.addClassName("desc") } - el.addClassName("asc") } else { - if (el.hasClassName('asc')) { - el.removeClassName('asc'); + if (el.hasClassName('selected')) { + el.removeClassName('selected'); + } + if (!el.hasClassName('desc') && !el.hasClassName('asc')) { // no order set in the HTML. Force desc + el.addClassName('desc'); } - el.addClassName("desc") - } - } else { - if (el.hasClassName('selected')) { - el.removeClassName('selected'); - } - if (!el.hasClassName('desc') && !el.hasClassName('asc')) { // no order set in the HTML. Force desc - el.addClassName('desc'); } - } - Event.observe(el, "click", function(event) { - var elem = event.element(); - if (!elem.hasClassName('sortable')) { - elem = elem.up('th.sortable'); - } - if (elem == null) { - // This should never happen in real life, but better safe than sorry... - return; - } - if (elem.hasClassName("selected")) { // Sort column already selected. Change direction - var direction = elem.hasClassName("asc") ? "asc" : "desc"; - var newDirection = direction == "asc" ? "desc" : "asc"; - elem.removeClassName(direction); - elem.addClassName(newDirection); - } - else { // sort column was not selected, do not change direction, just column - if (self.selectedColumn){ - self.selectedColumn.removeClassName("selected"); - } - elem.addClassName("selected"); - self.selectedColumn = elem; - } - self.clearCache(); //reset - self.showRows(1, self.limit); - }); - }); - } -}); + Event.observe(el, "click", function(event) { + var elem = event.element(); + if (!elem.hasClassName('sortable')) { + elem = elem.up('th.sortable'); + } + if (elem == null) { + // This should never happen in real life, but better safe than sorry... + return; + } + if (elem.hasClassName("selected")) { // Sort column already selected. Change direction + var direction = elem.hasClassName("asc") ? "asc" : "desc"; + var newDirection = direction == "asc" ? "desc" : "asc"; + elem.removeClassName(direction); + elem.addClassName(newDirection); + } + else { // sort column was not selected, do not change direction, just column + if (self.selectedColumn){ + self.selectedColumn.removeClassName("selected"); + } + elem.addClassName("selected"); + self.selectedColumn = elem; + } + self.clearCache(); //reset + self.showRows(1, self.limit); + }); + }); + } + }); -/** - * Helper class to manage permalinks - **/ -var LiveTableHash = Class.create({ /** - * new LiveTableHash( table, enable ) - * @param table the livetable link to this hash - * @param enable if false, the hash will be disabled (not updated) - */ - initialize: function(table, enable) - { - this.table = table; - this.enable = enable; - this.loadFromHash(); - }, + * Helper class to manage permalinks + **/ + var LiveTableHash = Class.create({ + /** + * new LiveTableHash( table, enable ) + * @param table the livetable link to this hash + * @param enable if false, the hash will be disabled (not updated) + */ + initialize: function(table, enable) + { + this.table = table; + this.enable = enable; + this.loadFromHash(); + }, - /** - * Returns the parameters for the current table from hash. - * If permalink is disabled, or there is no parameter for the current table in hash, returns null - */ - loadFromHash: function() - { - this.params = this.getTableParams(); - this.filters = new Object(); - - if (!this.enable) return; - - var hashString = window.location.hash.substring(1); - if (!hashString.blank()) { - var tables = hashString.split("|"); - for (var i = 0; i < tables.length; i++) { - var params = tables[i].toQueryParams(); - if (params["t"] == this.table.domNodeName) { - for (var param in params) { - if (param.length == 1 && "tplsd".indexOf(param) != -1) { - this.params[param] = params[param]; - } else { - this.filters[param] = params[param]; + /** + * Returns the parameters for the current table from hash. + * If permalink is disabled, or there is no parameter for the current table in hash, returns null + */ + loadFromHash: function() + { + this.params = this.getTableParams(); + this.filters = new Object(); + + if (!this.enable) return; + + var hashString = window.location.hash.substring(1); + if (!hashString.blank()) { + var tables = hashString.split("|"); + for (var i = 0; i < tables.length; i++) { + var params = tables[i].toQueryParams(); + if (params["t"] == this.table.domNodeName) { + for (var param in params) { + if (param.length == 1 && "tplsd".indexOf(param) != -1) { + this.params[param] = params[param]; + } else { + this.filters[param] = params[param]; + } } } } } - } - }, + }, - /** - * Returns a parameter map of current livetable state - */ - getTableParams: function() - { - var result = new Object(); - result["t"] = this.table.domNodeName; - result["p"] = ((this.table.lastOffset - 1) / this.table.limit) + 1; - result["l"] = this.table.limit; - if (this.table.getSortColumn() != null) { - result["s"] = this.table.getSortColumn(); - result["d"] = this.table.getSortDirection(); - } - return result; - }, + /** + * Returns a parameter map of current livetable state + */ + getTableParams: function() + { + var result = new Object(); + result["t"] = this.table.domNodeName; + result["p"] = ((this.table.lastOffset - 1) / this.table.limit) + 1; + result["l"] = this.table.limit; + if (this.table.getSortColumn() != null) { + result["s"] = this.table.getSortColumn(); + result["d"] = this.table.getSortDirection(); + } + return result; + }, - /** - * Get helpers, private - */ - getParam: function(name) { return this.params[name]; }, - getIntParam: function(name) { return parseInt(this.params[name]); }, + /** + * Get helpers, private + */ + getParam: function(name) { return this.params[name]; }, + getIntParam: function(name) { return parseInt(this.params[name]); }, + + /** + * Return individual parameter from permlinks hash + */ + getLimit: function() { return this.getIntParam("l"); }, + getPage: function() { return this.getIntParam("p"); }, + getSortColumn: function() { return this.getParam("s"); }, + getSortDirection: function() { return this.getParam("d"); }, + + /** + * Returns filters from permalink hash + * Note: Currently filters are not kept/updated after initialization + */ + getFilters: function(name) + { + return this.filters; + }, - /** - * Return individual parameter from permlinks hash - */ - getLimit: function() { return this.getIntParam("l"); }, - getPage: function() { return this.getIntParam("p"); }, - getSortColumn: function() { return this.getParam("s"); }, - getSortDirection: function() { return this.getParam("d"); }, + /** + * Serialize permalink parameters to query string. + * This function ensure serialization is always applied in the same order so that comparing strings is meaningful + * + * @param newParams Optional argument to serialize future parameters in place of current ones + */ + serializeParams: function(newParams) + { + var params = $H((newParams) ? newParams : this.params); + params = params.inject({}, function(params, pair) { + params[pair.key] = encodeURIComponent(pair.value); + return params; + }); - /** - * Returns filters from permalink hash - * Note: Currently filters are not kept/updated after initialization - */ - getFilters: function(name) - { - return this.filters; - }, + var result = "t=#{t}&p=#{p}&l=#{l}".interpolate(params); + if (params["s"]) { + result += "&s=#{s}&d=#{d}".interpolate(params); + } + return result; + }, - /** - * Serialize permalink parameters to query string. - * This function ensure serialization is always applied in the same order so that comparing strings is meaningful - * - * @param newParams Optional argument to serialize future parameters in place of current ones - */ - serializeParams: function(newParams) - { - var params = $H((newParams) ? newParams : this.params); - params = params.inject({}, function(params, pair) { - params[pair.key] = encodeURIComponent(pair.value); - return params; - }); + /** + * Re-write location hash with current page and filters values + * Nothing is done if the hash is disabled + */ + update: function() + { + if (!this.enable) return; - var result = "t=#{t}&p=#{p}&l=#{l}".interpolate(params); - if (params["s"]) { - result += "&s=#{s}&d=#{d}".interpolate(params); + var params = this.getTableParams(); + var paramsString = this.serializeParams(params); + var filterString = this.table.filter ? this.table.filter.serializeFilters() : ""; + + var shouldUpdate = !filterString.blank() || (paramsString != this.serializeParams()); + + if (shouldUpdate) { + var currentHash = window.location.hash.substring(1); + var tables = currentHash.split("|"), newHash = ""; + for (var i = 0; i < tables.length; i++) { + if (tables[i].toQueryParams()["t"] != params["t"]) { + // Don't override other tables params + newHash += (tables[i] + "|"); + } + } + newHash += paramsString; + newHash += filterString; + + this.params = params; + this.filters = null; //better, but useless: this.filters = filterString.toQueryParams(); + window.location.hash = "#" + newHash; + } } - return result; - }, + }); - /** - * Re-write location hash with current page and filters values - * Nothing is done if the hash is disabled + /** + * Helper class to display pagination */ - update: function() - { - if (!this.enable) return; - - var params = this.getTableParams(); - var paramsString = this.serializeParams(params); - var filterString = this.table.filter ? this.table.filter.serializeFilters() : ""; - - var shouldUpdate = !filterString.blank() || (paramsString != this.serializeParams()); - - if (shouldUpdate) { - var currentHash = window.location.hash.substring(1); - var tables = currentHash.split("|"), newHash = ""; - for (var i = 0; i < tables.length; i++) { - if (tables[i].toQueryParams()["t"] != params["t"]) { - // Don't override other tables params - newHash += (tables[i] + "|"); + var LiveTablePagination = Class.create({ + initialize: function(table, domNodes, max) + { + this.table = table; + var self = this; + this.pagesNodes = []; + domNodes.each(function(elem){ + self.pagesNodes.push(elem.down(".xwiki-livetable-pagination-content")); + }); + this.max = max; + $(this.table.domNodeName).select(".prevPagination").invoke("observe", "click", this.gotoPrevPage.bind(this)); + $(this.table.domNodeName).select(".nextPagination").invoke("observe", "click", this.gotoNextPage.bind(this)); + }, + refreshPagination: function() + { + var self = this; + this.pagesNodes.each(function(elem){ + elem.innerHTML = ""; + }); + var pages = Math.ceil(this.table.totalRows / this.table.limit); + var currentMax = (!this.max) ? pages : this.max; + var currentPage = Math.floor( this.table.lastOffset / this.table.limit) + 1; + var startPage = Math.floor(currentPage / currentMax) * currentMax - 1; + // always display the first page + if (startPage>1) { + this.pagesNodes.each(function(elem){ + elem.insert(self.createPageLink(1, false)); + }); + if (startPage>2) { + this.pagesNodes.invoke("insert", " ... "); + } + } + // display pages + for (var i=(startPage<=0) ? 1 : startPage;i<=Math.min(startPage + currentMax + 1, pages);i++) { + var selected = (currentPage == i); + this.pagesNodes.each(function(elem){ + elem.insert(self.createPageLink(i, selected)); + }); + this.pagesNodes.invoke("insert", " "); + } + // alwyas display the last page. + if (i
");
- // Move DIV contents after the GWT script loader.
- var nextSibling = script.nextSibling;
- while(div.firstChild) {
- var child = div.firstChild;
- // Recover the script tags.
- if (child.nodeName.toLowerCase() == 'pre' && child.getAttribute('script') == 'script') {
- var pre = child;
- pre.removeAttribute('script');
- // Create the script tag.
- child = document.createElement('script');
- // Copy all the attributes.
- for (var i = 0; i < pre.attributes.length; i++) {
- var attrNode = pre.attributes[i];
- // In case of IE we have to copy only the specified attributes.
- if (typeof attrNode.specified == 'undefined'
- || (typeof attrNode.specified == 'boolean' && attrNode.specified)) {
- child.setAttribute(attrNode.nodeName, attrNode.nodeValue);
- }
- }
- // Copy the script text.
- child.text = typeof pre.innerText == 'undefined' ? pre.textContent : pre.innerText;
- // Don't forget to remove the placeholder.
- div.removeChild(pre);
- }
- if (nextSibling) {
- script.parentNode.insertBefore(child, nextSibling);
- } else {
- script.parentNode.appendChild(child);
- }
- }
- }
- if (counter >= limit) {
- document.write = oldWrite;
- oldWrite = undefined;
- script = undefined;
- counter = undefined;
- }
- }
-
- // Append the script tag to the head.
- var heads = document.getElementsByTagName('head');
- if (heads.length > 0) {
- document.write = newWrite;
- heads[0].appendChild(script);
- }
- },
-
- /**
- * Schedules a function to be executed after the WYSIWYG module is loaded. A call to this method forces the WYSIWYG
- * module to be loaded, unless the second parameter, {@code lazy}, is set to {@code true}.
- *
- * @param fCode a function
- * @param lazy {@code true} to prevent loading the WYSIWYG module at this point, {@code false} otherwise
- */
- onModuleLoad: function(fCode, lazy) {
- if (typeof fCode != 'function') {
- return;
- }
- switch (this.readyState) {
- // uninitialized
- case 0:
- if (!lazy) {
- this.load();
- }
- // fall-through
-
- // loading
- case 1:
- this.onModuleLoadQueue.push(fCode);
- break;
-
- // loaded
- case 2:
- fCode();
- break;
- }
- },
-
- /**
- * Executes all the functions scheduled from on module load.
- */
- fireOnModuleLoad: function() {
- // The WYSIWYG module has been loaded successfully.
- this.readyState = 2;
-
- // Execute all the scheduled functions.
- for (var i = 0; i < this.onModuleLoadQueue.length; i++) {
- this.onModuleLoadQueue[i]();
- }
-
- // There's no need to schedule functions anymore. They will be execute immediately.
- this.onModuleLoadQueue = undefined;
- },
-
- /**
- * Try to wrap onScriptLoad in order to be notified when the WYSIWYG script is loaded.
- */
- maybeHookOnScriptLoad: function() {
- if (${moduleName} && ${moduleName}.onScriptLoad) {
- var onScriptLoad = ${moduleName}.onScriptLoad;
- ${moduleName}.onScriptLoad = function() {
- Wysiwyg.hookGwtOnLoad();
- onScriptLoad();
-
- // Restore the default onScriptLoad function.
- if (${moduleName} && ${moduleName}.onScriptLoad) {
- ${moduleName}.onScriptLoad = onScriptLoad;
- }
- onScriptLoad = undefined;
- }
-
- // Prevent further calls to this method.
- this.maybeHookOnScriptLoad = function(){};
- }
- },
-
- /**
- * Wrap gwtOnLoad in order to be notified when the WYSIWYG module is loaded.
- */
- hookGwtOnLoad: function() {
- var iframe = document.getElementById('${moduleName}');
- var gwtOnLoad = iframe.contentWindow.gwtOnLoad;
- iframe.contentWindow.gwtOnLoad = function(errFn, modName, modBase) {
- gwtOnLoad(function() {
- Wysiwyg.fireOnModuleLoad = function(){};
- if (typeof errFn == 'function') {
- errFn();
- }
- }, modName, modBase);
- Wysiwyg.fireOnModuleLoad();
-
- // Restore the default gwtOnLoad function.
- iframe.contentWindow.gwtOnLoad = gwtOnLoad;
- iframe = undefined;
- gwtOnLoad = undefined;
- }
-
- // Prevent further calls to this method.
- this.hookGwtOnLoad = function(){};
- }
-};
-
-// Enhance the WysiwygEditor class with custom events.
-Wysiwyg.onModuleLoad(function() {
- var WysiwygEditorAspect = function() {
- WysiwygEditorAspect.base.constructor.apply(this, arguments);
- if (this.getRichTextArea()) {
- // If the editor was successfully created then fire a custom event.
- document.fire('xwiki:wysiwyg:created', {'instance': this});
- }
- }
- WysiwygEditorAspect.prototype = new WysiwygEditor;
- WysiwygEditorAspect.base = WysiwygEditor.prototype;
- WysiwygEditor = WysiwygEditorAspect;
-}, true);
-
-#if("$!request.lazy" != "true")
-Wysiwyg.load();
-#end
\ No newline at end of file
diff --git a/src/main/webapp/resources/js/xwiki/xwiki-misc.js b/src/main/webapp/resources/js/xwiki/xwiki-misc.js
new file mode 100644
index 000000000..f6e9bce2d
--- /dev/null
+++ b/src/main/webapp/resources/js/xwiki/xwiki-misc.js
@@ -0,0 +1,20 @@
+/** this are js-snippets moved to disk from xwiki-sheets on
+ * dropping skinx plugins **/
+document.addEventListener("DOMContentLoaded", function () {
+ const switcher = document.getElementById("classname");
+ if (switcher) {
+ switcher.addEventListener("change", function () {
+ const value = this.options[this.selectedIndex].value;
+ if (value !== "-") {
+ window.location = value;
+ }
+ });
+ const form = switcher.closest("form");
+ if (form) {
+ const submit = form.querySelector("input[type='submit']");
+ if (submit) {
+ submit.style.display = "none";
+ }
+ }
+ }
+});
diff --git a/src/main/webapp/resources/js/xwiki/xwiki.js b/src/main/webapp/resources/js/xwiki/xwiki.js
index 6b078ee4d..3f7ce7aa7 100644
--- a/src/main/webapp/resources/js/xwiki/xwiki.js
+++ b/src/main/webapp/resources/js/xwiki/xwiki.js
@@ -7,9 +7,11 @@ var XWiki = (function (XWiki) {
*/
Object.extend(XWiki, {
-
+ messages: {
+ translations: {},
+ celMeta: {},
+ },
constants: {
-
/**
* Character that separates wiki from space in a page fullName (example: xwiki:Main.WebHome).
*/
@@ -48,18 +50,20 @@ var XWiki = (function (XWiki) {
/**
* URL Anchor for page comments.
*/
- docextraInformationAnchor: "Information"
+ docextraInformationAnchor: "Information",
},
resource: {
-
/**
* Extract the name of the wiki from a resource name. Examples: returns "xwiki" with "xwiki:Main.WebHome",
* returns null with "Main.WebHome".
*/
getWikiFromResourceName: function (name) {
if (name.include(XWiki.constants.wikiSpaceSeparator)) {
- return name.substring(0, name.indexOf(XWiki.constants.wikiSpaceSeparator));
+ return name.substring(
+ 0,
+ name.indexOf(XWiki.constants.wikiSpaceSeparator),
+ );
}
return null;
},
@@ -72,20 +76,31 @@ var XWiki = (function (XWiki) {
var originalName = name;
// Remove wiki if any.
if (name.include(XWiki.constants.wikiSpaceSeparator)) {
- name = name.substring(name.indexOf(XWiki.constants.wikiSpaceSeparator) + 1, name.length);
+ name = name.substring(
+ name.indexOf(XWiki.constants.wikiSpaceSeparator) + 1,
+ name.length,
+ );
}
// If the resource contains an attachment, make sure the dot is not part of the attachment name.
if (name.include(XWiki.constants.spacePageSeparator)) {
- if (name.include(XWiki.constants.pageAttachmentSeparator) && name.indexOf(XWiki.constants.spacePageSeparator)
- > name.indexOf(XWiki.constants.pageAttachmentSeparator)) {
+ if (
+ name.include(XWiki.constants.pageAttachmentSeparator) &&
+ name.indexOf(XWiki.constants.spacePageSeparator) >
+ name.indexOf(XWiki.constants.pageAttachmentSeparator)
+ ) {
return null;
}
- return name.substring(0, name.indexOf(XWiki.constants.spacePageSeparator));
+ return name.substring(
+ 0,
+ name.indexOf(XWiki.constants.spacePageSeparator),
+ );
}
// If the resource name looks like "xwiki:Main" we return "Main".
- if (originalName.include(XWiki.constants.wikiSpaceSeparator)
- && !originalName.include(XWiki.constants.pageAttachmentSeparator)
- && !originalName.include(XWiki.constants.anchorSeparator)) {
+ if (
+ originalName.include(XWiki.constants.wikiSpaceSeparator) &&
+ !originalName.include(XWiki.constants.pageAttachmentSeparator) &&
+ !originalName.include(XWiki.constants.anchorSeparator)
+ ) {
return name;
}
return null;
@@ -99,18 +114,30 @@ var XWiki = (function (XWiki) {
var originalName = name;
// Remove wiki if any.
if (name.include(XWiki.constants.wikiSpaceSeparator)) {
- name = name.substring(name.indexOf(XWiki.constants.wikiSpaceSeparator) + 1, name.length);
+ name = name.substring(
+ name.indexOf(XWiki.constants.wikiSpaceSeparator) + 1,
+ name.length,
+ );
}
// remove attachment if any.
if (name.include(XWiki.constants.pageAttachmentSeparator)) {
- name = name.substring(0, name.indexOf(XWiki.constants.pageAttachmentSeparator));
+ name = name.substring(
+ 0,
+ name.indexOf(XWiki.constants.pageAttachmentSeparator),
+ );
}
// remove anchor if any.
if (name.include(XWiki.constants.anchorSeparator)) {
- name = name.substring(0, name.indexOf(XWiki.constants.anchorSeparator));
+ name = name.substring(
+ 0,
+ name.indexOf(XWiki.constants.anchorSeparator),
+ );
}
if (name.include(XWiki.constants.spacePageSeparator)) {
- return name.substring(name.indexOf(XWiki.constants.spacePageSeparator) + 1, name.length);
+ return name.substring(
+ name.indexOf(XWiki.constants.spacePageSeparator) + 1,
+ name.length,
+ );
} else {
if (originalName.include(XWiki.constants.wikiSpaceSeparator)) {
// If the resource name looks like "xwiki:Main" it does not contain page info.
@@ -127,7 +154,10 @@ var XWiki = (function (XWiki) {
*/
getAttachmentFromResourceName: function (name) {
if (name.include(XWiki.constants.pageAttachmentSeparator)) {
- return name.substring(name.indexOf(XWiki.constants.pageAttachmentSeparator) + 1, name.length);
+ return name.substring(
+ name.indexOf(XWiki.constants.pageAttachmentSeparator) + 1,
+ name.length,
+ );
}
return null;
},
@@ -138,7 +168,10 @@ var XWiki = (function (XWiki) {
*/
getAnchorFromResourceName: function (name) {
if (name.include(XWiki.constants.anchorSeparator)) {
- return name.substring(name.indexOf(XWiki.constants.anchorSeparator) + 1, name.length);
+ return name.substring(
+ name.indexOf(XWiki.constants.anchorSeparator) + 1,
+ name.length,
+ );
}
return null;
},
@@ -165,15 +198,26 @@ var XWiki = (function (XWiki) {
var attachment = this.getAttachmentFromResourceName(name);
var anchor = this.getAnchorFromResourceName(name);
- if (!wiki) { wiki = XWiki.currentWiki; }
- if (!space) { space = XWiki.currentSpace; }
- if (!pageName) { pageName = XWiki.currentPage; }
- if (!attachment) { attachment = ""; }
- if (!anchor) { anchor = ""; }
+ if (!wiki) {
+ wiki = XWiki.currentWiki;
+ }
+ if (!space) {
+ space = XWiki.currentSpace;
+ }
+ if (!pageName) {
+ pageName = XWiki.currentPage;
+ }
+ if (!attachment) {
+ attachment = "";
+ }
+ if (!anchor) {
+ anchor = "";
+ }
var fullName = space + XWiki.constants.spacePageSeparator + pageName;
var prefixedSpace = wiki + XWiki.constants.wikiSpaceSeparator + space;
- var prefixedFullName = wiki + XWiki.constants.wikiSpaceSeparator + fullName;
+ var prefixedFullName =
+ wiki + XWiki.constants.wikiSpaceSeparator + fullName;
return {
wiki: wiki,
@@ -183,7 +227,7 @@ var XWiki = (function (XWiki) {
prefixedFullName: prefixedFullName,
name: pageName,
attachment: attachment,
- anchor: anchor
+ anchor: anchor,
};
},
@@ -194,7 +238,7 @@ var XWiki = (function (XWiki) {
* @return a string that can be passed to the #get(String) method to reconstruct the resource
*/
serialize: function (resource) {
- var name = '';
+ var name = "";
if (resource.wiki) {
name = resource.wiki;
}
@@ -223,7 +267,7 @@ var XWiki = (function (XWiki) {
name += resource.anchor;
}
return name;
- }
+ },
},
/**
@@ -258,7 +302,7 @@ var XWiki = (function (XWiki) {
window.activeDocExtraPane.className = "";
tab.blur();
- document.fire("xwiki:docextra:activated", { "id": extraID });
+ document.fire("xwiki:docextra:activated", { id: extraID });
};
// Use Ajax.Updater to display the requested pane (extraID) : comments, attachments, etc.
@@ -273,17 +317,17 @@ var XWiki = (function (XWiki) {
$("docextrapanes").className = "loading";
new Ajax.Updater(
extraID + "pane",
- window.docgeturl + '?xpage=xpart&vm=' + extraTemplate,
+ window.docgeturl + "?xpage=xpart&vm=" + extraTemplate,
{
- method: 'post',
+ method: "post",
evalScripts: true,
onComplete: function (transport) {
$("docextrapanes").className = "";
// Let other know new content has been loaded
document.fire("xwiki:docextra:loaded", {
- "id": extraID,
- "element": $(extraID + "pane")
+ id: extraID,
+ element: $(extraID + "pane"),
});
// switch tab
@@ -293,18 +337,19 @@ var XWiki = (function (XWiki) {
// Yes, this is a POJW (Plain Old JavaScript Ha^Wworkaround) which
// prevents the anchor 'jump' after a click event but enable it
// when the user is arriving from a direct /Space/Page#Section URL
- $(extraID + 'anchor').id = extraID;
- location.href = '#' + extraID;
- $(extraID).id = extraID + 'anchor';
+ $(extraID + "anchor").id = extraID;
+ location.href = "#" + extraID;
+ $(extraID).id = extraID + "anchor";
}
- }
- });
+ },
+ },
+ );
} else {
dhtmlSwitch(extraID);
if (scrollToAnchor) {
- $(extraID + 'anchor').id = extraID;
- location.href = '#' + extraID;
- $(extraID).id = extraID + 'anchor';
+ $(extraID + "anchor").id = extraID;
+ location.href = "#" + extraID;
+ $(extraID).id = extraID + "anchor";
}
}
},
@@ -318,15 +363,20 @@ var XWiki = (function (XWiki) {
if (typeof content == "undefined") {
content = document.body;
}
- $(content).select(".xwikirenderingerror").each(function (error) {
- if (error.next().innerHTML !== "" && error.next().hasClassName("xwikirenderingerrordescription")) {
- error.style.cursor = "pointer";
- error.title = "$msg.get('platform.core.rendering.error.readTechnicalInformation')";
- Event.observe(error, "click", function (event) {
- event.element().next().toggleClassName("hidden");
- });
- }
- });
+ $(content)
+ .select(".xwikirenderingerror")
+ .each(function (error) {
+ if (
+ error.next().innerHTML !== "" &&
+ error.next().hasClassName("xwikirenderingerrordescription")
+ ) {
+ error.style.cursor = "pointer";
+ error.title = this.messages.translations.readTechnicalInformation;
+ Event.observe(error, "click", function (event) {
+ event.element().next().toggleClassName("hidden");
+ });
+ }
+ });
},
/**
@@ -364,92 +414,63 @@ var XWiki = (function (XWiki) {
}
},
- /**
- * Insert a link for editing sections.
- */
- insertSectionEditLinks: function () {
- // Insert links only in view mode and for xwiki/2.0 documents.
- if (XWiki.docsyntax == "xwiki/2.0" && XWiki.contextaction == "view" && XWiki.hasEdit) {
-
- // Section count starts at one, not zero.
- var sectioncount = 1;
-
- // We can't use element.select() since it does not keep the order of the elements in the flow.
- var nodes = $("xwikicontent");
- if (!nodes) {
- return;
- }
- nodes = nodes.childNodes;
-
- // Only allow section editing for the specified depth level (2 by default)
- var headerPattern = new RegExp("H[1-" + $xwiki.getSectionEditingDepth() + "]");
-
- // For all non-generated headers, add a SPAN and A element in order to be able to edit the section.
- for (var i = 0; i < nodes.length; i++) {
-
- var node = $(nodes[i]);
-
- if (headerPattern.test(node.nodeName) && node.className.include("wikigeneratedheader") == false) {
- var editspan = document.createElement("SPAN");
- var editlink = document.createElement("A");
-
- editlink.href = window.docediturl + "?section=" + sectioncount;
- editlink.style.textDecoration = "none";
- editlink.innerHTML = "$msg.get('edit')";
- editspan.className = "edit_section";
-
- editspan.appendChild(editlink);
- node.insert({ 'after': editspan });
- sectioncount++;
- }
- }
- }
- },
-
/**
* Display a modal box allowing to create the new document from a template when clicking on broken links.
*/
insertCreatePageFromTemplateModalBoxes: function () {
// Insert links only in view mode and for xwiki/2.0 documents.
- if (XWiki.docsyntax == "xwiki/2.0" && XWiki.contextaction == "view" && XWiki.hasEdit) {
+ if (
+ XWiki.docsyntax == "xwiki/2.0" &&
+ XWiki.contextaction == "view" &&
+ XWiki.hasEdit
+ ) {
XWiki.widgets.CreatePagePopup = Class.create(XWiki.widgets.ModalPopup, {
initialize: function ($super, interactionParameters) {
- var content = new Element('div', { 'class': 'modal-popup' });
+ var content = new Element("div", { class: "modal-popup" });
content.insert(interactionParameters.content);
$super(
content,
{
- "show": { method: this.showDialog, keys: [] },
- "close": { method: this.closeDialog, keys: ['Esc'] }
+ show: { method: this.showDialog, keys: [] },
+ close: { method: this.closeDialog, keys: ["Esc"] },
},
{
displayCloseButton: true,
verticalPosition: "center",
- backgroundColor: "#FFF"
- }
+ backgroundColor: "#FFF",
+ },
);
this.showDialog();
this.setClass("createpage-modal-popup");
- }
+ },
});
var spans = document.body.select("span.wikicreatelink");
for (var i = 0; i < spans.length; i++) {
- spans[i].down('a').observe('click', function (event) {
- new Ajax.Request(event.findElement('a').href + '&xpage=createinline&ajax=1', {
- method: 'get',
- onSuccess: function (transport) {
- var redirect = transport.getHeader('redirect');
- if (redirect) {
- window.location = redirect;
- } else {
- new XWiki.widgets.CreatePagePopup({ content: transport.responseText });
- }
+ spans[i].down("a").observe("click", function (event) {
+ new Ajax.Request(
+ event.findElement("a").href + "&xpage=createinline&ajax=1",
+ {
+ method: "get",
+ onSuccess: function (transport) {
+ var redirect = transport.getHeader("redirect");
+ if (redirect) {
+ window.location = redirect;
+ } else {
+ new XWiki.widgets.CreatePagePopup({
+ content: transport.responseText,
+ });
+ }
+ },
+ onFailure: function () {
+ new XWiki.widgets.Notification(
+ this.messages.translations.createAjaxError,
+ "error",
+ { inactive: true },
+ ).show();
+ },
},
- onFailure: function () {
- new XWiki.widgets.Notification("$msg.get('core.create.ajax.error')", 'error', { inactive: true }).show();
- }
- });
+ );
event.stop();
});
}
@@ -460,29 +481,28 @@ var XWiki = (function (XWiki) {
* Watchlist methods.
*/
watchlist: {
-
/**
* Mapping between link IDs and associated actions.
*/
actionsMap: {
- 'tmWatchDocument': 'adddocument',
- 'tmUnwatchDocument': 'removedocument',
- 'tmWatchSpace': 'addspace',
- 'tmUnwatchSpace': 'removespace',
- 'tmWatchWiki': 'addwiki',
- 'tmUnwatchWiki': 'removewiki'
+ tmWatchDocument: "adddocument",
+ tmUnwatchDocument: "removedocument",
+ tmWatchSpace: "addspace",
+ tmUnwatchSpace: "removespace",
+ tmWatchWiki: "addwiki",
+ tmUnwatchWiki: "removewiki",
},
/**
* Mapping allowing to know which action to display when a previous action has been executed.
*/
flowMap: {
- 'tmWatchDocument': 'tmUnwatchDocument',
- 'tmUnwatchDocument': 'tmWatchDocument',
- 'tmWatchSpace': 'tmUnwatchSpace',
- 'tmUnwatchSpace': 'tmWatchSpace',
- 'tmWatchWiki': 'tmUnwatchWiki',
- 'tmUnwatchWiki': 'tmWatchWiki'
+ tmWatchDocument: "tmUnwatchDocument",
+ tmUnwatchDocument: "tmWatchDocument",
+ tmWatchSpace: "tmUnwatchSpace",
+ tmUnwatchSpace: "tmWatchSpace",
+ tmWatchWiki: "tmUnwatchWiki",
+ tmUnwatchWiki: "tmWatchWiki",
},
/**
@@ -491,21 +511,22 @@ var XWiki = (function (XWiki) {
* @param element the element that fired the action.
*/
executeAction: function (element) {
- var surl = window.docgeturl + "?xpage=watch&do=" + this.actionsMap[element.id];
- var myAjax = new Ajax.Request(
- surl,
- {
- method: 'get',
- onComplete: function () {
- if (element.nodeName == 'A') {
- element.parentNode.toggleClassName('hidden');
- $(XWiki.watchlist.flowMap[element.id]).parentNode.toggleClassName('hidden');
- } else {
- element.toggleClassName('hidden');
- $(XWiki.watchlist.flowMap[element.id]).toggleClassName('hidden');
- }
+ var surl =
+ window.docgeturl + "?xpage=watch&do=" + this.actionsMap[element.id];
+ var myAjax = new Ajax.Request(surl, {
+ method: "get",
+ onComplete: function () {
+ if (element.nodeName == "A") {
+ element.parentNode.toggleClassName("hidden");
+ $(XWiki.watchlist.flowMap[element.id]).parentNode.toggleClassName(
+ "hidden",
+ );
+ } else {
+ element.toggleClassName("hidden");
+ $(XWiki.watchlist.flowMap[element.id]).toggleClassName("hidden");
}
- });
+ },
+ });
},
/**
@@ -517,23 +538,23 @@ var XWiki = (function (XWiki) {
var element = $(button);
var self = this;
- if (element.nodeName != 'A') {
- element = $(button).down('A');
+ if (element.nodeName != "A") {
+ element = $(button).down("A");
}
// unregister previously registered handler if any
- element.stopObserving('click');
- element.observe('click', function (event) {
+ element.stopObserving("click");
+ element.observe("click", function (event) {
Event.stop(event);
var element = event.element();
- while (element.id == '') {
+ while (element.id == "") {
element = element.parentNode;
}
XWiki.watchlist.executeAction(element);
});
}
}
- }
+ },
},
cookies: {
@@ -548,10 +569,9 @@ var XWiki = (function (XWiki) {
create: function (name, value, days) {
if (days) {
var date = new Date();
- date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+ date.setTime(date.getTime() + days * 24 * 60 * 60 * 1000);
var expires = "; expires=" + date.toGMTString();
- }
- else var expires = "";
+ } else var expires = "";
document.cookie = name + "=" + value + expires + "; path=/";
},
@@ -563,10 +583,10 @@ var XWiki = (function (XWiki) {
*/
read: function (name) {
var nameEQ = name + "=";
- var ca = document.cookie.split(';');
+ var ca = document.cookie.split(";");
for (var i = 0; i < ca.length; i++) {
var c = ca[i];
- while (c.charAt(0) == ' ') {
+ while (c.charAt(0) == " ") {
c = c.substring(1, c.length);
}
if (c.indexOf(nameEQ) == 0) {
@@ -584,8 +604,7 @@ var XWiki = (function (XWiki) {
*/
erase: function (name) {
XWiki.cookies.create(name, "", -1);
- }
-
+ },
},
/**
@@ -597,8 +616,10 @@ var XWiki = (function (XWiki) {
element = $(element);
element.toggleClassName("collapsed");
if (cookieName) {
- var cookieValue = element.hasClassName('collapsed') ? 'collapsed' : 'expanded';
- XWiki.cookies.create(cookieName, cookieValue, '');
+ var cookieValue = element.hasClassName("collapsed")
+ ? "collapsed"
+ : "expanded";
+ XWiki.cookies.create(cookieName, cookieValue, "");
}
},
@@ -610,23 +631,32 @@ var XWiki = (function (XWiki) {
initialize: function () {
// Extra security to make sure we do not get initalized twice.
// It would fire the custom dom:loaded event twice, which could make their observers misbehave.
- if (typeof this.isInitialized == "undefined" || this.isInitialized == false) {
+ if (
+ typeof this.isInitialized == "undefined" ||
+ this.isInitialized == false
+ ) {
this.isInitialized = true;
- document.fire("xwiki:dom:loading");
-
- this.makeRenderingErrorsExpandable();
- this.fixLinksTargetAttribute();
- this.insertSectionEditLinks();
- this.insertCreatePageFromTemplateModalBoxes();
- this.watchlist.initialize();
-
- document.fire("xwiki:dom:loaded");
+ if (window.celExecOnceAfterMessagesLoaded) {
+ window.celExecOnceAfterMessagesLoaded(
+ (celMessages) => {
+ this.messages.translations = celMessages.xwiki;
+ this.messages.celMeta = celMessages.celmeta;
+ document.fire("xwiki:dom:loading");
+ this.makeRenderingErrorsExpandable();
+ this.fixLinksTargetAttribute();
+ this.insertCreatePageFromTemplateModalBoxes();
+ this.watchlist.initialize();
+ document.fire("xwiki:dom:loaded");
+ },
+ );
+ } else {
+ console.warn("celExecOnceAfterMessagesLoaded not available!");
+ }
}
- }
+ },
});
return XWiki;
-
})(XWiki || {});
/**
@@ -653,15 +683,17 @@ function showsubmenu(element) {
clearTimeout(window.hidetimer);
window.hidetimer = null;
window.hideelement = null;
- }
- else {
+ } else {
doHide();
}
}
var coords = Element.positionedOffset(element);
- element.lastChild.style.left = (coords[0] - 10) + "px";
- element.lastChild.style.top = (coords[1] + element.offsetHeight) + "px";
- element.lastChild.className = element.lastChild.className.replace("hidden", "visible");
+ element.lastChild.style.left = coords[0] - 10 + "px";
+ element.lastChild.style.top = coords[1] + element.offsetHeight + "px";
+ element.lastChild.className = element.lastChild.className.replace(
+ "hidden",
+ "visible",
+ );
}
}
@@ -684,7 +716,10 @@ function hidesubmenu(element) {
* @return
*/
function doHide() {
- window.hideelement.className = window.hideelement.className.replace("visible", "hidden");
+ window.hideelement.className = window.hideelement.className.replace(
+ "visible",
+ "hidden",
+ );
clearTimeout(window.hidetimer);
window.hidetimer = null;
window.hideelement = null;
@@ -699,9 +734,8 @@ function doHide() {
*/
function toggleClass(o, className) {
if (!eltHasClass(o, className)) {
- o.className += ' ' + className
- }
- else {
+ o.className += " " + className;
+ } else {
rmClass(o, className);
}
}
@@ -714,8 +748,7 @@ function toggleClass(o, className) {
* @return
*/
function addClass(o, className) {
- if (!eltHasClass(o, className))
- o.className += ' ' + className
+ if (!eltHasClass(o, className)) o.className += " " + className;
}
/**
@@ -726,9 +759,8 @@ function addClass(o, className) {
* @return True if the element has the class.
*/
function eltHasClass(o, className) {
- if (!o.className)
- return false;
- return new RegExp('\\b' + className + '\\b').test(o.className)
+ if (!o.className) return false;
+ return new RegExp("\\b" + className + "\\b").test(o.className);
}
/**
@@ -739,7 +771,10 @@ function eltHasClass(o, className) {
* @return
*/
function rmClass(o, className) {
- o.className = o.className.replace(new RegExp('\\s*\\b' + className + '\\b'), '')
+ o.className = o.className.replace(
+ new RegExp("\\s*\\b" + className + "\\b"),
+ "",
+ );
}
/**
@@ -749,7 +784,11 @@ function rmClass(o, className) {
* @return
*/
function openURL(url) {
- win = open(url, "win", "titlebar=0,width=990,height=500,resizable,scrollbars");
+ win = open(
+ url,
+ "win",
+ "titlebar=0,width=990,height=500,resizable,scrollbars",
+ );
if (win) {
win.focus();
}
@@ -762,7 +801,11 @@ function openURL(url) {
* @return
*/
function openHelp() {
- win = open("http://platform.xwiki.org/xwiki/bin/view/Main/XWikiSyntax?xpage=print", "XWikiSyntax", "titlebar=0,width=750,height=480,resizable,scrollbars");
+ win = open(
+ "http://platform.xwiki.org/xwiki/bin/view/Main/XWikiSyntax?xpage=print",
+ "XWikiSyntax",
+ "titlebar=0,width=750,height=480,resizable,scrollbars",
+ );
if (win) {
win.focus();
}
@@ -800,8 +843,14 @@ function updateName(field1, field2, removeclass) {
* @return The cleaned string.
*/
function noaccent(txt) {
- temp = txt.replace(/[\u00c0\u00c1\u00c2\u00c3\u00c4\u00c5\u0100\u0102\u0104\u01cd\u01de\u01e0\u01fa\u0200\u0202\u0226]/g, "A");
- temp = temp.replace(/[\u00e0\u00e1\u00e2\u00e3\u00e4\u00e5\u0101\u0103\u0105\u01ce\u01df\u01e1\u01fb\u0201\u0203\u0227]/g, "a");
+ temp = txt.replace(
+ /[\u00c0\u00c1\u00c2\u00c3\u00c4\u00c5\u0100\u0102\u0104\u01cd\u01de\u01e0\u01fa\u0200\u0202\u0226]/g,
+ "A",
+ );
+ temp = temp.replace(
+ /[\u00e0\u00e1\u00e2\u00e3\u00e4\u00e5\u0101\u0103\u0105\u01ce\u01df\u01e1\u01fb\u0201\u0203\u0227]/g,
+ "a",
+ );
temp = temp.replace(/[\u00c6\u01e2\u01fc]/g, "AE");
temp = temp.replace(/[\u00e6\u01e3\u01fd]/g, "ae");
temp = temp.replace(/[\u008c\u0152]/g, "OE");
@@ -810,14 +859,26 @@ function noaccent(txt) {
temp = temp.replace(/[\u00e7\u0107\u0109\u010b\u010d]/g, "c");
temp = temp.replace(/[\u00d0\u010e\u0110]/g, "D");
temp = temp.replace(/[\u00f0\u010f\u0111]/g, "d");
- temp = temp.replace(/[\u00c8\u00c9\u00ca\u00cb\u0112\u0114\u0116\u0118\u011a\u0204\u0206\u0228]/g, "E");
- temp = temp.replace(/[\u00e8\u00e9\u00ea\u00eb\u0113\u0115\u0117\u0119\u011b\u01dd\u0205\u0207\u0229]/g, "e");
+ temp = temp.replace(
+ /[\u00c8\u00c9\u00ca\u00cb\u0112\u0114\u0116\u0118\u011a\u0204\u0206\u0228]/g,
+ "E",
+ );
+ temp = temp.replace(
+ /[\u00e8\u00e9\u00ea\u00eb\u0113\u0115\u0117\u0119\u011b\u01dd\u0205\u0207\u0229]/g,
+ "e",
+ );
temp = temp.replace(/[\u011c\u011e\u0120\u0122\u01e4\u01e6\u01f4]/g, "G");
temp = temp.replace(/[\u011d\u011f\u0121\u0123\u01e5\u01e7\u01f5]/g, "g");
temp = temp.replace(/[\u0124\u0126\u021e]/g, "H");
temp = temp.replace(/[\u0125\u0127\u021f]/g, "h");
- temp = temp.replace(/[\u00cc\u00cd\u00ce\u00cf\u0128\u012a\u012c\u012e\u0130\u01cf\u0208\u020a]/g, "I");
- temp = temp.replace(/[\u00ec\u00ed\u00ee\u00ef\u0129\u012b\u012d\u012f\u0131\u01d0\u0209\u020b]/g, "i");
+ temp = temp.replace(
+ /[\u00cc\u00cd\u00ce\u00cf\u0128\u012a\u012c\u012e\u0130\u01cf\u0208\u020a]/g,
+ "I",
+ );
+ temp = temp.replace(
+ /[\u00ec\u00ed\u00ee\u00ef\u0129\u012b\u012d\u012f\u0131\u01d0\u0209\u020b]/g,
+ "i",
+ );
temp = temp.replace(/[\u0132]/g, "IJ");
temp = temp.replace(/[\u0133]/g, "ij");
temp = temp.replace(/[\u0134]/g, "J");
@@ -827,17 +888,32 @@ function noaccent(txt) {
temp = temp.replace(/[\u0139\u013b\u013d\u013f\u0141]/g, "L");
temp = temp.replace(/[\u013a\u013c\u013e\u0140\u0142\u0234]/g, "l");
temp = temp.replace(/[\u00d1\u0143\u0145\u0147\u014a\u01f8]/g, "N");
- temp = temp.replace(/[\u00f1\u0144\u0146\u0148\u0149\u014b\u01f9\u0235]/g, "n");
- temp = temp.replace(/[\u00d2\u00d3\u00d4\u00d5\u00d6\u00d8\u014c\u014e\u0150\u01d1\u01ea\u01ec\u01fe\u020c\u020e\u022a\u022c\u022e\u0230]/g, "O");
- temp = temp.replace(/[\u00f2\u00f3\u00f4\u00f5\u00f6\u00f8\u014d\u014f\u0151\u01d2\u01eb\u01ed\u01ff\u020d\u020f\u022b\u022d\u022f\u0231]/g, "o");
+ temp = temp.replace(
+ /[\u00f1\u0144\u0146\u0148\u0149\u014b\u01f9\u0235]/g,
+ "n",
+ );
+ temp = temp.replace(
+ /[\u00d2\u00d3\u00d4\u00d5\u00d6\u00d8\u014c\u014e\u0150\u01d1\u01ea\u01ec\u01fe\u020c\u020e\u022a\u022c\u022e\u0230]/g,
+ "O",
+ );
+ temp = temp.replace(
+ /[\u00f2\u00f3\u00f4\u00f5\u00f6\u00f8\u014d\u014f\u0151\u01d2\u01eb\u01ed\u01ff\u020d\u020f\u022b\u022d\u022f\u0231]/g,
+ "o",
+ );
temp = temp.replace(/[\u0156\u0158\u0210\u0212]/g, "R");
temp = temp.replace(/[\u0157\u0159\u0211\u0213]/g, "r");
temp = temp.replace(/[\u015a\u015c\u015e\u0160\u0218]/g, "S");
temp = temp.replace(/[\u015b\u015d\u015f\u0161\u0219]/g, "s");
temp = temp.replace(/[\u00de\u0162\u0164\u0166\u021a]/g, "T");
temp = temp.replace(/[\u00fe\u0163\u0165\u0167\u021b\u0236]/g, "t");
- temp = temp.replace(/[\u00d9\u00da\u00db\u00dc\u0168\u016a\u016c\u016e\u0170\u0172\u01d3\u01d5\u01d7\u01d9\u01db\u0214\u0216]/g, "U");
- temp = temp.replace(/[\u00f9\u00fa\u00fb\u00fc\u0169\u016b\u016d\u016f\u0171\u0173\u01d4\u01d6\u01d8\u01da\u01dc\u0215\u0217]/g, "u");
+ temp = temp.replace(
+ /[\u00d9\u00da\u00db\u00dc\u0168\u016a\u016c\u016e\u0170\u0172\u01d3\u01d5\u01d7\u01d9\u01db\u0214\u0216]/g,
+ "U",
+ );
+ temp = temp.replace(
+ /[\u00f9\u00fa\u00fb\u00fc\u0169\u016b\u016d\u016f\u0171\u0173\u01d4\u01d6\u01d8\u01da\u01dc\u0215\u0217]/g,
+ "u",
+ );
temp = temp.replace(/[\u0174]/g, "W");
temp = temp.replace(/[\u0175]/g, "w");
temp = temp.replace(/[\u00dd\u0176\u0178\u0232]/g, "Y");
@@ -865,7 +941,7 @@ function prepareName(form) {
fname.replace(/ /g, "");
}
if (lname != "") {
- lname = lname.substring(0, 1).toUpperCase() + lname.substring(1)
+ lname = lname.substring(0, 1).toUpperCase() + lname.substring(1);
lname.replace(/ /g, "");
}
if (cxwikiname.value == "") {
@@ -885,18 +961,21 @@ function checkAdvancedContent(message) {
return true;
}
data = document.forms.edit.content.value;
- myRE = new RegExp("]*)>", "ig")
- results = data.match(myRE)
- if (results && results.length > 0)
- result = true;
-
- myRE2 = new RegExp("(#(set|include|if|end|for)|#(#) Advanced content|public class|/\* Advanced content \*/)", "ig")
- results = data.match(myRE2)
- if (results && results.length > 0)
- result = true;
-
- if (result == true)
- return confirm(message);
+ myRE = new RegExp(
+ "]*)>",
+ "ig",
+ );
+ results = data.match(myRE);
+ if (results && results.length > 0) result = true;
+
+ myRE2 = new RegExp(
+ "(#(set|include|if|end|for)|#(#) Advanced content|public class|/\* Advanced content \*/)",
+ "ig",
+ );
+ results = data.match(myRE2);
+ if (results && results.length > 0) result = true;
+
+ if (result == true) return confirm(message);
return true;
}
@@ -909,25 +988,26 @@ function checkAdvancedContent(message) {
* License : BSD
*/
shortcut = {
- 'all_shortcuts': {},//All the shortcuts are stored in this array
- 'add': function (shortcut_combination, callback, opt) {
+ all_shortcuts: {}, //All the shortcuts are stored in this array
+ add: function (shortcut_combination, callback, opt) {
//Provide a set of default options
var default_options = {
- 'type': 'keydown',
- 'propagate': false,
- 'disable_in_input': false,
- 'target': document,
- 'keycode': false
- }
+ type: "keydown",
+ propagate: false,
+ disable_in_input: false,
+ target: document,
+ keycode: false,
+ };
if (!opt) opt = default_options;
else {
for (var dfo in default_options) {
- if (typeof opt[dfo] == 'undefined') opt[dfo] = default_options[dfo];
+ if (typeof opt[dfo] == "undefined") opt[dfo] = default_options[dfo];
}
}
- var ele = opt.target
- if (typeof opt.target == 'string') ele = document.getElementById(opt.target);
+ var ele = opt.target;
+ if (typeof opt.target == "string")
+ ele = document.getElementById(opt.target);
var ths = this;
shortcut_combination = shortcut_combination.toLowerCase();
@@ -935,12 +1015,17 @@ shortcut = {
var func = function (e) {
e = e || window.event;
- if (opt['disable_in_input']) { //Don't enable shortcut keys in Input, Textarea fields
+ if (opt["disable_in_input"]) {
+ //Don't enable shortcut keys in Input, Textarea fields
var element;
if (e.target) element = e.target;
else if (e.srcElement) element = e.srcElement;
if (element.nodeType == 3) element = element.parentNode;
- if (element.tagName == 'INPUT' || element.tagName == 'TEXTAREA' || element.tagName == 'SELECT') {
+ if (
+ element.tagName == "INPUT" ||
+ element.tagName == "TEXTAREA" ||
+ element.tagName == "SELECT"
+ ) {
return;
}
}
@@ -961,117 +1046,116 @@ shortcut = {
//Work around for stupid Shift key bug created by using lowercase - as a result the shift+num combination was broken
var shift_nums = {
"`": "~",
- "1": "!",
- "2": "@",
- "3": "#",
- "4": "$",
- "5": "%",
- "6": "^",
- "7": "&",
- "8": "*",
- "9": "(",
- "0": ")",
+ 1: "!",
+ 2: "@",
+ 3: "#",
+ 4: "$",
+ 5: "%",
+ 6: "^",
+ 7: "&",
+ 8: "*",
+ 9: "(",
+ 0: ")",
"-": "_",
"=": "+",
";": ":",
- "'": "\"",
+ "'": '"',
",": "<",
".": ">",
"/": "?",
- "\\": "|"
- }
+ "\\": "|",
+ };
//Special Keys - and their codes
var special_keys = {
- 'esc': 27,
- 'escape': 27,
- 'tab': 9,
- 'space': 32,
- 'return': 13,
- 'enter': 13,
- 'backspace': 8,
-
- 'scrolllock': 145,
- 'scroll_lock': 145,
- 'scroll': 145,
- 'capslock': 20,
- 'caps_lock': 20,
- 'caps': 20,
- 'numlock': 144,
- 'num_lock': 144,
- 'num': 144,
-
- 'pause': 19,
- 'break': 19,
-
- 'insert': 45,
- 'home': 36,
- 'delete': 46,
- 'end': 35,
-
- 'pageup': 33,
- 'page_up': 33,
- 'pu': 33,
-
- 'pagedown': 34,
- 'page_down': 34,
- 'pd': 34,
-
- 'left': 37,
- 'up': 38,
- 'right': 39,
- 'down': 40,
-
- 'f1': 112,
- 'f2': 113,
- 'f3': 114,
- 'f4': 115,
- 'f5': 116,
- 'f6': 117,
- 'f7': 118,
- 'f8': 119,
- 'f9': 120,
- 'f10': 121,
- 'f11': 122,
- 'f12': 123
- }
+ esc: 27,
+ escape: 27,
+ tab: 9,
+ space: 32,
+ return: 13,
+ enter: 13,
+ backspace: 8,
+
+ scrolllock: 145,
+ scroll_lock: 145,
+ scroll: 145,
+ capslock: 20,
+ caps_lock: 20,
+ caps: 20,
+ numlock: 144,
+ num_lock: 144,
+ num: 144,
+
+ pause: 19,
+ break: 19,
+
+ insert: 45,
+ home: 36,
+ delete: 46,
+ end: 35,
+
+ pageup: 33,
+ page_up: 33,
+ pu: 33,
+
+ pagedown: 34,
+ page_down: 34,
+ pd: 34,
+
+ left: 37,
+ up: 38,
+ right: 39,
+ down: 40,
+
+ f1: 112,
+ f2: 113,
+ f3: 114,
+ f4: 115,
+ f5: 116,
+ f6: 117,
+ f7: 118,
+ f8: 119,
+ f9: 120,
+ f10: 121,
+ f11: 122,
+ f12: 123,
+ };
var modifiers = {
shift: { wanted: false, pressed: false },
ctrl: { wanted: false, pressed: false },
alt: { wanted: false, pressed: false },
- meta: { wanted: false, pressed: false } //Meta is Mac specific
+ meta: { wanted: false, pressed: false }, //Meta is Mac specific
};
if (e.ctrlKey) modifiers.ctrl.pressed = true;
if (e.shiftKey) modifiers.shift.pressed = true;
if (e.altKey) modifiers.alt.pressed = true;
if (e.metaKey) modifiers.meta.pressed = true;
- for (var i = 0; k = keys[i], i < keys.length; i++) {
+ for (var i = 0; (k = keys[i]), i < keys.length; i++) {
//Modifiers
- if (k == 'ctrl' || k == 'control') {
+ if (k == "ctrl" || k == "control") {
kp++;
modifiers.ctrl.wanted = true;
-
- } else if (k == 'shift') {
+ } else if (k == "shift") {
kp++;
modifiers.shift.wanted = true;
-
- } else if (k == 'alt') {
+ } else if (k == "alt") {
kp++;
modifiers.alt.wanted = true;
- } else if (k == 'meta') {
+ } else if (k == "meta") {
kp++;
modifiers.meta.wanted = true;
- } else if (k.length > 1) { //If it is a special key
+ } else if (k.length > 1) {
+ //If it is a special key
if (special_keys[k] == code) kp++;
-
- } else if (opt['keycode']) {
- if (opt['keycode'] == code) kp++;
-
- } else { //The special keys did not match
+ } else if (opt["keycode"]) {
+ if (opt["keycode"] == code) kp++;
+ } else {
+ //The special keys did not match
if (character == k) kp++;
else {
- if (shift_nums[character] && e.shiftKey) { //Stupid Shift key bug created by using lowercase
+ if (shift_nums[character] && e.shiftKey) {
+ //Stupid Shift key bug created by using lowercase
character = shift_nums[character];
if (character == k) kp++;
}
@@ -1079,14 +1163,17 @@ shortcut = {
}
}
- if (kp == keys.length &&
+ if (
+ kp == keys.length &&
modifiers.ctrl.pressed == modifiers.ctrl.wanted &&
modifiers.shift.pressed == modifiers.shift.wanted &&
modifiers.alt.pressed == modifiers.alt.wanted &&
- modifiers.meta.pressed == modifiers.meta.wanted) {
+ modifiers.meta.pressed == modifiers.meta.wanted
+ ) {
callback(e);
- if (!opt['propagate']) { //Stop the event
+ if (!opt["propagate"]) {
+ //Stop the event
//e.cancelBubble is supported by IE - this will kill the bubbling process.
e.cancelBubble = true;
e.returnValue = false;
@@ -1104,33 +1191,34 @@ shortcut = {
return false;
}
}
- }
+ };
this.all_shortcuts[shortcut_combination] = {
- 'callback': func,
- 'target': ele,
- 'event': opt['type']
+ callback: func,
+ target: ele,
+ event: opt["type"],
};
//Attach the function with the event
- if (ele.addEventListener) ele.addEventListener(opt['type'], func, false);
- else if (ele.attachEvent) ele.attachEvent('on' + opt['type'], func);
- else ele['on' + opt['type']] = func;
+ if (ele.addEventListener) ele.addEventListener(opt["type"], func, false);
+ else if (ele.attachEvent) ele.attachEvent("on" + opt["type"], func);
+ else ele["on" + opt["type"]] = func;
},
//Remove the shortcut - just specify the shortcut and I will remove the binding
- 'remove': function (shortcut_combination) {
+ remove: function (shortcut_combination) {
shortcut_combination = shortcut_combination.toLowerCase();
var binding = this.all_shortcuts[shortcut_combination];
- delete (this.all_shortcuts[shortcut_combination])
+ delete this.all_shortcuts[shortcut_combination];
if (!binding) return;
- var type = binding['event'];
- var ele = binding['target'];
- var callback = binding['callback'];
-
- if (ele.detachEvent) ele.detachEvent('on' + type, callback);
- else if (ele.removeEventListener) ele.removeEventListener(type, callback, false);
- else ele['on' + type] = false;
- }
-}
+ var type = binding["event"];
+ var ele = binding["target"];
+ var callback = binding["callback"];
+
+ if (ele.detachEvent) ele.detachEvent("on" + type, callback);
+ else if (ele.removeEventListener)
+ ele.removeEventListener(type, callback, false);
+ else ele["on" + type] = false;
+ },
+};
/**
* Browser Detect
@@ -1138,99 +1226,124 @@ shortcut = {
* URL: http://dithered.chadlindstrom.ca/javascript/browser_detect/index.html
* License: http://creativecommons.org/licenses/by/1.0/
* Author: Chris Nott (chris[at]dithered[dot]com)
-*/
+ */
function BrowserDetect() {
var ua = navigator.userAgent.toLowerCase();
// browser engine name
- this.isGecko = (ua.indexOf('gecko') != -1 && ua.indexOf('safari') == -1);
- this.isAppleWebKit = (ua.indexOf('applewebkit') != -1);
+ this.isGecko = ua.indexOf("gecko") != -1 && ua.indexOf("safari") == -1;
+ this.isAppleWebKit = ua.indexOf("applewebkit") != -1;
// browser name
- this.isKonqueror = (ua.indexOf('konqueror') != -1);
- this.isSafari = (ua.indexOf('safari') != - 1);
- this.isOmniweb = (ua.indexOf('omniweb') != - 1);
- this.isOpera = (ua.indexOf('opera') != -1);
- this.isIcab = (ua.indexOf('icab') != -1);
- this.isAol = (ua.indexOf('aol') != -1);
- this.isIE = (ua.indexOf('msie') != -1 && !this.isOpera && (ua.indexOf('webtv') == -1));
- this.isMozilla = (this.isGecko && ua.indexOf('gecko/') + 14 == ua.length);
- this.isFirefox = (ua.indexOf('firefox/') != -1 || ua.indexOf('firebird/') != -1);
- this.isNS = ((this.isGecko) ? (ua.indexOf('netscape') != -1) : ((ua.indexOf('mozilla') != -1) && !this.isOpera && !this.isSafari && (ua.indexOf('spoofer') == -1) && (ua.indexOf('compatible') == -1) && (ua.indexOf('webtv') == -1) && (ua.indexOf('hotjava') == -1)));
+ this.isKonqueror = ua.indexOf("konqueror") != -1;
+ this.isSafari = ua.indexOf("safari") != -1;
+ this.isOmniweb = ua.indexOf("omniweb") != -1;
+ this.isOpera = ua.indexOf("opera") != -1;
+ this.isIcab = ua.indexOf("icab") != -1;
+ this.isAol = ua.indexOf("aol") != -1;
+ this.isIE =
+ ua.indexOf("msie") != -1 && !this.isOpera && ua.indexOf("webtv") == -1;
+ this.isMozilla = this.isGecko && ua.indexOf("gecko/") + 14 == ua.length;
+ this.isFirefox =
+ ua.indexOf("firefox/") != -1 || ua.indexOf("firebird/") != -1;
+ this.isNS = this.isGecko
+ ? ua.indexOf("netscape") != -1
+ : ua.indexOf("mozilla") != -1 &&
+ !this.isOpera &&
+ !this.isSafari &&
+ ua.indexOf("spoofer") == -1 &&
+ ua.indexOf("compatible") == -1 &&
+ ua.indexOf("webtv") == -1 &&
+ ua.indexOf("hotjava") == -1;
// spoofing and compatible browsers
- this.isIECompatible = ((ua.indexOf('msie') != -1) && !this.isIE);
- this.isNSCompatible = ((ua.indexOf('mozilla') != -1) && !this.isNS && !this.isMozilla);
+ this.isIECompatible = ua.indexOf("msie") != -1 && !this.isIE;
+ this.isNSCompatible =
+ ua.indexOf("mozilla") != -1 && !this.isNS && !this.isMozilla;
// rendering engine versions
- this.geckoVersion = ((this.isGecko) ? ua.substring((ua.lastIndexOf('gecko/') + 6), (ua.lastIndexOf('gecko/') + 14)) : -1);
- this.equivalentMozilla = ((this.isGecko) ? parseFloat(ua.substring(ua.indexOf('rv:') + 3)) : -1);
- this.appleWebKitVersion = ((this.isAppleWebKit) ? parseFloat(ua.substring(ua.indexOf('applewebkit/') + 12)) : -1);
+ this.geckoVersion = this.isGecko
+ ? ua.substring(ua.lastIndexOf("gecko/") + 6, ua.lastIndexOf("gecko/") + 14)
+ : -1;
+ this.equivalentMozilla = this.isGecko
+ ? parseFloat(ua.substring(ua.indexOf("rv:") + 3))
+ : -1;
+ this.appleWebKitVersion = this.isAppleWebKit
+ ? parseFloat(ua.substring(ua.indexOf("applewebkit/") + 12))
+ : -1;
// browser version
this.versionMinor = parseFloat(navigator.appVersion);
// correct version number
if (this.isGecko && !this.isMozilla) {
- this.versionMinor = parseFloat(ua.substring(ua.indexOf('/', ua.indexOf('gecko/') + 6) + 1));
- }
- else if (this.isMozilla) {
- this.versionMinor = parseFloat(ua.substring(ua.indexOf('rv:') + 3));
- }
- else if (this.isIE && this.versionMinor >= 4) {
- this.versionMinor = parseFloat(ua.substring(ua.indexOf('msie ') + 5));
- }
- else if (this.isKonqueror) {
- this.versionMinor = parseFloat(ua.substring(ua.indexOf('konqueror/') + 10));
- }
- else if (this.isSafari) {
- this.versionMinor = parseFloat(ua.substring(ua.lastIndexOf('safari/') + 7));
- }
- else if (this.isOmniweb) {
- this.versionMinor = parseFloat(ua.substring(ua.lastIndexOf('omniweb/') + 8));
- }
- else if (this.isOpera) {
- this.versionMinor = parseFloat(ua.substring(ua.indexOf('opera') + 6));
- }
- else if (this.isIcab) {
- this.versionMinor = parseFloat(ua.substring(ua.indexOf('icab') + 5));
+ this.versionMinor = parseFloat(
+ ua.substring(ua.indexOf("/", ua.indexOf("gecko/") + 6) + 1),
+ );
+ } else if (this.isMozilla) {
+ this.versionMinor = parseFloat(ua.substring(ua.indexOf("rv:") + 3));
+ } else if (this.isIE && this.versionMinor >= 4) {
+ this.versionMinor = parseFloat(ua.substring(ua.indexOf("msie ") + 5));
+ } else if (this.isKonqueror) {
+ this.versionMinor = parseFloat(ua.substring(ua.indexOf("konqueror/") + 10));
+ } else if (this.isSafari) {
+ this.versionMinor = parseFloat(ua.substring(ua.lastIndexOf("safari/") + 7));
+ } else if (this.isOmniweb) {
+ this.versionMinor = parseFloat(
+ ua.substring(ua.lastIndexOf("omniweb/") + 8),
+ );
+ } else if (this.isOpera) {
+ this.versionMinor = parseFloat(ua.substring(ua.indexOf("opera") + 6));
+ } else if (this.isIcab) {
+ this.versionMinor = parseFloat(ua.substring(ua.indexOf("icab") + 5));
}
this.versionMajor = parseInt(this.versionMinor);
// dom support
- this.isDOM1 = (document.getElementById);
- this.isDOM2Event = (document.addEventListener && document.removeEventListener);
+ this.isDOM1 = document.getElementById;
+ this.isDOM2Event = document.addEventListener && document.removeEventListener;
// css compatibility mode
- this.mode = document.compatMode ? document.compatMode : 'BackCompat';
+ this.mode = document.compatMode ? document.compatMode : "BackCompat";
// platform
- this.isWin = (ua.indexOf('win') != -1);
- this.isWin32 = (this.isWin && (ua.indexOf('95') != -1 || ua.indexOf('98') != -1 || ua.indexOf('nt') != -1 || ua.indexOf('win32') != -1 || ua.indexOf('32bit') != -1 || ua.indexOf('xp') != -1));
- this.isMac = (ua.indexOf('mac') != -1);
- this.isUnix = (ua.indexOf('unix') != -1 || ua.indexOf('sunos') != -1 || ua.indexOf('bsd') != -1 || ua.indexOf('x11') != -1)
- this.isLinux = (ua.indexOf('linux') != -1);
+ this.isWin = ua.indexOf("win") != -1;
+ this.isWin32 =
+ this.isWin &&
+ (ua.indexOf("95") != -1 ||
+ ua.indexOf("98") != -1 ||
+ ua.indexOf("nt") != -1 ||
+ ua.indexOf("win32") != -1 ||
+ ua.indexOf("32bit") != -1 ||
+ ua.indexOf("xp") != -1);
+ this.isMac = ua.indexOf("mac") != -1;
+ this.isUnix =
+ ua.indexOf("unix") != -1 ||
+ ua.indexOf("sunos") != -1 ||
+ ua.indexOf("bsd") != -1 ||
+ ua.indexOf("x11") != -1;
+ this.isLinux = ua.indexOf("linux") != -1;
// specific browser shortcuts
- this.isNS4x = (this.isNS && this.versionMajor == 4);
- this.isNS40x = (this.isNS4x && this.versionMinor < 4.5);
- this.isNS47x = (this.isNS4x && this.versionMinor >= 4.7);
- this.isNS4up = (this.isNS && this.versionMinor >= 4);
- this.isNS6x = (this.isNS && this.versionMajor == 6);
- this.isNS6up = (this.isNS && this.versionMajor >= 6);
- this.isNS7x = (this.isNS && this.versionMajor == 7);
- this.isNS7up = (this.isNS && this.versionMajor >= 7);
-
- this.isIE4x = (this.isIE && this.versionMajor == 4);
- this.isIE4up = (this.isIE && this.versionMajor >= 4);
- this.isIE5x = (this.isIE && this.versionMajor == 5);
- this.isIE55 = (this.isIE && this.versionMinor == 5.5);
- this.isIE5up = (this.isIE && this.versionMajor >= 5);
- this.isIE6x = (this.isIE && this.versionMajor == 6);
- this.isIE6up = (this.isIE && this.versionMajor >= 6);
-
- this.isIE4xMac = (this.isIE4x && this.isMac);
+ this.isNS4x = this.isNS && this.versionMajor == 4;
+ this.isNS40x = this.isNS4x && this.versionMinor < 4.5;
+ this.isNS47x = this.isNS4x && this.versionMinor >= 4.7;
+ this.isNS4up = this.isNS && this.versionMinor >= 4;
+ this.isNS6x = this.isNS && this.versionMajor == 6;
+ this.isNS6up = this.isNS && this.versionMajor >= 6;
+ this.isNS7x = this.isNS && this.versionMajor == 7;
+ this.isNS7up = this.isNS && this.versionMajor >= 7;
+
+ this.isIE4x = this.isIE && this.versionMajor == 4;
+ this.isIE4up = this.isIE && this.versionMajor >= 4;
+ this.isIE5x = this.isIE && this.versionMajor == 5;
+ this.isIE55 = this.isIE && this.versionMinor == 5.5;
+ this.isIE5up = this.isIE && this.versionMajor >= 5;
+ this.isIE6x = this.isIE && this.versionMajor == 6;
+ this.isIE6up = this.isIE && this.versionMajor >= 6;
+
+ this.isIE4xMac = this.isIE4x && this.isMac;
}
var browser = new BrowserDetect();
@@ -1250,16 +1363,22 @@ XWiki.Document = Class.create({
* Gets an URL pointing to this document.
*/
getURL: function (action, queryString, fragment) {
- action = action || 'view';
+ action = action || "view";
var url = XWiki.Document.URLTemplate;
url = url.replace("__space__", encodeURIComponent(this.space));
- url = url.replace("__page__", (this.page == 'WebHome') ? '' : encodeURIComponent(this.page));
- url = url.replace("__action__/", (action == 'view') ? '' : (encodeURIComponent(action) + "/"));
+ url = url.replace(
+ "__page__",
+ this.page == "WebHome" ? "" : encodeURIComponent(this.page),
+ );
+ url = url.replace(
+ "__action__/",
+ action == "view" ? "" : encodeURIComponent(action) + "/",
+ );
if (queryString) {
- url += '?' + queryString;
+ url += "?" + queryString;
}
if (fragment) {
- url += '#' + fragment;
+ url += "#" + fragment;
}
return url;
},
@@ -1267,7 +1386,7 @@ XWiki.Document = Class.create({
* Gets an URL which points to the REST location for accessing this document.
*/
getRestURL: function (entity, queryString) {
- entity = entity || '';
+ entity = entity || "";
var url = XWiki.Document.RestURLTemplate;
url = url.replace("__wiki__", this.wiki);
url = url.replace("__space__", this.space);
@@ -1276,26 +1395,42 @@ XWiki.Document = Class.create({
url += "/" + entity;
}
if (queryString) {
- url += '?' + queryString;
+ url += "?" + queryString;
}
return url;
- }
+ },
});
/* Initialize the document URL factory, and create XWiki.currentDocument. */
-document.observe('xwiki:dom:loading', function () {
- XWiki.Document.currentWiki = ($$("meta[name=wiki]").length > 0) ? $$("meta[name=wiki]")[0].content : "xwiki";
- XWiki.Document.currentSpace = ($$("meta[name=space]").length > 0) ? $$("meta[name=space]")[0].content : "Main";
- XWiki.Document.currentPage = ($$("meta[name=page]").length > 0) ? $$("meta[name=page]")[0].content : "WebHome";
- XWiki.Document.URLTemplate = "$xwiki.getURL('__space__.__page__', '__action__')";
- XWiki.Document.RestURLTemplate = "${request.contextPath}/rest/wikis/__wiki__/spaces/__space__/pages/__page__";
- XWiki.Document.WikiSearchURLStub = "${request.contextPath}/rest/wikis/__wiki__/search";
- XWiki.Document.SpaceSearchURLStub = "${request.contextPath}/rest/wikis/__wiki__/spaces/__space__/search";
+document.observe("xwiki:dom:loading", function () {
+ XWiki.Document.currentWiki =
+ $$("meta[name=wiki]").length > 0
+ ? $$("meta[name=wiki]")[0].content
+ : "xwiki";
+ XWiki.Document.currentSpace =
+ $$("meta[name=space]").length > 0
+ ? $$("meta[name=space]")[0].content
+ : "Main";
+ XWiki.Document.currentPage =
+ $$("meta[name=page]").length > 0
+ ? $$("meta[name=page]")[0].content
+ : "WebHome";
+ XWiki.Document.URLTemplate =
+ "/__action__/__space__/__page__";
+ XWiki.Document.RestURLTemplate =
+ XWiki.messages.celMeta.contextPath + "/rest/wikis/__wiki__/spaces/__space__/pages/__page__";
+ XWiki.Document.WikiSearchURLStub =
+ XWiki.messages.celMeta.contextPath + "/rest/wikis/__wiki__/search";
+ XWiki.Document.SpaceSearchURLStub =
+ XWiki.messages.celMeta.contextPath + "/rest/wikis/__wiki__/spaces/__space__/search";
XWiki.Document.getRestSearchURL = function (queryString, space, wiki) {
wiki = wiki || XWiki.Document.currentWiki;
var url;
if (space) {
- url = XWiki.Document.SpaceSearchURLStub.replace("__wiki__", wiki).replace("__space__", space);
+ url = XWiki.Document.SpaceSearchURLStub.replace("__wiki__", wiki).replace(
+ "__space__",
+ space,
+ );
} else {
url = XWiki.Document.WikiSearchURLStub.replace("__wiki__", wiki);
}
@@ -1312,103 +1447,109 @@ document.observe('xwiki:dom:loading', function () {
*
* To activate this behavior on an input element, add the "withTip" classname to it.
*/
-document.observe('xwiki:dom:loaded', function () {
+document.observe("xwiki:dom:loaded", function () {
var onFocus = function () {
if (this.value == this.defaultValue) {
this.value = "";
} else {
this.select();
}
- }
+ };
var onBlur = function () {
if (this.value == "") {
this.value = this.defaultValue;
}
- }
+ };
$$("input.withTip").each(function (item) {
- item.observe('focus', onFocus.bindAsEventListener(item));
- item.observe('blur', onBlur.bindAsEventListener(item));
+ item.observe("focus", onFocus.bindAsEventListener(item));
+ item.observe("blur", onBlur.bindAsEventListener(item));
});
});
/*
* AJAX improvements for setting the document parent.
*/
-document.observe('xwiki:dom:loaded', function () {
- var hierarchyElement = $('hierarchy');
- var breadcrumbsElement = $('breadcrumbs');
- var editParentTrigger = $('editParentTrigger');
- var parentInputSection = $('parentinput');
- var parentInputField = $('xwikidocparentinput');
- var titleInputField = $('xwikidoctitleinput');
+document.observe("xwiki:dom:loaded", function () {
+ var hierarchyElement = $("hierarchy");
+ var breadcrumbsElement = $("breadcrumbs");
+ var editParentTrigger = $("editParentTrigger");
+ var parentInputSection = $("parentinput");
+ var parentInputField = $("xwikidocparentinput");
+ var titleInputField = $("xwikidoctitleinput");
/** Hides the parent input field when focusing out of the parent field. */
function hideParentSection(event) {
if (event) {
event.stop();
}
- parentInputSection.removeClassName('active');
- editParentTrigger.addClassName('edit-parent');
- editParentTrigger.removeClassName('hide-edit-parent');
+ parentInputSection.removeClassName("active");
+ editParentTrigger.addClassName("edit-parent");
+ editParentTrigger.removeClassName("hide-edit-parent");
}
/** Displays the parent input field when clicking on the "Edit parent" button. */
function showParentSection(event) {
if (event) {
event.stop();
}
- parentInputSection.addClassName('active');
+ parentInputSection.addClassName("active");
parentInputField.focus();
- editParentTrigger.removeClassName('edit-parent');
- editParentTrigger.addClassName('hide-edit-parent');
+ editParentTrigger.removeClassName("edit-parent");
+ editParentTrigger.addClassName("hide-edit-parent");
}
/** Toggles the visibility of the parent input field. */
function toggleParentSectionVisibility(event) {
event.stop();
event.element().blur();
- if (editParentTrigger.hasClassName('edit-parent')) {
+ if (editParentTrigger.hasClassName("edit-parent")) {
showParentSection();
} else {
hideParentSection();
}
}
- if ($('hideEditParentTrigger')) {
- $('hideEditParentTrigger').style.display = 'none';
+ if ($("hideEditParentTrigger")) {
+ $("hideEditParentTrigger").style.display = "none";
}
if (editParentTrigger) {
- editParentTrigger.observe('click', toggleParentSectionVisibility);
+ editParentTrigger.observe("click", toggleParentSectionVisibility);
}
if (parentInputField) {
if (hierarchyElement || breadcrumbsElement) {
- ['blur', 'change', 'xwiki:suggest:selected'].each(function (monitoredEvent) {
- parentInputField.observe(monitoredEvent, function () {
- new Ajax.Request(XWiki.currentDocument.getURL('edit'), {
- parameters: {
- xpage: 'xpart',
- vm: (hierarchyElement ? 'hierarchy.vm' : 'space.vm'),
- parent: parentInputField.value,
- title: titleInputField.value
- },
- onSuccess: function (response) {
- if (hierarchyElement) {
- hierarchyElement.replace(response.responseText);
- hierarchyElement = $('hierarchy');
- } else {
- var tmp = new Element('div');
- tmp.update(response.responseText);
- breadcrumbsElement.replace(tmp.down('[id=breadcrumbs]'));
- breadcrumbsElement = $('breadcrumbs');
- }
- }
+ ["blur", "change", "xwiki:suggest:selected"].each(
+ function (monitoredEvent) {
+ parentInputField.observe(monitoredEvent, function () {
+ new Ajax.Request(XWiki.currentDocument.getURL("edit"), {
+ parameters: {
+ xpage: "xpart",
+ vm: hierarchyElement ? "hierarchy.vm" : "space.vm",
+ parent: parentInputField.value,
+ title: titleInputField.value,
+ },
+ onSuccess: function (response) {
+ if (hierarchyElement) {
+ hierarchyElement.replace(response.responseText);
+ hierarchyElement = $("hierarchy");
+ } else {
+ var tmp = new Element("div");
+ tmp.update(response.responseText);
+ breadcrumbsElement.replace(tmp.down("[id=breadcrumbs]"));
+ breadcrumbsElement = $("breadcrumbs");
+ }
+ },
+ });
});
- });
- });
+ },
+ );
}
- $('body').observe('click', function (event) {
- if (!event.element().descendantOf(parentInputSection) && event.element() != parentInputSection && event.element() != editParentTrigger) {
+ $("body").observe("click", function (event) {
+ if (
+ !event.element().descendantOf(parentInputSection) &&
+ event.element() != parentInputSection &&
+ event.element() != editParentTrigger
+ ) {
hideParentSection();
}
- })
+ });
}
});
@@ -1416,31 +1557,46 @@ document.observe('xwiki:dom:loaded', function () {
* JS improvement for keeping the content menu visible on the screen when scrolling down.
*/
document.observe("xwiki:dom:loaded", function () {
- var menu = $('contentmenu') || $('editmenu'); // Both for view and edit
- var content = $('mainContentArea') || $('mainEditArea'); // Both for view and edit
+ var menu = $("contentmenu") || $("editmenu"); // Both for view and edit
+ var content = $("mainContentArea") || $("mainEditArea"); // Both for view and edit
if (menu && content) {
createGhost(menu);
// Resize the fixed menu when the window width changes
- Event.observe(window, 'resize', function () {
- if (menu.style.position == 'fixed') {
- menu.style.width = content.getWidth() + 'px';
- if (typeof (menu.__fm_extra) != 'undefined') {
- if (menu.__fm_extra.getStyle('padding-left').replace(/[^a-z]/g, '') == 'px') {
- var boxExtra = menu.__fm_extra.getStyle('border-left-width').replace(/[^0-9.]/g, '') - 0;
- boxExtra += menu.__fm_extra.getStyle('padding-left').replace(/[^0-9.]/g, '') - 0;
- boxExtra += menu.__fm_extra.getStyle('padding-right').replace(/[^0-9.]/g, '') - 0;
- boxExtra += menu.__fm_extra.getStyle('border-right-width').replace(/[^0-9.]/g, '') - 0;
+ Event.observe(window, "resize", function () {
+ if (menu.style.position == "fixed") {
+ menu.style.width = content.getWidth() + "px";
+ if (typeof menu.__fm_extra != "undefined") {
+ if (
+ menu.__fm_extra.getStyle("padding-left").replace(/[^a-z]/g, "") ==
+ "px"
+ ) {
+ var boxExtra =
+ menu.__fm_extra
+ .getStyle("border-left-width")
+ .replace(/[^0-9.]/g, "") - 0;
+ boxExtra +=
+ menu.__fm_extra.getStyle("padding-left").replace(/[^0-9.]/g, "") -
+ 0;
+ boxExtra +=
+ menu.__fm_extra
+ .getStyle("padding-right")
+ .replace(/[^0-9.]/g, "") - 0;
+ boxExtra +=
+ menu.__fm_extra
+ .getStyle("border-right-width")
+ .replace(/[^0-9.]/g, "") - 0;
} else {
boxExtra = 50; // magic number 50 = standard left+right padding
}
- menu.__fm_extra.style.width = (content.getWidth() - boxExtra) + 'px';
+ menu.__fm_extra.style.width = content.getWidth() - boxExtra + "px";
}
}
});
- if (!browser.isIE6x) { // IE6 is too dumb to be supported
- Event.observe(window, 'scroll', handleScroll);
+ if (!browser.isIE6x) {
+ // IE6 is too dumb to be supported
+ Event.observe(window, "scroll", handleScroll);
// Make sure the annotations settings panel shows up in the right place
- document.observe('xwiki:annotations:settings:loaded', handleScroll);
+ document.observe("xwiki:annotations:settings:loaded", handleScroll);
}
}
@@ -1448,7 +1604,7 @@ document.observe("xwiki:dom:loaded", function () {
* Ensures that the content menu is always visible when scrolling down.
*/
function handleScroll() {
- var menuExtras = $$('.annotationsettings');
+ var menuExtras = $$(".annotationsettings");
var extraHeight = 0;
if (menuExtras && menuExtras.size() > 0) {
menu.__fm_extra = menuExtras[0];
@@ -1456,13 +1612,20 @@ document.observe("xwiki:dom:loaded", function () {
extraHeight = menu.__fm_extra.getHeight();
}
var menuHeight = menu.getHeight();
- var menuMaxTop = content.cumulativeOffset().top + content.getHeight() - menuHeight - extraHeight;
+ var menuMaxTop =
+ content.cumulativeOffset().top +
+ content.getHeight() -
+ menuHeight -
+ extraHeight;
var menuMinTop = content.cumulativeOffset().top - menuHeight - extraHeight;
- if (document.viewport.getScrollOffsets().top >= menuMinTop && document.viewport.getScrollOffsets().top < menuMaxTop) {
+ if (
+ document.viewport.getScrollOffsets().top >= menuMinTop &&
+ document.viewport.getScrollOffsets().top < menuMaxTop
+ ) {
var menuWidth = content.getWidth();
var menuLeft = content.cumulativeOffset().left;
makeFixed(menu, 0, menuLeft, menuWidth);
- makeFixed(menu.__fm_extra, menuHeight, menuLeft, (menuWidth - 50)); // magic number 50 = left+right padding
+ makeFixed(menu.__fm_extra, menuHeight, menuLeft, menuWidth - 50); // magic number 50 = left+right padding
} else if (document.viewport.getScrollOffsets().top >= menuMaxTop) {
makeAbsolute(menu, menuMaxTop);
makeAbsolute(menu.__fm_extra, menuMaxTop + menuHeight);
@@ -1477,29 +1640,29 @@ document.observe("xwiki:dom:loaded", function () {
* This clone prevents layout changes when moving the element outside its parent.
* The clone will be stored in the __fm_ghost property of the element and is inserted
* after the element in the DOM. The clone is not visible initially.
- *
+ *
* @param element the element whose position and dimesions should be cloned
*/
function createGhost(element) {
- if (typeof (element.__fm_ghost) == 'undefined') {
- element.__fm_ghost = new Element('div');
+ if (typeof element.__fm_ghost == "undefined") {
+ element.__fm_ghost = new Element("div");
element.__fm_ghost.hide();
- element.insert({ 'after': element.__fm_ghost });
+ element.insert({ after: element.__fm_ghost });
}
element.__fm_ghost.clonePosition(element, { setWidth: false });
}
/**
* Pins the provided element at a certain position inside the window. The element's clone is made
* visible to prevent layout changes.
- *
+ *
* @see #createGhost
*/
function makeFixed(element, top, left, width) {
if (element) {
- element.style.position = 'fixed';
- element.style.top = top + 'px';
- element.style.left = left + 'px';
- element.style.width = width + 'px';
+ element.style.position = "fixed";
+ element.style.top = top + "px";
+ element.style.left = left + "px";
+ element.style.width = width + "px";
element.__fm_ghost.show();
}
}
@@ -1508,8 +1671,8 @@ document.observe("xwiki:dom:loaded", function () {
*/
function makeAbsolute(element, top) {
if (element) {
- element.style.position = 'absolute';
- element.style.top = top + 'px';
+ element.style.position = "absolute";
+ element.style.top = top + "px";
element.__fm_ghost.show();
}
}
@@ -1518,10 +1681,10 @@ document.observe("xwiki:dom:loaded", function () {
*/
function makeScrollable(element) {
if (element) {
- element.style.position = '';
- element.style.top = '';
- element.style.left = '';
- element.style.width = '';
+ element.style.position = "";
+ element.style.top = "";
+ element.style.left = "";
+ element.style.width = "";
element.__fm_ghost.hide();
}
}
diff --git a/src/main/webapp/resources/js/xwiki/xwikiexplorer/xwikiexplorer.js b/src/main/webapp/resources/js/xwiki/xwikiexplorer/xwikiexplorer.js
deleted file mode 100644
index 9ae5da86a..000000000
--- a/src/main/webapp/resources/js/xwiki/xwikiexplorer/xwikiexplorer.js
+++ /dev/null
@@ -1,250 +0,0 @@
-if(typeof XWiki=="undefined"){alert("ERROR: xwikiexplorer.js depends on xwiki.js")
-}XWiki.constants.rest={baseRestURI:XWiki.contextPath+"/rest/",restChildrenRel:"http://www.xwiki.org/rel/children",restParentRel:"http://www.xwiki.org/rel/parent",restAttachmentsRel:"http://www.xwiki.org/rel/attachments",restHomeRel:"http://www.xwiki.org/rel/home"};
-isc.ClassFactory.defineClass("XWEResultTree",isc.ResultTree);
-isc.XWEResultTree.addClassProperties({constants:{addNodeSuffix:"..new",attachmentsTitle:"$msg.get('xwikiexplorer.attachments.title')",addPageTitle:"$msg.get('xwikiexplorer.addpage.title')",addAttachmentTitle:"$msg.get('xwikiexplorer.addattachment.title')"}});
-isc.XWEResultTree.addProperties({multiDSTree:true,callbacks:{dataArrived:new Array()},parentMap:{},displayLinks:true,displayAddPage:false,displayAddPageOnTop:true,displayAttachments:true,displayAttachmentsOnTop:false,displayAttachmentsWhenEmpty:false,displayAddAttachment:false,displayAddAttachmentOnTop:true,displayBlacklistedSpaces:false});
-isc.XWEResultTree.addMethods({getChildDataSource:function(E,D){var C=E[this.childTypeProperty];
-if(C!=null){return isc.DS.get(C)
-}var D=D||this.getNodeDataSource(E);
-if(D==null||!this.isMultiDSTree()){return this.getRootDataSource()
-}var B=this.treeRelations,A=D.getChildDataSources();
-var F=XWiki.resource.get(E.id);
-E.resource=F;
-if(D.Class=="XWEDataSource"){C=isc.XWEWikiDataSource.getOrCreate(F.wiki).getID()
-}else{if(D.Class=="XWEWikiDataSource"){C=isc.XWESpaceDataSource.getOrCreate(F.wiki,F.space).getID()
-}else{if(D.Class=="XWESpaceDataSource"){if(E.isXWikiAttachment==null){C=isc.XWESpaceDataSource.getOrCreate(F.wiki,F.space).getID()
-}else{C=isc.XWEAttachmentsDataSource.getOrCreate(F.wiki,F.space,F.name).getID()
-}}else{if(B){C=B[D.ID]
-}}}}if(C!=null){return isc.DS.get(C)
-}if(A!=null){return A[0]
-}},dataArrived:function(E){var I=this.getNodeDataSource(E);
-var C="";
-if(I==null){I=this.getDataSource()
-}if(I.Class=="XWEWikiDataSource"&&this.displayBlacklistedSpaces==false){this.filterNodesByName(this.getChildren(),XWiki.blacklistedSpaces)
-}var B=this.getChildren(E);
-for(var D=0;
-D"+G+""
-}isc.addProperties(B[D],{icon:A.icon,title:G,isNewPage:false,isNewAttachment:false});
-if(D==0){C=A.Class
-}}if(C=="XWESpaceDataSource"&&I.Class=="XWEWikiDataSource"&&this.displayAddPage==true){this.addAddPageNode(E)
-}if(I.Class=="XWESpaceDataSource"&&this.displayAttachments==true&&!E.isXWikiAttachment){this.addAttachmentsNode(E)
-}if(E.isXWikiAttachment&&this.displayAddAttachment==true){this.addAddAttachmentsNode(E)
-}if(this.callbacks.dataArrived.length>0){var H=this.callbacks.dataArrived.shift();
-H.callback()
-}},isFolder:function(D){var C=this.getNodeDataSource(D);
-if(C!=null){if(C.Class=="XWEDataSource"){return true
-}else{if(C.Class=="XWEWikiDataSource"){return true
-}else{if(C.Class=="XWESpaceDataSource"){if(D.isXWikiAttachment==true){return true
-}var A=(D.link!=null)?D.link:new Array();
-for(var B=0;
-B"+H+""
-}var A={id:G.id+XWiki.constants.anchorSeparator+XWiki.constants.docextraAttachmentsAnchor,fullName:G.fullName+XWiki.constants.anchorSeparator+XWiki.constants.docextraAttachmentsAnchor,wiki:G.wiki,space:G.space,title:H,name:G.name,parentId:G.id,xwikiRelativeURL:G.xwikiRelativeURL+XWiki.constants.anchorSeparator+XWiki.constants.docextraAttachmentsAnchor,icon:"$xwiki.getSkinFile('icons/silk/page_white_zip.gif', true)",resource:XWiki.resource.get(G.id+XWiki.constants.anchorSeparator+XWiki.constants.docextraAttachmentsAnchor),isXWikiAttachment:true,isNewPage:false,isNewAttachment:false};
-var C;
-if(this.displayAttachmentsOnTop==true){C=0
-}else{C=null
-}this.add(A,G,C)
-}}});
-isc.ClassFactory.defineClass("XWEDataSource",isc.DataSource);
-isc.XWEDataSource.addClassProperties({sep:"_"});
-isc.XWEDataSource.addProperties({dataFormat:"xml",xmlNamespaces:{xwiki:"http://www.xwiki.org"},resultTreeClass:"XWEResultTree",transformResponse:function(B,A,D){if(this.callbacks.transformResponse.length>0){var C=this.callbacks.transformResponse.shift();
-C.callback(B,A,D)
-}return B
-},dataURL:XWiki.constants.rest.baseRestURI+"wikis/",recordXPath:"/xwiki:wikis/xwiki:wiki",fields:[{name:"id",required:true,type:"text",primaryKey:true},{name:"name",type:"text"},{name:"title",type:"text"},{name:"xwikiRelativeUrl",type:"text"}],icon:"$xwiki.getSkinFile('icons/silk/database.gif', true)",requestProperties:{promptStyle:"cursor"},callbacks:{transformResponse:new Array()}});
-isc.XWEDataSource.addMethods({transformRequest:function(A){if(A.originalData){A.originalData.r=""+Math.floor(Math.random()*1000000)
-}return A.data
-}});
-isc.ClassFactory.defineClass("XWEWikiDataSource",isc.XWEDataSource);
-isc.XWEWikiDataSource.addClassMethods({getOrCreate:function(A){var C="XWEWikiDataSource_"+A;
-var B=this.get(C);
-if(B==null){B=this.create({ID:C,wiki:A})
-}return B
-}});
-isc.XWEWikiDataSource.addProperties({wiki:XWiki.currentWiki,recordXPath:"/xwiki:spaces/xwiki:space",fields:[{name:"id",required:true,type:"text",primaryKey:true},{name:"name",required:true,type:"text"},{name:"title",type:"text"},{name:"xwikiRelativeUrl",type:"text"}],icon:"$xwiki.getSkinFile('icons/silk/folder.gif', true)"});
-isc.XWEWikiDataSource.addMethods({init:function(){this.dataURL=XWiki.constants.rest.baseRestURI+"wikis/"+this.wiki+"/spaces";
-this.Super("init",arguments)
-}});
-isc.ClassFactory.defineClass("XWESpaceDataSource",isc.XWEDataSource);
-isc.XWESpaceDataSource.addClassMethods({getOrCreate:function(A,C){var D="XWESpaceDataSource_"+A+isc.XWEDataSource.sep+C;
-var B=this.get(D);
-if(B==null){B=this.create({ID:D,wiki:A,space:C})
-}return B
-}});
-isc.XWESpaceDataSource.addProperties({wiki:"xwiki",space:"Main",recordXPath:"/xwiki:pages/xwiki:pageSummary",fields:[{name:"id",required:true,type:"text",primaryKey:true},{name:"fullName",required:true,type:"text"},{name:"wiki",required:true,type:"text"},{name:"space",required:true,type:"text"},{name:"name",required:true,type:"text"},{name:"title",required:true,type:"text"},{name:"parentId",required:true,type:"text",foreignKey:"id"},{name:"parent",required:true,type:"text"},{name:"xwikiRelativeUrl",type:"text"},{name:"link",propertiesOnly:true}],icon:"$xwiki.getSkinFile('icons/silk/page_white_text.gif', true)"});
-isc.XWESpaceDataSource.addMethods({init:function(){this.dataURL=XWiki.constants.rest.baseRestURI+"wikis/"+this.wiki+"/spaces/"+this.space+"/pages";
-this.transformRequest=function(A){var B=this.wiki+XWiki.constants.wikiSpaceSeparator+this.space;
-if(A.originalData.parentId==B||A.originalData.parentId==null){A.originalData.parentId="^(?!"+B+".).*$"
-}return this.Super("transformRequest",arguments)
-};
-this.Super("init",arguments)
-}});
-isc.ClassFactory.defineClass("XWEPageDataSource",isc.XWEDataSource);
-isc.XWEPageDataSource.addClassMethods({getOrCreate:function(A,D,C){var E="XWEPageDataSource_"+A+isc.XWEDataSource.sep+D+isc.XWEDataSource.sep+C;
-var B=this.get(E);
-if(B==null){B=this.create({ID:E,wiki:A,space:D,page:C})
-}return B
-}});
-isc.XWEPageDataSource.addProperties({wiki:"xwiki",space:"Main",page:"WebHome",recordXPath:"/xwiki:page",fields:[{name:"id",required:true,type:"text",primaryKey:true},{name:"wiki",required:true,type:"text"},{name:"space",required:true,type:"text"},{name:"name",required:true,type:"text"},{name:"parentId",required:true,type:"text"},{name:"parent",required:true,type:"text"},{name:"link",propertiesOnly:true}],icon:"$xwiki.getSkinFile('icons/silk/page_white_text.gif', true)"});
-isc.XWEPageDataSource.addMethods({init:function(){this.dataURL=XWiki.constants.rest.baseRestURI+"wikis/"+this.wiki+"/spaces/"+this.space+"/pages/"+this.page;
-this.Super("init",arguments)
-}});
-isc.ClassFactory.defineClass("XWEAttachmentsDataSource",isc.XWEDataSource);
-isc.XWEAttachmentsDataSource.addClassMethods({getOrCreate:function(A,D,C){var E="XWEAttachmentsDataSource_"+A+isc.XWEDataSource.sep+D+isc.XWEDataSource.sep+C;
-var B=this.get(E);
-if(B==null){B=this.create({ID:E,wiki:A,space:D,page:C})
-}return B
-}});
-isc.XWEAttachmentsDataSource.addProperties({wiki:"xwiki",space:"Main",page:"WebHome",recordXPath:"/xwiki:attachments/xwiki:attachment",fields:[{name:"id",required:true,type:"text",primaryKey:true},{name:"name",required:true,type:"text"},{name:"title",type:"text"},{name:"xwikiRelativeUrl",type:"text"}],icon:"$xwiki.getSkinFile('icons/silk/attach.gif', true)"});
-isc.XWEAttachmentsDataSource.addMethods({init:function(){this.dataURL=XWiki.constants.rest.baseRestURI+"wikis/"+this.wiki+"/spaces/"+this.space+"/pages/"+this.page+"/attachments";
-this.Super("init",arguments)
-}});
-isc.ClassFactory.defineClass("XWETreeGrid",isc.TreeGrid);
-isc.XWETreeGrid.addProperties({autoDraw:false,autoFetchData:true,nodeClick:function(C,A,B){this.nodeClickCallback(C,A,B)
-},showHeader:false,folderIcon:"$xwiki.getSkinFile('icons/silk/database.gif', true)",position:"relative",dropIconSuffix:"",openIconSuffix:"",closedIconSuffix:"",animateFolders:false,wiki:XWiki.currentWiki,space:null,displaySuggest:true,defaultValue:"Main.WebHome",inputValueCache:""});
-isc.XWETreeGrid.addMethods({draw:function(){if(this.Super("draw",arguments)!=null){return this
-}if(typeof this.input=="undefined"&&this.input==null){this.drawInput()
-}for(member in this){if(typeof member!="function"&&member.startsWith("display")){this.data[member]=this[member]
-}}var A="div.listGrid td, div.listGrid table {margin:0;padding:0;} div.listGrid td {border:0;color:#333;} #actionmenu {z-index: 999999;}";
-var C=document.getElementsByTagName("head")[0];
-var B=document.createElement("style");
-B.type="text/css";
-B.media="screen";
-if(B.styleSheet){B.styleSheet.cssText=A
-}else{B.appendChild(document.createTextNode(A))
-}C.appendChild(B)
-},invalidateCache:function(){this.Super("invalidateCache",arguments);
-this.inputValueCache=""
-},openNode:function(A,E,B){var D={treeId:this.getID(),callback:function(){window[this.treeId].openNodesFromInput()
-}};
-var C=A.findById(E);
-if(C!=null){if(A.isFolder(C)&&!A.isOpen(C)){if(B==true){this.getData().callbacks.dataArrived.push(D)
-}A.openFolder(C);
-return null
-}this.selectNodeAndScroll(C);
-return C
-}return null
-},selectNodeAndScroll:function(A){this.deselectAllRecords();
-this.selectRecord(A);
-nodeYPos=this.getFocusRow()*this.getRowHeight();
-this.body.scrollTo(this.body.getScrollLeft(),nodeYPos)
-},openParent:function(A,D){if(D.name!=""){if(A.parentMap[D.prefixedFullName]==null){var E=isc.XWEPageDataSource.getOrCreate(D.wiki,D.space,D.name);
-var C=function(J,I,L,H){if(J.httpResponseCode==200){var G=XWiki.resource.get(J.data[0].parent);
-var F=A.findById(G.fullName);
-A.parentMap[D.prefixedFullName]=G;
-if(A.findById(G.prefixedFullName)!=null){this.openNode(A,G.prefixedFullName,true)
-}else{this.openParent(A,G)
-}}else{if(this.displayAddPage==true){var K=this.getData().findById(D.prefixedSpace+isc.XWEResultTree.constants.addNodeSuffix);
-K.resource=D;
-this.selectNodeAndScroll(K)
-}}}.bind(this);
-E.fetchData(null,C,null)
-}else{var B=A.parentMap[D.prefixedFullName];
-if(A.findById(B.prefixedFullName)!=null){this.openNode(A,B.prefixedFullName,true)
-}else{this.openParent(A,B)
-}}}},openNodesFromInput:function(){var I=this.getDataSource().Class;
-var D=XWiki.resource.get(this.input.value);
-var B=XWiki.resource.get("");
-var E=this.getData();
-if(this.getSelectedRecord()!=null){B=this.getSelectedRecord().resource
-}if(I=="XWEDataSource"){var J=this.openNode(E,D.wiki,true);
-if(J==null){return
-}}if(I=="XWEDataSource"||I=="XWEWikiDataSource"){if(D.space!=B.space){this.deselectRecord(this.getSelectedRecord())
-}var F=this.openNode(E,D.prefixedSpace,true);
-if(F==null){return
-}}var K=this.openNode(E,D.prefixedFullName,true);
-if(K==null){this.openParent(E,D)
-}if(B.attachment!=D.attachment||(B.anchor!=D.anchor&&D.anchor==XWiki.constants.docextraAttachmentsAnchor)){var C=D.prefixedFullName+XWiki.constants.anchorSeparator+XWiki.constants.docextraAttachmentsAnchor;
-var A=this.openNode(E,C,true);
-if(A==null){return
-}var G=D.prefixedFullName+XWiki.constants.pageAttachmentSeparator+D.attachment;
-var H=this.openNode(E,G,false)
-}return
-},inputObserver:function(){var A=this.input.value;
-if(A!=""&&A!=this.inputValueCache){this.openNodesFromInput();
-this.inputValueCache=A
-}setTimeout(this.inputObserver.bind(this),2000)
-},drawInput:function(){var D=(this.displaySuggest==false)?"hidden":"text";
-var A=this.width-6;
-var B=document.createElement("input");
-B.setAttribute("id",this.getID()+"_Input");
-B.setAttribute("name",this.getID()+"_Input");
-B.setAttribute("style","width:"+A+"px;clear:both");
-B.setAttribute("type",D);
-if(this.defaultValue){B.setAttribute("value",this.defaultValue)
-}this.htmlElement.appendChild(B);
-this.input=B;
-if(this.displaySuggest){var C=function(){var F=new ajaxSuggest(this,{script:"/xwiki/rest/wikis/"+XWiki.currentWiki+"/search?scope=name&",varname:"q"});
-F.setSuggestions=function(K){this.aSuggestions=[];
-var H=K.responseXML;
-var J=H.getElementsByTagName("searchResult");
-for(var I=0;
-I this.translations = celMessages.code);
+ } else {
+ console.warn('celExecOnceAfterMessagesLoaded not available!');
+ }
this.showingLineNumbers = initialShowLineNumbers;
this.toggleLink = $('toggleLineNumbers');
- this.showText = "$msg.get('core.viewers.code.showLineNumbers')";
- this.hideText = "$msg.get('core.viewers.code.hideLineNumbers')";
+ this.showText = this.translations.showLineNumbers;
+ this.hideText = this.translations.hideLineNumbers;
if (this.toggleLink) {
this.textarea = this.toggleLink.up().down('textarea');
if (this.textarea) {
diff --git a/src/main/webapp/resources/uicomponents/viewers/comments.css b/src/main/webapp/resources/uicomponents/viewers/comments.css
index 25ac1765f..32546b00f 100644
--- a/src/main/webapp/resources/uicomponents/viewers/comments.css
+++ b/src/main/webapp/resources/uicomponents/viewers/comments.css
@@ -1,26 +1,119 @@
-.commentthread{margin:0 0 0 32px;}
-.commentthread fieldset{margin:0!important;padding:0 0 8px 0;border:none;}
-ul.commentreplies,li.reply{margin:0;padding:0;text-indent:0;}
-li.reply{list-style-type:none;}
-* html .reply{border-top:1px solid #FFF;}
-.xwikicomment{padding:0 0 8px;border:none;}
-.commentheader{border-bottom:1px solid #DDD;margin:0;padding:2px 0;}
-.commentheader:hover{background-color:#FFD;}
-.commentauthor{font-size:120%;}
-.commentdate{font-size:80%;}
-.commentcontent{border:none;padding:0 36px 0 32px;margin:0;font-size:100%;font-style:italic;text-align:justify;}
-.commenttools{display:block;float:right;margin-top:-1.2em;}
-.commenttool a{width:16px;height:16px;text-indent:30px;line-height:30px;overflow:hidden;background:transparent left top no-repeat;display:block;float:left;margin:0 0 0 4px;}
-.commentdelete a{background-image:url($xwiki.getSkinFile('icons/silk/cross.gif', true));}
-.commentreply a{background-image:url($xwiki.getSkinFile('icons/silk/comments_add.gif', true));}
-#AddComment{border-top:1px solid #DDD;}
-.commentthread #AddComment legend{display:none;}
-.commentthread #AddComment{border-top:none;}
-#xwikidata #AddComment{width:auto;}
-#AddComment .commentcontainer{padding:4px 32px;background:transparent url($xwiki.getSkinFile('icons/xwiki/rquo.gif', true)) right 4px no-repeat;}
-#AddComment .commentcontainer label{width:24px;height:24px;text-indent:0;font-size:1px;line-height:120px;overflow:hidden;background:transparent url($xwiki.getSkinFile('icons/xwiki/lquo.gif', true)) left top no-repeat;display:inline;float:left;margin-left:-32px;}
-#AddComment .commentcontainer textarea{border:1px solid #DDD;width:100%;}
-* html #AddComment .commentcontainer textarea{width:98%;}
-#AddComment label{font-weight:bold;}
-div.notification{background-color:#FFD;padding:2px 32px;border:1px solid #DDD;font-size:80%;font-style:italic;margin:4px 0;}
-#xwikidata #commentscontent{background:transparent;}
\ No newline at end of file
+.commentthread {
+ margin: 0 0 0 32px;
+}
+.commentthread fieldset {
+ margin: 0 !important;
+ padding: 0 0 8px 0;
+ border: none;
+}
+ul.commentreplies,
+li.reply {
+ margin: 0;
+ padding: 0;
+ text-indent: 0;
+}
+li.reply {
+ list-style-type: none;
+}
+* html .reply {
+ border-top: 1px solid #fff;
+}
+.xwikicomment {
+ padding: 0 0 8px;
+ border: none;
+}
+.commentheader {
+ border-bottom: 1px solid #ddd;
+ margin: 0;
+ padding: 2px 0;
+}
+.commentheader:hover {
+ background-color: #ffd;
+}
+.commentauthor {
+ font-size: 120%;
+}
+.commentdate {
+ font-size: 80%;
+}
+.commentcontent {
+ border: none;
+ padding: 0 36px 0 32px;
+ margin: 0;
+ font-size: 100%;
+ font-style: italic;
+ text-align: justify;
+}
+.commenttools {
+ display: block;
+ float: right;
+ margin-top: -1.2em;
+}
+.commenttool a {
+ width: 16px;
+ height: 16px;
+ text-indent: 30px;
+ line-height: 30px;
+ overflow: hidden;
+ background: transparent left top no-repeat;
+ display: block;
+ float: left;
+ margin: 0 0 0 4px;
+}
+.commentdelete a {
+ background-image: url(/skin/resources/icons/silk/cross.gif);
+}
+.commentreply a {
+ background-image: url(/skin/resources/icons/silk/comments_add.gif);
+}
+#AddComment {
+ border-top: 1px solid #ddd;
+}
+.commentthread #AddComment legend {
+ display: none;
+}
+.commentthread #AddComment {
+ border-top: none;
+}
+#xwikidata #AddComment {
+ width: auto;
+}
+#AddComment .commentcontainer {
+ padding: 4px 32px;
+ background: transparent url(/skin/resources/icons/xwiki/rquo.gif) right 4px
+ no-repeat;
+}
+#AddComment .commentcontainer label {
+ width: 24px;
+ height: 24px;
+ text-indent: 0;
+ font-size: 1px;
+ line-height: 120px;
+ overflow: hidden;
+ background: transparent url(/skin/resources/icons/xwiki/lquo.gif) left top
+ no-repeat;
+ display: inline;
+ float: left;
+ margin-left: -32px;
+}
+#AddComment .commentcontainer textarea {
+ border: 1px solid #ddd;
+ width: 100%;
+}
+* html #AddComment .commentcontainer textarea {
+ width: 98%;
+}
+#AddComment label {
+ font-weight: bold;
+}
+div.notification {
+ background-color: #ffd;
+ padding: 2px 32px;
+ border: 1px solid #ddd;
+ font-size: 80%;
+ font-style: italic;
+ margin: 4px 0;
+}
+#xwikidata #commentscontent {
+ background: transparent;
+}
diff --git a/src/main/webapp/resources/uicomponents/viewers/comments.js b/src/main/webapp/resources/uicomponents/viewers/comments.js
index 06b604520..1fdcab5cf 100644
--- a/src/main/webapp/resources/uicomponents/viewers/comments.js
+++ b/src/main/webapp/resources/uicomponents/viewers/comments.js
@@ -1,423 +1,565 @@
var XWiki = (function (XWiki) {
-// Start XWiki augmentation.
-var viewers = XWiki.viewers = XWiki.viewers || {};
-/**
- * Javascript enhancements for the comments viewer.
- */
-viewers.Comments = Class.create({
- xcommentSelector : ".xwikicomment",
- /** Constructor. Adds all the JS improvements of the Comments area. */
- initialize : function() {
- if ($("commentscontent")) {
- // If the comments area is already visible, enhance it.
- this.startup();
- }
- if ($("Commentstab")) {
- this.container = $("Commentspane");
- this.generatorTemplate = "commentsinline.vm";
- } else if ($$(".main.layoutsubsection").size() > 0 && $$(".main.layoutsubsection").first().down("#commentscontent")) {
- this.container = $$(".main.layoutsubsection").first();
- this.generatorTemplate = "comments.vm";
- }
- // We wait for a notification for the AJAX loading of the Comments metadata tab.
- this.addTabLoadListener();
- },
- /** Enhance the Comments UI with JS behaviors. */
- startup : function() {
- if ($("commentform")) {
- this.form = $("commentform").up("form");
- } else {
- this.form = undefined;
- }
- this.loadIDs();
- this.addDeleteListener();
- this.addReplyListener();
- this.addSubmitListener(this.form);
- this.addCancelListener();
- this.addEditListener();
- this.addPreview(this.form);
- },
+ // Start XWiki augmentation.
+ var viewers = (XWiki.viewers = XWiki.viewers || {});
+
/**
- * Parse the IDs of the comments to obtain the xobject number.
+ * Javascript enhancements for the comments viewer.
*/
- loadIDs : function() {
- $$(this.xcommentSelector).each(function(item) {
- var elementId = item.id;
- item._x_number = elementId.substring(elementId.lastIndexOf("_") + 1) - 0;
- });
- },
- /**
- * Ajax comment deletion.
- * For all delete buttons, listen to "click", and make ajax request to remove the comment. Remove the corresponding
- * HTML element on succes (replace it with a small notification message). Display error message (alert) on failure.
- */
- addDeleteListener : function() {
- $$(this.xcommentSelector).each(function(item) {
- // Prototype bug in Opera: $$(".comment a.delete") returns only the first result.
- // Quick fix until Prototype 1.6.1 is integrated.
- item = item.down('a.delete');
- if (!item) {
- return;
+ viewers.Comments = Class.create({
+ translations: translations,
+ xcommentSelector: ".xwikicomment",
+ /** Constructor. Adds all the JS improvements of the Comments area. */
+ initialize: function () {
+ if (window.celExecOnceAfterMessagesLoaded) {
+ window.celExecOnceAfterMessagesLoaded(
+ (celMessages) => (this.translations = celMessages.comments),
+ );
+ } else {
+ console.warn("celExecOnceAfterMessagesLoaded not available!");
}
- item.observe('click', function(event) {
- item.blur();
- event.stop();
- if (item.disabled) {
- // Do nothing if the button was already clicked and it's waiting for a response from the server.
- return;
- } else {
- new XWiki.widgets.ConfirmedAjaxRequest(
- /* Ajax request URL */
- item.readAttribute('href') + (Prototype.Browser.Opera ? "" : "&ajax=1"),
- /* Ajax request parameters */
- {
- onCreate : function() {
- // Disable the button, to avoid a cascade of clicks from impatient users
- item.disabled = true;
- },
- onSuccess : function() {
- // Remove the corresponding HTML element from the UI and update the comment count
+ if ($("commentscontent")) {
+ // If the comments area is already visible, enhance it.
+ this.startup();
+ }
+ if ($("Commentstab")) {
+ this.container = $("Commentspane");
+ this.generatorTemplate = "commentsinline.vm";
+ } else if (
+ $$(".main.layoutsubsection").size() > 0 &&
+ $$(".main.layoutsubsection").first().down("#commentscontent")
+ ) {
+ this.container = $$(".main.layoutsubsection").first();
+ this.generatorTemplate = "comments.vm";
+ }
+ // We wait for a notification for the AJAX loading of the Comments metadata tab.
+ this.addTabLoadListener();
+ },
+ /** Enhance the Comments UI with JS behaviors. */
+ startup: function () {
+ if ($("commentform")) {
+ this.form = $("commentform").up("form");
+ } else {
+ this.form = undefined;
+ }
+ this.loadIDs();
+ this.addDeleteListener();
+ this.addReplyListener();
+ this.addSubmitListener(this.form);
+ this.addCancelListener();
+ this.addEditListener();
+ this.addPreview(this.form);
+ },
+ /**
+ * Parse the IDs of the comments to obtain the xobject number.
+ */
+ loadIDs: function () {
+ $$(this.xcommentSelector).each(function (item) {
+ var elementId = item.id;
+ item._x_number =
+ elementId.substring(elementId.lastIndexOf("_") + 1) - 0;
+ });
+ },
+ /**
+ * Ajax comment deletion.
+ * For all delete buttons, listen to "click", and make ajax request to remove the comment. Remove the corresponding
+ * HTML element on succes (replace it with a small notification message). Display error message (alert) on failure.
+ */
+ addDeleteListener: function () {
+ $$(this.xcommentSelector).each(
+ function (item) {
+ // Prototype bug in Opera: $$(".comment a.delete") returns only the first result.
+ // Quick fix until Prototype 1.6.1 is integrated.
+ item = item.down("a.delete");
+ if (!item) {
+ return;
+ }
+ item.observe(
+ "click",
+ function (event) {
+ item.blur();
+ event.stop();
+ if (item.disabled) {
+ // Do nothing if the button was already clicked and it's waiting for a response from the server.
+ return;
+ } else {
+ new XWiki.widgets.ConfirmedAjaxRequest(
+ /* Ajax request URL */
+ item.readAttribute("href") +
+ (Prototype.Browser.Opera ? "" : "&ajax=1"),
+ /* Ajax request parameters */
+ {
+ onCreate: function () {
+ // Disable the button, to avoid a cascade of clicks from impatient users
+ item.disabled = true;
+ },
+ onSuccess: function () {
+ // Remove the corresponding HTML element from the UI and update the comment count
+ var comment = item.up(this.xcommentSelector);
+ // If the form is inside this comment's reply thread, move it back to the bottom.
+ if (
+ this.form &&
+ this.form.descendantOf(comment.next(".commentthread"))
+ ) {
+ this.resetForm();
+ }
+ // Replace the comment with a "deleted comment" placeholder
+ comment.replace(
+ this.createNotification(this.translations.commentDeleted),
+ );
+ this.updateCount();
+ }.bind(this),
+ onComplete: function () {
+ // In the end: re-enable the button
+ item.disabled = false;
+ },
+ },
+ /* Interaction parameters */
+ {
+ confirmationText: this.translations.deleteConfirm,
+ progressMessageText: this.translations.deleteInProgress,
+ successMessageText: this.translations.deleteDone,
+ failureMessageText: this.translations.deleteFailed,
+ },
+ );
+ }
+ }.bindAsEventListener(this),
+ );
+ }.bind(this),
+ );
+ },
+ /**
+ * Ajax comment editing.
+ * For all edit buttons, listen to "click", and make ajax request to retrieve the form and save the comment.
+ */
+ addEditListener: function () {
+ $$(this.xcommentSelector).each(
+ function (item) {
+ // Prototype bug in Opera: $$(".comment a.delete") returns only the first result.
+ // Quick fix until Prototype 1.6.1 is integrated.
+ item = item.down("a.edit");
+ if (!item) {
+ return;
+ }
+ item.observe(
+ "click",
+ function (event) {
+ item.blur();
+ event.stop();
+ if (item.disabled) {
+ // Do nothing if the button was already clicked and it's waiting for a response from the server.
+ return;
+ } else if (item._x_editForm) {
+ // If the form was already fetched, but hidden after cancel, just show it again
+ // without making a new request
var comment = item.up(this.xcommentSelector);
- // If the form is inside this comment's reply thread, move it back to the bottom.
- if (this.form && this.form.descendantOf(comment.next('.commentthread'))) {
- this.resetForm();
- }
- // Replace the comment with a "deleted comment" placeholder
- comment.replace(this.createNotification("$msg.get('core.viewers.comments.commentDeleted')"));
- this.updateCount();
- }.bind(this),
- onComplete : function() {
- // In the end: re-enable the button
- item.disabled = false;
+ comment.hide();
+ item._x_editForm.show();
+ } else {
+ new Ajax.Request(
+ /* Ajax request URL */
+ item
+ .readAttribute("href")
+ .replace(
+ "viewer=comments",
+ "xpage=xpart&vm=commentsinline.vm",
+ ),
+ /* Ajax request parameters */
+ {
+ onCreate: function () {
+ // Disable the button, to avoid a cascade of clicks from impatient users
+ item.disabled = true;
+ item._x_notification = new XWiki.widgets.Notification(
+ this.translations.editFormFetchInProgress,
+ "inprogress",
+ );
+ },
+ onSuccess: function (response) {
+ // Hide other comment editing forms (allow only one comment to be edited at a time)
+ if (this.editing) {
+ this.cancelEdit(false, this.editing);
+ }
+ // Replace the comment text with a form for editing it
+ var comment = item.up(this.xcommentSelector);
+ comment.insert({ before: response.responseText });
+ item._x_editForm = comment.previous();
+ this.addSubmitListener(item._x_editForm);
+ this.addPreview(item._x_editForm);
+ item._x_editForm
+ .down("a.cancel")
+ .observe(
+ "click",
+ this.cancelEdit.bindAsEventListener(this, item),
+ );
+ comment.hide();
+ item._x_notification.hide();
+ // Currently editing: this comment
+ this.editing = item;
+ }.bind(this),
+ onFailure: function (response) {
+ var failureReason = response.statusText;
+ if (
+ response.statusText == "" /* No response */ ||
+ response.status == 12031 /* In IE */
+ ) {
+ failureReason = "Server not responding";
+ }
+ item._x_notification.replace(
+ new XWiki.widgets.Notification(
+ this.translations.editFormFetchFailed + failureReason,
+ "error",
+ ),
+ );
+ }.bind(this),
+ on0: function (response) {
+ response.request.options.onFailure(response);
+ },
+ onComplete: function () {
+ // In the end: re-enable the button
+ item.disabled = false;
+ },
+ },
+ );
}
- },
- /* Interaction parameters */
- {
- confirmationText: "$msg.get('core.viewers.comments.delete.confirm')",
- progressMessageText : "$msg.get('core.viewers.comments.delete.inProgress')",
- successMessageText : "$msg.get('core.viewers.comments.delete.done')",
- failureMessageText : "$msg.get('core.viewers.comments.delete.failed')"
- }
+ }.bindAsEventListener(this),
);
- }
- }.bindAsEventListener(this));
- }.bind(this));
- },
- /**
- * Ajax comment editing.
- * For all edit buttons, listen to "click", and make ajax request to retrieve the form and save the comment.
- */
- addEditListener : function() {
- $$(this.xcommentSelector).each(function(item) {
- // Prototype bug in Opera: $$(".comment a.delete") returns only the first result.
- // Quick fix until Prototype 1.6.1 is integrated.
- item = item.down('a.edit');
- if (!item) {
- return;
- }
- item.observe('click', function(event) {
- item.blur();
+ }.bind(this),
+ );
+ },
+ /**
+ * Cancel edit
+ */
+ cancelEdit: function (event, editActivator) {
+ if (event) {
event.stop();
- if (item.disabled) {
- // Do nothing if the button was already clicked and it's waiting for a response from the server.
- return;
- } else if (item._x_editForm){
- // If the form was already fetched, but hidden after cancel, just show it again
- // without making a new request
- var comment = item.up(this.xcommentSelector);
- comment.hide();
- item._x_editForm.show();
- } else {
- new Ajax.Request(
- /* Ajax request URL */
- item.readAttribute('href').replace('viewer=comments', 'xpage=xpart&vm=commentsinline.vm'),
- /* Ajax request parameters */
- {
- onCreate : function() {
- // Disable the button, to avoid a cascade of clicks from impatient users
- item.disabled = true;
- item._x_notification = new XWiki.widgets.Notification("$msg.get('core.viewers.comments.editForm.fetch.inProgress')", "inprogress");
- },
- onSuccess : function(response) {
- // Hide other comment editing forms (allow only one comment to be edited at a time)
- if (this.editing) {
- this.cancelEdit(false, this.editing);
+ }
+ var comment = editActivator.up(this.xcommentSelector);
+ editActivator._x_editForm.hide();
+ comment.show();
+ this.cancelPreview(editActivator._x_editForm);
+ this.editing = false;
+ },
+ /**
+ * Inline reply: Move the form under the replied comment and update the hidden "replyto" field.
+ */
+ addReplyListener: function () {
+ if (this.form) {
+ $$(this.xcommentSelector).each(
+ function (item) {
+ // Prototype bug in Opera: $$(".comment a.commentreply") returns only the first result.
+ // Quick fix until Prototype 1.6.1 is integrated.
+ item = item.down("a.commentreply");
+ if (!item) {
+ return;
+ }
+ item.observe(
+ "click",
+ function (event) {
+ item.blur();
+ event.stop();
+ // If the form was already displayed as a reply, re-enable the Reply button for the old location
+ if (this.form.up(".commentthread")) {
+ this.form
+ .up(".commentthread")
+ .previous(this.xcommentSelector)
+ .down("a.commentreply")
+ .show();
}
- // Replace the comment text with a form for editing it
- var comment = item.up(this.xcommentSelector);
- comment.insert({before: response.responseText});
- item._x_editForm = comment.previous();
- this.addSubmitListener(item._x_editForm);
- this.addPreview(item._x_editForm);
- item._x_editForm.down('a.cancel').observe('click', this.cancelEdit.bindAsEventListener(this, item));
- comment.hide();
- item._x_notification.hide();
- // Currently editing: this comment
- this.editing = item;
+ // Insert the form on top of that comment's discussion
+ item
+ .up(this.xcommentSelector)
+ .next(".commentthread")
+ .insert({ top: this.form });
+ // Set the replyto field to the replied comment's number
+ this.form["XWiki.XWikiComments_replyto"].value = item.up(
+ this.xcommentSelector,
+ )._x_number;
+ // Clear the contents and focus the textarea
+ this.form["XWiki.XWikiComments_comment"].value = "";
+ this.form["XWiki.XWikiComments_comment"].focus();
+ // Hide the reply button
+ item.hide();
+ }.bindAsEventListener(this),
+ );
+ }.bind(this),
+ );
+ } else {
+ // If, for some reason, the form is missing, hide the reply functionality from the user
+ $$(this.xcommentSelector + " a.commentreply").each(function (item) {
+ item.hide();
+ });
+ }
+ },
+ /**
+ * When pressing Submit, check that the comment is not empty. Submit the form with ajax and update the whole comments
+ * zone on success.
+ */
+ addSubmitListener: function (form) {
+ if (form) {
+ // Add listener for submit
+ form.down("input[type='submit']").observe(
+ "click",
+ function (event) {
+ event.stop();
+ if (form.down("textarea").value != "") {
+ var formData = new Hash(form.serialize(true));
+ formData.set(
+ "xredirect",
+ window.docgeturl + "?xpage=xpart&vm=" + this.generatorTemplate,
+ );
+ // Allows CommentAddAction to parse a template which will return a message telling if the captcha was wrong.
+ formData.set("xpage", "xpart");
+ formData.set("vm", this.generatorTemplate);
+ // Strip whatever query string is supplied by the form so it doesn't override the formData.
+ var url = form.action.replace(/\?.*/, "");
+ formData.unset("action_cancel");
+ // Create a notification message to display to the user when the submit is being sent
+ form._x_notification = new XWiki.widgets.Notification(
+ this.translations.addInProgress,
+ "inprogress",
+ );
+ form.disable();
+ this.restartNeeded = false;
+ new Ajax.Request(url, {
+ method: "post",
+ parameters: formData,
+ onSuccess: function () {
+ this.restartNeeded = true;
+ this.editing = false;
+ form._x_notification.replace(
+ new XWiki.widgets.Notification(
+ this.translations.addDone,
+ "done",
+ ),
+ );
+ }.bind(this),
+ onFailure: function (response) {
+ var failureReason = response.statusText;
+ if (
+ response.statusText == "" /* No response */ ||
+ response.status == 12031 /* In IE */
+ ) {
+ failureReason = "Server not responding";
+ }
+ form._x_notification.replace(
+ new XWiki.widgets.Notification(
+ this.translations.addFailed + failureReason,
+ "error",
+ ),
+ );
+ }.bind(this),
+ on0: function (response) {
+ response.request.options.onFailure(response);
+ },
+ onComplete: function (response) {
+ if (this.restartNeeded) {
+ this.container.update(response.responseText);
+ document.fire("xwiki:docextra:loaded", {
+ id: "Comments",
+ element: this.container,
+ });
+ this.updateCount();
+ } else {
+ form.enable();
+ }
+ }.bind(this),
+ });
+ }
+ }.bindAsEventListener(this),
+ );
+ }
+ },
+ /**
+ * When pressing Cancel, reset the form.
+ */
+ addCancelListener: function () {
+ if (this.form) {
+ this.initialLocation = new Element("span", { className: "hidden" });
+ $("_comments").insert(this.initialLocation);
+ // If the form is inside a thread, as a reply form, move it back to the bottom.
+ this.form
+ .down("a.cancel")
+ .observe("click", this.resetForm.bindAsEventListener(this));
+ }
+ },
+ /**
+ * Add a preview button that generates the rendered comment,
+ */
+ addPreview: function (form) {
+ if (!form) {
+ return;
+ }
+ var previewURL = "/preview/__space__/__page__"
+ .replace(
+ "__space__",
+ encodeURIComponent($$("meta[name=space]")[0].content),
+ )
+ .replace(
+ "__page__",
+ encodeURIComponent($$("meta[name=page]")[0].content),
+ );
+ form.commentElt = form.down("textarea");
+ var buttons = form.down("input[type=submit]").up("div");
+ form.previewButton = new Element("span", {
+ class: "buttonwrapper",
+ }).update(
+ new Element("input", {
+ type: "button",
+ class: "button",
+ value: this.translations.previewButtonPreview,
+ }),
+ );
+ form.previewButton._x_modePreview = false;
+ form.previewContent = new Element("div", {
+ class: "commentcontent commentPreview",
+ });
+ form.commentElt.insert({ before: form.previewContent });
+ form.previewContent.hide();
+ buttons.insert({ top: form.previewButton });
+ form.previewButton.observe(
+ "click",
+ function () {
+ if (
+ !form.previewButton._x_modePreview &&
+ !form.previewButton.disabled
+ ) {
+ form.previewButton.disabled = true;
+ var notification = new XWiki.widgets.Notification(
+ this.translations.previewInProgress,
+ "inprogress",
+ );
+ new Ajax.Request(previewURL, {
+ method: "post",
+ parameters: { xpage: "plain", content: form.commentElt.value },
+ onSuccess: function (response) {
+ this.doPreview(response.responseText, form);
+ notification.hide();
+ }.bind(this),
+ /* If the content is empty or does not generate anything, we have the "This template does not exist" response,
+ with a 400 status code. */
+ on400: function (response) {
+ this.doPreview(" ", form);
+ notification.hide();
}.bind(this),
- onFailure : function (response) {
+ onFailure: function (response) {
var failureReason = response.statusText;
- if (response.statusText == '' /* No response */ || response.status == 12031 /* In IE */) {
- failureReason = 'Server not responding';
+ if (
+ response.statusText == "" /* No response */ ||
+ response.status == 12031 /* In IE */
+ ) {
+ failureReason = "Server not responding";
}
- item._x_notification.replace(new XWiki.widgets.Notification("$msg.get('core.viewers.comments.editForm.fetch.failed')" + failureReason, "error"));
- }.bind(this),
- on0 : function (response) {
+ notification.replace(
+ new XWiki.widgets.Notification(
+ this.translations.previewFailed + failureReason,
+ "error",
+ ),
+ );
+ },
+ on0: function (response) {
response.request.options.onFailure(response);
},
- onComplete : function() {
- // In the end: re-enable the button
- item.disabled = false;
- }
- }
- );
- }
- }.bindAsEventListener(this));
- }.bind(this));
- },
- /**
- * Cancel edit
- */
- cancelEdit : function (event, editActivator) {
- if (event) {
- event.stop();
- }
- var comment = editActivator.up(this.xcommentSelector);
- editActivator._x_editForm.hide();
- comment.show();
- this.cancelPreview(editActivator._x_editForm);
- this.editing = false;
- },
- /**
- * Inline reply: Move the form under the replied comment and update the hidden "replyto" field.
- */
- addReplyListener : function() {
- if (this.form) {
- $$(this.xcommentSelector).each(function(item) {
- // Prototype bug in Opera: $$(".comment a.commentreply") returns only the first result.
- // Quick fix until Prototype 1.6.1 is integrated.
- item = item.down('a.commentreply');
- if (!item) {
- return;
- }
- item.observe('click', function(event) {
- item.blur();
- event.stop();
- // If the form was already displayed as a reply, re-enable the Reply button for the old location
- if (this.form.up('.commentthread')) {
- this.form.up(".commentthread").previous(this.xcommentSelector).down('a.commentreply').show();
+ onComplete: function (response) {
+ form.previewButton.disabled = false;
+ }.bind(this),
+ });
+ } else {
+ this.cancelPreview(form);
}
- // Insert the form on top of that comment's discussion
- item.up(this.xcommentSelector).next('.commentthread').insert({'top' : this.form});
- // Set the replyto field to the replied comment's number
- this.form["XWiki.XWikiComments_replyto"].value = item.up(this.xcommentSelector)._x_number;
- // Clear the contents and focus the textarea
- this.form["XWiki.XWikiComments_comment"].value = "";
- this.form["XWiki.XWikiComments_comment"].focus();
- // Hide the reply button
- item.hide();
- }.bindAsEventListener(this));
- }.bind(this));
- } else {
- // If, for some reason, the form is missing, hide the reply functionality from the user
- $$(this.xcommentSelector + ' a.commentreply').each(function(item) {
- item.hide();
- });
- }
- },
- /**
- * When pressing Submit, check that the comment is not empty. Submit the form with ajax and update the whole comments
- * zone on success.
- */
- addSubmitListener : function(form) {
- if (form) {
- // Add listener for submit
- form.down("input[type='submit']").observe('click', function(event) {
+ }.bindAsEventListener(this),
+ );
+ },
+ /**
+ * Display the comment preview instead of the comment textarea.
+ *
+ * @param content the rendered comment, as HTML text
+ * @param form the form for which the preview is done
+ */
+ doPreview: function (content, form) {
+ form.previewButton._x_modePreview = true;
+ form.previewContent.update(content);
+ form.previewContent.show();
+ form.commentElt.hide();
+ form.previewButton.down("input").value = this.translations.previewButtonBack;
+ },
+ /**
+ * Display the comment textarea instead of the comment preview.
+ *
+ * @param form the form for which the preview is canceled
+ */
+ cancelPreview: function (form) {
+ form.previewButton._x_modePreview = false;
+ form.previewContent.hide();
+ form.previewContent.update("");
+ form.commentElt.show();
+ form.previewButton.down("input").value =
+ this.translations.previewButtonPreview;
+ },
+ resetForm: function (event) {
+ if (event) {
event.stop();
- if (form.down('textarea').value != "") {
- var formData = new Hash(form.serialize(true));
- formData.set('xredirect', window.docgeturl + '?xpage=xpart&vm=' + this.generatorTemplate);
- // Allows CommentAddAction to parse a template which will return a message telling if the captcha was wrong.
- formData.set('xpage', 'xpart');
- formData.set('vm', this.generatorTemplate);
- // Strip whatever query string is supplied by the form so it doesn't override the formData.
- var url = form.action.replace(/\?.*/, '');
- formData.unset('action_cancel');
- // Create a notification message to display to the user when the submit is being sent
- form._x_notification = new XWiki.widgets.Notification("$msg.get('core.viewers.comments.add.inProgress')", "inprogress");
- form.disable();
- this.restartNeeded = false;
- new Ajax.Request(url, {
- method : 'post',
- parameters : formData,
- onSuccess : function () {
- this.restartNeeded = true;
- this.editing = false;
- form._x_notification.replace(new XWiki.widgets.Notification("$msg.get('core.viewers.comments.add.done')", "done"));
- }.bind(this),
- onFailure : function (response) {
- var failureReason = response.statusText;
- if (response.statusText == '' /* No response */ || response.status == 12031 /* In IE */) {
- failureReason = 'Server not responding';
- }
- form._x_notification.replace(new XWiki.widgets.Notification("$msg.get('core.viewers.comments.add.failed')" + failureReason, "error"));
- }.bind(this),
- on0 : function (response) {
- response.request.options.onFailure(response);
- },
- onComplete : function (response) {
- if (this.restartNeeded) {
- this.container.update(response.responseText);
- document.fire("xwiki:docextra:loaded", {
- "id" : "Comments",
- "element": this.container
- });
- this.updateCount();
- } else {
- form.enable();
- }
- }.bind(this)
- });
- }
- }.bindAsEventListener(this));
- }
- },
- /**
- * When pressing Cancel, reset the form.
- */
- addCancelListener : function() {
- if (this.form) {
- this.initialLocation = new Element("span", {className : "hidden"});
- $('_comments').insert(this.initialLocation);
- // If the form is inside a thread, as a reply form, move it back to the bottom.
- this.form.down('a.cancel').observe('click', this.resetForm.bindAsEventListener(this));
- }
- },
- /**
- * Add a preview button that generates the rendered comment,
- */
- addPreview : function(form) {
- if (!form) {
- return;
- }
- var previewURL = "$xwiki.getURL('__space__.__page__', 'preview')".replace("__space__", encodeURIComponent($$("meta[name=space]")[0].content)).replace("__page__", encodeURIComponent($$("meta[name=page]")[0].content));
- form.commentElt = form.down('textarea');
- var buttons = form.down('input[type=submit]').up('div');
- form.previewButton = new Element('span', {'class' : 'buttonwrapper'}).update(new Element('input', {'type' : 'button', 'class' : 'button', 'value' : "$msg.get('core.viewers.comments.preview.button.preview')"}));
- form.previewButton._x_modePreview = false;
- form.previewContent = new Element('div', {'class' : 'commentcontent commentPreview'});
- form.commentElt.insert({'before' : form.previewContent});
- form.previewContent.hide();
- buttons.insert({'top' : form.previewButton});
- form.previewButton.observe('click', function() {
- if (!form.previewButton._x_modePreview && !form.previewButton.disabled) {
- form.previewButton.disabled = true;
- var notification = new XWiki.widgets.Notification("$msg.get('core.viewers.comments.preview.inProgress')", "inprogress");
- new Ajax.Request(previewURL, {
- method : 'post',
- parameters : {'xpage' : 'plain', 'content' : form.commentElt.value},
- onSuccess : function (response) {
- this.doPreview(response.responseText, form);
- notification.hide();
- }.bind(this),
- /* If the content is empty or does not generate anything, we have the "This template does not exist" response,
- with a 400 status code. */
- on400 : function(response) {
- this.doPreview(' ', form);
- notification.hide();
- }.bind(this),
- onFailure : function (response) {
- var failureReason = response.statusText;
- if (response.statusText == '' /* No response */ || response.status == 12031 /* In IE */) {
- failureReason = 'Server not responding';
- }
- notification.replace(new XWiki.widgets.Notification("$msg.get('core.viewers.comments.preview.failed')" + failureReason, "error"));
- },
- on0 : function (response) {
- response.request.options.onFailure(response);
- },
- onComplete : function (response) {
- form.previewButton.disabled = false;
- }.bind(this)
- });
- } else {
- this.cancelPreview(form);
}
- }.bindAsEventListener(this));
- },
- /**
- * Display the comment preview instead of the comment textarea.
- *
- * @param content the rendered comment, as HTML text
- * @param form the form for which the preview is done
- */
- doPreview : function(content, form) {
- form.previewButton._x_modePreview = true;
- form.previewContent.update(content);
- form.previewContent.show();
- form.commentElt.hide();
- form.previewButton.down('input').value = "$msg.get('core.viewers.comments.preview.button.back')";
- },
- /**
- * Display the comment textarea instead of the comment preview.
- *
- * @param form the form for which the preview is canceled
- */
- cancelPreview : function(form) {
- form.previewButton._x_modePreview = false;
- form.previewContent.hide();
- form.previewContent.update('');
- form.commentElt.show();
- form.previewButton.down('input').value = "$msg.get('core.viewers.comments.preview.button.preview')";
- },
- resetForm : function (event) {
- if (event) {
- event.stop();
- }
- if (this.form.up('.commentthread')) {
- // Show the comment's reply button
- this.form.up(".commentthread").previous(this.xcommentSelector).down('a.commentreply').show();
- // Put the form back to its initial location and clear the contents
- this.initialLocation.insert({after: this.form});
- }
- this.form["XWiki.XWikiComments_replyto"].value = "";
- this.form["XWiki.XWikiComments_comment"].value = "";
- this.cancelPreview(this.form);
- },
- updateCount : function() {
- if ($("Commentstab") && $("Commentstab").down(".itemCount")) {
- $("Commentstab").down(".itemCount").update("$msg.get('docextra.extranb', ['__number__'])".replace("__number__", $$(this.xcommentSelector).size()));
- }
- if ($("commentsshortcut") && $("commentsshortcut").down(".itemCount")) {
- $("commentsshortcut").down(".itemCount").update("$msg.get('docextra.extranb', ['__number__'])".replace("__number__", $$(this.xcommentSelector).size()));
- }
- },
- /**
- * Registers a listener that watches for the insertion of the Comments tab and triggers the enhancements.
- * After that, the listener removes itself, since it is no longer needed.
- */
- addTabLoadListener : function(event) {
- var listener = function(event) {
- if (event.memo.id == 'Comments') {
- this.startup();
+ if (this.form.up(".commentthread")) {
+ // Show the comment's reply button
+ this.form
+ .up(".commentthread")
+ .previous(this.xcommentSelector)
+ .down("a.commentreply")
+ .show();
+ // Put the form back to its initial location and clear the contents
+ this.initialLocation.insert({ after: this.form });
}
- }.bindAsEventListener(this);
- document.observe("xwiki:docextra:loaded", listener);
- },
- /**
- * Just a simple message box that is displayed at various events: comment deleted, sending comment...
- */
- createNotification : function(message) {
- var msg = new Element('div', {"class" : "notification" });
- msg.update(message);
- return msg;
- }
-});
-// End XWiki augmentation.
-return XWiki;
-}(XWiki || {}));
+ this.form["XWiki.XWikiComments_replyto"].value = "";
+ this.form["XWiki.XWikiComments_comment"].value = "";
+ this.cancelPreview(this.form);
+ },
+ updateCount: function () {
+ if ($("Commentstab") && $("Commentstab").down(".itemCount")) {
+ $("Commentstab")
+ .down(".itemCount")
+ .update(
+ this.translations["extranb"].replace(
+ "__number__",
+ $$(this.xcommentSelector).size(),
+ ),
+ );
+ }
+ if ($("commentsshortcut") && $("commentsshortcut").down(".itemCount")) {
+ $("commentsshortcut")
+ .down(".itemCount")
+ .update(
+ this.translations["extranb"].replace(
+ "__number__",
+ $$(this.xcommentSelector).size(),
+ ),
+ );
+ }
+ },
+ /**
+ * Registers a listener that watches for the insertion of the Comments tab and triggers the enhancements.
+ * After that, the listener removes itself, since it is no longer needed.
+ */
+ addTabLoadListener: function (event) {
+ var listener = function (event) {
+ if (event.memo.id == "Comments") {
+ this.startup();
+ }
+ }.bindAsEventListener(this);
+ document.observe("xwiki:docextra:loaded", listener);
+ },
+ /**
+ * Just a simple message box that is displayed at various events: comment deleted, sending comment...
+ */
+ createNotification: function (message) {
+ var msg = new Element("div", { class: "notification" });
+ msg.update(message);
+ return msg;
+ },
+ });
+ // End XWiki augmentation.
+ return XWiki;
+})(XWiki || {});
// ======================================
// Comment actions enhancements
-document.observe('xwiki:dom:loaded', function() {
+document.observe("xwiki:dom:loaded", function () {
new XWiki.viewers.Comments();
});
diff --git a/src/main/webapp/resources/uicomponents/viewers/tags.css b/src/main/webapp/resources/uicomponents/viewers/tags.css
deleted file mode 100644
index d55cfa8de..000000000
--- a/src/main/webapp/resources/uicomponents/viewers/tags.css
+++ /dev/null
@@ -1,83 +0,0 @@
-#template("colorThemeInit.vm")
-.doc-tags {
- float: left;
- width: 48%;
-}
-.tag-wrapper {
- padding: 2px 1px;
-}
-.tag-wrapper .separator {
- display: none;
-}
-.tag {
- word-wrap: break-word;
-}
-a.tag-delete, a.tag-delete:visited {
- color: $theme.pageContentBackgroundColor;
- font-size: 70%;
- font-weight: bold;
- text-decoration: none !important;
- vertical-align: super;
-}
-.tag-wrapper:hover a.tag-delete {
- color: $theme.textPrimaryColor;
-}
-.tag-wrapper a.tag-delete:hover {
- color: #C00;
-}
-.tag-add {
- color: $theme.textPrimaryColor;
- display: inline;
-}
-.tag-add a, .tag-add a:visited {
- color: $theme.textPrimaryColor;
- font-size: 80%;
- text-decoration: none;
-}
-.tag-add a:hover {
- color: $theme.linkColor;
-}
-
-.tag-add-form {
- border: 1px outset $theme.borderColor;
- position: absolute;
- vertical-align: top !important;
- z-index: 1000;
-}
-* html .tag-add-form {
- width: 190px;
-}
-.tag-add-form div {
- background: $theme.backgroundSecondaryColor;
- overflow: hidden;
- padding: 4px 8px;
-}
-
-.tag-add-form label {
- color: $theme.textColor;
- font-size: 80%;
- margin: 2px 0;
-}
-
-.tag-add-form .input-tag {
- width: 16em;
- height: 80%;
- margin-right: 3px;
-}
-
-.tag-add-form .buttonwrapper {
- margin-left: 0;
-}
-
-#body .tag-add-form .button {
- font-size: 80%;
- padding: 3px 5px !important;
- cursor: pointer;
- display: inline-block;
- min-height: 0 !important;
-}
-
-.tag-add-form .button-add-tag-cancel {
- font-size: 80%;
- padding: 4px 5px !important;
-}
diff --git a/src/main/webapp/resources/uicomponents/viewers/tags.js b/src/main/webapp/resources/uicomponents/viewers/tags.js
deleted file mode 100644
index 1eb89e6ed..000000000
--- a/src/main/webapp/resources/uicomponents/viewers/tags.js
+++ /dev/null
@@ -1,167 +0,0 @@
-// ======================================
-// Ajax tag editing
-//
-var XWiki = (function (XWiki) {
-// Start XWiki augmentation.
-var viewers = XWiki.viewers = XWiki.viewers || {};
-
-/**
- * Tag editing.
- */
-viewers.Tags = Class.create({
- /**
- * Initialization: add listeners for all tag actions, to perform them via AJAX
- */
- initialize : function() {
- // delete tags
- $$('.doc-tags .tag-delete').each(this.ajaxTagDelete);
- $$('.doc-tags .tag-add a').each(this.createTagAddForm.bind(this));
- if ($$('.doc-tags .tag-add-form').length > 0) {
- this.ajaxifyForm($$('.doc-tags .tag-add-form')[0]);
- }
- },
- /** AJAX tag removal */
- ajaxTagDelete : function (item) {
- item.observe('click', function(event) {
- if (event) {
- event.stop();
- }
- if (!item.disabled) {
- new Ajax.Request(
- item.readAttribute('href').replace(/&xredirect=.+$/, "&ajax=1"),
- {
- onCreate : function () {
- // ignore "cascade" clicks
- item.disabled = true;
- item.notification = new XWiki.widgets.Notification("Deleting tag...", "inprogress");
- },
- onSuccess : function () {
- // delete the corresponding element
- item.up('.tag-wrapper').remove();
- },
- onFailure : function (response) {
- new XWiki.widgets.Notification(response.responseText || 'Server not responding', "error");
- },
- // 0 is returned for network failures, except on IE where a strange large number (12031) is returned.
- on0 : function(response) {
- response.request.options.onFailure(response);
- },
- onComplete : function () {
- item.disabled = false;
- item.notification.hide();
- }
- }
- );
- }
- }.bindAsEventListener());
- },
- createTagAddForm : function (item) {
- item.observe('click', function(event) {
- if (event) {
- event.stop();
- }
- if (!item._x_form) {
- if (!item.disabled) {
- new Ajax.Request(
- item.readAttribute('href').replace(/#.+$/, "&ajax=1&xpage=documentTags"),
- {
- onCreate : function () {
- // ignore "cascade" clicks
- item.disabled = true;
- item.notification = new XWiki.widgets.Notification("Fetching form...", "inprogress");
- },
- onSuccess : function (response) {
- var iParent = item.up();
- item.remove();
- iParent.update(response.responseText);
- item._x_form = iParent.firstDescendant();
- item._x_form._x_activator = item;
- item._x_form.down('input[type=text]').focus();
- this.ajaxifyForm(item._x_form);
- }.bind(this),
- onFailure : function (response) {
- new XWiki.widgets.Notification(response.responseText || 'Server not responding', "error");
- },
- // 0 is returned for network failures, except on IE where a strange large number (12031) is returned.
- on0 : function(response) {
- response.request.options.onFailure(response);
- },
- onComplete : function () {
- item.disabled = false;
- item.notification.hide();
- }
- }
- );
- }
- } else {
- Element.replace(item, item._x_form);
- item._x_form.down('input[type=text]').focus();
- }
- }.bindAsEventListener(this));
- },
- ajaxifyForm : function(form) {
- form.setAttribute('autocomplete', 'off');
- form.down('input[type=text]').setAttribute('autocomplete', 'off');
- form.down('input[type=text]').setAttribute('autocomplete', 'off');
- form.observe('submit', function(event) {
- event.stop();
- form.down('input[type=text]').focus();
- if (form.tag.value != '') {
- new Ajax.Request(
- form.action.replace(/&xredirect=.+$/, '&ajax=1&tag=') + encodeURIComponent(form.tag.value),
- {
- onCreate : function () {
- // ignore "cascade" clicks
- form.disable();
- form.notification = new XWiki.widgets.Notification("Adding tag...", "inprogress");
- },
- onSuccess : function (response) {
- var wrapper = new Element('span');
- wrapper.insert(response.responseText + ' ');
- wrapper.select('.tag-delete').each(this.ajaxTagDelete);
- while (wrapper.childNodes.length > 0) {
- form.up('.tag-add').insert({before : wrapper.firstChild});
- form.up('.tag-add').insert({before : ' '});
- wrapper.removeChild(wrapper.firstChild);
- }
- form.reset();
- }.bind(this),
- onFailure : function (response) {
- new XWiki.widgets.Notification(response.responseText || 'Server not responding', "error");
- },
- onComplete : function () {
- form.enable();
- form.notification.hide();
- },
- // 0 is returned for network failures, except on IE where a strange large number (12031) is returned.
- on0 : function(response) {
- response.request.options.onFailure(response);
- }
- }
- );
- }
- }.bindAsEventListener(this));
- form.observe('reset', function(event) {
- Element.replace(form, form._x_activator);
- }.bindAsEventListener(this));
- // Replace the Cancel link (which is supposed to
- var cancel = new Element("input", {type: "reset", value : form.down('.button-add-tag-cancel').innerHTML, "class" : "button"});
- form.down('.button-add-tag-cancel').replace(cancel);
-
- new XWiki.widgets.Suggest(form.down('input[type=text]'), {
- script: "${xwiki.getURL('Main.WebHome', 'view', 'xpage=suggest&classname=XWiki.TagClass&fieldname=tags&firCol=-&secCol=-')}&",
- varname: 'input',
- seps: "${xwiki.getDocument('XWiki.TagClass').xWikiClass.tags.getProperty('separators').value}",
- shownoresults : false,
- icon: "${xwiki.getSkinFile('icons/silk/tag_yellow.gif')}"
- });
- }
-});
-// End XWiki augmentation.
-return XWiki;
-}(XWiki || {}));
-
-// Create the tags editing behavior on startup.
-document.observe('xwiki:dom:loaded', function() {
- new XWiki.viewers.Tags();
-});
diff --git a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_bars.png b/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_bars.png
deleted file mode 100644
index cbd818411..000000000
Binary files a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_bars.png and /dev/null differ
diff --git a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_bg.gif b/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_bg.gif
deleted file mode 100644
index f0d26f66f..000000000
Binary files a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_bg.gif and /dev/null differ
diff --git a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_bg.png b/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_bg.png
deleted file mode 100644
index 47903c360..000000000
Binary files a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_bg.png and /dev/null differ
diff --git a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_boxes.png b/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_boxes.png
deleted file mode 100644
index e024a2104..000000000
Binary files a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_boxes.png and /dev/null differ
diff --git a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_close.png b/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_close.png
deleted file mode 100644
index ec4e0a377..000000000
Binary files a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_close.png and /dev/null differ
diff --git a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_drop.png b/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_drop.png
deleted file mode 100644
index 65e83ccd3..000000000
Binary files a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_drop.png and /dev/null differ
diff --git a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_palette_raw.png b/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_palette_raw.png
deleted file mode 100644
index a67824700..000000000
Binary files a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_palette_raw.png and /dev/null differ
diff --git a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_sel_circle.gif b/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_sel_circle.gif
deleted file mode 100644
index 0e0278403..000000000
Binary files a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_sel_circle.gif and /dev/null differ
diff --git a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_sel_circle.png b/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_sel_circle.png
deleted file mode 100644
index 771fd774c..000000000
Binary files a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_sel_circle.png and /dev/null differ
diff --git a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_sel_rect.gif b/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_sel_rect.gif
deleted file mode 100644
index c1be1cd67..000000000
Binary files a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_sel_rect.gif and /dev/null differ
diff --git a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_sel_rect.png b/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_sel_rect.png
deleted file mode 100644
index 2c68a2ba4..000000000
Binary files a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_sel_rect.png and /dev/null differ
diff --git a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_wheel_black.png b/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_wheel_black.png
deleted file mode 100644
index 56d1564c4..000000000
Binary files a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_wheel_black.png and /dev/null differ
diff --git a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_wheel_rgb.jpg b/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_wheel_rgb.jpg
deleted file mode 100644
index b7dc4e0bb..000000000
Binary files a/src/main/webapp/resources/uicomponents/widgets/colorpicker/img/procolor_win_wheel_rgb.jpg and /dev/null differ
diff --git a/src/main/webapp/resources/uicomponents/widgets/colorpicker/procolor.js b/src/main/webapp/resources/uicomponents/widgets/colorpicker/procolor.js
deleted file mode 100644
index 98fd1a55e..000000000
--- a/src/main/webapp/resources/uicomponents/widgets/colorpicker/procolor.js
+++ /dev/null
@@ -1,753 +0,0 @@
-/*
-** PROCOLOR LICENSE
-** ----------------
-**
-** Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are met:
-**
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-**
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in the
-** documentation and/or other materials provided with the distribution.
-**
-** THIS SOFTWARE IS PROVIDED BY THE PHANTOM INKER AND CONTRIBUTORS "AS IS"
-** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-** THE POSSIBILITY OF SUCH DAMAGE.
-*/
-if(typeof Prototype=="undefined"){alert("ProColor Error: Prototype is not loaded. Please make sure that your page includes prototype.js before it includes procolor.js.")
-}if(Prototype.Version<"1.6"){alert("ProColor Error: Minimum Prototype 1.6.0 is required; you are using "+Prototype.Version)
-}Element.addMethods({build:function(B,D,A,C){var E=$(document.createElement(D));
-$H(A).each(function(F){E[F.key]=F.value
-});
-if(C){E.setStyle(C)
-}B.appendChild(E);
-return E
-},isEventIn:function(B,C){var E=B.getDimensions();
-var D=B.cumulativeOffset();
-var A=C.pointerX(),F=C.pointerY();
-return(A>=D.left&&F>=D.top&&A=5.5&&D<7&&document.body.filters);
-this.div=null;
-this.color=null;
-this.listeners={};
-this.dblclk={time:0};
-if(A.parent){this.parent=$(A.parent)
-}else{this.parent=Element.extend(document.body)
-}if(A.input){this.input=$(A.input)
-}else{this.input=null
-}this.options={mode:"static",width:360,height:192,offsetx:13,offsety:8,input:null,showInField:false,parent:null,closeButton:(A.mode=="popup"),imgPath:"",color:(!this.input?"#FFFFFF":this.input.tagName=="INPUT"?this.input.value:this.input.innerHTML),editbg:"#FFFFFF",edittext:"#4C4C4C",outputFormat:"#{RR}{GG}{BB}",onOpening:null,onOpened:null,onClosing:null,onClosed:null,onCloseButton:null,onChanging:null,onChanged:null,onCancelClick:null,onAcceptClick:null};
-for(var B in A){this.options[B]=A[B]
-}if(this.options.onOpening){this.options.onOpening(this,"opening")
-}this.createDiv();
-if(this.options.mode=="popup"){this.positionPopup();
-Event.observe(document,"mousedown",this.closeClickHandler=this.handleCloseClick.bindAsEventListener(this));
-Event.observe(document,"keypress",this.keyPressHandler=this.handleKeyPress.bindAsEventListener(this))
-}if(this.options.onOpened){this.options.onOpened(this,"opened")
-}},positionPopup:function(){var I=this.div.cumulativeOffset(),K=I[0],H=I[1];
-var C=this.div.getDimensions(),M=C.height,B=C.width;
-var D=document.viewport.getHeight(),N=document.viewport.getWidth();
-var Q=document.viewport.getScrollOffsets();
-var O=$(this.input).cumulativeOffset(),F=O[1],P=O[0];
-var G=$(this.input).getDimensions().height,J=F+G;
-if(P+B>N-8){P=N-8-B
-}if(P<8){P=8
-}var L=(J+M>Q.top+D)&&(J-M>Q.top);
-var A=P.toString()+"px";
-var E=(L?(F-M):(F+G)).toString()+"px";
-this.div.style.left=A;
-this.div.style.top=E;
-this.div.setStyle({visibility:"",display:"block"})
-},createDiv:function(){var B={display:"block",width:this.options.width+"px",height:this.options.height+"px",backgroundPosition:"0% 0%",backgroundAttachment:"scroll",backgroundRepeat:"no-repeat",backgroundImage:"url("+this.options.imgPath+(this.old_ie?"bg.gif)":"bg.png)"),color:"#BBBBD7",left:0,top:0};
-if(this.options.mode=="popup"){B.position="absolute";
-B.display="none";
-B.visibility="hidden";
-B.zIndex=999999
-}else{B.position="relative"
-}this.div=$(this.parent).build("div",{className:"procolor_box"},B);
-this.img_palette=this.loadBgImage(this.div,"palette_raw.png",0,1,66,174);
-this.img_bar_lower=this.loadBgImage(this.div,"bars.png",77,1,20,174,{zIndex:1,opacity:1});
-this.img_bar_middle=this.loadBgImage(this.div,"bars.png",77,1,20,174,{zIndex:2,opacity:0});
-this.img_bar_upper=this.loadBgImage(this.div,"bars.png",77,1,20,174,{zIndex:3,opacity:0});
-this.img_wheel_rgb=this.loadBgImage(this.div,"wheel_rgb.jpg",105,0,176,176,{zIndex:1,opacity:1});
-this.img_wheel_black=this.loadBgImage(this.div,"wheel_black.png",105,0,176,176,{zIndex:2,opacity:1});
-this.img_boxes=this.loadBgImage(this.div,"boxes.png",287,25,50,149,{zIndex:1});
-this.img_bar_dragger=this.createImageButton(this.div,"sel_rect",73+this.options.offsetx,-1+this.options.offsety,24,8,{zIndex:4});
-this.img_wheel_dragger=this.createImageButton(this.div,"sel_circle",184+this.options.offsetx,79+this.options.offsety,17,17,{zIndex:5});
-this.listeners.wheel=this.onWheelEvent.bindAsEventListener(this);
-this.img_wheel_black.observe("mousedown",this.listeners.wheel);
-this.img_wheel_dragger.observe("mousedown",this.listeners.wheel);
-this.img_wheel_dragger.observe("keydown",this.listeners.wheel);
-this.listeners.bar=this.onBarEvent.bindAsEventListener(this);
-this.img_bar_upper.observe("mousedown",this.listeners.bar);
-this.img_bar_dragger.observe("mousedown",this.listeners.bar);
-this.img_bar_dragger.observe("keydown",this.listeners.bar);
-this.listeners.palette=this.onPaletteEvent.bindAsEventListener(this);
-this.img_palette.observe("mousedown",this.listeners.palette);
-this.wheel={left:106+this.options.offsetx,top:1+this.options.offsety,width:174,height:174};
-this.bar={left:77+this.options.offsetx,top:2+this.options.offsety,width:20,height:172};
-this.wheelsel={width:17,height:17};
-this.barsel={width:24,height:8};
-this.listeners.rgb=this.onNumberBox.bindAsEventListener(this,"rgb",0,255,0);
-this.r_edit=this.createEdit(this.div,287,25,37,20,this.listeners.rgb);
-this.g_edit=this.createEdit(this.div,287,47,37,20,this.listeners.rgb);
-this.b_edit=this.createEdit(this.div,287,69,37,20,this.listeners.rgb);
-this.listeners.hue=this.onNumberBox.bindAsEventListener(this,"hsb",0,359,360);
-this.listeners.satbrt=this.onNumberBox.bindAsEventListener(this,"hsb",0,100,0);
-this.hue_edit=this.createEdit(this.div,287,110,37,20,this.listeners.hue);
-this.sat_edit=this.createEdit(this.div,287,132,37,20,this.listeners.satbrt);
-this.brt_edit=this.createEdit(this.div,287,154,37,20,this.listeners.satbrt);
-if(this.options.closeButton){this.img_close=this.createImageButton(this.div,"close",this.options.width-40,0,24,16);
-this.listeners.close=this.onCloseEvent.bindAsEventListener(this);
-this.img_close.observe("mouseover",this.listeners.close);
-this.img_close.observe("mouseout",this.listeners.close);
-this.img_close.observe("mousedown",this.listeners.close);
-this.img_close.observe("keydown",this.listeners.close);
-this.img_close.trackingMouse=false
-}if(this.input&&this.input.tagName=="INPUT"){this.listeners.input=this.onInput.bindAsEventListener(this);
-this.input.observe("keyup",this.listeners.input);
-this.input.observe("focus",this.listeners.input);
-this.input.observe("blur",this.listeners.input)
-}else{this.listeners.input=null
-}var A=this.decodeHexColor(this.options.color);
-if(!A){A={r:0,g:0,b:0}
-}this.update("rgb",A,[])
-},loadBgImage:function(G,A,F,E,H,D,I){var B={display:"block",position:"absolute",width:H+"px",height:D+"px",left:F+this.options.offsetx+"px",top:E+this.options.offsety+"px",padding:"0",backgroundImage:"url("+this.options.imgPath+A+")"};
-if(I){for(var C in I){B[C]=I[C]
-}}return G.build("div",{},B)
-},createImageButton:function(H,A,G,F,I,E,J){var B={display:"block",position:"absolute",width:I+"px",height:E+"px",left:G+"px",top:F+"px",border:"0",cursor:"default",padding:"0",fontSize:"1px",backgroundImage:"url("+this.options.imgPath+A+(this.old_ie?".gif)":".png)")};
-if(J){for(var D in J){B[D]=J[D]
-}}var C=H.build("a",{href:"#"},B);
-return C
-},createEdit:function(F,A,H,B,E,G){A+=5;
-B-=9;
-H+=2;
-E-=6;
-var D={display:"inline",position:"absolute",width:B+"px",height:E+"px",left:A+this.options.offsetx+"px",top:H+this.options.offsety+"px",verticalAlign:"top",backgroundColor:this.options.editbg,padding:"0",color:this.options.edittext,fontFamily:"Verdana,Tahoma,Arial,sans-serif,sans serif,sans",fontSize:"12px",fontStyle:"Normal",fontVariant:"Normal",fontWeight:"Normal",textAlign:"right",direction:"ltr",border:0,zIndex:10};
-var C=F.build("input",{type:"text",value:"0",maxLength:3},D);
-C.observe("keypress",G);
-C.observe("keyup",G);
-C.observe("focus",G);
-C.observe("blur",G);
-return C
-},close:function(){if(!this.div){return false
-}if(this.options.onClosing){this.options.onClosing(this,"closing")
-}if(this.options.closeButton){Event.stopObserving(this.img_close)
-}Event.stopObserving(this.r_edit);
-Event.stopObserving(this.g_edit);
-Event.stopObserving(this.b_edit);
-Event.stopObserving(this.hue_edit);
-Event.stopObserving(this.sat_edit);
-Event.stopObserving(this.brt_edit);
-Event.stopObserving(this.img_wheel_black);
-Event.stopObserving(this.img_bar_upper);
-Event.stopObserving(this.img_palette);
-Event.stopObserving(this.img_wheel_dragger);
-Event.stopObserving(this.img_bar_dragger);
-if(this.listeners.input){Event.stopObserving(this.input,"keyup",this.listeners.input);
-Event.stopObserving(this.input,"focus",this.listeners.input);
-Event.stopObserving(this.input,"blur",this.listeners.input)
-}Event.stopObserving(document,"mousedown",this.closeClickHandler);
-Event.stopObserving(document,"keypress",this.keyPressHandler);
-this.div.remove();
-this.div=null;
-this.listeners={};
-this.dblclk={};
-if(this.input.type!="hidden"&&!this.input.disabled){this.input.focus()
-}if(this.options.onClosed){this.options.onClosed(this,"closed")
-}},updateState:{},updateTimeout:false,queuedUpdate:function(D,A,B){if(!Prototype.Browser.IE){this.update(D,A,B)
-}else{var C=this;
-C.updateState={mode:D,color:A,sources:B};
-if(C.updateTimeout==false){C.updateTimeout=setTimeout(function(){C.updateTimeout=false;
-C.update(C.updateState.mode,C.updateState.color,C.updateState.sources)
-},25)
-}}},finalUpdate:function(){if(this.updateTimeout){clearTimeout(this.updateTimeout);
-this.updateTimeout=false;
-this.update(this.updateState.mode,this.updateState.color,this.updateState.sources);
-this.updateState={}
-}},update:function(I,F,A){if(typeof (F)!="object"){F={r:0,g:0,b:0,hue:0,sat:0,brt:0}
-}F.r=this.toNumber(F.r);
-F.g=this.toNumber(F.g);
-F.b=this.toNumber(F.b);
-F.hue=this.toNumber(F.hue);
-F.sat=this.toNumber(F.sat);
-F.brt=this.toNumber(F.brt);
-var K,G;
-if(I=="rgb"){K=F;
-G=this.RGBtoHSB(K)
-}else{if(I=="hsb"){G=F;
-K=this.HSBtoRGB(G)
-}}if(K.r<0){K.r=0
-}if(K.r>255){K.r=255
-}if(K.g<0){K.g=0
-}if(K.g>255){K.g=255
-}if(K.b<0){K.b=0
-}if(K.b>255){K.b=255
-}G.hue=G.hue%360;
-if(G.hue<0){G.hue+=360
-}if(G.sat<0){G.sat=0
-}if(G.sat>100){G.sat=100
-}if(G.brt<0){G.brt=0
-}if(G.brt>100){G.brt=100
-}source={};
-A.each(function(R){source[R]=true
-});
-var P=this;
-if(!source.wheel){var B=G.brt/100;
-if(B>0.9999){B=0.9999
-}P.img_wheel_black.setOpacity(1-B);
-var C=((G.hue+270)%360)*(Math.PI*2/360);
-var J=Math.cos(C);
-var Q=Math.sin(C);
-var N=Math.floor(J*G.sat*P.wheel.width/200+0.5)+P.wheel.left+((P.wheel.width-4)/2)+2;
-var L=Math.floor(Q*G.sat*P.wheel.height/200+0.5)+P.wheel.top+((P.wheel.height-4)/2)+2;
-P.img_wheel_dragger.setStyle({left:N-Math.floor(P.wheelsel.width/2)+"px",top:L-Math.floor(P.wheelsel.height/2)+"px"})
-}if(!source.bar){var E=Math.floor(G.hue/60);
-var H=(E+1)%6;
-P.img_bar_lower.setStyle({backgroundPosition:(-E*20-20)+"px 0px"});
-P.img_bar_middle.setStyle({backgroundPosition:(-H*20-20)+"px 0px"});
-P.img_bar_middle.setOpacity((G.hue-E*60)/60);
-var B=(100-G.sat)/100;
-if(B<0.0001){B=0.0001
-}P.img_bar_upper.setOpacity(B);
-P.img_bar_dragger.setStyle({top:P.bar.top-Math.floor(P.barsel.height/2)+Math.floor((100-G.brt)*P.bar.height/100+0.5)+"px",left:P.bar.left+Math.floor(P.bar.width-P.barsel.width)/2+"px"})
-}K.r=Math.floor(K.r+0.5);
-K.g=Math.floor(K.g+0.5);
-K.b=Math.floor(K.b+0.5);
-G.hue=Math.floor(G.hue+0.5);
-G.sat=Math.floor(G.sat+0.5);
-G.brt=Math.floor(G.brt+0.5);
-G.hue=G.hue%360;
-this.color="#"+(K.r.toColorPart()+K.g.toColorPart()+K.b.toColorPart()).toUpperCase();
-if(!source.rgb){this.r_edit.value=K.r;
-this.g_edit.value=K.g;
-this.b_edit.value=K.b
-}if(!source.hsb){this.hue_edit.value=G.hue;
-this.sat_edit.value=G.sat;
-this.brt_edit.value=G.brt
-}if(this.options.input){var M=$(this.options.input);
-if(!source.input){var O=this.internalFormatOutput(K,G,this.options.outputFormat);
-if(M.tagName=="INPUT"){M.value=O
-}else{M.innerHTML=O
-}}if(this.options.showInField){var D=this.computeTextColor(K);
-M.setStyle({backgroundColor:this.color,color:"#"+D.r.toColorPart()+D.g.toColorPart()+D.b.toColorPart()})
-}}},toNumber:function(A){switch(typeof A){case"number":return A;
-case"string":if(matches=/^[^0-9.+-]*([+-]?(?:[0-9]*\.[0-9]+|[0-9]+(?:\.[0-9]*)?))(?:[^0-9]|$)/.exec(A)){return Number(matches[1])
-}else{return 0
-}case"boolean":return A?1:0;
-case"object":return A?1:0;
-case"function":return 1;
-default:case"undefined":return 0
-}},formatOutput:function(B,C){if(!C){C="#{RR}{GG}{BB}"
-}var A=this.decodeHexColor(B);
-if(!A){A={r:0,g:0,b:0}
-}return this.internalFormatOutput(A,this.RGBtoHSB(A),C)
-},internalFormatOutput:function(C,A,E){var D=E.match(/(\{\w+\}|[^{]+)/g);
-var B="";
-D.each(function(G){var F;
-switch(G){case"{RR}":F=C.r.toColorPart().toUpperCase();
-break;
-case"{GG}":F=C.g.toColorPart().toUpperCase();
-break;
-case"{BB}":F=C.b.toColorPart().toUpperCase();
-break;
-case"{rr}":F=C.r.toColorPart().toLowerCase();
-break;
-case"{gg}":F=C.g.toColorPart().toLowerCase();
-break;
-case"{bb}":F=C.b.toColorPart().toLowerCase();
-break;
-case"{R}":F=this.halfColorPart(C.r).toUpperCase();
-break;
-case"{G}":F=this.halfColorPart(C.g).toUpperCase();
-break;
-case"{B}":F=this.halfColorPart(C.b).toUpperCase();
-break;
-case"{r}":F=this.halfColorPart(C.r).toLowerCase();
-break;
-case"{g}":F=this.halfColorPart(C.g).toLowerCase();
-break;
-case"{b}":F=this.halfColorPart(C.b).toLowerCase();
-break;
-case"{red}":F=C.r.toString();
-break;
-case"{grn}":F=C.g.toString();
-break;
-case"{blu}":F=C.b.toString();
-break;
-case"{hue}":F=A.hue.toString();
-break;
-case"{sat}":F=A.sat.toString();
-break;
-case"{brt}":F=A.brt.toString();
-break;
-default:F=G;
-break
-}B+=F
-});
-return B
-},halfColorPart:function(A){return Math.floor((A+8)/17).toString(16)
-},decodeHexColor:function(B){var E;
-if(E=/^[^0-9A-Fa-f]*([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})([0-9A-Fa-f]{0,2})(?:[^0-9A-Fa-f]|$)/.exec(B)){return{r:parseInt(E[1],16),g:parseInt(E[2],16),b:parseInt(E[3],16)}
-}if(E=/^[^0-9A-Fa-f]*([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})([0-9A-Fa-f])(?:[^0-9A-Fa-f]|$)/.exec(B)){var A=parseInt(E[3],16);
-return{r:parseInt(E[1],16),g:parseInt(E[2],16),b:A*16+A}
-}if(E=/^[^0-9A-Fa-f]*([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})(?:[^0-9A-Fa-f]|$)/.exec(B)){var D=parseInt(E[2],16);
-return{r:parseInt(E[1],16),g:D,b:D}
-}if(E=/^[^0-9A-Fa-f]*([0-9A-Fa-f])([0-9A-Fa-f])([0-9A-Fa-f])([0-9A-Fa-f]{0,2})(?:[^0-9A-Fa-f]|$)/.exec(B)){var C=parseInt(E[1],16);
-var D=parseInt(E[2],16);
-var A=parseInt(E[3],16);
-return{r:C*16+C,g:D*16+D,b:A*16+A}
-}if(E=/^[^0-9A-Fa-f]*([0-9A-Fa-f]{2})(?:[^0-9A-Fa-f]|$)/.exec(B)){var D=parseInt(E[1],16);
-return{r:D,g:D,b:D}
-}if(E=/^[^0-9A-Fa-f]*([0-9A-Fa-f])(?:[^0-9A-Fa-f]|$)/.exec(B)){var D=parseInt(E[1],16);
-D=D*16+D;
-return{r:D,g:D,b:D}
-}return false
-},trueBrightness:function(A){return(A.r/255*0.3)+(A.g/255*0.59)+(A.b/255*0.11)
-},computeTextColor:function(C){var D=this.trueBrightness(C);
-if(D<0.5){var A=Math.floor(D*20)+3;
-var B=255*(A-1)
-}else{var A=Math.floor((1-D)*20)+3;
-var B=0
-}return{r:Math.floor((C.r+B)/A),g:Math.floor((C.g+B)/A),b:Math.floor((C.b+B)/A)}
-},RGBtoHSB:function(E){var A=Math.floor(this.toNumber(E.r)+0.5);
-var D=Math.floor(this.toNumber(E.g)+0.5);
-var F=Math.floor(this.toNumber(E.b)+0.5);
-if(A<0){A=0
-}if(A>255){A=255
-}if(D<0){D=0
-}if(D>255){D=255
-}if(F<0){F=0
-}if(F>255){F=255
-}var G,J,H,B;
-var C=A,K=D,I=F;
-if(A>D){if(A>F){I=G=A,B=0,H=D-F
-}else{I=G=F,B=240,H=A-D
-}J=G-((DF){I=G=D,B=120,H=F-A
-}else{I=G=F,B=240,H=A-D
-}J=G-((A100){G=100
-}G=G*255/100;
-var I=this.toNumber(C.sat);
-if(I<=0){G=Math.floor(G+0.5);
-return{r:G,g:G,b:G}
-}if(I>100){I=100
-}var D=this.toNumber(C.hue);
-D=D%360;
-if(D<0){D+=360
-}var H=G*I/100;
-var B=(H*((D*256/60)%256))/256;
-var A,E,F;
-switch(Math.floor(D/60)){case 0:A=G;
-E=G-H+B;
-F=G-H;
-break;
-case 1:A=G-B;
-E=G;
-F=G-H;
-break;
-case 2:A=G-H;
-E=G;
-F=G-H+B;
-break;
-case 3:A=G-H;
-E=G-B;
-F=G;
-break;
-case 4:A=G-H+B;
-E=G-H;
-F=G;
-break;
-case 5:A=G;
-E=G-H;
-F=G-B;
-break
-}A=Math.floor(A+0.5);
-E=Math.floor(E+0.5);
-F=Math.floor(F+0.5);
-if(A<0){A=0
-}if(A>255){A=255
-}if(E<0){E=0
-}if(E>255){E=255
-}if(F<0){F=0
-}if(F>255){F=255
-}return{r:A,g:E,b:F}
-},acceptAndClose:function(){if(this.options.onAcceptClick){this.options.onAcceptClick(this,"acceptclick")
-}if(this.options.mode=="popup"){this.close()
-}},cancelAndClose:function(){if(this.options.onCancelClick){this.options.onCancelClick(this,"cancelclick")
-}if(this.options.mode=="popup"){this.close()
-}},closeOnDoubleClick:function(D){var A=D.pointerX(),E=D.pointerY();
-var B=new Date;
-var C=B.getTime();
-if(Math.abs(this.dblclk.x-A)<3&&Math.abs(this.dblclk.y-E)<3&&C-this.dblclk.time<=500){this.dblclk.time=0;
-this.acceptAndClose();
-return true
-}else{this.dblclk.x=A;
-this.dblclk.y=E;
-this.dblclk.time=C;
-return false
-}},brtFromPoint:function(A,D){var C=this.img_bar_upper.getDimensions();
-var B=this.img_bar_upper.cumulativeOffset();
-if(D=B.top+C.height){return 0
-}else{return((B.top+C.height-1-D)*100/C.height)
-}}},hueSatFromPoint:function(A,H){var G=this.img_wheel_rgb.getDimensions();
-var F=this.img_wheel_rgb.cumulativeOffset();
-var B=(H-(F.top+G.height/2))/((G.height-4)/2);
-var E=(A-(F.left+G.width/2))/((G.width-4)/2);
-var D=Math.sqrt(B*B+E*E)*100+0.5;
-var C=Math.atan2(B,E)*180/Math.PI+90;
-if(D<=0){C=D=0
-}if(D>100){D=100
-}if(C<0){C+=360
-}return{sat:D,hue:C}
-},colorFromPalette:function(B,G){var F=this.img_palette.getDimensions();
-var E=this.img_palette.cumulativeOffset();
-if(B=E.left+F.width){return false
-}B=Math.floor((B-E.left)/11);
-if(G>=E.top&&GE.top+20&&G100){F=100
-}if(E.options.onChanging&&(B!=F)){E.options.onChanging(E,"changing")
-}E.update("hsb",{hue:E.hue_edit.value,sat:E.sat_edit.value,brt:F},[]);
-if(E.options.onChanged&&(B!=F)){E.options.onChanged(E,"changed")
-}break;
-case"mousedown":G.stop();
-var E=this;
-E.oldcolor=E.color;
-if(E.img_bar_dragger.focus){E.img_bar_dragger.focus()
-}var C=function(I){var H={hue:E.hue_edit.value,sat:E.sat_edit.value,brt:E.brtFromPoint(I.pointerX(),I.pointerY())};
-E.queuedUpdate("hsb",H,[]);
-if(E.options.onChanging){E.options.onChanging(E,"changing")
-}};
-C(G);
-if(this.closeOnDoubleClick(G)){break
-}var A=new MouseCapture;
-A.setCursor("default");
-A.begin(function(I,H){switch(H){case"mouseup":case"keyup":A.end();
-E.finalUpdate();
-if(E.options.onChanged&&E.oldcolor!=E.color){E.options.onChanged(E,"changed")
-}break;
-case"mousemove":C(I);
-break
-}});
-break
-}},onWheelEvent:function(E){switch(E.type){case"keydown":var I=this;
-var D=this.toNumber(I.hue_edit.value),A=D;
-var C=this.toNumber(I.sat_edit.value),G=C;
-var F=E.shiftKey||E.ctrlKey||E.altKey;
-switch(E.keyCode){case Event.KEY_UP:C+=F?10:1;
-E.stop();
-break;
-case Event.KEY_DOWN:C-=F?10:1;
-E.stop();
-break;
-case Event.KEY_LEFT:D-=F?10:1;
-E.stop();
-break;
-case Event.KEY_RIGHT:D+=F?10:1;
-E.stop();
-break;
-case Event.KEY_PAGEUP:C+=F?25:10;
-E.stop();
-break;
-case Event.KEY_PAGEDOWN:C-=F?25:10;
-E.stop();
-break;
-case Event.KEY_HOME:C=100;
-E.stop();
-break;
-case Event.KEY_END:C=0;
-E.stop();
-break
-}if(C<0){C=0
-}if(C>100){C=100
-}D=D%360;
-if(D<0){D+=360
-}if(I.options.onChanging&&(A!=D||G!=C)){I.options.onChanging(I,"changing")
-}I.update("hsb",{hue:D,sat:C,brt:I.brt_edit.value},[]);
-if(I.options.onChanged&&(A!=D||G!=C)){I.options.onChanged(I,"changed")
-}break;
-case"mousedown":E.stop();
-var I=this;
-I.oldcolor=I.color;
-if(I.img_wheel_dragger.focus){I.img_wheel_dragger.focus()
-}var B=function(K){var J=I.hueSatFromPoint(K.pointerX(),K.pointerY());
-J.brt=I.brt_edit.value;
-I.queuedUpdate("hsb",J,[]);
-if(I.options.onChanging){I.options.onChanging(I,"changing")
-}};
-B(E);
-if(this.closeOnDoubleClick(E)){break
-}var H=new MouseCapture;
-H.setCursor("default");
-H.begin(function(K,J){switch(J){case"mouseup":case"keyup":H.end();
-I.finalUpdate();
-if(I.options.onChanged&&I.oldcolor!=I.color){I.options.onChanged(I,"changed")
-}break;
-case"mousemove":B(K);
-break
-}});
-break
-}},onPaletteEvent:function(D){switch(D.type){case"mousedown":var C=this;
-C.oldcolor=C.color;
-if(C.img_palette.focus){C.img_palette.focus()
-}var B=function(F){var E=C.colorFromPalette(F.pointerX(),F.pointerY());
-if(E){C.queuedUpdate("rgb",E,[])
-}if(C.options.onChanging){C.options.onChanging(C,"changing")
-}return E
-};
-if(!B(D)){break
-}D.stop();
-if(this.closeOnDoubleClick(D)){break
-}var A=new MouseCapture;
-A.setCursor("default");
-A.begin(function(F,E){switch(E){case"mouseup":case"keyup":A.end();
-C.finalUpdate();
-if(C.options.onChanged&&C.oldcolor!=C.color){C.options.onChanged(C,"changed")
-}break;
-case"mousemove":B(F);
-break
-}});
-break
-}},onNumberBox:function(F,G,E,A,D){var C=Event.element(F);
-switch(F.type){case"keypress":if(!F||F.ctrlKey||F.altKey){F.stop()
-}else{if((F.charCode>=48&&F.charCode<=57)||(F.keyCode>=48&&F.keyCode<=57)){}else{if(F.keyCode>0&&F.keyCode<48){}else{F.stop()
-}}}break;
-case"keyup":if(F.keyCode!=Event.KEY_TAB){this.updateByMode(G);
-if(this.options.onChanging){this.options.onChanging(this,"changing")
-}}if(F.keyCode==Event.KEY_RETURN){this.acceptAndClose();
-F.stop()
-}if(F.keyCode==Event.KEY_ESC){this.cancelAndClose();
-F.stop()
-}break;
-case"focus":this.oldcolor=this.color;
-break;
-case"blur":var B=this.toNumber(C.value);
-if(BA){if(D){B%=D;
-if(B<0){B+=D
-}}else{if(B
+ this.defaultInteractionParameters = {
+ confirmationText: celMessages.confirmationBox.defaultQuestion,
+ yesButtonText: celMessages.confirmationBox.yes,
+ noButtonText: celMessages.confirmationBox.no
+ });
+ } else {
+ console.warn("celExecOnceAfterMessagesLoaded not available!");
}
- );
- this.showDialog();
- this.setClass("confirmation");
- this.behavior = behavior || { };
- },
- /** Create the content of the confirmation dialog: icon + question text, buttons */
- createContent : function (data) {
- var question = new Element("div", {"class" : "question"}).update(data.confirmationText);
- var buttons = new Element("div", {"class" : "buttons"});
- var yesButton = this.createButton("button", data.yesButtonText, "(Enter)", "");
- var noButton = this.createButton("button", data.noButtonText, "(Esc)", "");
- buttons.insert(yesButton);
- buttons.insert(noButton);
- var content = new Element("div");
- content.insert(question).insert(buttons);
- Event.observe(yesButton, "click", this.onYes.bindAsEventListener(this));
- Event.observe(noButton, "click", this.onNo.bindAsEventListener(this));
- return content;
- },
- onYes : function() {
- this.closeDialog();
- if (typeof (this.behavior.onYes) == 'function') {
- this.behavior.onYes();
- }
- },
- onNo : function() {
- this.closeDialog();
- if (typeof (this.behavior.onNo) == 'function') {
- this.behavior.onNo();
- }
- }
-});
-} // if the parent widget is defined
\ No newline at end of file
+ this.interactionParameters = Object.extend(
+ Object.clone(this.defaultInteractionParameters),
+ interactionParameters || {},
+ );
+ $super(
+ this.createContent(this.interactionParameters),
+ {
+ show: { method: this.showDialog, keys: [] },
+ yes: { method: this.onYes, keys: ["Enter", "Space"] },
+ no: { method: this.onNo, keys: ["Esc"] },
+ close: { method: this.closeDialog, keys: [] },
+ },
+ {
+ displayCloseButton: false,
+ removeOnClose: true,
+ },
+ );
+ this.showDialog();
+ this.setClass("confirmation");
+ this.behavior = behavior || {};
+ },
+ /** Create the content of the confirmation dialog: icon + question text, buttons */
+ createContent: function (data) {
+ var question = new Element("div", { class: "question" }).update(
+ data.confirmationText,
+ );
+ var buttons = new Element("div", { class: "buttons" });
+ var yesButton = this.createButton(
+ "button",
+ data.yesButtonText,
+ "(Enter)",
+ "",
+ );
+ var noButton = this.createButton(
+ "button",
+ data.noButtonText,
+ "(Esc)",
+ "",
+ );
+ buttons.insert(yesButton);
+ buttons.insert(noButton);
+ var content = new Element("div");
+ content.insert(question).insert(buttons);
+ Event.observe(yesButton, "click", this.onYes.bindAsEventListener(this));
+ Event.observe(noButton, "click", this.onNo.bindAsEventListener(this));
+ return content;
+ },
+ onYes: function () {
+ this.closeDialog();
+ if (typeof this.behavior.onYes == "function") {
+ this.behavior.onYes();
+ }
+ },
+ onNo: function () {
+ this.closeDialog();
+ if (typeof this.behavior.onNo == "function") {
+ this.behavior.onNo();
+ }
+ },
+ });
+} // if the parent widget is defined
diff --git a/src/main/webapp/resources/uicomponents/widgets/confirmedAjaxRequest.js b/src/main/webapp/resources/uicomponents/widgets/confirmedAjaxRequest.js
index 971aaff13..fe5e0fb59 100644
--- a/src/main/webapp/resources/uicomponents/widgets/confirmedAjaxRequest.js
+++ b/src/main/webapp/resources/uicomponents/widgets/confirmedAjaxRequest.js
@@ -44,14 +44,20 @@ XWiki.widgets.ConfirmedAjaxRequest = Class.create(XWiki.widgets.ConfirmationBox,
},
/** Constructor. Registers the key listener that pops up the dialog. */
initialize : function($super, requestUrl, ajaxRequestParameters, interactionParameters) {
- this.interactionParameters = Object.extend({
- displayProgressMessage: true,
- progressMessageText : "$msg.get('core.widgets.confirmationBox.notification.inProgress')",
- displaySuccessMessage: true,
- successMessageText : "$msg.get('core.widgets.confirmationBox.notification.done')",
- displayFailureMessage: true,
- failureMessageText : "$msg.get('core.widgets.confirmationBox.notification.failed')"
- }, interactionParameters || {});
+ if (window.celExecOnceAfterMessagesLoaded) {
+ window.celExecOnceAfterMessagesLoaded(
+ celMessages => this.interactionParameters = Object.extend({
+ displayProgressMessage: true,
+ progressMessageText : celMessages.confirmedAjaxRequest.notificationInProgress,
+ displaySuccessMessage: true,
+ successMessageText : celMessages.confirmedAjaxRequest.notificationDone,
+ displayFailureMessage: true,
+ failureMessageText : celMessages.confirmedAjaxRequest.notificationFailed
+ }, interactionParameters || {})
+ );
+ } else {
+ console.warn('celExecOnceAfterMessagesLoaded not available!');
+ }
this.requestUrl = requestUrl;
this.ajaxRequestParameters = Object.extend(Object.clone(this.defaultAjaxRequestParameters), ajaxRequestParameters || {});
Object.extend(this.ajaxRequestParameters, {
diff --git a/src/main/webapp/resources/uicomponents/widgets/fullScreen.css b/src/main/webapp/resources/uicomponents/widgets/fullScreen.css
deleted file mode 100644
index 972c46b9b..000000000
--- a/src/main/webapp/resources/uicomponents/widgets/fullScreen.css
+++ /dev/null
@@ -1,89 +0,0 @@
-#template('colorThemeInit.vm')
-.fullScreenEditButton {
- cursor: ne-resize !important;
-}
-.fullScreenEditLinkContainer {
- text-transform: lowercase;
- font-size: 80%;
- color: $theme.linkColor;
- cursor: pointer;
- display: block;
- margin-top: -1.4em;
- text-align: right;
-}
-
-/* Matches the style of the new object editor */
-#xwikiobjects .fullScreenEditLinkContainer, #xwikiclassproperties .fullScreenEditLinkContainer {
- margin-right: 10%;
-}
-
-.fullScreenWrapper .fullScreenEditLinkContainer {
- display: none;
-}
-.fullScreenCloseButton {
- cursor: sw-resize !important;
-}
-.leftmenu2 .fullScreenEditButton, .leftmenu2 .fullScreenCloseButton {
- margin: 2px;
- float: right;
-}
-.mceToolbar .fullScreenEditButton, .mceToolbar .fullScreenCloseButton {
- padding: 2px;
- width: 16px;
- height: 16px;
-}
-.gwt-MenuBar .fullScreenEditButton, .gwt-MenuBar .fullScreenCloseButton {
- float: right;
- margin: 5px;
-}
-
-#body .fullScreenWrapper {
- z-index: 5;
- position: fixed !important;
- left: 0;
- top: 0px;
- right: 0;
- bottom: 0;
- width: 100%;
- height: 100%;
- padding: 0 !important;
- margin: 0 !important;
- background-color: $theme.pageContentBackgroundColor;
-}
-
-/* Comment this to make the version comment and minor edit checkbox visible in full screen */
-.fullScreenWrapper .metamodifs {
- display: none !important;
-}
-
-.fullScreenWrapper .mceEditorContainer {
- height: auto !important;
-}
-.fullScreenWrapper table.mceEditor {
- height: auto !important;
- margin: 0 !important;
- border: none !important;
-}
-* html .fullScreenWrapper {
- position: absolute !important;
-}
-/* Make sure gwt popup menus are visible in full screen: */
-.gwt-MenuBarPopup {
- z-index: 12;
-}
-/* This overrides the pre behavior when the buttons end up as children of such a field */
-#body .fullScreenWrapper {
- white-space: normal;
-}
-/* This overrides a rule for the Object Editor that is supposed to resize text inputs. */
-#body .fullScreenWrapper .buttons .buttonwrapper input {
- width: auto;
-}
-#xwikiobjects .fullScreenWrapper textarea:focus, #xwikiclassproperties .fullScreenWrapper textarea:focus {
- background-color: $theme.pageContentBackgroundColor;
-}
-.fullScreenWrapper textarea {
- margin: 0 !important;
- padding: 0 2px !important;
- border: 0 none !important;
-}
\ No newline at end of file
diff --git a/src/main/webapp/resources/uicomponents/widgets/fullScreen.js b/src/main/webapp/resources/uicomponents/widgets/fullScreen.js
deleted file mode 100644
index f973e2cc8..000000000
--- a/src/main/webapp/resources/uicomponents/widgets/fullScreen.js
+++ /dev/null
@@ -1,497 +0,0 @@
-// ======================================
-// Full screen editing for page content
-//
-// Make sure the XWiki 'namespace' exists.
-if (typeof(XWiki) == 'undefined') {
- XWiki = new Object();
-}
-// Make sure the editors 'namespace' exists.
-if (typeof(XWiki.widgets) == 'undefined') {
- XWiki.widgets = new Object();
-}
-
-/**
- * Full screen editing for textareas or maximizable elements.
- *
- * TODO Revisit once the new WYSIWYG supports inline editing.
- */
-XWiki.widgets.FullScreen = Class.create({
- // Some layout settings, to be customized for other skins
- /** Maximized element margins */
- margin : 0,
- /** Full screen activator / deactivator button size */
- buttonSize : 16,
- /**
- * Full screen control initialization
- * Identifies the elements that must be visible in full screen: the textarea or the rich text editor, along with their
- * toolbar and the form buttons.
- * Creates two buttons for closing the fullscreen: one (image) to insert in the toolbar, and one (plain form button)
- * to add next to the form's action buttons.
- * Finally, the textareas and rich text editors in the form are equipped with their own fullscreen activators,
- * inserted in the corresponding toolbar, if there is any, or simply next to the textarea in the document
- * (see the {@link #addBehavior} function),
- */
- initialize : function() {
- // The action buttons need to be visible in full screen
- this.buttons = $(document.body).down(".bottombuttons");
- // If there are no buttons, at least the Exit FS button should be visible, so create an empty button container
- if (!this.buttons) {
- this.buttons = new Element("div", {"class" : "bottombuttons"}).update(new Element("div", {"class" : "buttons"}));
- this.buttons._x_isCustom = true;
- // It doesn't matter where the container is, it will only be needed in fullScreen.
- document.body.appendChild(this.buttons.hide());
- }
- // When the full screen is activated, the buttons will be brought in the fullscreen, thus removed from their parent
- // element, where they are replaced by a placeholder, so that we know exactly where to put them back.
- this.buttonsPlaceholder = new Element("span");
- // Placeholder for the toolbar, see above.
- this.toolbarPlaceholder = new Element("span");
- // The controls that will close the fullscreen
- this.createCloseButtons();
- // Prepare textareas / maximizable elements for full screen editing
- $$('textarea', '.maximizable').each(function(element) {
- this.addBehavior(element);
- }.bind(this));
- // The GWT editor removes the textarea from the document, thus should be treated separately
- $$('.xRichTextEditor').each(function(item) {
- this.addBehavior(item);
- }.bind(this));
- // WYSIWYGR sends events when a new editor is created.
- this.addWysiwyg20Listener();
- // When comming back from preview, check if the user was in full screen before hitting preview, and if so restore
- // that full screen
- this.maximizedReference = $(document.body).down("input[name='x-maximized']");
- if (this.maximizedReference && this.maximizedReference.value != "") {
- var matches = $$(this.maximizedReference.value);
- if (matches && matches.length > 0) {
- this.makeFullScreen(matches[0]);
- }
- }
- },
- /** According to the type of each element being maximized, a button in created and attached to it. */
- addBehavior : function (item) {
- if (this.isWysiwyg20Content(item)) {
- this.addWysiwyg20ContentButton(item);
- } else if (this.isWysiwyg10Content(item)) {
- this.addWysiwyg10ContentButton(item);
- } else if (this.isWikiContent(item)) {
- this.addWikiContentButton(item);
- } else if (this.isWysiwyg20Field(item)) {
- this.addWysiwyg20FieldButton(item);
- } else if (this.isWikiField(item)) {
- this.addWikiFieldButton(item);
- } else if (this.isWysiwyg10Field(item)) {
- this.addWysiwyg10FieldButton(item);
- } else {
- // a div element with class maximazable
- this.addElementButton(item);
- }
- },
- addWysiwyg20Listener : function () {
- document.observe('xwiki:wysiwyg:created', this.wysiwyg20Created.bindAsEventListener(this));
- },
- wysiwyg20Created : function(event) {
- var item = $(event.memo.instance.getRichTextArea()).up(".xRichTextEditor");
- this.addBehavior(item);
- // Remove the old maximize link inserted for the plain textarea before the WYSIWYG was loaded
- while (true) {
- item = item.up();
- if (!item) {
- return;
- } else if (item.previous(".fullScreenEditLinkContainer")) {
- item.previous(".fullScreenEditLinkContainer").remove();
- return;
- }
- }
- },
- // Some simple functions that help deciding what kind of editor is the target element
- isWikiContent : function (textarea) {
- // If the textarea is not visible, then the WYSIWYG editor is active.
- return textarea.name == 'content' && textarea.visible();
- },
- isWysiwyg10Content : function (textarea) {
- // If the textarea is not visible, then the WYSIWYG editor is active.
- // In IE, the WYSIWYG is placed before its textarea.
- return textarea.name == 'content' && (Prototype.Browser.IE ? textarea.previous(".mceEditorContainer") : textarea.next(".mceEditorContainer"));
- },
- isWysiwyg20Content : function (item) {
- return item.hasClassName("xRichTextEditor") && item.up("div[id^=content_container]");
- },
- isWikiField : function (textarea) {
- // If the textarea is not visible, then the WYSIWYG editor is active.
- return textarea.visible();
- },
- isWysiwyg10Field : function (textarea) {
- return !textarea.visible() && textarea.name != 'content' && (Prototype.Browser.IE ? textarea.previous(".mceEditorContainer") : textarea.next(".mceEditorContainer"));
- },
- isWysiwyg20Field : function (item) {
- return item.hasClassName("xRichTextEditor") && !item.up("div[id^=content_container]");
- },
- /** Adds the fullscreen button in the Wiki editor toolbar. */
- addWikiContentButton : function (textarea) {
- textarea._toolbar = $(document.body).down(".leftmenu2");
- // Normally there should be a simple toolbar with basic actions
- if (textarea._toolbar) {
- textarea._toolbar.insert({top: this.createOpenButton(textarea)});
- } else {
- this.addWikiFieldButton(textarea);
- }
- },
- /** Adds the fullscreen button in the TinyMCE WYSIWYG editor toolbar. */
- addWysiwyg10ContentButton : function (item) {
- var container = (Prototype.Browser.IE ? item.previous(".mceEditorContainer") : item.next(".mceEditorContainer"));
- if (!container) {
- return false;
- }
- var toolbar = container.down(".mceToolbar");
- if (!toolbar) {
- return false;
- }
- // Create a tinymce-like internal toolbar to contain the fullscreen button
- var newToolbar = new Element('span', {'class': 'mce_editor_fullscreentoolbar'});
- var link = new Element('a', {'class' : 'mceButtonNormal'});
- // Separator
- newToolbar.insert(new Element('img', {
- 'class': 'mceSeparatorLine',
- height: 15,
- width: 1,
- src: toolbar.down('img.mceSeparatorLine').src
- }));
- newToolbar.insert(link.insert(this.createOpenButton(container)));
- toolbar.insert(newToolbar);
- container._toolbar = toolbar;
- return true;
- },
- /** Adds the fullscreen button in the GWT WYSIWYGR editor menu. */
- addWysiwyg20ContentButton : function (item) {
- var toolbar = item.down(".gwt-MenuBar");
- // Sometimes the toolbar isn't loaded when this method executes (in IE). Schedule a periodical reatempt.
- if (!toolbar) {
- // Only schedule once
- if (!item._x_fullScreenLoader) {
- item._x_fullScreenLoader_iterations = 0;
- item._x_fullScreenLoader = new PeriodicalExecuter(function(item) {
- // Give up after 20 seconds
- if (item._x_fullScreenLoader_iteration > 100) {
- item._x_fullScreenLoader.stop();
- item._x_fullScreenLoader = false;
- return;
- }
- item._x_fullScreenLoader_iteration++;
- this.addWysiwyg20ContentButton(item);
- }.bind(this, item), 0.2);
- }
- return false;
- }
- toolbar.insert({"top" : this.createOpenButton(item)});
- item._toolbar = toolbar;
- if (item._x_fullScreenLoader) {
- item._x_fullScreenLoader.stop();
- item._x_fullScreenLoader = false;
- }
- return true;
- },
- addElementButton: function(element) {
- Element.insert(element, {before: this.createOpenLink(element)});
- },
- addWikiFieldButton : function (textarea) {
- Element.insert(textarea, {before: this.createOpenLink(textarea)});
- },
- addWysiwyg10FieldButton : function (textarea) {
- this.addWysiwyg10ContentButton(textarea);
- },
- addWysiwyg20FieldButton : function (textarea) {
- this.addWysiwyg20ContentButton(textarea);
- },
- /** Creates a full screen activator button for the given element. */
- createOpenButton : function (targetElement) {
- // Create HTML element
- var fullScreenActivator = new Element('img', {
- 'class': 'fullScreenEditButton',
- title: "$msg.get('core.editors.fullscreen.editFullScreen')",
- alt: "$msg.get('core.editors.fullscreen.editFullScreen')",
- src: "$xwiki.getSkinFile('icons/silk/arrow_out.gif')"
- });
- // Add functionality
- fullScreenActivator.observe('click', this.makeFullScreen.bind(this, targetElement));
- fullScreenActivator.observe('mousedown', this.preventDrag.bindAsEventListener(this));
- // Remember the button associated with each maximizable element
- targetElement._x_fullScreenActivator = fullScreenActivator;
- fullScreenActivator._x_maximizedElement = targetElement;
- return fullScreenActivator;
- },
- createOpenLink : function (targetElement) {
- // Create HTML element
- var fullScreenActivatorContainer = new Element('div', {
- 'class': 'fullScreenEditLinkContainer'
- });
- var fullScreenActivator = new Element('a', {
- 'class': 'fullScreenEditLink',
- title: "$msg.get('core.editors.fullscreen.editFullScreen')"
- });
- fullScreenActivator.update("${msg.get('core.editors.fullscreen.editFullScreen')} »")
- // Add functionality
- fullScreenActivator.observe('click', this.makeFullScreen.bind(this, targetElement));
- // Add it to the container
- fullScreenActivatorContainer.update(fullScreenActivator);
- // Remember the button associated with each maximizable element
- targetElement._x_fullScreenActivator = fullScreenActivator;
- fullScreenActivator._x_maximizedElement = targetElement;
- return fullScreenActivatorContainer;
- },
- /**
- * Creates the full screen close buttons (which are generic, not attached to the maximized elements like the activators)
- */
- createCloseButtons : function () {
- // Toolbar image button
- // Create HTML element
- this.closeButton = new Element('img', {
- 'class': 'fullScreenCloseButton',
- title: "$msg.get('core.editors.fullscreen.exitFullScreen')",
- alt: "$msg.get('core.editors.fullscreen.exitFullScreen')",
- src: "$xwiki.getSkinFile('icons/silk/arrow_in.gif')"
- });
- // Add functionality
- this.closeButton.observe('click', this.closeFullScreen.bind(this));
- this.closeButton.observe('mousedown', this.preventDrag.bindAsEventListener(this));
- // Hide by default
- this.closeButton.hide();
-
- // Edit actions button
- // Create HTML element
- this.actionCloseButton = new Element('input', {
- "type" : "button",
- 'class': 'button',
- value: "$msg.get('core.editors.fullscreen.exitFullScreen')"
- });
- this.actionCloseButtonWrapper = new Element('span', {
- 'class': 'buttonwrapper'
- });
- this.actionCloseButtonWrapper.update(this.actionCloseButton);
- // Add functionality
- this.actionCloseButton.observe('click', this.closeFullScreen.bind(this));
- // Hide by default
- this.actionCloseButtonWrapper.hide();
- // Add it in the action bar
- this.buttons.down(".buttons").insert({top: this.actionCloseButtonWrapper});
- },
-
- /**
- * How this works:
- * - All the elements between the targetElement and the root element are maximized, and all the other nodes are hidden
- * - The parent element becomes a wrapper around the targetElement
- * - Move the toolbar (if it exists) and the action buttons in the wrapper
- * - Hide the overflows of the body element, so that a scrollbar doesn't appear
- * - All the initial styles of the altered elements are remembered, so that they can be restored when exiting fullscreen
- */
- makeFullScreen : function (targetElement) {
- // Store the selector of the target element in the form, in the hidden input called 'x-maximized'.
- // This is needed so that the full screen can be reactivated when comming back from preview, if it was activate before
- // the user hit the preview button.
- if (this.maximizedReference) {
- if (targetElement.id) {
- // Using #ID fails since the IDs for the textareas in inline editing contain the '.' character, which marks a classname
- this.maximizedReference.value = targetElement.tagName + "[id='" + targetElement.id + "']";
- } else if (targetElement.name) {
- this.maximizedReference.value = targetElement.tagName + "[name='" + targetElement.name + "']" ;
- } else if (targetElement.className) {
- // No id, no name. This must be the GWT editor...
- this.maximizedReference.value = targetElement.tagName + "." + targetElement.className ;
- }
- }
- // Remember the maximized element
- this.maximized = targetElement;
- // Remember the original dimensions of the maximized element
- targetElement._originalStyle = {
- 'width' : targetElement.style['width'],
- 'height' : targetElement.style['height']
- };
- if (targetElement.hasClassName("xRichTextEditor")) {
- var iframe = targetElement.down(".gwt-RichTextArea");
- iframe._originalStyle = {
- 'width' : iframe.style['width'],
- 'height' : iframe.style['height']
- };
- } else if (targetElement.hasClassName("mceEditorContainer")) {
- var iframe = targetElement.down(".mceEditorIframe");
- iframe._originalStyle = {
- 'width' : iframe.style['width'],
- 'height' : iframe.style['height']
- };
- var tframe = targetElement.down(".mceEditorSource");
- tframe._originalStyle = {
- 'width' : tframe.style['width'],
- 'height' : tframe.style['height']
- };
- }
- // All the elements between the targetElement and the root element are set to position: static, so that the offset
- // parent of the targetElement will be the window. Remember the previous settings in order to be able to restore the
- // layout when exiting fullscreen.
- var wrapper = targetElement.up();
- wrapper.addClassName("fullScreenWrapper");
- if(targetElement._toolbar) {
- // The wiki editor has the toolbar outside the textarea element, unlike the other editors, which have it as a descendant
- if (targetElement._toolbar.hasClassName("leftmenu2")) {
- wrapper.insert({"top" : targetElement._toolbar.replace(this.toolbarPlaceholder)});
- }
- // Replace the Maximize button in the toolbar with the Restore one
- targetElement._x_fullScreenActivator.replace(this.closeButton);
- }
- wrapper.insert(this.buttons.replace(this.buttonsPlaceholder).show());
- var parent = targetElement.up();
- targetElement._x_fullScreenActivator.hide();
- while (parent != document.body) {
- parent._originalStyle = {
- 'overflow' : parent.style['overflow'],
- 'position' : parent.style['position'],
- 'width' : parent.style['width'],
- 'height' : parent.style['height'],
- 'left' : parent.style['left'],
- 'right' : parent.style['right'],
- 'top' : parent.style['top'],
- 'bottom' : parent.style['bottom'],
- 'padding' : parent.style['padding'],
- 'margin' : parent.style['margin']
- };
- parent.setStyle({'overflow': "visible", 'position': "absolute", width: "100%", height: "100%", left: 0, top:0, right:0, bottom: 0, padding: 0, margin: 0});
- parent.siblings().each(function(item) {
- item._originalDisplay = item.style['display'];
- item.setStyle({display: "none"});
- });
- parent = parent.up();
- }
- document.body._originalStyle = {
- 'overflow' : parent.style['overflow'],
- 'width' : parent.style['width'],
- 'height' : parent.style['height']
- };
- var root = $(document.body).up();
- root._originalStyle = {
- 'overflow' : root.style['overflow'],
- 'width' : root.style['width'],
- 'height' : root.style['height']
- };
- $(document.body).setStyle({'overflow': 'hidden', 'width': '100%', 'height': '100%'});
- root.setStyle({'overflow': "hidden", 'width': "100%", 'height': "100%"});
-
- // Make sure to resize the targetElement when the window dimensions are changed. Both document and window are monitored,
- // since different browsers send events to different elements.
- this.resizeListener = this.resizeTextArea.bind(this, targetElement);
- Event.observe(window, 'resize', this.resizeListener);
- // Show the exit buttons
- this.closeButton.show();
- this.actionCloseButtonWrapper.show();
- // Maximize the targetElement
- this.resizeTextArea(targetElement);
- // IE6 has yet another bug, if we don't call this, then sometimes the toolbar will be invisible. Don't ask why.
- if (targetElement._toolbar) {
- targetElement._toolbar.viewportOffset();
- }
- document.fire("xwiki:fullscreen:entered", { "target" : targetElement });
- },
- /** Restore the layout. */
- closeFullScreen : function() {
- var targetElement = this.maximized;
- // Hide the exit buttons
- this.closeButton.hide();
- this.actionCloseButtonWrapper.hide();
- // We're no longer interested in resize events
- Event.stopObserving(window, 'resize', this.resizeListener);
- // Restore the parent element (the wrapper)
- targetElement.up().removeClassName("fullScreenWrapper");
- // Restore the WYSIWYGs
- if (targetElement.hasClassName("xRichTextEditor")) {
- var iframe = targetElement.down(".gwt-RichTextArea");
- iframe.setStyle(iframe._originalStyle);
- } else if (targetElement.hasClassName("mceEditorContainer")) {
- var iframe = targetElement.down(".mceEditorIframe");
- iframe.setStyle(iframe._originalStyle);
- var tframe = targetElement.down(".mceEditorSource");
- tframe.setStyle(tframe._originalStyle);
- }
-
- // Restore the previous layout
- // NOTE: We restore the previous layout in reverse order (from the document body down to the target element) to
- // overcome a IE7 bug (see http://jira.xwiki.org/jira/browse/XWIKI-4346 ).
- var parent = targetElement.up();
- var parents = [];
- while (parent != document.body) {
- parents.push(parent);
- parent = parent.up();
- }
- var i = parents.length;
- while (i--) {
- parent = parents[i];
- parent.setStyle(parent._originalStyle);
- parent.siblings().each(function(item) {
- item.style['display'] = item._originalDisplay;
- });
- }
- document.body.setStyle(document.body._originalStyle);
- $(document.body).up().setStyle($(document.body).up()._originalStyle);
- // Restore the toolbar and action buttons to their initial position
- this.buttonsPlaceholder.replace(this.buttons);
- if (this.buttons._x_isCustom) {
- this.buttons.hide();
- }
- if (targetElement._toolbar) {
- if (targetElement._toolbar.hasClassName("leftmenu2")) {
- this.toolbarPlaceholder.replace(targetElement._toolbar);
- }
- // Replace the Restore button in the toolbar with the Maximize one
- this.closeButton.replace(targetElement._x_fullScreenActivator);
- }
- if (Prototype.Browser.IE) {
- // IE crashes if we try to resize this without a bit of delay.
- setTimeout(function() {
- targetElement._x_fullScreenActivator.show();
- this.setStyle(this._originalStyle);
- }.bind(targetElement), 500);
- } else {
- targetElement._x_fullScreenActivator.show();
- targetElement.setStyle(targetElement._originalStyle);
- }
- // No element is maximized anymore
- delete this.maximized;
- if (this.maximizedReference) {
- this.maximizedReference.value = '';
- }
- document.fire("xwiki:fullscreen:exited", { "target" : targetElement });
- },
- /** In full screen, when the containers's dimensions change, the maximized element must be resized accordingly. */
- resizeTextArea : function(targetElement) {
- if (!this.maximized) {
- return;
- }
- // Compute the maximum space available for the textarea:
- var newHeight = document.viewport.getHeight();
- var newWidth = document.viewport.getWidth();
- // Prototype fails to return the right viewport in IE6. This works:
- if(newWidth <= 0) {
- newWidth = document.body.clientWidth;
- newHeight = document.body.clientHeight;
- }
- // Window width - styling padding
- newWidth = newWidth - this.margin;
- // Window height - margin (for the toolbar) - styling padding - buttons
- newHeight = newHeight - targetElement.positionedOffset().top - this.margin - this.buttons.getHeight();
- targetElement.setStyle({'width' : newWidth + 'px', 'height' : newHeight + 'px'});
- // Resize the WYSIWYGs
- if (targetElement.hasClassName("xRichTextEditor")) {
- targetElement.down(".gwt-RichTextArea").setStyle({'width' : newWidth + 'px', 'height' : newHeight - targetElement.down(".xToolbar").getHeight() - targetElement.down(".gwt-MenuBar").getHeight() + 'px'});
- } else if (targetElement.hasClassName("mceEditorContainer")) {
- targetElement.down(".mceEditorIframe").setStyle({'width' : newWidth + 'px', 'height' : newHeight - targetElement._toolbar.getHeight() + 'px'});
- targetElement.down(".mceEditorSource").setStyle({'width' : newWidth + 'px', 'height' : newHeight - targetElement._toolbar.getHeight() + 'px'});
- }
- document.fire("xwiki:fullscreen:resized", { "target" : targetElement });
- },
- /** onMouseDown handler that prevents dragging the button. */
- preventDrag : function(event) {
- event.stop();
- }
-});
-
-// Create the fullscreen behavior on startup.
-document.observe('xwiki:dom:loaded', function() {
- new XWiki.widgets.FullScreen();
-});
diff --git a/src/main/webapp/resources/uicomponents/widgets/list/xlist.js b/src/main/webapp/resources/uicomponents/widgets/list/xlist.js
index 999507c7c..6d4faaf0d 100644
--- a/src/main/webapp/resources/uicomponents/widgets/list/xlist.js
+++ b/src/main/webapp/resources/uicomponents/widgets/list/xlist.js
@@ -10,7 +10,7 @@
* ],
* { // options
* numbered: false,
- * icon: "$xwiki.getSkinFile('icons/silk/sport_basketball.gif')",
+ * icon: "pathToIcon",
* classes : "myListExtraClass",
* itemClasses : "myListItemExtraClasses",
* eventListeners : {
@@ -25,7 +25,7 @@
*
* xlist.addItem(
* new XWiki.widgets.XListItem('A fifth element added later', {
- * icon : "$xwiki.getSkinFile('icons/silk/bomb.gif')", // this overrides the one defined for the whole list
+ * icon : "pathToIcon", // this overrides the one defined for the whole list
* eventListeners: {
* // Event listeners defined just for this specific list item
* 'mouseout' : function() { console.log('just this list item is bound to this event', this); }
diff --git a/src/main/webapp/resources/uicomponents/widgets/notification.css b/src/main/webapp/resources/uicomponents/widgets/notification.css
index 73f47f24a..e582cedbb 100644
--- a/src/main/webapp/resources/uicomponents/widgets/notification.css
+++ b/src/main/webapp/resources/uicomponents/widgets/notification.css
@@ -20,36 +20,30 @@
font-weight: bold;
line-height: 20px;
}
-
-#set($notificationCustommization = [])
-## each element: [notification type, bg color, text color, icon]
-#set($discard = $notificationCustommization.add(["info", "#268", "#fff"]))
-#set($discard = $notificationCustommization.add(["warning", "#fd8", "#330"]))
-#set($discard = $notificationCustommization.add(["error", "#a00", "#fff"]))
-#set($discard = $notificationCustommization.add(["inprogress", "#333", "#fff", "icons/xwiki/spinner-white.gif"]))
-#set($discard = $notificationCustommization.add(["done", "#160", "#fff"]))
-##
-#foreach($item in $notificationCustommization)
- #set($notificationType = ${item.get(0)})
- #set($bgColor = ${item.get(1)})
- #set($textColor = ${item.get(2)})
- #set($imgUrl = '')
- #if ($item.size() >= 4)
- #set($imgName = "$!{item.get(3)}")
- #if($imgName.indexOf("/") >= 0)
- #set($imgUrl = $xwiki.getSkinFile($imgName, true))
- #else
- #set($imgUrl = $xwiki.getSkinFile("icons/silk/${imgName}.gif", true))
- #end
- #end
-/** $notificationType */
-.xnotification-${notificationType} {
- background-color: $bgColor;
- color: $textColor;
- border-color: $textColor;
-#if($imgUrl != '')
- background-image: url(${imgUrl});
+.xnotification-info {
+ background-color: #268;
+ color: #fff;
+ border-color: #fff;
+}
+.xnotification-warning {
+ background-color: #fd8;
+ color: #330;
+ border-color: #330;
+}
+.xnotification-error {
+ background-color: #a00;
+ color: #fff;
+ border-color: #fff;
+}
+.xnotification-inprogress {
+ background-color: #333;
+ color: #fff;
+ border-color: #fff;
+ background-image: url(/skin/resources/icons/xwiki/spinner%2Dwhite.gif);
padding-left: 22px;
-#end
}
-#end
+.xnotification-done {
+ background-color: #160;
+ color: #fff;
+ border-color: #fff;
+}
diff --git a/src/main/webapp/skins/albatross/screenlayout.css b/src/main/webapp/skins/albatross/screenlayout.css
index 884667706..d4100adc1 100644
--- a/src/main/webapp/skins/albatross/screenlayout.css
+++ b/src/main/webapp/skins/albatross/screenlayout.css
@@ -1,5 +1,5 @@
-@import url(google-fonts/Terminal-Dosis/Terminal-Dosis-200,300,400,500,600,700,800.css);
-@import url(google-fonts/Open-Sans/Open-Sans-300italic,400italic,600italic,700italic,800italic,300,400,600,700,800.css);
+@import url(/file/resources/celRes/google-fonts/Terminal-Dosis/Terminal-Dosis-200,300,400,500,600,700,800.css);
+@import url(/file/resources/celRes/google-fonts/Open-Sans/Open-Sans-300italic,400italic,600italic,700italic,800italic,300,400,600,700,800.css);
/**
General layout of the page
@@ -7,46 +7,61 @@ for @media screen displays
**/
-body#body{
+body#body {
width: 100%;
padding: 0;
- margin: 0 ; /* padding et margin nul pour emulation min width*/
+ margin: 0;
+ /* padding et margin nul pour emulation min width*/
min-width: 760px;
}
-#xwikimaincontainer{
+#xwikimaincontainer {
margin: 0px 40px;
text-align: center;
margin-bottom: 40px;
}
-html > body .minwidth, html > body .minwidthb, html > body .minwidthc{
+html>body .minwidth,
+html>body .minwidthb,
+html>body .minwidthc {
display: none;
}
-.minwidth, .minwidthb, .minwidthc{
+
+.minwidth,
+.minwidthb,
+.minwidthc {
width: 720px;
height: 0px;
}
-* html .minwidth, * html .minwidthb, * html .minwidthc{
+
+* html .minwidth,
+* html .minwidthb,
+* html .minwidthc {
height: 1px !important;
overflow: hidden;
}
-.minwidthb{
+
+.minwidthb {
width: 520px;
}
-.minwidthc{
+
+.minwidthc {
width: 438px;
}
-.layoutsection{
+
+.layoutsection {
clear: both;
}
-#xwikimaincontainerinner{
+
+#xwikimaincontainerinner {
text-align: left;
}
-#contentcontainer{
+
+#contentcontainer {
z-index: 1;
}
-#xwikieditor{
+
+#xwikieditor {
border-right: 310px solid;
z-index: 1;
}
@@ -63,13 +78,14 @@ Global header
---------------------------------------
*/
-#headerglobal{
+#headerglobal {
display: block;
height: 8em;
min-height: 100px;
- border-right:200px solid ;
+ border-right: 200px solid;
z-index: 1;
}
+
#globallinks {
position: relative;
float: left;
@@ -79,10 +95,11 @@ Global header
margin-right: -200px;
}
-.editbody #headerglobal{
- border-right:310px solid ;
+.editbody #headerglobal {
+ border-right: 310px solid;
}
-.editbody #globallinks{
+
+.editbody #globallinks {
width: 310px;
margin-right: -310px;
}
@@ -93,21 +110,24 @@ Global header
font-size: 115%;
line-height: 1em;
}
+
#globalmenu .glink {
display: block;
text-decoration: none;
font-size: 0.8em;
font-weight: bold;
}
-#globalmenu #headerlanguages a{
+
+#globalmenu #headerlanguages a {
text-transform: capitalize;
}
+
#globalmenu span {
display: none;
}
-#company{
+#company {
height: 8em;
float: left;
width: 100%;
@@ -123,46 +143,30 @@ Global header
}
#globaldoctitle {
- display: none; /*pour éviter pb dans IE -- a regler*/
+ display: none;
+ /*pour éviter pb dans IE -- a regler*/
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/*
---------------------------------------
Space header, footer
---------------------------------------
*/
-#headerspace, #footerglobal {
+#headerspace,
+#footerglobal {
height: 1.5em;
}
+
#footerglobal {
padding: 1em 0px;
text-align: center;
}
-#headerspace hr, #footerglobal hr{
+#headerspace hr,
+#footerglobal hr {
display: none;
}
+
#breadcrumbs {
padding-left: 40px;
display: inline-block;
@@ -175,9 +179,12 @@ Space header, footer
vertical-align: middle;
float: left;
}
-#headerspace:target #breadcrumbs, #headerspace:target .edit-meta-tools {
+
+#headerspace:target #breadcrumbs,
+#headerspace:target .edit-meta-tools {
display: none;
}
+
.edit-meta-tools a {
display: block;
width: 16px;
@@ -187,11 +194,13 @@ Space header, footer
background: transparent none left top no-repeat;
margin-left: 4px;
}
+
.edit-meta-tools a.edit-parent {
- background-image: url("$xwiki.getSkinFile('icons/xwiki/parent_edit.gif')");
+ background-image: url(/skin/resources/icons/xwiki/parent_edit.gif);
}
+
.edit-meta-tools a.hide-edit-parent {
- background-image: url("$xwiki.getSkinFile('icons/silk/chart_organisation.gif')");
+ background-image: url(/skin/resources/icons/silk/chart_organisation.gif);
}
/* Parent editing area */
@@ -201,38 +210,47 @@ Space header, footer
font-size: 90%;
vertical-align: baseline;
}
+
#headerspace #parentinput * {
vertical-align: baseline;
}
+
/* Don't combine the following two rules, otherwise IE will fail to recognize either of them */
#headerspace:target #parentinput {
display: inline-block;
}
+
#headerspace #parentinput.active {
display: inline-block;
}
-#footerglobal, #headerspace {
- clear:both;
+#footerglobal,
+#headerspace {
+ clear: both;
}
+
#xwikilicence {
float: right;
clear: right;
margin-right: 5px;
}
+
#xwikidocinfo {
width: 100%;
}
+
#celementsplatformversion {
float: left;
margin-left: 5px;
}
+
/*
---------------------------------------
Content
---------------------------------------
*/
-#contentcontainerinner, #xwikieditorinner {
+#contentcontainerinner,
+#xwikieditorinner {
width: 100%;
background-color: #FFF;
}
@@ -241,47 +259,54 @@ Content
float: right;
padding: 0px;
}
+
* html #contentcolumn {
width: auto;
}
+
.main {
padding: 20px 40px 20px 40px;
}
-.leftsidecolumns{
+
+.leftsidecolumns {
float: left;
width: 100%;
}
-.content{
+
+.content {
border-right: 200px solid;
border-left: 200px solid;
}
-.contenthideleft{
- border-right: 200px solid ;
- border-left: 0px solid ;
+
+.contenthideleft {
+ border-right: 200px solid;
+ border-left: 0px solid;
}
-.contenthideright{
- border-right: 0px solid ;
+
+.contenthideright {
+ border-right: 0px solid;
border-left: 200px solid;
}
-#contentcontainer.contenthidelefthideright{
- border-right: 0px solid ;
- border-left: 0px solid ;
+
+#contentcontainer.contenthidelefthideright {
+ border-right: 0px solid;
+ border-left: 0px solid;
}
-#editcolumn{
+#editcolumn {
width: 100%;
float: left;
overflow: hidden;
padding-bottom: 20px;
}
-#actionmenu{}
#xwikieditcontent textarea#content {
width: 100%;
}
-.layoutsubsection{}
-.layoutsubsection.about{
+.layoutsubsection {}
+
+.layoutsubsection.about {
border: none;
text-align: right;
font-style: italic;
@@ -290,10 +315,10 @@ Content
}
.about {
- float:right;
- text-align:right;
- width:230px;
- overflow:hidden;
+ float: right;
+ text-align: right;
+ width: 230px;
+ overflow: hidden;
height: 30px;
line-height: 15px;
}
@@ -303,13 +328,14 @@ Content
Zone for Comments, attachments, History...
---------------------------------------
*/
-#xwikidata{
+#xwikidata {
padding: 0px;
border: none;
}
-.xwikiintratitle{
-}
-.xwikiintracontent{
+
+.xwikiintratitle {}
+
+.xwikiintracontent {
margin: 0px;
}
@@ -318,7 +344,7 @@ Zone for Comments, attachments, History...
"Message Boxes"
---------------------------------------------
*/
-fieldset.xwikimessage{
+fieldset.xwikimessage {
display: block;
float: none;
width: 480px;
@@ -327,7 +353,8 @@ fieldset.xwikimessage{
border-top: 8px solid #BBB;
padding: 0px 8px 16px;
}
-html > body fieldset.xwikimessage{
+
+html>body fieldset.xwikimessage {
padding-top: 8px;
}
@@ -337,54 +364,65 @@ fieldset.xwikimessage legend {
padding: 2px 8px;
margin: 0px;
}
-fieldset.xwikimessage .xwikimessage{
+
+fieldset.xwikimessage .xwikimessage {
text-align: center;
font-weight: bold;
font-size: 110%;
}
+
fieldset.xwikimessage .buttons {
text-align: center;
}
+
fieldset.xwikimessage .buttons a {
text-decoration: none;
margin: 8px;
}
-.button{
+.button {
font-family: Helvetica, sans-serif;
font-weight: bold;
text-align: center;
}
-.topbuttons{
+
+.topbuttons {
margin-bottom: 5px;
}
-.bottombuttons{
+
+.bottombuttons {
margin-top: 5px;
}
+
/*
----------------------------------------------
Comments
----------------------------------------------
*/
-.xwikicomment {
-}
+.xwikicomment {}
-#xwikidata #commentscontent{
+#xwikidata #commentscontent {
background: #E5F0FE url("icons/black-bg-comments-left.png") left top no-repeat;
}
-#comments, #attachments {
+
+#comments,
+#attachments {
padding: 0px 20px;
}
-#xwikidata .xwikititlewrapper{
+
+#xwikidata .xwikititlewrapper {
cursor: pointer;
}
-#xwikidata #commentscontent .xwikititlewrapper{
+
+#xwikidata #commentscontent .xwikititlewrapper {
background: transparent url("icons/black-bg-comments-right.png") right top no-repeat;
}
-#xwikidata #attw{
+
+#xwikidata #attw {
background: transparent url("icons/black-bg-attach-right.png") right bottom no-repeat;
}
-.xwikiintratitle{
+
+.xwikiintratitle {
background: transparent url("icons/black-content-more.png") right center no-repeat;
font-size: 160%;
font-weight: 400;
@@ -392,115 +430,140 @@ Comments
margin: 0px 24px;
padding: 16px 0px 16px;
}
-.exp .xwikiintratitle{
+
+.exp .xwikiintratitle {
background: transparent url("icons/black-content-less.png") right center no-repeat;
}
+
#xwikidata #attachmentscontent {
background: url("icons/black-bg-attach-left.png") left bottom no-repeat;
}
-#attachmentscontent table{
+
+#attachmentscontent table {
border: none;
}
-.mime{
+
+.mime {
text-align: center;
}
-.xwikicomment{
+
+.xwikicomment {
padding: 10px 24px;
position: relative;
overflow: hidden;
}
-.commentspacer{
+
+.commentspacer {
display: none;
}
-#comments .odd{
+
+#comments .odd {
background-color: #FFF;
}
-#comments .even{
+
+#comments .even {
background-color: #E5F0FE;
}
-.commentavatar{
+.commentavatar {
left: 0px;
top: 0px;
width: 54px;
}
-.commentavatar img{
+
+.commentavatar img {
width: 3.5em;
display: block;
margin: auto;
}
-.commentheader{
+
+.commentheader {
padding: 6px 0px;
}
-.commentauthor{
+
+.commentauthor {
font-size: 130%;
font-weight: 900;
}
-.commentauthor a{
+
+.commentauthor a {
text-decoration: none;
color: #000 !important;
}
-.commentcontent{
-}
+.commentcontent {}
-.xwikibuttonlink a{
+.xwikibuttonlink a {
background-color: #BBB;
padding: 2px 4px;
text-decoration: none;
font-weight: bold;
}
-table.xwikidatatable{
+
+table.xwikidatatable {
margin: 8px auto;
/* width: 100%; */
}
-table.xwikidatatable, table.xwikidatatable th{
+
+table.xwikidatatable,
+table.xwikidatatable th {
border: 1px solid #DDD;
}
-table.xwikidatatable td{
+
+table.xwikidatatable td {
padding: 2px 8px;
}
-.xwikiintracontent legend{
+.xwikiintracontent legend {
border: 1px solid #ddd;
padding: 2px 4px;
}
-.xwikiintracontent fieldset{
+
+.xwikiintracontent fieldset {
border-color: #ddd;
border-style: solid;
padding: 8px 8px;
}
-.xwikiintracontent legend{
+
+.xwikiintracontent legend {
font-size: 110%;
font-weight: bold;
cursor: pointer;
margin-bottom: 8px;
}
-html > body .xwikiintracontent legend{
+
+html>body .xwikiintracontent legend {
margin-bottom: 0px;
}
-.xwikiintracontent fieldset.collapsed{
+
+.xwikiintracontent fieldset.collapsed {
border: none;
}
-.xwikiintracontent fieldset.collapsed legend{
+
+.xwikiintracontent fieldset.collapsed legend {
margin-left: 2px;
}
-.xwikiintracontent fieldset.collapsed div{
+
+.xwikiintracontent fieldset.collapsed div {
display: none;
}
-.xwikiintracontent fieldset.expanded .expands{
+
+.xwikiintracontent fieldset.expanded .expands {
display: none;
}
-.commentsno, .attachmentsno{
+.commentsno,
+.attachmentsno {
font-size: 50%;
background: transparent url("icons/black-comment2.png") center no-repeat;
padding: 11px 24px 13px;
font-weight: 900;
}
-.attachmentsno{
+
+.attachmentsno {
background: transparent url("icons/black-doc2.png") center no-repeat;
}
+
/*
---------------------------------------
Menu
@@ -520,58 +583,66 @@ Menu
overflow: visible;
}
-html > body #actionmenu{
+html>body #actionmenu {
position: fixed;
top: 0;
left: 0;
width: 100%;
}
-#actionmenu a{
+html>body.celementsmenubarvisible #actionmenu {
+ top: 28px;
+}
+
+#actionmenu a {
text-decoration: none;
}
-.rightmenu{
- position: absolute;
- right: 0px;
- margin-right: 40px;
+
+.rightmenu {
+ position: absolute;
+ right: 0px;
+ margin-right: 40px;
}
-.rightmenu a{
+
+.rightmenu a {
float: left;
width: 200px;
text-align: center;
- border:1px solid;
- border-width:0px 1px;
+ border: 1px solid;
+ border-width: 0px 1px;
margin-right: -1px;
- font-size:1em;
- text-decoration:none;
- height:2em;
- line-height:1.9em;
+ font-size: 1em;
+ text-decoration: none;
+ height: 2em;
+ line-height: 1.9em;
}
-.leftmenu{
+.leftmenu {
position: absolute;
left: 42px;
}
.leftmenu2 {
- text-align: left;
+ text-align: left;
}
-.topmenuentry{
+.topmenuentry {
float: left;
width: 7em;
height: 2em;
text-align: center;
- border:1px solid ;
- border-width:0px 1px;
+ border: 1px solid;
+ border-width: 0px 1px;
margin-right: -1px;
}
-.topmenuentry strong{
+
+.topmenuentry strong {
font-size: 90%;
}
-.submenu{
+
+.submenu {
display: block;
width: 12em;
text-align: left;
@@ -581,26 +652,29 @@ html > body #actionmenu{
}
-.topmenuentry a, .topmenuentry a:link, .topmenuentry a:visited, .topmenuentry a:active{
-display:block;
-font-size:1em;
-text-decoration:none;
-width:7em;
-height:2em;
-line-height:1.9em;
+.topmenuentry a,
+.topmenuentry a:link,
+.topmenuentry a:visited,
+.topmenuentry a:active {
+ display: block;
+ font-size: 1em;
+ text-decoration: none;
+ width: 7em;
+ height: 2em;
+ line-height: 1.9em;
}
-.rightmenu a{
-height:2em;
-line-height:1.9em;
-font-size:1em;
-text-decoration:none;
+.rightmenu a {
+ height: 2em;
+ line-height: 1.9em;
+ font-size: 1em;
+ text-decoration: none;
}
-.submenu .submenuitem{
+.submenu .submenuitem {
display: block;
padding: 2px;
- border-bottom: 1px dashed ;
+ border-bottom: 1px dashed;
margin-bottom: -1px;
}
@@ -608,26 +682,30 @@ text-decoration:none;
display: block;
font-size: 1px;
line-height: 1px;
- border-top: 1px solid ;
+ border-top: 1px solid;
}
-.submenu.hidden{
+.submenu.hidden {
display: none;
}
-.submenuitem a, .submenuitem a:link, .submenuitem a:visited, .submenuitem a:active {
-display:block;
-width: auto;
-font-size:0.8em;
-font-weight: bold;
-text-decoration:none;
-height:auto;
-padding:1px 3px;
-line-height:1.5em;
+
+.submenuitem a,
+.submenuitem a:link,
+.submenuitem a:visited,
+.submenuitem a:active {
+ display: block;
+ width: auto;
+ font-size: 0.8em;
+ font-weight: bold;
+ text-decoration: none;
+ height: auto;
+ padding: 1px 3px;
+ line-height: 1.5em;
}
.menuarrow {
- display:none;
+ display: none;
}
/*
@@ -635,7 +713,8 @@ line-height:1.5em;
Editors
---------------------------------------
*/
-#xwikieditorstitles, #xwikiviewerstitles{
+#xwikieditorstitles,
+#xwikiviewerstitles {
display: none;
}
@@ -644,11 +723,12 @@ Editors
Tabs
---------------------------------------
*/
-ul.xwikitabbar{
+ul.xwikitabbar {
padding: 4px 0px;
margin: 0px;
}
-.xwikitabbar li{
+
+.xwikitabbar li {
display: inline;
padding: 5px 0px;
list-style-type: none;
@@ -657,30 +737,34 @@ ul.xwikitabbar{
margin-right: 2px;
margin-top: 2px;
}
-html > body .xwikitabbar li{
+
+html>body .xwikitabbar li {
padding: 5px 0px;
}
-.xwikitabbar li a{
+
+.xwikitabbar li a {
padding: 5px 15px;
font-weight: bold;
text-decoration: none;
}
-.xwikitabbar li a:hover{
+
+.xwikitabbar li a:hover {
text-decoration: none;
}
-.xwikitabbar li.active{
+.xwikitabbar li.active {
border: 1px solid;
border-bottom: 3px solid;
}
-.xwikitabbar li.active a:hover{
+.xwikitabbar li.active a:hover {
cursor: default;
}
+
/*
--
*/
-#xwikicontentedit{
+#xwikicontentedit {
border: 1px solid;
}
@@ -695,47 +779,56 @@ Panels
margin: 0px;
padding: 0px 0px 30px;
}
-.globalsearch input{
+
+.globalsearch input {
font-size: 0.7em;
border: 1px solid;
display: inline !important;
}
-.globalsearch input.button{
+
+.globalsearch input.button {
vertical-align: middle;
font-size: 1em;
border: 0px;
padding: 0px;
}
-#rightPanels, #leftPanels {
+#rightPanels,
+#leftPanels {
position: relative;
float: left;
width: 200px;
padding-top: 0px;
}
-#rightPanels{
+
+#rightPanels {
margin-right: -200px;
}
+
#leftPanels {
margin-left: -200px;
}
-.panels{
-}
-html > body .panels{
+.panels {}
+
+html>body .panels {
margin-top: 0px;
}
+
.panels.left {
float: left;
clear: none;
margin-left: 0px;
}
+
.panels.right {
float: right;
clear: right;
margin-right: 0px;
}
-.panel, .fakepanel{
+
+.panel,
+.fakepanel {
color: #DDD;
width: 200px;
display: block;
@@ -743,62 +836,75 @@ html > body .panels{
padding: 0px;
border: 0px solid;
}
-.placeholder{
+
+.placeholder {
width: 200px;
}
-html > body #dragbox {
+
+html>body #dragbox {
width: 198px !important;
}
-#xwikinavcontainer{
+
+#xwikinavcontainer {
margin-bottom: 20px;
}
-.fakepanel{
+
+.fakepanel {
display: none;
height: 320px;
}
-#editPanels.panels{
+#editPanels.panels {
width: 310px;
float: left;
position: relative;
margin-right: -310px;
}
-#editPanels .panel{
+
+#editPanels .panel {
width: 310px;
}
-.collapsed .xwikipanelcontents{
+
+.collapsed .xwikipanelcontents {
display: none;
}
-span.panelitem{
+
+span.panelitem {
display: block;
}
-span.pitemseparator{
+
+span.pitemseparator {
display: none;
}
-.panelcontainer{
+
+.panelcontainer {
height: 200px;
overflow: hidden;
border: 1px inset #444;
padding: 3px;
}
-.panelitemc{
+
+.panelitemc {
height: 256px;
margin: 0px 4px;
width: 210px;
float: left;
}
-.panelitemc .label, .panelitemc .xwikibuttonlink{
+
+.panelitemc .label,
+.panelitemc .xwikibuttonlink {
text-align: center;
}
+
/*
----------------------------------
Scriptaculous Acordeon
----------------------------------
*/
#xwikisyntaxhelp {
- margin-top:6px;
- border-top-width:1px;
- border-top-style:solid;
+ margin-top: 6px;
+ border-top-width: 1px;
+ border-top-style: solid;
border: none;
}
@@ -807,29 +913,37 @@ Scriptaculous Acordeon
}
/* Note that h6 styling is provided in order to ensure backward compatibility after XSALBATROSS-71 */
-.accordionTabTitleBar h1, .accordionTabTitleBar h6 {
+.accordionTabTitleBar h1,
+.accordionTabTitleBar h6 {
margin: 0px;
padding: 0px 4px;
}
-#editPanels .accordionTabContentBox{
+#editPanels .accordionTabContentBox {
border: none;
overflow: auto !important;
}
-#editPanels .accordionTabContentBox table{
+#editPanels .accordionTabContentBox table {
border: none;
}
-.accordionTabContentBox table th{
+
+.accordionTabContentBox table th {
border-bottom: 1px solid #DDD;
text-align: center;
}
-#xwikihelptitlesContent h1, #xwikihelptitlesContent h2, #xwikihelptitlesContent h3, #xwikihelptitlesContent h4, #xwikihelptitlesContent h5, #xwikihelptitlesContent h6{
+
+#xwikihelptitlesContent h1,
+#xwikihelptitlesContent h2,
+#xwikihelptitlesContent h3,
+#xwikihelptitlesContent h4,
+#xwikihelptitlesContent h5,
+#xwikihelptitlesContent h6 {
margin: 0px;
text-align: right;
}
-.accordionTabTitleBar{
+.accordionTabTitleBar {
border: 1px solid #FFF;
cursor: default;
}
@@ -840,65 +954,76 @@ Scriptaculous Acordeon
Misc
-----------------------------
*/
-#xwikihelplistsContent ul, #xwikihelplistsContent ol{
+#xwikihelplistsContent ul,
+#xwikihelplistsContent ol {
margin: 0px;
}
-#contentcolumn .panel.large{
+
+#contentcolumn .panel.large {
width: 290px;
}
-.accordionTabTitleBar tt{
+
+.accordionTabTitleBar tt {
font-style: normal;
font-size: 150%;
font-weight: 100;
padding: 0px 4px;
}
+
/*.accordionTabContentBox div{
padding: 0px;
}*/
-td.label{
+td.label {
text-align: right;
padding-right: 4px;
}
-#xwikiclassproperties, #xwikiobjects{
+
+#xwikiclassproperties,
+#xwikiobjects {
border: 1px solid #DDD !important;
overflow: hidden;
}
-.center{
+
+.center {
text-align: center;
}
-.padded{
+.padded {
padding: 8px;
}
-#xwikihelpsyntax{
+#xwikihelpsyntax {
border-top: 1px solid #DDD;
padding: 2px 6px;
margin: -2px 1px 0px;
}
-.editactions{
+.editactions {
border: none !important;
margin-top: 10px;
padding: 0px;
}
-#historycontent td{
+
+#historycontent td {
padding: 2px;
}
-#xwikiuserprofile th{
+
+#xwikiuserprofile th {
background-color: transparent;
text-align: right;
}
-#xwikiuserprofile td, #xwikiuserprofile th{
+
+#xwikiuserprofile td,
+#xwikiuserprofile th {
padding: 4px;
}
-#xwikiobjects td{
+#xwikiobjects td {
vertical-align: top;
}
-html > body .xwikidatatable{
+html>body .xwikidatatable {
width: 100%;
}
@@ -908,35 +1033,37 @@ html > body .xwikidatatable{
border: 2px solid;
}
-.edit_section{
+.edit_section {
visibility: hidden;
display: block;
overflow: hidden;
height: 24px;
width: 24px;
-/* position: relative;
+ /* position: relative;
top: -4em;
*/
}
-.edit_section a{
+
+.edit_section a {
visibility: visible;
position: relative;
top: -1.2em;
background: transparent url("icons/black-edit.png") left bottom no-repeat;
padding: 0px 10px 20px;
}
+
/*
------------------------
Page Layout Selection
------------------------
*/
-td div.pagelayoutoption{
+td div.pagelayoutoption {
margin: 0px auto;
width: 106px;
}
-div.layoutmaquette{
+div.layoutmaquette {
width: 100px;
height: 100px;
border: 1px solid #ddd;
@@ -944,7 +1071,8 @@ div.layoutmaquette{
padding: 2px;
}
-div.lmleftcolumn, div.lmrightcolumn{
+div.lmleftcolumn,
+div.lmrightcolumn {
width: 20px;
height: 60px;
border: 1px solid #aaa;
@@ -952,80 +1080,80 @@ div.lmleftcolumn, div.lmrightcolumn{
float: left;
}
-div.lmrightcolumn{
+div.lmrightcolumn {
float: right;
}
-div.lmcontentcolumn{
+div.lmcontentcolumn {
border: 1px solid #aaa;
background-color: #eee;
height: 90px;
}
-#leftcolumn div.lmcontentcolumn{
+#leftcolumn div.lmcontentcolumn {
margin-left: 24px;
}
-#rightcolumn div.lmcontentcolumn{
+#rightcolumn div.lmcontentcolumn {
margin-right: 24px;
}
-#bothcolumns div.lmcontentcolumn{
+#bothcolumns div.lmcontentcolumn {
margin-left: 24px;
margin-right: 24px;
}
-div.pagelayoutoption:hover .layoutmaquette{
+div.pagelayoutoption:hover .layoutmaquette {
background-color: #ffd;
}
-div.pagelayoutoption:hover .lmcontentcolumn{
+div.pagelayoutoption:hover .lmcontentcolumn {
background-color: #ddd;
}
div.pagelayoutoption:hover .lmleftcolumn,
-div.pagelayoutoption:hover .lmrightcolumn{
+div.pagelayoutoption:hover .lmrightcolumn {
background-color: #acf;
}
-div.pagelayoutoptions > table{
+div.pagelayoutoptions>table {
width: 100%;
text-align: center;
}
-div.pagelayoutoptions td{
+div.pagelayoutoptions td {
padding: 2px;
vertical-align: bottom;
}
-#selectedoption{
-}
+#selectedoption {}
-#selectedoption .lmcontentcolumn{
+#selectedoption .lmcontentcolumn {
background-color: #acf;
}
#selectedoption .lmleftcolumn,
-#selectedoption .lmrightcolumn{
+#selectedoption .lmrightcolumn {
background-color: #369;
}
-.pagelayoutoption label{
+.pagelayoutoption label {
color: #aaa;
}
-#selectedoption label, .pagelayoutoption:hover label{
+#selectedoption label,
+.pagelayoutoption:hover label {
color: #000;
}
-.hastooltip{
+.hastooltip {
border-bottom: 1px dotted #000;
cursor: help;
}
-#dhtmltooltip{
+#dhtmltooltip {
border: 1px solid #aaa;
padding: 2px 4px;
background-color: #ffd;
@@ -1033,61 +1161,66 @@ div.pagelayoutoptions td{
position: absolute;
}
-#panelwizardbuttons{
+#panelwizardbuttons {
padding: 8px 5px 0px;
margin: 8px -5px 0px;
border-top: 1px solid #ddd;
text-align: left;
}
-.alleditcontent{
+.alleditcontent {
position: relative;
width: auto;
margin: 20px 20px 0px 20px;
}
-.floatcontainer{
+.floatcontainer {
overflow: hidden;
}
-#xwikieditcontent, .xwikitabpanescontainer {
+#xwikieditcontent,
+.xwikitabpanescontainer {
border: 2px solid #3381CC;
padding: 3px 8px 3px 3px;
overflow: auto;
}
-#xwikieditcontent div{
+#xwikieditcontent div {
overflow: hidden;
}
-* html #xwikieditcontent{
+* html #xwikieditcontent {
padding: 0px 3px 3px 3px;
}
-.editinfo{
+.editinfo {
height: 2em;
font-weight: bold;
font-size: 1em;
line-height: 2em;
}
-#edit{
+
+#edit {
padding: 0px;
margin: 0px;
border: none;
}
-#xwikitext{
+
+#xwikitext {
clear: both;
}
-#panelsBackground{
+
+#panelsBackground {
height: 20px;
background-color: #384554;
}
-#xwikidoctitleinput{
+#xwikidoctitleinput {
width: 100%;
font-size: 150%;
}
-* html form{
+
+* html form {
margin-top: 0px;
}
@@ -1096,6 +1229,7 @@ div.pagelayoutoptions td{
display: inline;
margin-right: 2px;
}
+
.xwiki-form-listclass {
margin-right: 10px;
}
@@ -1114,28 +1248,34 @@ div.attachment {
border-left: 1px solid #eee;
font-size: 85%;
}
+
.attachment .mime {
display: block;
float: left;
padding-right: 8px;
padding-bottom: 4px;
}
+
.attachment .information {
position: relative;
overflow: hidden;
}
+
.attachment .name {
display: block;
float: left;
font-size: 170%;
padding: 0px 6px 4px 0px;
}
+
.attachment .version {
display: block;
}
+
.attachment .meta {
clear: left;
}
+
.attachment .xwikibuttonlinks {
float: right;
font-size: 130%;
@@ -1143,11 +1283,11 @@ div.attachment {
}
.mceEditorContainer {
- display: block;
- height: 100% !important;
- position: relative;
+ display: block;
+ height: 100% !important;
+ position: relative;
}
.mceToolbar {
- z-index: 30002;
-}
\ No newline at end of file
+ z-index: 30002;
+}
diff --git a/src/main/webapp/skins/albatross/style.css b/src/main/webapp/skins/albatross/style.css
index 14dc43f34..57fbc9752 100644
--- a/src/main/webapp/skins/albatross/style.css
+++ b/src/main/webapp/skins/albatross/style.css
@@ -1,29 +1,6 @@
-@import "elements.css";
-
-@import "classes.css";
-
-/* @import "js/xwiki/chartwizard/chwSkin.css";*/
-@import "xwiki.css";
-
-@import "wiki.css";
-
-@import "page.css";
-
-@import "rss.css";
-
-@import "screenlayout.css?ver=20230902";
-
-@import "microformats.css";
-
-@import "presentation.css";
-
-@import "colorsblack.css";
-
-/*@import "ie.css"; */
-
/* Empty lines between block elements. Generated by the new rendering */
.wikimodel-emptyline {
- height:1em;
+ height: 1em;
}
.rightmenu a {
@@ -55,7 +32,8 @@
}
/* Note that h6 styling is provided in order to ensure backward compatibility after XSALBATROSS-71 */
-.panel .accordionTabTitleBar h1, .panel .accordionTabTitleBar h6 {
+.panel .accordionTabTitleBar h1,
+.panel .accordionTabTitleBar h6 {
border-top: 1px solid #999;
}
@@ -88,7 +66,8 @@ li.selected {
/* Note that h6 styling is provided in order to ensure backward compatibility after XSALBATROSS-71 */
-#xwikieditcontent .accordionTabTitleBar h1, #xwikieditcontent .accordionTabTitleBar h6 {
+#xwikieditcontent .accordionTabTitleBar h1,
+#xwikieditcontent .accordionTabTitleBar h6 {
width: 100%;
}
@@ -112,8 +91,11 @@ div.panellayoutcontainer-5col .panellayoutcol {
width: 20%;
}
-div.panellayoutcontainer-1col,div.panellayoutcontainer-2col,div.panellayoutcontainer-3col,div.panellayoutcontainer-4col,div.panellayoutcontainer-5col
- {
+div.panellayoutcontainer-1col,
+div.panellayoutcontainer-2col,
+div.panellayoutcontainer-3col,
+div.panellayoutcontainer-4col,
+div.panellayoutcontainer-5col {
overflow: auto;
clear: left;
height: 1%;
@@ -154,20 +136,18 @@ div.panellayoutcontainer-1col,div.panellayoutcontainer-2col,div.panellayoutconta
color: #fff;
border-bottom: 1px solid #ddd;
background-image:
- url("icons/black-less-cont.png")
- ;
+ url("icons/black-less-cont.png");
}
#xwikicontent .panellayoutcol .collapsed .xwikipaneltitle {
background-color: #CDE;
color: #fff;
background-image:
- url("icons/black-more-cont.png")
- ;
+ url("icons/black-more-cont.png");
}
-#xwikicontent .panellayoutcol .expanded h1.xwikipaneltitle:hover,#xwikicontent .panellayoutcol .collapsed h1.xwikipaneltitle:hover
- {
+#xwikicontent .panellayoutcol .expanded h1.xwikipaneltitle:hover,
+#xwikicontent .panellayoutcol .collapsed h1.xwikipaneltitle:hover {
color: #fff;
}
@@ -177,45 +157,46 @@ div.panellayoutcontainer-1col,div.panellayoutcontainer-2col,div.panellayoutconta
*/
#docExtraTabs {
- border: 0px !important;
- background-color: white;
+ border: 0px !important;
+ background-color: white;
}
#docExtrasTabsUl {
- float: left;
+ float: left;
}
#docExtraTabs ul.xwikitabbar {
- width: auto;
- padding: 0;
+ width: auto;
+ padding: 0;
}
#docextrapanes {
- border : solid 1px #3280CC;
- background-color: #E4F6FF;
- padding: 10px;
- clear: both;
+ border: solid 1px #3280CC;
+ background-color: #E4F6FF;
+ padding: 10px;
+ clear: both;
}
#docextraanchors {
- height: 2em;
+ height: 2em;
}
-#_information dd, #_information dt {
- padding-top: 4px;
- padding-bottom: 4px;
- clear: both;
+#_information dd,
+#_information dt {
+ padding-top: 4px;
+ padding-bottom: 4px;
+ clear: both;
}
#_information #tags {
- width: 400px;
- font-size: 110%;
- float:left;
+ width: 400px;
+ font-size: 110%;
+ float: left;
}
#tageditsavewrapper {
- display:inline;
- margin:0 0 10px 10px;
+ display: inline;
+ margin: 0 0 10px 10px;
}
#tageditsavesuccess {
@@ -233,50 +214,52 @@ div.panellayoutcontainer-1col,div.panellayoutcontainer-2col,div.panellayoutconta
*/
ul.xlist {
- margin: 0 0 0 0.5em !important;
- padding: 0 !important;
+ margin: 0 0 0 0.5em !important;
+ padding: 0 !important;
}
ul.xlist li.xunderline {
- border-bottom: solid 1px #efefef !important;
+ border-bottom: solid 1px #efefef !important;
}
ul.xlist li.xhighlight:hover {
- background-color: lemonChiffon;
+ background-color: lemonChiffon;
}
ul.xlist li {
- width: 100% !important;
- padding-top: 0.2em;
- list-style-type: none;
+ width: 100% !important;
+ padding-top: 0.2em;
+ list-style-type: none;
}
-ul.xlist li.space, ul.xlist li.page, ul.xlist li.comment, ul.xlist li.attachment {
- background-repeat: no-repeat;
- background-position: 2px 3px;
+ul.xlist li.space,
+ul.xlist li.page,
+ul.xlist li.comment,
+ul.xlist li.attachment {
+ background-repeat: no-repeat;
+ background-position: 2px 3px;
}
ul.xlist li.space {
- background-image: url( ../../resources/icons/silk/folder.gif );
+ background-image: url(../../resources/icons/silk/folder.gif );
}
ul.xlist li.page {
- background-image: url( ../../resources/icons/silk/page_white_text.gif );
+ background-image: url(../../resources/icons/silk/page_white_text.gif );
}
ul.xlist li.comment {
- background-image: url( ../../resources/icons/silk/comment.gif );
+ background-image: url(../../resources/icons/silk/comment.gif );
}
ul.xlist li.attachment {
- background-image: url( ../../resources/icons/silk/attach.gif );
+ background-image: url(../../resources/icons/silk/attach.gif );
}
ul.xlist li.xitem div.xitemcontainer {
- text-indent: 1.5em;
+ text-indent: 1.5em;
}
ul.xlist li.xitem div.xitemcontainer ul.xlist {
- text-indent: 0em;
+ text-indent: 0em;
}
-
diff --git a/src/main/webapp/skins/albatross/wiki.css b/src/main/webapp/skins/albatross/wiki.css
index 19a46bb8d..cd9ae4731 100644
--- a/src/main/webapp/skins/albatross/wiki.css
+++ b/src/main/webapp/skins/albatross/wiki.css
@@ -401,7 +401,7 @@ span.wikicreatelink a {
/* Used to signify a rendering error in the rendered page. Valid only with new rendering */
.xwikirenderingerror {
background-color: #eee;
- background-image: url($xwiki.getSkinFile("icons/silk/exclamation.gif", true));
+ background-image: url(/skin/resources/icons/silk/exclamation.gif);
background-position: 2px 50%;
background-repeat: no-repeat;
color: #e14726;
diff --git a/src/main/webapp/templates/celMacros/CelMessages.vm b/src/main/webapp/templates/celMacros/CelMessages.vm
index f599d86cc..c5df5d184 100644
--- a/src/main/webapp/templates/celMacros/CelMessages.vm
+++ b/src/main/webapp/templates/celMacros/CelMessages.vm
@@ -2,6 +2,8 @@ $jsonBuilder.openProperty('celmeta')
$jsonBuilder.openDictionary()
$jsonBuilder.addStringProperty('language', "$language")
$jsonBuilder.addStringProperty('admin-language', "$admin_language")
+$jsonBuilder.addStringProperty('contextPath', "${request.contextPath}")
+$jsonBuilder.addStringProperty('database', "${context.database}")
$jsonBuilder.openProperty('isAdmin')
$jsonBuilder.addBoolean($isAdmin)
$jsonBuilder.openProperty('isSuperAdmin')
@@ -102,3 +104,113 @@ $jsonBuilder.openProperty('celmenu')
$jsonBuilder.openDictionary()
$jsonBuilder.addStringProperty('supportLinkURL', "$!services.celementsweb.getSupportLinkURL()")
$jsonBuilder.closeDictionary()
+
+## actionButtons.js
+$jsonBuilder.openProperty('actionButtons')
+$jsonBuilder.openDictionary()
+$jsonBuilder.addStringProperty('cancel', "$!adminMsg.get('core.shortcuts.edit.cancel')")
+$jsonBuilder.addStringProperty('preview', "$!adminMsg.get('core.shortcuts.edit.preview')")
+$jsonBuilder.addStringProperty('backtoedit', "$!adminMsg.get('core.shortcuts.edit.backtoedit')")
+$jsonBuilder.addStringProperty('saveandview', "$!adminMsg.get('core.shortcuts.edit.saveandview')")
+$jsonBuilder.addStringProperty('saveandcontinue', "$!adminMsg.get('core.shortcuts.edit.saveandcontinue')")
+$jsonBuilder.addStringProperty('mandatoryField', "$!adminMsg.get('core.editors.validation.mandatoryField')")
+$jsonBuilder.addStringProperty('commentPrompt', "$!adminMsg.get('core.comment.prompt')")
+$jsonBuilder.closeDictionary()
+## attachments.js
+$jsonBuilder.openProperty('attachments')
+$jsonBuilder.openDictionary()
+$jsonBuilder.addStringProperty('deleteConfirm', "$!adminMsg.get('core.viewers.attachments.delete.confirm')")
+$jsonBuilder.addStringProperty('deleteInProgress', "$!adminMsg.get('core.viewers.attachments.delete.inProgress')")
+$jsonBuilder.addStringProperty('deleteDone', "$!adminMsg.get('core.viewers.attachments.delete.done')")
+$jsonBuilder.addStringProperty('deleteFailed', "$!adminMsg.get('core.viewers.attachments.delete.failed')")
+$jsonBuilder.addStringProperty('addFileInput', "$!adminMsg.get('core.viewers.attachments.upload.addFileInput')")
+$jsonBuilder.addStringProperty('removeFileInput', "$!adminMsg.get('core.viewers.attachments.upload.removeFileInput')")
+$jsonBuilder.addStringProperty('removeFileInputTitle', "$!adminMsg.get('core.viewers.attachments.upload.removeFileInput.title')")
+$jsonBuilder.addStringProperty('extranb', "$!adminMsg.get('docextra.extranb', ['__number__'])")
+$jsonBuilder.closeDictionary()
+## code.js
+$jsonBuilder.openProperty('code')
+$jsonBuilder.openDictionary()
+$jsonBuilder.addStringProperty('showLineNumbers', "$!adminMsg.get('core.viewers.code.showLineNumbers')")
+$jsonBuilder.addStringProperty('hideLineNumbers', "$!adminMsg.get('core.viewers.code.hideLineNumbers')")
+$jsonBuilder.closeDictionary()
+## comments.js
+$jsonBuilder.openProperty('comments')
+$jsonBuilder.openDictionary()
+$jsonBuilder.addStringProperty('commentDeleted', "$!adminMsg.get('core.viewers.comments.commentDeleted')")
+$jsonBuilder.addStringProperty('deleteConfirm', "$!adminMsg.get('core.viewers.comments.delete.confirm')")
+$jsonBuilder.addStringProperty('deleteInProgress', "$!adminMsg.get('core.viewers.comments.delete.inProgress')")
+$jsonBuilder.addStringProperty('deleteDone', "$!adminMsg.get('core.viewers.comments.delete.done')")
+$jsonBuilder.addStringProperty('deleteFailed', "$!adminMsg.get('core.viewers.comments.delete.failed')")
+$jsonBuilder.addStringProperty('editFormFetchInProgress', "$!adminMsg.get('core.viewers.comments.editForm.fetch.inProgress')")
+$jsonBuilder.addStringProperty('editFormFetchFailed', "$!adminMsg.get('core.viewers.comments.editForm.fetch.failed')")
+$jsonBuilder.addStringProperty('addInProgress', "$!adminMsg.get('core.viewers.comments.add.inProgress')")
+$jsonBuilder.addStringProperty('addDone', "$!adminMsg.get('core.viewers.comments.add.done')")
+$jsonBuilder.addStringProperty('addFailed', "$!adminMsg.get('core.viewers.comments.add.failed')")
+$jsonBuilder.addStringProperty('previewButtonPreview', "$!adminMsg.get('core.viewers.comments.preview.button.preview')")
+$jsonBuilder.addStringProperty('previewInProgress', "$!adminMsg.get('core.viewers.comments.preview.inProgress')")
+$jsonBuilder.addStringProperty('previewFailed', "$!adminMsg.get('core.viewers.comments.preview.failed')")
+$jsonBuilder.addStringProperty('previewButtonBack', "$!adminMsg.get('core.viewers.comments.preview.button.back')")
+$jsonBuilder.addStringProperty('extranb', "$!adminMsg.get('docextra.extranb', ['__number__'])")
+$jsonBuilder.closeDictionary()
+## confirmationBox.js
+$jsonBuilder.openProperty('confirmationBox')
+$jsonBuilder.openDictionary()
+$jsonBuilder.addStringProperty('defaultQuestion', "$!adminMsg.get('core.widgets.confirmationBox.defaultQuestion')")
+$jsonBuilder.addStringProperty('yes', "$!adminMsg.get('core.widgets.confirmationBox.button.yes')")
+$jsonBuilder.addStringProperty('no', "$!adminMsg.get('core.widgets.confirmationBox.button.no')")
+$jsonBuilder.closeDictionary()
+## confirmedAjaxRequest.js
+$jsonBuilder.openProperty('confirmedAjaxRequest')
+$jsonBuilder.openDictionary()
+$jsonBuilder.addStringProperty('notificationInProgress', "$!adminMsg.get('core.widgets.confirmationBox.notification.inProgress')")
+$jsonBuilder.addStringProperty('notificationDone', "$!adminMsg.get('core.widgets.confirmationBox.notification.done')")
+$jsonBuilder.addStringProperty('notificationFailed', "$!adminMsg.get('core.widgets.confirmationBox.notification.failed')")
+$jsonBuilder.closeDictionary()
+## dataeditors.js
+$jsonBuilder.openProperty('dataeditors')
+$jsonBuilder.openDictionary()
+$jsonBuilder.addStringProperty('confirmationText', "$!adminMsg.get('core.editors.object.delete.confirm')")
+$jsonBuilder.addStringProperty('progressMessageText', "$!adminMsg.get('core.editors.object.delete.inProgress')")
+$jsonBuilder.addStringProperty('successMessageText', "$!adminMsg.get('core.editors.object.delete.done')")
+$jsonBuilder.addStringProperty('failureMessageText', "$!adminMsg.get('core.editors.object.delete.failed')")
+$jsonBuilder.closeDictionary()
+## livetable.js
+$jsonBuilder.openProperty('livetable')
+$jsonBuilder.openDictionary()
+$jsonBuilder.addStringProperty('resultsOf', "$!adminMsg.get('xe.pagination.results.of')")
+$jsonBuilder.addStringProperty('results', "$!adminMsg.get('xe.pagination.results')")
+$jsonBuilder.closeDictionary()
+## usersandgroups.js
+$jsonBuilder.openProperty('usersandgroups')
+$jsonBuilder.openDictionary()
+$jsonBuilder.addStringProperty('denyrightforcurrentuser', "$!adminMsg.get('rightsmanager.denyrightforcurrentuser')")
+$jsonBuilder.addStringProperty('clearrightforcurrentuserinstead', "$!adminMsg.get('rightsmanager.clearrightforcurrentuserinstead')")
+$jsonBuilder.addStringProperty('clearrightforcurrentuser', "$!adminMsg.get('rightsmanager.clearrightforcurrentuser')")
+$jsonBuilder.addStringProperty('denyrightforgroup', "$!adminMsg.get('rightsmanager.denyrightforgroup')")
+$jsonBuilder.addStringProperty('clearrightforgroupinstead', "$!adminMsg.get('rightsmanager.clearrightforgroupinstead')")
+$jsonBuilder.addStringProperty('clearrightforgroup', "$!adminMsg.get('rightsmanager.clearrightforgroup')")
+$jsonBuilder.addStringProperty('denyrightforuorg', "$!adminMsg.get('rightsmanager.denyrightforuorg')")
+$jsonBuilder.addStringProperty('clearrightforuorg', "$!adminMsg.get('rightsmanager.clearrightforuorg')")
+$jsonBuilder.addStringProperty('saveFailure', "$!adminMsg.get('platform.core.rightsManagement.saveFailure')")
+$jsonBuilder.addStringProperty('ajaxFailure', "$!adminMsg.get('platform.core.rightsManagement.ajaxFailure')")
+$jsonBuilder.addStringProperty('edit', "$!adminMsg.get('edit')")
+$jsonBuilder.addStringProperty('delete', "$!adminMsg.get('delete')")
+$jsonBuilder.addStringProperty('confirmdeleteuser', "$!adminMsg.get('rightsmanager.confirmdeleteuser')")
+$jsonBuilder.addStringProperty('confirmdeletegroup', "$!adminMsg.get('rightsmanager.confirmdeletegroup')")
+$jsonBuilder.addStringProperty('confirmdeletemember', "$!adminMsg.get('rightsmanager.confirmdeletemember')")
+$jsonBuilder.closeDictionary()
+## xwiki.js
+$jsonBuilder.openProperty('xwiki')
+$jsonBuilder.openDictionary()
+$jsonBuilder.addStringProperty('readTechnicalInformation', "$!adminMsg.get('platform.core.rendering.error.readTechnicalInformation')")
+$jsonBuilder.addStringProperty('edit', "$!adminMsg.get('edit')")
+$jsonBuilder.addStringProperty('createAjaxError', "$!adminMsg.get('core.create.ajax.error')")
+$jsonBuilder.closeDictionary()
+## xwikiexplorer.js
+$jsonBuilder.openProperty('xwikiexplorer')
+$jsonBuilder.openDictionary()
+$jsonBuilder.addStringProperty('attachmentsTitle', "$!adminMsg.get('xwikiexplorer.attachments.title')")
+$jsonBuilder.addStringProperty('addPageTitle', "$!adminMsg.get('xwikiexplorer.addpage.title')")
+$jsonBuilder.addStringProperty('addAttachmentTitle', "$!adminMsg.get('xwikiexplorer.addattachment.title')")
+$jsonBuilder.closeDictionary()
diff --git a/src/main/webapp/templates/celTemplates/ObjectEdit.vm b/src/main/webapp/templates/celTemplates/ObjectEdit.vm
index afe78bc5d..614a3d8a9 100644
--- a/src/main/webapp/templates/celTemplates/ObjectEdit.vm
+++ b/src/main/webapp/templates/celTemplates/ObjectEdit.vm
@@ -181,16 +181,16 @@
#else
#set($properties = $class.properties)
#end
+#set($jsService = $services.javascript)
+#set($extJsParam = $jsService.createExtJSParam().setAction('file'))
#foreach($prop in $properties)
#set($classRef = $services.model.resolveDocument($class.getName()))
#if($services.editorsupport.getSuggestBaseClass($classRef, "$!prop.getName()").isPicker())
-$services.javascript.addExtJSfileOnce(':celJS/prototype.js')
-$services.javascript.addExtJSfileOnce(':js/xwiki/xwiki.js', 'file')
-$services.javascript.addExtJSfileOnce(':uicomponents/widgets/list/xlist.js', 'file')
-<-- ajaxSuggest loaded ?? -->
-$services.javascript.addExtJSfileOnce(':js/xwiki/suggest/ajaxSuggest.js', 'file')
-$services.javascript.addExtJSfileOnce(':js/scriptaculous/effects.js', 'file')
-$services.javascript.addExtJSfileOnce(':celJS/addSuggest.js', 'file')
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':celJS/prototype.js'))##
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':celJS/initCelements.min.js'))##
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/xwiki.js', 'file'))##
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':uicomponents/widgets/list/xlist.js', 'file'))##
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/scriptaculous/effects.js', 'file'))##
#end
#if($cel_embedded_editobj)
#set($cel_editobj_validationClass = '')
diff --git a/src/main/webapp/templates/code.vm b/src/main/webapp/templates/code.vm
index 5ca072ae2..b90a601b3 100644
--- a/src/main/webapp/templates/code.vm
+++ b/src/main/webapp/templates/code.vm
@@ -6,8 +6,6 @@
#set($extJsParam = $jsService.createExtJSParam().setAction('file'))
#set($extJsParam = $extJsParam.setLazyLoad(true))
$!jsService.includeExtJsFile($extJsParam.setJsFile(':uicomponents/viewers/code.js'))##
-$!jsService.includeExtJsFile($extJsParam.setJsFile(':uicomponents/widgets/fullScreen.js'))##
-
$msg.get('core.viewers.code.title', [$escapetool.xml($doc.getPlainTitle()), $doc.getURL()])
## ----------------------------
## Display the shortcuts
diff --git a/src/main/webapp/templates/createinline.vm b/src/main/webapp/templates/createinline.vm
index b239ae40f..1d245a418 100644
--- a/src/main/webapp/templates/createinline.vm
+++ b/src/main/webapp/templates/createinline.vm
@@ -1,3 +1,5 @@
+#set($jsService = $services.javascript)
+#set($extJsParam = $jsService.createExtJSParam().setAction('file'))
## ---------------------------------------------------------------------------------------------------------
## Since this template can be used for creating a Page or a Space, check the passed "tocreate" parameter
## which can be either "page" or "space". If no "tocreate" parameter is passed then we default to creating a Page.
@@ -127,8 +129,8 @@
## ---------------------------------------------------------------------------------------------------------
## Output JavaScript validation code
## ---------------------------------------------------------------------------------------------------------
-$xwiki.get('jsfx').use('uicomponents/widgets/validation/livevalidation_prototype.js')##
-$xwiki.get('ssfx').use('uicomponents/widgets/validation/livevalidation.css')##
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':uicomponents/widgets/validation/livevalidation_prototype.js'))##
+$services.css.includeCSSPage(':uicomponents/widgets/validation/livevalidation.css')##
-
**#
$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/widgets/modalPopup.js'))##
- $!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/widgets/jumpToPage.js'))##
$!jsService.includeExtJsFile($extJsParam.setJsFile(':uicomponents/widgets/confirmationBox.js'))##
$!jsService.includeExtJsFile($extJsParam.setJsFile(':uicomponents/widgets/confirmedAjaxRequest.js'))##
$!jsService.includeExtJsFile($extJsParam.setJsFile(':uicomponents/widgets/notification.js'))##
diff --git a/src/main/webapp/templates/javascript.vm b/src/main/webapp/templates/javascript.vm
index 081efad45..685e57b90 100644
--- a/src/main/webapp/templates/javascript.vm
+++ b/src/main/webapp/templates/javascript.vm
@@ -1,7 +1,6 @@
##
## CSS files related to JS libraries.
##
-
##
## JS Libraries.
@@ -11,19 +10,25 @@
$!jsService.includeExtJsFile($extJsParam.setJsFile(':celJS/prototype.js'))##
$!jsService.includeExtJsFile($extJsParam.setJsFile(':celJS/jquery.min.js'))##
$!jsService.includeExtJsFile($extJsParam.setJsFile(':celJS/jquery-noconflict.js'))##
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':celJS/initCelements.min.js'))##
$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/xwiki.js'))##
$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/scriptaculous/effects.js'))##
$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/widgets/modalPopup.js'))##
$services.css.includeCSSPage(':js/xwiki/widgets/modalPopup.css')##
-$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/widgets/jumpToPage.js'))##
-##$xwiki.ssfx.use('js/xwiki/widgets/jumpToPage.css', {'forceSkinAction' : true, 'language' : $context.language})
$!jsService.includeExtJsFile($extJsParam.setJsFile(':uicomponents/widgets/confirmationBox.js'))##
$services.css.includeCSSPage(':uicomponents/widgets/confirmationBox.css')##
$!jsService.includeExtJsFile($extJsParam.setJsFile(':uicomponents/widgets/confirmedAjaxRequest.js'))##
$!jsService.includeExtJsFile($extJsParam.setJsFile(':uicomponents/widgets/notification.js'))##
$services.css.includeCSSPage(':uicomponents/widgets/notification.css')##
$!jsService.includeExtJsFile($extJsParam.setJsFile(':uicomponents/widgets/list/xlist.js'))##
-$!jsService.includeExtJsFile($extJsParam.setJsFile(':uicomponents/suggest/suggest.js'))##
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/xwiki-misc.js'))##
+#if($hasedit || $isContentEditor || $isAdmin || ($services.celMenu.getMenuHeaders().size() > 0))
+ $services.css.includeCSSPage(':celRes/celements2.css')##
+ $!jsService.includeExtJsFile($extJsParam.setJsFile(':celJS/moofx/moo.fx.js'))
+ $!jsService.includeExtJsFile($extJsParam.setJsFile(':celJS/moofx/moo.fx.utils.js'))
+ $!jsService.includeExtJsFile($extJsParam.setJsFile(':celJS/adminUi/admininterface.js'))
+ $!jsService.includeExtJsFile($extJsParam.setJsFile(':celJS/adminUi/menubar.js'))
+#end
#if($xwiki.exists('XWiki.SearchSuggestConfig'))
## Hook to request the search suggest script if search suggest configuration is present.
## We can't just have it as a always-use SSX yet since we compute a hash to be sure to refresh
@@ -39,10 +44,15 @@ $!jsService.includeExtJsFile($extJsParam.setJsFile(':uicomponents/suggest/sugges
#set($searchSuggestConfigHash = "${searchSuggestConfigHash}|${sourceId}")
#end
#end
- $!jsService.includeExtJsFile($extJsParam.setJsFile(':uicomponents/search/searchSuggest.js'))##
- $services.css.includeCSSPage(':uicomponents/search/searchSuggest.css')##
#end
#end
+#if(($xcontext.action=="inline")||($xcontext.action=="edit") || ($xcontext.action=="admin"))
+ $!jsService.includeExtJsFile($extJsParam.setJsFile(':uicomponents/widgets/validation/livevalidation_prototype.js'))##
+ $services.css.includeCSSPage(':uicomponents/widgets/validation/livevalidation.css')##
+#end
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/compatibility.js'))##
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':celDynJS/DynamicLoader/celLazyLoader.mjs'))##
+$!services.javascript.getAllExternalJavaScriptFiles()
-#if(($xcontext.action=="inline")||($xcontext.action=="edit") || ($xcontext.action=="admin"))
-$!jsService.includeExtJsFile($extJsParam.setJsFile(':uicomponents/widgets/validation/livevalidation_prototype.js'))##
-$xwiki.get('ssfx').use('uicomponents/widgets/validation/livevalidation.css', true)
-$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/compatibility.js'))##
-$!jsService.includeExtJsFile($extJsParam.setJsFile(':celDynJS/DynamicLoader/celLazyLoader.mjs'))##
-$!services.javascript.getAllExternalJavaScriptFiles()
##
-
+ function prepareCancelEdit() {
+ lockEdit();
+ }
+ function cancelCancelEdit() {
+ cancelCancelEditFlag = false;
+ }
+ Event.observe(window, "unload", cancelEdit);
+ Event.observe(window, "pagehide", cancelEdit);
+ $j(document).ready(prepareCancelEdit);
+ // ]]>
+
#end
##
diff --git a/src/main/webapp/templates/simpleedittoolbar.vm b/src/main/webapp/templates/simpleedittoolbar.vm
deleted file mode 100644
index 69fa74d55..000000000
--- a/src/main/webapp/templates/simpleedittoolbar.vm
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
diff --git a/src/main/webapp/templates/startpage.vm b/src/main/webapp/templates/startpage.vm
index 5c206e9d1..e8d3acc97 100644
--- a/src/main/webapp/templates/startpage.vm
+++ b/src/main/webapp/templates/startpage.vm
@@ -1,6 +1,7 @@
#template("xwikivars.vm")
#template("layoutvars.vm")
#template("htmlheader.vm")
+#set($displayMainMenu = "$request.get('xwikiMenu')" == 'true')
#if($displayMainMenu)