Add ability to reorder screenshots

app/templates/packages/view.html

@@ -380,23 +380,23 @@
 			{% endif %}
 		</aside>
 
+		{% if package.checkPerm(current_user, "ADD_SCREENSHOTS") %}
+			<a href="{{ package.getEditScreenshotsURL() }}" class="btn btn-primary float-right">
+				<i class="fas fa-edit"></i>
+				Edit
+			</a>
+		{% endif %}
+
 		<ul class="screenshot_list mb-4">
 			{% for ss in package.screenshots %}
 				{% if ss.approved or package.checkPerm(current_user, "ADD_SCREENSHOTS") %}
 					<li>
-						<a href="{% if package.checkPerm(current_user, 'ADD_SCREENSHOTS') %}{{ ss.getEditURL() }}{% else %}{{ ss.url }}{% endif %}">
+						<a href="{{ ss.url }}">
 							<img src="{{ ss.getThumbnailURL() }}" alt="{{ ss.title }}" />
 						</a>
 					</li>
 				{% endif %}
 			{% endfor %}
-			{% if package.checkPerm(current_user, "EDIT_PACKAGE") %}
-				<li>
-					<a href="{{ package.getNewScreenshotURL() }}">
-						<div class="fas fa-plus screenshot-add"></div>
-					</a>
-				</li>
-			{% endif %}
 		</ul>
 
 		{{ package.desc | markdown }}