diff --git a/trac/admin/templates/admin_basics.html b/trac/admin/templates/admin_basics.html --- a/trac/admin/templates/admin_basics.html +++ b/trac/admin/templates/admin_basics.html @@ -12,7 +12,7 @@

Basic Settings

-
+
Project
diff --git a/trac/admin/templates/admin_components.html b/trac/admin/templates/admin_components.html --- a/trac/admin/templates/admin_components.html +++ b/trac/admin/templates/admin_components.html @@ -29,7 +29,7 @@ - +
Modify Component:
@@ -58,7 +58,7 @@ -
+
Add Component:
@@ -72,7 +72,7 @@ -
+ diff --git a/trac/admin/templates/admin_enums.html b/trac/admin/templates/admin_enums.html --- a/trac/admin/templates/admin_enums.html +++ b/trac/admin/templates/admin_enums.html @@ -13,7 +13,7 @@

Manage $label_plural

- +
Modify $label_singular
@@ -27,7 +27,7 @@ -
+
Add $label_singular
@@ -40,7 +40,7 @@ -
+
 
diff --git a/trac/admin/templates/admin_logging.html b/trac/admin/templates/admin_logging.html --- a/trac/admin/templates/admin_logging.html +++ b/trac/admin/templates/admin_logging.html @@ -20,7 +20,7 @@

Logging

- +
Configuration
diff --git a/trac/admin/templates/admin_milestones.html b/trac/admin/templates/admin_milestones.html --- a/trac/admin/templates/admin_milestones.html +++ b/trac/admin/templates/admin_milestones.html @@ -13,7 +13,7 @@

Manage Milestones

- +
Modify Milestone:
@@ -69,7 +69,7 @@ - +
Add Milestone:
@@ -92,7 +92,7 @@ -
+
 
diff --git a/trac/admin/templates/admin_plugins.html b/trac/admin/templates/admin_plugins.html --- a/trac/admin/templates/admin_plugins.html +++ b/trac/admin/templates/admin_plugins.html @@ -16,7 +16,7 @@

Manage Plugins

- +
Install Plugin:
@@ -40,7 +40,7 @@
- +

${plugin.name} ${plugin.version}

diff --git a/trac/admin/templates/admin_versions.html b/trac/admin/templates/admin_versions.html --- a/trac/admin/templates/admin_versions.html +++ b/trac/admin/templates/admin_versions.html @@ -13,7 +13,7 @@

Manage Versions

- +
Modify Version:
@@ -48,7 +48,7 @@ -
+
Add Version:
@@ -69,7 +69,7 @@ -
+
 
diff --git a/trac/templates/about.html b/trac/templates/about.html --- a/trac/templates/about.html +++ b/trac/templates/about.html @@ -9,9 +9,11 @@ About Trac diff --git a/trac/templates/history_view.html b/trac/templates/history_view.html --- a/trac/templates/history_view.html +++ b/trac/templates/history_view.html @@ -15,8 +15,8 @@

Change History for ${name_of(resource)}

-
+
 
diff --git a/trac/templates/theme.html b/trac/templates/theme.html --- a/trac/templates/theme.html +++ b/trac/templates/theme.html @@ -35,7 +35,7 @@
+
(none) @@ -83,12 +86,16 @@ attachments.can_create" class="buttons"> - - +
+ + +
- - +
+ + +
${attach_file_form(attachments)} diff --git a/trac/ticket/templates/report_delete.html b/trac/ticket/templates/report_delete.html --- a/trac/ticket/templates/report_delete.html +++ b/trac/ticket/templates/report_delete.html @@ -13,10 +13,10 @@

$report.title

- -

Are you sure you want to delete this report?

+ +
diff --git a/trac/ticket/templates/ticket.html b/trac/ticket/templates/ticket.html --- a/trac/ticket/templates/ticket.html +++ b/trac/ticket/templates/ticket.html @@ -177,7 +177,7 @@
@@ -237,7 +237,7 @@ ('TICKET_APPEND' in perm(ticket.resource) or 'TICKET_CHGPROP' in perm(ticket.resource) or ('TICKET_CREATE' in perm(ticket.resource) and not ticket.id))" - action="${ticket.exists and href.ticket(ticket.id) or href.newticket()}" method="post" name="propform" id="propertyform"> + action="${ticket.exists and href.ticket(ticket.id) or href.newticket()}" method="post" id="propertyform">

Add/Change #${ticket.id} ($ticket.summary)

diff --git a/trac/ticket/tests/functional.py b/trac/ticket/tests/functional.py --- a/trac/ticket/tests/functional.py +++ b/trac/ticket/tests/functional.py @@ -915,9 +915,9 @@ self._tester.login('admin') ticket_id = self._tester.create_ticket() self._tester.go_to_ticket(ticket_id) - tc.formvalue('propform', 'action', 'reassign') + tc.formvalue('propertyform', 'action', 'reassign') tc.find('reassign_reassign_owner') - tc.formvalue('propform', 'action_reassign_reassign_owner', 'user') + tc.formvalue('propertyform', 'action_reassign_reassign_owner', 'user') tc.submit('submit') finally: # Undo the config change for now since this (failing) @@ -1030,7 +1030,7 @@ Open ticket, component changed, owner not changed""" ticketid = self._tester.create_ticket("regression test 5497a") self._tester.go_to_ticket(ticketid) - tc.formvalue('propform', 'field-component', 'regression5497') + tc.formvalue('propertyform', 'field-component', 'regression5497') tc.submit('submit') tc.find(regex_owned_by('user')) @@ -1040,9 +1040,9 @@ Open ticket, component changed, owner changed""" ticketid = self._tester.create_ticket("regression test 5497b") self._tester.go_to_ticket(ticketid) - tc.formvalue('propform', 'field-component', 'regression5497') - tc.formvalue('propform', 'action', 'reassign') - tc.formvalue('propform', 'action_reassign_reassign_owner', 'admin') + tc.formvalue('propertyform', 'field-component', 'regression5497') + tc.formvalue('propertyform', 'action', 'reassign') + tc.formvalue('propertyform', 'action_reassign_reassign_owner', 'admin') tc.submit('submit') tc.notfind(regex_owned_by('user')) tc.find(regex_owned_by('admin')) @@ -1078,27 +1078,27 @@ # leave ids[0] as new # make ids[1] be assigned self._tester.go_to_ticket(ids[1]) - tc.formvalue('propform', 'action', 'reassign') - tc.formvalue('propform', 'action_reassign_reassign_owner', 'admin') + tc.formvalue('propertyform', 'action', 'reassign') + tc.formvalue('propertyform', 'action_reassign_reassign_owner', 'admin') tc.submit('submit') # make ids[2] be accepted self._tester.go_to_ticket(ids[2]) - tc.formvalue('propform', 'action', 'accept') + tc.formvalue('propertyform', 'action', 'accept') tc.submit('submit') # make ids[3] be closed self._tester.go_to_ticket(ids[3]) - tc.formvalue('propform', 'action', 'resolve') - tc.formvalue('propform', 'action_resolve_resolve_resolution', 'fixed') + tc.formvalue('propertyform', 'action', 'resolve') + tc.formvalue('propertyform', 'action_resolve_resolve_resolution', 'fixed') tc.submit('submit') # make ids[4] be reopened self._tester.go_to_ticket(ids[4]) - tc.formvalue('propform', 'action', 'resolve') - tc.formvalue('propform', 'action_resolve_resolve_resolution', 'fixed') + tc.formvalue('propertyform', 'action', 'resolve') + tc.formvalue('propertyform', 'action_resolve_resolve_resolution', 'fixed') tc.submit('submit') # FIXME: we have to wait a second to avoid "IntegrityError: columns # ticket, time, field are not unique" time.sleep(1) - tc.formvalue('propform', 'action', 'reopen') + tc.formvalue('propertyform', 'action', 'reopen') tc.submit('submit') tc.show() tc.notfind("Python Traceback") @@ -1168,7 +1168,7 @@ self._tester.create_ticket(summary='RegressionTestTicket6048b') self._tester.go_to_ticket(ticket_id) tc.find('delete ticket') - tc.formvalue('propform', 'action', 'delete') + tc.formvalue('propertyform', 'action', 'delete') tc.submit('submit') self._tester.go_to_ticket(ticket_id) @@ -1224,10 +1224,10 @@ # create a ticket, then preview resolving the ticket twice ticket_id = self._tester.create_ticket("RegressionTestTicket6879 a") self._tester.go_to_ticket(ticket_id) - tc.formvalue('propform', 'action', 'resolve') - tc.formvalue('propform', 'action_resolve_resolve_resolution', 'fixed') + tc.formvalue('propertyform', 'action', 'resolve') + tc.formvalue('propertyform', 'action_resolve_resolve_resolution', 'fixed') tc.submit('preview') - tc.formvalue('propform', 'action', 'resolve') + tc.formvalue('propertyform', 'action', 'resolve') tc.submit('preview') @@ -1241,10 +1241,10 @@ # create a ticket, then preview resolving the ticket twice ticket_id = self._tester.create_ticket("RegressionTestTicket6879 b") self._tester.go_to_ticket(ticket_id) - tc.formvalue('propform', 'action', 'resolve') - tc.formvalue('propform', 'action_resolve_resolve_resolution', 'fixed') + tc.formvalue('propertyform', 'action', 'resolve') + tc.formvalue('propertyform', 'action_resolve_resolve_resolution', 'fixed') tc.submit('preview') - tc.formvalue('propform', 'action', 'resolve') + tc.formvalue('propertyform', 'action', 'resolve') tc.submit('submit') diff --git a/trac/wiki/templates/wiki_delete.html b/trac/wiki/templates/wiki_delete.html --- a/trac/wiki/templates/wiki_delete.html +++ b/trac/wiki/templates/wiki_delete.html @@ -21,8 +21,8 @@ ">

Delete $range $page.name

-

+ Are you sure you want to ${not range and 'completely' or ''} delete $range this page?
diff --git a/trac/wiki/templates/wiki_diff.html b/trac/wiki/templates/wiki_diff.html --- a/trac/wiki/templates/wiki_diff.html +++ b/trac/wiki/templates/wiki_diff.html @@ -9,12 +9,14 @@ - - - - +

+ + + + +