com web/bugs: Slightly improve loading feedback, incl. adding small image: templates/addghpull.php www/images/loading-blue.gif
| From: | Johannes Schlüter | Date: | Wed, 13 Feb 2013 01:53:49 +0000 |
| Subject: | com web/bugs: Slightly improve loading feedback, incl. adding small image: templates/addghpull.php www/images/loading-blue.gif | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-15467@lists.php.net to get a copy of this message | ||
Commit: 70d085f1e7c5bf5c1a41863c8227097a18b57ba6
Author: Johannes Schlüter <johannes@schlueters.de> Wed, 13 Feb 2013 02:53:49 +0100
Parents: f8b70752d7cc8deafb0cff529fe1be868efa5fb6
Branches: master
Link: http://git.php.net/?p=web/bugs.git;a=commitdiff;h=70d085f1e7c5bf5c1a41863c8227097a18b57ba6
Log:
Slightly improve loading feedback, incl. adding small image
Changed paths:
M templates/addghpull.php
A www/images/loading-blue.gif
Diff:
diff --git a/templates/addghpull.php b/templates/addghpull.php
index 55bac7e..60d3b51 100644
--- a/templates/addghpull.php
+++ b/templates/addghpull.php
@@ -53,6 +53,7 @@ if (!$logged_in) {
Pull Request:
</th>
<td class="form-input">
+ <img src="images/loading-blue.gif" id="loading" />
<select name="pull_id" id="pull_id_field"></select>
<div id="pull_details"></div>
</td>
@@ -64,11 +65,16 @@ if (!$logged_in) {
<script>
var gh_pulls = false;
var converter;
+if (typeof($) != "function") {
+ window.alert("Failed to load jQuery!");
+}
$(document).ready(function() {
var org = "php";
var baseurl = "https://api.github.com/";
var url = baseurl+'orgs/'+org+'/repos';
converter = new Markdown.getSanitizingConverter();
+ $("#pull_id_field").empty().hide();
+ $('#pull_details').empty();
$..ajax({ dataType: 'jsonp', url: url, success: function(d) {
var repos = new Array();
for (var i in d.data) {
@@ -78,15 +84,19 @@ $(document).ready(function() {
for (var i in repos) {
$("#repository_field").append("<option>"+repos[i]+"</option>");
}
+ $("#loading").hide();
} });
});
$("#repository_field").change(function() {
- $("#pull_id_field").empty();
+ $("#pull_id_field").empty().hide();
+ $('#pull_details').empty();
+ $('#loading').show();
gh_pulls = false;
$("#pull_id_field").append("<option
value=''></option>");
var repo = $("#repository_field").val();
if (repo == "") {
+ $('#loading').hide();
return;
}
var org = "php";
@@ -98,6 +108,8 @@ $("#repository_field").change(function() {
$("#pull_id_field").append("<option
value="+(d.data[i].number+0)+">"+d.data[i].number+" -
"+d.data[i].title+"</option>");
}
gh_pulls = d.data;
+ $("#pull_id_field").show();
+ $("#loading").hide();
}});
});
@@ -115,14 +127,12 @@ $("#pull_id_field")..change(function() {
}
}
if (pr) {
-
$('#pull_details').append('<b>'+pr.title+'</b><br>'+converter.makeHtml(pr.body));
+
$('#pull_details').append('<b>'+pr.title+'</b><br>'+converter.makeHtml(pr.body)+'<p><a
href="'+pr.html_url+'">View on GitHub</a></p>');
}
});
</script>
-<?php if (!empty($patches)) { ?>
-<h2>Existing patches: TODO</h2>
+<br/>
<?php
-}
$canpatch = false;
require "{$ROOT_DIR}/templates/listpulls.php";
diff --git a/www/images/loading-blue.gif b/www/images/loading-blue.gif
new file mode 100644
index 0000000..27a5e07
Binary files /dev/null and b/www/images/loading-blue.gif differ