diff --git a/module/doc/control.php b/module/doc/control.php index 9eae927be7..5228ef1962 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -921,6 +921,12 @@ class doc extends control $doc = $this->doc->getById($docID, $version, true); if(!$doc) die(js::error($this->lang->notFound) . js::locate('back')); + if($doc->keywords) + { + $doc->keywords = preg_replace("/(\n)|(\s)|(\t)|(\')|(')|(，)/", ',', $doc->keywords); + $doc->keywords = explode(',', $doc->keywords); + } + if($doc->contentType == 'markdown') { $doc->content = commonModel::processMarkdown($doc->content); diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php index b981fc4366..0f2e6a95e8 100644 --- a/module/doc/lang/de.php +++ b/module/doc/lang/de.php @@ -88,19 +88,20 @@ $lang->doc->cancelCollection = 'Favorit entfernen'; $lang->doc->deleteFile = 'Delete File'; $lang->doc->menuTitle = 'Menu'; -$lang->doc->libName = 'Name'; -$lang->doc->libType = 'Kategorie'; -$lang->doc->custom = 'Eigene Dok Bibliothek'; -$lang->doc->customAB = 'Eigene Bibliothek'; -$lang->doc->createlib = 'Bibliothek erstellen'; -$lang->doc->allLibs = 'Bibliothek'; -$lang->doc->objectLibs = "{$lang->productCommon}/{$lang->executionCommon} Bibliothek Liste"; -$lang->doc->showFiles = 'Dok Bibliothek'; -$lang->doc->editlib = 'Bibliothek bearbeiten'; -$lang->doc->deleteLib = 'Bibliothek löschen'; -$lang->doc->fixedMenu = 'Im Menü fixieren'; -$lang->doc->removeMenu = 'Vom Menü entfernen'; -$lang->doc->search = 'Suche'; +$lang->doc->libName = 'Name'; +$lang->doc->libType = 'Kategorie'; +$lang->doc->custom = 'Eigene Dok Bibliothek'; +$lang->doc->customAB = 'Eigene Bibliothek'; +$lang->doc->createlib = 'Bibliothek erstellen'; +$lang->doc->allLibs = 'Bibliothek'; +$lang->doc->objectLibs = "{$lang->productCommon}/{$lang->executionCommon} Bibliothek Liste"; +$lang->doc->showFiles = 'Dok Bibliothek'; +$lang->doc->editlib = 'Bibliothek bearbeiten'; +$lang->doc->deleteLib = 'Bibliothek löschen'; +$lang->doc->fixedMenu = 'Im Menü fixieren'; +$lang->doc->removeMenu = 'Vom Menü entfernen'; +$lang->doc->search = 'Suche'; +$lang->doc->keywordsTips = 'Please use commas to separate multiple keywords.'; /* 查询条件列表 */ $lang->doc->allProduct = 'Alle' . $lang->productCommon; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 9bb3d1420b..e73f8cc957 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -91,19 +91,20 @@ $lang->doc->menuTitle = 'Menu'; $lang->doc->collectAction = 'Add Favorite'; -$lang->doc->libName = 'Document Library'; -$lang->doc->libType = 'Category'; -$lang->doc->custom = 'Custom Document Library'; -$lang->doc->customAB = 'Custom Doc Lib'; -$lang->doc->createLib = 'Create Document Library'; -$lang->doc->allLibs = 'Library List'; -$lang->doc->objectLibs = "{$lang->productCommon}/{$lang->executionCommon} Libraries"; -$lang->doc->showFiles = 'Attachments'; -$lang->doc->editLib = 'Edit Document Library'; -$lang->doc->deleteLib = 'Delete Document Library'; -$lang->doc->fixedMenu = 'Fix to Menu'; -$lang->doc->removeMenu = 'Remove from Menu'; -$lang->doc->search = 'Search'; +$lang->doc->libName = 'Document Library'; +$lang->doc->libType = 'Category'; +$lang->doc->custom = 'Custom Document Library'; +$lang->doc->customAB = 'Custom Doc Lib'; +$lang->doc->createLib = 'Create Document Library'; +$lang->doc->allLibs = 'Library List'; +$lang->doc->objectLibs = "{$lang->productCommon}/{$lang->executionCommon} Libraries"; +$lang->doc->showFiles = 'Attachments'; +$lang->doc->editLib = 'Edit Document Library'; +$lang->doc->deleteLib = 'Delete Document Library'; +$lang->doc->fixedMenu = 'Fix to Menu'; +$lang->doc->removeMenu = 'Remove from Menu'; +$lang->doc->search = 'Search'; +$lang->doc->keywordsTips = 'Please use commas to separate multiple keywords.'; global $config; /* Query condition list. */ diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php index 54460f5eac..9370b94d31 100644 --- a/module/doc/lang/fr.php +++ b/module/doc/lang/fr.php @@ -88,19 +88,20 @@ $lang->doc->cancelCollection = 'Retirer des Favoris'; $lang->doc->deleteFile = 'Supprimer Fichier'; $lang->doc->menuTitle = 'Menu'; -$lang->doc->libName = 'Bibliothèque de Documents'; -$lang->doc->libType = 'Catégorie'; -$lang->doc->custom = 'Personnaliser Bibliothèque de Documents'; -$lang->doc->customAB = 'Person. Bib Doc'; -$lang->doc->createlib = 'Créer une Bibliothèque'; -$lang->doc->allLibs = 'Liste des Bibliothèque'; -$lang->doc->objectLibs = "{$lang->productCommon}/{$lang->executionCommon} Bibliothèque"; -$lang->doc->showFiles = 'Pièces Jointes'; -$lang->doc->editlib = 'Editer Bibliothèque'; -$lang->doc->deleteLib = 'Supprimer Bibliothèque'; -$lang->doc->fixedMenu = 'Coller au Menu'; -$lang->doc->removeMenu = 'Décoller du Menu'; -$lang->doc->search = 'Rechercher'; +$lang->doc->libName = 'Bibliothèque de Documents'; +$lang->doc->libType = 'Catégorie'; +$lang->doc->custom = 'Personnaliser Bibliothèque de Documents'; +$lang->doc->customAB = 'Person. Bib Doc'; +$lang->doc->createlib = 'Créer une Bibliothèque'; +$lang->doc->allLibs = 'Liste des Bibliothèque'; +$lang->doc->objectLibs = "{$lang->productCommon}/{$lang->executionCommon} Bibliothèque"; +$lang->doc->showFiles = 'Pièces Jointes'; +$lang->doc->editlib = 'Editer Bibliothèque'; +$lang->doc->deleteLib = 'Supprimer Bibliothèque'; +$lang->doc->fixedMenu = 'Coller au Menu'; +$lang->doc->removeMenu = 'Décoller du Menu'; +$lang->doc->search = 'Rechercher'; +$lang->doc->keywordsTips = 'Please use commas to separate multiple keywords.'; /* 查询条件列表 */ $lang->doc->allProduct = 'Tous les' . $lang->productCommon . 's'; diff --git a/module/doc/lang/vi.php b/module/doc/lang/vi.php index 299e032438..f986adca5c 100644 --- a/module/doc/lang/vi.php +++ b/module/doc/lang/vi.php @@ -88,19 +88,20 @@ $lang->doc->cancelCollection = 'Remove Favorite'; $lang->doc->deleteFile = 'Xóa File'; $lang->doc->menuTitle = 'Menu'; -$lang->doc->libName = 'Thư viện tài liệu'; -$lang->doc->libType = 'Danh mục'; -$lang->doc->custom = 'Tùy biến thư viện tài liệu'; -$lang->doc->customAB = 'Tùy biến Doc Lib'; -$lang->doc->createlib = 'Tạo thư viện tài liệu'; -$lang->doc->allLibs = 'Library danh sách'; -$lang->doc->objectLibs = "{$lang->productCommon}/{$lang->executionCommon} Libraries"; -$lang->doc->showFiles = 'Attachments'; -$lang->doc->editlib = 'Sửa thư viện tài liệu'; -$lang->doc->deleteLib = 'Xóa thư viện tài liệu'; -$lang->doc->fixedMenu = 'Sửa to Menu'; -$lang->doc->removeMenu = 'Remove from Menu'; -$lang->doc->search = 'Tìm kiếm'; +$lang->doc->libName = 'Thư viện tài liệu'; +$lang->doc->libType = 'Danh mục'; +$lang->doc->custom = 'Tùy biến thư viện tài liệu'; +$lang->doc->customAB = 'Tùy biến Doc Lib'; +$lang->doc->createlib = 'Tạo thư viện tài liệu'; +$lang->doc->allLibs = 'Library danh sách'; +$lang->doc->objectLibs = "{$lang->productCommon}/{$lang->executionCommon} Libraries"; +$lang->doc->showFiles = 'Attachments'; +$lang->doc->editlib = 'Sửa thư viện tài liệu'; +$lang->doc->deleteLib = 'Xóa thư viện tài liệu'; +$lang->doc->fixedMenu = 'Sửa to Menu'; +$lang->doc->removeMenu = 'Remove from Menu'; +$lang->doc->search = 'Tìm kiếm'; +$lang->doc->keywordsTips = 'Please use commas to separate multiple keywords.'; /* Query condition list. */ $lang->doc->allProduct = 'All' . $lang->productCommon; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 999f5351e3..447637cbe8 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -104,6 +104,7 @@ $lang->doc->deleteLib = '删除文档库'; $lang->doc->fixedMenu = '固定到菜单栏'; $lang->doc->removeMenu = '从菜单栏移除'; $lang->doc->search = '搜索'; +$lang->doc->keywordsTips = '多个关键字请用逗号分隔。'; global $config; /* 查询条件列表 */ diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php index deb2c5f78a..1809005894 100644 --- a/module/doc/view/content.html.php +++ b/module/doc/view/content.html.php @@ -66,6 +66,13 @@ $sessionString .= session_name() . '=' . session_id();
+ keywords):?> +

+ keywords as $keywords):?> + $keywords";?> + +

+ type == 'url') { @@ -138,14 +145,6 @@ $sessionString .= session_name() . '=' . session_id();
-
-
- doc->keywords;?> -
- keywords) ? $doc->keywords : "
" . $lang->noData . '
';?> -
-
-
doc->basicInfo;?> diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php index ff7c892de7..773e37f892 100644 --- a/module/doc/view/create.html.php +++ b/module/doc/view/create.html.php @@ -58,7 +58,7 @@ doc->keywords;?> - + doc->keywordsTips}'");?> doc->type;?> diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php index e9ce3e1968..88ef2e06bd 100644 --- a/module/doc/view/edit.html.php +++ b/module/doc/view/edit.html.php @@ -24,37 +24,37 @@
save, '', 'id="top-submit" class="btn btn-primary"');?>
- +
- + - + - + - + type == 'url') echo "class='hidden'"?>> - + type != 'url') echo "class='hidden'"?>> - +
doc->lib;?> lib, "class='form-control chosen' onchange=loadDocModule(this.value)");?>
doc->module;?> module, "class='form-control chosen'");?>
doc->title;?> title, "class='form-control' required");?>
doc->keywords;?>keywords, "class='form-control'");?>keywords, "class='form-control' placeholder='{$lang->doc->keywordsTips}'");?>
doc->type;?> doc->types, $doc->type);?>
doc->content;?> type == 'url' ? '' : htmlspecialchars($doc->content), "style='width:100%; height:200px'") . html::hidden('contentType', $doc->contentType);?>
doc->url;?> type == 'url' ? $doc->content : '', "class='form-control'");?>
doc->files;?> fetch('file', 'buildform');?>