From 6db60d1cb3f2fde8cc764231311dc124437482f6 Mon Sep 17 00:00:00 2001 From: Shish Date: Tue, 20 Apr 2010 02:24:36 +0100 Subject: [PATCH] new default --- themes/{html5 => default}/background.svg | 0 themes/default/comment.theme.php | 7 ++++ themes/default/layout.class.php | 18 ++------- themes/default/setup.theme.php | 5 ++- themes/default/style.css | 45 ++++++++++------------ themes/default/themelet.class.php | 21 +--------- themes/{default => flat}/circle-bl.png | Bin themes/{default => flat}/circle-br.png | Bin themes/{default => flat}/circle-tl.png | Bin themes/{default => flat}/circle-tr.png | Bin themes/{html5 => flat}/comment.theme.php | 7 ---- themes/{html5 => flat}/layout.class.php | 18 +++++++-- themes/{html5 => flat}/setup.theme.php | 5 +-- themes/{html5 => flat}/style.css | 45 ++++++++++++---------- themes/{html5 => flat}/themelet.class.php | 21 +++++++++- 15 files changed, 96 insertions(+), 96 deletions(-) rename themes/{html5 => default}/background.svg (100%) rename themes/{default => flat}/circle-bl.png (100%) rename themes/{default => flat}/circle-br.png (100%) rename themes/{default => flat}/circle-tl.png (100%) rename themes/{default => flat}/circle-tr.png (100%) rename themes/{html5 => flat}/comment.theme.php (73%) rename themes/{html5 => flat}/layout.class.php (87%) rename themes/{html5 => flat}/setup.theme.php (91%) rename themes/{html5 => flat}/style.css (77%) rename themes/{html5 => flat}/themelet.class.php (88%) diff --git a/themes/html5/background.svg b/themes/default/background.svg similarity index 100% rename from themes/html5/background.svg rename to themes/default/background.svg diff --git a/themes/default/comment.theme.php b/themes/default/comment.theme.php index 97676e24..4c6f95dc 100644 --- a/themes/default/comment.theme.php +++ b/themes/default/comment.theme.php @@ -8,5 +8,12 @@ class CustomCommentListTheme extends CommentListTheme { protected function build_postbox($image_id) { return $this->rr(parent::build_postbox($image_id)); } + + protected function rr($html) { + return " + +
$html
+ "; + } } ?> diff --git a/themes/default/layout.class.php b/themes/default/layout.class.php index 6ecc66c7..a96da4ec 100644 --- a/themes/default/layout.class.php +++ b/themes/default/layout.class.php @@ -109,24 +109,14 @@ EOD; //--> "; if(!is_null($h)) $html .= " -
-
-

$h

-
-
+

$h

"; if(!is_null($b)) { - if(strpos($b, "")) { - $html .= "
$b
"; + if(strpos($b, "") === FALSE) { + $html .= "
$b
"; } else { - $html .= " -
-
-
$b
-
-
- "; + $html .= "
$b
"; } } diff --git a/themes/default/setup.theme.php b/themes/default/setup.theme.php index 2d54ec3e..6f55a711 100644 --- a/themes/default/setup.theme.php +++ b/themes/default/setup.theme.php @@ -25,13 +25,14 @@ class CustomSetupTheme extends SetupTheme { } }); //--> -
+
$h
$b
+ "; - return $this->rr($html); + return $html; } } ?> diff --git a/themes/default/style.css b/themes/default/style.css index 75e41b34..487455e3 100644 --- a/themes/default/style.css +++ b/themes/default/style.css @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -3 things common to all pages * +* things common to all pages * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ BODY { @@ -10,12 +10,9 @@ BODY { margin: 0px; } H1 { - border-bottom: 1px solid black; - margin-top: 0px; - margin-bottom: 16px; - padding: 8px; background: #BBB; text-align: center; + border: 1px solid #AAA; } H1 A { color: black; @@ -24,6 +21,22 @@ H3 { text-align: center; margin: 0px; } +.hrr { + background: #CCC; + border: 1px solid #BBB; +} +.brr, .thumb { + background: #DDD; + border: 1px solid #CCC; +} +.brr, .hrr, H1, #footer, .thumb { + margin: 8px; + padding: 8px; + -webkit-border-radius: 12px; + -moz-border-radius: 12px; + -webkit-box-shadow: 2px 2px 6px rgba(0,0,0,0.6); + -moz-box-shadow: 2px 2px 6px rgba(0,0,0,0.6); +} THEAD { font-weight: bold; } @@ -63,11 +76,10 @@ TABLE.zebra TR.even {background: #E0E0E0;} #footer { clear: both; - padding: 8px; font-size: 0.7em; text-align: center; - border-top: 1px solid black; background: #BBB; + border: 1px solid #AAA; } *[onclick] {cursor: pointer;} @@ -99,6 +111,7 @@ UL { #nav .blockbody { font-size: 0.85em; text-align: center; + overflow: hidden; } #nav TABLE { width: 150px; @@ -171,22 +184,6 @@ UL { padding: 8px 4px 8px 4px; } -.rr {text-align: left; background: #DDD; margin: 8px;} -.rrtop {background: url("circle-tl.png") no-repeat top left;} -.rrtop div {background: url("circle-tr.png") no-repeat top right;} -.rrbot {background: url("circle-bl.png") no-repeat bottom left;} -.rrbot div {background: url("circle-br.png") no-repeat bottom right;} -.rrtop, .rrtop div, .rrbot, .rrbot div {height: 8px; width: 100%;} -.rrcontent {margin: 0px 8px; text-align: center;} - -.hrr {text-align: left; background: #CCC; margin: 8px;} -.hrrtop {background: url("circle-tl.png") no-repeat top left;} -.hrrtop div {background: url("circle-tr.png") no-repeat top right;} -.hrrbot {background: url("circle-bl.png") no-repeat bottom left;} -.hrrbot div {background: url("circle-br.png") no-repeat bottom right;} -.hrrtop, .hrrtop div, .hrrbot, .hrrbot div {height: 8px; width: 100%;} -.hrrcontent {margin: 0px 8px;} - .setupblock { text-align: center; width: 350px; @@ -218,11 +215,11 @@ UL { width: 220px; height: 220px; display: inline-block; + text-align: center; float: left; } .thumb { display: inline-block; - text-align: center; margin-bottom: 32px; } diff --git a/themes/default/themelet.class.php b/themes/default/themelet.class.php index 5cb25716..81990bb8 100644 --- a/themes/default/themelet.class.php +++ b/themes/default/themelet.class.php @@ -35,35 +35,18 @@ class Themelet { $h_thumb_link = $image->get_thumb_link(); $tsize = get_thumbnail_size($image->width, $image->height); return " +
-
-
-
+
$h_tip -
-
"; } - /** - * Put something in a rounded rectangle box; specific to the default theme - */ - public function rr($html) { - return " -
-
-
$html
-
-
- "; - } - - /** * Add a generic paginator */ diff --git a/themes/default/circle-bl.png b/themes/flat/circle-bl.png similarity index 100% rename from themes/default/circle-bl.png rename to themes/flat/circle-bl.png diff --git a/themes/default/circle-br.png b/themes/flat/circle-br.png similarity index 100% rename from themes/default/circle-br.png rename to themes/flat/circle-br.png diff --git a/themes/default/circle-tl.png b/themes/flat/circle-tl.png similarity index 100% rename from themes/default/circle-tl.png rename to themes/flat/circle-tl.png diff --git a/themes/default/circle-tr.png b/themes/flat/circle-tr.png similarity index 100% rename from themes/default/circle-tr.png rename to themes/flat/circle-tr.png diff --git a/themes/html5/comment.theme.php b/themes/flat/comment.theme.php similarity index 73% rename from themes/html5/comment.theme.php rename to themes/flat/comment.theme.php index 4c6f95dc..97676e24 100644 --- a/themes/html5/comment.theme.php +++ b/themes/flat/comment.theme.php @@ -8,12 +8,5 @@ class CustomCommentListTheme extends CommentListTheme { protected function build_postbox($image_id) { return $this->rr(parent::build_postbox($image_id)); } - - protected function rr($html) { - return " - -
$html
- "; - } } ?> diff --git a/themes/html5/layout.class.php b/themes/flat/layout.class.php similarity index 87% rename from themes/html5/layout.class.php rename to themes/flat/layout.class.php index a96da4ec..6ecc66c7 100644 --- a/themes/html5/layout.class.php +++ b/themes/flat/layout.class.php @@ -109,14 +109,24 @@ EOD; //--> "; if(!is_null($h)) $html .= " -

$h

+
+
+

$h

+
+
"; if(!is_null($b)) { - if(strpos($b, "") === FALSE) { - $html .= "
$b
"; + if(strpos($b, "")) { + $html .= "
$b
"; } else { - $html .= "
$b
"; + $html .= " +
+
+
$b
+
+
+ "; } } diff --git a/themes/html5/setup.theme.php b/themes/flat/setup.theme.php similarity index 91% rename from themes/html5/setup.theme.php rename to themes/flat/setup.theme.php index 6f55a711..2d54ec3e 100644 --- a/themes/html5/setup.theme.php +++ b/themes/flat/setup.theme.php @@ -25,14 +25,13 @@ class CustomSetupTheme extends SetupTheme { } }); //--> -
+
$h
$b
- "; - return $html; + return $this->rr($html); } } ?> diff --git a/themes/html5/style.css b/themes/flat/style.css similarity index 77% rename from themes/html5/style.css rename to themes/flat/style.css index 487455e3..75e41b34 100644 --- a/themes/html5/style.css +++ b/themes/flat/style.css @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -* things common to all pages * +3 things common to all pages * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ BODY { @@ -10,9 +10,12 @@ BODY { margin: 0px; } H1 { + border-bottom: 1px solid black; + margin-top: 0px; + margin-bottom: 16px; + padding: 8px; background: #BBB; text-align: center; - border: 1px solid #AAA; } H1 A { color: black; @@ -21,22 +24,6 @@ H3 { text-align: center; margin: 0px; } -.hrr { - background: #CCC; - border: 1px solid #BBB; -} -.brr, .thumb { - background: #DDD; - border: 1px solid #CCC; -} -.brr, .hrr, H1, #footer, .thumb { - margin: 8px; - padding: 8px; - -webkit-border-radius: 12px; - -moz-border-radius: 12px; - -webkit-box-shadow: 2px 2px 6px rgba(0,0,0,0.6); - -moz-box-shadow: 2px 2px 6px rgba(0,0,0,0.6); -} THEAD { font-weight: bold; } @@ -76,10 +63,11 @@ TABLE.zebra TR.even {background: #E0E0E0;} #footer { clear: both; + padding: 8px; font-size: 0.7em; text-align: center; + border-top: 1px solid black; background: #BBB; - border: 1px solid #AAA; } *[onclick] {cursor: pointer;} @@ -111,7 +99,6 @@ UL { #nav .blockbody { font-size: 0.85em; text-align: center; - overflow: hidden; } #nav TABLE { width: 150px; @@ -184,6 +171,22 @@ UL { padding: 8px 4px 8px 4px; } +.rr {text-align: left; background: #DDD; margin: 8px;} +.rrtop {background: url("circle-tl.png") no-repeat top left;} +.rrtop div {background: url("circle-tr.png") no-repeat top right;} +.rrbot {background: url("circle-bl.png") no-repeat bottom left;} +.rrbot div {background: url("circle-br.png") no-repeat bottom right;} +.rrtop, .rrtop div, .rrbot, .rrbot div {height: 8px; width: 100%;} +.rrcontent {margin: 0px 8px; text-align: center;} + +.hrr {text-align: left; background: #CCC; margin: 8px;} +.hrrtop {background: url("circle-tl.png") no-repeat top left;} +.hrrtop div {background: url("circle-tr.png") no-repeat top right;} +.hrrbot {background: url("circle-bl.png") no-repeat bottom left;} +.hrrbot div {background: url("circle-br.png") no-repeat bottom right;} +.hrrtop, .hrrtop div, .hrrbot, .hrrbot div {height: 8px; width: 100%;} +.hrrcontent {margin: 0px 8px;} + .setupblock { text-align: center; width: 350px; @@ -215,11 +218,11 @@ UL { width: 220px; height: 220px; display: inline-block; - text-align: center; float: left; } .thumb { display: inline-block; + text-align: center; margin-bottom: 32px; } diff --git a/themes/html5/themelet.class.php b/themes/flat/themelet.class.php similarity index 88% rename from themes/html5/themelet.class.php rename to themes/flat/themelet.class.php index 81990bb8..5cb25716 100644 --- a/themes/html5/themelet.class.php +++ b/themes/flat/themelet.class.php @@ -35,18 +35,35 @@ class Themelet { $h_thumb_link = $image->get_thumb_link(); $tsize = get_thumbnail_size($image->width, $image->height); return " -
-
+
+
+
$h_tip +
+
"; } + /** + * Put something in a rounded rectangle box; specific to the default theme + */ + public function rr($html) { + return " +
+
+
$html
+
+
+ "; + } + + /** * Add a generic paginator */