From 30e8071d1dc724bbbaae737a88fd1eba367279be Mon Sep 17 00:00:00 2001 From: zhutaoredhat Date: Tue, 26 Jun 2018 17:59:59 +0800 Subject: [PATCH] Fixes KEYCLOAK-7535 - My Resources - HTML This PR is to provide HTML and CSS code JIRA task: https://issues.jboss.org/browse/KEYCLOAK-7535 --- .../account/messages/messages_en.properties | 27 ++ .../my-resources-detail-page.component.html | 312 +++++++++++++++++- .../my-resources-page.component.html | 250 +++++++++++++- .../shared-with-me-detail-page.component.html | 100 +++++- .../shared-with-me-page.component.html | 167 +++++++++- .../account/resources/styles.css | 168 +++++++++- 6 files changed, 1018 insertions(+), 6 deletions(-) diff --git a/themes/src/main/resources/theme/base/account/messages/messages_en.properties b/themes/src/main/resources/theme/base/account/messages/messages_en.properties index 3374227277..8ee69b7bf6 100755 --- a/themes/src/main/resources/theme/base/account/messages/messages_en.properties +++ b/themes/src/main/resources/theme/base/account/messages/messages_en.properties @@ -283,3 +283,30 @@ authenticatorChangePhone=Change Phone Number authenticatorBackupCodesTitle=Backup Codes authenticatorBackupCodesMessage=Get your 8-digit backup codes authenticatorBackupCodesFinishSetUpMessage=12 backup codes was generated at this time. Each one can be used once. + +#Resources +resources=Resources +myResources=My Resources +sharedwithMe=Shared with Me +share=Share +resource=Resource +application=Application +date=Date +sharewith=Share with +owner=Owner +accessPermissions=Access Permissions +permissionRequests=Permission Requests +approve=Approve +approveAll=Approve all +sharedwith=Shared with +people=people +perPage=per page +currentPage=Current Page +sharetheResource=Share the resource +user=User +group=Group +selectPermission=Select Permission +addPeople=Add people to share your resource with +addTeam=Add team to share your resource with +myPermissions=My Permissions +waitingforApproval=Waiting for approval diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/my-resources-detail-page.component.html b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/my-resources-detail-page.component.html index 33bc2c5879..956f8760ce 100644 --- a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/my-resources-detail-page.component.html +++ b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/my-resources-detail-page.component.html @@ -1 +1,311 @@ -

Placeholder for My Resources Detail Page

\ No newline at end of file +
    +
  1. {{'resources' | translate}} +
    2. +
  2. Alice Family +
    3. +
+ +
+
+ +

Alice Family

+
+ +
+ + +
+
+
+ Access management + photoz-rest-api + Roma William (you） +
+
+
+
+
+
+
+ +
+ + +
+
+
+
+
+
+ {{'sharewith' | translate}} 3 {{'people' | translate}} +
+
+
+
+ {{'accessPermissions' | translate}} +
+
+ {{'permissionRequests' | translate}} +
+
+
+
+
+ +
+
+ +
+ + +
+
+
+
+
+
+
+ Martin Liu + jhonsmith@paternfly.com +
+
+
+
+ Read, Battery, Test-date, Status +
+
+
    +
  • + + Status + + +
    • +
  • + + Time + + +
    • +
  • + + Beta + + +
    • +
+
+
+
+
+
+ +
+
+ +
+ + +
+
+
+
+
+
+
+ Jhon Smith + jhonsmith@paternfly.com +
+
+
+
+ Read, Battery, Test-date +
+
+
    +
  • + + Status + + +
    • +
  • + + Time + + +
    • +
  • + + Beta + + +
    • +
+
+
+
+
+
+ +
+
+ +
+ + +
+
+
+
+
+
+
+ Jhon Wong + jhonsmith@paternfly.com +
+
+
+
+ Read, Battery, Test-date +
+
+
+
+
+
+
+ +
+
+ + {{'perPage' | translate}} +
+
+ 1-15 of 75 +
    +
    • +
    • +
+ + + of 5 +
    +
    • +
    • +
+
+
+
+
+
+
+ + + + + diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/my-resources-page.component.html b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/my-resources-page.component.html index e1d9ed92cb..82758bf304 100644 --- a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/my-resources-page.component.html +++ b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/my-resources-page.component.html @@ -1 +1,249 @@ -

Placeholder for My Resources Page

\ No newline at end of file +
+

{{'resources' | translate}}

+
+
+
+ +
+
+
+
+
+
+
+
+
+ {{'resource' | translate}} +
+
+
+
+ {{'application' | translate}} +
+
+ {{'date' | translate}} +
+
+ {{'sharewith' | translate}} +
+
+
+
+
+ +
+
+ +
+ + +
+
+
+
+
+
+ Alice Family +
+
+
+
+ photoz-rest-api +
+
+ 12:00 AM +
+
+ 5 persons +
+
+
+
+
+ +
+
+ +
+ + +
+
+
+
+
+
+ Patternfly design document update +
+
+
+
+ photoz-rest +
+
+ 12:00 AM +
+
+ 5 persons +
+
+
+
+
+ +
+
+ +
+ + +
+
+
+
+
+
+ Patternfly design document +
+
+
+
+ photoz-rest-api +
+
+ 12:00 AM +
+
+ 5 persons +
+
+
+
+
+ +
+
+ + {{'perPage' | translate}} +
+
+ 1-15 of 75 +
    +
    • +
    • +
+ + + of 5 +
    +
    • +
    • +
+
+
+
+
+
+
+ + + + diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/shared-with-me-detail-page.component.html b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/shared-with-me-detail-page.component.html index 22a2375404..07c6440066 100644 --- a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/shared-with-me-detail-page.component.html +++ b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/shared-with-me-detail-page.component.html @@ -1 +1,99 @@ -

Placeholder for Shared With Me Detail Page

\ No newline at end of file +
    +
  1. {{'resources' | translate}} +
    2. +
  2. Alice Family +
    3. +
+ +
+
+ +

Alice Family

+
+ Access management + photoz-rest-api + Christ Ma +
+
+
+
+
+
+
+
+
+
+
+
+ {{'sharedwithMe' | translate}} +
+
+
+
+ {{'accessPermissions' | translate}} +
+
+ {{'permissionRequests' | translate}} +
+
+ {{'Status' | translate}} +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+
+
+ Martin Liu (you) + jhonsmith@paternfly.com +
+
+
+
+ Read, Battery, Test-date, Status +
+
+
    +
  • + + Status + +
    • +
  • + + Time + +
    • +
  • + + Beta + +
    • +
+
+
+ {{'waitingforApproval' | translate}} +
+
+
+
+
+
+
+
+
diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/shared-with-me-page.component.html b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/shared-with-me-page.component.html index 590ceb24fc..f0a3c2c30f 100644 --- a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/shared-with-me-page.component.html +++ b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/shared-with-me-page.component.html @@ -1 +1,166 @@ -

Placeholder for Shared With Me Page

\ No newline at end of file +
+

{{'resources' | translate}}

+
+
+
+ +
+
+
+
+
+
+
+
+
+ {{'resource' | translate}} +
+
+
+
+ {{'owner' | translate}} +
+
+ {{'application' | translate}} +
+
+ {{'myPermissions' | translate}} +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+
+ Open camera +
+
+
+
+ Chirst Ma +
+
+ photoz-rest-api +
+
+ Read, Battery, Test-date, Status, Delete +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+
+ Open company server +
+
+
+
+ tzhu +
+
+ photoz-rest +
+
+ Read, Battery +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+
+ Personal info of Tom Li +
+
+
+
+ lijun +
+
+ photoz-rest-api +
+
+ Email, Phone, Address, Avatar, Username… +
+
+
+
+
+ +
+
+ + per page +
+
+ 1-15 of 75 +
    +
    • +
    • +
+ + + of 5 +
    +
    • +
    • +
+
+
+ +
+
+
+
diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/styles.css b/themes/src/main/resources/theme/keycloak-preview/account/resources/styles.css index ddf912c206..a69a204169 100644 --- a/themes/src/main/resources/theme/keycloak-preview/account/resources/styles.css +++ b/themes/src/main/resources/theme/keycloak-preview/account/resources/styles.css @@ -83,7 +83,7 @@ p.description { border-top: 0; padding: 0; } - .card-pf-body { + .card-pf-body { padding: 20px 20px 10px; margin-top: 0; } @@ -320,6 +320,143 @@ p.description { .card-linked-account .list-view-pf .list-group-item-text { width: calc(45% - 40px); } +/*resource*/ +.m-t { + margin-top: 20px; +} +.list-view-pf .list-group-item { + border-bottom: 1px solid #ededed; +} +.list-view-resources .list-view-pf-additional-info-item { + width: 30%; +} +.list-view-resources .list-view-pf-additional-info-item .pficon { + margin-right: 0; + color: #fff; + font-size: 12px; + margin-left: 5px; +} +.list-view-resources .list-view-pf-additional-info-item-lg { + width: 45%; +} +.pfng-list-heading .list-view-pf-main-info { + padding-top: 10px; + padding-bottom: 10px; + font-weight: bold; + font-size: 13px; +} +.list-view-resources .list-view-pf-actions { + width: 75px; + height: 10px; +} +.pfng-list-heading .list-view-pf-additional-info { + font-size: 12px; + font-weight: bold; +} +.list-view-resources .list-view-pf-description { + width: 35%; +} +.list-view-shared .list-view-pf-description { + width: 30%; +} +.list-view-shared .list-view-pf-actions { + width: 20px; + height: 10px; +} +.list-view-detail .list-view-pf-actions { + width: 90px; +} +.list-view-detail .list-view-master-actions { + width: 105px; +} +.list-view-detail .list-view-space{ + width: 20px; +} +.list-view-resources .list-view-pf-status { + width: auto; +} +.list-view-pf-additional-info-item { + text-align: left; +} +.list-view-resources .list-view-pf-stacked .list-group-item-heading { + font-size: 13px; + font-weight: bold; +} +.list-view-resources .content-view-pf-pagination { + border: none; +} +.resources-header { + margin-bottom: 20px; +} +.resources-header .fa-file { + font-size: 60px; + float: left; + margin-right: 20px; +} +.resources-info span { + border-right: 1px solid #cccccc; + padding-right: 20px; + margin-right: 20px; +} +.resources-info span:last-child { + border-right: 0px solid #cccccc; +} +.resources-actions { + float: right; + margin-top: -35px; +} +.resources-actions button { + margin-right: 10px; +} +.user-list-avatar { + width: 36px; + height: 36px; + border-radius: 36px; + background-color: #1E97D6; + color: #fff; + float: left; + text-align: center; + line-height: 36px; + margin-right: 10px; +} +.list-view-master-actions { + margin-top: 6px; +} +.permission-requests-labels li { + margin-bottom: 5px; + margin-top: 5px; +} +.permission-requests-labels .label-info { + background-color: #4A90E2; + padding-left: 15px; + padding-right: 15px; + border-radius: 20px; +} +.my-requests-labels .label-info { + background-color: #15B692; +} +.modal-title span { + font-weight: normal; +} +.bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) { + width: 100%; +} +.resource-share-content { + margin-top: 20px; +} +.resources-list .nav-tabs { + margin-left: 20px; +} +.resources-list .card-pf-body { + padding-bottom: 0; +} +.resources-list .content-view-pf-pagination { + margin-top: 20px; + margin-bottom: -20px; +} +.breadcrumb { + padding: 20px 15px 20px 0; +} @media (max-width: 767px) { .card-pf-application h2 { @@ -356,9 +493,36 @@ p.description { .non-display { display: none; } + .breadcrumb { + padding: 20px 15px 0px 20px; + } + .resources-header { + padding: 20px 20px 0 20px; + margin-bottom: 0px; + } + .resources-header .fa-file { + font-size: 50px; + } + .resources-list .card-pf-body { + padding: 0; + } + .list-view-resources .list-view-pf-additional-info-item { + width: 100%; + } + .list-view-resources .list-view-pf-additional-info-item-lg { + width: 100%; + } + .list-view-resources .list-view-pf-description { + width: 100%; + } + .list-view-shared .list-view-pf-description { + width: 100%; + } + .resources-list .nav-tabs { + margin-top: 10px; + } } - /* authenticator style */ .list-pf { border-bottom: 0;