Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust the kindeditor.

Browse Source
This commit is contained in:
wangchunsheng
2010-09-13 08:11:44 +00:00
parent 0f21c65493
commit f3edef3a90
24 changed files with 82 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/bug/view/create.html.php
View File

@@ -128,7 +128,7 @@ var userList = "<?php echo join(',', array_keys($users));?>".split(',');
$(function() { $(function() {
$("#mailto").autocomplete(userList, { multiple: true, mustMatch: true}); $("#mailto").autocomplete(userList, { multiple: true, mustMatch: true});
setAssignedTo(); setAssignedTo();
KE.show({id:'steps',items:bugTools}); KE.show({id:'steps',items:bugTools, filterMode:true, imageUploadJson: createLink('file', 'ajaxUpload')});
}) })
</script> </script>

4
module/bug/view/edit.html.php
View File

@@ -148,7 +148,7 @@ $(function() {
$("#mailto").autocomplete(userList, { multiple: true, mustMatch: true}); $("#mailto").autocomplete(userList, { multiple: true, mustMatch: true});
$("#searchStories").colorbox({width:680, height:400, iframe:true, transition:'none'}); $("#searchStories").colorbox({width:680, height:400, iframe:true, transition:'none'});
$("#searchTasks").colorbox({width:680, height:400, iframe:true, transition:'none'}); $("#searchTasks").colorbox({width:680, height:400, iframe:true, transition:'none'});
KE.show({id:'steps', items:simpleTools}); KE.show({id:'steps', items:simpleTools, filterMode:true, imageUploadJson: createLink('file', 'ajaxUpload')});
}); });
</script> </script>
@@ -170,7 +170,7 @@ $(function() {
<tr class='bd-none'><td class='bd-none'> <tr class='bd-none'><td class='bd-none'>
<fieldset> <fieldset>
<legend><?php echo $lang->bug->legendSteps;?></legend> <legend><?php echo $lang->bug->legendSteps;?></legend>
<div class='w-p90'><?php echo html::textarea('steps', $bug->steps, "rows='12'");?></div> <div class='w-p90'><?php echo html::textarea('steps', htmlspecialchars($bug->steps), "rows='12'");?></div>
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend><?php echo $lang->bug->legendComment;?></legend> <legend><?php echo $lang->bug->legendComment;?></legend>

2
module/common/control.php
View File

@@ -462,7 +462,7 @@ EOT;
if($value != $old->$key) if($value != $old->$key)
{ {
$diff = ''; $diff = '';
if(substr_count($value, "\n") > 1 or substr_count($old->$key, "\n") > 1 or strpos('name,title,desc,spec,steps', strtolower($key)) !== false) $diff = self::diff($old->$key, $value); if(substr_count($value, "\n") > 1 or substr_count($old->$key, "\n") > 1 or strpos('name,title,desc,spec,steps,content,digest', strtolower($key)) !== false) $diff = self::diff($old->$key, $value);
$changes[] = array('field' => $key, 'old' => $old->$key, 'new' => $value, 'diff' => $diff); $changes[] = array('field' => $key, 'old' => $old->$key, 'new' => $value, 'diff' => $diff);
} }
} }

34
module/common/view/kindeditor.html.php
View File

@@ -1,19 +1,25 @@
<?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?> <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
<script src='<?php echo $jsRoot;?>jquery/kindeditor/kindeditor.js' type='text/javascript'></script> <script src='<?php echo $jsRoot;?>jquery/kindeditor/kindeditor.<?php echo $app->getClientLang();?>.js' type='text/javascript'></script>
<script language='javascript'> <script language='javascript'>
var bugTools = [ 'title', 'fontname', 'fontsize', var bugTools =
'textcolor', 'bgcolor', 'bold', 'italic','underline', [ 'title', 'fontname', 'fontsize','textcolor', 'bgcolor', 'bold', 'italic','underline',
'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', 'insertunorderedlist', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', 'insertunorderedlist', '|',
'emoticons', 'image', 'link', '|', 'removeformat','undo', 'redo', 'fullscreen', 'source', 'savetemplate']; 'emoticons', 'image', 'link', '|', 'removeformat','undo', 'redo', 'fullscreen', 'source', 'savetemplate', 'about'];
var simpleTools = [ 'title', 'fontname', 'fontsize', var simpleTools =
'textcolor', 'bgcolor', 'bold', 'italic','underline', [ 'title', 'fontname', 'fontsize', 'textcolor', 'bgcolor', 'bold', 'italic','underline',
'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', 'insertunorderedlist', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', 'insertunorderedlist', '|',
'emoticons', 'image', 'link', '|', 'removeformat','undo', 'redo', 'fullscreen', 'source']; 'emoticons', 'image', 'link', '|', 'removeformat','undo', 'redo', 'fullscreen', 'source', 'about'];
var tools = ['source', '|', 'fullscreen', 'undo', 'redo', 'print', 'cut', 'copy', 'paste', 'plainpaste', 'wordpaste', '|', var tools =
'justifyleft', 'justifycenter', 'justifyright', 'justifyfull', 'insertorderedlist', 'insertunorderedlist', 'indent', 'outdent', 'subscript', 'superscript', '|', [ 'title', 'fontname', 'fontsize','textcolor', '|',
'selectall', 'title', 'fontname', 'fontsize', '|', 'bgcolor', 'bold', 'italic','underline', '|',
'textcolor', 'bgcolor', 'bold', 'italic', 'underline', 'strikethrough', 'removeformat', '|', 'justifyleft', 'justifycenter', 'justifyright', 'justifyfull', '|',
'image', 'flash', 'media', 'advtable', 'hr', 'emoticons', 'link', 'unlink', '|', 'about']; 'insertorderedlist', 'insertunorderedlist', '|',
'emoticons', 'image','link', 'unlink', '|',
'removeformat','undo', 'redo', 'fullscreen', 'source', 'about', '-',
'cut', 'copy', 'paste', 'plainpaste', 'wordpaste', '|',
'indent', 'outdent', 'subscript', 'superscript', '|',
'selectall', 'strikethrough', 'removeformat', '|',
'flash', 'media', 'advtable', 'hr', 'print'];
</script> </script>

4
module/doc/model.php
View File

@@ -130,7 +130,7 @@ class docModel extends model
->add('addedBy', $this->app->user->account) ->add('addedBy', $this->app->user->account)
->add('addedDate', $now) ->add('addedDate', $now)
->setDefault('product, project, module', 0) ->setDefault('product, project, module', 0)
->specialChars('title, digest, content, keywords') ->specialChars('title, digest, keywords')
->encodeURL('url') ->encodeURL('url')
->cleanInt('product, project, module') ->cleanInt('product, project, module')
->remove('files, labels') ->remove('files, labels')
@@ -159,7 +159,7 @@ class docModel extends model
$doc = fixer::input('post') $doc = fixer::input('post')
->cleanInt('module') ->cleanInt('module')
->setDefault('module', 0) ->setDefault('module', 0)
->specialChars('title, digest, content, keywords') ->specialChars('title, digest, keywords')
->encodeURL('url') ->encodeURL('url')
->remove('files, labels') ->remove('files, labels')
->add('editedBy', $this->app->user->account) ->add('editedBy', $this->app->user->account)

12
module/doc/view/create.html.php
View File

@@ -23,6 +23,7 @@
*/ */
?> ?>
<?php include '../../common/view/header.html.php';?> <?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<script language='Javascript'> <script language='Javascript'>
function loadProducts(project) function loadProducts(project)
{ {
@@ -48,6 +49,7 @@ function setType(type)
$('#contentBox').hide(); $('#contentBox').hide();
} }
} }
$(function() {KE.show({id:'content', items:tools, filterMode:true, imageUploadJson: createLink('file', 'ajaxUpload')});});
</script> </script>
<div class='yui-d0'> <div class='yui-d0'>
<form method='post' enctype='multipart/form-data' target='hiddenwin'> <form method='post' enctype='multipart/form-data' target='hiddenwin'>
@@ -80,17 +82,17 @@ function setType(type)
<th class='rowhead'><?php echo $lang->doc->title;?></th> <th class='rowhead'><?php echo $lang->doc->title;?></th>
<td><?php echo html::input('title', '', "class='text-1'");?></td> <td><?php echo html::input('title', '', "class='text-1'");?></td>
</tr> </tr>
<tr>
<th class='rowhead'><?php echo $lang->doc->keywords;?></th>
<td><?php echo html::input('keywords', '', "class='text-1'");?></td>
</tr>
<tr id='urlBox' class='hidden'> <tr id='urlBox' class='hidden'>
<th class='rowhead'><?php echo $lang->doc->url;?></th> <th class='rowhead'><?php echo $lang->doc->url;?></th>
<td><?php echo html::input('url', '', "class='text-1'");?></td> <td><?php echo html::input('url', '', "class='text-1'");?></td>
</tr> </tr>
<tr id='contentBox' class='hidden'> <tr id='contentBox' class='hidden'>
<th class='rowhead'><?php echo $lang->doc->content;?></th> <th class='rowhead'><?php echo $lang->doc->content;?></th>
<td><?php echo html::textarea('content', '', "class='text-1' rows='8'");?></td> <td><?php echo html::textarea('content', '', "class='area-1' style='width:90%; height:200px'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->doc->keywords;?></th>
<td><?php echo html::input('keywords', '', "class='text-1'");?></td>
</tr> </tr>
<tr> <tr>
<th class='rowhead'><?php echo $lang->doc->digest;?></th> <th class='rowhead'><?php echo $lang->doc->digest;?></th>

7
module/doc/view/edit.html.php
View File

@@ -23,6 +23,7 @@
*/ */
?> ?>
<?php include '../../common/view/header.html.php';?> <?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<script language='javascript'> <script language='javascript'>
/* 设置文档类型。*/ /* 设置文档类型。*/
var type = '<?php echo $doc->type;?>'; var type = '<?php echo $doc->type;?>';
@@ -43,6 +44,8 @@ $(document).ready(function()
$('#contentBox').hide(); $('#contentBox').hide();
$('#fileBox').show(); $('#fileBox').show();
} }
$(function() {KE.show({id:'content', items:tools, filterMode:true, imageUploadJson: createLink('file', 'ajaxUpload')});});
}); });
</script> </script>
<div class='yui-d0'> <div class='yui-d0'>
@@ -55,7 +58,7 @@ $(document).ready(function()
</tr> </tr>
<tr> <tr>
<th class='rowhead'><?php echo $lang->doc->type;?></th> <th class='rowhead'><?php echo $lang->doc->type;?></th>
<td><?php echo $doc->type;?></td> <td><?php echo $lang->doc->types[$doc->type];?></td>
</tr> </tr>
<th class='rowhead'><?php echo $lang->doc->title;?></th> <th class='rowhead'><?php echo $lang->doc->title;?></th>
<td><?php echo html::input('title', $doc->title, "class='text-1'");?></td> <td><?php echo html::input('title', $doc->title, "class='text-1'");?></td>
@@ -70,7 +73,7 @@ $(document).ready(function()
</tr> </tr>
<tr id='contentBox' class='hidden'> <tr id='contentBox' class='hidden'>
<th class='rowhead'><?php echo $lang->doc->content;?></th> <th class='rowhead'><?php echo $lang->doc->content;?></th>
<td><?php echo html::textarea('content', $doc->content, "class='text-1' rows='8'");?></td> <td><?php echo html::textarea('content', htmlspecialchars($doc->content), "class='text-1' rows='8' style='width:90%; height:200px'");?></td>
</tr> </tr>
<tr> <tr>
<th class='rowhead'><?php echo $lang->doc->digest;?></th> <th class='rowhead'><?php echo $lang->doc->digest;?></th>

4
module/doc/view/view.html.php
View File

@@ -62,11 +62,11 @@ $(document).ready(function()
</tr> </tr>
<tr id='urlBox' class='hidden'> <tr id='urlBox' class='hidden'>
<th class='rowhead'><?php echo $lang->doc->url;?></th> <th class='rowhead'><?php echo $lang->doc->url;?></th>
<td><?php echo html::a(urldecode($doc->url));?></td> <td><?php echo html::a(urldecode($doc->url), '', '_blank');?></td>
</tr> </tr>
<tr id='contentBox' class='hidden'> <tr id='contentBox' class='hidden'>
<th class='rowhead'><?php echo $lang->doc->content;?></th> <th class='rowhead'><?php echo $lang->doc->content;?></th>
<td><?php echo nl2br($doc->content);?></td> <td class='content'><?php echo $doc->content;?></td>
</tr> </tr>
<tr> <tr>
<th class='rowhead'><?php echo $lang->doc->digest;?></th> <th class='rowhead'><?php echo $lang->doc->digest;?></th>

13
module/file/control.php
View File

@@ -31,6 +31,19 @@ class file extends control
$this->display(); $this->display();
} }
/* ajax接口，用于接收编辑器附件上传。*/
public function ajaxUpload()
{
$file = $this->file->getUpload('imgFile');
$file = $file[0];
if($file)
{
move_uploaded_file($file['tmpname'], $this->file->savePath . $file['pathname']);
$url = $this->file->webPath . $file['pathname'];
die(json_encode(array('error' => 0, 'url' => $url)));
}
}
/* 下载一个文件。*/ /* 下载一个文件。*/
public function download($fileID, $mouse = '') public function download($fileID, $mouse = '')
{ {

5
module/file/lang/en.php
View File

@@ -25,4 +25,7 @@ $lang->file->common = 'File';
$lang->file->download = 'Download'; $lang->file->download = 'Download';
$lang->file->delete = 'Delete'; $lang->file->delete = 'Delete';
$lang->file->export2CSV = 'Export CSV'; $lang->file->export2CSV = 'Export CSV';
$lang->file->label = 'Title: '; $lang->file->ajaxUpload = 'AJAX: upload file from editor';
$lang->file->label = 'Title: ';
$lang->file->confirmDelete = " Are you sure to delete this file?";

3
module/file/lang/ja.php
View File

@@ -25,4 +25,7 @@ $lang->file->common = 'ファイル';
$lang->file->download = 'ダウンロード'; $lang->file->download = 'ダウンロード';
$lang->file->delete = '削除'; $lang->file->delete = '削除';
$lang->file->export2CSV = 'エクスポートCSV形式'; $lang->file->export2CSV = 'エクスポートCSV形式';
$lang->file->ajaxUpload = 'AJAX: upload file from editor';
$lang->file->label = 'タイトル：'; $lang->file->label = 'タイトル：';
$lang->file->confirmDelete = " Are you sure to delete this file?";

3
module/file/lang/ko.php
View File

@@ -25,4 +25,7 @@ $lang->file->common = '파일';
$lang->file->download = '다운로드'; $lang->file->download = '다운로드';
$lang->file->delete = '삭제'; $lang->file->delete = '삭제';
$lang->file->export2CSV = 'CSV 내보내기'; $lang->file->export2CSV = 'CSV 내보내기';
$lang->file->ajaxUpload = 'AJAX: upload file from editor';
$lang->file->label = '제목 :'; $lang->file->label = '제목 :';
$lang->file->confirmDelete = " Are you sure to delete this file?";

1
module/file/lang/zh-cn.php
View File

@@ -25,6 +25,7 @@ $lang->file->common = '附件';
$lang->file->download = '下载附件'; $lang->file->download = '下载附件';
$lang->file->delete = '删除附件'; $lang->file->delete = '删除附件';
$lang->file->export2CSV = '导出CSV'; $lang->file->export2CSV = '导出CSV';
$lang->file->ajaxUpload = '接口：编辑器上传附件';
$lang->file->label = '标题：'; $lang->file->label = '标题：';
$lang->file->confirmDelete = " 您确定删除该附件吗？"; $lang->file->confirmDelete = " 您确定删除该附件吗？";

6
module/file/model.php
View File

@@ -82,7 +82,7 @@ class fileModel extends model
} }
/* 获取上传的文件信息。*/ /* 获取上传的文件信息。*/
private function getUpload($htmlTagName = 'files') public function getUpload($htmlTagName = 'files')
{ {
$files = array(); $files = array();
if(!isset($_FILES[$htmlTagName])) return $files; if(!isset($_FILES[$htmlTagName])) return $files;
@@ -108,7 +108,7 @@ class fileModel extends model
extract($_FILES[$htmlTagName]); extract($_FILES[$htmlTagName]);
$file['extension'] = $this->getExtension($name); $file['extension'] = $this->getExtension($name);
$file['pathname'] = $this->setPathName(0, $file['extension']); $file['pathname'] = $this->setPathName(0, $file['extension']);
$file['title'] = !empty($_POST['labels'][0]) ? htmlspecialchars($_POST['labels'][0]) : pathinfo($filename, PATHINFO_FILENAME); $file['title'] = !empty($_POST['labels'][0]) ? htmlspecialchars($_POST['labels'][0]) : pathinfo($name, PATHINFO_FILENAME);
$file['size'] = $size; $file['size'] = $size;
$file['tmpname'] = $tmp_name; $file['tmpname'] = $tmp_name;
return array($file); return array($file);
@@ -142,7 +142,7 @@ class fileModel extends model
} }
/* 设置web访问路径。*/ /* 设置web访问路径。*/
private function setWebPath() public function setWebPath()
{ {
$this->webPath = $this->app->getWebRoot() . "data/upload/{$this->app->company->id}/"; $this->webPath = $this->app->getWebRoot() . "data/upload/{$this->app->company->id}/";
} }

1
module/group/lang/resource.php
View File

@@ -245,6 +245,7 @@ $lang->resource->api->getModel = 'getModel';
$lang->resource->file->download = 'download'; $lang->resource->file->download = 'download';
$lang->resource->file->delete = 'delete'; $lang->resource->file->delete = 'delete';
$lang->resource->file->export2CSV = 'export2CSV'; $lang->resource->file->export2CSV = 'export2CSV';
$lang->resource->file->ajaxUpload = 'ajaxUpload';
$lang->resource->misc->ping = 'ping'; $lang->resource->misc->ping = 'ping';
$lang->resource->action->trash = 'trash'; $lang->resource->action->trash = 'trash';
$lang->resource->action->undelete = 'undelete'; $lang->resource->action->undelete = 'undelete';

4
module/story/view/change.html.php
View File

@@ -24,7 +24,7 @@
?> ?>
<?php include './header.html.php';?> <?php include './header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?> <?php include '../../common/view/kindeditor.html.php';?>
<script language='javascript'>KE.show({id:'spec', items:simpleTools});</script> <script language='javascript'>KE.show({id:'spec', items:simpleTools, filterMode:true, imageUploadJson: createLink('file', 'ajaxUpload')});</script>
<div class='yui-d0'> <div class='yui-d0'>
<form method='post' enctype='multipart/form-data' target='hiddenwin'> <form method='post' enctype='multipart/form-data' target='hiddenwin'>
<table class='table-1'> <table class='table-1'>
@@ -39,7 +39,7 @@
</tr> </tr>
<tr> <tr>
<th class='rowhead'><?php echo $lang->story->spec;?></th> <th class='rowhead'><?php echo $lang->story->spec;?></th>
<td><?php echo html::textarea('spec', $story->spec, 'rows=8 class="area-1"');?><br /> <?php echo $lang->story->specTemplate;?></td> <td><?php echo html::textarea('spec', htmlspecialchars($story->spec), 'rows=8 class="area-1"');?><br /> <?php echo $lang->story->specTemplate;?></td>
</tr> </tr>
<tr> <tr>
<th class='rowhead'><?php echo $lang->story->comment;?></th> <th class='rowhead'><?php echo $lang->story->comment;?></th>

2
module/story/view/create.html.php
View File

@@ -25,7 +25,7 @@
<?php include './header.html.php';?> <?php include './header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?> <?php include '../../common/view/kindeditor.html.php';?>
<style>#plan {width:245px}</style> <style>#plan {width:245px}</style>
<script language='javascript'>KE.show({id:'spec', items:simpleTools});</script> <script language='javascript'>KE.show({id:'spec', items:simpleTools, filterMode:true, imageUploadJson: createLink('file', 'ajaxUpload')});</script>
<div class='yui-d0'> <div class='yui-d0'>
<form method='post' enctype='multipart/form-data' target='hiddenwin'> <form method='post' enctype='multipart/form-data' target='hiddenwin'>
<table align='center' class='table-1'> <table align='center' class='table-1'>

2
module/task/view/create.html.php
View File

@@ -67,7 +67,7 @@ function setPreview()
var userList = "<?php echo join(',', array_keys($users));?>".split(','); var userList = "<?php echo join(',', array_keys($users));?>".split(',');
$(document).ready(function() $(document).ready(function()
{ {
KE.show({id:'desc', items:simpleTools}); //富文本编辑器。 KE.show({id:'desc', items:simpleTools, filterMode:true, imageUploadJson: createLink('file', 'ajaxUpload')}); //富文本编辑器。
setPreview(); setPreview();
$("#mailto").autocomplete(userList, { multiple: true, mustMatch: true}); $("#mailto").autocomplete(userList, { multiple: true, mustMatch: true});
}); });

4
module/task/view/edit.html.php
View File

@@ -37,7 +37,7 @@ var userList = "<?php echo join(',', array_keys($users));?>".split(',');
$(function() { $(function() {
$("#mailto").autocomplete(userList, { multiple: true, mustMatch: true}); $("#mailto").autocomplete(userList, { multiple: true, mustMatch: true});
$("#searchStories").colorbox({width:680, height:400, iframe:true, transition:'none'}); $("#searchStories").colorbox({width:680, height:400, iframe:true, transition:'none'});
KE.show({ id:'desc', items:simpleTools }); // 富文本编辑器。 KE.show({ id:'desc', items:simpleTools, filterMode:true, imageUploadJson: createLink('file', 'ajaxUpload')});
}) })
</script> </script>
@@ -56,7 +56,7 @@ $(function() {
<tr class='bd-none'><td class='bd-none'> <tr class='bd-none'><td class='bd-none'>
<fieldset> <fieldset>
<legend><?php echo $lang->task->desc;?></legend> <legend><?php echo $lang->task->desc;?></legend>
<?php echo html::textarea('desc', $task->desc, "rows='8' class='area-1'");?> <?php echo html::textarea('desc', htmlspecialchars($task->desc), "rows='8' class='area-1'");?>
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend><?php echo $lang->comment;?></legend> <legend><?php echo $lang->comment;?></legend>

2
module/testtask/view/create.html.php
View File

@@ -25,7 +25,7 @@
<?php include '../../common/view/header.html.php';?> <?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?> <?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?> <?php include '../../common/view/kindeditor.html.php';?>
<script language='javascript'>KE.show({id:'desc', items:simpleTools});</script> <script language='javascript'>KE.show({id:'desc', items:simpleTools, filterMode:true, imageUploadJson: createLink('file', 'ajaxUpload')});</script>
<div class='yui-d0'> <div class='yui-d0'>
<form method='post' target='hiddenwin'> <form method='post' target='hiddenwin'>
<table class='table-1'> <table class='table-1'>

4
module/testtask/view/edit.html.php
View File

@@ -25,7 +25,7 @@
<?php include '../../common/view/header.html.php';?> <?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?> <?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?> <?php include '../../common/view/kindeditor.html.php';?>
<script language='javascript'>KE.show({id:'desc', items:simpleTools});</script> <script language='javascript'>KE.show({id:'desc', items:simpleTools, filterMode:true, imageUploadJson: createLink('file', 'ajaxUpload')});</script>
<div class='yui-d0'> <div class='yui-d0'>
<form method='post' target='hiddenwin'> <form method='post' target='hiddenwin'>
<table class='table-1'> <table class='table-1'>
@@ -56,7 +56,7 @@
</tr> </tr>
<tr> <tr>
<th class='rowhead'><?php echo $lang->testtask->desc;?></th> <th class='rowhead'><?php echo $lang->testtask->desc;?></th>
<td><?php echo html::textarea('desc', $task->desc, "rows=10 class='area-1'");?> <td><?php echo html::textarea('desc', htmlspecialchars($task->desc), "rows=10 class='area-1'");?>
</tr> </tr>
<tr> <tr>
<td colspan='2' class='a-center'><?php echo html::submitButton() . html::resetButton();?> </td> <td colspan='2' class='a-center'><?php echo html::submitButton() . html::resetButton();?> </td>

10
module/todo/view/create.html.php
View File

@@ -19,18 +19,12 @@
* @author Chunsheng Wang <chunsheng@cnezsoft.com> * @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package todo * @package todo
* @version $Id$ * @version $Id$
* @link http://www.zentaoms.com * @link http://www.zentao.net
*/ */
?> ?>
<?php include '../../common/view/header.html.php';?> <?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?> <?php include '../../common/view/kindeditor.html.php';?>
<script language='javascript'> <script language='javascript'>KE.show({id:'desc', items:simpleTools, filterMode:true, imageUploadJson: createLink('file', 'ajaxUpload')});</script>
/* 富文本编辑器。*/
KE.show({
id:'desc',
items:simpleTools
});
</script>
<div class='yui-d0'> <div class='yui-d0'>
<form method='post' target='hiddenwin'> <form method='post' target='hiddenwin'>
<table class='table-1'> <table class='table-1'>

11
module/todo/view/edit.html.php
View File

@@ -5,7 +5,6 @@
* ZenTaoMS is free software: you can redistribute it and/or modify * ZenTaoMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by * it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* *
* ZenTaoMS is distributed in the hope that it will be useful, * ZenTaoMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,13 +23,7 @@
?> ?>
<?php include '../../common/view/header.html.php';?> <?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?> <?php include '../../common/view/kindeditor.html.php';?>
<script language='javascript'> <script language='javascript'>KE.show({id:'desc', items:simpleTools, filterMode:true, imageUploadJson: createLink('file', 'ajaxUpload')});</script>
/* 富文本编辑器。*/
KE.show({
id:'desc',
items:simpleTools
});
</script>
<div class='yui-d0'> <div class='yui-d0'>
<form method='post' target='hiddenwin'> <form method='post' target='hiddenwin'>
<table class='table-1 a-left'> <table class='table-1 a-left'>
@@ -59,7 +52,7 @@ KE.show({
</tr> </tr>
<tr> <tr>
<th class='rowhead'><?php echo $lang->todo->desc;?></th> <th class='rowhead'><?php echo $lang->todo->desc;?></th>
<td><?php echo html::textarea('desc', $todo->desc, "rows=8 class=area-1");?></td> <td><?php echo html::textarea('desc', htmlspecialchars($todo->desc), "rows=8 class=area-1");?></td>
</tr> </tr>
<tr> <tr>
<th class='rowhead'><?php echo $lang->todo->status;?></th> <th class='rowhead'><?php echo $lang->todo->status;?></th>

2
module/todo/view/view.html.php
View File

@@ -58,7 +58,7 @@
</tr> </tr>
<tr> <tr>
<th class='rowhead'><?php echo $lang->todo->desc;?></th> <th class='rowhead'><?php echo $lang->todo->desc;?></th>
<td><?php echo $todo->desc;?></td> <td class='content'><?php echo $todo->desc;?></td>
</tr> </tr>
<tr> <tr>
<th class='rowhead'><?php echo $lang->todo->status;?></th> <th class='rowhead'><?php echo $lang->todo->status;?></th>