diff --git a/module/common/lang/en.php b/module/common/lang/en.php index a2dbdd6cc6..d91d116955 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -258,7 +258,7 @@ $lang->company->menu->name = '%s' . $lang->arrow; $lang->company->menu->browseUser = array('link' => 'Users|company|browse', 'subModule' => 'user'); $lang->company->menu->dept = array('link' => 'Department|dept|browse', 'subModule' => 'dept'); $lang->company->menu->browseGroup = array('link' => 'Group|group|browse', 'subModule' => 'group'); -$lang->company->menu->edit = array('link' => 'Company|company|edit'); +$lang->company->menu->view = array('link' => 'Company|company|view', 'alias' => 'edit'); $lang->company->menu->dynamic = 'Dynamic|company|dynamic|'; $lang->company->menu->addGroup = array('link' => ' Add Group|group|create', 'float' => 'right'); $lang->company->menu->batchAddUser = array('link' => ' Batch Add|user|batchCreate', 'subModule' => 'user', 'float' => 'right'); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 93d5697462..432bb98d5c 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -258,7 +258,7 @@ $lang->company->menu->name = '%s' . $lang->arrow; $lang->company->menu->browseUser = array('link' => '用户|company|browse', 'subModule' => 'user'); $lang->company->menu->dept = array('link' => '部门|dept|browse', 'subModule' => 'dept'); $lang->company->menu->browseGroup = array('link' => '权限|group|browse', 'subModule' => 'group'); -$lang->company->menu->edit = array('link' => '公司|company|edit'); +$lang->company->menu->view = array('link' => '公司|company|view', 'alias' => 'edit'); $lang->company->menu->dynamic = '动态|company|dynamic|'; $lang->company->menu->addGroup = array('link' => ' 添加分组|group|create', 'float' => 'right'); $lang->company->menu->batchAddUser = array('link' => ' 批量添加|user|batchCreate', 'subModule' => 'user', 'float' => 'right'); diff --git a/module/company/control.php b/module/company/control.php index 8a270a7dc5..803c00957b 100644 --- a/module/company/control.php +++ b/module/company/control.php @@ -161,6 +161,20 @@ class company extends control $this->display(); } + /** + * View a company. + * + * @access public + * @return void + */ + public function view() + { + $this->view->title = $this->lang->company->common . $this->lang->colon . $this->lang->company->view; + $this->view->position[] = $this->lang->company->view; + $this->view->company = $this->company->getById($this->app->company->id); + $this->display(); + } + /** * Delete a company. * diff --git a/module/company/js/edit.js b/module/company/js/edit.js index 43061492f9..b0cf639d5f 100644 --- a/module/company/js/edit.js +++ b/module/company/js/edit.js @@ -1 +1,2 @@ function setForm(){} +function setOuterBox(){} diff --git a/module/company/js/view.js b/module/company/js/view.js new file mode 100644 index 0000000000..b321c37f83 --- /dev/null +++ b/module/company/js/view.js @@ -0,0 +1,3 @@ +$(function(){ + $('#editCompany').colorbox({width:800, height:520, iframe:true, transition:'none'}); +}); diff --git a/module/company/lang/en.php b/module/company/lang/en.php index e6e65cbb41..729202d184 100644 --- a/module/company/lang/en.php +++ b/module/company/lang/en.php @@ -13,6 +13,7 @@ $lang->company->common = 'Company'; $lang->company->index = "Index"; $lang->company->create = "Create"; $lang->company->edit = "Edit"; +$lang->company->view = "Info"; $lang->company->read = "Info"; $lang->company->update = "Update"; $lang->company->delete = "Delete"; diff --git a/module/company/lang/zh-cn.php b/module/company/lang/zh-cn.php index b708ea2539..cf8766f089 100644 --- a/module/company/lang/zh-cn.php +++ b/module/company/lang/zh-cn.php @@ -13,6 +13,7 @@ $lang->company->common = '组织视图'; $lang->company->index = "组织视图首页"; $lang->company->create = "新增公司"; $lang->company->edit = "编辑公司"; +$lang->company->view = "公司信息"; $lang->company->read = "公司信息"; $lang->company->update = "更新公司"; $lang->company->delete = "删除公司"; diff --git a/module/company/view/view.html.php b/module/company/view/view.html.php new file mode 100644 index 0000000000..6ca89f3eef --- /dev/null +++ b/module/company/view/view.html.php @@ -0,0 +1,54 @@ + + * @package company + * @version $Id: edit.html.php 4488 2013-02-27 02:54:49Z chencongzhi520@gmail.com $ + * @link http://www.zentao.net + */ +?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
company->view;?>
company->name;?>name;?>
company->phone;?>phone;?>
company->fax;?>fax;?>
company->address;?>address;?>
company->zipcode;?>zipcode;?>
company->website;?>website;?>
company->backyard;?>backyard;?>
company->pms;?>pms;?>
company->guest;?>company->guestList[$company->guest];?>
edit, '', 'id=editCompany', true, true);?>
+ diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 8ebaa0228c..f39f4e9ea8 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -477,6 +477,7 @@ $lang->resource->company->index = 'index'; $lang->resource->company->browse = 'browse'; $lang->resource->company->create = 'create'; $lang->resource->company->edit = 'edit'; +$lang->resource->company->view = 'view'; $lang->resource->company->delete = 'delete'; $lang->resource->company->dynamic= 'dynamic';