shuber 2005/03/11 09:43:50 CET
Modified files:
src/view/jsp/include box_webapps.inc declarations.inc
header.inc
Added files:
src/view/jsp/images/portlets tabBorder.gif tabLeft.gif
tabRight.gif windowStates.gif
windowStates_maximized.gif
windowStates_minimized.gif
windowStates_normal.gif
src/view/jsp portlets.css
Log:
Integrate portlet modes and window states into templates.
Revision Changes Path
1.1 +1 -0
corporate_portal_templates/src/view/jsp/images/portlets/tabBorder.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/images/portlets/tabBorder.gif?rev=1.1&content-type=text/plain
1.1 +1 -0
corporate_portal_templates/src/view/jsp/images/portlets/tabLeft.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/images/portlets/tabLeft.gif?rev=1.1&content-type=text/plain
1.1 +1 -0
corporate_portal_templates/src/view/jsp/images/portlets/tabRight.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/images/portlets/tabRight.gif?rev=1.1&content-type=text/plain
1.1 +1 -0
corporate_portal_templates/src/view/jsp/images/portlets/windowStates.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/images/portlets/windowStates.gif?rev=1.1&content-type=text/plain
1.1 +1 -0
corporate_portal_templates/src/view/jsp/images/portlets/windowStates_maximized.gif
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/images/portlets/windowStates_maximized.gif?rev=1.1&content-type=text/plain
1.1 +2 -0
corporate_portal_templates/src/view/jsp/images/portlets/windowStates_minimized.gif
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/images/portlets/windowStates_minimized.gif?rev=1.1&content-type=text/plain
1.1 +1 -0
corporate_portal_templates/src/view/jsp/images/portlets/windowStates_normal.gif
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/images/portlets/windowStates_normal.gif?rev=1.1&content-type=text/plain
1.2 +6 -1
corporate_portal_templates/src/view/jsp/include/box_webapps.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/box_webapps.inc.diff?r1=1.1&r2=1.2&f=h
1.7 +1 -0
corporate_portal_templates/src/view/jsp/include/declarations.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/declarations.inc.diff?r1=1.6&r2=1.7&f=h
1.10 +1 -0
corporate_portal_templates/src/view/jsp/include/header.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/header.inc.diff?r1=1.9&r2=1.10&f=h
1.1 +106 -0 corporate_portal_templates/src/view/jsp/portlets.css
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/portlets.css?rev=1.1&content-type=text/plain
Index: box_webapps.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/box_webapps.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- box_webapps.inc 28 Oct 2003 22:56:41 -0000 1.1
+++ box_webapps.inc 11 Mar 2005 08:43:49 -0000 1.2
@@ -1,6 +1,11 @@
<content:containerList name='<%="webappsContainer" + id%>'
id="webappsContainerList" parentContainerName="boxContainer">
<content:container>
- <content:applicationField name='<%="webapp" + id%>'/>
+ <content:applicationField name='<%="webapp" + id%>' id="webapp"
display="false" />
+ <bean:define id="portletWindowBean" name="webapp" property="object"
/>
+ <jahiaHtml:portletModes name="portletWindowBean" />
+ <jahiaHtml:windowStates name="portletWindowBean" />
+ <br/>
+ <bean:write name="webapp" property="value" filter="false" />
<content:updateContainerURL id="updateWebappsContainerURL"
display="false"/>
<content:deleteContainerURL id="deleteWebappsContainerURL"
display="false"/>
<logic:present name="updateWebappsContainerURL">
Index: declarations.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/declarations.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- declarations.inc 6 Aug 2004 10:02:34 -0000 1.6
+++ declarations.inc 11 Mar 2005 08:43:49 -0000 1.7
@@ -8,6 +8,7 @@
<%@ page import="java.io.IOException"%>
<%@ page import="org.jahia.data.*" %>
<%@ page import="org.jahia.data.beans.*" %>
+<%@ page import="org.jahia.data.beans.portlets.*" %>
<%@ page import="org.jahia.data.containers.*" %>
<%@ page import="org.jahia.data.fields.*" %>
<%@ page import="org.jahia.data.files.*" %>
Index: header.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/header.inc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- header.inc 28 Feb 2005 17:58:51 -0000 1.9
+++ header.inc 11 Mar 2005 08:43:49 -0000 1.10
@@ -50,6 +50,7 @@
<link rel="stylesheet"
href="<jahia:contextURL/>/web_css.jsp?colorSet=<%=colorSet%>"
type="text/css"></link>
<link rel="stylesheet" href="<jahia:contextURL/>/jforum.css"
type="text/css"></link>
+<link rel="stylesheet" href="<jahia:contextURL/>/portlets.css"
type="text/css"></link>
<%
if (! isNS4(request)){
%><script language="javascript1.2" type="text/javascript"
src="<jahia:contextURL/>/menu.js"></script><%
Index: tabBorder.gif
===================================================================
<<Binary file>>
Index: tabLeft.gif
===================================================================
<<Binary file>>
Index: tabRight.gif
===================================================================
<<Binary file>>
Index: windowStates.gif
===================================================================
<<Binary file>>
Index: windowStates_maximized.gif
===================================================================
<<Binary file>>
Index: windowStates_minimized.gif
===================================================================
<<Binary file>>
Index: windowStates_normal.gif
===================================================================
<<Binary file>>
Index: portlets.css
====================================================================
ul.portletModes {
background: url(images/portlets/tabBorder.gif) #FFFFFF repeat-x bottom;
color: #515C6A;
float: left;
list-style: none;
margin: 0px;
padding: 0px;
}
ul.portletModes a {
background: url(images/portlets/tabRight.gif) no-repeat right top;
border-bottom: 1px solid #515C6A;
float: left;
margin-right: 2px;
text-decoration: none;
}
ul.portletModes a:hover {
background-position: 100% -26px;
}
ul.portletModes a:hover span {
background-position: 0% -26px;
}
ul.portletModes li {
display: inline;
margin: 0px;
padding: 0px;
}
ul.portletModes li.current a {
background-position: 100% -26px;
border-width: 0px;
}
ul.portletModes li.current span {
background-position: 0% -26px;
padding-bottom: 1px;
}
ul.portletModes span {
background: url(images/portlets/tabLeft.gif) no-repeat left top;
display: block;
float: left;
padding: 1px 6px;
white-space: nowrap;
color: #515C6A;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 9px;
}
/* Commented Backslash Hack hides rule from IE5-Mac \*/
ul.portletModes span {
float: none;
}
/* End IE5-Mac hack */
ul.windowStates {
background: url(images/portlets/tabBorder.gif) #FFFFFF repeat-x bottom;
color: #515C6A;
float: left;
list-style: none;
margin: 0px;
padding: 0px;
}
ul.windowStates a {
background: url(images/windowStates.gif) no-repeat left top;
border-bottom: 1px solid #515C6A;
float: left;
height: 14px;
margin-right: 2px;
text-decoration: none;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 9px;
width:17px;
z-index: 1;
}
ul.windowStates a span {
display:none;
}
ul.windowStates a.maximized {
background-image: url(images/portlets/windowStates_maximized.gif);
}
ul.windowStates a.minimized {
background-image: url(images/portlets/windowStates_minimized.gif);
}
ul.windowStates a.normal {
background-image: url(images/portlets/windowStates_normal.gif);
}
ul.windowStates a:hover {
background-position: 0% -15px;
}
ul.windowStates li {
display: inline;
margin: 0px;
padding: 0px;
}
ul.windowStates li.current a {
display: none;
}
/* Commented Backslash Hack hides rule from IE5-Mac \*/
ul.windowStates div {
float: none;
}
/* End IE5-Mac hack */
