mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
13424: ETHREEOH-1242: Sample LDAP authentication config breaks site invites in Share 13427: Fixes for ETHREEOH-1157: Propagate exceptions using ReportedException 13428: Fix ETHREEOH-1493: Upgrade from 2.1-A to 3.1 uses incorrect patch id and fixes_to_schema 13429: Specific fix for ETHREEOH-1157: duplicate/triplicate users not properly prohibited 13436: Merged V2.2 to V3.1 13435: Merged V2.1 to V2.2 12307: Merged DEV/V2.1SP7 to 2.1 11927: ETWOONE-396 12112: ETWOONE-396 13437: Fixed ETHREEOH-1498: Mismatched closing XML tag in ehcache-custom.xml.sample.cluster 13439: Fix for ETHREEOH-1157: JSF Dialogs Absorbing Exceptions 13456: Fixed ETHREEOH-1472: Changes to systemBootstrap cause bootstrapping ACP's not to work 13469: Upgrade patch to update internal version2Store counter (follow-on fix for ETHREEOH-1540) 13491: Chaining example for DOC-84 13492: Fixed paths in zip file 13494: Fixed GenericBootstrapPatch when overriding bootstrap views 13495: Added @version javadoc 13496: Minor logging updates 13497: Fixed ETHREEOH-1431: Authentication case sensitivity switch doesn't work 13500: Temporary fix for Sharepoint issue raised last week 13502: ETHREEOH-1575: It's impossible to create Change Request task 13511: Fix for ETHREEOH-1549: Impossible to create HTML web content 13529: Fix for ETHREEOH-1595 13531: Fix for ETHREEOH-1607: Error on chaining example xml - malformed comment 13537: Build fix ... exclude the system user from auto creation 13538: Build Fix - further contraints to aviod auto-creation of guest ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V2.1:r12307 Merged /alfresco/BRANCHES/V2.2:r13435 Merged /alfresco/BRANCHES/V3.1:r 13424,13427-13429,13436-13437,13439,13442-13450,13452,13454-13456, 13469-13473,13475-13476,13479-13480,13491-13500,13502,13511,13529-13538 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
112 lines
4.8 KiB
Plaintext
112 lines
4.8 KiB
Plaintext
<!--
|
|
* Copyright (C) 2005-2007 Alfresco Software Limited.
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
* As a special exception to the terms and conditions of version 2.0 of
|
|
* the GPL, you may redistribute this Program in connection with Free/Libre
|
|
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
|
* FLOSS exception. You should have recieved a copy of the text describing
|
|
* the FLOSS exception, and it is also available here:
|
|
* http://www.alfresco.com/legal/licensing
|
|
-->
|
|
<jsp:root version="1.2"
|
|
xmlns:jsp="http://java.sun.com/JSP/Page"
|
|
xmlns:c="http://java.sun.com/jsp/jstl/core"
|
|
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
|
|
xmlns:f="http://java.sun.com/jsf/core"
|
|
xmlns:h="http://java.sun.com/jsf/html">
|
|
|
|
<jsp:output doctype-root-element="html"
|
|
doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
|
|
doctype-system="http://www.w3c.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
|
|
|
|
<jsp:directive.page language="java" contentType="text/html; charset=UTF-8"/>
|
|
<jsp:directive.page isELIgnored="false"/>
|
|
<script language="javascript"
|
|
type="text/javascript"
|
|
src="${pageContext.request.contextPath}/scripts/tiny_mce/tiny_mce.js"> </script>
|
|
<script language="javascript"
|
|
type="text/javascript"
|
|
src="${pageContext.request.contextPath}/scripts/ajax/common.js"> </script>
|
|
|
|
<script language="javascript" type="text/javascript">
|
|
<!-- Init the Tiny MCE in-line HTML editor -->
|
|
var alfresco = typeof alfresco == "undefined" ? {} : alfresco;
|
|
alfresco.constants = typeof alfresco.constants == "undefined" ? {} : alfresco.constants;
|
|
|
|
alfresco.constants.WEBAPP_CONTEXT = "${pageContext.request.contextPath}";
|
|
alfresco.constants.AVM_WEBAPP_URL = "${WizardManager.bean.previewSandboxUrl}";
|
|
|
|
alfresco.resources =
|
|
{
|
|
//XXXarielb deal with encoding
|
|
add_content: "${msg.add_content}",
|
|
cancel: "${msg.cancel}",
|
|
change: "${msg.change}",
|
|
go_up: "${msg.go_up}",
|
|
ide: "${msg.idle}",
|
|
loading: "${msg.loading}",
|
|
path: "${msg.path}",
|
|
select: "${msg.select}",
|
|
upload: "${msg.upload}"
|
|
};
|
|
|
|
tinyMCE.init({
|
|
theme : "advanced",
|
|
language : "${pageContext.request.locale.language}",
|
|
mode : "exact",
|
|
elements : "editor",
|
|
save_callback : "saveContent",
|
|
plugins : "table",
|
|
theme_advanced_toolbar_location : "top",
|
|
theme_advanced_toolbar_align : "left",
|
|
theme_advanced_buttons1_add : "fontselect,fontsizeselect",
|
|
theme_advanced_buttons2_add : "separator,forecolor,backcolor",
|
|
theme_advanced_buttons3_add_before : "tablecontrols,separator",
|
|
theme_advanced_disable: "styleselect",
|
|
extended_valid_elements : "a[href|target|name],font[face|size|color|style],span[class|align|style]",
|
|
urlconverter_callback: "alfresco_TinyMCE_urlconverter_callback",
|
|
file_browser_callback: "alfresco_TinyMCE_file_browser_callback"
|
|
});
|
|
|
|
function saveContent(id, content)
|
|
{
|
|
document.getElementById("wizard:wizard-body:editor-output").value = content;
|
|
return content;
|
|
}
|
|
</script>
|
|
<script language="javascript"
|
|
type="text/javascript"
|
|
src="${pageContext.request.contextPath}/scripts/ajax/dojo/dojo.js"> </script>
|
|
<script language="javascript"
|
|
type="text/javascript"
|
|
src="${pageContext.request.contextPath}/scripts/ajax/tiny_mce_wcm_extensions.js"> </script>
|
|
<script language="javascript"
|
|
type="text/javascript"
|
|
src="${pageContext.request.contextPath}/scripts/ajax/ajax_helper.js"> </script>
|
|
<script language="javascript"
|
|
type="text/javascript"
|
|
src="${pageContext.request.contextPath}/scripts/ajax/file_picker_widget.js"> </script>
|
|
<script language="javascript"
|
|
type="text/javascript"
|
|
src="${pageContext.request.contextPath}/scripts/upload_helper.js"> </script>
|
|
|
|
<div id='editor' style='width:100%; height:360px'>
|
|
<h:outputText value="#{WizardManager.bean.content}" escape="false" />
|
|
</div>
|
|
<h:inputHidden id="editor-output" value="#{WizardManager.bean.content}" />
|
|
</jsp:root>
|