make the code use the default style

darcs-hash:20080520173427-84dde-890b794c42ab3c29c23aa542fee3232fd41463a3.gz

diff --git a/lib/util.php b/lib/util.php
index f05c47e68ba4143c7905d0bdada483f269b7ce80..24f0e5dd8b530e2e3d43097b4186f70add97339c 100644 (file)
--- 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 a00d5312704c5720ffb3f0b6740decce72daf95e..10f0e89dc8e1af74ec8842a80a53ef09a961c2d6 100644 (file)
--- a/theme/default/style/html.css
+++ b/theme/default/style/html.css
@@ -22,7 +22,7 @@ body {
   font: 400 0.8em georgia, serif;\r
   line-height: 180%;\r
 \r
-  background: url(../img/bg/body.jpg) repeat top left;\r
+  background: url(../image/body.jpg) repeat top left;\r
   color: #6D6864;\r
 }\r
 \r
@@ -93,7 +93,7 @@ ul {
 \r
 ul li {\r
   padding-left: 25px;\r
-  background: url(../img/bg/bullet.gif) no-repeat;\r
+  background: url(../image/bullet.gif) no-repeat;\r
   background-position: 0 3px;\r
 }\r
 \r

diff --git a/theme/default/style/layout.css b/theme/default/style/layout.css
index c08682cd2ea43d2bca06afba9027a0c6421d49cf..98e3c878b14ae9579824606e009e388f538d4e82 100644 (file)
--- a/theme/default/style/layout.css
+++ b/theme/default/style/layout.css
@@ -27,13 +27,13 @@
   height: 100%;\r
   min-height: 100%; \r
   \r
-  background: url(../img/bg/content.gif) repeat-y top center;\r
+  background: url(../image/content.gif) repeat-y top center;\r
 }\r
 \r
 \r
 #content[id] {\r
   height: auto;  \r
-  background: url(../img/bg/content.png) repeat-y top center;\r
+  background: url(../image/content.png) repeat-y top center;\r
 }\r
 \r
 \r
@@ -45,7 +45,7 @@
 \r
 #header {\r
   padding: 60px 0 2em 49px;  \r
-  background: url(../img/bg/header.jpg) no-repeat top center;  \r
+  background: url(../image/header.jpg) no-repeat top center;  \r
 }\r
 \r
 /* Forces IE to set the hasLayout flag and show the header at the height of its contents \*/\r
@@ -108,12 +108,12 @@ ul#menu li a:visited {
 \r
 ul#menu li a:hover {\r
   color: #2E5F0F;\r
-  background: url(../img/bg/menu.gif) repeat-x bottom left;\r
+  background: url(../image/menu.gif) repeat-x bottom left;\r
 }\r
 \r
 ul#menu li a.here {\r
   color: #512103;\r
-  background: url(../img/bg/menu.gif) repeat-x bottom left;\r
+  background: url(../image/menu.gif) repeat-x bottom left;\r
 }\r
 \r
 /* helper classes to control width of links in topbar */\r