diff --git a/module/doc/config.php b/module/doc/config.php index 738fdf9289..888bc9bfb6 100644 --- a/module/doc/config.php +++ b/module/doc/config.php @@ -2,13 +2,13 @@ global $lang; $config->doc = new stdclass(); -$config->doc->createLib = new stdclass(); -$config->doc->editLib = new stdclass(); +$config->doc->createlib = new stdclass(); +$config->doc->editlib = new stdclass(); $config->doc->create = new stdclass(); $config->doc->edit = new stdclass(); -$config->doc->createLib->requiredFields = 'name'; -$config->doc->editLib->requiredFields = 'name'; +$config->doc->createlib->requiredFields = 'name'; +$config->doc->editlib->requiredFields = 'name'; $config->doc->create->requiredFields = 'title'; $config->doc->edit->requiredFields = 'title'; diff --git a/module/doc/css/createlib.css b/module/doc/css/createlib.css index e69de29bb2..d5f518687f 100644 --- a/module/doc/css/createlib.css +++ b/module/doc/css/createlib.css @@ -0,0 +1,3 @@ +form {margin-right: 30px;} + +#whiteListBox div.input-group {margin-bottom: 2px;} diff --git a/module/doc/css/editlib.css b/module/doc/css/editlib.css index 8b13789179..afb55c8159 100644 --- a/module/doc/css/editlib.css +++ b/module/doc/css/editlib.css @@ -1 +1,5 @@ +form {margin-right: 30px;} +.chosen-container .chosen-results {max-height: 180px;} + +#whiteListBox div.input-group {margin-bottom: 2px;} diff --git a/module/doc/model.php b/module/doc/model.php index 8dccc428cd..e8cb9f8134 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -237,7 +237,7 @@ class docModel extends model if($lib->acl == 'private') $lib->users = $this->app->user->account; $this->dao->insert(TABLE_DOCLIB)->data($lib)->autoCheck() - ->batchCheck('name', 'notempty') + ->batchCheck($this->config->doc->createlib->requiredFields, 'notempty') ->exec(); return $this->dao->lastInsertID(); @@ -261,7 +261,7 @@ class docModel extends model $lib->users = $libCreatedBy ? $libCreatedBy : $this->app->user->account; } $this->dao->update(TABLE_DOCLIB)->data($lib)->autoCheck() - ->batchCheck('name', 'notempty') + ->batchCheck($this->config->doc->editlib->requiredFields, 'notempty') ->where('id')->eq($libID) ->exec(); if(!dao::isError()) return common::createChanges($oldLib, $lib); diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php index 48efa281e8..ca9465809a 100644 --- a/module/doc/view/objectlibs.html.php +++ b/module/doc/view/objectlibs.html.php @@ -73,8 +73,8 @@
", 'hiddenwin', "title='{$collectTitle}' class='btn btn-link'")?> ", '', "title='{$lang->edit}' class='btn btn-link iframe'")?> - ", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> - ", '', "title='{$lang->tree->manage}' class='btn btn-link'")?> + main)) common::printLink('doc', 'deleteLib', "libID=$libID", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> + ", '', "title='{$lang->doc->manageType}' class='btn btn-link'")?>
diff --git a/module/project/css/view.css b/module/project/css/view.css index c01cadeb57..43675ad00b 100644 --- a/module/project/css/view.css +++ b/module/project/css/view.css @@ -1,3 +1,5 @@ +.block-burn .panel-body{margin-top: 20px;} + #burnWrapper {max-width: 400px; margin: 0 auto; padding: 8px; position: relative;} #burnYUnit {position: absolute; color: #CBD0DB; top: -10px; left: 10px;} #burnLegend {position: absolute; right: 0; width: 80px; height: 40px; top: 0; margin-top: -20px; line-height: 20px; color: #838A9D; font-size: 12px;} diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index 355cb565b5..ff7dae0e24 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -183,7 +183,7 @@
$product):?> plan])):?> -
createLink('productplan', 'view', "planID={$product->id}"), $product->name . '/' . $planGroups[$productID][$product->plan]);?>
+
createLink('productplan', 'view', "planID={$product->id}"), $product->name . '/' . $planGroups[$productID][$product->plan]);?>
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index 434002041c..2deb2ba16a 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -22,7 +22,23 @@
- tree->manageLine : $lang->tree->common) . ':' . $root->name;?> + + doc->manageType; + } + elseif($viewType == 'line') + { + echo $lang->tree->manageLine; + } + else + { + echo $lang->tree->common; + } + echo $lang->colon . $root->name; + ?> +