changeset 3376:446f769b813b maint-0.8

merge from HEAD
author Richard Jones <richard@users.sourceforge.net>
date Tue, 05 Jul 2005 06:28:35 +0000
parents 3f12b4bcf796
children 90efd19c4b36
files roundup/admin.py templates/classic/html/issue.search.html templates/classic/html/page.html templates/minimal/html/page.html templates/minimal/html/style.css
diffstat 5 files changed, 69 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/roundup/admin.py	Fri Jun 24 07:19:04 2005 +0000
+++ b/roundup/admin.py	Tue Jul 05 06:28:35 2005 +0000
@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: admin.py,v 1.85.2.8 2005-06-24 05:34:15 richard Exp $
+# $Id: admin.py,v 1.85.2.9 2005-07-05 06:28:35 richard Exp $
 
 '''Administration commands for maintaining Roundup trackers.
 '''
@@ -407,6 +407,7 @@
         init.write_select_db(tracker_home, backend)
 
         print _("""
+---------------------------------------------------------------------------
  You should now edit the tracker configuration file:
    %(config_file)s""") % {"config_file": config_ini_file}
 
@@ -427,6 +428,10 @@
  You may also change the database initialisation file:
    %(database_init_file)s
  ... see the documentation on customizing for more information.
+
+ You MUST run the "roundup-admin initialise" command once you've performed
+ the above steps.
+---------------------------------------------------------------------------
 """) % {
     'database_config_file': os.path.join(tracker_home, 'schema.py'),
     'database_init_file': os.path.join(tracker_home, 'initial_data.py'),
--- a/templates/classic/html/issue.search.html	Fri Jun 24 07:19:04 2005 +0000
+++ b/templates/classic/html/issue.search.html	Tue Jul 05 06:28:35 2005 +0000
@@ -155,7 +155,7 @@
 </tr>
 
 <tr>
- <th>No Sort or group:</th>
+ <th i18n:translate="">No Sort or group:</th>
  <td>&nbsp;</td>
  <td>&nbsp;</td>
  <td><input type="radio" name="@sort" value=""></td>
--- a/templates/classic/html/page.html	Fri Jun 24 07:19:04 2005 +0000
+++ b/templates/classic/html/page.html	Tue Jul 05 06:28:35 2005 +0000
@@ -28,7 +28,7 @@
        <input type="hidden" name="@sort" value="activity"/>
        <input type="hidden" name="@group" value="priority"/>
        <input id="search-text" name="@search_text" size="10"/>
-       <input type="submit" id="submit" name="submit" value="Search"/>
+       <input type="submit" id="submit" name="submit" value="Search" i18n:attributes="value"/>
      </form>
    </div>
  </td>
--- a/templates/minimal/html/page.html	Fri Jun 24 07:19:04 2005 +0000
+++ b/templates/minimal/html/page.html	Tue Jul 05 06:28:35 2005 +0000
@@ -11,13 +11,27 @@
 </script>
 
 </head>
-<body class="body" marginwidth="0" marginheight="0">
+<body class="body">
 
 <table class="body">
 
 <tr>
  <td class="page-header-left">&nbsp;</td>
- <td class="page-header-top"><h2><span metal:define-slot="body_title">body title</span></h2></td>
+ <td class="page-header-top">
+   <div id="body-title">
+     <h2><span metal:define-slot="body_title">body title</span></h2>
+   </div>
+   <div id="searchbox">
+     <form method="GET" action="issue">
+       <input type="hidden" name="@columns"
+              value="id,activity,title,creator,assignedto,status"/>
+       <input type="hidden" name="@sort" value="activity"/>
+       <input type="hidden" name="@group" value="priority"/>
+       <input id="search-text" name="@search_text" size="10"/>
+       <input type="submit" id="submit" name="submit" value="Search" i18n:attributes="value"/>
+     </form>
+  </div>
+ </td>
 </tr>
 
 <tr>
--- a/templates/minimal/html/style.css	Fri Jun 24 07:19:04 2005 +0000
+++ b/templates/minimal/html/style.css	Tue Jul 05 06:28:35 2005 +0000
@@ -6,12 +6,10 @@
   margin: 0;
 }
 a[href]:hover {
-  background-color: white;
   color:blue;
   text-decoration: underline;
 }
 a[href], a[href]:link {
-  background-color: white;
   color:blue;
   text-decoration: none;
 }
@@ -40,12 +38,35 @@
     td.sidebar {
         display: none;
     }
+    .index-controls {
+        display: none;
+    }
+    #searchbox {
+        display: none;
+    }
 }
 
 td.page-header-top {
   padding: 5px;
   border-bottom: 1px solid #444;
 }
+#searchbox {
+    float: right;
+}
+
+div#body-title {
+  float: left;
+}
+
+
+div#searchbox {
+  float: right;
+  padding-top: 1em;
+}
+
+div#searchbox input#search-text {
+  width: 10em;
+}
 
 form {
   margin: 0;
@@ -69,6 +90,12 @@
   background-color: #eef;
 }
 
+.form-small {
+  padding: 0;
+  font-size: 75%;
+}
+
+
 td.content {
   padding: 1px 5px 1px 5px;
   vertical-align: top;
@@ -91,6 +118,22 @@
   color: white;
   font-weight: bold;
 }
+p.error-message a[href] {
+  color: white;
+  text-decoration: underline;
+}
+
+
+/* style for search forms */
+ul.search-checkboxes {
+    display: inline;
+    padding: none;
+    list-style: none;
+}
+ul.search-checkboxes > li {
+    display: inline;
+    padding-right: .5em;
+}
 
 
 /* style for forms */

Roundup Issue Tracker: http://roundup-tracker.org/