# HG changeset patch
# User casties
# Date 1360689305 -3600
# Node ID 9e720c6c5b6c8523064ae4290a24a105b6aa4587
# Parent 1a895905f7caea9f742a020a6255da02b637b9ad
working on start page.
diff -r 1a895905f7ca -r 9e720c6c5b6c MPIWGFeature.py
--- a/MPIWGFeature.py Mon Feb 11 20:14:47 2013 +0100
+++ b/MPIWGFeature.py Tue Feb 12 18:15:05 2013 +0100
@@ -57,6 +57,28 @@
t = self.title
return t
+
+ def getUrl(self, baseUrl=None):
+ """returns URL to this feature"""
+ if baseUrl is None:
+ return self.absolute_url()
+
+ return '%s/%s'%(baseUrl, self.getId())
+
+ def getPath(self, page, relative=True):
+ """returns path to template page"""
+ # get Language from MPIWGRoot
+ lang = self.getLang()
+ dir = getattr(self, lang, self.en)
+ if relative:
+ return '%s/%s/%s'%(self.getId(), dir.getId(), page)
+
+ pt = getattr(dir, page)
+ return pt.absolute_url_path()
+
+ def getTeaserPath(self):
+ """returns the path to the teaser template"""
+ return self.getPath('teaser.pt')
def getIntro(self, **args):
"""returns the intro as PageTemplate"""
@@ -66,13 +88,6 @@
pt = getattr(dir, 'intro.pt')
return pt(**args)
- def getTeaserPath(self):
- """returns the path to the teaser template"""
- # get Language from MPIWGRoot
- lang = self.getLang()
- dir = getattr(self, lang, self.en)
- return '%s/%s/teaser.pt'%(self.getId(),dir.getId())
-
def getMain(self, **args):
"""returns the main part as PageTemplate"""
# get Language from MPIWGRoot
diff -r 1a895905f7ca -r 9e720c6c5b6c css/mpiwg.css
--- a/css/mpiwg.css Mon Feb 11 20:14:47 2013 +0100
+++ b/css/mpiwg.css Tue Feb 12 18:15:05 2013 +0100
@@ -73,21 +73,21 @@
h1 {
color: #3b4186;
- font-size: 15px;
+ font-size: 16px;
font-weight: bold;
margin: 10px 2px 10px 2px;
}
h2 {
color: #3b4186;
- font-size: 15px;
+ font-size: 16px;
font-weight: normal;
margin: 2px;
}
h3 {
color: #3b4186;
- font-size: 13px;
+ font-size: 14px;
font-weight: normal;
margin: 2px;
}
@@ -296,53 +296,52 @@
* main section
*/
-div.content {
- /* float: left; */
- width: 900px;
+div.main {
+}
+
+div.main div.row {
+ /* set font-size to ignore whitespace */
+ font-size: 0;
}
-div.main {
- /* float: left; */
- width: 720px;
- background-color: #FFFFFF;
- margin-bottom: 10px;
- padding-right: 10px;
- font-size: 12px;
+div.main div.block {
+ display: inline-block;
+ width: 286px;
+ vertical-align: top;
+ /* reset font-size */
+ font-size: 12px;
+ line-height: 1.5;
+ margin-left: 21px;
}
-
-div.main div.center {
- /* float: left; */
- width: 460px;
- padding: 20px;
+div.main div.block:first-child {
+ /* first block has no left margin */
+ margin-left: 0;
}
-
-div.center, div.center_wide {
- line-height: 1.6;
+div.main div.block h2 {
+ position: relative;
+ padding-bottom: 3px;
+ margin-top: 18px;
+ border-bottom: 3px solid #dccbae;
}
-div.center ul {
- list-style: none;
- margin-left: 0;
- padding: 0;
-}
-
-div.center li {
- margin-bottom: 10px;
+div.main div.block h2 a:link {
+ /* more-links in title are right */
+ position: absolute;
+ right: 0;
+ /* more-links in title are small */
+ font-size: 12px;
}
-
-div.main div.center_wide {
- /* float: left; */
- width: 710px;
-/* padding: 20px 0 0 20px; */
- padding: 20px;
+div.main div.block div.item {
+ padding-top: 5px;
+ padding-bottom: 3px;
+ border-bottom: 1px solid #dccbae;
}
-
-
-
-
-
+div.main div.block b {
+ /* bold is blue */
+ color: #3b4186;
+}
/*
* subnavigation
diff -r 1a895905f7ca -r 9e720c6c5b6c zpt/www/main_template.zpt
--- a/zpt/www/main_template.zpt Mon Feb 11 20:14:47 2013 +0100
+++ b/zpt/www/main_template.zpt Tue Feb 12 18:15:05 2013 +0100
@@ -1,27 +1,33 @@
-
-
-
- Max Planck Institute for the History of Science
-
-
-
-
-
+
+
+Max Planck Institute for the History of Science
+
+
+
+
@@ -46,10 +52,8 @@
-
-