Tweak the CSS and stuff beyond repair.

diff --git a/files/pr0n.css b/files/pr0n.css
index e5841c2635a61d377dc6ee891ecf27c7a40a4bf6..f49eccac79d648fee6a3cfc75d99fd597717d29b 100644 (file)
--- a/files/pr0n.css
+++ b/files/pr0n.css
@@ -12,15 +12,35 @@ a {
 }
 h2.date {
        font-size: 1em;
+       margin-top: 0.5em;
+       margin-bottom: 0.5em;
+}
+h1 {
+       margin-bottom: 0;
 }
 img {
        border: 1px solid black;
 }
 h2 {
-       display: inline;
+       margin-bottom: 0.5em;
+       margin-top: 0.5em;
+}
+p, h2.date {
+       padding-left: 2em;
+}
+p {
+       margin: 0;
+}
+ul {
+       margin-left: 1em;
 }
 .fsfromhere {
-       font-size: smaller;
+       font-size: small;
+       font-weight: normal;
        display: inline;
        margin-left: 1em;
+       padding-left: 0;
+}
+* {
+/*     border: 1px solid red; */
 }

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index a00cadf8e23dba933ab70d1869f2ee81a2350353..b5bc5f13908a4773e88d48015384800a607e7c95 100644 (file)
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -222,8 +222,10 @@ sub handler {
 
                                if ($takenby ne $lastupl) {
                                        $lastupl = $takenby;
+                                       $r->print("    <h2>");
                                        Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
                                        print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
+                                       $r->print("</h2>\n");
                                }
                                if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
                                        my $width = $ref->{'width'};
@@ -268,8 +270,10 @@ sub handler {
 
                                if ($takenby ne $lastupl) {
                                        $lastupl = $takenby;
+                                       $r->print("    <h2>");
                                        Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
                                        print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
+                                       $r->print("</h2>\n");
                                }
                                if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
                                        my $width = $ref->{'width'};
@@ -308,9 +312,11 @@ sub handler {
                                if ($takenby ne $lastupl) {
                                        $r->print("    </p>\n\n") if ($lastupl ne "");
                                        $lastupl = $takenby;
+                                       $r->print("    <h2>");
                                        Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
                                        print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
-                                       $r->print("    <p>\n");
+                                       $r->print("</h2>\n");
+                                       $r->print("    <p class=\"photos\">\n");
                                }
                                if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
                                        my $width = $ref->{'width'};

diff --git a/templates/bilder.knatten.com/submittedby b/templates/bilder.knatten.com/submittedby
index 6d6c8aaaed08658fb9f903cfdb1d7bcaafa20b16..fd7ddd94b54961897a487ae8726b8e3e14073ac5 100644 (file)
--- a/templates/bilder.knatten.com/submittedby
+++ b/templates/bilder.knatten.com/submittedby
@@ -1 +1 @@
-    <h2>Tatt av: %AUTHOR%</h2>
+Tatt av: %AUTHOR%

diff --git a/templates/default/submittedby b/templates/default/submittedby
index 7460ee7bcbaf458f689cc57ce724d3b15e9c5082..b27c685a3e647576a22e9cd200395ac94a75da2d 100644 (file)
--- a/templates/default/submittedby
+++ b/templates/default/submittedby
@@ -1 +1 @@
-    <h2>Taken by: %AUTHOR%</h2>
+Taken by: %AUTHOR%

diff --git a/templates/images.tg05.gathering.org/submittedby b/templates/images.tg05.gathering.org/submittedby
index 7460ee7bcbaf458f689cc57ce724d3b15e9c5082..b27c685a3e647576a22e9cd200395ac94a75da2d 100644 (file)
--- a/templates/images.tg05.gathering.org/submittedby
+++ b/templates/images.tg05.gathering.org/submittedby
@@ -1 +1 @@
-    <h2>Taken by: %AUTHOR%</h2>
+Taken by: %AUTHOR%

diff --git a/templates/itk-bilder.samfundet.no/submittedby b/templates/itk-bilder.samfundet.no/submittedby
index 6d6c8aaaed08658fb9f903cfdb1d7bcaafa20b16..fd7ddd94b54961897a487ae8726b8e3e14073ac5 100644 (file)
--- a/templates/itk-bilder.samfundet.no/submittedby
+++ b/templates/itk-bilder.samfundet.no/submittedby
@@ -1 +1 @@
-    <h2>Tatt av: %AUTHOR%</h2>
+Tatt av: %AUTHOR%

diff --git a/templates/skoyen.bilder.knatten.com/submittedby b/templates/skoyen.bilder.knatten.com/submittedby
index 6d6c8aaaed08658fb9f903cfdb1d7bcaafa20b16..fd7ddd94b54961897a487ae8726b8e3e14073ac5 100644 (file)
--- a/templates/skoyen.bilder.knatten.com/submittedby
+++ b/templates/skoyen.bilder.knatten.com/submittedby
@@ -1 +1 @@
-    <h2>Tatt av: %AUTHOR%</h2>
+Tatt av: %AUTHOR%

diff --git a/templates/skoyen.bildereks.knatten.com/submittedby b/templates/skoyen.bildereks.knatten.com/submittedby
index 6d6c8aaaed08658fb9f903cfdb1d7bcaafa20b16..fd7ddd94b54961897a487ae8726b8e3e14073ac5 100644 (file)
--- a/templates/skoyen.bildereks.knatten.com/submittedby
+++ b/templates/skoyen.bildereks.knatten.com/submittedby
@@ -1 +1 @@
-    <h2>Tatt av: %AUTHOR%</h2>
+Tatt av: %AUTHOR%