diff --git a/lib/front/front.class.php b/lib/front/front.class.php index eac6139290..613aa5af9d 100644 --- a/lib/front/front.class.php +++ b/lib/front/front.class.php @@ -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 = << +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"));}); +} + +EOT; + global $lang; + $string .= "{$lang->selectAll}"; + $string .= "{$lang->selectReverse}"; + return $string; + } + /** * Create tags like "" * diff --git a/module/my/css/index.css b/module/my/css/index.css index 3bdd0aa723..20317bf419 100644 --- a/module/my/css/index.css +++ b/module/my/css/index.css @@ -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;} diff --git a/module/my/view/blockdynamic.html.php b/module/my/view/blockdynamic.html.php index d7315c54b4..be93b5f767 100644 --- a/module/my/view/blockdynamic.html.php +++ b/module/my/view/blockdynamic.html.php @@ -3,7 +3,7 @@ icons['dynamic']);?> my->home->latest;?>
more . " ");?>
- +
actor]) ? $users[$action->actor] : $action->actor; if($action->action == 'login' or $action->action == 'logout') $action->objectName = $action->objectLabel = ''; - echo ""; + echo ""; } ?>
"; + echo "
"; printf($lang->my->home->action, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName); - echo "
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 3e8ed47f6f..b00ad719f5 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -124,14 +124,14 @@
-
+
createLink('story', 'batchEdit', "productID=$productID&projectID=0"); ?>
- " . $lang->edit, "onclick=\"setFormAction('$actionLink')\" $disabled");?> + edit, "onclick=\"setFormAction('$actionLink')\" $disabled");?>