pvollenweider 2005/03/09 12:05:38 CET
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/view/jsp/include left_menu.inc links.inc main_menu.inc
src/view/jsp web_css.jsp
Added files: (Branch: JAHIA-4-1-BRANCH)
src/view/jsp/images remote.gif
Log:
Add 'shortcut' picto for remote and linked pages in navigagtion menus
Revision Changes Path
1.1.4.1 +1 -0
corporate_portal_templates/src/view/jsp/images/remote.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/images/remote.gif?rev=1.1.4.1&content-type=text/plain
1.13.4.1 +25 -3
corporate_portal_templates/src/view/jsp/include/left_menu.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/left_menu.inc.diff?r1=1.13&r2=1.13.4.1&f=h
1.1.4.1 +2 -2 corporate_portal_templates/src/view/jsp/include/links.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/links.inc.diff?r1=1.1&r2=1.1.4.1&f=h
1.14.4.1 +25 -2
corporate_portal_templates/src/view/jsp/include/main_menu.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/main_menu.inc.diff?r1=1.14&r2=1.14.4.1&f=h
1.28.4.2 +4 -0 corporate_portal_templates/src/view/jsp/web_css.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/web_css.jsp.diff?r1=1.28.4.1&r2=1.28.4.2&f=h
Index: left_menu.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/left_menu.inc,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -u -r1.13 -r1.13.4.1
--- left_menu.inc 10 Nov 2004 10:46:40 -0000 1.13
+++ left_menu.inc 9 Mar 2005 11:05:37 -0000 1.13.4.1
@@ -60,7 +60,14 @@
out.println(">");
out.println("<a class=\"leftlevel" + currentLevel);
- out.println("\" href=\"" + linkBean.getUrl() +
"\">"+pageTitle+"</a>");
+ out.println("\" href=\"" + linkBean.getUrl() +
"\"><span");
+ if ((linkBean.getType() ==
PageInfoInterface.TYPE_URL) ||
+ (linkBean.getType() ==
PageInfoInterface.TYPE_LINK )) {
+ out.println(" class='remote'");
+ }
+ out.println(">");
+ out.println(pageTitle);
+ out.println("</span></a>");
// displays action buttons on container
jData.gui().html().drawBeginActionMenu(linksContainerBean, null, null, false,
"", "jahiatemplates.Corporate_portal_templates", null, out);
@@ -211,8 +218,23 @@
onclick="goTo('<bean:write name='link'
property='url'/>')"
</jahia:ifNotEditMode>
>
- <a href="<bean:write name='link'
property='url'/>" class="leftlevel1"><bean:write name="link"
- property="title" filter="false"/></a>
+ <a href="<bean:write name='link'
property='url'/>" class="leftlevel1">
+ <%
+ PageBean link = (PageBean)
pageContext.getAttribute("link");
+ boolean isRemoteLink =
+ (link.getType() ==
PageInfoInterface.TYPE_URL) ||
+ (link.getType() ==
PageInfoInterface.TYPE_LINK );
+ if (isRemoteLink) {
+ %><span class='remote'><%
+ }
+ %>
+ <bean:write name="link" property="title"
filter="false"/>
+ <%
+ if (isRemoteLink) {
+ %></span><%
+ }
+ %>
+ </a>
<jahiaHtml:actionMenu name="linkContainer"
namePostFix="" resourceBundle="jahiatemplates.Corporate_portal_templates"
useFieldSet="false">
</jahiaHtml:actionMenu>
<%
Index: links.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/links.inc,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- links.inc 28 Oct 2003 22:56:41 -0000 1.1
+++ links.inc 9 Mar 2005 11:05:37 -0000 1.1.4.1
@@ -65,8 +65,8 @@
<%
if ( directoryLink != null ) {
%>
- <td valign="top" width="16"><a class="box" <%if
(directoryLink.getPageType() == 2){%>target="_new"<%}%>
href="<%=directoryLink.getUrl(jData.params())%>"><img
src="<%=theURL%>/images/icons/standard/link.gif" alt="* " width="16"
height="16" border="0"/></a></td>
- <td valign="top"><a class="box" <%if
(directoryLink.getPageType() == 2){%>target="_new"<%}%>
href="<%=directoryLink.getUrl(jData.params())%>"><%=directoryLink.getTitle()%></a></td>
+ <td valign="top" width="16"><a class="box" <%if
(directoryLink.getPageType() ==
PageInfoInterface.TYPE_URL){%>target="_blank"<%}%>
href="<%=directoryLink.getUrl(jData.params())%>"><img
src="<%=theURL%>/images/icons/standard/link.gif" alt="* " width="16"
height="16" border="0"/></a></td>
+ <td valign="top"><a class="box" <%if
(directoryLink.getPageType() ==
PageInfoInterface.TYPE_URL){%>target="_blank"<%}%>
href="<%=directoryLink.getUrl(jData.params())%>"><%=directoryLink.getTitle()%></a></td>
<%
} else {
%>
Index: main_menu.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/main_menu.inc,v
retrieving revision 1.14
retrieving revision 1.14.4.1
diff -u -r1.14 -r1.14.4.1
--- main_menu.inc 9 Nov 2004 19:21:23 -0000 1.14
+++ main_menu.inc 9 Mar 2005 11:05:37 -0000 1.14.4.1
@@ -95,6 +95,9 @@
onmouseover += "topOn" + myColorSet + "('menu" +
menuCount + "');";
onmouseout += "topOff('menu" + menuCount + "');";
}
+ boolean isRemoteLink =
+ (topLinkBean.getType() ==
PageInfoInterface.TYPE_URL) ||
+ (topLinkBean.getType() ==
PageInfoInterface.TYPE_LINK );
%>
<td id="menu<%=menuCount%>" class="<bean:write
name="classpath"/><bean:write name="myColorSet"/>">
<a href="<bean:write name='topLink' property='url'/>"<%
@@ -104,10 +107,19 @@
if (! "".equals(onmouseout)) {
%> onmouseout="<%=onmouseout%>"<%
}
- %>><bean:write name="topLink" property="title"
filter="false"/>
+ %>><%
+ if (isRemoteLink) {
+ %><span class='remote'><%
+ }
+ %><bean:write name="topLink" property="title"
filter="false"/>
<logic:empty name="topLink"
property="title"><span style="color:#ff0000;"><content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="noTitle"
defaultValue="No
title"/></span></logic:empty>
+ <%
+ if (isRemoteLink) {
+ %></span><%
+ }
+ %>
</a>
<jahiaHtml:actionMenu name="topMenuContainer"
namePostFix="" resourceBundle="jahiatemplates.Corporate_portal_templates"
useFieldSet="false">
</jahiaHtml:actionMenu>
@@ -146,7 +158,18 @@
JahiaPage myLink = (JahiaPage)
myContainer.getFieldObject( "link" );
if (myLink != null){
subMenuCount++;
- div.append(" <a
href=\"").append(myLink.getURL(jData.params())).append("\">").append(myLink.getTitle()).append("</a>\n");
+ boolean isRemoteLink =
+ (myLink.getPageType() ==
PageInfoInterface.TYPE_URL) ||
+ (myLink.getPageType() ==
PageInfoInterface.TYPE_LINK );
+ div.append(" <a
href=\"").append(myLink.getURL(jData.params())).append("\">");
+ if (isRemoteLink) {
+ div.append("<span class='remote'>");
+ }
+ div.append(myLink.getTitle());
+ if (isRemoteLink) {
+ div.append("</span>");
+ }
+ div.append("</a>\n");
if (myLink.getTitle() != null) {
int w = myLink.getTitle().length() *
6 + 30;
if (w > subMenuWidth) {
Index: web_css.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/web_css.jsp,v
retrieving revision 1.28.4.1
retrieving revision 1.28.4.2
diff -u -r1.28.4.1 -r1.28.4.2
--- web_css.jsp 2 Mar 2005 10:00:46 -0000 1.28.4.1
+++ web_css.jsp 9 Mar 2005 11:05:37 -0000 1.28.4.2
@@ -535,6 +535,10 @@
font-family: Arial, Helvetica, sans-serif;
font-size: 11px;
}
+.remote {
+ background:url(images/remote.gif) no-repeat 0 2px;
+ padding-left: 10px;
+}
## webapps
.waMenu a ,a.waMenu{color: #000000; }
Index: remote.gif
===================================================================
<<Binary file>>
