summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorhel <git@yorhel.nl>2008-12-23 09:55:59 +0100
committerYorhel <git@yorhel.nl>2008-12-23 09:55:59 +0100
commitb65c057afb9849bfcbefa08b40c7a548f5e3a6a7 (patch)
tree5de496289ec75a71b7f893271db208fbd94823fd
parent99c38fd5886778178cd752a91ca41d9686de0ce6 (diff)
Removed skin directory name from the config files, and renamed fullname to name
-rw-r--r--static/s/angel/conf3
-rw-r--r--static/s/test/conf3
-rwxr-xr-xutil/skingen.pl9
3 files changed, 7 insertions, 8 deletions
diff --git a/static/s/angel/conf b/static/s/angel/conf
index cc73db2f..0e8dbaed 100644
--- a/static/s/angel/conf
+++ b/static/s/angel/conf
@@ -1,5 +1,4 @@
-name angel
-fullname Angelic Serenade
+name Angelic Serenade
bodybg #000 // main background color
maintext #ddd // primary text color
alttitle #fff // alternative title + menu link color
diff --git a/static/s/test/conf b/static/s/test/conf
index 5a234e76..7e76a634 100644
--- a/static/s/test/conf
+++ b/static/s/test/conf
@@ -1,5 +1,4 @@
-name test
-fullname Testlayout
+name Testlayout
bodybg #fff // main background color
maintext #333 // primary text color
alttitle #000 // alternative title + menu link color
diff --git a/util/skingen.pl b/util/skingen.pl
index 4a1db17f..95aa8d63 100755
--- a/util/skingen.pl
+++ b/util/skingen.pl
@@ -29,6 +29,7 @@ sub readskin { # skin name
$o{$1} = $2;
}
close $F;
+ $o{_name} = $name;
return \%o;
}
@@ -37,7 +38,7 @@ sub writeskin { # $obj
my $o = shift;
# fix image locations
- $o->{$_} && ($o->{$_} = '/s/'.$o->{name}.'/'.$o->{$_}) for (qw|imglefttop imgrighttop|);
+ $o->{$_} && ($o->{$_} = '/s/'.$o->{_name}.'/'.$o->{$_}) for (qw|imglefttop imgrighttop|);
# get the right top image
if($o->{imgrighttop}) {
@@ -60,8 +61,8 @@ sub writeskin { # $obj
# create boxbg.png
my $img = Image::Magick->new(size => '1x1');
$img->Read('xc:'.$o->{boxbg});
- $img->Write(filename => $ROOT.'/static/s/'.$o->{name}.'/boxbg.png');
- $o->{_boxbg} = '/s/'.$o->{name}.'/boxbg.png';
+ $img->Write(filename => $ROOT.'/static/s/'.$o->{_name}.'/boxbg.png');
+ $o->{_boxbg} = '/s/'.$o->{_name}.'/boxbg.png';
# get the blend color
$img = Image::Magick->new(size => '1x1');
@@ -71,7 +72,7 @@ sub writeskin { # $obj
# write the CSS
open my $CSS, '<', "$ROOT/data/skingen/style.css" or die $!;
- open my $SKIN, '>', "$ROOT/static/s/$o->{name}/style.css" or die $!;
+ open my $SKIN, '>', "$ROOT/static/s/$o->{_name}/style.css" or die $!;
while((my $d = <$CSS>)) {
$d =~ s/\$$_\$/$o->{$_}/g for (keys %$o);
print $SKIN $d;