X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2Finclude%2FviewSone.html;h=af7c8be976e96dcf7400381e8fefba288a34e4be;hb=dfdfe62269b1abc712aeffb3f5940b57c99d9e3a;hp=5f001ba7d148fdba847a2f961ee1dda03fe49b0f;hpb=9fdc55aac4b0a848d224867aaf61479d771525e8;p=Sone.git

diff --git a/src/main/resources/templates/include/viewSone.html b/src/main/resources/templates/include/viewSone.html
index 5f001ba..af7c8be 100644
--- a/src/main/resources/templates/include/viewSone.html
+++ b/src/main/resources/templates/include/viewSone.html
@@ -1,39 +1,72 @@
-<div class="sone <% sone.status><%if sone.modified> modified<%/if>">
-	<div class="profile-link"><a href="viewSone.html?sone=<% sone.id>" title="<% sone.requestUri|html>"><% sone.niceName|html></a></div>
-	<div class="last-update">(<%= View.Sone.Label.LastUpdate|l10n|html> <% sone.time|date format="MMM d, yyyy, HH:mm:ss">)</div>
+<script language="javascript">
+
+	function getStatus(soneId) {
+		$.getJSON("ajax/getSoneStatus.ajax", {"sone": soneId}, function(data, textStatus) {
+			updateStatus(soneId, data.status, data.modified);
+			setTimeout(function() {
+				getStatus(soneId);
+			}, 5000);
+		});
+	}
+
+	function updateStatus(soneId, status, modified) {
+		$("#sone .sone#" + soneId).
+			toggleClass("unknown", status == "unknown").
+			toggleClass("idle", status == "idle").
+			toggleClass("inserting", status == "inserting").
+			toggleClass("downloading", status == "downloading").
+			toggleClass("modified", modified);
+	}
+
+	$(document).ready(function() {
+		$("#sone .sone").each(function() {
+			getStatus($(this).attr("id"));
+		});
+	});
+</script>
+
+<div id="<% sone.id|html>" class="sone <% sone.status|html><%if sone.modified> modified<%/if>">
 	<div class="unknown-marker" title="<%= View.Sone.Status.Unknown|l10n|html>">?</div>
 	<div class="modified-marker" title="<%= View.Sone.Status.Modified|l10n|html>">!</div>
 	<div class="download-marker" title="<%= View.Sone.Status.Downloading|l10n|html>">⬊</div>
 	<div class="insert-marker" title="<%= View.Sone.Status.Inserting|l10n|html>">⬈</div>
-	<div class="idle-marker" title="<%= View.Sone.Status.Idle|l10n|html>"></div>
+	<div class="idle-marker" title="<%= View.Sone.Status.Idle|l10n|html>">✔</div>
+	<div class="last-update"><%= View.Sone.Label.LastUpdate|l10n|html> <% sone.time|date format="MMM d, yyyy, HH:mm:ss"></div>
+	<div class="profile-link"><a href="viewSone.html?sone=<% sone.id|html>" title="<% sone.requestUri|html>"><% sone.niceName|html></a></div>
+	<div class="short-request-uri"><% sone.requestUri|substring start=4 length=43|html></div>
 	<%ifnull ! currentSone>
 		<%if ! sone.current>
 			<%if sone.friend>
 				<form class="unfollow" action="unfollowSone.html" method="post">
 					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-					<input type="hidden" name="sone" value="<% sone.id>" />
+					<input type="hidden" name="sone" value="<% sone.id|html>" />
+					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
 					<button type="submit"><%= View.Sone.Button.UnfollowSone|l10n|html></button>
 				</form>
 			<%else>
 				<form class="follow" action="followSone.html" method="post">
 					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-					<input type="hidden" name="sone" value="<% sone.id>" />
+					<input type="hidden" name="sone" value="<% sone.id|html>" />
+					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
 					<button type="submit"><%= View.Sone.Button.FollowSone|l10n|html></button>
 				</form>
 			<%/if>
 			<%if sone.blocked>
 				<form class="unblock" action="unblockSone.html" method="post">
 					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-					<input type="hidden" name="sone" value="<% sone.id>" />
+					<input type="hidden" name="sone" value="<% sone.id|html>" />
+					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
 					<button type="submit"><%= View.Sone.Button.UnblockSone|l10n|html></button>
 				</form>
 			<%else>
 				<form class="block" action="blockSone.html" method="post">
 					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-					<input type="hidden" name="sone" value="<% sone.id>" />
+					<input type="hidden" name="sone" value="<% sone.id|html>" />
+					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
 					<button type="submit"><%= View.Sone.Button.BlockSone|l10n|html></button>
 				</form>
 			<%/if>
 		<%/if>
 	<%/if>
+	<div class="spacer">&nbsp;</div>
 </div>