diff options
author | Florian Pritz <bluewind@xssn.at> | 2010-10-24 17:51:34 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xssn.at> | 2010-10-24 17:51:34 +0200 |
commit | 2d31c619e6177e26b4f141b9cfd8ac27962d1a2f (patch) | |
tree | 836eaecb27af9b1858db7902ddfc41dc0dd775e3 | |
parent | 285b1d5e9ef5eba2bc64d6d46eb22d7ac1f24b4c (diff) |
unify design
Signed-off-by: Florian Pritz <bluewind@xssn.at>
-rw-r--r-- | data/default.css | 38 | ||||
-rw-r--r-- | system/application/models/file_mod.php | 1 | ||||
-rw-r--r-- | system/application/views/file/header.php | 4 | ||||
-rw-r--r-- | system/application/views/file/html_header.php | 1 |
4 files changed, 14 insertions, 30 deletions
diff --git a/data/default.css b/data/default.css index 973394f23..8d29adc0d 100644 --- a/data/default.css +++ b/data/default.css @@ -1,4 +1,3 @@ -/* standard elements */ html { min-height: 100%; background: #fff; @@ -32,36 +31,21 @@ body { } .top{ - background-color: #eee; - position:fixed; - top:0; - padding: 5px; - padding-left:10px; - font-family: Monospace; - width:100%; - border-bottom:1px dotted #333; + background: #444; + color: #fff; + padding-left: 5px; + padding-top: 5px; + padding-bottom: 5px; + border-bottom: 3px double gray; +} + +.top a { + color: lightblue; } .content { padding-left:13px; padding-top:13px; - margin-top:150px; + margin-top:100px; } -.nav li a{ - text-decoration: none; - padding: 3px 7px; - margin-right: -8px; - border-left: 1px solid #333 ; - border-right: 1px solid #333 ; - background-color: #e6e6ff; -} -.nav li{ - display: inline; - margin: 0; -} -.nav { - margin-bottom: -2px; - margin-top: -2px; - text-align:center; -} diff --git a/system/application/models/file_mod.php b/system/application/models/file_mod.php index b93aab354..0ae64410d 100644 --- a/system/application/models/file_mod.php +++ b/system/application/models/file_mod.php @@ -190,6 +190,7 @@ class File_mod extends Model { ) { $data['title'] = $filedata['filename']; $data['raw_link'] = site_url($id); + $data['new_link'] = site_url(); $data['plain_link'] = site_url($id.'/plain'); $data['auto_link'] = site_url($id).'/'; $data['rmd_link'] = site_url($id.'/rmd'); diff --git a/system/application/views/file/header.php b/system/application/views/file/header.php index 76d21e076..aba7283a7 100644 --- a/system/application/views/file/header.php +++ b/system/application/views/file/header.php @@ -9,9 +9,7 @@ <body> <div class="top"> - <ul class="nav"> - <li><?php echo anchor('file/index', 'Upload'); ?></li> - </ul> + <?php echo anchor('file/index', 'New'); ?> </div> <div class="clearer" ></div> diff --git a/system/application/views/file/html_header.php b/system/application/views/file/html_header.php index ebb52a433..ef5b204ff 100644 --- a/system/application/views/file/html_header.php +++ b/system/application/views/file/html_header.php @@ -7,6 +7,7 @@ </head> <body> <div class="top_bar"> + <a class="raw_link no" href="<?php echo $new_link; ?>">New</a> | <a class="raw_link no" href="<?php echo $raw_link; ?>">Raw</a> | <a class="raw_link no" href="<?php echo $plain_link; ?>">Plain</a> | Currently: <?php echo $current_highlight; ?> |