Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#667 fix workspace comp in datasource #1424

Merged
merged 6 commits into from
Feb 14, 2019
Merged

#667 fix workspace comp in datasource #1424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7fe1992
#667 add username in datasource link workspace component
brandon-wonjune Feb 13, 2019
10094fd
#667 change message in workspace link component
brandon-wonjune Feb 13, 2019
41dd766
#667 add no result message in link workspace component
brandon-wonjune Feb 13, 2019
ed30217
#667 fix owner width
brandon-wonjune Feb 13, 2019
7338149
#667 remove selected class in link workspace component
brandon-wonjune Feb 14, 2019
9306f83
#667 change header width
brandon-wonjune Feb 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 22 additions & 16 deletions ...app/data-storage/component/set-workspace-published/set-workspace-published.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
~ limitations under the License.
-->

<div class="ddp-index ddp-layout-popuptype" *ngIf="showFl">
<div class="ddp-layout-popuptype" *ngIf="showFl">
<em class="ddp-bg-popup"></em>
<div class="ddp-ui-popup">
<!-- title -->
Expand All @@ -34,7 +34,7 @@
</div>
<!-- //title -->
<div class="ddp-ui-popup-contents">
<div class="ddp-wrap-permission">
<div class="ddp-wrap-permission ddp-type">
<!-- tab -->
<div class="ddp-wrap-tab">
<ul class="ddp-ui-tab ddp-clear">
Expand Down Expand Up @@ -76,7 +76,7 @@
<colgroup>
<col width="51px">
<col width="*">
<col width="20%">
<col width="250px">
</colgroup>
<thead>
<tr>
Expand All @@ -92,7 +92,7 @@
<em class="ddp-icon-array-des2" *ngIf="personalWorkspaces.sort === 'name,desc'"></em>
</th>
<th>
{{'msg.storage.th.owner' | translate}}
{{'msg.storage.th.owner' | translate}} ({{'msg.storage.ui.username' | translate}})
</th>
</tr>
</thead>
Expand All @@ -107,12 +107,14 @@
<colgroup>
<col width="51px">
<col width="*">
<col width="20%">
<col width="250px">
</colgroup>
<tbody>
<tr *ngIf="!personalWorkspaceList() || personalWorkspaceList().length === 0">
<td class="ddp-data-none " colspan="5">{{'msg.comm.ui.no.rslt' | translate}}</td>
</tr>
<!-- 체크시 상태 tr class="ddp-tr-select" 추가 -->
<tr *ngFor="let workspace of personalWorkspaceList()"
[ngClass]="{'ddp-tr-select' : checkInWorkspaces(workspace)}"
(click)="onCheckedWorkspace(workspace, 'PRIVATE')">
<td class="ddp-txt-center">
<div class="ddp-ui-checkbox">
Expand All @@ -127,7 +129,8 @@
</div>
</td>
<td>
{{workspace.owner.fullName}}
<span class="ddp-txt-data">{{workspace.owner.fullName}}</span>
<span class="ddp-data-owner">({{workspace.owner.username}})</span>
</td>
</tr>
</tbody>
Expand Down Expand Up @@ -174,9 +177,9 @@
<colgroup>
<col width="51px">
<col width="*">
<col width="10%">
<col width="10%">
<col width="20%">
<col width="70px">
<col width="70px">
<col width="250px">
</colgroup>
<thead>
<tr>
Expand All @@ -198,7 +201,7 @@
{{'msg.storage.th.group' | translate}}
</th>
<th>
{{'msg.storage.th.owner' | translate}}
{{'msg.storage.th.owner' | translate}} ({{'msg.storage.ui.username' | translate}})
</th>
</tr>
</thead>
Expand All @@ -213,13 +216,15 @@
<colgroup>
<col width="51px">
<col width="*">
<col width="10%">
<col width="10%">
<col width="20%">
<col width="70px">
<col width="70px">
<col width="250px">
</colgroup>
<tbody>
<tr *ngIf="!publicWorkspaceList() || publicWorkspaceList().length === 0">
<td class="ddp-data-none " colspan="5">{{'msg.comm.ui.no.rslt' | translate}}</td>
</tr>
<tr *ngFor="let workspace of publicWorkspaceList()"
[ngClass]="{'ddp-tr-select' : checkInWorkspaces(workspace)}"
(click)="onCheckedWorkspace(workspace, 'SHARED')">
<td class="ddp-txt-center">
<div class="ddp-ui-checkbox">
Expand All @@ -240,7 +245,8 @@
{{workspace.countByMemberType.group}}
</td>
<td>
{{workspace.owner.fullName}}
<span class="ddp-txt-data">{{workspace.owner.fullName}}</span>
<span class="ddp-data-owner">({{workspace.owner.username}})</span>
</td>
</tr>
</tbody>
Expand Down
3 changes: 2 additions & 1 deletion discovery-frontend/src/assets/css/metatron/component/component.table.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ table.ddp-table-form tbody tr td .ddp-link-delete:hover em.ddp-icon-delete {back
.ddp-ui-grid .ddp-ui-empty {padding:20px; color:#b7b9c3; font-size:12px;}
.ddp-ui-gridbody {position:absolute; top:28px; left:0; right:0; bottom:0; overflow-y:scroll;}
.ddp-box-viewtable .ddp-ui-gridhead {height:33px;border-top:none;}
.ddp-box-viewtable .ddp-ui-gridhead table {padding-right:18px;}
.ddp-box-viewtable .ddp-ui-gridhead tr th {height:33px; box-sizing:border-box;}
.ddp-box-viewtable .ddp-ui-gridbody {top:34px;}

Expand Down Expand Up @@ -202,7 +203,7 @@ table.ddp-table-select tbody tr.ddp-selected td:last-of-type {border-right:1px s
table.ddp-table-select tbody tr td .ddp-box-tag {position:relative; top:2px;}
table.ddp-table-type2.ddp-table-select tbody tr.ddp-selected > td {padding:12px 10px 13px 10px}
table.ddp-table-type2.ddp-table-select tbody tr.ddp-selected > td:first-of-type {padding-left:9px;}
table.ddp-table-type2.ddp-table-select tbody tr.ddp-selected > td:last-of-type {padding-right:29px;}
table.ddp-table-select tbody tr td:last-of-type {padding-right:29px !important;}

table.ddp-table-select tr td:last-of-type {padding-right:35px;}
table.ddp-table-select tbody tr.ddp-selected td:first-child:before {border-left:1px solid #666eb2;}
Expand Down
4 changes: 4 additions & 0 deletions discovery-frontend/src/assets/css/polaris.v2.page.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7227,10 +7227,14 @@ ul.ddp-ui-tab li em.ddp-icon-user-s2,
ul.ddp-ui-tab li em.ddp-icon-group-s2 {margin-right:8px;}
ul.ddp-ui-tab li.ddp-selected em.ddp-icon-user-s2,
ul.ddp-ui-tab li.ddp-selected em.ddp-icon-group-s2 {opacity:1;}
.ddp-wrap-permission.ddp-type {padding-top:0;}
.ddp-wrap-permission.ddp-type .ddp-wrap-viewtable {top:98px;}
.ddp-wrap-permission {position:relative; padding-top:42px; height:100%; box-sizing:border-box;}
.ddp-wrap-permission .ddp-type-check {display:inline-block; position:absolute; top:0;}
.ddp-wrap-permission .ddp-wrap-viewtable{position:absolute; top:140px; left:0; right:0; bottom:68px;}
.ddp-wrap-permission .ddp-wrap-switch .ddp-form-search {width:270px;}
.ddp-wrap-permission table.ddp-table-type2 tbody tr > td .ddp-data-owner {float:left; color:#b7b9c2;}
.ddp-wrap-permission table.ddp-table-type2 tbody tr > td .ddp-txt-data {float:left; padding-right:4px;}

.ddp-box-popupcontents2.ddp-setting-source {width:666px;}
.ddp-box-popupcontents2.ddp-setting-source > .ddp-wrap-edit2:first-of-type {margin-top:0;}
Expand Down
3 changes: 2 additions & 1 deletion discovery-frontend/src/assets/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2030,7 +2030,7 @@
"msg.storage.ui.conn.url.ph" : "Please enter URL",
"msg.storage.ui.conn.sid.ph" : "Please enter SID",
"msg.storage.ui.conn.catalog.ph" : "Please enter Catalog",
"msg.storage.ui.spaces.search.ph" : "Search by workspace",
"msg.storage.ui.spaces.search.ph" : "Search by workspace or owner name",
"msg.storage.ui.action.delete" : "Do you want to delete?",
"msg.storage.ui.action.data.detail" : "Data detail",
"msg.storage.ui.server" : "Server",
Expand Down Expand Up @@ -2145,6 +2145,7 @@
"msg.storage.ui.file.result.FV004": "Column names are allowed up to 50 characters.",
"msg.storage.ui.file.result.FV005": "Empty column name is not allowed.",
"msg.storage.ui.timezone": "Time zone",
"msg.storage.ui.username": "Username",

"msg.storage.ui.timezone.country.zimbabwe": "Zimbabwe",
"msg.storage.ui.timezone.country.zambia": "Zambia",
Expand Down
3 changes: 2 additions & 1 deletion discovery-frontend/src/assets/i18n/ko.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2029,7 +2029,7 @@
"msg.storage.ui.conn.url.ph" : "URL을 입력해 주세요",
"msg.storage.ui.conn.sid.ph" : "SID를 입력해 주세요",
"msg.storage.ui.conn.catalog.ph" : "Catalog를 입력해 주세요",
"msg.storage.ui.spaces.search.ph" : "워크스페이스 검색",
"msg.storage.ui.spaces.search.ph" : "워크스페이스 또는 소유자 검색",
"msg.storage.ui.action.delete" : "삭제합니까?",
"msg.storage.ui.action.data.detail" : "데이터 상세",
"msg.storage.ui.server" : "서버",
Expand Down Expand Up @@ -2143,6 +2143,7 @@
"msg.storage.ui.file.result.FV004": "1자~50자 이내의 컬럼명으로 작성해주세요.",
"msg.storage.ui.file.result.FV005": "빈 컬럼명은 허용되지 않습니다.",
"msg.storage.ui.timezone": "타임존",
"msg.storage.ui.username": "사용자이름",

"msg.storage.ui.timezone.country.zimbabwe": "짐바브웨",
"msg.storage.ui.timezone.country.zambia": "잠비아",
Expand Down