fixed layout and classes from live

barbie · Jan 1, 2013 · b65bcaa · b65bcaa
1 parent ac62a3e
commit b65bcaa
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/vhost/cgi-bin/config/settings.ini b/vhost/cgi-bin/config/settings.ini
@@ -6,7 +6,7 @@ mailhost=
 cookiename=session
 timeout=3600
 autoguest=1
-copyright=&#169; 1999-2011 CPAN Testers.
+copyright=&#169; 1999-2013 CPAN Testers.
 lastpagereturn=0
 minpasslen=6
 maxpasslen=20

diff --git a/vhost/cgi-bin/templates/articles/arts-item.html b/vhost/cgi-bin/templates/articles/arts-item.html
@@ -10,7 +10,7 @@
 [% IF item %]
     [% IF item.type == 1 %]
         [% IF item.link %]
-        [% IF item.align  %][% class  = item.align  %][% ELSE %][% class  = "inline" %][% END %]
+        [% IF item.align  %][% class = 'thumb' _ item.align %][% ELSE %][% class = "inline" %][% END %]
         [% IF item.href %]
             <a href='[% item.href %]'><img class="[% class %]" src="[% webpath %]/[% item.link %]" alt="[% item.tag %]"
             [% IF item.align  %]align="[% item.align %]"[% END %]

diff --git a/vhost/cgi-bin/templates/articles/arts-preview.html b/vhost/cgi-bin/templates/articles/arts-preview.html
@@ -16,7 +16,7 @@ <h1>Preview: [% preview.data.title %]</h1>
 [% ELSE %]
 [% IF item.type == 1 %]
     [% IF item.link %]
-    [% IF item.align  %][% class  = item.align  %][% ELSE %][% class  = "inline" %][% END %]
+    [% IF item.align  %][% class = 'thumb' _ item.align %][% ELSE %][% class = "inline" %][% END %]
     [% IF item.href %]
         <a href='[% item.href %]'><img class="[% class %]" src="[% webpath %]/[% item.link %]" alt="[% item.tag %]"
         [% IF item.align  %]align="[% item.align %]"[% END %]

diff --git a/vhost/cgi-bin/templates/diary/diary-adminedit.html b/vhost/cgi-bin/templates/diary/diary-adminedit.html
@@ -137,7 +137,7 @@ <h2>[% preview.data.title %]</h2>
 [% IF item.type == 1 %]
 
     [% IF item.link %]
-    [% IF item.align  %][% class  = item.align  %][% ELSE %][% class  = "inline" %][% END %]
+    [% IF item.align  %][% class = item.align %][% ELSE %][% class = "inline" %][% END %]
     [% IF item.href %]
         <div class="thumb[% item.align %]" >
         <a href='[% item.href %]'><img class="[% class %]" src="/[% item.link %]" alt="[% item.tag %]"
@@ -152,7 +152,6 @@ <h2>[% preview.data.title %]</h2>
         [% IF item.width  %]width="[% item.width %]"[% END %]
         [% IF item.height %]height="[% item.height %]"[% END %]
         />
-        [% IF item.tag %]<p>[% item.tag %]</p>[% END %]
         </div>
     [% END %]
     [% END %]

diff --git a/vhost/html/css/layout2_text.css b/vhost/html/css/layout2_text.css
@@ -329,6 +329,7 @@ table.blocker th.named  { width: 100px; }
     padding-top: 5px;
 }
 
+.main-content .thumb1,
 .main-content .thumbleft {
     float: left;
     margin: 0 5px 4px 0;
@@ -337,6 +338,7 @@ table.blocker th.named  { width: 100px; }
     text-align: center;
 }
 
+.main-content .thumb2,
 .main-content .thumbcenter {
     display: block;
     margin: 0 auto 4px auto;
@@ -345,28 +347,38 @@ table.blocker th.named  { width: 100px; }
     text-align: center;
 }
 
+.main-content .thumb3,
 .main-content .thumbright {
     float: right;
-    margin: 0 0 4px 5px;
+    margin: 0 0 5px 10px;
     padding: 4px;
     border: 1px solid #a0a0a0;
     text-align: center;
 }
 
+.main-content .thumb1 p,
+.main-content .thumb2 p,
+.main-content .thumb3 p,
 .main-content .thumbleft   p,
 .main-content .thumbcenter p,
 .main-content .thumbright  p {
     margin: 0;
     padding: 0 0 -15px 0;
 }
 
+.main-content .thumb1 img,
+.main-content .thumb2 img,
+.main-content .thumb3 img,
 .main-content .thumbleft   img,
 .main-content .thumbcenter img,
 .main-content .thumbright  img {
     margin: 0px;
     padding: 0px;
 }
 
+.main-content .thumb1 a img,
+.main-content .thumb2 a img,
+.main-content .thumb3 a img,
 .main-content .thumbleft   a img,
 .main-content .thumbcenter a img,
 .main-content .thumbright  a img {