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

* ajusted button color of feature bar.

Browse Source 
* ajusted style of 'my/index'.
 * added method 'selectButton' in 'front.class.php'.
This commit is contained in:
Catouse
2014-04-23 13:17:41 +08:00
parent a434ad1a42
commit b399d7d52c
6 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/front/front.class.php
+31 -3
View File
@@ -294,14 +294,14 @@ function selectAll(checker, scope, type)
{
if(type == 'button')
{
$('input').each(function()
$('input:checkbox').each(function()
{
$(this).attr("checked", true)
});
}
else if(type == 'checkbox')
{
$('input').each(function()
$('input:checkbox').each(function()
{
$(this).attr("checked", checker.checked)
});
@@ -351,7 +351,7 @@ function selectReverse(scope)
}
else
{
$('input').each(function()
$('input:checkbox').each(function()
{
$(this).attr("checked", !$(this).attr("checked"))
});
@@ -365,6 +365,34 @@ EOT;
return $string;
}
/**
* Create select buttons include 'selectAll' and 'selectAll'.
*
* @param string $scope the scope of select reverse.
* @return string
*/
static public function selectButton($scope = "")
{
$string = <<<EOT
<script>
function selectAll(scope)
{
if(scope) $('#' + scope + ' input').each(function() { $(this).attr("checked", true);});
else $('input:checkbox').each(function() { $(this).attr("checked", true);});
}
function selectReverse(scope)
{
if(scope) $('#' + scope + ' input').each(function() { $(this).attr("checked", !$(this).attr("checked"));});
else $('input:checkbox').each(function(){ $(this).attr("checked", !$(this).attr("checked"));});
}
</script>
EOT;
global $lang;
$string .= "<a id='allchecker' class='btn btn-select-all' href='javascript:selectAll(\"$scope\")' >{$lang->selectAll}</a>";
$string .= "<a id='reversechecker' class='btn btn-select-reverse' href='javascript:selectReverse(\"$scope\")'>{$lang->selectReverse}</a>";
return $string;
}
/**
* Create tags like "<input type='text' />"
*
module/my/css/index.css
+2 -2
View File
@@ -3,8 +3,8 @@
.panel-block .panel-heading {padding: 6px 10px; margin: 0;}
.panel-block .panel-actions {line-height: 36px; margin-right: -2px;}
.panel > .table > thead > tr > th, .panel > form > .table > thead > tr > th {background: #f1f1f1!important}
.panel-block td, .panel-block th {padding: 6px;}
.panel-block.dynamic td {padding: 6px 6px 5px}
.panel-block td, .panel-block th {padding: 6px 6px 5px;}
.panel-block.dynamic td {padding: 5px 6px 5px; overflow: hidden;}
.panel-block tr > td:first-child, .panel-block tr > th:first-child, .outer .table tr > th:first-child, .outer .table tr > td:first-child {padding-left: 10px;}
.panel-block td .progressbar {display: inline-block; height: 16px; background: #229F24;}
.panel-block .icon {color: #666; display: inline-block; margin-right: 2px;}
module/my/view/blockdynamic.html.php
+3 -3
View File
@@ -3,7 +3,7 @@
<?php echo html::icon($lang->icons['dynamic']);?> <strong><?php echo $lang->my->home->latest;?></strong>
<div class="panel-actions pull-right"><?php common::printLink('company', 'dynamic', '', $lang->more . "&nbsp;<i class='icon-th icon icon-double-angle-right'></i>");?></div>
</div>
<table class='table table-condensed table-hover table-striped table-borderless'>
<table class='table table-condensed table-hover table-striped table-borderless table-fixed'>
<?php
foreach($actions as $action)
{
@@ -15,9 +15,9 @@
if(!$canView) continue;
$user = isset($users[$action->actor]) ? $users[$action->actor] : $action->actor;
if($action->action == 'login' or $action->action == 'logout') $action->objectName = $action->objectLabel = '';
echo "<tr><td class='nobr' width='95%'>";
echo "<tr><td class='nobr' width='100%'>";
printf($lang->my->home->action, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName);
echo "</td><td class='divider'></td></tr>";
echo "</td></tr>";
}
?>
</table>
module/product/view/browse.html.php
+2 -2
View File
@@ -124,14 +124,14 @@
<td colspan='11'>
<div class='table-actions clearfix'>
<?php if(count($stories)):?>
<div class='btn-group'><?php echo html::selectAll() . html::selectReverse();?></div>
<div class='btn-group'><?php echo html::selectButton();?></div>
<?php
$canBatchEdit = common::hasPriv('story', 'batchEdit');
$disabled = $canBatchEdit ? '' : "disabled='disabled'";
$actionLink = $this->createLink('story', 'batchEdit', "productID=$productID&projectID=0");
?>
<div class='btn-group dropup'>
<?php echo html::commonButton("<i class='icon-pencil'></i> " . $lang->edit, "onclick=\"setFormAction('$actionLink')\" $disabled");?>
<?php echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\" $disabled");?>
<button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
<ul class='dropdown-menu'>
<?php
module/search/view/buildform.html.php
+2 -2
View File
@@ -13,9 +13,9 @@
<?php include '../../common/view/alert.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<style>
#bysearchTab {transition: all 0.3s;}
#bysearchTab {transition: all .3s cubic-bezier(.175, .885, .32, 1);}
#bysearchTab.active {background: #fff; padding: 2px 10px 3px; border: 1px solid #ddd; border-bottom: none}
#bysearchTab.active:hover {background: #f1f1f1}
#bysearchTab.active:hover {background: #ddd}
#bysearchTab.active > a:after {font-size: 14px; font-family: ZenIcon; content: ' \e6e2'; color: #808080}
#featurebar .nav {z-index: 999; position: relative;}
#querybox .form-control {padding: 2px; padding: 6px 2px\0;}
www/theme/default/style.css
+9 -8
View File
@@ -16,7 +16,7 @@
.w-auto {width: auto} .w-20px {width:20px} .w-30px {width:30px} .w-35px {width:35px} .w-40px {width:40px} .w-45px {width:45px} .w-50px {width:50px} .w-60px {width:60px} .w-70px {width:70px} .w-80px {width:80px} .w-90px {width:90px} .w-100px {width:100px} .w-110px {width:110px} .w-120px {width:120px} .w-130px {width:130px} .w-140px {width:140px} .w-150px {width:150px} .w-160px {width:160px} .w-180px {width:180px} .w-200px {width:200px} .w-300px {width:300px} .w-400px {width:400px} .w-500px {width:500px} .w-600px {width:600px} .w-700px {width:700px} .w-800px {width:800px} .w-900px {width:900px}
.mw-200px {max-width:200px!important} .mw-300px {max-width:300px!important} .mw-400px {max-width:400px!important} .mw-500px {max-width:500px!important} .mw-600px {max-width:600px!important} .mw-700px {max-width:700px!important} .mw-800px {max-width:800px!important} .mw-900px {max-width:900px!important}
.w-id {width:70px;} .w-pri {width:40px;} .w-severity {width:50px;} .w-hour {width:48px;} .w-date {width:80px;} .w-user {width:65px;} .w-status {width:55px} .w-type {width:80px} .w-resolution {width:60px}
.w-id {width:70px;} .w-pri {width:40px;} .w-severity {width:50px;} .w-hour {width:54px;} .w-date {width:80px;} .w-user {width:65px;} .w-status {width:55px} .w-type {width:80px} .w-resolution {width:60px}
.w-p15-f {width: 15% !important; min-width: 120px} .w-p25-f {width: 25% !important; min-width: 200px} .w-p35-f {width: 35% !important; min-width: 300px} .w-p45-f {width: 45% !important; min-width: 400px}
@@ -79,8 +79,8 @@ hr.small {margin: 10px 0}
.tablesorter thead tr .header a,.tablesorter thead tr .headerSortUp a,.tablesorter thead tr .headerSortDown a{display: inline-block; text-decoration:none}
.tablesorter thead tr .header a {color:#333;}
.tablesorter thead tr .header:after {font-family: ZenIcon; font-weight: normal;content: " \e6bd";font-size: 14px;}
.tablesorter thead tr .headerSortUp:after {font-family: ZenIcon; font-weight: normal;content: " \e6bf";font-size: 14px;color:#2973EA;}
.tablesorter thead tr .headerSortDown:after{font-family: ZenIcon; font-weight: normal;content: " \e6be";font-size: 14px;color:#2973EA;}
.tablesorter thead tr .headerSortUp:after {font-family: ZenIcon; font-weight: normal;content: " \e6b9";font-size: 14px;color:#03C;}
.tablesorter thead tr .headerSortDown:after{font-family: ZenIcon; font-weight: normal;content: " \e6b8";font-size: 14px;color:#03C;}
.table tr.active td, .table-hover>tbody>tr.active:hover>td, .table-hover>tbody>tr.active:hover>th, .table-striped>tbody>tr.active:nth-child(odd).active>td, .table-striped>tbody>tr.active:nth-child(odd)>th {background-color: #FCE6A2}
.table tr>td.active, .table tr>th.active, .table tr.active>td, .table tr.active>th {background-color: #FCE6A2}
@@ -269,7 +269,7 @@ div.form-control[contenteditable='true'] {height: auto; text-align: left; outlin
/* === Layout === */
/* Background */
body {font-size: 12px; color:#141414;padding-bottom: 40px;}
body {font-size: 13px; color:#141414;padding-bottom: 40px;}
/* Header */
#header {padding: 12px 20px 0; background:#003366;}
@@ -362,7 +362,8 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
#featurebar .nav > li > .form-control {margin-left: 6px; padding: 1px 8px; height: 30px; height: 26px\0; margin-right: 10px;}
#featurebar .nav > li > .form-control.form-date {width: 110px}
#featurebar .nav > li.datepicker-wrapper:before {right: 15px; top: 0; top: -2px\0;}
#featurebar .nav > li > a {padding: 0px 4px;}
#featurebar .nav > li > a {padding: 0px 4px; border-radius: 2px}
#featurebar .nav > li > a:hover {background: #ddd; color: #333}
#featurebar .nav > li.active > a, #featurebar .nav > li.active > a:hover, #featurebar .nav > li.active > a:active, #featurebar .nav > li.active > a:focus {font-weight: bold; color: #333}
#featurebar .nav > li.active > .form-control, #featurebar .nav > li.active > .form-control:hover, #featurebar .nav > li.active > .form-control:active, #featurebar .nav > li.active > .form-control:focus {border-color: #009900}
#featurebar .btn-group {margin-right: 5px;}
@@ -395,8 +396,8 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
#titlebar .actions > .text {display: inline-block; margin-left: 8px; line-height: 30px}
/* Button in titlebar and featurebar */
#featurebar > .actions .btn:not(.btn-primary), #titlebar > .actions .btn:not(.btn-primary), #featurebar > .pull-right .btn:not(.btn-primary), #titlebar > .pull-right .btn:not(.btn-primary) {border-color: transparent; background: none; box-shadow: none; padding: 4px 8px; border-radius: 2px; text-shadow: none;}
#featurebar > .actions .btn:not(.btn-primary):hover, #titlebar > .actions .btn:not(.btn-primary):hover ,#featurebar > .pull-right .btn:not(.btn-primary):hover, #titlebar > .pull-right .btn:not(.btn-primary):hover{background: #ddd; border-color: #ddd;}
#featurebar > .actions .btn:not(.btn-primary), #titlebar > .actions .btn:not(.btn-primary), #featurebar > .pull-right .btn:not(.btn-primary), #titlebar > .pull-right .btn:not(.btn-primary) {border-color: transparent; background: none; box-shadow: none; padding: 4px 8px; border-radius: 2px; text-shadow: none; color: #036}
#featurebar > .actions .btn:not(.btn-primary):hover, #titlebar > .actions .btn:not(.btn-primary):hover ,#featurebar > .pull-right .btn:not(.btn-primary):hover, #titlebar > .pull-right .btn:not(.btn-primary):hover{background: #ddd; border-color: #ddd; color: #333}
/* Following style to fixed ie8 */
#featurebar > .actions .btn, #titlebar > .actions .btn, #featurebar > .pull-right .btn, #titlebar > .pull-right .btn {border-color: transparent\0; background: none\0; box-shadow: none\0; padding: 4px 8px\0;}
@@ -421,7 +422,7 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
.outer .table.table-data.table-borderless tbody > tr:last-child td, .outer .table.table-form tbody > tr:last-child td {border: none}
.outer .table tfoot td {border-top: 1px solid #ddd}
.outer .table tfoot .form-control {padding: 1px 8px; height: 30px}
.outer .table tfoot .btn {padding: 4px 12px;}
.outer .table tfoot .btn {padding-top: 4px; padding-bottom: 4px;}
.outer .table tfoot .btn > i {display: inline-block; margin-right: 1px; opacity: 0.8}
.outer .table tfoot .datepicker-wrapper:before {top: 5px}
.outer .table tfoot .form-control.form-date {width: 110px}