mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
15908: Merged V3.1 to V3.2 (record only) 15907: Merged V3.2 to V3.1 15683: Fixed potential concurrency issues in HeartBeat and LicenseComponent 15972: Merged V3.1 to V3.2 15429: **Record only** I18N message IDs for JSF dashlets 15947: ETHREEOH-2565: The content size shown in the preview popup is incorrect 15952: Part of fix for ETHREEOH-2493 - missing html encoding on webscript 404 html status page. 15953: Fix for ETHREEOH-2364 - LDAP sync missing last name displayed as null. 15956: Fix for ETHREEOH-2714 - html encoding in Create New User summary page. 15957: Merged DEV-TEMPORARY to V3.1 15865: Fix for ETHREEOH-2673 15958: Merged DEV-TEMPORARY to V3.1 15885: ETHREEOH-2615: Localization Issue - Japanese UI 15959: Merged DEV-TEMPORARY to V3.1 15882: ETHREEOH-2644: Sending Email using Template throws exception 15962: Fix for ETHREEOH-2390 15963: Fix ETHREEOH-1962: Hibernate flush ordering incorrect for alf_qname 15965: Merged DEV/BELARUS/V3.1 15949: ETHREEOH-2689: When upgrading from 2.1.7e to 3.1.0e/3.1.1e user roles are mapped incorrectly 15966: Merged V2.2 to V3.1 15948: (RECORD ONLY) Backport of the fix provided for ETHREEOH-1719. 15969: Prep for ETHREEOH-2295 fixes and associated merges. 15970: Merged DEV-TEMPORARY to V3.1 14360: ETHREEOH-1571, ETHREEOH-1656, ETHREEOH-1404, ETHREEOH-953, ALFCOM-2650, ETHREEOH-1572, ETHREEOH-1574 15331: ETHREEOH-2295 - LayeredFile: Layer file/folder is present when original file/folder is removed 15824: ETHREEOH-2295 - higlight stale object ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/DEV/BELARUS/V3.1:r15865,15882,15885,15949 Merged /alfresco/BRANCHES/DEV/3.1SP2:r14360,15331,15824 Merged /alfresco/BRANCHES/V2.2:r15948 Merged /alfresco/BRANCHES/V3.1:r15907,15947-15962,15964-15970 Merged /alfresco/BRANCHES/V3.2:r15908,15972 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
196 lines
6.7 KiB
Plaintext
196 lines
6.7 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"
|
|
--%>
|
|
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
|
|
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
|
|
<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a"%>
|
|
<%@ taglib uri="/WEB-INF/repo.tld" prefix="r"%>
|
|
|
|
<%@ page buffer="32kb" contentType="text/html;charset=UTF-8"%>
|
|
<%@ page isELIgnored="false"%>
|
|
<%@ page import="javax.faces.context.FacesContext"%>
|
|
<%@ page import="org.alfresco.web.app.Application"%>
|
|
<%@ page import="org.alfresco.web.bean.wcm.AddAvmContentDialog"%>
|
|
<%@ page import="org.alfresco.web.app.servlet.FacesHelper"%>
|
|
<%@ page import="org.alfresco.web.ui.common.PanelGenerator"%>
|
|
|
|
|
|
<%
|
|
boolean fileUploaded = false;
|
|
|
|
AddAvmContentDialog dialog = (AddAvmContentDialog) FacesHelper.getManagedBean(FacesContext.getCurrentInstance(), "AddAvmContentDialog");
|
|
if (dialog != null && dialog.getFileName() != null)
|
|
{
|
|
fileUploaded = true;
|
|
}
|
|
%>
|
|
<f:verbatim>
|
|
<script type="text/javascript" src="<%=request.getContextPath()%>/scripts/validation.js"> </script>
|
|
<%
|
|
if (fileUploaded)
|
|
{
|
|
PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc");
|
|
out.write("<img alt='' align='absmiddle' src='");
|
|
out.write(request.getContextPath());
|
|
out.write("/images/icons/info_icon.gif' /> ");
|
|
out.write(dialog.getFileUploadSuccessMsg());
|
|
PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner");
|
|
out.write("<div style='padding:2px;'></div>");
|
|
}
|
|
%>
|
|
<table cellpadding="2" cellspacing="2" border="0" width="100%">
|
|
</f:verbatim>
|
|
<%
|
|
if (fileUploaded == false)
|
|
{
|
|
%>
|
|
<f:verbatim>
|
|
<tr>
|
|
<td colspan="3" class="wizardSectionHeading">
|
|
</f:verbatim>
|
|
<h:outputText id="text0" value="#{msg.upload_content}" />
|
|
<f:verbatim>
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<td></f:verbatim>
|
|
<h:panelGrid id="upload_panel" columns="2" cellpadding="2" cellspacing="2" border="0" width="100%" columnClasses="panelGridLabelColumn,panelGridValueColumn">
|
|
|
|
<h:outputText value="#{msg.locate_content}" style="padding-left:8px"/>
|
|
<f:verbatim/>
|
|
|
|
<h:outputText id="out_schema" value="#{msg.file_location}:" style="padding-left:8px" />
|
|
<r:upload id="uploader" value="#{DialogManager.bean.fileName}" framework="dialog"/>
|
|
</h:panelGrid>
|
|
<f:verbatim></td>
|
|
</tr></f:verbatim>
|
|
<%
|
|
}
|
|
%>
|
|
<%
|
|
if (fileUploaded)
|
|
{
|
|
%>
|
|
<f:verbatim>
|
|
<tr>
|
|
<td colspan="3">
|
|
<table border="0" cellspacing="2" cellpadding="2" class="selectedItems">
|
|
<tr>
|
|
<td colspan="2" class="selectedItemsHeader"></f:verbatim><h:outputText id="text2" value="#{msg.uploaded_content}" /><f:verbatim>
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<td class="selectedItemsRow"></f:verbatim><h:outputText id="text3" value="#{DialogManager.bean.fileName}" /><f:verbatim></td>
|
|
<td></f:verbatim><a:actionLink image="/images/icons/delete.gif" value="#{msg.remove}" action="#{DialogManager.bean.removeUploadedFile}" showLink="false" id="link1" /><f:verbatim></td>
|
|
</tr>
|
|
</table>
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paddingRow"></td>
|
|
</tr>
|
|
<tr>
|
|
<td colspan="3" class="wizardSectionHeading">
|
|
</f:verbatim>
|
|
<h:outputText id="text4" value="#{msg.general_properties}" />
|
|
<f:verbatim>
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paddingRow"></td>
|
|
</tr>
|
|
<tr>
|
|
<td align="middle">
|
|
</f:verbatim>
|
|
<h:graphicImage id="required_field" value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
|
|
<f:verbatim>
|
|
</td>
|
|
<td>
|
|
</f:verbatim>
|
|
<h:outputText id="text5" value="#{msg.name}:" />
|
|
<f:verbatim>
|
|
</td>
|
|
<td width="85%">
|
|
</f:verbatim>
|
|
<h:inputText id="name" value="#{DialogManager.bean.fileName}" maxlength="1024" size="35" onkeyup="checkButtonState();" onchange="checkButtonState();" />
|
|
<f:verbatim>
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>
|
|
</f:verbatim>
|
|
<h:outputText id="text7" value="#{msg.content_type}:" />
|
|
<f:verbatim>
|
|
</td>
|
|
<td>
|
|
</f:verbatim>
|
|
<r:mimeTypeSelector id="mime-type" value="#{DialogManager.bean.mimeType}" />
|
|
<f:verbatim>
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>
|
|
</f:verbatim>
|
|
<h:outputText id="text8" value="#{msg.encoding}:" />
|
|
<f:verbatim>
|
|
</td>
|
|
<td>
|
|
</f:verbatim>
|
|
<r:charsetSelector id="charset" value="#{DialogManager.bean.encoding}" />
|
|
<f:verbatim>
|
|
</td>
|
|
</tr>
|
|
</f:verbatim>
|
|
<%
|
|
}
|
|
%>
|
|
<f:verbatim>
|
|
</table>
|
|
|
|
<script type="text/javascript">
|
|
var finishButtonPressed = false;
|
|
window.onload = pageLoaded;
|
|
|
|
function pageLoaded()
|
|
{
|
|
document.getElementById("dialog").onsubmit = validateDialog;
|
|
document.getElementById("dialog:finish-button").onclick = function() {finishButtonPressed = true; clear_dialog();}
|
|
}
|
|
|
|
function checkButtonState()
|
|
{
|
|
if (document.getElementById("dialog:dialog-body:name").value.length == 0 )
|
|
{
|
|
document.getElementById("dialog:finish-button").disabled = true;
|
|
}
|
|
else
|
|
{
|
|
document.getElementById("dialog:finish-button").disabled = false;
|
|
}
|
|
}
|
|
|
|
</script>
|
|
</f:verbatim> |