diff --git a/module/my/css/preference.css b/module/my/css/preference.css index 81ccd2f8ab..5d5414d9d2 100644 --- a/module/my/css/preference.css +++ b/module/my/css/preference.css @@ -1,3 +1,59 @@ .tip {margin-top: 10px;} -.table-form>tbody>tr>th {white-space: nowrap; !important} -.table-form>tbody>tr>td {width: 75%; !important} +.table-form>tbody>tr>th {white-space: nowrap!important} +.table-form>tbody>tr>td {width: 75%!important} + +.has-img > .border { + display: flex; + padding: 5px 16px; + border: 1px solid #EDEEF2; +} +.has-img.picker-option-active >.border { + border: 2px solid #2E7FFF; +} +.has-img.picker-option-active { + background: rgba(230,240,255, 0.4)!important; +} +.has-img-text { + display: flex; + flex-direction: column; + justify-content: space-around; + padding-left: 5px; +} +.has-img-text > .title { + color: #0B0F18; + font-size: 13px; +} +.has-img-text > .context { + color: #838A9D; + font-size: 12px; +} + +#pickerDropMenu-pk_URSR > .picker-option-list{ + display: flex; + flex-wrap: wrap; +} +.option-ursr { + flex: 1 1 220px; +} +.option-ursr.picker-option-selected > .border, +.option-ursr.picker-option-active> .border { + border: none; +} +.option-ursr > .border { + height: 46px; + display: flex; + padding: 5px 16px; + border: 1px solid #EDEEF2; + align-items: center; +} +.option-ursr > .border > .value { + margin-right: 20px; + width: 20px; + height: 20px; + border-radius: 100%; + background: rgba(230,240,255, 0.4); +} +.option-ursr > .border > .value > p { + line-height: 20px; + text-align: center; +} diff --git a/module/my/js/preference.js b/module/my/js/preference.js new file mode 100644 index 0000000000..7bc7c0750c --- /dev/null +++ b/module/my/js/preference.js @@ -0,0 +1,64 @@ +function initPreference() { + var objPngSrc = { + 'program-browse': 'list', + 'program-project': 'list-recent', + 'program-kanban': 'kanban', + + 'product-index': 'panel-recent-browse', + 'product-all': 'list', + 'product-dashboard': 'panel', + 'product-browse': 'list-recent', + 'product-kanban': 'kanban', + + 'project-browse': 'list', + 'project-execution': 'list-recent', + 'project-index': 'panel-recent-browse', + 'project-kanban': 'kanban', + + 'execution-all': 'list', + 'execution-task': 'kanban', + 'execution-executionkanban': 'list-recent', + } + function optionRenderProgram($option, b) { + /* transform , to , then split to fit lang */ + var textArr = b.text.replace(/[\uff0c]/g,",").split(','); + $option.empty(); + $option.addClass('has-img') + /** dom to prepend + *
+ *
+ *
+ *
+ *
+ * + **/ + $option.prepend('
' + textArr[0] + '
' + textArr[1] + '
'); + return $option; + } + function optionRenderURSR($option, b) { + $option.addClass('option-ursr'); + $option.parent().addClass('list-ursr'); + $option.empty(); + $option.prepend('

' + b.value + '

' + b.text + '
'); + return $option; + } + + $('#programLink').picker({ + optionRender: optionRenderProgram + }); + $('#productLink').picker({ + optionRender: optionRenderProgram + }); + $('#projectLink').picker({ + optionRender: optionRenderProgram + }); + $('#executionLink').picker({ + optionRender: optionRenderProgram + }); + $('#URSR').picker({ + optionRender: optionRenderURSR + }); +} + +initPreference(); diff --git a/module/my/view/preference.html.php b/module/my/view/preference.html.php index a1512c65b8..d9aa57030a 100755 --- a/module/my/view/preference.html.php +++ b/module/my/view/preference.html.php @@ -40,25 +40,25 @@ html,body {height: 100%;} - + config->systemMode == 'ALM'):?> - + - + - + - +
my->storyConcept;?>
my->programLink;?>my->programLinkList, $programLink, "class='form-control chosen'");?>my->programLinkList, $programLink, "class='form-control picker'");?>
my->productLink;?>my->productLinkList, $productLink, "class='form-control chosen'");?>my->productLinkList, $productLink, "class='form-control picker'");?>
my->projectLink;?>my->projectLinkList, $projectLink, "class='form-control chosen'");?>my->projectLinkList, $projectLink, "class='form-control picker'");?>
my->executionLink;?>my->executionLinkList, $executionLink, "class='form-control chosen'");?>my->executionLinkList, $executionLink, "class='form-control picker'");?>
diff --git a/www/theme/default/images/guide/kanban.png b/www/theme/default/images/guide/kanban.png new file mode 100644 index 0000000000..e9c9961bbc Binary files /dev/null and b/www/theme/default/images/guide/kanban.png differ diff --git a/www/theme/default/images/guide/list-recent.png b/www/theme/default/images/guide/list-recent.png new file mode 100644 index 0000000000..623dab2abd Binary files /dev/null and b/www/theme/default/images/guide/list-recent.png differ diff --git a/www/theme/default/images/guide/list.png b/www/theme/default/images/guide/list.png new file mode 100644 index 0000000000..ebe0d8a32c Binary files /dev/null and b/www/theme/default/images/guide/list.png differ diff --git a/www/theme/default/images/guide/panel-recent-browse.png b/www/theme/default/images/guide/panel-recent-browse.png new file mode 100644 index 0000000000..0f6fbfa214 Binary files /dev/null and b/www/theme/default/images/guide/panel-recent-browse.png differ diff --git a/www/theme/default/images/guide/panel-recent-product.png b/www/theme/default/images/guide/panel-recent-product.png new file mode 100644 index 0000000000..280745dac9 Binary files /dev/null and b/www/theme/default/images/guide/panel-recent-product.png differ diff --git a/www/theme/default/images/guide/panel.png b/www/theme/default/images/guide/panel.png new file mode 100644 index 0000000000..e5563e3ce8 Binary files /dev/null and b/www/theme/default/images/guide/panel.png differ