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

diff --git a/src/main/resources/templates/include/viewSone.html b/src/main/resources/templates/include/viewSone.html
index af7c8be..9cebc9c 100644
--- a/src/main/resources/templates/include/viewSone.html
+++ b/src/main/resources/templates/include/viewSone.html
@@ -1,71 +1,28 @@
-<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="sone <% sone.status|html><%if sone.modified> modified<%/if> <% sone.id|css|html><%if sone.local> local<%/if>">
+	<div class="id"><% sone.id|html></div>
 	<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="last-update"><%= View.Sone.Label.LastUpdate|l10n|html> <% sone.time|date format="MMM d, yyyy, HH:mm:ss"></div>
+	<div class="last-update"><%= View.Sone.Label.LastUpdate|l10n|html> <span class="time"><% sone.time|date format="MMM d, yyyy, HH:mm:ss"></span></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|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|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|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|html>" />
-					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-					<button type="submit"><%= View.Sone.Button.BlockSone|l10n|html></button>
-				</form>
-			<%/if>
+	<div class="hidden"><% sone.blacklisted></div>
+	<%if ! sone.current>
+		<%ifnull ! currentSone>
+			<form class="unfollow<%if ! sone.friend> hidden<%/if>" action="unfollowSone.html" method="post">
+				<input type="hidden" name="formPassword" value="<% formPassword|html>" />
+				<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>
+			<form class="follow<%if sone.friend> hidden<%/if>" action="followSone.html" method="post">
+				<input type="hidden" name="formPassword" value="<% formPassword|html>" />
+				<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>
 	<div class="spacer">&nbsp;</div>