inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

MNT-10255: Merged DEV to V4.2-BUG-FIX (4.2.1).

Browse Source 
59393: MNT-10255 Mac OS -CIFS: Collaborator/editor can delete content created by other site members after editing.
           - In ScenarioTempDeleteShuffle.createInstance() was added check: (operation instanceof MoveFileOperation).



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59504 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Pavel Yurke
2014-01-08 10:54:10 +00:00
parent eefc607ebf
commit b0071b8afb
3 changed files with 586 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/java/org/alfresco/web/ui/repo/tag/PageTag.java
View File

@@ -17,9 +17,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* There is an Enterprise overlay for this file
*/
/* Enterprise overlay */
package org.alfresco.web.ui.repo.tag;
@@ -88,20 +86,10 @@ public class PageTag extends TagSupport
* Please ensure you understand the terms of the license before changing the contents of this file.
*/
private final static String ALF_LOGO_HTTP = "http://www.alfresco.com/assets/images/logos/community-4.2.png";
private final static String ALF_LOGO_HTTPS = "https://www.alfresco.com/assets/images/logos/community-4.2.png";
private final static String ALF_URL = "http://www.alfresco.com";
private final static String ALF_TEXT = "Alfresco Community";
private final static String ALF_COPY = "Supplied free of charge with " +
"<a class='footer' href='http://www.alfresco.com/services/support/communityterms/#support'>no support</a>, " +
"<a class='footer' href='http://www.alfresco.com/services/support/communityterms/#certification'>no certification</a>, " +
"<a class='footer' href='http://www.alfresco.com/services/support/communityterms/#maintenance'>no maintenance</a>, " +
"<a class='footer' href='http://www.alfresco.com/services/support/communityterms/#warranty'>no warranty</a> and " +
"<a class='footer' href='http://www.alfresco.com/services/support/communityterms/#indemnity'>no indemnity</a> by " +
"<a class='footer' href='http://www.alfresco.com'>Alfresco</a> or its " +
"<a class='footer' href='http://www.alfresco.com/partners/'>Certified Partners</a>. " +
"<a class='footer' href='http://www.alfresco.com/services/support/'>Click here for support</a>. " +
"Alfresco Software Inc. &copy; 2005-2014 All rights reserved.";
private final static String ALF_LOGO = "/images/logo/alfresco_enterprise.gif";
private final static String ALF_TEXT = "Alfresco Enterprise";
private final static String ALF_COPY = "Certified and supported. Alfresco Software Inc. &copy; 2005-2014 All rights reserved.";
private final static Log logger = LogFactory.getLog(PageTag.class);
private static String alfresco = null;
@@ -340,12 +328,12 @@ public class PageTag extends TagSupport
{
if (PageTag.alfresco == null)
{
final HttpServletRequest req = (HttpServletRequest)pageContext.getRequest();
final String reqPath = ((HttpServletRequest)pageContext.getRequest()).getContextPath();
PageTag.alfresco = ("<center><table style='margin: 0px auto;'><tr><td>" +
"<a href='" + ALF_URL + "'>" +
"<img style='vertical-align:middle;border-width:0px;' width='176' height='26' alt='' title='" + ALF_TEXT +
"' src='" + ("http".equals(req.getScheme()) ? ALF_LOGO_HTTP : ALF_LOGO_HTTPS) +
"'>" +"</a></td><td align='center'>" +
"<img style='vertical-align:middle;border-width:0px;' width='164' height='26' alt='' title='" + ALF_TEXT +
"' src='" + reqPath + ALF_LOGO + "'/>" +
"</a></td><td align='center'>" +
"<span class='footer'>" + ALF_COPY +
"</span></td><td></td></tr></table></center>");
}

9
source/web/WEB-INF/web.xml
View File

@@ -100,7 +100,7 @@
<param-value>false</param-value>
</context-param>
<!-- Activiti context param placeholder -->
<context-param><param-name>productionMode</param-name><param-value>true</param-value><description>Vaadin production mode</description></context-param>
<filter>
<filter-name>CMIS security context cleaning filter</filter-name>
@@ -380,7 +380,7 @@
<listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
</listener>
<!-- Activiti listener placeholder -->
<listener><listener-class>org.springframework.web.context.request.RequestContextListener</listener-class></listener>
<!-- Faces Servlet -->
@@ -631,7 +631,7 @@
</init-param>
</servlet>
<!-- Activiti servlet placeholder -->
<servlet><servlet-name>Vaadin Application Servlet</servlet-name><servlet-class>org.activiti.explorer.servlet.ExplorerApplicationServlet</servlet-class></servlet>
<servlet-mapping>
<servlet-name>Faces Servlet</servlet-name>
@@ -831,7 +831,8 @@
</servlet-mapping>
CMISTCK -->
<!-- Activiti servlet mapping placeholder -->
<servlet-mapping><servlet-name>Vaadin Application Servlet</servlet-name><url-pattern>/activiti-admin/*</url-pattern></servlet-mapping>
<servlet-mapping><servlet-name>Vaadin Application Servlet</servlet-name><url-pattern>/VAADIN/*</url-pattern></servlet-mapping>
<session-config>
<session-timeout>60</session-timeout>

20
source/web/jsp/dialog/about.jsp
View File

@@ -186,27 +186,11 @@
</tr>
<tr>
<td width="50%" align="right">
Language and translation packs:
Supported language packs:
</td>
<td>&nbsp;&#8226;&nbsp;</td>
<td width="50%">
Camille B&eacute;gnis,
Andrejus Chaliapinas,
Laurent Genier,
Antti Jokipii,
Henning Kristensen,
Betty Mai,
Fabian Mandelbaum,
Theodoros Papageorgiou,
Helio Silvio Piccinatto,
Gian Luca Farina Perseu,
Alex Revesz,
Christian Roy,
Philippe Seillier,
Frank Shipley,
Michiel Steltman,
Gert Thiel,
cnalfresco
French, German, Italian, (European) Spanish and Japanese.
</td>
</tr>
</table>