diff --git a/module/extension/control.php b/module/extension/control.php index 2f6829901d..7b1b75ef50 100644 --- a/module/extension/control.php +++ b/module/extension/control.php @@ -374,7 +374,7 @@ class extension extends control */ public function structure($extension) { - $this->view->structures = $this->extension->structure($extension); + $this->view->extension = $this->extension->getInfoFromDB($extension); $this->display(); } } diff --git a/module/extension/js/common.js b/module/extension/js/common.js index ce34126492..0d51c19670 100644 --- a/module/extension/js/common.js +++ b/module/extension/js/common.js @@ -1,3 +1,3 @@ if($('a.iframe').size()) $("a.iframe").colorbox({width:800, height:400, iframe:true, transition:'elastic', speed:350, scrolling:true}); if($('a.manual').size()) $("a.manual").colorbox({width:1024, height:600, iframe:true, transition:'elastic', speed:350, scrolling:false}); -if($('a.extension').size()) $("a.extension").colorbox({width:1024, height:480, iframe:true, transition:'elastic', speed:350, scrolling:true}); +if($('a.extension').size()) $("a.extension").colorbox({width:600, height:320, iframe:true, transition:'elastic', speed:350, scrolling:true}); diff --git a/module/extension/model.php b/module/extension/model.php index 3d86ad1b76..142477453f 100644 --- a/module/extension/model.php +++ b/module/extension/model.php @@ -751,28 +751,4 @@ class extensionModel extends model } return $this->dao->update(TABLE_EXTENSION)->data($data)->where('code')->eq($extension)->exec(); } - - /** - * Get the structure of extension. - * - * @param int $extension - * @access public - * @return void - */ - public function structure($extension) - { - $extension = $this->getInfoFromDB($extension); - $files = json_decode($extension->files); - $appRoot = $this->app->getAppRoot(); - - $structures = array(); - foreach($files as $struct => $value) - { - $structures[] = $appRoot . $struct; - } - - $structures['name'] = $extension->name; - $structures['code'] = $extension->code; - return $structures; - } } diff --git a/module/extension/view/structure.html.php b/module/extension/view/structure.html.php index edf629dbf5..308a2382c1 100644 --- a/module/extension/view/structure.html.php +++ b/module/extension/view/structure.html.php @@ -10,8 +10,17 @@ * @link http://www.zentao.net */ ?> -extension->structure . ':';?>

- - -
- + + + + + +
name . '[' . $extension->code . '] ' .$lang->extension->structure . ':';?> +
+ app->getAppRoot(); + $files = json_decode($extension->files); + foreach($files as $file => $md5) echo $appRoot . $file . "
"; + ?> +
+