Merge lp:~jak-o/beeseek/configuration-ui into lp:beeseek/1.0

[Jacopo Moretto]

[Andrea Corbellini (andrea.corbellini)]

Thanks for your work. The new UI looks really great, but I found a small
problem: when there are multiple options, the layout looks strange.
 review needsfixing

I'm attaching a patch so that you can add some dummy options to the
configuration page and do better tests. You can apply it with the
command:
 patch -p0 < add-dummy-options
(Remember not to commit "beeseek/applications/peer/main.py")

review: Needs Fixing

[Andrea Corbellini (andrea.corbellini)]

=== modified file 'beeseek/applications/peer/main.py'
--- beeseek/applications/peer/main.py 2009-03-27 12:53:24 +0000
+++ beeseek/applications/peer/main.py 2009-03-31 13:32:19 +0000
@@ -38,6 +38,23 @@
                           'Wheter to track SSL encoded pages.',
                           default=False)

+ test1 = Option(str, 'Test option 1', None, None,
+ 'This is a test option.',
+ default="bla bla bla")
+
+ class TestConfig(BaseOptionSection):
+
+ implements(IOptionSection)
+ help = 'This is a test section.'
+
+ test2 = Option(str, 'Test option 2 ', None, None,
+ 'This is a test option.',
+ default="bla bla bla")
+
+ test3 = Option(str, 'Test option 3', None, None,
+ 'This is a test option.',
+ default="bla bla bla")
+

 class ProxySession(BaseServerSession):

[lp:~jak-o/beeseek/configuration-ui]

246. By Jacopo Moretto on 2009-03-31

Minor adjustments to BeeSeek Peer configuration theme.

[Andrea Corbellini (andrea.corbellini)]

This new revision looks good. +1

review: Approve

=== modified file 'webdata/css/style_basic.css'
--- webdata/css/style_basic.css	2009-02-19 19:45:15 +0000
+++ webdata/css/style_basic.css	2009-03-31 12:22:14 +0000
@@ -182,3 +182,66 @@
 div#top div#users {
   float:left;
 }
+
+form#options {
+  position:relative;
+  left:0;
+  margin:-1em 0 0 0;
+  width:100%;
+}
+
+li.option {
+  border-top: 1px dotted #cfcfcf;
+  list-style-type: none;
+  padding: 5px;
+  width: 400px;
+}
+
+li.option h3 {
+  margin:0;
+  padding:5px 0;
+}
+
+li.option h3 a{
+  text-decoration:none;
+  color: #556d7a;
+}
+li.option p {
+  font-size: 8pt;
+  margin:0;
+  padding:0 0 10px 0;
+}
+
+div#save {
+  position:relative;
+  padding: 10px;
+  border-top: 1px dotted #cfcfcf;
+  margin-left:3em;
+  width: 400px;
+}
+
+a#cancel {
+  background: #f5f5f5;
+  border: 1px solid #cfcfcf;
+  font-family: "Bitstream Vera Sans", "Trebuchet MS", Trebuchet, Verdana, Arial, Sans-serif;
+  font-size: 9pt;
+  color: #494949;
+  text-decoration: none;
+  padding: 1px 7px;
+  margin: 0 10px;
+}
+
+p#help {
+  position:relative;
+  border: 1px dotted #cfcfcf;
+  padding:5px 7px;
+  font-weight:bold;
+  font-style: italic;
+  width:350px;
+  background: #f5f5f5;
+}
+
+p#help a{
+  text-decoration:none;
+  color: #556d7a;
+}
\ No newline at end of file

=== modified file 'webdata/html/config-bottom.html'
--- webdata/html/config-bottom.html	2009-03-01 13:18:04 +0000
+++ webdata/html/config-bottom.html	2009-03-31 12:22:14 +0000
@@ -1,4 +1,4 @@
     </ol>
-    <p>If you need help, <a href="http://wiki.beeseek.org/Documentation">read
+    <p id="help">If you need help, <a href="http://wiki.beeseek.org/Documentation">read
     the wiki</a> or <a href="http://wiki.beeseek.org/Feedback">contact the
     team</a>.</p>

=== modified file 'webdata/html/config-section.html'
--- webdata/html/config-section.html	2009-03-03 12:49:17 +0000
+++ webdata/html/config-section.html	2009-03-31 12:22:14 +0000
@@ -1,2 +1,4 @@
-      <h3>$name <small><a href="/beeseek:configure/$lowername">edit</a></small></h3>
-      <p>$description</p>
+      <li class="option">
+        <h3>$name <small><a href="/beeseek:configure/$lowername">edit</a></small></h3>
+        <p>$description</p>
+      </li>

=== modified file 'webdata/html/configopt-base.html'
--- webdata/html/configopt-base.html	2009-03-19 17:10:53 +0000
+++ webdata/html/configopt-base.html	2009-03-31 12:22:14 +0000
@@ -1,3 +1,5 @@
-        <h3>$name</h3>
-        <p>$description</p>
-        $widget
+        <li class="option">
+            <h3>$name</h3>
+            <p>$description</p>
+            $widget
+        </li>

=== modified file 'webdata/html/configsec-bottom.html'
--- webdata/html/configsec-bottom.html	2009-03-11 16:14:56 +0000
+++ webdata/html/configsec-bottom.html	2009-03-31 12:22:14 +0000
@@ -1,4 +1,6 @@
       </ol>
-      <p><input type="submit" value="Save changes" /> or
-      <a href="/beeseek:configure">Cancel</a>.</p>
+
+      <div id="save">
+        <input value="Save changes" type="submit"/> <a id="cancel" href="http://www.beeseek.org/beeseek:configure">Cancel</a>
+      </div>
     </form>

=== modified file 'webdata/html/configsec-top.html'
--- webdata/html/configsec-top.html	2009-03-20 16:23:12 +0000
+++ webdata/html/configsec-top.html	2009-03-31 12:22:14 +0000
@@ -1,4 +1,4 @@
     <h2>Configuration for $instance:appname - $name</h2>
     <p>$description</p>
-    <form action="" method="post">
+    <form action="" method="post" id="options">
       <ol>