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 @@ -175,7 +175,7 @@
@@ -235,7 +235,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="propform">

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 @@ -26,8 +26,8 @@ tc.follow('New Ticket') summary = random_sentence(5) desc = random_sentence(5) - tc.formvalue('propertyform', 'field-summary', summary) - tc.formvalue('propertyform', 'field-description', desc) + tc.formvalue('propform', 'field-summary', summary) + tc.formvalue('propform', 'field-description', desc) tc.submit('preview') tc.url(self._tester.url + '/newticket$') tc.find('ticket not yet created') @@ -41,7 +41,7 @@ self._tester.go_to_front() tc.follow('New Ticket') desc = random_sentence(5) - tc.formvalue('propertyform', 'field-description', desc) + tc.formvalue('propform', 'field-description', desc) tc.submit('submit') tc.find(desc) tc.find('Tickets must contain a summary.') @@ -96,14 +96,14 @@ self._tester.go_to_ticket(ticketid) # Make a number of changes to exercise all of the RSS feed code self._tester.go_to_ticket(ticketid) - tc.formvalue('propertyform', 'comment', random_sentence(3)) - tc.formvalue('propertyform', 'field-type', 'task') - tc.formvalue('propertyform', 'description', summary + '\n\n' + - random_sentence(8)) - tc.formvalue('propertyform', 'field-keywords', 'key') + tc.formvalue('propform', 'comment', random_sentence(3)) + tc.formvalue('propform', 'field-type', 'task') + tc.formvalue('propform', 'description', summary + '\n\n' + + random_sentence(8)) + tc.formvalue('propform', 'field-keywords', 'key') tc.submit('submit') time.sleep(1) # Have to wait a second - tc.formvalue('propertyform', 'field-keywords', '') + tc.formvalue('propform', 'field-keywords', '') tc.submit('submit') tc.find('RSS Feed') @@ -169,7 +169,7 @@ ticketid = self._tester.create_ticket(name) self._tester.go_to_ticket(ticketid) tc.formvalue - tc.formvalue('propertyform', 'description', random_sentence(6)) + tc.formvalue('propform', 'description', random_sentence(6)) tc.submit('submit') tc.find('description<[^>]*>\\s*modified \\(<[^>]*>diff', 's') tc.follow('diff') 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 @@ - - - - +

+ + + + +