diff --git a/module/project/css/browse.ui.css b/module/project/css/browse.ui.css index 7840578170..a7b987551c 100644 --- a/module/project/css/browse.ui.css +++ b/module/project/css/browse.ui.css @@ -2,7 +2,7 @@ input[name="realEnd"] {width: 150px;} .table-empty-tip {padding: 80px 10px; text-align: center; background: #fff;} .table-empty-tip .btn {background-color: rgba(var(--color-primary-50-rgb),var(--tw-bg-opacity)); color: var(--nav-active-color); --tw-ring-color: rgba(var(--color-primary-50-rgb),var(--tw-bg-opacity));} -#cards {margin: 0 -20px; flex-wrap: wrap; padding: 10px;} +#cards {margin: -20px -20px 0 -20px; flex-wrap: wrap; padding: 10px;} #cards > .col {width: 25%; padding-left: 10px; padding-right: 10px;} @media screen and (max-width: 1500px) {#cards > .col {width: 33.3333333%;}} #cards .panel {margin: 10px 0; border: 1px solid rgb(var(--color-gray-300-rgb)); border-radius: 4px; box-shadow: none; cursor: pointer; height: 175px; background: #FFF;} diff --git a/module/project/js/browse.ui.js b/module/project/js/browse.ui.js index 091828dbc3..24137420d7 100644 --- a/module/project/js/browse.ui.js +++ b/module/project/js/browse.ui.js @@ -69,3 +69,10 @@ window.confirmDelete = function(projectID, projectName) if(res) $.ajaxSubmit({url: $.createLink('project', 'delete', 'projectID=' + projectID)}); }); } + +window.changeProgram = function() +{ + const programID = $('input[name=programID]').val(); + const link = $.createLink('project', 'browse', 'programID=' + programID + '&browseType=' + browseType + '¶m=' + param + '&orderBy=order_asc&recTotal=' + recTotal + '&recPerPage=' + recPerPage + '&pageID=' + pageID); + loadPage(link); +} diff --git a/module/project/ui/browsebycard.html.php b/module/project/ui/browsebycard.html.php index ef2124539d..d2e0572508 100644 --- a/module/project/ui/browsebycard.html.php +++ b/module/project/ui/browsebycard.html.php @@ -10,9 +10,31 @@ declare(strict_types=1); */ namespace zin; +jsVar('browseType', $browseType); +jsVar('param', $param); +jsVar('recTotal', $pager->recTotal); +jsVar('recPerPage', $pager->recPerPage); +jsVar('pageID', $pager->pageID); + /* zin: Define the feature bar on main menu. */ +unset($programs[0]); featureBar ( + to::before + ( + div + ( + picker + ( + set::name('programID'), + set::value($programID), + set::items($programs), + set::width('200px'), + set::placeholder($lang->project->selectProgram), + on::change('changeProgram') + ) + ) + ), set::current($browseType), set::linkParams("programID={$programID}&status={key}¶m=&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), checkbox