[#8457] prevented actions from getting duplicated when a ticket is on edit mode and then canceled
diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index f4d2f6b..79659f5 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -122,7 +122,8 @@
{% set inner_width = outer_width %}
{% endif %}
<div class="grid-{{ outer_width }} pad">
- <h2 class="dark{% block header_classes %} title{% endblock %}">{% block header %}{% endblock %}
+ <h2 class="dark{% block header_classes %} title{% endblock %}">
+ <span>{% block header %}{% endblock %}</span>
<!-- actions -->
<small>
{% block actions %}{% endblock %}
@@ -172,6 +173,7 @@
{{ c.project.neighborhood.site_specific_html | safe }}
{% endif %}
{{ theme_macros.custom_js() }}
+
{% if flash %}
<script type="text/javascript">{{ flash | safe }}</script>
{% endif %}
diff --git a/Allura/allura/templates_responsive/jinja_master/master.html b/Allura/allura/templates_responsive/jinja_master/master.html
index 2f12bc1..defab9b 100644
--- a/Allura/allura/templates_responsive/jinja_master/master.html
+++ b/Allura/allura/templates_responsive/jinja_master/master.html
@@ -112,7 +112,8 @@
{% endblock %}
{% endif %}
<div class="column">
- <h2 class="{% block header_classes %} title{% endblock %}">{% block header %}{% endblock %}
+ <h2 class="{% block header_classes %} title{% endblock %}">
+ <span>{% block header %}{% endblock %}</span>
<!-- actions -->
<small>
{% block actions %}{% endblock %}
diff --git a/ForgeTracker/forgetracker/templates/tracker/ticket.html b/ForgeTracker/forgetracker/templates/tracker/ticket.html
index 97f3fa1..59bd0a3 100644
--- a/ForgeTracker/forgetracker/templates/tracker/ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/ticket.html
@@ -189,6 +189,7 @@
var discussion_holder = $('#discussion_holder');
var ticket_content = $('#ticket_content');
var title_holder = $('h2.dark');
+ var original_title_text = title_holder.find('span').text()
var original_title = title_holder.html();
var title_actions = title_holder.find('small');
var vote = $('#vote');
@@ -203,7 +204,7 @@
ticket_content.hide();
title_actions.hide();
title_actions.appendTo(document.body);
- title_holder.text('\u00A0');
+ title_holder.find('span').text('\u00A0')
vote.hide();
$('div.new-ticket-title label').hide();
$('a.edit_ticket').addClass('btn_activate');
@@ -225,7 +226,7 @@
view_holder.show();
discussion_holder.show();
ticket_content.show();
- title_holder.html(original_title);
+ title_holder.find('span').html(original_title_text)
title_actions.appendTo(title_holder);
title_actions.show();
vote.show();