changeset 329:cc052e263d84

text_x_arnica (parser, css): rearanged order of data below the image to: 1. tools, 2. date exif information, 3.filename/description. That makes it easier to have a longer description with multiple lines and and other elements in the same line.
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Mon, 19 Jan 2009 23:03:11 +0100
parents d130a623d14a
children 3f6de5cba911
files data/plugin/parser/text_x_arnica.py htdocs/arnica/css/text_x_arnica.css
diffstat 2 files changed, 42 insertions(+), 56 deletions(-) [+]
line wrap: on
line diff
--- a/data/plugin/parser/text_x_arnica.py	Mon Jan 19 17:03:51 2009 +0100
+++ b/data/plugin/parser/text_x_arnica.py	Mon Jan 19 23:03:11 2009 +0100
@@ -103,31 +103,30 @@
         if not self.request.user.may.delete(self.pagename):
             return ''
         return """
-<form action="%(url)s" method="POST" enctype="multipart/form-data">
-    <div class="rotate-to-left">
+<li class="tool">
+    <form action="%(url)s" method="POST" enctype="multipart/form-data">
         <input type="hidden" name="action" value="arnica_slides">
         <input type="hidden" name="do" value="rotate_left">
         <input type="hidden" name="target" value="%(this_target)s">
         <input type="image" value="submit" src="%(htdocs)s/arnica/img/arnica_rotate_to_left.png" title="rotate to left">
-    </div>
-</form>
-<form action="%(url)s" method="POST" enctype="multipart/form-data">
-    <div class="rotate-to-right">
+    </form>
+</li>
+<li class="tool">
+    <form action="%(url)s" method="POST" enctype="multipart/form-data">
         <input type="hidden" name="action" value="arnica_slides">
         <input type="hidden" name="do" value="rotate_right">
-         <input type="hidden" name="target" value="%(this_target)s">
+        <input type="hidden" name="target" value="%(this_target)s">
         <input type="image"  value="submit" src="%(htdocs)s/arnica/img/arnica_rotate_to_right.png" title="rotate to right">
-    </div>
-</form>
-<form action="%(url)s" method="POST" enctype="multipart/form-data">
-     <div class="delete-image">
+    </form>
+</li>
+<li class="tool">
+    <form action="%(url)s" method="POST" enctype="multipart/form-data">
          <input type="hidden" name="action" value="arnica_slides">
          <input type="hidden" name="do" value="delete">
          <input type="hidden" name="target" value="%(this_target)s">
          <input type="image" value="submit" src="%(htdocs)s/arnica/img/arnica_remove_image.png" title="move to bak">
-     </div>
-</form>
-""" % {
+    </form>
+</li>""" % {
             'url': Page(self.request, self.pagename).url(self.request),
             'htdocs': self.request.cfg.url_prefix_static,
             "pagename": wikiutil.quoteWikinameURL(self.pagename),
@@ -143,16 +142,17 @@
         selected_images = [image_names[int(idx)] for idx in index]
 
         html = """
-<form action="%(url)s" method="POST" enctype="multipart/form-data">
-    <div class="get-image">
+<ul>
+<li class="tool">
+    <form action="%(url)s" method="POST" enctype="multipart/form-data">
         <input type="hidden" name="action" value="AttachFile">
         <input type="hidden" name="do" value="get">
         <input type="hidden" name="target" value="%(this_target)s">
         <input type="image" value="submit" src="%(htdocs)s/arnica/img/arnica_full_image.png" title="load image">
-    </div>
-</form>
-<form action="%(url)s" method="POST" enctype="multipart/form-data">
-    <div class="slide-show">
+    </form>
+</li>
+<li class="tool">
+    <form action="%(url)s" method="POST" enctype="multipart/form-data">
         <input type="hidden" name="action" value="arnica_slides">
         <input type="hidden" name="do" value="slide_show">
         <input type="hidden" name="alias" value="%(description)s">
@@ -162,9 +162,10 @@
         <input type="hidden" name="original_images" value="%(original_images)s">
         <input type="hidden" name="exif_date" value="%(exif_date)s">
         <input type="image" value="submit" title="slide show" src="%(htdocs)s/arnica/img/arnica_load_slide_show.png">
-    </div>
-</form>
+    </form>
+</li>
 %(html_tools_restricted)s
+</ul>
 """ % {
         "url": Page(self.request, self.pagename).url(self.request),
         "pagename": self.pagename,
@@ -239,9 +240,9 @@
       </div>
     </form>
     <div style="width:%(width)spx">
+    %(html_tools)s
     %(alias_html)s
     %(date_html)s
-    %(html_tools)s
     </div>
 </div>
 """ % {
--- a/htdocs/arnica/css/text_x_arnica.css	Mon Jan 19 17:03:51 2009 +0100
+++ b/htdocs/arnica/css/text_x_arnica.css	Mon Jan 19 23:03:11 2009 +0100
@@ -19,17 +19,13 @@
     display: block;
     text-align: center;
     float: left;
-    padding: 0.2em 0.2em 0.0em 0.2em;
     margin: 0 15px 15px 0;
-    background-color:rgb(240, 240, 240);
-}
-
 }
 
 .arnica .text {
     position: relative;
     text-align: left;
-    margin: 0em;
+    margin: 0;
     padding: 0.2em;
 }
 
@@ -64,39 +60,28 @@
     font-size: 90%;
  }
 
-.arnica .html-show-tools {
+.arnica form {
+    padding: 0;
+    margin: 0;
     position: relative;
-    text-align: center;
-    vertical-align: middle;
-    margin: 0.2em;
-}
-
-.arnica .html-show-tools .get-image {
-	float: left;
-	margin: 0 5px 5px 0;
-    vertical-align: middle;
 }
 
-.arnica  .html-show-tools .slide-show {
-    float: left;
-    margin: 0 5px 5px 0;
-    vertical-align: middle;
+.arnica .html-show-tools {
+    position: relative;
+    width: 100%;
+    padding-top: 2px;
 }
 
-.arnica  .html-show-tools .rotate-to-left {
-    float: left;
-    margin: 0 5px 5px 0;
-    vertical-align: middle;
+.arnica .html-show-tools ul {
+    display: inline;
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
 }
 
-.arnica  .html-show-tools .rotate-to-right {
-    float: left;
-    margin: 0 5px 5px 0;
-    vertical-align: middle;
+.arnica .html-show-tools li {
+    display: table-cell;
+    position: relative;
+    padding: 0 1px 0 1px;
+    margin: 0;
 }
-
-.arnica  .html-show-tools .delete-image {
-	float: left;
-	margin: 0 5px 5px 0;
-    vertical-align: middle;
-}