[Python-checkins] r52735 - tracker/instances/python-dev/html/_generic.index.html tracker/instances/python-dev/html/_generic.item.html tracker/instances/python-dev/html/file.item.html tracker/instances/python-dev/html/issue.index.html tracker/instances/python-dev/html/issue.item.html tracker/instances/python-dev/html/msg.item.html tracker/instances/python-dev/html/page.html tracker/instances/python-dev/html/user.index.html tracker/instances/python-dev/html/user.item.html

Sat Nov 11 22:04:20 CET 2006

Author: erik.forsberg
Date: Sat Nov 11 22:04:19 2006
New Revision: 52735
Modified:
 tracker/instances/python-dev/html/_generic.index.html
 tracker/instances/python-dev/html/_generic.item.html
 tracker/instances/python-dev/html/file.item.html
 tracker/instances/python-dev/html/issue.index.html
 tracker/instances/python-dev/html/issue.item.html
 tracker/instances/python-dev/html/msg.item.html
 tracker/instances/python-dev/html/page.html
 tracker/instances/python-dev/html/user.index.html
 tracker/instances/python-dev/html/user.item.html
Log:
Merged changes between roundup 1.2.1 and roundup 1.3.0 into python-dev
tracker.
Modified: tracker/instances/python-dev/html/_generic.index.html
==============================================================================

--- tracker/instances/python-dev/html/_generic.index.html	(original)
+++ tracker/instances/python-dev/html/_generic.index.html	Sat Nov 11 22:04:19 2006
@@ -11,10 +11,16 @@
 
 <td class="content" metal:fill-slot="content">
 
-<span tal:condition="python:not (context.is_view_ok() or context.is_edit_ok())"
+<span tal:condition="python:not (context.is_view_ok() or context.is_edit_ok()
+ or request.user.hasRole('Anonymous'))"
 tal:omit-tag="python:1" i18n:translate=""
 >You are not allowed to view this page.</span>
 
+<span tal:condition="python:not (context.is_view_ok() or context.is_edit_ok())
+ and request.user.hasRole('Anonymous')"
+ tal:omit-tag="python:1" i18n:translate=""
+>Please login with your username and password.</span>
+
 <tal:block tal:condition="context/is_edit_ok">
 <tal:block i18n:translate="">
 <p class="form-help">
Modified: tracker/instances/python-dev/html/_generic.item.html
==============================================================================
--- tracker/instances/python-dev/html/_generic.item.html	(original)
+++ tracker/instances/python-dev/html/_generic.item.html	Sat Nov 11 22:04:19 2006
@@ -9,8 +9,13 @@
 
 <td class="content" metal:fill-slot="content">
 
-<p tal:condition="not:context/is_view_ok" i18n:translate="">You are not
- allowed to view this page.</p>
+<p tal:condition="python:not (context.is_view_ok()
+ or request.user.hasRole('Anonymous'))" i18n:translate="">
+ You are not allowed to view this page.</p>
+
+<p tal:condition="python:not context.is_view_ok()
+ and request.user.hasRole('Anonymous')" i18n:translate="">
+ Please login with your username and password.</p>
 
 <div tal:condition="context/is_view_ok">
 
Modified: tracker/instances/python-dev/html/file.item.html
==============================================================================
--- tracker/instances/python-dev/html/file.item.html	(original)
+++ tracker/instances/python-dev/html/file.item.html	Sat Nov 11 22:04:19 2006
@@ -6,8 +6,13 @@
 
 <td class="content" metal:fill-slot="content">
 
-<p tal:condition="not:context/is_view_ok" i18n:translate="">You are not
- allowed to view this page.</p>
+<p tal:condition="python:not (context.is_view_ok()
+ or request.user.hasRole('Anonymous'))" i18n:translate="">
+ You are not allowed to view this page.</p>
+
+<p tal:condition="python:not context.is_view_ok()
+ and request.user.hasRole('Anonymous')" i18n:translate="">
+ Please login with your username and password.</p>
 
 <form method="POST" onSubmit="return submit_once()"
 enctype="multipart/form-data" tal:condition="context/is_view_ok"
Modified: tracker/instances/python-dev/html/issue.index.html
==============================================================================
--- tracker/instances/python-dev/html/issue.index.html	(original)
+++ tracker/instances/python-dev/html/issue.index.html	Sat Nov 11 22:04:19 2006
@@ -1,4 +1,4 @@
-<!-- $Id: issue.index.html,v 1.25 2006年09月18日 00:03:02 tobias-herp Exp $ -->
+<!-- $Id: issue.index.html,v 1.27 2006年11月09日 01:26:28 richard Exp $ -->
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title" >
 <span tal:omit-tag="true" i18n:translate="" >List of issues</span>
@@ -13,8 +13,13 @@
 </span>
 <td class="content" metal:fill-slot="content">
 
-<p tal:condition="not:context/is_view_ok" i18n:translate="">You are not
- allowed to view this page.</p>
+<p tal:condition="python:not (context.is_view_ok()
+ or request.user.hasRole('Anonymous'))" i18n:translate="">
+ You are not allowed to view this page.</p>
+
+<p tal:condition="python:not context.is_view_ok()
+ and request.user.hasRole('Anonymous')" i18n:translate="">
+ Please login with your username and password.</p>
 
 <tal:block tal:define="batch request/batch" tal:condition="context/is_view_ok">
 <table class="list">
@@ -99,7 +104,7 @@
 <a tal:attributes="href python:request.indexargs_url('issue',
 {'@action':'export_csv'})" i18n:translate="">Download as CSV</a>
 
-<form method="get" class="index-controls"
+<form method="GET" class="index-controls"
 tal:attributes="action request/classname">
 
 <table class="form" tal:define="n_sort python:2">
@@ -119,8 +124,8 @@
 </select>
 </td>
 <th i18n:translate="">Descending:</th>
- <td><input type="checkbox" name="@sortdir"
- tal:attributes="checked python:key and key[0] == '-'">
+ <td><input type="checkbox" tal:attributes="name python:'@sortdir%d'%n;
+ checked python:key and key[0] == '-'">
 </td>
 </tr>
 </tal:block>
@@ -140,8 +145,8 @@
 </select>
 </td>
 <th i18n:translate="">Descending:</th>
- <td><input type="checkbox" name="@groupdir"
- tal:attributes="checked python:key and key[0] == '-'">
+ <td><input type="checkbox" tal:attributes="name python:'@groupdir%d'%n;
+ checked python:key and key[0] == '-'">
 </td>
 </tr>
 </tal:block>
Modified: tracker/instances/python-dev/html/issue.item.html
==============================================================================
--- tracker/instances/python-dev/html/issue.item.html	(original)
+++ tracker/instances/python-dev/html/issue.item.html	Sat Nov 11 22:04:19 2006
@@ -25,17 +25,22 @@
 
 <td class="content" metal:fill-slot="content">
 
-<p tal:condition="python: context.id and context.imported_from_sf"><a tal:attributes="href
+<p tal:condition="python:not (context.is_view_ok()
+ or request.user.hasRole('Anonymous'))" i18n:translate="">
+ You are not allowed to view this page.</p>
+
+<p tal:condition="python:not context.is_view_ok()
+ and request.user.hasRole('Anonymous')" i18n:translate="">
+ Please login with your username and password.</p>
+
+<div tal:condition="context/is_view_ok">
+
+<p tal:condition="python: context.id and context.imported_from_sf">
+ <a tal:attributes="href
 python:'http://sourceforge.net/support/tracker.php?aid='+context.id;">
 Sourceforge tracker item</a> (for comparison)
 </p>
 
-
-<p tal:condition="not:context/is_view_ok" i18n:translate="">You are not
- allowed to view this page.</p>
-
-<div tal:condition="context/is_view_ok">
-
 <form method="POST" name="itemSynopsis"
 onSubmit="return submit_once()" enctype="multipart/form-data"
 tal:attributes="action context/designator">
Modified: tracker/instances/python-dev/html/msg.item.html
==============================================================================
--- tracker/instances/python-dev/html/msg.item.html	(original)
+++ tracker/instances/python-dev/html/msg.item.html	Sat Nov 11 22:04:19 2006
@@ -23,8 +23,13 @@
 </tal:block>
 <td class="content" metal:fill-slot="content">
 
-<p tal:condition="not:context/is_view_ok" i18n:translate="">You are not
- allowed to view this page.</p>
+<p tal:condition="python:not (context.is_view_ok()
+ or request.user.hasRole('Anonymous'))" i18n:translate="">
+ You are not allowed to view this page.</p>
+
+<p tal:condition="python:not context.is_view_ok()
+ and request.user.hasRole('Anonymous')" i18n:translate="">
+ Please login with your username and password.</p>
 
 <div tal:condition="context/is_view_ok">
 <table class="form">
Modified: tracker/instances/python-dev/html/page.html
==============================================================================
--- tracker/instances/python-dev/html/page.html	(original)
+++ tracker/instances/python-dev/html/page.html	Sat Nov 11 22:04:19 2006
@@ -16,7 +16,15 @@
 <metal:x define-slot="more-javascript" />
 
 </head>
-<body>
+<body
+tal:define="
+kw_edit python:request.user.hasPermission('Edit', 'keyword');
+kw_create python:request.user.hasPermission('Create', 'keyword');
+kw_edit_link python:kw_edit and db.keyword.list();
+columns string:id,activity,title,creator,status;
+columns_showall string:id,activity,title,creator,assignedto,status;
+status_notresolved string:-1,1,2,3,4,5,6,7;
+">
 <!-- Logo -->
 <h1 id="logoheader">
 <a accesskey="1" href="." id="logolink"><img src="http://python.org/images/python-logo.gif" alt="homepage" border="0" id="logo" /></a></h1>
@@ -26,7 +34,8 @@
 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 id="search-text" name="@search_text" size="10"
+ tal:attributes="value request/search_text"/>
 <input type="submit" id="submit" name="submit" value="Search" i18n:attributes="value"/>
 </form>
 </div>
@@ -53,13 +62,29 @@
 <a href="issue?@template=item" i18n:translate="">Create New</a>
 </li>
 <li>
- <a href="issue?@sort=-activity&@group=priority&@filter=status,assignedto&@columns=id,activity,title,creator,status&status=1,2&assignedto=-1&@dispname=Show%20Unassigned"
- i18n:translate="">Show Unassigned</a>
- </li>
- <li>
- <a href="issue?@sort=-activity&@group=priority&@filter=status&@columns=id,activity,title,creator,assignedto,status&status=1,2&@dispname=Show%20All"
- i18n:translate="">Show All</a>
- </li>
+ <li><a href="#"
+ tal:attributes="href python:request.indexargs_url('issue', {
+ '@sort': '-activity',
+ '@group': 'priority',
+ '@filter': 'status,assignedto',
+ '@columns': columns,
+ '@search_text': '',
+ 'status': status_notresolved,
+ 'assignedto': '-1',
+ '@dispname': i18n.gettext('Show Unassigned'),
+ })"
+ i18n:translate="">Show Unassigned</a></li>
+ <li><a href="#"
+ tal:attributes="href python:request.indexargs_url('issue', {
+ '@sort': '-activity',
+ '@group': 'priority',
+ '@filter': 'status',
+ '@columns': columns_showall,
+ '@search_text': '',
+ 'status': status_notresolved,
+ '@dispname': i18n.gettext('Show All'),
+ })"
+ i18n:translate="">Show All</a></li>
 <li>
 <a href="issue?@template=search" i18n:translate="">Search</a>
 </li>
@@ -118,7 +143,18 @@
 tal:replace="request/user/username">username</span></b><br/>
 <ul class="level-three">
 <li>
- <a tal:attributes="href string:issue?@sort=-activity&@group=priority&@filter=status,assignedto&@columns=id,activity,title,creator,status&status=1,2&assignedto=${request/user/id}" i18n:translate="">Your Issues</a>
+ <a href="#"
+ tal:attributes="href python:request.indexargs_url('issue', {
+ '@sort': '-activity',
+ '@group': 'priority',
+ '@filter': 'status,assignedto',
+ '@columns': 'id,activity,title,creator,status',
+ '@search_text': '',
+ 'status': status_notresolved,
+ 'assignedto': request.user.id,
+ '@dispname': i18n.gettext('Your Issues'),
+ })"
+ i18n:translate="">Your Issues</a>
 </li>
 <li>
 <a tal:attributes="href string:user${request/user/id}"
Modified: tracker/instances/python-dev/html/user.index.html
==============================================================================
--- tracker/instances/python-dev/html/user.index.html	(original)
+++ tracker/instances/python-dev/html/user.index.html	Sat Nov 11 22:04:19 2006
@@ -6,10 +6,16 @@
 i18n:translate="">User listing</span>
 <td class="content" metal:fill-slot="content">
 
-<span tal:condition="not:context/is_view_ok"
+<span tal:condition="python:not (context.is_view_ok()
+ or request.user.hasRole('Anonymous'))"
 i18n:translate="">You are not allowed to view this page.</span>
 
-<table width="100%" tal:define="batch request/batch" tal:condition="context/is_view_ok" class="list">
+<span tal:condition="python:not context.is_view_ok()
+ and request.user.hasRole('Anonymous')"
+ i18n:translate="">Please login with your username and password.</span>
+
+<table width="100%" tal:condition="context/is_view_ok" class="list"
+ tal:define="batch request/batch">
 <tr>
 <th i18n:translate="">Username</th>
 <th i18n:translate="">Real name</th>
Modified: tracker/instances/python-dev/html/user.item.html
==============================================================================
--- tracker/instances/python-dev/html/user.item.html	(original)
+++ tracker/instances/python-dev/html/user.item.html	Sat Nov 11 22:04:19 2006
@@ -32,8 +32,13 @@
 
 <td class="content" metal:fill-slot="content">
 
-<p tal:condition="not:context/is_view_ok" i18n:translate="">You are not
- allowed to view this page.</p>
+<p tal:condition="python:not (context.is_view_ok()
+ or request.user.hasRole('Anonymous'))" i18n:translate="">
+ You are not allowed to view this page.</p>
+
+<p tal:condition="python:not context.is_view_ok()
+ and request.user.hasRole('Anonymous')" i18n:translate="">
+ Please login with your username and password.</p>
 
 <div tal:condition="context/is_view_ok">
 
