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
2014-05-09 06:13:20 +00:00
parent ce89b0b5b0 e083bf99ad
commit 2f53b2a951
11 changed files with 13 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/control.php
+1 -1
View File
@@ -335,7 +335,7 @@ class common extends control
{
if($type == 'list')
{
echo "<button class='disabled btn-icon $extraClass'><i class='$class' title='$title' $misc></i></button>";
echo "<button type='button' class='disabled btn-icon $extraClass'><i class='$class' title='$title' $misc></i></button>";
}
}
}
module/common/view/datepicker.html.php
-32
View File
@@ -8,38 +8,6 @@ if($config->debug)
}
?>
<script language='javascript'>
/**
* Format date to a string
*
* @param string format
* @return string
*/
Date.prototype.format = function(format)
{
var date =
{
"M+": this.getMonth() + 1,
"d+": this.getDate(),
"h+": this.getHours(),
"m+": this.getMinutes(),
"s+": this.getSeconds(),
"q+": Math.floor((this.getMonth() + 3) / 3),
"S+": this.getMilliseconds()
};
if (/(y+)/i.test(format))
{
format = format.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length));
}
for (var k in date)
{
if (new RegExp("(" + k + ")").test(format))
{
format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? date[k] : ("00" + date[k]).substr(("" + date[k]).length));
}
}
return format;
}
$(function()
{
$.fn.fixedDate = function()
module/common/view/header.lite.html.php
+1 -1
View File
@@ -8,7 +8,7 @@ $langTheme = $themeRoot . 'lang/' . $app->getClientLang() . '.css';
$clientTheme = $this->app->getClientTheme();
?>
<!DOCTYPE html>
<html>
<html lang='<?php echo $app->getClientLang();?>'>
<head>
<meta charset='utf-8'>
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
module/doc/view/editlib.html.php
+5 -6
View File
@@ -22,16 +22,15 @@
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['doclib']);?></span>
<strong><small class='text-muted'><i class='icon icon-pencil'></i></small> <?php echo $lang->doc->editLib;?></strong>
<strong><?php echo $lang->doc->editLib;?></strong>
</div>
</div>
<div class='main'>
<form method='post' class='form-condensed'>
<div class='form-group'>
<label for="name"><?php echo $lang->doc->libName;?></label>
<?php echo html::input('name', $libName, "class='form-control'");?>
<form method='post' class='form-condensed' style='margin: 30px 50px'>
<div class='input-group'>
<?php echo html::input('name', $libName, "class='form-control' placeholder='{$lang->doc->libName}'");?>
<span class='input-group-btn'><?php echo html::submitButton();?></span>
</div>
<?php echo html::submitButton();?>
</form>
</div>
<?php endif;?>
module/task/view/editestimate.html.php
-1
View File
@@ -16,7 +16,6 @@
<div class='container mw-600px'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['task']);?> <strong><?php echo $task->id;?></strong></span>
<strong><?php echo $lang->task->editEstimate;?></strong>
<small class='text-muted'><?php echo html::icon($lang->icons['edit']);?></small>
</div>
module/user/css/managecontacts.css
+2
View File
@@ -3,3 +3,5 @@
.panel.with-list .panel-heading {border: 1px solid #ddd; border-bottom: none}
.panel.with-list .list-group {margin: 0}
.list-group-item.active {color: #1A4F85}
.input-group.clearfix .form-control, .input-group.clearfix .input-group-addon {display: block; float: left; max-width: 150px; width: auto}
.input-group.clearfix .input-group-addon {padding: 5px 10px; line-height: 18px}
module/user/view/managecontacts.html.php
+2 -2
View File
@@ -55,10 +55,10 @@
<tr>
<th><?php $mode == 'new' ? print($lang->user->contacts->selectList) : print($lang->user->contacts->listName);?></th>
<td>
<div class='input-group' style='width:300px'>
<?php
if($mode == 'new')
{
echo "<div class='input-group clearfix mw-700px'>";
if($lists)
{
echo "<span class='input-group-addon'>" . $lang->user->contacts->appendToList . '</span>';
@@ -69,6 +69,7 @@
echo $lang->user->contacts->createList;
echo '</span>';
echo html::input('newList', '', "class='form-control'");
echo '</div>';
}
else
{
@@ -76,7 +77,6 @@
echo html::hidden('listID', $list->id);
}
?>
</div>
</td>
</tr>
<tr><td></td><td><?php echo html::submitButton() . html::hidden('mode', $mode);?></td></tr>
www/js/jquery/lib.js
Vendored
-10
View File
File diff suppressed because one or more lines are too long
www/js/zui/min.js
+1 -1
View File
File diff suppressed because one or more lines are too long
www/theme/default/style.css
-3
View File
@@ -570,9 +570,6 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
.loader {display: none}
.modal-loading .loader{position: absolute; display: block; text-align: center; font-size: 56px; color: #fff; top: 35%; width: 100%}
/* about dialog */
.modal .modal-about.modal-dialog {margin-top: 9%;}
/* Tree menu. */
.tree {padding: 0; margin: 0;}
.tree li,.tree ul {margin: 0; padding: 0; display: block; position: relative;}
www/theme/zui/css/min.css
+1 -1
View File
File diff suppressed because one or more lines are too long