Update maze sign view

rrrobo · Apr 7, 2024 · d759815 · d759815
1 parent 6c610e2
commit d759815
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 46 deletions.
diff --git a/views/sign/maze_2024.pug b/views/sign/maze_2024.pug
@@ -20,20 +20,17 @@ html(ng-app="ddApp")
     nav.navbar(style='background-color: #e67e22; color: #ecf0f1; position: fixed; top: 0; z-index:60 ;  width: 100%')
       // Navbar content
       .col-md-6.col-sm4.col-12
+        button.btn.btn-secondary(style='margin:-5px 5px 0 0;', type='button', ng-click="go('/maze/judge/' + runId + '?return=' + getParam('return'))")
+          i.far.fa-edit(aria-hidden='true')  {{'line.sign.to_judge' | translate}}
         li.navbar-brand(href='#')
-          i.fas.fa-spinner.fa-spin.fa-fw
-          |  {{team}}
+          span {{team}}
       .col-md-3.col-sm4.col-7
         i.fas.fa-calculator.fa-2x(aria-hidden='true') &nbsp;
         li.navbar-brand(href='#')  {{score}} {{'common.point' | translate}}
       .col-md-3.col-sm4.col-5
         i.fas.fa-stopwatch.fa-2x(aria-hidden='true') &nbsp;
         li.navbar-brand(href='#')  {{minutes*60*1000+seconds*1000 | date:'mm:ss'}}
     .container-fluid.nav-cont
-      .row
-        .col-md12
-          button.btn.btn-secondary(style='margin:0 10px 10px 0;', type='button', ng-click="go('/maze/judge/' + runId + '?return=' + getParam('return'))")
-            i.fas.fa-edit(aria-hidden='true')  {{'maze.sign.to_judge' | translate}}
       include ../view/common/maze_2024
       .alert.alert-success(style='margin:30 0 0 0;', role='alert')
         .row

diff --git a/views/sign/maze_2024E.pug b/views/sign/maze_2024E.pug
@@ -20,20 +20,17 @@ html(ng-app="ddApp")
     nav.navbar(style='background-color: #e67e22; color: #ecf0f1; position: fixed; top: 0; z-index:60 ;  width: 100%')
       // Navbar content
       .col-md-6.col-sm4.col-12
+        button.btn.btn-secondary(style='margin:-5px 5px 0 0;', type='button', ng-click="go('/maze/judge/' + runId + '?return=' + getParam('return'))")
+          i.far.fa-edit(aria-hidden='true')  {{'line.sign.to_judge' | translate}}
         li.navbar-brand(href='#')
-          i.fas.fa-spinner.fa-spin.fa-fw
-          |  {{team}}
+          span {{team}}
       .col-md-3.col-sm4.col-7
         i.fas.fa-calculator.fa-2x(aria-hidden='true') &nbsp;
         li.navbar-brand(href='#')  {{score}} {{'common.point' | translate}}
       .col-md-3.col-sm4.col-5
         i.fas.fa-stopwatch.fa-2x(aria-hidden='true') &nbsp;
         li.navbar-brand(href='#')  {{minutes*60*1000+seconds*1000 | date:'mm:ss'}}
     .container-fluid.nav-cont
-      .row
-        .col-md12
-          button.btn.btn-secondary(style='margin:0 10px 10px 0;', type='button', ng-click="go('/maze/judge/' + runId + '?return=' + getParam('return'))")
-            i.fas.fa-edit(aria-hidden='true')  {{'maze.sign.to_judge' | translate}}
       include ../view/common/maze_2024E
       .alert.alert-success(style='margin:30 0 0 0;', role='alert')
         .row

diff --git a/views/view/common/maze_2024.pug b/views/view/common/maze_2024.pug
@@ -1,6 +1,6 @@
 
 .row
-  .col-md-4.col-lg-3(style='margin-bottom:70px;')
+  .col-md-4.col-lg-3(style='margin-bottom:30px;')
     #card_area
       .card
         h3.card-header
@@ -45,22 +45,26 @@
             div(style='position:absolute; top:30px; left:25px;')
               i.fas.fa-check.fa-fw.fa-5x(ng-show='exitBonus && !exitBonusP', style='color:#27ae60; opacity:0.9;')
               i.fas.fa-times.fa-fw.fa-5x(ng-show='!exitBonus && !exitBonusP', style='padding-top:4px; color:#e74c3c; opacity:0.9;')
-  .col-md-8.col-lg-9.tilearea(style='margin-top:-45px;')
-    .alert.alert-primary(style='margin-bottom:5px;text-align:center;', role='alert')
-      h2(style='text-align:center;')
-        | {{'common.stotal' | translate}} : {{allItemScore()}} {{'common.point' |translate}}
-    div(style='text-align:left;float:left;')
-      .btn-group
-        .input-group-prepend
-          span.input-group-text
-            i.fas.fa-arrows-alt-v(aria-hidden='true')
-        button.btn.btn-outline-dark(type='button', ng-click='changeFloor(zz)', ng-repeat='zz in range(height)', ng-class='{active: zz == z}')  {{zz}} 
-    div(style='text-align:right;float:right;')
-      .btn-group
-        button.btn.btn-outline-dark(type='button', ng-click='tileRot(-90)')
-          i.fas.fa-undo(aria-hidden='true')
-        button.btn.btn-outline-dark(type='button', ng-click='tileRot(90)')
-          i.fas.fa-redo(aria-hidden='true')
+  .col-md-8.col-lg-9.tilearea
+    .row(style="margin-bottom: 5px;")
+      .col-3(style="margin-bottom: 5px;")
+        div(style='text-align:left;float:left;')
+          .btn-group
+            .input-group-prepend
+              span.input-group-text
+                i.fas.fa-arrows-alt-v(aria-hidden='true')
+            button.btn.btn-outline-dark(type='button', ng-click='changeFloor(zz)', ng-repeat='zz in range(height)', ng-class='{active: zz == z}')  {{zz}} 
+      .col-6(style="margin-bottom: 5px;")
+        .alert.alert-primary(style='padding: 0;margin: 0;text-align:center;', role='alert')
+          h3(style='text-align:center;margin: 0;')
+            | {{'common.stotal' | translate}} : {{allItemScore()}} {{'common.point' |translate}}
+      .col-3(style="margin-bottom: 5px;")
+        div(style='text-align:right;float:right;')
+          .btn-group
+            button.btn.btn-outline-dark(type='button', ng-click='tileRot(-90)')
+              i.fas.fa-undo(aria-hidden='true')
+            button.btn.btn-outline-dark(type='button', ng-click='tileRot(90)')
+              i.fas.fa-redo(aria-hidden='true')
     div(style='clear:both;')#mapTopLeft
     #wrapTile(style='margin-top:5px;transform-origin: top left;')
       h2(ng-show='!(length&&width)', style='text-align:center') {{'common.loading' | translate}}

diff --git a/views/view/common/maze_2024E.pug b/views/view/common/maze_2024E.pug
@@ -1,6 +1,6 @@
 
 .row
-  .col-md-4.col-lg-3(style='margin-bottom:70px;')
+  .col-md-4.col-lg-3(style='margin-bottom:30px;')
     #card_area
       .card
         h3.card-header
@@ -45,22 +45,26 @@
             div(style='position:absolute; top:30px; left:25px;')
               i.fas.fa-check.fa-fw.fa-5x(ng-show='exitBonus && !exitBonusP', style='color:#27ae60; opacity:0.9;')
               i.fas.fa-times.fa-fw.fa-5x(ng-show='!exitBonus && !exitBonusP', style='padding-top:4px; color:#e74c3c; opacity:0.9;')
-  .col-md-8.col-lg-9.tilearea(style='margin-top:-45px;')
-    .alert.alert-primary(style='margin-bottom:5px;text-align:center;', role='alert')
-      h2(style='text-align:center;')
-        | {{'common.stotal' | translate}} : {{allItemScore()}} {{'common.point' |translate}}
-    div(style='text-align:left;float:left;')
-      .btn-group
-        .input-group-prepend
-          span.input-group-text
-            i.fas.fa-arrows-alt-v(aria-hidden='true')
-        button.btn.btn-outline-dark(type='button', ng-click='changeFloor(zz)', ng-repeat='zz in range(height)', ng-class='{active: zz == z}')  {{zz}} 
-    div(style='text-align:right;float:right;')
-      .btn-group
-        button.btn.btn-outline-dark(type='button', ng-click='tileRot(-90)')
-          i.fas.fa-undo(aria-hidden='true')
-        button.btn.btn-outline-dark(type='button', ng-click='tileRot(90)')
-          i.fas.fa-redo(aria-hidden='true')
+  .col-md-8.col-lg-9.tilearea
+    .row(style="margin-bottom: 5px;")
+      .col-3(style="margin-bottom: 5px;")
+        div(style='text-align:left;float:left;')
+          .btn-group
+            .input-group-prepend
+              span.input-group-text
+                i.fas.fa-arrows-alt-v(aria-hidden='true')
+            button.btn.btn-outline-dark(type='button', ng-click='changeFloor(zz)', ng-repeat='zz in range(height)', ng-class='{active: zz == z}')  {{zz}} 
+      .col-6(style="margin-bottom: 5px;")
+        .alert.alert-primary(style='padding: 0;margin: 0;text-align:center;', role='alert')
+          h3(style='text-align:center;margin: 0;')
+            | {{'common.stotal' | translate}} : {{allItemScore()}} {{'common.point' |translate}}
+      .col-3(style="margin-bottom: 5px;")
+        div(style='text-align:right;float:right;')
+          .btn-group
+            button.btn.btn-outline-dark(type='button', ng-click='tileRot(-90)')
+              i.fas.fa-undo(aria-hidden='true')
+            button.btn.btn-outline-dark(type='button', ng-click='tileRot(90)')
+              i.fas.fa-redo(aria-hidden='true')
     div(style='clear:both;')#mapTopLeft
     #wrapTile(style='margin-top:5px;transform-origin: top left;')
       h2(ng-show='!(length&&width)', style='text-align:center') {{'common.loading' | translate}}