You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/04/04 00:15:50 UTC
[1/3] git commit: [#5088] ticket:309 s/wraning_msg/warning_msg
Updated Branches:
refs/heads/master 5eb6d368d -> f81ebb34c
[#5088] ticket:309 s/wraning_msg/warning_msg
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/80b4708c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/80b4708c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/80b4708c
Branch: refs/heads/master
Commit: 80b4708c942df8370e774db6844a712dce525e6b
Parents: 5ca4eaf
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed Apr 3 10:29:18 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Wed Apr 3 22:00:45 2013 +0000
----------------------------------------------------------------------
.../allura/ext/admin/templates/project_tools.html | 2 +-
Allura/allura/public/nf/js/project_tools.js | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/80b4708c/Allura/allura/ext/admin/templates/project_tools.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_tools.html b/Allura/allura/ext/admin/templates/project_tools.html
index 51f1521..68e83ce 100644
--- a/Allura/allura/ext/admin/templates/project_tools.html
+++ b/Allura/allura/ext/admin/templates/project_tools.html
@@ -105,7 +105,7 @@
</div>
</div>
<form id="mount_delete_form" style="display:none">
- <div class="grid-13 wraning_msg">Warning: This will destroy all data in this tool and is non reversable!</div>
+ <div class="grid-13 warning_msg">Warning: This will destroy all data in this tool and is non reversable!</div>
<div class="grid-13"> </div>
<hr>
<div class="grid-13"> </div>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/80b4708c/Allura/allura/public/nf/js/project_tools.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/project_tools.js b/Allura/allura/public/nf/js/project_tools.js
index fca4919..1b07067 100644
--- a/Allura/allura/public/nf/js/project_tools.js
+++ b/Allura/allura/public/nf/js/project_tools.js
@@ -52,11 +52,11 @@
});
$('a.mount_delete').click(function () {
if (this.getAttribute('mount_point')){
- $('div.wraning_msg').text('Warning: This will destroy all data in the "' +
+ $('div.warning_msg').text('Warning: This will destroy all data in the "' +
this.getAttribute('mount_point') +
'" tool and is non reversable!');}
else {
- $('div.wraning_msg').text('Warning: This will destroy all data in this tool and is non reversable!');
+ $('div.warning_msg').text('Warning: This will destroy all data in this tool and is non reversable!');
}
form_to_delete = this.parentNode;
@@ -107,4 +107,4 @@
ui.helper.css('margin-top', 0 );
});
}
-})();
\ No newline at end of file
+})();
[2/3] git commit: [#5088] ticket:309 Confirm delete dialog contains
information about the deleted tool
Posted by jo...@apache.org.
[#5088] ticket:309 Confirm delete dialog contains information about the deleted tool
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/5ca4eaf1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/5ca4eaf1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/5ca4eaf1
Branch: refs/heads/master
Commit: 5ca4eaf1ca6554a3c846557a59f190e04882f7dd
Parents: 5eb6d36
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Tue Apr 2 12:20:27 2013 +0400
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Wed Apr 3 22:00:45 2013 +0000
----------------------------------------------------------------------
.../allura/ext/admin/templates/project_tools.html | 6 +++---
Allura/allura/public/nf/js/project_tools.js | 8 ++++++++
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5ca4eaf1/Allura/allura/ext/admin/templates/project_tools.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_tools.html b/Allura/allura/ext/admin/templates/project_tools.html
index 30005e3..51f1521 100644
--- a/Allura/allura/ext/admin/templates/project_tools.html
+++ b/Allura/allura/ext/admin/templates/project_tools.html
@@ -71,7 +71,7 @@
value="{{mount['ac'].options.mount_point}}"/>
<input name="tool-{{loop.index0}}.delete" type="hidden" value="Delete"/>
{% if mount['ac'].load().uninstallable %}
- <a href="#" class="mount_delete">Delete</a>
+ <a href="#" class="mount_delete" mount_point="{{ mount['ac'].options.mount_point }}">Delete</a>
{% endif %}
</form>
</li>
@@ -95,7 +95,7 @@
name="subproject-{{loop.index0}}.shortname"
value="{{mount['sub'].shortname}}"/>
<input name="subproject-{{loop.index0}}.delete" type="hidden" value="Delete"/>
- <a href="#" class="mount_delete">Delete</a>
+ <a href="#" class="mount_delete" mount_point="{{ mount['sub'].shortname }}">Delete</a>
</form>
</li>
</ul>
@@ -105,7 +105,7 @@
</div>
</div>
<form id="mount_delete_form" style="display:none">
- <div class="grid-13">Warning: This will destroy all data in this tool and is non reversable!</div>
+ <div class="grid-13 wraning_msg">Warning: This will destroy all data in this tool and is non reversable!</div>
<div class="grid-13"> </div>
<hr>
<div class="grid-13"> </div>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5ca4eaf1/Allura/allura/public/nf/js/project_tools.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/project_tools.js b/Allura/allura/public/nf/js/project_tools.js
index 89fed8e..fca4919 100644
--- a/Allura/allura/public/nf/js/project_tools.js
+++ b/Allura/allura/public/nf/js/project_tools.js
@@ -51,6 +51,14 @@
form_to_delete = null;
});
$('a.mount_delete').click(function () {
+ if (this.getAttribute('mount_point')){
+ $('div.wraning_msg').text('Warning: This will destroy all data in the "' +
+ this.getAttribute('mount_point') +
+ '" tool and is non reversable!');}
+ else {
+ $('div.wraning_msg').text('Warning: This will destroy all data in this tool and is non reversable!');
+ }
+
form_to_delete = this.parentNode;
return false;
});
[3/3] git commit: [#5088] Changed custom attribute to HTML5 data-*
attr
Posted by jo...@apache.org.
[#5088] Changed custom attribute to HTML5 data-* attr
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/f81ebb34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/f81ebb34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/f81ebb34
Branch: refs/heads/master
Commit: f81ebb34c22b6fce51990310ebea7768086d1814
Parents: 80b4708
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Wed Apr 3 22:15:20 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Wed Apr 3 22:15:20 2013 +0000
----------------------------------------------------------------------
.../allura/ext/admin/templates/project_tools.html | 4 ++--
Allura/allura/public/nf/js/project_tools.js | 11 +++++------
2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f81ebb34/Allura/allura/ext/admin/templates/project_tools.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_tools.html b/Allura/allura/ext/admin/templates/project_tools.html
index 68e83ce..0d572af 100644
--- a/Allura/allura/ext/admin/templates/project_tools.html
+++ b/Allura/allura/ext/admin/templates/project_tools.html
@@ -71,7 +71,7 @@
value="{{mount['ac'].options.mount_point}}"/>
<input name="tool-{{loop.index0}}.delete" type="hidden" value="Delete"/>
{% if mount['ac'].load().uninstallable %}
- <a href="#" class="mount_delete" mount_point="{{ mount['ac'].options.mount_point }}">Delete</a>
+ <a href="#" class="mount_delete" data-mount-point="{{ mount['ac'].options.mount_point }}">Delete</a>
{% endif %}
</form>
</li>
@@ -95,7 +95,7 @@
name="subproject-{{loop.index0}}.shortname"
value="{{mount['sub'].shortname}}"/>
<input name="subproject-{{loop.index0}}.delete" type="hidden" value="Delete"/>
- <a href="#" class="mount_delete" mount_point="{{ mount['sub'].shortname }}">Delete</a>
+ <a href="#" class="mount_delete" data-mount-point="{{ mount['sub'].shortname }}">Delete</a>
</form>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f81ebb34/Allura/allura/public/nf/js/project_tools.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/project_tools.js b/Allura/allura/public/nf/js/project_tools.js
index 1b07067..c477e7a 100644
--- a/Allura/allura/public/nf/js/project_tools.js
+++ b/Allura/allura/public/nf/js/project_tools.js
@@ -51,13 +51,12 @@
form_to_delete = null;
});
$('a.mount_delete').click(function () {
- if (this.getAttribute('mount_point')){
- $('div.warning_msg').text('Warning: This will destroy all data in the "' +
- this.getAttribute('mount_point') +
- '" tool and is non reversable!');}
- else {
- $('div.warning_msg').text('Warning: This will destroy all data in this tool and is non reversable!');
+ var tool_label = 'this';
+ var mount_point = $(this).data('mount-point');
+ if (mount_point) {
+ tool_label = 'the "' + mount_point + '"';
}
+ $('div.warning_msg').text('Warning: This will destroy all data in ' + tool_label + ' tool and is non-reversable!');
form_to_delete = this.parentNode;
return false;