Merge pull request 'Edits' (#12) from drew-dev into stranck-dev

Reviewed-on: #12

res/styles/base.css

@@ -6,3 +6,16 @@
 summary:has(span.status) {
     background-color: #ffaf0377;
 }
+
+/* Mobile only */
+@media only screen and ((max-width: 500px) or (hover: none)) {
+    .propic-border.blurred {
+        display: none;
+    }
+}
+
+@media only screen and (prefers-reduced-motion) {
+    .propic-border.blurred {
+        display: none;
+    }
+}

res/styles/propic.css

@@ -18,9 +18,9 @@ svg.propic-border-filter {
 
 .propic-filler {
     width: 100%;
-    border-radius:0.4em;
+    border-radius: 0.4em;
-    margin:0 auto;
+    margin: 0 auto;
-    border:4px solid #546e7a;
+    border: 4px solid #546e7a;
     opacity: 0;
 }
 
@@ -77,7 +77,7 @@ svg.propic-border-filter {
 }
 
 .propic-flag {
-    z-index: 2;
+    z-index: 4;
     max-width: 2em;
     border-radius:2px;
     right: calc(0% - 0.3em);
@@ -95,3 +95,16 @@ svg.propic-border-filter {
 .propic-base {
     border:4px solid #546e7a;
 }
+
+.control-login-as:hover::before{
+    background-color: #2f4e5cc5;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    content: 'Enter as';
+    color: white;
+    text-decoration: none;
+    text-align: center;
+    z-index: 3;
+    border-radius: 0.6rem;
+}

res/styles/room.css

@@ -7,14 +7,14 @@ span.nsc-room-counter {
     text-transform: capitalize;
 }
 
-@media only screen and (max-width: 500px) {
-    div.room-actions a>span {
-        display: none;
-    }    
-}
-
 #room a[role=button] {
     display: inline-flex;
     justify-content: space-around;
     align-items: center;
 }
+
+@media only screen and (max-width: 500px) {
+    div.room-actions a>span {
+        display: none;
+    }    
+}

tpl/admin.html

@@ -11,7 +11,7 @@
 		<!-- Quick controls -->
         <h2>Admin panel</h2>
         <a href="/manage/admin/cache/clear" role="button" title="Reload the orders' data and the re-sync items' indexes from pretix">Clear cache</a>
-        <a href="/manage/nosecount" role="button" title="Reload the orders' data and the re-sync items' indexes from pretix">Manage rooms</a>
+        <a href="/manage/nosecount" role="button" title="Shortcut to the nosecount's admin data">Manage rooms</a>
 		<hr>
 	</main>
 	

tpl/blocks/badge.html

@@ -11,7 +11,7 @@
 	<form method="POST" enctype="multipart/form-data" action="/manage/propic/upload">
 		<div class="grid" style="text-align:center;margin-bottom:1em;">
 			<div>
-				{% with order=order, imgSrc='/res/propic/' + (order.ans('propic') or 'default.png'), effects = false %}
+				{% with current=order, order=order, imgSrc='/res/propic/' + (order.ans('propic') or 'default.png'), effects = false %}
 					{% include 'blocks/propic.html' %}
 				{% endwith %}
 				<p>Normal Badge</p>
@@ -21,7 +21,7 @@
 			</div>
 			{% if order.is_fursuiter %}
 				<div>
-					{% with order=order, imgSrc='/res/propic/' + (order.ans('propic_fursuiter') or 'default.png'), effects = false %}
+					{% with current=order, order=order, imgSrc='/res/propic/' + (order.ans('propic_fursuiter') or 'default.png'), effects = false %}
 						{% include 'blocks/propic.html' %}
 					{% endwith %}
 					<p>Fursuit Badge</p>

tpl/blocks/propic.html

@@ -1,14 +1,20 @@
 <div class="propic-container" >
     {% if effects and (not order.sponsorship == None) %}
-    <div class="absolute propic-border {{'propic-animated-' + (order.sponsorship or 'base')}}">
+    <div aria-hidden="true" class="absolute propic-border {{'propic-animated-' + (order.sponsorship or 'base')}}">
-      <div class="propic-border-animation"></div>
+      <div aria-hidden="true" class="propic-border-animation"></div>
     </div>
-    <div class="absolute propic-border blurred {{'propic-animated-' + (order.sponsorship or 'base')}}">
+    <div aria-hidden="true" class="absolute propic-border blurred {{'propic-animated-' + (order.sponsorship or 'base')}}">
-      <div class="propic-border-animation"></div>
+      <div aria-hidden="true" class="propic-border-animation"></div>
     </div>
     {% endif %}
-    <img alt="Your own profile picture" src="{{imgSrc}}" class="absolute propic {{(('propic-' + order.sponsorship) if not effects else '') if order.sponsorship else 'propic-base'}}"/>
+    {% if current and current.isAdmin () and (not current.code == order.code )%}
-    <svg alt="" class="propic-filler {{(('propic-' + order.sponsorship) if not effects else '') if order.sponsorship else 'propic-base'}}" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg"></svg>
+    <a class="control-login-as" href="/manage/admin/loginas/{{order.code}}">
+    {% endif %}
+    <img alt="{{order.ans('fursona_name') if order.ans('fursona_name') else 'A user'}}'s profile picture" src="{{imgSrc}}" class="absolute propic {{(('propic-' + order.sponsorship) if not effects else '') if order.sponsorship else 'propic-base'}}"/>
+    <svg aria-hidden="true" alt="" class="propic-filler {{(('propic-' + order.sponsorship) if not effects else '') if order.sponsorship else 'propic-base'}}" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg"></svg>
+    {% if current and current.isAdmin () %}
+    </a>
+    {% endif %}
     {% if flag %}
       <img alt="flag" class="absolute propic-flag" src="/res/flags/{{order.country.lower()}}.svg"/>
     {% endif %}

tpl/blocks/room.html

@@ -27,7 +27,7 @@
 		<div class="grid people" style="padding-bottom:1em;">
 			{% for person in room_members %}
 				<div style="margin-bottom: 1em;">
-					{% with order=person, imgSrc='/res/propic/' + (person.ans('propic') or 'default.png'), effects = true, flag = true %}
+					{% with current=order, order=person, imgSrc='/res/propic/' + (person.ans('propic') or 'default.png'), effects = true, flag = true %}
 						{% include 'blocks/propic.html' %}
 					{% endwith %}
 					<h3>{{person.ans('fursona_name')}}</h3>

tpl/fursuitcount.html

@@ -15,7 +15,7 @@
 				<div class="grid people" style="padding-bottom:1em;">
 			{% endif %}
 				<div style="margin-bottom: 1em;">
-					{% with order=person, imgSrc='/res/propic/' + (person.ans('propic_fursuiter') or 'default.png'), effects = true, flag = true %}
+					{% with current=order, order=person, imgSrc='/res/propic/' + (person.ans('propic_fursuiter') or 'default.png'), effects = true, flag = true %}
 						{% include 'blocks/propic.html' %}
 					{% endwith %}
 					<h5>{{person.ans('fursona_name')}}</h5>

tpl/nosecount.html

@@ -29,7 +29,7 @@
 						{% if m in orders %}
 							{% with person = orders[m] %}
 								<div style="margin-bottom: 1em;">
-									{% with order=person, imgSrc='/res/propic/' + (person.ans('propic') or 'default.png'), effects = true, flag = true %}
+									{% with current=order, order=person, imgSrc='/res/propic/' + (person.ans('propic') or 'default.png'), effects = true, flag = true %}
 										{% include 'blocks/propic.html' %}
 									{% endwith %}
 									<h5>{{person.ans('fursona_name')}}</h5>
@@ -61,7 +61,7 @@
 					{% if m in orders %}
 						{% with person = orders[m] %}
 							<div style="margin-bottom: 1em;">
-								{% with order=person, imgSrc='/res/propic/' + (person.ans('propic') or 'default.png'), effects = true, flag = true %}
+								{% with current=order, order=person, imgSrc='/res/propic/' + (person.ans('propic') or 'default.png'), effects = true, flag = true %}
 									{% include 'blocks/propic.html' %}
 								{% endwith %}
 								<h5>{{person.ans('fursona_name')}}</h5>
@@ -81,7 +81,7 @@
 				<div class="grid people" style="padding-bottom:1em;">
 			{% endif %}
 				<div style="margin-bottom: 1em;">
-					{% with order=person, imgSrc='/res/propic/' + (person.ans('propic') or 'default.png'), effects = true, flag = true %}
+					{% with current=order, order=person, imgSrc='/res/propic/' + (person.ans('propic') or 'default.png'), effects = true, flag = true %}
 						{% include 'blocks/propic.html' %}
 					{% endwith %}
 					
@@ -98,7 +98,7 @@
 				<div class="grid people" style="padding-bottom:1em;">
 			{% endif %}
 				<div style="margin-bottom: 1em;">
-					{% with order=person, imgSrc='/res/propic/' + (person.ans('propic') or 'default.png'), effects = true, flag = true %}
+					{% with current=order, order=person, imgSrc='/res/propic/' + (person.ans('propic') or 'default.png'), effects = true, flag = true %}
 						{% include 'blocks/propic.html' %}
 					{% endwith %}
 					<h5>{{person.ans('fursona_name')}}</h5>

tpl/sponsorcount.html

@@ -17,7 +17,7 @@
 				<div class="grid people" style="padding-bottom:1em;">
 			{% endif %}
 				<div style="margin-bottom: 1em;">
-					{% with order=person, imgSrc='/res/propic/' + (person.ans('propic') or 'default.png'), effects = true, flag = true %}
+					{% with current=order, order=person, imgSrc='/res/propic/' + (person.ans('propic') or 'default.png'), effects = true, flag = true %}
 						{% include 'blocks/propic.html' %}
 					{% endwith %}
 					<h5>{{person.ans('fursona_name')}}</h5>
@@ -32,7 +32,7 @@
 				<div class="grid people" style="padding-bottom:1em;">
 			{% endif %}
 				<div style="margin-bottom: 1em;">
-					{% with order=person, imgSrc='/res/propic/' + (person.ans('propic') or 'default.png'), effects = true, flag = true %}
+					{% with current=order, order=person, imgSrc='/res/propic/' + (person.ans('propic') or 'default.png'), effects = true, flag = true %}
 						{% include 'blocks/propic.html' %}
 					{% endwith %}
 					<h5>{{person.ans('fursona_name')}}</h5>