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

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

Browse Source
This commit is contained in:
wwccss
2014-04-30 11:17:28 +08:00
parent e6babde9ce 2c98a3bed8
commit ca7ce5b055
12 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/view/browse.html.php
+1 -1
View File
@@ -31,7 +31,7 @@ var browseType = '<?php echo $browseType;?>';
<a class='side-handle' data-id='treebox'><i class='icon-caret-left'></i></a>
<div class='side-body'>
<div class='panel panel-sm'>
<div class='panel-heading nobr'><?php echo html::icon('folder-close');?> <strong><?php echo $libName;?></strong></div>
<div class='panel-heading nobr'><?php echo html::icon('folder-close-alt');?> <strong><?php echo $libName;?></strong></div>
<div class='panel-body'>
<?php echo $moduleTree;?>
<div class='text-right'>
module/doc/view/edit.html.php
+1 -1
View File
@@ -19,7 +19,7 @@ $(document).ready(function()
setType(type);
});
</script>
<div class='container mw-900px'>
<div class='container'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['doc']);?> <strong><?php echo $doc->id;?></strong></span>
module/product/css/index.css
+1
View File
@@ -1 +1,2 @@
.alert>[class*="icon-"]+.content {padding-left: 20px;}
#featurebar {display: none}
module/product/view/close.html.php
+1 -1
View File
@@ -12,7 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<div class='container mw-800px'>
<div class='container'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['product']);?> <strong><?php echo $product->id;?></strong></span>
module/product/view/create.html.php
+2 -2
View File
@@ -12,7 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<div class='container mw-800px'>
<div class='container'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['product']);?></span>
@@ -23,7 +23,7 @@
<table class='table table-form'>
<tr>
<th class='w-90px'><?php echo $lang->product->name;?></th>
<td class='w-p35-f'><?php echo html::input('name', '', "class='form-control'");?></td><td></td>
<td class='w-p25-f'><?php echo html::input('name', '', "class='form-control'");?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->product->code;?></th>
module/product/view/edit.html.php
+2 -2
View File
@@ -12,7 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<div class='container mw-800px'>
<div class='container'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['product']);?> <strong><?php echo $product->id;?></strong></span>
@@ -24,7 +24,7 @@
<table align='center' class='table table-form'>
<tr>
<th class='w-90px'><?php echo $lang->product->name;?></th>
<td class='w-p35-f'><?php echo html::input('name', $product->name, "class='form-control'");?></td><td></td>
<td class='w-p25-f'><?php echo html::input('name', $product->name, "class='form-control'");?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->product->code;?></th>
module/product/view/index.html.php
+1 -1
View File
@@ -32,7 +32,7 @@
</div>
<?php else:?>
<form method='post' action='<?php echo inLink('batchEdit', "productID=$productID");?>'>
<table class='table table-condensed table-hover table-striped table-borderless'>
<table class='table table-condensed table-hover table-striped'>
<thead>
<tr>
<th class='w-id'> <?php echo $lang->idAB;?></th>
module/product/view/roadmap.html.php
+1 -1
View File
@@ -11,7 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<div class='container mw-900px'>
<div class='container'>
<div id='titlebar'><div class='heading'><i class='icon-code-fork'></i> <?php echo $lang->product->roadmap;?></div></div>
<table class='table-grid w-p100'>
<?php
module/productplan/view/edit.html.php
+2 -2
View File
@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<div class='container mw-900px'>
<div class='container'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['plan']);?></span>
@@ -33,7 +33,7 @@
</tr>
<tr>
<th><?php echo $lang->productplan->begin;?></th>
<td><?php echo html::input('begin', $plan->begin, 'class="form-control date"');?></td>
<td><?php echo html::input('begin', $plan->begin, 'class="form-control form-date"');?></td>
</tr>
<tr>
<th><?php echo $lang->productplan->end;?></th>
module/project/view/activate.html.php
+1 -1
View File
@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php js::import($jsRoot . 'misc/date.js');?>
<div class='container mw-800px'>
<div class='container'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['project']);?> <strong><?php echo $project->id;?></strong></span>
module/task/view/start.html.php
+1 -1
View File
@@ -25,7 +25,7 @@
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->task->realStarted;?></th>
<td class='w-p25-f'><div class='datepicker-wrapper'><?php echo html::input('realStarted', helper::today(), "class='form-control form-date'");?></div></td><td></td>
<td class='w-p25-f'><div class='datepicker-wrapper datepicker-date'><?php echo html::input('realStarted', helper::today(), "class='form-control form-date'");?></div></td><td></td>
</tr>
<tr>
<th><?php echo $lang->task->consumed;?></th>
www/theme/default/style.css
+4 -2
View File
@@ -366,7 +366,9 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
#qrcodePopover.popover.top .arrow {left: inherit; right: 10px}
/* Feature bar. */
#featurebar {margin: -20px -20px 20px; padding: 8px 10px 7px; font-size: 14px; background: #F8FAFE; border-bottom: 1px solid #ddd; line-height: 30px; min-height: 46px; min-height: 30px\0}
#featurebar {margin: -20px -20px 20px; padding: 8px 10px 7px; font-size: 14px; background: #F8FAFE; border-bottom: 1px solid #ddd; line-height: 30px; min-height: 46px; min-height: 30px\0;}
#featurebar:after, #featurebar:before {content: ' '; display: table;}
#featurebar:after {clear:both;}
#featurebar .heading {float: left; padding: 0 5px; color: #666}
#featurebar .heading:after {content: "\e6e1"; font-family: ZenIcon; font-size: 14px; color: #999; display: inline-block; margin-left: 5px;}
#featurebar .heading > i {color: #808080}
@@ -391,7 +393,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
.outer > .alert + #featurebar {border-top: 1px solid #ddd;}
/* sub featurebar */
.sub-featurebar {border-bottom: 1px solid #ddd; padding: 5px 10px}
.sub-featurebar {border-bottom: 1px solid #ddd; padding: 5px 10px; margin: -20px -20px 20px;}
.sub-featurebar > .nav > li {float: left;}
.sub-featurebar > .nav > li > a {padding: 5px 10px}
.sub-featurebar > .nav > li.active > a {color: #333; font-weight: bold;}