* change header UI.

module/common/model.php

@@ -287,6 +287,8 @@ class commonModel extends model
                 echo "<li class='custom-item'><a href='$customLink' data-toggle='modal' data-type='iframe' data-icon='cog' data-width='80%'>$lang->customMenu</a></li>";
             }
 
+            echo '<li class="divider"></li>';
+            commonModel::printAboutBar();
             echo '<li class="divider"></li>';
             echo '<li>';
             if($isGuest)
@@ -311,16 +313,14 @@ class commonModel extends model
     public static function printAboutBar()
     {
         global $app, $config, $lang;
-        echo "<ul id='extraNav' class='nav nav-default'>";
-        echo "<li class='dropdown'>";
-        echo "<a data-toggle='dropdown'>" . $lang->help . " <span class='caret'></span></a>";
-        echo "<ul class='dropdown-menu'>";
+        echo "<li class='dropdown-submenu'>";
+        echo "<a data-toggle='dropdown'>" . $lang->help . "</a>";
+        echo "<ul class='dropdown-menu pull-left'>";
         if($config->global->flow == 'full' && !commonModel::isTutorialMode() and $app->user->account != 'guest') echo '<li>' . html::a(helper::createLink('tutorial', 'start'), $lang->tutorial, '', "class='iframe' data-class-name='modal-inverse' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . "</li>";
         echo '<li>' . html::a($lang->manualUrl, $lang->manual, '_blank', "class='open-help-tab'") . '</li>';
         echo '<li>' . html::a(helper::createLink('misc', 'changeLog'), $lang->changeLog, '', "class='iframe' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . '</li>';
         echo "</ul></li>\n";
         echo '<li>' . html::a(helper::createLink('misc', 'about'), $lang->aboutZenTao, '', "class='about iframe' data-width='900' data-headerless='true' data-backdrop='true' data-keyboard='true' data-class='modal-about'") . '</li>';
-        echo '</ul>';
     }
 
     /**

module/common/view/header.html.php

@@ -17,13 +17,12 @@ if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile;
 <header id='header'>
   <div id='mainHeader'>
     <div class='container'>
-      <hrgroup id='heading'>
+      <hgroup id='heading'>
         <?php $heading = $app->company->name;?>
         <h1 id='companyname' title='<?php echo $heading;?>'<?php if(strlen($heading) > 36) echo " class='long-name'" ?>><?php echo html::a(helper::createLink('index'), $heading);?></h1>
-      </hrgroup>
+      </hgroup>
       <nav id='navbar'><?php commonModel::printMainmenu($this->moduleName);?></nav>
       <div id='toolbar'>
-        <?php common::printAboutBar();?>
         <div id="userMenu">
           <?php common::printSearchBox();?>
           <ul id="userNav" class="nav nav-default">