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
2018-05-17 09:05:15 +08:00
parent 304653cd65 b5d0e60258
commit 646079892c
73 changed files with 164 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/view/bind.html.php
+1 -2
View File
@@ -34,8 +34,7 @@
<td><?php echo html::password('password', '', "class='form-control'");?></td>
</tr>
<tr>
<th></th>
<td class="text-center">
<td colspan='2' class="text-center">
<?php
echo html::submitButton('', '', 'btn btn-wide btn-primary');
echo html::hidden('sn', $sn) . html::hidden('site', common::getSysURL());
module/admin/view/certifyztemail.html.php
+1 -2
View File
@@ -28,8 +28,7 @@
<td><?php echo html::input('captcha', '', "class='form-control' autocomplete='off'");?></td>
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton();?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
</tr>
</table>
</form>
module/admin/view/certifyztmobile.html.php
+1 -2
View File
@@ -28,8 +28,7 @@
<td><?php echo html::input('captcha', '', "class='form-control' autocomplete='off'");?></td>
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton();?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
</tr>
</table>
</form>
module/admin/view/register.html.php
+3 -4
View File
@@ -83,9 +83,8 @@
</td>
</tr>
<tr>
<th></th>
<td>
<?php echo html::submitButton($lang->admin->register->submit) . html::hidden('sn', $sn) . html::hidden('bindSite', common::getSysURL());?>
<td colspan='2' class='text-center'>
<?php echo html::submitButton($lang->admin->register->submit, '', 'btn btn-wide btn-primary') . html::hidden('sn', $sn) . html::hidden('bindSite', common::getSysURL());?>
</td>
</tr>
</table>
@@ -110,7 +109,7 @@
<td><?php echo html::password('password', '', "class='form-control'");?></td>
</tr>
<tr>
<th></th><td class="text-center"><?php echo html::submitButton() . html::hidden('sn', $sn) . html::hidden('site', common::getSysURL());?></td>
<td colspan='2' class="text-center"><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::hidden('sn', $sn) . html::hidden('site', common::getSysURL());?></td>
</tr>
</table>
</form>
module/admin/view/safe.html.php
+1 -2
View File
@@ -47,8 +47,7 @@
<td colspan='2'><?php echo html::radio('modifyPasswordFirstLogin', $lang->admin->safe->modifyPasswordList, isset($config->safe->modifyPasswordFirstLogin) ? $config->safe->modifyPasswordFirstLogin : 0)?></td>
</tr>
<tr>
<th></th>
<td colspan='2'>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
module/admin/view/ztcompany.html.php
+1 -2
View File
@@ -25,8 +25,7 @@
</tr>
<?php endforeach;?>
<tr>
<th></th>
<td><?php echo html::submitButton();?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
</tr>
</table>
</form>
module/block/view/todoblock.html.php
+4 -6
View File
@@ -36,13 +36,13 @@
<div class="form-group">
<label for="todoBegin" class="col-sm-2"><?php echo $lang->todo->beginAndEnd?></label>
<div class="col-sm-4">
<select name="begin" id="todoBegin" class="form-control">
<select name="begin" id="todoBegin" class="form-control chosen-simple">
<option value=""><?php echo $lang->todo->lblDisableDate;?></option>
</select>
</div>
<label class="col-sm-1 text-center hide-empty-begin" for="todoEnd"> ~ </label>
<div class="col-sm-4 hide-empty-begin">
<select name="end" id="todoEnd" class="form-control"></select>
<select name="end" id="todoEnd" class="form-control chosen-simple"></select>
</div>
</div>
<div class="form-group">
@@ -118,12 +118,12 @@
{
$control.trigger('chosen:updated');
}
});
}).find('[name="begin"]').trigger('chosen:updated');
});
};
}
$('ul.todoes li .todo-check').click(function()
$('.block-todoes').blockTodoes().on('click', '.todo-check', function()
{
var $liTag = $(this).closest('li');
var isFinished = $liTag.hasClass('active');
@@ -135,8 +135,6 @@
if(isFinished) $liTag.removeClass('active');
});
});
$('.block-todoes').blockTodoes();
});
function ajaxCreateTodo(obj)
module/branch/view/manage.html.php
+1 -2
View File
@@ -47,8 +47,7 @@
<td></td>
</tr>
<tr>
<td></td>
<td><?php echo html::submitButton();?> </td><td></td>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?> </td><td></td>
</tr>
</table>
</form>
module/bug/view/activate.html.php
+1 -1
View File
@@ -43,7 +43,7 @@
<td colspan='2' class='text-left'><?php echo $this->fetch('file', 'buildform');?></td>
</tr>
<tr>
<th></th><td colspan='2'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
<td class='text-center' colspan='3'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->bugList, '', '', 'btn btn-wide');?></td>
</tr>
</table>
</form>
module/bug/view/assignto.html.php
+1 -1
View File
@@ -43,7 +43,7 @@ js::set('page', 'assignedto');
<td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
</tr>
<tr>
<th></th><td colspan='2'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer);?></td>
<td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->server->http_referer, '', '', 'btn btn-wide');?></td>
</tr>
</table>
</form>
module/bug/view/close.html.php
+2 -2
View File
@@ -27,11 +27,11 @@
<form method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th><?php echo $lang->comment;?></th>
<th class='w-60px'><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
</tr>
<tr>
<th></th><td><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->bugList);?></td>
</tr>
</table>
</form>
module/bug/view/confirmbug.html.php
+1 -1
View File
@@ -52,7 +52,7 @@ js::set('page', 'confirmbug');
<td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p94'");?></td>
</tr>
<tr>
<th></th><td colspan='2'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer);?></td>
<td class='text-center' colspan='3'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->server->http_referer, '', '', 'btn btn-wide');?></td>
</tr>
</table>
</form>
module/bug/view/edit.html.php
+3 -3
View File
@@ -35,7 +35,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<small><?php echo $lang->arrow . ' ' . $lang->bug->edit;?></small>
</h2>
<div class="pull-right btn-toolbar">
<?php echo html::submitButton($lang->save)?>
<?php echo html::submitButton($lang->save);?>
</div>
</div>
<div class='main-row'>
@@ -70,9 +70,9 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<div class='actions actions-form text-center'>
<?php
echo html::hidden('lastEditedDate', $bug->lastEditedDate);
echo html::submitButton();
echo html::submitButton('', '', 'btn btn-wide btn-primary');
$browseLink = $app->session->bugList != false ? $app->session->bugList : inlink('browse', "productID=$bug->product");
echo html::linkButton($lang->goback, $browseLink);
echo html::linkButton($lang->goback, $browseLink, '', '', "btn btn-wide");
?>
</div>
<hr class='small' />
module/bug/view/resolve.html.php
+1 -1
View File
@@ -82,7 +82,7 @@ js::set('productID' , $bug->product);
<td colspan='3'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
</tr>
<tr>
<th></th><td colspan='2'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
<td class='text-center' colspan='4'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->bugList);?></td>
</tr>
</table>
</form>
module/build/view/linkbug.html.php
+4
View File
@@ -62,7 +62,11 @@
<?php if($unlinkedCount):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<<<<<<< HEAD
<?php echo html::submitButton($lang->build->linkBug, '', 'btn btn-default');?>
=======
<?php echo html::submitButton($lang->build->linkBug, '', 'btn');?>
>>>>>>> d31cb467eea5b5badeb0fe21a7c21ac7e1b3b15e
</div>
<?php endif;?>
<?php echo html::a(inlink('view', "buildID={$build->id}&type=bug"), $lang->goback, '', "class='btn'");?>
module/build/view/linkstory.html.php
+4
View File
@@ -66,7 +66,11 @@
<?php if($unlinkedCount):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<<<<<<< HEAD
<?php echo html::submitButton($lang->build->linkStory, '', 'btn btn-default');?>
=======
<?php echo html::submitButton($lang->build->linkStory, '', 'btn');?>
>>>>>>> d31cb467eea5b5badeb0fe21a7c21ac7e1b3b15e
</div>
<?php endif;?>
<?php echo html::a(inlink('view', "buildID={$build->id}&type=story"), $lang->goback, '', "class='btn'");?>
module/company/view/edit.html.php
+4 -4
View File
@@ -20,10 +20,10 @@
<?php endif;?>
</h2>
</div>
<form method='post' target='hiddenwin'>
<table align='center' class='table table-form'>
<form class='main-form' method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='w-150px'><?php echo $lang->company->name;?></th>
<th><?php echo $lang->company->name;?></th>
<td><?php echo html::input('name', $company->name, "class='form-control' autocomplete='off'");?></td>
</tr>
<tr>
@@ -54,7 +54,7 @@
<th><?php echo $lang->company->guest;?></th>
<td><?php echo html::radio('guest', $lang->company->guestOptions, $company->guest);?></td>
</tr>
<tr><td></td><td><?php echo html::submitButton();?></td></tr>
<tr><td class='text-center' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td></tr>
</table>
</form>
</div>
module/cron/view/create.html.php
+1 -2
View File
@@ -59,8 +59,7 @@
<td><?php echo html::select('type', $lang->cron->typeList, 'system', "class='form-control'")?></td>
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td>
<td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td>
</tr>
</table>
</form>
module/cron/view/edit.html.php
+1 -2
View File
@@ -59,8 +59,7 @@
<td><?php echo html::select('type', $lang->cron->typeList, $cron->type, "class='form-control'")?></td>
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
<td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
</tr>
</table>
</form>
module/custom/view/required.html.php
+1 -2
View File
@@ -54,8 +54,7 @@
</tr>
<?php endforeach;?>
<tr>
<td></td>
<td>
<td colspan='2' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
<?php if(common::hasPriv('custom', 'resetRequired')) echo html::a(inlink('resetRequired', "module=$moduleName"), $lang->custom->restore, 'hiddenwin', "class='btn btn-wide'");?>
</td>
module/custom/view/set.html.php
+3 -6
View File
@@ -71,8 +71,7 @@ EOT;
</tr>
<?php endif;?>
<tr>
<td></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
</tr>
</table>
<?php elseif($module == 'task' and $field == 'hours'):?>
@@ -87,8 +86,7 @@ EOT;
<td><?php echo html::radio('weekend', $lang->custom->weekendList, $weekend);?></td>
</tr>
<tr>
<td></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
</tr>
</table>
<?php elseif($module == 'bug' and $field == 'longlife'):?>
@@ -112,8 +110,7 @@ EOT;
<td><?php echo html::select('closed[]', $blockPairs, $closedBlock, "class='form-control chosen' multiple");?></td>
</tr>
<tr>
<td></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
</tr>
</table>
<?php elseif($module == 'user' and $field == 'deleted'):?>
module/custom/view/working.html.php
+1 -1
View File
@@ -22,7 +22,7 @@
</div>
<table class='table table-form'>
<tr>
<th class='w-150px text-top'><?php echo $lang->custom->working;?></th>
<th class='text-top'><?php echo $lang->custom->working;?></th>
<td>
<?php $checkedKey = isset($config->global->flow) ? $config->global->flow : 'full';?>
<?php foreach($lang->custom->workingList as $key => $value):?>
module/doc/view/create.html.php
+1 -1
View File
@@ -77,7 +77,7 @@
</tr>
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide') . html::hidden('lib', $libID);?>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide') . html::hidden('lib', $libID);?>
</td>
</tr>
</tbody>
module/doc/view/createlib.html.php
+1 -2
View File
@@ -58,8 +58,7 @@
</td>
</tr>
<tr>
<td></td>
<td><?php echo html::submitButton();?></td>
<td class='text-center' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
</tr>
</table>
</form>
module/doc/view/edit.html.php
+5 -5
View File
@@ -72,11 +72,11 @@
</div>
</td>
</tr>
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>
</form>
</div>
module/doc/view/editlib.html.php
+1 -2
View File
@@ -56,8 +56,7 @@
</td>
</tr>
<tr>
<td></td>
<td><?php echo html::submitButton();?></td>
<td class='text-center' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
</tr>
</table>
</form>
module/group/view/copy.html.php
+1 -2
View File
@@ -30,8 +30,7 @@
<td><?php echo html::checkbox('options', $lang->group->copyOptions, '', '', 'inline');?></td>
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
</tr>
</table>
</form>
module/group/view/create.html.php
+1 -2
View File
@@ -26,8 +26,7 @@
<td><?php echo html::textarea('desc', '', "rows=5 class=form-control");?></td>
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
</tr>
</table>
</form>
module/group/view/edit.html.php
+1 -2
View File
@@ -30,8 +30,7 @@
<td><?php echo html::textarea('desc', $group->desc, "rows='5' class='form-control'");?></td>
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
</tr>
</table>
</form>
module/my/view/changepassword.html.php
+1 -2
View File
@@ -39,8 +39,7 @@
<td><?php echo html::password('password2', '', "class='form-control'");?></td>
</tr>
<tr>
<td></td>
<td><?php echo html::submitButton() . html::backButton();?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
</tr>
</table>
<?php if(!empty($this->app->user->modifyPasswordReason)):?>
module/my/view/editprofile.html.php
+1 -1
View File
@@ -103,7 +103,7 @@
</td>
</tr>
</table>
<div class='text-center'><?php echo html::submitButton() . ' &nbsp; ' . html::backButton();?></div>
<div class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' &nbsp; ' . html::backButton('', '', 'btn btn-wide');?></div>
</form>
<?php echo html::hidden('verifyRand', $rand);?>
</div>
module/my/view/managecontacts.html.php
+3 -2
View File
@@ -76,8 +76,9 @@
<tr>
<th></th>
<td colspan="2">
<label class="checkbox-inline">
<input type="checkbox" name="share" value="1" <?php if($mode != 'new' && in_array($list->id, $globalContacts)) echo 'checked';?>/> <?php echo $lang->my->shareContacts;?>
<label class="checkbox-primary">
<input type="checkbox" name="share" value="1" id="shareCheckbox" <?php if($mode != 'new' && in_array($list->id, $globalContacts)) echo 'checked';?>/>
<label for="shareCheckbox"><?php echo $lang->my->shareContacts;?></label>
</label>
</td>
</tr>
module/product/view/close.html.php
+3 -4
View File
@@ -29,10 +29,9 @@
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
</tr>
<tr>
<th></th>
<td>
<?php echo html::submitButton();?>
<?php echo html::linkButton($lang->goback, $this->session->taskList);?>
<td colspan='2'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::linkButton($lang->goback, $this->session->taskList, '', '', 'btn btn-wide');?>
</td>
</tr>
</table>
module/project/view/activate.html.php
+1 -2
View File
@@ -54,8 +54,7 @@
<td colspan='5'><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
</tr>
<tr>
<th></th>
<td colspan='5'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
<td class='text-center' colspan='6'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, '', '', 'btn btn-wide'); ?></td>
</tr>
</table>
</form>
module/project/view/ajaxkanbansetting.html.php
+2 -2
View File
@@ -42,8 +42,8 @@
<tr>
<td colspan='2' class='text-center'>
<?php
echo html::submitButton();
echo html::a(inlink('ajaxResetKanban', "projectID=$projectID"), $lang->project->resetKanban, 'hiddenwin', "class='btn'");
echo html::submitButton('', '', 'btn btn-wide btn-primary');
echo '&nbsp;' . html::a(inlink('ajaxResetKanban', "projectID=$projectID"), $lang->project->resetKanban, 'hiddenwin', "class='btn btn-wide'");
?>
</td>
</tr>
module/project/view/all.html.php
+1 -1
View File
@@ -108,7 +108,7 @@
<div class='table-footer'>
<?php if($canBatchEdit):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->project->batchEdit);?></div>
<div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->project->batchEdit, '', 'btn btn-default');?></div>
<?php endif;?>
<?php if(!$canOrder and common::hasPriv('project', 'updateOrder')) echo html::a(inlink('all', "status=$status&projectID=$projectID&order=order_desc&productID=$productID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), $lang->project->updateOrder, '', "class='btn'");?>
<?php $pager->show('right', 'pagerjs');?>
module/project/view/batchedit.html.php
+1 -1
View File
@@ -84,7 +84,7 @@
<?php endforeach;?>
</tbody>
<tfoot>
<tr><td colspan='<?php echo count($visibleFields) + 6?>' class='text-center'><?php echo html::submitButton();?></td></tr>
<tr><td colspan='<?php echo count($visibleFields) + 6?>' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td></tr>
</tfoot>
</table>
</form>
module/project/view/close.html.php
+1 -2
View File
@@ -30,8 +30,7 @@
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
<td class='text-center' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, '', '', 'btn btn-wide'); ?></td>
</tr>
</tbody>
</table>
module/project/view/create.html.php
+4
View File
@@ -138,10 +138,14 @@
<td colspan='3'><?php echo html::checkbox('whitelist', $groups, $whitelist, '', '', 'inline');?></td>
</tr>
<tr>
<<<<<<< HEAD
<td colspan='4' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide');?></td>
=======
<td colspan='4' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
>>>>>>> d31cb467eea5b5badeb0fe21a7c21ac7e1b3b15e
</tr>
</table>
</form>
module/project/view/edit.html.php
+1 -1
View File
@@ -145,7 +145,7 @@
<th><?php echo $lang->project->whitelist;?></th>
<td colspan='2' id='whitelistBox'><?php echo html::checkbox('whitelist', $groups, $project->whitelist, '', '', 'inline');?></td>
</tr>
<tr><td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td></tr>
<tr><td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide');?></td></tr>
</table>
</form>
</div>
module/project/view/importbug.html.php
+1 -1
View File
@@ -71,7 +71,7 @@ var browseType = '<?php echo $browseType;?>';
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<?php echo html::submitButton($lang->import);?>
<?php echo html::submitButton($lang->import, '', 'btn btn-default');?>
</div>
<?php echo html::backButton();?>
<?php $pager->show('right', 'pagerjs');?>
module/project/view/importtask.html.php
+1 -1
View File
@@ -87,7 +87,7 @@
<?php if($tasks2Imported):?>
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->project->importTask);?></div>
<div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->project->importTask, '', 'btn btn-default');?></div>
</div>
<?php endif;?>
</form>
module/project/view/managemembers.html.php
+1 -1
View File
@@ -120,7 +120,7 @@
<?php endfor;?>
</tbody>
</table>
<div class='table-footer text-center'><?php echo html::submitButton() . ' ' . html::backButton(); ?></div>
<div class='table-footer text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide'); ?></div>
<?php js::set('i', $i);?>
</form>
</div>
module/project/view/manageproducts.html.php
+1 -1
View File
@@ -61,7 +61,7 @@
</div>
<div class="detail text-center">
<?php echo html::hidden("post", 'post');?>
<?php echo html::submitButton();?>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
</div>
</form>
</div>
module/project/view/putoff.html.php
+1 -1
View File
@@ -60,7 +60,7 @@
<td colspan='3'><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
</tr>
<tr>
<th></th><td colspan='3'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
<td colspan='4' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, '', '', 'btn btn-wide'); ?></td>
</tr>
</tbody>
</table>
module/project/view/start.html.php
+1 -2
View File
@@ -30,8 +30,7 @@
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton($lang->project->start) . html::linkButton($lang->goback, $this->session->taskList); ?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton($lang->project->start, '', 'btn btn-wide btn-primary') . ' ' . html::linkButton($lang->goback, $this->session->taskList); ?></td>
</tr>
</tbody>
</table>
module/project/view/suspend.html.php
+1 -2
View File
@@ -29,8 +29,7 @@
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, '', '', 'btn btn-wide'); ?></td>
</tr>
</table>
</form>
module/release/view/linkbug.html.php
+9
View File
@@ -43,7 +43,11 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
<?php foreach($allBugs as $bug):?>
<?php if(strpos(",{$releaseBugs},", ",$bug->id,") !== false) continue;?>
<tr>
<<<<<<< HEAD
<td class='c-id'>
=======
<td class='c-id text-left'>
>>>>>>> d31cb467eea5b5badeb0fe21a7c21ac7e1b3b15e
<?php echo html::checkbox('bugs', array($bug->id => sprintf('%03d', $bug->id)), ($type == 'leftBug' or $bug->status == 'resolved' or $bug->status == 'closed') ? $bug->id : '');?>
</td>
<td><span class='label-pri label-pri-<?php echo $bug->pri;?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
@@ -64,8 +68,13 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
<div class='table-footer'>
<?php if($unlinkedCount):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<<<<<<< HEAD
<div class="table-actions btn-toolbar">
<?php echo html::submitButton($lang->release->linkBug, '', 'btn btn-default');?>
=======
<div class="btn-toolbar">
<?php echo html::submitButton($lang->release->linkBug, '', 'btn');?>
>>>>>>> d31cb467eea5b5badeb0fe21a7c21ac7e1b3b15e
</div>
<?php endif;?>
<?php echo html::a(inlink('view', "releaseID=$release->id&type=$type"), $lang->goback, '', "class='btn'");?>
module/release/view/linkstory.html.php
+5
View File
@@ -64,8 +64,13 @@
<div class='table-footer'>
<?php if($unlinkedCount):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<<<<<<< HEAD
<div class='table-actions btn-toolbar'>
<?php echo html::submitButton($lang->release->linkStory, '', 'btn btn-default');?>
=======
<div class='btn-toolbar'>
<?php echo html::submitButton($lang->release->linkStory, '', 'btn');?>
>>>>>>> d31cb467eea5b5badeb0fe21a7c21ac7e1b3b15e
</div>
<?php endif;?>
<?php echo html::a(inlink('view', "releaseID=$release->id&type=story"), $lang->goback, '', "class='btn'");?>
module/release/view/view.html.php
+3 -3
View File
@@ -125,7 +125,7 @@
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<?php echo html::submitButton($lang->release->batchUnlink);?>
<?php echo html::submitButton($lang->release->batchUnlink, '', 'btn btn-default');?>
</div>
<div class='text'><?php echo sprintf($lang->release->finishStories, $countStories);?></div>
</div>
@@ -196,7 +196,7 @@
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<?php echo html::submitButton($lang->release->batchUnlink);?>
<?php echo html::submitButton($lang->release->batchUnlink, '', 'btn btn-default');?>
</div>
<div class='text'><?php echo sprintf($lang->release->resolvedBugs, $countBugs);?></div>
</div>
@@ -267,7 +267,7 @@
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<?php echo html::submitButton($lang->release->batchUnlink);?>
<?php echo html::submitButton($lang->release->batchUnlink, '', 'btn btn-default');?>
</div>
<div class='text'><?php echo sprintf($lang->release->createdBugs, $countLeftBugs);?></div>
</div>
module/story/view/batchclose.html.php
+1 -1
View File
@@ -54,7 +54,7 @@
</tr>
<?php endforeach;?>
<tr>
<td colspan='5' class='text-center'>
<td colspan='5' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
module/story/view/close.html.php
+3 -4
View File
@@ -41,10 +41,9 @@
<td colspan='2'><?php echo html::textarea('comment', '', "rows='8' class='form-control'");?></td>
</tr>
<tr>
<td></td>
<td colspan='2'>
<?php echo html::submitButton();?>
<?php echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"));?>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), '', '', 'btn btn-wide');?>
</td>
</tr>
</table>
module/story/view/edit.html.php
+1 -1
View File
@@ -45,7 +45,7 @@
</div>
<div id='linkStoriesBOX'><?php echo html::hidden('linkStories', $story->linkStories);?></div>
<div id='childStoriesBOX'><?php echo html::hidden('childStories', $story->childStories);?></div>
<div class='actions actions-form text-center'>
<div class='actions form-actions text-center'>
<?php
echo html::hidden('lastEditedDate', $story->lastEditedDate);
echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');
module/story/view/review.html.php
+3 -4
View File
@@ -69,10 +69,9 @@ var assignedTo = '<?php $story->lastEditedBy ? print($story->lastEditedBy) : pri
<td colspan='2'><?php include './affected.html.php';?></td>
</tr>
<tr>
<td></td>
<td colspan='2'>
<?php echo html::submitButton();?>
<?php echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"));?>
<td colspan='3' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), '', '', 'btn btn-wide');?>
</td>
</tr>
</table>
module/task/view/editestimate.html.php
+1 -1
View File
@@ -38,7 +38,7 @@
<td colspan='2'><?php echo html::textarea('work', $estimate->work, "class=form-control");?></td>
</tr>
<tr>
<td colspan='3' class='text-center'><?php echo html::submitButton() . html::backButton();?></td>
<td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
</tr>
</table>
</form>
module/task/view/finish.html.php
+3 -4
View File
@@ -69,10 +69,9 @@
<td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
</tr>
<tr>
<th></th>
<td colspan='2'>
<?php echo html::submitButton($lang->task->finish);?>
<?php echo html::linkButton($lang->goback, $this->session->taskList);?>
<td colspan='3' class='text-center'>
<?php echo html::submitButton($lang->task->finish, '', 'btn btn-wide btn-primary');?>
<?php echo html::linkButton($lang->goback, $this->session->taskList, '', '', 'btn btn-wide');?>
</td>
</tr>
</table>
module/task/view/pause.html.php
+3 -4
View File
@@ -31,10 +31,9 @@
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
</tr>
<tr>
<th></th>
<td>
<?php echo html::submitButton();?>
<?php echo html::linkButton($lang->goback, $this->session->taskList);?>
<td colspan='2'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::linkButton($lang->goback, $this->session->taskList, '', '', 'btn btn-wide');?>
</td>
</tr>
</table>
module/task/view/recordestimate.html.php
+1 -1
View File
@@ -79,7 +79,7 @@
<?php endfor;?>
<?php endif;?>
<tr>
<td colspan='6' class='text-center'><?php echo html::submitButton() . html::backButton();?></td>
<td colspan='6' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
</tr>
</table>
</form>
module/task/view/start.html.php
+3 -3
View File
@@ -66,9 +66,9 @@
<td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
</tr>
<tr>
<td colspan='2'>
<?php echo html::submitButton($lang->task->start);?>
<?php echo html::linkButton($lang->goback, $this->session->taskList);?>
<td colspan='3' class='text-center'>
<?php echo html::submitButton($lang->task->start, '', 'btn btn-wide btn-primary');?>
<?php echo html::linkButton($lang->goback, $this->session->taskList, '', '', 'btn btn-wide');?>
</td>
</tr>
</table>
module/testcase/view/importfromlib.html.php
+1 -1
View File
@@ -70,7 +70,7 @@
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class='table-actions btn-toolbar'>
<?php echo html::submitButton($lang->testcase->import);?>
<?php echo html::submitButton($lang->testcase->import, '', 'btn btn-default');?>
</div>
<?php echo html::linkButton($lang->goback, $this->session->caseList);?>
<?php $pager->show('right', 'pagerjs');?>
module/testsuite/view/linkcase.html.php
+1 -1
View File
@@ -66,7 +66,7 @@
?>
</td>
<td><?php echo $lang->testcase->typeList[$case->type];?></td>
<td><?php echo $users[$case->openedBy];?></td>
<td><?php echo zget($users, $case->openedBy);?></td>
<td class='case-<?php echo $case->status?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
</tr>
<?php endforeach;?>
module/testtask/view/activate.html.php
+1 -1
View File
@@ -28,7 +28,7 @@
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
</tr>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::linkButton($lang->goback, $this->session->taskList, '', '', 'btn btn-wide');?></td>
</tr>
</table>
</form>
module/testtask/view/batchrun.html.php
+1 -1
View File
@@ -67,7 +67,7 @@
</td>
</tr>
<?php endforeach;?>
<tr><td colspan='6' class='text-center'><?php echo html::submitButton();?></td></tr>
<tr><td colspan='6' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td></tr>
</table>
</form>
</div>
module/testtask/view/block.html.php
+1 -1
View File
@@ -29,7 +29,7 @@
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
</tr>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, '', '', 'btn btn-wide'); ?></td>
</tr>
</table>
</form>
module/testtask/view/close.html.php
+1 -1
View File
@@ -37,7 +37,7 @@
</td>
</tr>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, '', '', 'btn btn-wide');?></td>
</tr>
</table>
</form>
module/testtask/view/linkcase.html.php
+2 -2
View File
@@ -108,8 +108,8 @@
?>
</td>
<td><?php echo $lang->testcase->typeList[$case->type];?></td>
<td><?php echo $users[$case->openedBy];?></td>
<td><?php echo $users[$case->lastRunner];?></td>
<td><?php echo zget($users, $case->openedBy);?></td>
<td><?php echo zget($users, $case->lastRunner);?></td>
<td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
<td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
<td class='case-<?php echo $case->status?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
module/testtask/view/runcase.html.php
+2 -2
View File
@@ -84,8 +84,8 @@
<td colspan='5'>
<?php
if($preCase) echo html::a(inlink('runCase', "runID={$preCase['runID']}&caseID={$preCase['caseID']}&version={$preCase['version']}"), $lang->testtask->pre, '', "id='pre' class='btn'");
echo html::submitButton();
if($nextCase) echo html::a(inlink('runCase', "runID={$nextCase['runID']}&caseID={$nextCase['caseID']}&version={$nextCase['version']}"), $lang->testtask->next, '', "id='next' class='btn'");
echo html::submitButton('', '', 'btn btn-wide btn-primary');
if($nextCase) echo '&nbsp;' . html::a(inlink('runCase', "runID={$nextCase['runID']}&caseID={$nextCase['caseID']}&version={$nextCase['version']}"), $lang->testtask->next, '', "id='next' class='btn btn-wide'");
echo html::hidden('case', $run->case->id);
echo html::hidden('version', $run->case->currentVersion);
?>
module/testtask/view/start.html.php
+2 -2
View File
@@ -31,8 +31,8 @@
</tr>
<tr>
<td colspan="2" class="text-center">
<?php echo html::submitButton();?>
<?php echo html::linkButton($lang->goback, $this->session->taskList);?>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::linkButton($lang->goback, $this->session->taskList, '', '', 'btn btn-wide');?>
</td>
</tr>
</table>
module/todo/view/assignto.html.php
+2 -2
View File
@@ -18,7 +18,7 @@
<h4 class="modal-title"><i class="icon-file-text"></i> <?php echo $lang->todo->assignTo;?></h4>
</div>
<div class="modal-body">
<form class='form-condensed' method='post' target='hiddenwin' id="todoAssignForm">
<form class='load-indicator main-form' method='post' target='hiddenwin' id="todoAssignForm">
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->todo->assignTo;?></th>
@@ -49,7 +49,7 @@
<td><input type='checkbox' id='switchDate' onclick='switchDateFeature(this);' name="lblDisableDate"> <?php echo $lang->todo->lblDisableDate;?></td>
</tr>
<tfoot>
<tr><td colspan='3'><?php echo html::submitButton();?></td></tr>
<tr><td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td></tr>
</tfoot>
</table>
</form>
module/todo/view/create.html.php
+2 -3
View File
@@ -131,9 +131,8 @@
</td>
</tr>
<tr>
<td></td>
<td colspan='2' class='text-center'>
<?php echo html::submitButton() . html::backButton();?>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>
www/js/my.full.js
+27 -30
View File
@@ -1639,44 +1639,41 @@ $(document).ready(function()
// fixStyle();
// Init tree menu
$('.tree').tree({initialState: 'preserve'});
// $(window).resize(saveWindowSize); // When window resized, call it again.
if(needPing) setTimeout('setPing()', 1000 * 60 * 10); // After 10 minutes, begin ping.
initPrioritySelector();
// initPrioritySelector();
// initHotKey();
initHelpLink();
// initHelpLink();
checkTutorial();
revertModuleCookie();
/* Adjust for dropdown position. */
$('li.dropdown-submenu').mouseover(function()
{
$('li.dropdown-submenu > .dropdown-menu').each(function()
{
if($(this).css('display') == 'block')
{
var topPosition = $(this).offset().top;
if(topPosition < 0) $(this).css('bottom', Number($(this).css('bottom').replace('px', '')) + topPosition);
}
})
})
// $('li.dropdown-submenu').mouseover(function()
// {
// $('li.dropdown-submenu > .dropdown-menu').each(function()
// {
// if($(this).css('display') == 'block')
// {
// var topPosition = $(this).offset().top;
// if(topPosition < 0) $(this).css('bottom', Number($(this).css('bottom').replace('px', '')) + topPosition);
// }
// })
// })
$.extend({'closeModal':function(callback, location)
{
$ajaxModal = $('.modal-iframe');
$ajaxModal.on('hidden.zui.modal', function()
{
if(location && (!$ajaxModal.data('cancel-reload')))
{
if(location == 'this') window.location.reload();
else window.location = location;
}
if(callback && $.isFunction(callback)) callback();
});
$ajaxModal.modal('hide');
}});
// $.extend({'closeModal':function(callback, location)
// {
// $ajaxModal = $('.modal-iframe');
// $ajaxModal.on('hidden.zui.modal', function()
// {
// if(location && (!$ajaxModal.data('cancel-reload')))
// {
// if(location == 'this') window.location.reload();
// else window.location = location;
// }
// if(callback && $.isFunction(callback)) callback();
// });
// $ajaxModal.modal('hide');
// }});
});
www/js/zui/min.js
+6 -6
View File
File diff suppressed because one or more lines are too long
www/theme/zui/css/min.css
+1 -1
View File
File diff suppressed because one or more lines are too long