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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2014-06-18 03:23:52 +00:00
parent d1431b9ddb bb51c37bfe
commit 5030a42ad7
8 changed files with 42 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/file/view/buildform.html.php
+15 -11
View File
@@ -1,18 +1,22 @@
<style>
.fileBox {margin-bottom: 10px; width: 100%}
table.fileBox td {padding: 0!important}
.fileBox .input-control > input[type='file'] {width: 100%; height: 100%; height: 26px; line-height: 26px; border: none; position: relative;}
.fileBox td .btn {border-radius: 0; border-left: none}
.file-wrapper.form-control {border-right: 0}
</style>
<div id='fileform'>
<?php
/* Define the html code of a file row. */
$fileRow = <<<EOT
<div class='fileBox input-group' id='fileBox\$i'>
<span class='input-control w-p45 pd-0'><input type='file' name='files[]' class='fileControl' tabindex='-1' /></span>
<span class="input-group-addon">{$lang->file->label}</span>
<input type='text' name='labels[]' class='form-control' placeholder='{$lang->file->label}' tabindex='-1' />
<span class='input-group-btn'>
<a href='javascript:void();' onclick='addFile(this)' class='btn'><i class='icon-plus'></i></a>
</span>
<span class='input-group-btn'>
<a href='javascript:void();' onclick='delFile(this)' class='btn'><i class='icon-remove'></i></a>
</span>
</div>
<table class='fileBox' id='fileBox\$i'>
<tr>
<td class='w-p45'><div class='form-control file-wrapper'><input type='file' name='files[]' class='fileControl' tabindex='-1' /></div></td>
<td class=''><input type='text' name='labels[]' class='form-control' placeholder='{$lang->file->label}' tabindex='-1' /></td>
<td class='w-30px'><a href='javascript:void();' onclick='addFile(this)' class='btn btn-block'><i class='icon-plus'></i></a></td>
<td class='w-30px'><a href='javascript:void();' onclick='delFile(this)' class='btn btn-block'><i class='icon-remove'></i></a></td>
</tr>
</table>
EOT;
for($i = 1; $i <= $fileCount; $i ++) echo str_replace('$i', $i, $fileRow);
?>
module/my/view/blockproducts.html.php
+1 -1
View File
@@ -4,7 +4,7 @@
<i class='icon-cube icon'></i> <strong><?php echo $lang->my->home->products;?></strong>
</div>
<div class='panel-body text-center'><br><br>
<?php echo html::a($this->createLink('product', 'create'), "<i class='icon-plus'></i> " . $lang->my->home->createProduct,'', "class='btn btn-success'");?> &nbsp; &nbsp; <?php echo " <i class='icon-question-sign text-muted'></i> " . $lang->my->home->help; ?>
<?php echo html::a($this->createLink('product', 'create'), "<i class='icon-plus'></i> " . $lang->my->home->createProduct,'', "class='btn btn-primary'");?> &nbsp; &nbsp; <?php echo " <i class='icon-question-sign text-muted'></i> " . $lang->my->home->help; ?>
</div>
<?php else:?>
<table class='table table-condensed table-hover table-striped table-borderless'>
module/my/view/blockprojects.html.php
+1 -1
View File
@@ -4,7 +4,7 @@
<i class='icon-folder-close-alt icon'></i> <strong><?php echo $lang->my->home->projects;?></strong>
</div>
<div class='panel-body text-center'><br><br>
<?php echo html::a($this->createLink('project', 'create'), "<i class='icon-plus'></i> " . $lang->my->home->createProject,'', "class='btn btn-success'");?> &nbsp; &nbsp; <?php echo " <i class='icon-question-sign text-muted'></i> " . $lang->my->home->help; ?>
<?php echo html::a($this->createLink('project', 'create'), "<i class='icon-plus'></i> " . $lang->my->home->createProject,'', "class='btn btn-primary'");?> &nbsp; &nbsp; <?php echo " <i class='icon-question-sign text-muted'></i> " . $lang->my->home->help; ?>
</div>
<?php else:?>
<table class='table table-condensed table-hover table-striped table-borderless'>
module/project/view/story.html.php
+3 -3
View File
@@ -29,7 +29,7 @@
</div>
</div>
<form method='post' id='projectStoryForm'>
<table class='table tablesorter table-fixed' id='storyList'>
<table class='table tablesorter table-condensed table-fixed' id='storyList'>
<thead>
<tr class='colhead'>
<?php $vars = "projectID={$project->id}&orderBy=%s"; ?>
@@ -81,13 +81,13 @@
$param = "projectID={$project->id}&story={$story->id}&moduleID={$story->module}";
$lang->task->create = $lang->project->wbs;
common::printIcon('task', 'create', $param, '', 'list', 'branch');
common::printIcon('task', 'create', $param, '', 'list', 'sitemap');
$lang->task->batchCreate = $lang->project->batchWBS;
common::printIcon('task', 'batchCreate', "projectID={$project->id}&story={$story->id}", '', 'list', 'stack');
$lang->testcase->batchCreate = $lang->testcase->create;
if($productID) common::printIcon('testcase', 'batchCreate', "productID=$story->product&moduleID=$story->module&storyID=$story->id", '', 'list', 'sitemap');
if($productID) common::printIcon('testcase', 'batchCreate', "productID=$story->product&moduleID=$story->module&storyID=$story->id", '', 'list', 'smile');
if(common::hasPriv('project', 'unlinkStory'))
{
module/project/view/taskheader.html.php
+1 -1
View File
@@ -81,7 +81,7 @@
<div class='btn-group'>
<?php
common::printIcon('task', 'batchCreate', "projectID=$projectID");
common::printIcon('task', 'create', "project=$projectID", '', 'button', 'branch');
common::printIcon('task', 'create', "project=$projectID", '', 'button', 'sitemap');
?>
</div>
</div>
www/js/kindeditor/plugins/image/image.js
+19 -19
View File
@@ -40,8 +40,22 @@ KindEditor.plugin('image', function(K) {
'<div style="padding:20px;">',
//tabs
'<div class="tabs"></div>',
//remote image - start
//local upload - start
'<div class="tab1" style="display:none;">',
'<iframe name="' + target + '" style="display:none;"></iframe>',
'<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="' + target + '" action="' + K.addParam(uploadJson, 'dir=image') + '">',
//file
'<div class="ke-dialog-row">',
hiddenElements.join(''),
'<label style="width:60px;">' + lang.localUrl + '</label>',
'<input type="text" name="localUrl" class="ke-input-text" tabindex="-1" style="width:200px;" readonly="true" /> &nbsp;',
'<input type="button" class="ke-upload-button" value="' + lang.upload + '" />',
'</div>',
'</form>',
'</div>',
//local upload - end
//remote image - start
'<div class="tab2" style="display:none;">',
//url
'<div class="ke-dialog-row">',
'<label for="remoteUrl" style="width:60px;">' + lang.remoteUrl + '</label>',
@@ -71,20 +85,6 @@ KindEditor.plugin('image', function(K) {
'</div>',
'</div>',
//remote image - end
//local upload - start
'<div class="tab2" style="display:none;">',
'<iframe name="' + target + '" style="display:none;"></iframe>',
'<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="' + target + '" action="' + K.addParam(uploadJson, 'dir=image') + '">',
//file
'<div class="ke-dialog-row">',
hiddenElements.join(''),
'<label style="width:60px;">' + lang.localUrl + '</label>',
'<input type="text" name="localUrl" class="ke-input-text" tabindex="-1" style="width:200px;" readonly="true" /> &nbsp;',
'<input type="button" class="ke-upload-button" value="' + lang.upload + '" />',
'</div>',
'</form>',
'</div>',
//local upload - end
'</div>'
].join('');
var dialogWidth = showLocal || allowFileManager ? 450 : 400,
@@ -168,17 +168,17 @@ KindEditor.plugin('image', function(K) {
afterSelect : function(i) {}
});
tabs.add({
title : lang.remoteImage,
title : lang.localImage,
panel : K('.tab1', div)
});
tabs.add({
title : lang.localImage,
title : lang.remoteImage,
panel : K('.tab2', div)
});
tabs.select(tabIndex);
} else if (showRemote) {
K('.tab1', div).show();
} else if (showLocal) {
K('.tab1', div).show();
} else if (showRemote) {
K('.tab2', div).show();
}
www/theme/default/style.css
-9
View File
@@ -310,15 +310,6 @@ div.form-control[contenteditable='true'] {height: auto; text-align: left; outlin
.list-group-item.active,.list-group-item.active:hover {background: #fff; border-color: #ddd; background: #f1f1f1; color: #333; font-weight: bold;}
.list-group-item.active > a {color: #333}
/* File form */
.fileBox {margin-bottom: 10px; width: 100%}
#fileform > .fileBox:last-child {margin-bottom: 0;}
.fileBox .input-group-addon{text-indent: -9999em; padding: 0 !important; border-left: 0; border-right: 0}
.fileBox .form-control[type='text'] + .input-group-btn > .btn {border-left: 0}
.fileBox .form-control[type='text'] {height: 30px;}
.fileBox .input-control {display: table-cell; border: 1px solid #ccc; padding: 0 10px; border-radius: 2px 0 0 2px}
.fileBox .input-control > input[type='file'] {width: 100%; height: 100%; height: 26px; padding: 0 5px; line-height: 26px; border: none; position: relative; top: 0;}
/* Bug status */
.bug-closed, .bug-closed a {color: #808080; text-decoration: line-through;}
www/theme/zui/css/min.css
+2 -2
View File
File diff suppressed because one or more lines are too long