* Finish task #40498.

module/doc/css/common.css

@@ -80,7 +80,7 @@ td.c-name a:visited {color: #082999;}
 
 #pageNav .dropdown-menu {max-height: 350px; overflow-y: auto;}
 
-#createDropdown ul.dropdown-menu {width: 100%;}
+#createDropdown ul.dropdown-menu {text-align: left;}
 #project, #product, #custom, #book {min-height: 160px;}
 #title .menu-title {font-size: 15px; font-weight: 600; position: relative; padding: 2px 0 2px 15px; list-style: none;}
 #title .dropdown-menu {top: 38px;}

module/doc/lang/de.php

@@ -131,6 +131,13 @@ $lang->doc->typeList['word']     = 'Word';
 $lang->doc->typeList['ppt']      = 'PPT';
 $lang->doc->typeList['excel']    = 'Excel';
 
+$lang->doc->iconList['html']     = 'rich-text';
+$lang->doc->iconList['markdown'] = 'markdown';
+$lang->doc->iconList['url']      = 'text-link';
+$lang->doc->iconList['word']     = 'word';
+$lang->doc->iconList['ppt']      = 'ppt';
+$lang->doc->iconList['excel']    = 'excel';
+
 $lang->doc->types['text'] = 'Text';
 $lang->doc->types['url']  = 'URL';
 

module/doc/lang/en.php

@@ -136,6 +136,13 @@ $lang->doc->typeList['word']     = 'Word';
 $lang->doc->typeList['ppt']      = 'PPT';
 $lang->doc->typeList['excel']    = 'Excel';
 
+$lang->doc->iconList['html']     = 'rich-text';
+$lang->doc->iconList['markdown'] = 'markdown';
+$lang->doc->iconList['url']      = 'text-link';
+$lang->doc->iconList['word']     = 'word';
+$lang->doc->iconList['ppt']      = 'ppt';
+$lang->doc->iconList['excel']    = 'excel';
+
 $lang->doc->types['text'] = 'Text';
 $lang->doc->types['url']  = 'URL';
 

module/doc/lang/fr.php

@@ -131,6 +131,13 @@ $lang->doc->typeList['word']     = 'Word';
 $lang->doc->typeList['ppt']      = 'PPT';
 $lang->doc->typeList['excel']    = 'Excel';
 
+$lang->doc->iconList['html']     = 'rich-text';
+$lang->doc->iconList['markdown'] = 'markdown';
+$lang->doc->iconList['url']      = 'text-link';
+$lang->doc->iconList['word']     = 'word';
+$lang->doc->iconList['ppt']      = 'ppt';
+$lang->doc->iconList['excel']    = 'excel';
+
 $lang->doc->types['text'] = 'Text';
 $lang->doc->types['url']  = 'URL';
 

module/doc/lang/vi.php

@@ -131,6 +131,13 @@ $lang->doc->typeList['word']     = 'Word';
 $lang->doc->typeList['ppt']      = 'PPT';
 $lang->doc->typeList['excel']    = 'Excel';
 
+$lang->doc->iconList['html']     = 'rich-text';
+$lang->doc->iconList['markdown'] = 'markdown';
+$lang->doc->iconList['url']      = 'text-link';
+$lang->doc->iconList['word']     = 'word';
+$lang->doc->iconList['ppt']      = 'ppt';
+$lang->doc->iconList['excel']    = 'excel';
+
 $lang->doc->types['text'] = 'Text';
 $lang->doc->types['url']  = 'URL';
 

module/doc/lang/zh-cn.php

@@ -136,6 +136,13 @@ $lang->doc->typeList['word']     = 'Word';
 $lang->doc->typeList['ppt']      = 'PPT';
 $lang->doc->typeList['excel']    = 'Excel';
 
+$lang->doc->iconList['html']     = 'rich-text';
+$lang->doc->iconList['markdown'] = 'markdown';
+$lang->doc->iconList['url']      = 'text-link';
+$lang->doc->iconList['word']     = 'word';
+$lang->doc->iconList['ppt']      = 'ppt';
+$lang->doc->iconList['excel']    = 'excel';
+
 $lang->doc->types['text'] = '文档';
 $lang->doc->types['url']  = '链接';
 

module/doc/model.php

@@ -1707,15 +1707,17 @@ class docModel extends model
         {
             $html  = "<div class='dropdown' id='createDropdown'>";
             $html .= "<button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i>" . $this->lang->doc->createAB . " <span class='caret'></span></button>";
-            $html .= "<ul class='dropdown-menu' style='left:0px'>";
+            $html .= "<ul class='dropdown-menu pull-right'>";
             foreach($this->lang->doc->typeList as $typeKey => $typeName)
             {
                 $class = strpos($this->config->doc->officeTypes, $typeKey) !== false ? 'iframe' : '';
+                $icon  = zget($this->lang->doc->iconList, $typeKey);
                 $html .= "<li>";
-                $html .= html::a(helper::createLink('doc', 'create', "objectType=$objectType&objectID=$objectID&libID=$libID&moduleID=0&type=$typeKey", '', $class ? true : false), $typeName, '', "class='$class' data-app='{$this->app->openApp}'");
+                $html .= html::a(helper::createLink('doc', 'create', "objectType=$objectType&objectID=$objectID&libID=$libID&moduleID=0&type=$typeKey", '', $class ? true : false), "<i class='icon-$icon'></i> '" . $typeName, '', "class='$class' data-app='{$this->app->openApp}'");
                 $html .= "</li>";
-
+                if($typeKey == 'url') $html .= '<li class="divider"></li>';
             }
+
             if(common::hasPriv('doc', 'createLib'))
             {
                 $html .= '<li class="divider"></li>';

module/doc/view/tablecontents.html.php

@@ -87,11 +87,12 @@ if(empty($type)) $type = 'product';
             $html .= "<ul class='dropdown-menu' style='left:0px'>";
             foreach($this->lang->doc->typeList as $typeKey => $typeName)
             {
+                $icon  = zget($this->lang->doc->iconList, $typeKey);
                 $class = strpos($this->config->doc->officeTypes, $typeKey) !== false ? 'iframe' : '';
                 $html .= "<li>";
-                $html .= html::a(helper::createLink('doc', 'create', "objectType=$type&objectID=$objectID&libID=$libID&moduleID=0&type=$typeKey", '', $class ? true : false), $typeName, '', "class='$class' data-app='{$this->app->openApp}'");
+                $html .= html::a(helper::createLink('doc', 'create', "objectType=$type&objectID=$objectID&libID=$libID&moduleID=0&type=$typeKey", '', $class ? true : false), "<i class='icon-$icon'></i> '" . $typeName, '', "class='$class' data-app='{$this->app->openApp}'");
                 $html .= "</li>";
-
+                if($typeKey == 'url') $html .= '<li class="divider"></li>';
             }
             $html .= "</ul></div>";
         }