diff options
| -rw-r--r-- | lib/util.php | 25 | ||||
| -rw-r--r-- | theme/default/style/html.css | 4 | ||||
| -rw-r--r-- | theme/default/style/layout.css | 10 |
3 files changed, 31 insertions, 8 deletions
diff --git a/lib/util.php b/lib/util.php index f05c47e68..24f0e5dd8 100644 --- a/lib/util.php +++ b/lib/util.php @@ -85,16 +85,39 @@ function common_show_header($pagetitle) { common_element_start('head'); common_element('title', NULL, $pagetitle . " - " . $config['site']['name']); + common_element('link', array('rel' => 'stylesheet', + 'type' => 'text/css', + 'href' => $config['site']['path'] . 'theme/default/style/html.css', + 'media' => 'screen, projection, tv')); + common_element('link', array('rel' => 'stylesheet', + 'type' => 'text/css', + 'href' => $config['site']['path'] . 'theme/default/style/layout.css', + 'media' => 'screen, projection, tv')); + common_element('link', array('rel' => 'stylesheet', + 'type' => 'text/css', + 'href' => $config['site']['path'] . 'theme/default/style/print.css', + 'media' => 'print')); common_element_end('head'); common_element_start('body'); + common_element_start('div', array('id' => 'wrapper')); + common_element_start('div', array('id' => 'content')); + common_element_start('div', array('id' => 'header')); common_element('h1', 'title', $pagetitle); + common_element('h2', 'subtitle', $config['site']['name']); + common_element_end('div'); common_head_menu(); + common_element_start('div', array('id' => 'page')); } function common_show_footer() { global $xw, $config; + common_element_start('p', 'footer'); common_foot_menu(); common_license_block(); + common_element_end('p'); + common_element_end('div'); + common_element_end('div'); + common_element_end('div'); common_element_end('body'); common_element_end('html'); $xw->endDocument(); @@ -127,7 +150,7 @@ function common_license_block() { function common_head_menu() { $user = common_current_user(); - common_element_start('ul', 'headmenu'); + common_element_start('ul', array('id' => 'menu', 'class' => ($user) ? 'five' : 'three')); common_menu_item(common_local_url('doc', array('title' => 'help')), _t('Help')); if ($user) { diff --git a/theme/default/style/html.css b/theme/default/style/html.css index a00d53127..10f0e89dc 100644 --- a/theme/default/style/html.css +++ b/theme/default/style/html.css @@ -22,7 +22,7 @@ body { font: 400 0.8em georgia, serif;
line-height: 180%;
- background: url(../img/bg/body.jpg) repeat top left;
+ background: url(../image/body.jpg) repeat top left;
color: #6D6864;
}
@@ -93,7 +93,7 @@ ul { ul li {
padding-left: 25px;
- background: url(../img/bg/bullet.gif) no-repeat;
+ background: url(../image/bullet.gif) no-repeat;
background-position: 0 3px;
}
diff --git a/theme/default/style/layout.css b/theme/default/style/layout.css index c08682cd2..98e3c878b 100644 --- a/theme/default/style/layout.css +++ b/theme/default/style/layout.css @@ -27,13 +27,13 @@ height: 100%;
min-height: 100%;
- background: url(../img/bg/content.gif) repeat-y top center;
+ background: url(../image/content.gif) repeat-y top center;
}
#content[id] {
height: auto;
- background: url(../img/bg/content.png) repeat-y top center;
+ background: url(../image/content.png) repeat-y top center;
}
@@ -45,7 +45,7 @@ #header {
padding: 60px 0 2em 49px;
- background: url(../img/bg/header.jpg) no-repeat top center;
+ background: url(../image/header.jpg) no-repeat top center;
}
/* Forces IE to set the hasLayout flag and show the header at the height of its contents \*/
@@ -108,12 +108,12 @@ ul#menu li a:visited { ul#menu li a:hover {
color: #2E5F0F;
- background: url(../img/bg/menu.gif) repeat-x bottom left;
+ background: url(../image/menu.gif) repeat-x bottom left;
}
ul#menu li a.here {
color: #512103;
- background: url(../img/bg/menu.gif) repeat-x bottom left;
+ background: url(../image/menu.gif) repeat-x bottom left;
}
/* helper classes to control width of links in topbar */
|