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

ACE-1787: Reverse Merged - Wrong commit was made

Browse Source 
71809: ACE-1787 Drop-down menu icon is not displayed for many cases
             Added a constant arrow symbol ("&#9662") to be used in the drop down menus.
   71928: ACE-1787 Drop-down menu icon is not displayed for many cases
             Added a constant arrow symbol ("&#9662") to be used in the drop down menus. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@72320 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Pavel Yurke
2014-05-30 11:02:18 +00:00
parent 53bfef6c1e 98c262ad02
commit f1fbba755b
3 changed files with 614 additions and 588 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,7 +17,9 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* Enterprise overlay */ /*
* There is an Enterprise overlay for this file
*/
package org.alfresco.web.ui.repo.tag; package org.alfresco.web.ui.repo.tag;
@@ -86,10 +88,20 @@ public class PageTag extends TagSupport
* Please ensure you understand the terms of the license before changing the contents of this file. * 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_URL = "http://www.alfresco.com";
private final static String ALF_LOGO = "/images/logo/alfresco_enterprise.gif"; private final static String ALF_TEXT = "Alfresco Community";
private final static String ALF_TEXT = "Alfresco Enterprise"; private final static String ALF_COPY = "Supplied free of charge with " +
private final static String ALF_COPY = "Certified and supported. Alfresco Software Inc. &copy; 2005-2014 All rights reserved."; "<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 Log logger = LogFactory.getLog(PageTag.class); private final static Log logger = LogFactory.getLog(PageTag.class);
private static String alfresco = null; private static String alfresco = null;
@@ -328,12 +340,12 @@ public class PageTag extends TagSupport
{ {
if (PageTag.alfresco == null) if (PageTag.alfresco == null)
{ {
final String reqPath = ((HttpServletRequest)pageContext.getRequest()).getContextPath(); final HttpServletRequest req = (HttpServletRequest)pageContext.getRequest();
PageTag.alfresco = ("<center><table style='margin: 0px auto;'><tr><td>" + PageTag.alfresco = ("<center><table style='margin: 0px auto;'><tr><td>" +
"<a href='" + ALF_URL + "'>" + "<a href='" + ALF_URL + "'>" +
"<img style='vertical-align:middle;border-width:0px;' width='164' height='26' alt='' title='" + ALF_TEXT + "<img style='vertical-align:middle;border-width:0px;' width='176' height='26' alt='' title='" + ALF_TEXT +
"' src='" + reqPath + ALF_LOGO + "'/>" + "' src='" + ("http".equals(req.getScheme()) ? ALF_LOGO_HTTP : ALF_LOGO_HTTPS) +
"</a></td><td align='center'>" + "'>" +"</a></td><td align='center'>" +
"<span class='footer'>" + ALF_COPY + "<span class='footer'>" + ALF_COPY +
"</span></td><td></td></tr></table></center>"); "</span></td><td></td></tr></table></center>");
} }

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

@@ -100,7 +100,7 @@
<param-value>false</param-value> <param-value>false</param-value>
</context-param> </context-param>
<context-param><param-name>productionMode</param-name><param-value>true</param-value><description>Vaadin production mode</description></context-param> <!-- Activiti context param placeholder -->
<filter> <filter>
<filter-name>CMIS security context cleaning filter</filter-name> <filter-name>CMIS security context cleaning filter</filter-name>
@@ -240,8 +240,7 @@
<url-pattern>/d/*</url-pattern> <url-pattern>/d/*</url-pattern>
</filter-mapping> </filter-mapping>
<filter-mapping><filter-name>Global Authentication Filter</filter-name><url-pattern>/activiti-admin/*</url-pattern></filter-mapping> <!-- Activiti Global Authentication Filter mapping placeholder -->
<filter-mapping><filter-name>Global Authentication Filter</filter-name><url-pattern>/VAADIN/*</url-pattern></filter-mapping>
<!-- The Cookie WebScript Authentication filter sits in front of web service URLs in addition to the global authentication filter --> <!-- The Cookie WebScript Authentication filter sits in front of web service URLs in addition to the global authentication filter -->
<filter-mapping> <filter-mapping>
@@ -384,7 +383,7 @@
<listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class> <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
</listener> </listener>
<listener><listener-class>org.springframework.web.context.request.RequestContextListener</listener-class></listener> <!-- Activiti listener placeholder -->
<!-- Faces Servlet --> <!-- Faces Servlet -->
@@ -635,7 +634,7 @@
</init-param> </init-param>
</servlet> </servlet>
<servlet><servlet-name>Vaadin Application Servlet</servlet-name><servlet-class>org.activiti.explorer.servlet.ExplorerApplicationServlet</servlet-class></servlet> <!-- Activiti servlet placeholder -->
<servlet-mapping> <servlet-mapping>
<servlet-name>Faces Servlet</servlet-name> <servlet-name>Faces Servlet</servlet-name>
@@ -835,8 +834,7 @@
</servlet-mapping> </servlet-mapping>
CMISTCK --> CMISTCK -->
<servlet-mapping><servlet-name>Vaadin Application Servlet</servlet-name><url-pattern>/activiti-admin/*</url-pattern></servlet-mapping> <!-- Activiti servlet mapping placeholder -->
<servlet-mapping><servlet-name>Vaadin Application Servlet</servlet-name><url-pattern>/VAADIN/*</url-pattern></servlet-mapping>
<session-config> <session-config>
<session-timeout>60</session-timeout> <session-timeout>60</session-timeout>

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

@@ -186,11 +186,27 @@
</tr> </tr>
<tr> <tr>
<td width="50%" align="right"> <td width="50%" align="right">
Supported language packs: Language and translation packs:
</td> </td>
<td>&nbsp;&#8226;&nbsp;</td> <td>&nbsp;&#8226;&nbsp;</td>
<td width="50%"> <td width="50%">
French, German, Italian, (European) Spanish and Japanese. 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
</td> </td>
</tr> </tr>
</table> </table>