diff --git a/module/doc/config.php b/module/doc/config.php index e0da9b384b..57af0540c8 100644 --- a/module/doc/config.php +++ b/module/doc/config.php @@ -30,6 +30,13 @@ $config->doc->markdown->create = array('id' => 'contentMarkdown', 'tools' => 'wi $config->doc->collectionLimit = 10; +$config->doc->iconList['html'] = 'rich-text'; +$config->doc->iconList['markdown'] = 'markdown'; +$config->doc->iconList['url'] = 'text-link'; +$config->doc->iconList['word'] = 'word'; +$config->doc->iconList['ppt'] = 'ppt'; +$config->doc->iconList['excel'] = 'excel'; + $config->doc->search['module'] = 'doc'; $config->doc->search['fields']['title'] = $lang->doc->title; $config->doc->search['fields']['id'] = $lang->doc->id; diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php index e39bbd0237..ddd6f58183 100644 --- a/module/doc/lang/de.php +++ b/module/doc/lang/de.php @@ -132,13 +132,6 @@ $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'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 15f88c2f59..ebe2fa3a25 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -137,13 +137,6 @@ $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'; diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php index 2f2c81cd50..69bb0a4d42 100644 --- a/module/doc/lang/fr.php +++ b/module/doc/lang/fr.php @@ -132,13 +132,6 @@ $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'; diff --git a/module/doc/lang/vi.php b/module/doc/lang/vi.php index 69aef83cf5..76edcec8a6 100644 --- a/module/doc/lang/vi.php +++ b/module/doc/lang/vi.php @@ -132,13 +132,6 @@ $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'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 3b375782b7..20d4dc8fd4 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -137,13 +137,6 @@ $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'] = '链接'; diff --git a/module/doc/model.php b/module/doc/model.php index 28c35075f3..a7a108e040 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1732,7 +1732,7 @@ class docModel extends model foreach($this->lang->doc->typeList as $typeKey => $typeName) { $class = strpos($this->config->doc->officeTypes, $typeKey) !== false ? 'iframe' : ''; - $icon = zget($this->lang->doc->iconList, $typeKey); + $icon = zget($this->config->doc->iconList, $typeKey); $html .= "
  • "; $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 .= "
  • "; diff --git a/module/doc/view/tablecontents.html.php b/module/doc/view/tablecontents.html.php index e2ec9079f1..b3a791fea9 100644 --- a/module/doc/view/tablecontents.html.php +++ b/module/doc/view/tablecontents.html.php @@ -87,7 +87,7 @@ if(empty($type)) $type = 'product'; $html .= "