svnno****@sourc*****
svnno****@sourc*****
2007年 4月 14日 (土) 08:03:42 JST
Revision: 48
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=48
Author: shinsuke
Date: 2007-04-14 08:03:41 +0900 (Sat, 14 Apr 2007)
Log Message:
-----------
updated layout.
Modified Paths:
--------------
pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/css/styles.css
pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/decorator-macros.vm
pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/footer.vm
pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/header.vm
pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/images/header_bg.gif
pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/images/header_bg.xcf
-------------- next part --------------
Modified: pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/css/styles.css
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/css/styles.css 2007-04-13 13:08:34 UTC (rev 47)
+++ pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/css/styles.css 2007-04-13 23:03:41 UTC (rev 48)
@@ -14,7 +14,7 @@
limitations under the License.
*/
- ＠ import url("../../css/portal-standard.css");
+/*@import url("../../css/portal-standard.css");*/
body {
height: auto;
@@ -22,7 +22,6 @@
color: #000000;
font-family: Arial, Helvetica, sans-serif;
font-size: 10px;
- text-align:center;
}
/**
@@ -107,82 +106,19 @@
.layout-nextgen #container {
width: 800px;
height: auto;
- margin: 0 auto 0 auto;
+ margin: 0 auto 0 20px;
text-align:left;
}
-/* the topbar that contains the most upper links */
-.layout-nextgen #topbar {
- position:absolute;
- width: 800px;
- height: 25px;
- line-height: 25px;
- vertical-align: middle;
- text-align: right;
- z-index:10;
-}
-
-.layout-nextgen #topbar ul.main {
- margin:0px;
- padding:0px;
- float:right;
- position:relative;
- list-style:none;
- text-align:center;
- z-index:10;
-}
-
-.layout-nextgen #topbar ul.main li span {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
-}
-
-.layout-nextgen #topbar .main li.menuItem {
- position:relative;
- height: 25px;
- width:120px;
- float:left;
- padding: 0px 2px;
- /*overflow:hidden;*/
- text-align:center;
-}
-
-.layout-nextgen #topbar ol.sub {
- width:120px;
- margin:0px;
- padding:0px;
- position:relative;
- border:1px solid #999999;
- background-color:#ffffff;
- list-style:none;
- text-align:left;
- display:none;
-}
-.layout-nextgen #topbar .sub li {
- margin:0px;
- padding:0px;
- height:25px;
-}
-.layout-nextgen #topbar .sub a {
- margin:0px;
- padding:1px 2px 1px 2px;
- display:block;
- text-decoration: none;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
-}
-.layout-nextgen #topbar .sub a:hover {
- background-color:#ccddee;
-}
-
-
/* the header that contains the big image */
.layout-nextgen #header {
top:25px;
- width: 800px;
- height: 100px;
+ width:800px;
+ height:100px;
background-image: url(../images/header_bg.gif);
+ background-repeat: repeat-y;
+ background-position: right center;
position: relative;
border: 1px solid #dedede;
z-index:1;
@@ -203,6 +139,7 @@
}
.layout-nextgen #header .info .action {
+ padding: 2px 0px;
}
.layout-nextgen #header .info .action a {
@@ -221,10 +158,8 @@
margin:0px;
padding:0px;
width:800px;
- height:20px;
+ height:30px;
background-image: url(../images/tab_bg.gif);
- border-left:1px solid #113377;
- border-right:1px solid #113377;
}
/* the links in the navigationbar are an unordered list */
@@ -237,39 +172,50 @@
list-style: none;
margin:0px;
padding:0px;
+ height:30px;
float: left;
}
.layout-nextgen #navbar a {
float: left;
text-decoration: none;
margin:0px;
- padding: 3px 7px;
+ padding: 8px 5px;
font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
+ font-size: 11px;
+ font-weight: bold;
color: #ffffff;
}
.layout-nextgen #navbar a:hover {
- background: #113377;
+ background: #71758a;
color: #ffffff;
}
.layout-nextgen #navbar span {
float: left;
text-decoration: none;
margin:0px;
- padding: 3px 7px;
+ padding: 8px 5px;
font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
+ font-size: 11px;
+ font-weight: bold;
color: #ffffff;
}
+.layout-nextgen #navbar img {
+ background-color:#ffffff;
+ float:right;
+ margin:0px;
+ padding: 0px;
+}
/* the core contains all the site contents */
.layout-nextgen #core {
+ clear:both;
position:relative;
- top:25px;
+ top:30px;
width: 800px;
height: auto;
margin-top: 5px;
+ padding:0px 1px;
}
.layout-nextgen #breadcrumbs {
@@ -286,14 +232,57 @@
text-decoration: none;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
+ color:#12248d;
}
+.layout-nextgen #subnavbar {
+ position:relative;
+ top:25px;
+ height: auto;
+}
+
+.layout-nextgen #subnavbar ul {
+ margin:0px;
+ padding:0px;
+}
+
+.layout-nextgen #subnavbar li {
+ list-style: none;
+ margin:3px;
+ padding:0px 0px;
+}
+
+.layout-nextgen #subnavbar li span {
+ float:left;
+ margin:0px;
+ padding:5px 0px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ font-weight:normal;
+ color: #666666;
+}
+
+.layout-nextgen #subnavbar li a {
+ text-decoration: none;
+ margin:0px;
+ padding: 0px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ font-weight: bold;
+}
+.layout-nextgen #subnavbar li a:hover {
+ color: #0000ff;
+}
+
/* the corecenter contains the center part of the core */
.layout-nextgen #corecenter {
- width: 800px;
+ margin:2px;
+ width: 796px;
height: auto;
- float: left;
}
+.layout-nextgen #corecenter .portlet {
+ margin:1px;
+}
/* the footer contains all copyright info etcetera */
.layout-nextgen #footer {
@@ -302,15 +291,15 @@
height: 30px;
vertical-align: middle;
text-align: right;
- font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-family: Arial Black, Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
background-image: url(../images/footer_bg.gif);
border: 1px solid #dedede;
margin-bottom:10px;
}
-.layout-nextgen #footer p {
+.layout-nextgen #footer div {
color: #666666;
- padding-right: 20px;
+ padding: 5px 20px;
}
.layout-nextgen #footer a {
color: #666666;
Modified: pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/decorator-macros.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/decorator-macros.vm 2007-04-13 13:08:34 UTC (rev 47)
+++ pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/decorator-macros.vm 2007-04-13 23:03:41 UTC (rev 48)
@@ -27,9 +27,40 @@
#end
#end
#end
+ <li></li>
</ul>
#end
+#macro (includeMenuNavigation $_menu $_orientation)
+ #set($sepa="")
+ <ul>
+ #foreach($element in $_menu.elements.iterator())
+ #if($element.elementType == "option")
+ #set($tabTitle = $element.getTitle($preferedLocale))
+ #set($tabName = $element.getShortTitle($preferedLocale))
+ #if($_orientation == $TOP_TO_BOTTOM)
+ #if($element.isSelected($site))
+ <li><div>» ${tabName}</div></li>
+ #else
+ #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
+ <li><div><a href="$tabUrl">» ${tabName}</a></div></li>
+ #end
+ #end
+ #if($_orientation == $LEFT_TO_RIGHT)
+ ${sepa}
+ #if($element.isSelected($site))
+ <li><span>${tabName}</span></li>
+ #else
+ #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
+ <li><span><a href="$tabUrl">${tabName}</a></span></li>
+ #end
+ #end
+ #end
+ #set($sepa="<li><span class='sepa'>|</span></li>")
+ #end
+ </ul>
+#end
+
#* include links navigation component *#
#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter)
#if(!$_delimiter || $_delimiter == "")
Modified: pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/footer.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/footer.vm 2007-04-13 13:08:34 UTC (rev 47)
+++ pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/footer.vm 2007-04-13 23:03:41 UTC (rev 48)
@@ -16,8 +16,8 @@
</div>
<div id="footer">
- <p><!-- Copy Right Template -->
- © 2005-2007, PAL Portal version @@PORTAL_VERSION@@</p>
+ <div><!-- Copy Right Template -->
+ © 2005-2007, PAL Portal version @@PORTAL_VERSION@@</div>
</div>
</div>
</div>
Modified: pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/header.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/header.vm 2007-04-13 13:08:34 UTC (rev 47)
+++ pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/header.vm 2007-04-13 23:03:41 UTC (rev 48)
@@ -52,7 +52,7 @@
<title>#PageTitle()</title>
<meta name="version" content="#SiteVersionTag()">
- <meta name="keywords" content="" />
+ <meta name="keywords" content="個人事業主,起業家,技術者,仕事紹介" />
<meta name="description" content="#PageDescription()" />
</head>
@@ -62,14 +62,9 @@
<div id="container">
<div id="topbar">
<!-- Left Navigations Menu Table Data -->
-#set($navigationsStandardMenu = $site.getMenu("navigations"))
-
-#if(!$navigationsStandardMenu.empty)
-#includeLinksWithIconNavigation($navigationsStandardMenu $LEFT_TO_RIGHT)
-#end
</div>
<div id="header">
- <img style="filter:chroma(color=#ffffff)" src="#GetPageResource('images/logo.png')"/>
+ <img style="border:0px;" src="#GetPageResource('images/logo.png')"/>
<div class="info">
#if($username)
<div class="action">
@@ -88,12 +83,21 @@
</div>
</div>
<div id="navbar">
+#set($navigationsStandardMenu = $site.getMenu("navigations"))
+#if(!$navigationsStandardMenu.empty)
+#includeTabsNavigation($navigationsStandardMenu $LEFT_TO_RIGHT)
+#end
+ </div>
+
+ <div id="subnavbar">
#set($pagesStandardMenu = $site.getMenu("pages"))
#if(!$pagesStandardMenu.empty)
-#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
+#includeMenuNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
#end
</div>
+
<div id="core">
+ <div id="corecenter">
<div id="breadcrumbs">
#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
#if(!$breadcrumbsStandardMenu.empty)
@@ -102,8 +106,7 @@
#end
</div>
- <div id="corecenter">
<!-- Page Action Bar -->
#PageActionBar()
-<!-- END: layout/html/nextgen/decorator.vm -->
+<!-- END: layout/html/n2sm/decorator.vm -->
Modified: pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/images/header_bg.gif
===================================================================
(Binary files differ)
Modified: pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/images/header_bg.xcf
===================================================================
(Binary files differ)