Mercurial > p > roundup > code
changeset 1776:3d7bb1659d73 maint-0.6
merge from HEAD
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Fri, 29 Aug 2003 12:45:54 +0000 |
| parents | ae5ed85b111a |
| children | d85cb1ad9bc9 |
| files | CHANGES.txt roundup/admin.py templates/classic/html/page.html |
| diffstat | 3 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGES.txt Thu Aug 28 05:55:34 2003 +0000 +++ b/CHANGES.txt Fri Aug 29 12:45:54 2003 +0000 @@ -15,6 +15,7 @@ - fixed upgrading docs for timezones (sf bug 790498) - set the content type on page templates (can have XML templates now) - various cosmetic fixes (thanks James Kew for being persistent :) +- applied patch 739314 (sorry John!) 2003-08-08 0.6.0
--- a/roundup/admin.py Thu Aug 28 05:55:34 2003 +0000 +++ b/roundup/admin.py Fri Aug 29 12:45:54 2003 +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.55.2.1 2003-08-28 04:53:04 richard Exp $ +# $Id: admin.py,v 1.55.2.2 2003-08-29 12:45:54 richard Exp $ '''Administration commands for maintaining Roundup trackers. ''' @@ -719,7 +719,9 @@ cl = self.get_class(classname) # display the values - for key in cl.properties.keys(): + keys = cl.properties.keys() + keys.sort() + for key in keys: value = cl.get(nodeid, key) print _('%(key)s: %(value)s')%locals()
--- a/templates/classic/html/page.html Thu Aug 28 05:55:34 2003 +0000 +++ b/templates/classic/html/page.html Fri Aug 29 12:45:54 2003 +0000 @@ -37,7 +37,7 @@ <a href="issue?:sort=-activity&:group=priority&:filter=status,assignedto&:columns=id,activity,title,creator,status&status=-1,1,2,3,4,5,6,7&assignedto=-1">Show Unassigned</a><br> <a href="issue?:sort=-activity&:group=priority&:filter=status&:columns=id,activity,title,creator,assignedto,status&status=-1,1,2,3,4,5,6,7">Show All</a><br> <a href="issue?:template=search">Search</a><br> - <input type="submit" value="Show issue no."><input size="4" type="text" name=":number"> + <input type="submit" style="padding: 0" value="Show issue:"><input size="4" type="text" name=":number"> <input type="hidden" name=":type" value="issue"> <input type="hidden" name=":action" value="show"> </p> @@ -71,10 +71,10 @@ <b>Login</b><br> <input size="10" name="__login_name"><br> <input size="10" type="password" name="__login_password"><br> - <input type="submit" name=":action" value="Login"> + <input type="submit" name=":action" value="Login"><br> <span tal:replace="structure request/indexargs_form" /> <a href="user?:template=register">Register</a><br> - <a href="user?:template=forgotten">Lost your password?</a><br> + <a href="user?:template=forgotten">Lost your login?</a><br> </p> </form>
