diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 5eef3aa05f..aeb47a02c3 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -107,6 +107,7 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows
+
moduleName . ucfirst($this->methodName); diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php index e796d95dd1..e417a806c7 100644 --- a/module/company/view/browse.html.php +++ b/module/company/view/browse.html.php @@ -32,80 +32,81 @@ js::set('confirmDelete', $lang->user->confirmDelete);
-' method='post' id='userListForm'> - - - - recTotal}&recPerPage={$pager->recPerPage}";?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + +
idAB);?>user->realname);?>user->account);?>user->role);?>user->email);?>user->gender);?>user->phone);?>user->qq);?>user->join);?>user->last);?>user->visits);?>actions;?>
- account'> "; - printf('%03d', $user->id); - ?> - account", $user->realname)) echo $user->realname;?>account;?>user->roleList[$user->role];?>email);?>user->genderList[$user->gender])) echo $lang->user->genderList[$user->gender];?>phone;?>qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?>join;?>last) echo date('Y-m-d', $user->last);?>visits;?> - id&from=company", '', 'list'); - if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete')) - { - echo html::a($this->createLink('user', 'delete', "userID=$user->id"), '', '', "title='{$lang->user->delete}' class='btn-icon iframe'"); - } - if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60) - { - common::printIcon('user', 'unlock', "userID=$user->account", '', 'list', '', "hiddenwin"); - } - if($user->ranzhi) common::printIcon('user', 'unbind', "userID=$user->account", '', 'list', 'unlink', "hiddenwin"); - ?> -
-
- edit, 'onclick=batchEdit()', 'btn btn-default'); + + ' method='post' id='userListForm'> + + + + recTotal}&recPerPage={$pager->recPerPage}";?> + + + + + + + + + + + + + + + + + - - show();?> - - - -
idAB);?>user->realname);?>user->account);?>user->role);?>user->email);?>user->gender);?>user->phone);?>user->qq);?>user->join);?>user->last);?>user->visits);?>actions;?>
- + +
+ account'> "; + printf('%03d', $user->id); + ?> + account", $user->realname)) echo $user->realname;?>account;?>user->roleList[$user->role];?>email);?>user->genderList[$user->gender])) echo $lang->user->genderList[$user->gender];?>phone;?>qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?>join;?>last) echo date('Y-m-d', $user->last);?>visits;?> + id&from=company", '', 'list'); + if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete')) + { + echo html::a($this->createLink('user', 'delete', "userID=$user->id"), '', '', "title='{$lang->user->delete}' class='btn-icon iframe'"); + } + if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60) + { + common::printIcon('user', 'unlock', "userID=$user->account", '', 'list', '', "hiddenwin"); + } + if($user->ranzhi) common::printIcon('user', 'unbind', "userID=$user->account", '', 'list', 'unlink', "hiddenwin"); + ?> +
+
+ edit, 'onclick=batchEdit()', 'btn btn-default'); + ?> +
+ show();?> +
+
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php index b33cf8e5de..bf5c339307 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -66,6 +66,7 @@ var browseType = '';
+ diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index f8e1e2acbb..7178591b19 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -99,6 +99,7 @@
+
moduleName . ucfirst($this->methodName); diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index e7014441ed..6af33e33f7 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -50,6 +50,7 @@
+
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php index 503ce5089c..d164062b95 100644 --- a/module/project/view/task.html.php +++ b/module/project/view/task.html.php @@ -38,6 +38,7 @@ js::set('browseType', $browseType);
+ moduleName . ucfirst($this->methodName); diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 30514bc2a3..3dda295fca 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -36,6 +36,7 @@ js::set('batchDelete', $lang->testcase->confirmBatchDelete);
+ moduleName . ucfirst($this->methodName); diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index e3590de80a..16ca66abdf 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -31,6 +31,7 @@ var moduleID = '';
+ id&browseType=$browseType¶m=$param&orderBy=%s&recToal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; diff --git a/www/js/my.full.js b/www/js/my.full.js index 76f724ccf9..45b9bed9bb 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -385,35 +385,6 @@ function showTreeBox(treeType) $('.side-handle .icon-caret-right').removeClass('icon-caret-right').addClass('icon-caret-left'); } -/** - * Toggle tree menu. - - * @access public - * @return void - */ -function toggleTreeBox() -{ - var treeType = $('.side-handle').data('id'); - if(typeof treeType == 'undefined' || treeType == null) return; - if($.cookie(treeType) == 'hide') hideTreeBox(treeType); - - $('.side-handle').toggle - ( - function() - { - if($.cookie(treeType) == 'hide') return showTreeBox(treeType); - hideTreeBox(treeType); - }, - function() - { - if($.cookie(treeType) == 'show') return hideTreeBox(treeType); - showTreeBox(treeType); - } - ); - - setTimeout(function(){$('.outer.with-side').addClass('with-transition')}, 1000); -} - /** * set tree menu. @@ -422,8 +393,32 @@ function toggleTreeBox() */ function setTreeBox() { + var $handle = $('.side-handle'); + if($handle.data('setted')) return; + + var treeType = $handle.data('id'); + if(treeType) + { + if($.cookie(treeType) == 'hide') hideTreeBox(treeType); + + $handle.toggle + ( + function() + { + if($.cookie(treeType) == 'hide') return showTreeBox(treeType); + hideTreeBox(treeType); + }, + function() + { + if($.cookie(treeType) == 'show') return hideTreeBox(treeType); + showTreeBox(treeType); + } + ).data('setted', true); + } + if($('.outer > .side').length) $('.outer').addClass('with-side'); - toggleTreeBox(); + setTimeout(function(){$('.outer.with-side').addClass('with-transition')}, 1000); + adjustOuterSize(); } /** @@ -478,6 +473,21 @@ function saveWindowSize() $.cookie('windowHeight', height) } +/** + * Adjust Outer box's width and height. + * + * @access public + * @return void + */ +function adjustOuterSize() +{ + var side = $('#wrap .outer > .side'); + var sideH = side.length ? (side.outerHeight() + $('#featurebar').outerHeight() + 20) : 0; + var height = Math.max(sideH, $(window).height() - $('#header').outerHeight() - ($('#footer').outerHeight() || 0) - 20); + if(navigator.userAgent.indexOf("MSIE 8.0") >= 0) height -= 40; + $('#wrap .outer').css('min-height', height); +} + /** * Set Outer box's width and height. * @@ -486,20 +496,10 @@ function saveWindowSize() */ function setOuterBox() { -// if($('.sub-featurebar').length) $('#featurebar').addClass('with-sub'); - var side = $('#wrap .outer > .side'); - var resetOuterHeight = function() - { - var sideH = side.length ? (side.outerHeight() + $('#featurebar').outerHeight() + 20) : 0; - var height = Math.max(sideH, $(window).height() - $('#header').outerHeight() - ($('#footer').outerHeight() || 0) - 20); - if(navigator.userAgent.indexOf("MSIE 8.0") >= 0) height -= 40; - $('#wrap .outer').css('min-height', height); - } - - side.resize(resetOuterHeight); - $(window).resize(resetOuterHeight); - resetOuterHeight(); + side.resize(adjustOuterSize); + $(window).resize(adjustOuterSize); + adjustOuterSize(); } /** diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 51b5ac06d8..5698c152f9 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -353,7 +353,7 @@ div.form-control[contenteditable='true'] {height: auto; text-align: left; outlin .panel .table-bordered tfoot > tr:last-child > td {border-bottom: 0} /* small panel */ -.panel-sm .panel-heading {padding: 7px 10px} +.panel-sm .panel-heading {padding: 6px 10px} /* list group */ .list-group-item {padding: 8px 15px} @@ -628,6 +628,9 @@ body {color:#141414; padding-bottom: 40px;} .outer .side-handle:hover {background: #c5c5c5; color: #04f} .outer.with-transition .side, .outer .side-handle.with-transition {transition: all 0.3s;} +.outer .side, .outer .side + .main {visibility: hidden;} +.outer.with-side .side, .outer.with-side .side + .main {visibility: visible;} + .outer.hide-side .side{width: 0; border: none;} .outer.hide-side .side .side-handle {right: -15px;} .outer.hide-side .side .side-body {display:none;}