confirm_btn_align fixed misaligned wiki confirm modal
diff --git a/Allura/allura/templates/jinja_master/dialog_macros.html b/Allura/allura/templates/jinja_master/dialog_macros.html
index 82f3a35..9e2557e 100644
--- a/Allura/allura/templates/jinja_master/dialog_macros.html
+++ b/Allura/allura/templates/jinja_master/dialog_macros.html
@@ -25,15 +25,15 @@
{% if not revert_confirmation_dialog %}
{%- macro revert_confirmation_dialog(version) %}
<div class="confirmation_dialog_{{version}}" style="display:none">
- {{ g.icons['close'].render(tag='b', extra_css='close') }}
+ {{ g.icons['close'].render(tag='a', extra_css='close') }}
<h1>Confirm revert to version {{version}}</h1>
<p>
Do you really want to revert page to version {{version}}?
You can undo it later by reverting changes made by this revert.
</p>
<p>
- <button class="continue_confirm" href="./revert?version={{version}}">Yes</button>
- <input type="button" value="Cancel" class="cancel_confirmation close">
+ <input type="submit" value="Yes" class="continue_confirm" data-href="revert?version={{version}}">
+ <input type="submit" value="Cancel" class="cancel_confirmation close">
</p>
</div>
{%- endmacro %}
diff --git a/Allura/allura/templates/user_prefs.html b/Allura/allura/templates/user_prefs.html
index c7a8677..a64062e 100644
--- a/Allura/allura/templates/user_prefs.html
+++ b/Allura/allura/templates/user_prefs.html
@@ -81,7 +81,7 @@
<div class="grid-13">
<p>
<input type="submit" name="enter_pass_submit" value="Ok">
- <input type="button" name="cancel_lightbox" value="Cancel">
+ <input type="submit" name="cancel_lightbox" value="Cancel">
</p>
</div>
</form>
diff --git a/ForgeBlog/forgeblog/templates/blog/post_history.html b/ForgeBlog/forgeblog/templates/blog/post_history.html
index de41bda..1f8cb32 100644
--- a/ForgeBlog/forgeblog/templates/blog/post_history.html
+++ b/ForgeBlog/forgeblog/templates/blog/post_history.html
@@ -71,7 +71,9 @@
modal.find('.continue_confirm').click(function (evt) {
var cval = $.cookie('_session_id');
evt.preventDefault();
- $.post($(this).attr('href'), {_session_id: cval}, function (val) {
+ var _t = $(this);
+ var url = _t.data('href') || _t.attr('href');
+ $.post(url, {_session_id: cval}, function (val) {
window.location = val.location;
}, 'json');
});
diff --git a/ForgeWiki/forgewiki/templates/wiki/master.html b/ForgeWiki/forgewiki/templates/wiki/master.html
index ad03778..e2f561e 100644
--- a/ForgeWiki/forgewiki/templates/wiki/master.html
+++ b/ForgeWiki/forgewiki/templates/wiki/master.html
@@ -50,7 +50,9 @@
modal.find('.continue_confirm').click(function (evt) {
var cval = $.cookie('_session_id');
evt.preventDefault();
- $.post($(this).attr('href'), {_session_id: cval}, function (val) {
+ var _t = $(this);
+ var url = _t.data('href') || _t.attr('href');
+ $.post(url, {_session_id: cval}, function (val) {
window.location = val.location;
}, 'json');
});
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_edit.html b/ForgeWiki/forgewiki/templates/wiki/page_edit.html
index 0fbadad..6d43a51 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_edit.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_edit.html
@@ -36,7 +36,7 @@
{% if page_exists and h.has_access(page, 'delete')() %}
{{ g.icons['delete'].render(extra_css='post-link') }}
<div class="confirmation_dialog" style="display:none">
- {{ g.icons['close'].render(tag='b', extra_css='close') }}
+ {{ g.icons['close'].render(tag='a', extra_css='close') }}
<h1>Confirm page deletion</h1>
<p>
@@ -44,8 +44,8 @@
You can undo it later.
</p>
<p>
- <button class="continue_confirm" href="./delete">Yes</button>
- <input type="button" value="Cancel" class="cancel_confirmation close">
+ <input type="submit" value="Yes" class="continue_confirm" data-href="delete">
+ <input type="submit" value="Cancel" class="cancel_confirmation close">
</p>
</div>
{% endif %}
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_view.html b/ForgeWiki/forgewiki/templates/wiki/page_view.html
index 52954ca..7380232 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_view.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_view.html
@@ -50,15 +50,15 @@
{% elif h.has_access(page, 'delete')() %}
{{ g.icons['undelete'].render(extra_css='post-link') }}
<div class="confirmation_dialog" style="display:none">
- {{ g.icons['close'].render(tag='b', extra_css='close') }}
+ {{ g.icons['close'].render(tag='a', extra_css='close') }}
<h1>Confirm page restoration</h1>
<p>
Do you really want to restore the page?
You can undo it later.
</p>
<p>
- <button class="continue_confirm" href="./undelete">Yes</button>
- <input type="button" value="Cancel" class="cancel_confirmation close">
+ <input type="submit" value="Yes" class="continue_confirm" data-href="undelete">
+ <input type="submit" value="Cancel" class="cancel_confirmation close">
</p>
</div>
