refs #16711 [fid_adlr] new my-research menu order

themes/fid_adlr/templates/myresearch/menu.phtml

@@ -19,56 +19,7 @@
 <div class="clearfix"></div>
 
 <?php if (!empty($user)): ?>
-  <h4><?=$this->transEsc('Your Account')?></h4>
-  <div class="myresearch-menu account-menu">
-    <?php if ('ils-none' !== $this->ils()->getOfflineMode()): ?>
-      <a href="<?=$this->url('myresearch-profile')?>"<?=$this->active == 'profile' ? ' class="active"' : ''?>>
-        <i class="icon icon-user" aria-hidden="true"></i>
-        <?=$this->transEsc('Profile')?>
-      </a>
-
-      <?php /* refs #15480 add password change to fid profile */ ?>
-
-        <a href="<?=$this->url('fid/user/reset-password')?>" data-lightbox>
-          <span class="no-padding">
-            <i class="icon icon-lock" aria-hidden="true"></i>
-          </span>
-          <?=$this->transEsc('Change Password')?>
-        </a>
-
-        <a href="<?=$this->url('fid/user/change-username')?>" data-lightbox>
-          <span class="no-padding">
-            <i class="icon icon-edit-3" aria-hidden="true"></i>
-          </span>
-          <?=$this->transEsc('fid::username_change_link')?>
-        </a>
 
-      <?php /* refs #16033 contact link */ ?>
-        <a href="<?=$this->url('feedback-home')?>" data-lightbox>
-          <span class="no-padding">
-            <i class="icon icon-mail" aria-hidden="true"></i>
-          </span>
-          <?=$this->transEsc('contact_adlr')?>
-        </a>
-
-        <span class="logout-button">
-          <a href="<?=$this->url('myresearch-logout')?>">
-            <span class="no-padding">
-              <i class="icon icon-log-out" aria-hidden="true"></i>
-            </span>
-            <?=$this->transEsc("Logout")?>
-          </a>
-        </span>
-
-      <?php if ($user->libraryCardsEnabled()): ?>
-        <a href="<?=$this->url('librarycards-home')?>"<?=$this->active == 'librarycards' ? ' class="active"' : ''?>>
-          <i class="fa fa-fw fa-barcode" aria-hidden="true"></i> <?=$this->transEsc('Library Cards')?>
-        </a>
-      <?php endif; ?>
-    <?php endif; ?>
-  </div>
-
-  <br />
   <?php if ($this->userlist()->getMode() !== 'disabled'): ?>
     <h4><?=$this->transEsc('Your Lists')?></h4>
 
@@ -119,15 +70,66 @@
         </a>
       <?php endif; ?>
     </div>
+    <br />
   <?php endif ?>
 
+  <h4><?=$this->transEsc('Your Account')?></h4>
+  <div class="myresearch-menu account-menu">
+    <?php if ('ils-none' !== $this->ils()->getOfflineMode()): ?>
+      <a href="<?= $this->url('myresearch-profile') ?>" <?= $this->active == 'profile' ? ' class="active"' : '' ?>>
+        <i class="icon icon-user" aria-hidden="true"></i>
+        <?= $this->transEsc('Profile') ?>
+      </a>
+
+      <?php /* refs #15480 add password change to fid profile */ ?>
+
+      <a href="<?= $this->url('fid/user/reset-password') ?>" data-lightbox>
+        <span class="no-padding">
+          <i class="icon icon-lock" aria-hidden="true"></i>
+        </span>
+        <?= $this->transEsc('Change Password') ?>
+      </a>
+
+      <a href="<?= $this->url('fid/user/change-username') ?>" data-lightbox>
+        <span class="no-padding">
+          <i class="icon icon-edit-3" aria-hidden="true"></i>
+        </span>
+        <?= $this->transEsc('fid::username_change_link') ?>
+      </a>
+
+        <?php /* refs #16033 contact link */ ?>
+      <a href="<?= $this->url('feedback-home') ?>" data-lightbox>
+        <span class="no-padding">
+          <i class="icon icon-mail" aria-hidden="true"></i>
+        </span>
+        <?= $this->transEsc('contact_adlr') ?>
+      </a>
+
+      <span class="logout-button">
+        <a href="<?= $this->url('myresearch-logout') ?>">
+          <span class="no-padding">
+            <i class="icon icon-log-out" aria-hidden="true"></i>
+          </span>
+          <?= $this->transEsc("Logout") ?>
+        </a>
+      </span>
+
+      <?php if ($user->libraryCardsEnabled()): ?>
+        <a href="<?= $this->url('librarycards-home') ?>"
+           <?= $this->active == 'librarycards' ? ' class="active"' : '' ?>>
+          <i class="fa fa-fw fa-barcode" aria-hidden="true"></i> <?= $this->transEsc('Library Cards') ?>
+        </a>
+      <?php endif; ?>
+    <?php endif; ?>
+  </div>
+
   <?php if ($this->permission()->allowDisplay('fid.ReadList')): ?>
-  <br/>
-  <h4><?=$this->transEsc('fid::admin_section')?></h4>
-  <div class="myresearch-menu">
-    <a href="<?=$this->url('fid/admin/list')?>"><?=$this->transEsc('fid::permission_read_user_list')?></a>
-    <a href="<?=$this->url('fid/admin/orders')?>"><?=$this->transEsc('fid::permission_read_order_list')?></a>
+    <br/>
+    <h4><?=$this->transEsc('fid::admin_section')?></h4>
+    <div class="myresearch-menu">
+      <a href="<?=$this->url('fid/admin/list')?>"><?=$this->transEsc('fid::permission_read_user_list')?></a>
+      <a href="<?=$this->url('fid/admin/orders')?>"><?=$this->transEsc('fid::permission_read_order_list')?></a>
+    </div>
   <?php endif; ?>
-  </div>
   <!-- fid-adlr: myresearch - menu - END -->
 <?php endif; ?>