pvollenweider 2005/09/01 18:16:03 CEST
Modified files:
src/jsp/box box.jsp links.inc webapps.inc
src/jsp/css screen.css
Log:
Add webapps
Revision Changes Path
1.4 +1 -1 corporate_portal_templates_v2/src/jsp/box/box.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/box/box.jsp.diff?r1=1.3&r2=1.4&f=h
1.3 +0 -1 corporate_portal_templates_v2/src/jsp/box/links.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/box/links.inc.diff?r1=1.2&r2=1.3&f=h
1.3 +21 -23 corporate_portal_templates_v2/src/jsp/box/webapps.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/box/webapps.inc.diff?r1=1.2&r2=1.3&f=h
1.8 +1 -2 corporate_portal_templates_v2/src/jsp/css/screen.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/css/screen.css.diff?r1=1.7&r2=1.8&f=h
Index: box.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/box/box.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- box.jsp 1 Sep 2005 15:56:31 -0000 1.3
+++ box.jsp 1 Sep 2005 16:16:02 -0000 1.4
@@ -35,7 +35,7 @@
<%//@ include file="links.inc"%>
</c:when>
<c:when test="${boxTypeValue == webapps}">
- <%//@ include file="webapps.inc"%>
+ <%@ include file="webapps.inc"%>
</c:when>
<c:when test="${boxTypeValue == news}">
<%@ include file="news.inc"%>
Index: links.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/box/links.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- links.inc 1 Sep 2005 13:55:48 -0000 1.2
+++ links.inc 1 Sep 2005 16:16:02 -0000 1.3
@@ -1,4 +1,3 @@
-this is links box
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<content:containerList name='<%="linksContainer" + id%>'
id="linksContainerList" parentContainerName="boxContainer">
<content:container id="linksContainer">
Index: webapps.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/box/webapps.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- webapps.inc 1 Sep 2005 13:55:48 -0000 1.2
+++ webapps.inc 1 Sep 2005 16:16:02 -0000 1.3
@@ -1,26 +1,24 @@
-this is webapps box
-<content:containerList name='<%="webappsContainer" + id%>'
id="webappsContainerList" parentContainerName="boxContainer">
- <content:container>
- <content:applicationField name='webapp' id="webapp" display="false"
/>
- <bean:define id="portletWindowBean" name="webapp" property="object"
/>
- <jahiaHtml:windowStates name="portletWindowBean" />
- <jahiaHtml:portletModes 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">
- <a href="<bean:write
name='updateWebappsContainerURL'/>"><%=updateButton%></a>
- <a href="<bean:write
name='deleteWebappsContainerURL'/>"><%=deleteButton%></a>
- </logic:present>
+<content:containerList name='<%="webapps" + id%>' id="webapps"
parentContainerName="boxContainer">
+ <content:container id="webappsContainer">
+ <jahiaHtml:actionMenu name="webappsContainer" namePostFix=".webapp"
+ resourceBundle="jahiatemplates.Corporate_portal_templates">
+ <!--bean:define id="portletWindowBean" name="webapp"
property="object" /-->
+ <!--jahiaHtml:windowStates name="portletWindowBean" /-->
+ <!--jahiaHtml:portletModes name="portletWindowBean" /-->
+ <content:applicationField name='webapp' id="webapp"
display="false" />
+ </jahiaHtml:actionMenu>
+
+ <jahiaHtml:actionMenu name="webapps" namePostFix=".webapps"
+ resourceBundle="jahiatemplates.Corporate_portal_templates"
useFieldSet="false"
+ labelKey="add.webapps">
+ </jahiaHtml:actionMenu>
</content:container>
- <logic:equal name="webappsContainerList" property="size" value="0">
- <content:addContainerURL id="addWebappsContainerURL"
display="false"/>
- <logic:present name="addWebappsContainerURL">
- <br/><a href="<bean:write
name='addWebappsContainerURL'/>"><%=addButton%> <jahia:resourceBundle
- resourceBundle="jahiatemplates.Corporate_portal_templates"
- resourceName="addWebapps"/></a>
- </logic:present>
+
+ <logic:equal name="webapps" property="size" value="0">
+ <jahiaHtml:actionMenu name="webapps" namePostFix=".webapps"
+ resourceBundle="jahiatemplates.Corporate_portal_templates"
+ useFieldSet="false" actionIcon='<%=contextURL +
"/img/actions/add.gif"%>'
+ labelKey="add.webapps">
+ </jahiaHtml:actionMenu>
</logic:equal>
</content:containerList>
-
Index: screen.css
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/css/screen.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- screen.css 1 Sep 2005 15:56:31 -0000 1.7
+++ screen.css 1 Sep 2005 16:16:02 -0000 1.8
@@ -385,8 +385,7 @@
/* ------------------------------------------------ */
table.files tr td {
vertical-align: top;
- padding-left: 2px;
- padding-right: 1px;
+ padding: 1px;
}
table.files tr:hover {
background: #e9e9e9;
