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:
wyd621
2013-10-23 05:10:57 +00:00
parent 33899c1bf5 3ab9fe6c03
commit f338b9a7e8
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/company/css/browse.css
-1
View File
@@ -1,2 +1 @@
.icon-green-user-unlock {padding:2px 8px; background:url(theme/default/images/main/zt-icons.png) -20px -460px;}
form {position:relative}
module/company/view/browse.html.php
+1 -1
View File
@@ -71,7 +71,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
<td><?php echo $user->join;?></td>
<td><?php if($user->last) echo date('Y-m-d', $user->last);?></td>
<td><?php echo $user->visits;?></td>
<td class='a-left'>
<td class='a-left w-80px'>
<?php
common::printIcon('user', 'edit', "userID=$user->id&from=company", '', 'list');
if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete'))
module/productplan/view/browse.html.php
+1 -1
View File
@@ -33,7 +33,7 @@
<tr class='a-center'>
<td><?php echo $plan->id;?></td>
<td class='a-left' title="<?php echo $plan->title?>"><?php echo html::a(inlink('view', "id=$plan->id"), $plan->title);?></td>
<td class='a-left content' title="<?php echo $plan->desc?>"><?php echo $plan->desc;?></td>
<td class='a-left content' title='<?php echo $plan->desc;?>'><?php echo $plan->desc;?></td>
<td><?php echo $plan->begin;?></td>
<td><?php echo $plan->end;?></td>
<td class='a-center'>
module/search/model.php
+3 -3
View File
@@ -53,7 +53,7 @@ class searchModel extends model
for($i = 1; $i <= $groupItems * 2; $i ++)
{
/* The and or between two groups. */
if($i == 1) $where .= '( 1 ';
if($i == 1) $where .= '(( 1 ';
if($i == $groupItems + 1) $where .= " ) $groupAndOr ( 1 ";
/* Set var names. */
@@ -63,7 +63,7 @@ class searchModel extends model
$valueName = "value$i";
/* Skip empty values. */
if($this->post->$valueName == false) continue;
if($this->post->$valueName === false or $this->post->$valueName === '') continue;
if($this->post->$valueName == 'null') $this->post->$valueName = ''; // Null is special, stands to empty.
if($this->post->$valueName == 'ZERO') $this->post->$valueName = 0; // ZERO is special, stands to 0.
@@ -111,7 +111,7 @@ class searchModel extends model
}
}
$where .=" )";
$where .=" ))";
/* Save to session. */
$querySessionName = $this->post->module . 'Query';
www/theme/default/style.css
+1
View File
@@ -114,6 +114,7 @@ i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[c
.icon-green-build-create:before,.icon-gray-build-create:before{content: "\f067";}
.icon-green-effort-createForObject:before{content: "\f017"}
.icon-arrow:before{content: "\f105";}
.icon-green-user-unlock:before,.icon-green-user-unlock:before {content: "\f09C";}
i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disabled:hover,i[class*=" icon-"].disabled:hover,i[class^="icon-"].disabled:before,i[class*=" icon-"].disabled:before{color: #ccc;}
www/theme/default/style.ie7.css
+3 -1
View File
@@ -166,4 +166,6 @@
.log-desc{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf063;');}
.log-asc{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf062;');}
.diff-all{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0b2;');}
.diff-sort{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf036;');}
.diff-sort{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf036;');}
.icon-green-user-unlock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf09C;');}
.icon-gray-user-unlock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf09C;');}