pvollenweider 2005/08/24 18:06:42 CEST
Modified files:
src/jsp/common topmenu.jsp
src/jsp/css actions.css screen.css
src/jsp home.jsp
Log:
some css fixes
Revision Changes Path
1.3 +4 -2 corporate_portal_templates_v2/src/jsp/common/topmenu.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/common/topmenu.jsp.diff?r1=1.2&r2=1.3&f=h
1.2 +21 -31 corporate_portal_templates_v2/src/jsp/css/actions.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/css/actions.css.diff?r1=1.1&r2=1.2&f=h
1.4 +2 -0 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.3&r2=1.4&f=h
1.8 +8 -4 corporate_portal_templates_v2/src/jsp/home.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/home.jsp.diff?r1=1.7&r2=1.8&f=h
Index: topmenu.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/common/topmenu.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- topmenu.jsp 24 Aug 2005 09:58:34 -0000 1.2
+++ topmenu.jsp 24 Aug 2005 16:06:41 -0000 1.3
@@ -22,7 +22,8 @@
</a>
<%
jData.gui().html().drawBeginActionMenu(topNavigationContainerBean,
- null, null, false, "",
"jahiatemplates.Corporate_portal_templates", null, out);
+ null, null, false, ".navigationLink",
+ "jahiatemplates.Corporate_portal_templates", null, out);
%>
</li>
<%
@@ -35,7 +36,8 @@
logger.debug("display action menu for top container list");
%><li><%
jData.gui().html().drawBeginActionMenu(topNavigationContainerListBean,
- null, null, false, "",
"jahiatemplates.Corporate_portal_templates", null, out);
+ null, null, false, ".navigationLinks",
+ "jahiatemplates.Corporate_portal_templates", null, out);
%></li><%
} else {
logger.debug("No action URL for topNavigationContainerList");
Index: actions.css
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/css/actions.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- actions.css 26 Jul 2005 15:24:53 -0000 1.1
+++ actions.css 24 Aug 2005 16:06:42 -0000 1.2
@@ -1,48 +1,38 @@
-div.menu,
-div.menu a.menuItem {
- font-family: "MS Sans Serif", Arial, sans-serif;
- font-size: 8pt;
- font-style: normal;
- font-weight: normal;
- color: #000000;
- white-space: nowrap;
- display: block !important;
- background-image:none;
-}
div.menu {
background-color: #d0d0d0;
- border: 2px solid;
+ border: 1px solid;
border-color: #f0f0f0 #909090 #909090 #f0f0f0;
left: 0px;
- padding: 0px 1px 1px 0px;
+ padding: 0px 1px 1px 0px !important;
position: absolute;
top: 0px;
visibility: hidden;
z-index: 101;
}
+div.menu,
div.menu a.menuItem {
- color: #000000;
- cursor: default;
- display: block;
- padding: 3px 1em;
- text-decoration: none;
+ font-family: "MS Sans Serif", Arial, sans-serif;
+ font-size: 8pt;
+ font-style: normal;
+ font-weight: normal;
+ color: #000000 !important;
white-space: nowrap;
+ float:left;
+ display: block !important;
+ background-image:none !important;
}
-div.menu a.menuItem:hover, div.menu a.menuItemHighlight {
- background-color: #000080;
- color: #ffffff;
-}
-
-div.menu a.menuItem span.menuItemText {}
-
-div.menu a.menuItem span.menuItemArrow {
- margin-right: -.75em;
+div.menu a.menuItem {
+ display: block !important;
+ clear:both;
+ padding: 3px; !important;
+ text-decoration: none;
+ white-space: nowrap;
}
-div.menu div.menuItemSep {
- border-top: 1px solid #909090;
- border-bottom: 1px solid #f0f0f0;
- margin: 4px 2px;
+div.menu a.menuItem:hover,
+div.menu a.menuItemHighlight {
+ background-color: #316ac5 !important;
+ color: #ffffff !important;
}
Index: screen.css
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/css/screen.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- screen.css 24 Aug 2005 09:58:34 -0000 1.3
+++ screen.css 24 Aug 2005 16:06:42 -0000 1.4
@@ -55,6 +55,7 @@
clear: both;
float: left;
width: 730px;
+ text-align: center;
}
/* ------------------------------------------------ */
/* HEADER */
@@ -346,5 +347,6 @@
clear: both;
border-top: 1px solid #d2d2d2;
margin-top: 10px;
+ padding-top: 10px;
margin-bottom: 20px;
}
\ No newline at end of file
Index: home.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/home.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- home.jsp 24 Aug 2005 09:58:34 -0000 1.7
+++ home.jsp 24 Aug 2005 16:06:42 -0000 1.8
@@ -78,10 +78,14 @@
</form>
</div>
</logic:equal>
- <div id="navigation">
- <h2>Navigation</h2>
- <jsp:include page="nav/menu.jsp" flush="true"/>
- </div>
+ <logic:notEqual name="currentPage" property="level" value="0">
+ <div id="navigation">
+ <h2><content:resourceBundle
+
resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="label.navigation"/></h2>
+ <jsp:include page="nav/menu.jsp" flush="true"/>
+ </div>
+ </logic:notEqual>
<div class="navbox">
<div class="title">News and events</div>
<div class="content">
