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

* Finish xuanxuan bug view.

Browse Source
This commit is contained in:
Yagami
2018-12-18 10:24:49 +08:00
parent 7c74014d00
commit 25ffec7ee2
9 changed files with 66 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/css/x.activate.css
+3
View File
@@ -0,0 +1,3 @@
#header{display: none}
#footer{display: none}
#header, #header+#main{min-width: 700px}
module/story/css/x.change.css
+3
View File
@@ -0,0 +1,3 @@
#header{display: none}
#footer{display: none}
#header, #header+#main{min-width: 700px}
module/story/css/x.close.css
+3
View File
@@ -0,0 +1,3 @@
#header{display: none}
#footer{display: none}
#header, #header+#main{min-width: 700px}
module/story/css/x.create.css
+3
View File
@@ -0,0 +1,3 @@
#header{display: none}
#footer{display: none}
#header, #header+#main{min-width: 700px}
module/story/css/x.view.css
+13
View File
@@ -0,0 +1,13 @@
body{padding:0px; margin: 0px}
#header{display: none}
#footer{display: none}
.main-actions{display: none}
#header+#main{min-width:700px}
#mainMenu .pull-left>a{display: none}
#mainMenu .pull-left .divider{display: none}
#mainMenu .pull-right{display: none}
#mainContent .col-4{display: none}
.col-8>.cell{min-height: 300px}
/*备注宽度*/
.modal-dialog{width: 90%}
module/story/js/x.create.js
+6
View File
@@ -0,0 +1,6 @@
$(function()
{
$('#sourceNote').parent().find('span').remove();
$('#sourceNote').remove();
$('table tbody tr th').addClass('w-70px');
});
module/story/js/x.view.js
+13
View File
@@ -0,0 +1,13 @@
$(function()
{
var $xuanAction = "<div class='xuancard-actions fixed'>";
if(status != 'closed') $xuanAction += "<a href='" + changeLink + "'" + " target='_blank'" + " class='btn btn-link'" + '>' + "<i class='icon-story-change icon-fork'></i>" + " <span class='text'>" + change + "</span>" + "</a>";
if(status == 'draft') $xuanAction += "<a href='" + reviewLink + "'" + " target='_blank'" + " class='btn btn-link'" + '>' + "<i class='icon-glasses'></i>" + " <span class='text'>" + review + "</span>" + "</a>";
$xuanAction += "<a href='" + editLink + "'" + " target='_blank' title=" + edit + " class='btn btn-link'" + '>' + "<i class='icon-edit'></i>" + "</a>";
if(status != 'closed') $xuanAction += '<a href="' + closeLink + '"' + " target='_blank'" + ' class="btn btn-link">' + '<i class="icon-story-close icon-off"></i>' + ' <span class="text">' + close + "</span>" + "</a>";
if(status == 'closed') $xuanAction += '<a href="' + activateLink + '"' + " target='_blank'" + ' class="btn btn-link">' + '<i class="icon-story-activate icon-magic"></i>' + ' <span class="text">' + activate + "</span>" + "</a>";
$xuanAction += '</div>';
$('#footer').replaceWith($xuanAction);
})
module/story/view/view.html.php
+22 -1
View File
@@ -12,7 +12,15 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php $browseLink = $app->session->storyList != false ? $app->session->storyList : $this->createLink('product', 'browse', "productID=$story->product&branch=$story->branch&moduleID=$story->module");?>
<?php
$browseLink = $app->session->storyList != false ? $app->session->storyList : $this->createLink('product', 'browse', "productID=$story->product&branch=$story->branch&moduleID=$story->module");
/* xuanxuan.*/
$changeLink = 'xxc:openUrlInDialog/' . rawurlencode(common::getSysUrl() . helper::createLink('story', 'change', "storyID=$story->id"));
$reviewLink = 'xxc:openUrlInDialog/' . rawurlencode(common::getSysUrl() . helper::createLink('story', 'review', "storyID=$story->id"));
$editLink = 'xxc:openUrlInDialog/' . rawurlencode(common::getSysUrl() . helper::createLink('story', 'edit', "storyID=$story->id"));
$closeLink = 'xxc:openUrlInDialog/' . rawurlencode(common::getSysUrl() . helper::createLink('story', 'close', "storyID=$story->id"));
$activateLink = 'xxc:openUrlInDialog/' . rawurlencode(common::getSysUrl() . helper::createLink('story', 'activate', "storyID=$story->id"));
?>
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<?php if(!isonlybody()):?>
@@ -388,6 +396,19 @@ js::set('createStory', $lang->story->create);
js::set('productID', $story->product);
js::set('branch', $story->branch);
js::set('moduleID', $story->module);
/* xuanxuan. */
js::set('storyID', $story->id);
js::set('changeLink', $changeLink);
js::set('reviewLink', $reviewLink);
js::set('editLink', $editLink);
js::set('closeLink', $closeLink);
js::set('activateLink', $activateLink);
js::set('edit', $lang->story->edit);
js::set('change', $lang->story->change);
js::set('review', $lang->story->review);
js::set('close', $lang->story->close);
js::set('activate', $lang->story->activate);
js::set('status', $story->status);
?>
<?php include '../../common/view/syntaxhighlighter.html.php';?>
<?php include '../../common/view/footer.html.php';?>
module/story/view/x.create.html.php
-168
View File
@@ -1,168 +0,0 @@
<?php
/**
* The create view of story module of ZenTaoPMS.
*
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package story
* @version $Id: create.html.php 4902 2013-06-26 05:25:58Z wyd621@gmail.com $
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<style>
body{padding-bottom: 0px}
</style>
<div id="mainContent" class="main-content fade">
<form class="load-indicator main-form form-ajax" method='post' enctype='multipart/form-data' id='dataform'>
<table class="table table-form">
<tbody>
<tr>
<th class='w-70px'><?php echo $lang->story->product;?></th>
<td colspan="2">
<?php if($product->type != 'normal'):?>
<div class='input-group'>
<?php endif;?>
<?php echo html::select('product', $products, $productID, "onchange='loadProduct(this.value);' class='form-control chosen control-product'");?>
<?php if($product->type != 'normal'):?>
<span class='input-group-addon fix-border fix-padding'></span>
<?php echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control chosen control-branch'");?>
</div>
<?php endif;?>
</td>
<td colspan="2">
<div class='input-group' id='moduleIdBox'>
<div class="input-group-addon"><?php echo $lang->story->module;?></div>
<?php echo html::select('module', $moduleOptionMenu, $moduleID, "class='form-control chosen'"); ?>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->story->plan;?></th>
<td colspan="2">
<div class='input-group' id='planIdBox'>
<?php echo html::select('plan', $plans, $planID, "class='form-control chosen'"); ?>
</div>
</td>
<td colspan="2">
<div class="input-group">
<div class="input-group">
<div class="input-group-addon"><?php echo $lang->story->source;?></div>
<?php echo html::select('source', $lang->story->sourceList, $source, "class='form-control chosen'");?>
</div>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->story->reviewedBy;?></th>
<td><?php echo html::select('assignedTo', $users, empty($needReview) ? $product->PO : '', "class='form-control chosen'");?></td>
<?php if(!$this->story->checkForceReview()):?>
<td>
<div class='checkbox-primary'>
<input id='needNotReview' name='needNotReview' value='1' type='checkbox' class='no-margin' <?php echo $needReview;?>/>
<label for='needNotReview'><?php echo $lang->story->needNotReview;?></label>
</div>
</td>
<?php endif;?>
<td colspan='2'>
<div class="input-group">
<span class='input-group-addon'><?php echo $lang->story->sourceNote;?></span>
<?php echo html::input('sourceNote', $sourceNote, "class='form-control' autocomplete='off'");?>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->story->title;?></th>
<td colspan="4">
<div class='table-row'>
<div class='table-col'>
<div class="input-control has-icon-right">
<?php echo html::input('title', $storyTitle, "class='form-control' autocomplete='off' required");?>
<div class="colorpicker">
<button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
<ul class="dropdown-menu clearfix">
<li class="heading"><?php echo $lang->story->colorTag;?><i class="icon icon-close"></i></li>
</ul>
<input type="hidden" class="colorpicker" id="color" name="color" value="" data-icon="color" data-wrapper="input-control-icon-right" data-update-color="#title" data-provide="colorpicker">
</div>
</div>
</div>
<div class='table-col w-150px'>
<div class="input-group">
<span class="input-group-addon fix-border br-0"><?php echo $lang->story->pri;?></span>
<?php
$hasCustomPri = false;
foreach($lang->story->priList as $priKey => $priValue)
{
if(!empty($priKey) and (string)$priKey != (string)$priValue)
{
$hasCustomPri = true;
break;
}
}
$priList = $lang->story->priList;
?>
<?php if($hasCustomPri):?>
<?php echo html::select('pri', (array)$priList, $pri, "class='form-control'");?>
<?php else:?>
<div class="input-group-btn pri-selector" data-type="pri">
<button type="button" class="btn dropdown-toggle br-0" data-toggle="dropdown">
<span class="pri-text"><span class="label-pri label-pri-<?php echo empty($pri) ? '0' : $pri?>" title="<?php echo $pri?>"><?php echo $pri?></span></span> &nbsp;<span class="caret"></span>
</button>
<div class='dropdown-menu pull-right'>
<?php echo html::select('pri', (array)$priList, $pri, "class='form-control' data-provide='labelSelector' data-label-class='label-pri'");?>
</div>
</div>
<?php endif;?>
</div>
</div>
<div class='table-col w-120px'>
<div class="input-group">
<span class="input-group-addon fix-border br-0"><?php echo $lang->story->estimateAB;?></span>
<input type="text" name="estimate" id="estimate" value="<?php echo $estimate;?>" class="form-control" autocomplete="off" placeholder='<?php echo $lang->story->hour;?>' />
</div>
</div>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->story->spec;?></th>
<td colspan="4"><?php echo html::textarea('spec', $spec, "rows='9' class='form-control kindeditor disabled-ie-placeholder' hidefocus='true' placeholder='" . htmlspecialchars($lang->story->specTemplate) . "'");?></td>
</tr>
<tr>
<th><?php echo $lang->story->verify;?></th>
<td colspan="4"><?php echo html::textarea('verify', $verify, "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
</tr>
<tr>
<th><?php echo $lang->story->mailto;?></th>
<td colspan="4">
<div class="input-group">
<?php echo html::select('mailto[]', $users, str_replace(' ' , '', $mailto), "class='form-control chosen' data-placeholder='{$lang->chooseUsersToMail}' multiple");?>
<?php echo $this->fetch('my', 'buildContactLists');?>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->story->keywords;?></th>
<td colspan="4">
<?php echo html::input('keywords', $keywords, 'class="form-control" autocomplete="off"');?>
</td>
</tr>
<tr>
<th><?php echo $lang->story->legendAttatch;?></th>
<td colspan='4'><?php echo $this->fetch('file', 'buildform');?></td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="5" class="text-center form-actions">
<?php echo html::submitButton();?>
</td>
</tr>
</tfoot>
</table>
</form>
</div>
<?php js::set('storyModule', $lang->story->module);?>