Merge pull request BitLucid#1667 from BitLucid/feat/bathhouse

Improvements to bathhouse template,
NinjaWars · Feb 9, 2024 · cd86000 · cd86000
2 parents b4717fd + efc22be
commit cd86000
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/deploy/templates/bath-house.tpl b/deploy/templates/bath-house.tpl
@@ -32,7 +32,11 @@
 <ul id='duel-log' style='overflow-y: auto;max-height:20rem;'>
 	{foreach item="duel" from=$duels}
   <li>
-  {include file="player-link.tpl" username=$duel.attacker id=$duel.attacker_id} has dueled {include file="player-link.tpl" username=$duel.defender id=$duel.defender_id} and {if $duel.won}won{else}lost{/if} for {$duel.killpoints} killpoints on {$duel.date}
+  {include file="player-link.tpl" username=$duel.attacker id=$duel.attacker_id}
+  has dueled 
+  {include file="player-link.tpl" username=$duel.defender id=$duel.defender_id}
+  and {if $duel.won}<span class='text-success'>won</span>{else}<span class='text-danger'>lost</span>{/if} 
+  for <strong>{$duel.killpoints}</strong> killpoints <time class='chat-time timeago' datetime='{$duel.date|escape}' title='{$duel.date|escape}'>{$duel.date|escape}</time>
   </li>
 	{/foreach}
 </ul>

diff --git a/deploy/templates/selfmenu.partial.tpl b/deploy/templates/selfmenu.partial.tpl
@@ -33,7 +33,9 @@
         {/if}
         <li class="divider"></li>
         {if $ninja->isAdmin()}
-            <li><a href='/ninjamaster'><button class='btn btn-default' type='button'>Ninjamaster</button></a></li>    
+            <li><a href='/ninjamaster' class='inline-block px-thick'>
+                <i class="fa-solid fa-screwdriver-wrench"></i> Ninjamaster
+            </a></li>    
         {/if}
         <li><a href="/account" target="main" title='Your player account info, email, password, etc.' tabindex="-1"><i
                     class="fa fa-cog"></i> Account Info</a></li>
@@ -50,9 +52,13 @@
             </div>
         </div><!-- End of recent events -->
         <li class="divider"></li>
-        <li><a target='main' href='/intro'><i class="fa fa-question-circle" tabindex="-1"></i> Intro Guide</a></li>
+        <li>
+            <a target='main' href='/intro'>
+                <i class="fa fa-question-circle" tabindex="-1"></i> Intro Guide
+            </a>
+        </li>
         <li class="logout-item">
-            <form method='post' action='/logout'>
+            <form method='post' action='/logout' class='px-thick'>
                 <input type='submit' name='logout' value='Logout' class='btn btn-default'>
             </form>
         </li>

diff --git a/deploy/www/css/style.css b/deploy/www/css/style.css
@@ -5287,6 +5287,22 @@ input[type='button'].btn-block {
     margin-right: 2rem;
 }
 
+.my-thick {
+    margin-top: 2rem;
+    margin-bottom: 2rem;
+}
+
+.px-thick {
+    padding-left: 2rem;
+    padding-right: 2rem;
+}
+
+.py-thick {
+    padding-top: 2rem;
+    padding-bottom: 2rem;
+}
+
+
 /**
  * Media queries for responsive design.
  *