diff --git a/profiles/default/viewlets.xml b/profiles/default/viewlets.xml
index 957af72..c7ce86e 100644
--- a/profiles/default/viewlets.xml
+++ b/profiles/default/viewlets.xml
@@ -5,6 +5,9 @@
-
+
+
+
+
diff --git a/skins/pcfintranetstyle_styles/base_properties.props b/skins/pcfintranetstyle_styles/base_properties.props
index 0dcc713..9ee7602 100644
--- a/skins/pcfintranetstyle_styles/base_properties.props
+++ b/skins/pcfintranetstyle_styles/base_properties.props
@@ -2,7 +2,7 @@ title:string=PcfIntranetStyle's color, font, logo and border defaults
plone_skin:string=PcfIntranetStyle
-logoName:string=logo.gif
+logoName:string=banniereintranet.gif
fontFamily:string="Helvetica Neue", Arial, sans-serif
fontBaseSize:string=100%
diff --git a/skins/pcfintranetstyle_styles/pcf-intranet.css b/skins/pcfintranetstyle_styles/pcf-intranet.css
index a8f3a51..036d5f3 100644
--- a/skins/pcfintranetstyle_styles/pcf-intranet.css
+++ b/skins/pcfintranetstyle_styles/pcf-intranet.css
@@ -48,6 +48,11 @@ a {
/* @group Temp (Cornelis) */
+#visual-portal-wrapper {
+ margin: 0 100px;
+ position: absolute;
+}
+
#portal-personaltools-wrapper {
line-height: 20px;
padding: 0;
@@ -81,13 +86,15 @@ ul#portal-siteactions {
line-height: 20px;
padding: 0;
margin-top: 0;
- right: 10px;
- float: right;
+ right: 20px;
+ position: absolute;
+ top: 10px;
}
ul#portal-siteactions li a {
font-size: 11px;
padding-left: 5px;
+ color: white;
}
#portal-searchbox {
@@ -124,7 +131,7 @@ input#searchGadget:focus {
body {
font: 70% Arial, sans-serif;
- background: url(body-ltr.gif) repeat-y;
+ background: white;
}
#visual-portal-wrapper {
@@ -212,17 +219,25 @@ textarea:focus {
/* @group Columns */
#portal-columns {
- padding-bottom: 40px;
float: left;
}
/* @group Column One */
#portal-column-one {
- width: 251px;
+ width: 150px;
padding: 0;
float: left;
- margin-right: 500px;
+}
+
+div#portal-gray-zone {
+ background: #ccc;
+ border: 2px inset #555;
+ width: 636px;
+ position: relative;
+ margin-left: 1px;
+ float: left;
+ padding: 5px;
}
@@ -231,9 +246,11 @@ textarea:focus {
/* @group Column Two */
#portal-column-two {
- width: 200px;
+ width: 100px;
padding: 0 25px;
- float: left;
+ position: absolute;
+ top: 5px;
+ right: 5px;
}
.narrow #portal-column-two {
@@ -324,9 +341,7 @@ div.managePortletsLink a:hover {
#portal-column-one dl,.narrow #portal-column-two dl {
font-size: 12px;
color: #666;
- padding: 0 25px;
- margin: 0 0 25px;
- width: 200px;
+ width: 140px;
float: left;
}
@@ -391,30 +406,28 @@ div.managePortletsLink a:hover {
#portal-column-two dl {
margin-left: -25px !important;
margin-right: -25px !important;
- margin-bottom: 1em;
+ margin-bottom: 2em;
}
#portal-column-two dt {
- background-color: #666;
- color: white;
- padding: 10px 15px;
+ color: black;
+ font-weight: bold;
}
#portal-column-two dt a {
text-decoration: none;
display: block;
padding: 10px 15px;
margin: -10px -15px;
- background-color: #5a9bc6;
- color: white;
+ color: black;
}
-#portal-column-two dt a:hover {
+/*#portal-column-two dt a:hover {
background-color: #666;
-}
+}*/
#portal-column-two dd {
font-size: 12px;
line-height: 15px;
- margin: 0 15px;
+ margin: 0;
}
#portal-column-two dd a {
@@ -423,11 +436,12 @@ div.managePortletsLink a:hover {
}
#portal-column-two dt.portletHeader {
- text-transform: uppercase;
- letter-spacing: 1px;
- font-size: 14px;
- margin: 0 0 10px 0;
clear: both;
+ padding-bottom: 2px;
+}
+
+#portal-column-two form .field {
+ margin: 0;
}
#portal-column-two dd a img {
@@ -587,12 +601,11 @@ dl.portletSearch {
}
input.searchField {
- width: 173px;
background: url(searchField.png) no-repeat right center;
color: #999;
border: 1px solid #666;
font-size: 11px;
- padding: 4px 20px 4px 5px;
+ /*padding: 4px 20px 4px 5px;*/
font-weight: bold;
}
@@ -722,7 +735,7 @@ dl.portletCalendar table a {
/* @group Login portlet */
dl.portletLogin div.field input {
- width: 175px;
+ width: 115px;
border: 1px solid #666;
font-size: 10px;
padding: 3px 20px 3px 3px;
@@ -784,14 +797,13 @@ dl.toc dd ol {
#portal-header {
float: left;
padding-top: 10px;
- padding-bottom: 35px;
- background: url(body-ltr.gif) repeat-y;
+ padding-bottom: 10px;
position: relative;
padding-right: 10px;
}
#portal-top {
- width: 1011px;
+ width: 811px;
}
.narrow #portal-top {
@@ -799,18 +811,14 @@ dl.toc dd ol {
}
a#portal-logo {
- height: 53px;
- width: 250px;
+ height: 95px;
+ width: 800px;
float: left;
position: relative;
top: 0px;
}
.narrow a#portal-logo {
- height: 53px;
- width: 250px;
- float: left;
- position: relative;
top: 20px;
}
@@ -1042,18 +1050,18 @@ span#breadcrumbs-you-are-here {
/* @group Global Navigation */
ul#portal-globalnav {
- width: 724px;
- float: right;
overflow: hidden;
margin-left: 25px;
margin-right: 0;
font-size: 1em;
- margin-top: 15px;
- border-left: 1px solid gray;
+ background: #ddd;
+ padding: 3px 10px;
+ float: right;
+ width: 630px;
+ text-align: right;
}
.narrow ul#portal-globalnav {
- width: 450px;
}
.medium ul#portal-globalnav {
@@ -1061,24 +1069,20 @@ ul#portal-globalnav {
}
ul#portal-globalnav li {
- float: left;
- border-left: 1px solid #7dabcf;
- margin-left: -1px;
- margin-right: 1px;
+ display: inline;
+ background: url(puce-pcf.gif) center left no-repeat;
}
ul#portal-globalnav li a {
- float: left;
- padding: 10px 20px;
+ padding: 0px 10px;
+ color: black;
}
ul#portal-globalnav li.selected a {
- color: white;
- background-color: #7dabcf;
+ text-decoration: underline;
}
ul#portal-globalnav li a:hover {
- background-color: #666;
color: white;
}
@@ -1327,7 +1331,6 @@ h1,
}
h1 {
- text-transform: uppercase;
font-family: "Helvetica Neue Light","Helvetica Neue",Arial,Helvetica,Geneva,sans-serif;
letter-spacing: 1px;
font-weight: normal;
@@ -1336,12 +1339,14 @@ h1 {
h1.documentFirstHeading {
margin-bottom: 0.4em;
+ background: url(bannierevide_jaune.gif) top left;
+ color: white;
+ padding-left: 60px;
}
h2 {
color: #666;
padding: 0;
- text-transform: uppercase;
letter-spacing: 1px;
margin: 0.5em 0 0.4em;
font: normal 18px/20px "Helvetica Neue Light","Helvetica Neue",Arial,Helvetica,Geneva,sans-serif;
@@ -1360,12 +1365,9 @@ h3 a:hover {
#portal-column-content {
background-color: white;
- width: 451px;
- padding-right: 25px;
- padding-left: 25px;
- position: absolute;
- left: 251px;
- padding-bottom: 40px;
+ width: 440px;
+ padding: 10px 10px 40px 10px;
+ border: 1px solid #d9ad00;
}
#region-content {
@@ -1490,21 +1492,26 @@ h3 a:hover {
#portal-footer,
#portal-colophon {
- width: 190px;
+ background: #b30000;
font-size: 10px;
color: #999;
padding-left: 25px;
padding-right: 25px;
clear: left;
line-height: 14px;
+ margin-right: 10px;
+}
+
+#portal-colophon {
+ padding-top: 5px;
}
#portal-footer p,
#portal-colophon p,
#portal-footer ul,
#portal-colophon ul {
- margin-bottom: 6px;
- margin-top: 4px;
+ color: white;
+ text-align: center;
}
#portal-colophon div.colophonWrapper ul li {
diff --git a/skins/pcfintranetstyle_templates/main_template.pt b/skins/pcfintranetstyle_templates/main_template.pt
index e047be5..24bf700 100644
--- a/skins/pcfintranetstyle_templates/main_template.pt
+++ b/skins/pcfintranetstyle_templates/main_template.pt
@@ -91,6 +91,7 @@
End of the left column
+
Start of main content block
@@ -162,6 +163,8 @@
End of the right column
+
+
end column wrapper