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

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

Browse Source
This commit is contained in:
Catouse
2018-05-17 14:03:59 +08:00
parent 27a4f7d55a e9cf09ccd8
commit e4a06c3fb2
22 changed files with 35 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/base/front/front.class.php
+5 -5
View File
@@ -392,7 +392,7 @@ class baseHTML
{
$html = "<div class='input-append date date-picker' {$options}>";
$html .= "<input type='text' name='{$name}' id='$name' value='$value' {$attrib} />\n";
$html .= "<span class='add-on'><button class='btn btn-default' type='button'><i class='icon-calendar'></i></button></span></div>";
$html .= "<span class='add-on'><button class='btn' type='button'><i class='icon-calendar'></i></button></span></div>";
return $html;
}
@@ -412,7 +412,7 @@ class baseHTML
{
$html = "<div class='input-append date time-picker' {$options}>";
$html .= "<input type='text' name='{$name}' id='$name' value='$value' {$attrib} />\n";
$html .= "<span class='add-on'><button class='btn btn-default' type='button'><i class='icon-calendar'></i></button></span></div>";
$html .= "<span class='add-on'><button class='btn' type='button'><i class='icon-calendar'></i></button></span></div>";
return $html;
}
@@ -507,7 +507,7 @@ class baseHTML
* @access public
* @return string the common button tag.
*/
public static function commonButton($label = '', $class = 'btn btn-default', $misc = '', $icon = '')
public static function commonButton($label = '', $class = 'btn', $misc = '', $icon = '')
{
if($icon) $label = "<i class='icon-" . $icon . "'></i> " . $label;
return " <button type='button' class='$class' $misc>$label</button>";
@@ -526,7 +526,7 @@ class baseHTML
* @access public
* @return string
*/
public static function linkButton($label = '', $link = '', $class='btn btn-default', $misc = '', $target = 'self')
public static function linkButton($label = '', $link = '', $class='btn', $misc = '', $target = 'self')
{
global $config, $lang;
@@ -650,7 +650,7 @@ function selectReverse(scope)
</script>
EOT;
global $lang;
$string .= "<input type='button' name='reversechecker' id='reversechecker' value='{$lang->selectReverse}' class='btn btn-default' onclick='selectReverse(\"$scope\")'/>";
$string .= "<input type='button' name='reversechecker' id='reversechecker' value='{$lang->selectReverse}' class='btn' onclick='selectReverse(\"$scope\")'/>";
return $string;
}
lib/front/front.class.php
+2 -2
View File
@@ -92,12 +92,12 @@ class html extends baseHTML
return parent::submitButton($label, $class, $misc);
}
public static function commonButton($label = '', $misc = '', $class = 'btn btn-default', $icon = '')
public static function commonButton($label = '', $misc = '', $class = 'btn', $icon = '')
{
return parent::commonButton($label, $class, $misc, $icon);
}
public static function linkButton($label = '', $link = '', $target = 'self', $misc = '', $class = 'btn btn-default')
public static function linkButton($label = '', $link = '', $target = 'self', $misc = '', $class = 'btn')
{
return parent::linkButton($label, $link, $class, $misc, $target);
}
module/block/view/dashboard.html.php
+1 -1
View File
@@ -105,7 +105,7 @@ config.confirmRemoveBlock = '<?php echo $lang->block->confirmRemoveBlock; ?>';
var module = '<?php echo $module?>';
var useGuest = <?php echo $useGuest ? 'true' : 'false';?>;
<?php if(!$useGuest):?>
$('#subHeader #pageActions .btn-toolbar:last').append(<?php echo json_encode(html::a($this->createLink("block", "admin", "id=0&module=$module"), "<i class='icon icon-plus text-muted'></i> {$lang->block->createBlock}", '', "class='btn btn-default' data-toggle='modal' data-type='ajax' data-width='700' data-title='{$lang->block->createBlock}'"))?>);
$('#subHeader #pageActions .btn-toolbar:last').append(<?php echo json_encode(html::a($this->createLink("block", "admin", "id=0&module=$module"), "<i class='icon icon-plus text-muted'></i> {$lang->block->createBlock}", '', "class='btn' data-toggle='modal' data-type='ajax' data-width='700' data-title='{$lang->block->createBlock}'"))?>);
<?php endif;?>
</script>
<?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
module/block/view/todoblock.html.php
+1 -1
View File
@@ -82,7 +82,7 @@
<div class="col-sm-10 form-actions no-margin">
<?php echo html::hidden('type', 'custom');?>
<?php echo html::commonButton($lang->save, "onclick='ajaxCreateTodo(this)'", "btn btn-primary btn-wide");?>
<button type="button" class="btn btn-default btn-wide todo-form-trigger" data-trigger="false"><?php echo $lang->goback;?></button>
<button type="button" class="btn btn-wide todo-form-trigger" data-trigger="false"><?php echo $lang->goback;?></button>
</div>
</div>
</form>
module/bug/view/create.html.php
+2 -2
View File
@@ -77,7 +77,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
<div class='input-group' id='buildBox'>
<?php echo html::select('openedBuild[]', $builds, $buildID, "size=4 multiple=multiple class='chosen form-control'");?>
<span class='input-group-addon fix-border' id='buildBoxActions'></span>
<div class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn btn-default' data-toggle='tooltip' onclick='loadAllBuilds()'")?></div>
<div class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn' data-toggle='tooltip' onclick='loadAllBuilds()'")?></div>
</div>
</td>
</tr>
@@ -86,7 +86,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
<td>
<div class='input-group'>
<div class='input-group' id='assignedToBox'><?php echo html::select('assignedTo', $projectMembers, $assignedTo, "class='form-control chosen'");?></div>
<span class='input-group-btn'><?php echo html::commonButton($lang->bug->allUsers, "class='btn btn-default' onclick='loadAllUsers()' data-toggle='tooltip'");?></span>
<span class='input-group-btn'><?php echo html::commonButton($lang->bug->allUsers, "class='btn' onclick='loadAllUsers()' data-toggle='tooltip'");?></span>
</div>
</td>
</tr>
module/bug/view/edit.html.php
+2 -2
View File
@@ -218,7 +218,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<td>
<div id='openedBuildBox' class='input-group'>
<?php echo html::select('openedBuild[]', $openedBuilds, $bug->openedBuild, 'size=4 multiple=multiple class="chosen form-control"');?>
<span class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn btn-default' onclick='loadAllBuilds(this)'")?></span>
<span class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn' onclick='loadAllBuilds(this)'")?></span>
</div>
</td>
</tr>
@@ -235,7 +235,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<td>
<div id='resolvedBuildBox' class='input-group'>
<?php echo html::select('resolvedBuild', $resolvedBuilds, $bug->resolvedBuild, "class='form-control chosen'");?>
<span class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn btn-default' onclick='loadAllBuilds(this)'")?></span>
<span class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn' onclick='loadAllBuilds(this)'")?></span>
</div>
</td>
</tr>
module/build/view/linkbug.html.php
-4
View File
@@ -62,11 +62,7 @@
<?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,11 +66,7 @@
<?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/message/view/setting.html.php
+1 -1
View File
@@ -70,7 +70,7 @@
</tbody>
<tfoot>
<tr>
<td colspan='<?php echo count($lang->message->typeList) + 1?>' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?> <?php echo html::backButton('', '', 'btn btn-default btn-wide');?></td>
<td colspan='<?php echo count($lang->message->typeList) + 1?>' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?> <?php echo html::backButton('', '', 'btn btn-wide');?></td>
</tr>
</tfoot>
</table>
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, '', 'btn btn-default');?></div>
<div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->project->batchEdit, '', 'btn');?></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/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, '', 'btn btn-default');?>
<?php echo html::submitButton($lang->import, '', 'btn');?>
</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, '', 'btn btn-default');?></div>
<div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->project->importTask, '', 'btn');?></div>
</div>
<?php endif;?>
</form>
module/project/view/taskheader.html.php
+2 -2
View File
@@ -91,7 +91,7 @@
?>
<div class='btn-group'>
<button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown' id='exportAction'>
<button type='button' class='btn dropdown-toggle' data-toggle='dropdown' id='exportAction'>
<i class='icon-download-alt'></i> <?php echo $lang->export ?>
<span class='caret'></span>
</button>
@@ -105,7 +105,7 @@
</div>
<div class='btn-group'>
<button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown' id='importAction'>
<button type='button' class='btn dropdown-toggle' data-toggle='dropdown' id='importAction'>
<i class='icon-upload-alt'></i> <?php echo $lang->import ?>
<span class='caret'></span>
</button>
module/release/view/linkbug.html.php
-9
View File
@@ -43,11 +43,7 @@ $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>
@@ -68,13 +64,8 @@ $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,13 +64,8 @@
<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, '', 'btn btn-default');?>
<?php echo html::submitButton($lang->release->batchUnlink, '', 'btn');?>
</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, '', 'btn btn-default');?>
<?php echo html::submitButton($lang->release->batchUnlink, '', 'btn');?>
</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, '', 'btn btn-default');?>
<?php echo html::submitButton($lang->release->batchUnlink, '', 'btn');?>
</div>
<div class='text'><?php echo sprintf($lang->release->createdBugs, $countLeftBugs);?></div>
</div>
module/story/view/view.html.php
+1 -1
View File
@@ -339,7 +339,7 @@
{
$this->app->loadLang('testcase');
echo "<div class='btn-group dropup'>";
echo "<button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown'><i class='icon icon-sitemap'></i> " . $lang->testcase->common . " <span class='caret'></span></button>";
echo "<button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><i class='icon icon-sitemap'></i> " . $lang->testcase->common . " <span class='caret'></span></button>";
echo "<ul class='dropdown-menu' id='createCaseActionMenu'>";
$misc = "data-toggle='modal' data-type='iframe' data-width='95%'";
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, '', 'btn btn-default');?>
<?php echo html::submitButton($lang->testcase->import, '', 'btn');?>
</div>
<?php echo html::linkButton($lang->goback, $this->session->caseList);?>
<?php $pager->show('right', 'pagerjs');?>
module/testtask/view/runcase.html.php
+1 -1
View File
@@ -107,7 +107,7 @@
<td><?php echo $this->fetch('file', 'buildform', array('fileCount' => 1, 'percent' => 0.9, 'filesName' => "files{$step->id}", 'labelsName' => "labels{$step->id}"));?></td>
</tr>
<tr>
<td class='text-center'><button type="button" class="btn btn-default" onclick='loadFilesName()' data-dismiss="modal" aria-hidden="true"><?php echo $lang->save;?></button></td>
<td class='text-center'><button type="button" class="btn" onclick='loadFilesName()' data-dismiss="modal" aria-hidden="true"><?php echo $lang->save;?></button></td>
<tr>
</table>
</div>
module/webhook/view/create.html.php
+4 -1
View File
@@ -65,7 +65,10 @@
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?> <?php echo html::backButton('', '', 'btn btn-default btn-wide');?></td>
<td>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>
</form>
module/webhook/view/edit.html.php
+4 -1
View File
@@ -68,7 +68,10 @@
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?> <?php echo html::backButton('', '', 'btn btn-default btn-wide')?></td>
<td>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide')?>
</td>
</tr>
</table>
</form>
www/js/zui/min.js
+2 -2
View File
File diff suppressed because one or more lines are too long