diff --git a/module/design/config.php b/module/design/config.php index 1ace001529..44ec3e7752 100644 --- a/module/design/config.php +++ b/module/design/config.php @@ -62,6 +62,7 @@ $config->design->actionList['linkCommit']['text'] = $lang->design->link $config->design->actionList['linkCommit']['url'] = helper::createLink('design', 'linkCommit', 'designID={id}'); $config->design->actionList['linkCommit']['data-toggle'] = 'modal'; $config->design->actionList['linkCommit']['data-position'] = 'center'; +$config->design->actionList['linkCommit']['data-size'] = 'lg'; $config->design->view->operateList['main'] = array('assignTo', 'linkCommit'); $config->design->view->operateList['common'] = array('edit', 'delete'); diff --git a/module/design/css/linkcommit.ui.css b/module/design/css/linkcommit.ui.css index c79c08f319..9c35a4fb25 100644 --- a/module/design/css/linkcommit.ui.css +++ b/module/design/css/linkcommit.ui.css @@ -1,3 +1,3 @@ +#featureBar {margin: 0.5rem 0 0.5rem 0;} .select-repo-box, .select-date-box {display: inline-flex;} -.select-repo-box .repo-title {width: 104px;} -.select-date-box .date-title {width: 62px;} +.select-repo-box .repo-title,.select-date-box .date-title {width: 80px;} diff --git a/module/design/js/common.ui.js b/module/design/js/common.ui.js index ebf156d783..5bcb246f8f 100644 --- a/module/design/js/common.ui.js +++ b/module/design/js/common.ui.js @@ -20,7 +20,7 @@ function loadStory(e) $(function() { - if(type) + if(typeof type != 'undefined') { $('#mainNavbar .nav a').removeClass('active'); $('#mainNavbar .nav a[data-id=' + type + ']').addClass('active'); diff --git a/module/design/js/linkcommit.ui.js b/module/design/js/linkcommit.ui.js index cc39b5a5fc..e785891092 100644 --- a/module/design/js/linkcommit.ui.js +++ b/module/design/js/linkcommit.ui.js @@ -1,8 +1,8 @@ function loadCommit() { - let begin = $('#begin').val(); - let end = $('#end').val(); - let repoID = $('#repo').val(); + let begin = $('.select-date-box input[name=begin]').val(); + let end = $('.select-date-box input[name=end]').val(); + let repoID = $('.select-repo-box input[name=repo]').val(); if(begin.indexOf('-') != -1) { diff --git a/module/design/ui/linkcommit.html.php b/module/design/ui/linkcommit.html.php index 27c1d9fd4c..8e63abef1e 100644 --- a/module/design/ui/linkcommit.html.php +++ b/module/design/ui/linkcommit.html.php @@ -38,12 +38,12 @@ else setClass('flex items-center repo-title'), $lang->repo->maintain ), - select + picker ( - set::id('repo'), set::name('repo'), set::value($repoID), set::items($repos), + set::width('200px'), on::change('loadCommit'), set::required(true) ) @@ -60,7 +60,6 @@ else ( datePicker ( - set::id('begin'), set::name('begin'), set::value($begin), on::change('loadCommit') @@ -68,7 +67,6 @@ else $lang->to, datePicker ( - set::id('end'), set::name('end'), set::value($end), on::change('loadCommit') @@ -92,12 +90,7 @@ else set::footToolbar($footToolbar), set::checkInfo(jsRaw('function(checkedIDList){return \'\';}')), set::rowKey('revision'), - set::footPager( - usePager - ( - array('linkCreator' => helper::createLink('design', 'linkCommit', "designID={$designID}&repoID={$repoID}&begin={$begin}&end={$end}&recPerPage={recPerPage}&pageID={page}")) - ) - ) + set::footPager(usePager()) ); }