From 568402d9bc3fc4e4f3d20e0432758b135d7b7da5 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Thu, 31 May 2018 16:21:01 +0800
Subject: [PATCH 1/2]  * Do not display divider if the menu is the last.

---
 module/common/model.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/module/common/model.php b/module/common/model.php
index a19eaffc22..8d32f58af6 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -358,6 +358,7 @@ class commonModel extends model
         $menu       = customModel::getMainMenu();
         $activeName = 'active';
 
+        $lastMenu = end($menu);
         echo "<ul class='nav nav-default'>\n";
         foreach($menu as $menuItem)
         {
@@ -367,7 +368,9 @@ class commonModel extends model
                 $link   = commonModel::createMenuLink($menuItem);
                 echo "<li $active data-id='$menuItem->name'><a href='$link' $active>$menuItem->text</a></li>\n";
             }
-            if(strpos($lang->dividerMenu, ",{$menuItem->name},") !== false) echo "<li class='divider'></li>";
+
+            if(($lastMenu->name != $menuItem->name) && strpos($lang->dividerMenu, ",{$menuItem->name},") !== false) echo "<li class='divider'></li>";
+
         }
         $customLink = helper::createLink('custom', 'ajaxMenu', "module={$app->getModuleName()}&method={$app->getMethodName()}", '', true);
         if(!commonModel::isTutorialMode() and $app->viewType != 'mhtml' and $app->user->account != 'guest') echo "<li class='custom-item'><a href='$customLink' class='hidden' data-toggle='modal' data-type='iframe' title='$lang->customMenu' data-icon='cog' data-width='80%'><i class='icon icon-cog'></i></a></li>";

From 4643931d3c034629588b5b16c4bef23d20b6dcb5 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Thu, 31 May 2018 16:22:40 +0800
Subject: [PATCH 2/2]  * Adjust codes.

---
 module/common/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/common/model.php b/module/common/model.php
index 8d32f58af6..ec2b2ea6a7 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -357,8 +357,8 @@ class commonModel extends model
         /* Print all main menus. */
         $menu       = customModel::getMainMenu();
         $activeName = 'active';
+        $lastMenu   = end($menu);
 
-        $lastMenu = end($menu);
         echo "<ul class='nav nav-default'>\n";
         foreach($menu as $menuItem)
         {