From 42dfd762d95a2f77fa6f6d61d4af827bf439a320 Mon Sep 17 00:00:00 2001
From: Flat <flatta@outlook.jp>
Date: Sat, 2 Jul 2016 21:41:40 +0900
Subject: [PATCH] Move 'Logged in as' dialog to footer.html

---
 web/templates/admin/list_search.html | 26 ++-------------
 web/templates/admin/list_user.html   | 35 ++------------------
 web/templates/footer.html            | 48 +++++++++++++++++++++-------
 web/templates/user/list_search.html  | 28 +++-------------
 web/templates/user/list_user.html    | 35 ++------------------
 5 files changed, 49 insertions(+), 123 deletions(-)

diff --git a/web/templates/admin/list_search.html b/web/templates/admin/list_search.html
index 110feb87..6aa243e9 100644
--- a/web/templates/admin/list_search.html
+++ b/web/templates/admin/list_search.html
@@ -72,29 +72,9 @@
                 if ($key == $user) {
             ?>
                   <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
-                <?
-                  if (!empty($_SESSION['look_alert'])) {
-                ?>
-                    <script type="text/javascript">
-                      $(function() {
-                        $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                        $( "#dialog-message" ).dialog({
-                          modal: true,
-                          buttons: {
-                            Ok: function() {
-                              $( this ).dialog( "close" );
-                            },
-                          }
-                        });
-                      });
-                    </script>
-                    <div id="dialog-message" title="<?=__('Welcome')?>">
-                      <p class="confirmation"><?=__('LOGGED_IN_AS',$key)?></p>
-                    </div>
-                    <?
-                      unset($_SESSION['look_alert']);
-                  }
-                } else { ?>
+<?php
+                } else {
+?>
                   <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/login/?loginas=<?=$data[$key]['USER']?>&token=<?=$_SESSION['token']?>""><?=__('login as')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
             <?  }
               }
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
index a4753aa3..d52d80986 100644
--- a/web/templates/admin/list_user.html
+++ b/web/templates/admin/list_user.html
@@ -92,38 +92,9 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
               if ($key == $user) {
             ?>
                 <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
-              <?
-                if (!empty($_SESSION['look_alert'])) {
-              ?>
-                  <script type="text/javascript">
-                    $(function() {
-                      $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                      $( "#dialog-message" ).dialog({
-                        modal: true,
-                        buttons: {
-                          Ok: function() {
-                            $( this ).dialog( "close" );
-                          },
-                        },
-                        create:function () {
-                            $(this).closest(".ui-dialog")
-                                .find(".ui-button:first")
-                                .addClass("submit");
-                            $(this).closest(".ui-dialog")
-                                .find(".ui-button")
-                                .eq(1) // the first button
-                                .addClass("cancel");
-                            }
-                      });
-                    });
-                  </script>
-                  <div id="dialog-message" title="<?=__('Welcome')?>">
-                    <p class="confirmation"><?=__('LOGGED_IN_AS',$key)?></p>
-                  </div>
-                  <?
-                    unset($_SESSION['look_alert']);
-                }
-              } else { ?>
+<?php
+              } else {
+?>
                 <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>""><?=__('login as').' '.$key?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
               <?}?>
               <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
diff --git a/web/templates/footer.html b/web/templates/footer.html
index fa71c154..bab46cf0 100644
--- a/web/templates/footer.html
+++ b/web/templates/footer.html
@@ -17,13 +17,12 @@
 ?>
 
 <?php
-if (!empty($_SESSION['error_msg'])):
+// todo: display all the dialogs?
+
+if (!empty($_SESSION['look_alert'])):
 ?>
-  <div>
-    <div id="dialog-message" title="">
-      <p><?=htmlentities($_SESSION['error_msg'])?></p>
-    </div>
-    <script>
+  <script>
+    $(function() {
       $('#dialog:ui-dialog').dialog('destroy');
       $('#dialog-message').dialog({
         modal: true,
@@ -31,15 +30,40 @@ if (!empty($_SESSION['error_msg'])):
           Ok: function() {
             $(this).dialog('close');
           }
-        },
-        create: function() {
-          $(this)
-          .closest('.ui-dialog')
-          .find('.ui-button:first')
-          .addClass('submit');
         }
       });
+    });
+  </script>
+  <div id="dialog-message" title="<?=__('Welcome')?>">
+    <p class="confirmation"><?=__('LOGGED_IN_AS', $_SESSION['look'])?></p>
+  </div>
+<?php
+  unset($_SESSION['look_alert']);
+elseif (!empty($_SESSION['error_msg'])):
+?>
+  <div>
+    <script>
+      $(function() {
+        $('#dialog:ui-dialog').dialog('destroy');
+        $('#dialog-message').dialog({
+          modal: true,
+          buttons: {
+            Ok: function() {
+              $(this).dialog('close');
+            }
+          },
+          create: function() {
+            $(this)
+            .closest('.ui-dialog')
+            .find('.ui-button:first')
+            .addClass('submit');
+          }
+        });
+      });
     </script>
+    <div id="dialog-message" title="">
+      <p><?=htmlentities($_SESSION['error_msg'])?></p>
+    </div>
   </div>
 <?php
   unset($_SESSION['error_msg']);
diff --git a/web/templates/user/list_search.html b/web/templates/user/list_search.html
index a8909b29..4820b51d 100644
--- a/web/templates/user/list_search.html
+++ b/web/templates/user/list_search.html
@@ -74,29 +74,9 @@
                 if ($key == $user) {
             ?>
                   <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
-                <?
-                  if (!empty($_SESSION['look_alert'])) {
-                ?>
-                    <script type="text/javascript">
-                      $(function() {
-                        $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                        $( "#dialog-message" ).dialog({
-                          modal: true,
-                          buttons: {
-                            Ok: function() {
-                              $( this ).dialog( "close" );
-                            },
-                          }
-                        });
-                      });
-                    </script>
-                    <div id="dialog-message" title="<?=__('Welcome')?>">
-                      <p class="confirmation"><?=__('LOGGED_IN_AS',$key)?></p>
-                    </div>
-                    <?
-                      unset($_SESSION['look_alert']);
-                  }
-                } else { ?>
+<?php
+                } else {
+ ?>
                   <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/login/?loginas=<?=$data[$key]['USER']?>&token=<?=$_SESSION['token']?>""><?=__('login as')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
             <?  }
               }
@@ -235,4 +215,4 @@
           </div>
         </div>
       </div>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html
index eea0e93a..3087bc65 100644
--- a/web/templates/user/list_user.html
+++ b/web/templates/user/list_user.html
@@ -90,38 +90,9 @@ sort-disk="<?=$data[$key]['U_DISK']?>" sort-star="<?if($_SESSION['favourites']['
               if ($key == $user) {
             ?>
                 <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
-              <?
-                if (!empty($_SESSION['look_alert'])) {
-              ?>
-                  <script type="text/javascript">
-                    $(function() {
-                      $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                      $( "#dialog-message" ).dialog({
-                        modal: true,
-                        buttons: {
-                          Ok: function() {
-                            $( this ).dialog( "close" );
-                          },
-                        },
-                        create:function () {
-                          $(this).closest(".ui-dialog")
-                            .find(".ui-button:first")
-                            .addClass("submit");
-                          $(this).closest(".ui-dialog")
-                            .find(".ui-button")
-                            .eq(1) // the first button
-                            .addClass("cancel");
-                        }
-                      });
-                    });
-                  </script>
-                  <div id="dialog-message" title="<?=__('Welcome')?>">
-                    <p class="confirmation"><?=__('LOGGED_IN_AS',$key)?></p>
-                  </div>
-                  <?
-                    unset($_SESSION['look_alert']);
-                }
-              } else { ?>
+<?php
+              } else {
+?>
                 <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/login/?loginas=<?=$key?>""><?=__('login as')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
               <?}?>
               <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/user/?user=<?=$key?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>