From b80b480769f0cde7b6cf022c28d2058eaa5d89f9 Mon Sep 17 00:00:00 2001 From: zhutaoredhat Date: Fri, 29 Jun 2018 18:23:15 +0800 Subject: [PATCH] Fixes KEYCLOAK-7535 - reupdate resource html --- .../account/messages/messages_en.properties | 2 +- .../my-resources-detail-page.component.html | 169 ++++++++---------- .../my-resources-page.component.html | 106 +++++------ .../shared-with-me-detail-page.component.html | 35 ++-- .../shared-with-me-page.component.html | 106 +++++------ .../account/resources/styles.css | 92 +++++----- 6 files changed, 222 insertions(+), 288 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 6229600020..e7cd4e845d 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 @@ -325,7 +325,7 @@ share=Share resource=Resource application=Application date=Date -sharewith=Share with +sharedwith=Shared with owner=Owner accessPermissions=Access Permissions permissionRequests=Permission Requests 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 956f8760ce..2e9033781d 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 @@ -8,7 +8,7 @@
-

Alice Family

+

Alice Family

@@ -29,7 +29,7 @@
-
+
@@ -42,19 +42,15 @@
-
-
-
- {{'sharewith' | translate}} 3 {{'people' | translate}} -
+
+
+ {{'sharedwith' | translate}} 3 {{'people' | translate}}
-
-
- {{'accessPermissions' | translate}} -
-
- {{'permissionRequests' | translate}} -
+
+ {{'accessPermissions' | translate}} +
+
+ {{'permissionRequests' | translate}}
@@ -73,40 +69,35 @@
-
-
-
-
- Martin Liu - jhonsmith@paternfly.com -
+
+
+ Tom Liu + jhonsmith@paternfly.com
-
-
- Read, Battery, Test-date, Status -
-
-
    -
  • - - Status - - -
    • -
  • - - Time - - -
    • -
  • - - Beta - - -
    • -
-
+
+ Read, Battery, Test-date, Status +
+
+
    +
  • + + Status + + +
    • +
  • + + Time + + +
    • +
  • + + Beta + + +
    • +
@@ -125,40 +116,35 @@
-
-
-
-
- Jhon Smith - jhonsmith@paternfly.com -
+
+
+ Martin Liu + mar@paternfly.com
-
-
- Read, Battery, Test-date -
-
-
    -
  • - - Status - - -
    • -
  • - - Time - - -
    • -
  • - - Beta - - -
    • -
-
+
+ Read, Battery, Test-date +
+
+
    +
  • + + Status + + +
    • +
  • + + Time + + +
    • +
  • + + Beta + + +
    • +
@@ -166,32 +152,25 @@
-
-
-
-
-
- Jhon Wong - jhonsmith@paternfly.com -
+
+
+ Jhon Smith + jhonsmith@paternfly.com
-
-
- Read, Battery, Test-date -
-
-
+
+ Read, Battery +
+
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 82758bf304..7c3f610be0 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 @@ -9,26 +9,22 @@
-
+
-
-
-
- {{'resource' | translate}} -
+
+
+ {{'resource' | translate}}
-
-
- {{'application' | translate}} -
-
- {{'date' | translate}} -
-
- {{'sharewith' | translate}} -
+
+ {{'application' | translate}} +
+
+ {{'date' | translate}} +
+
+ {{'sharedwith' | translate}}
@@ -47,22 +43,18 @@
-
-
-
- Alice Family -
+
+
+ Alice Family
-
-
- photoz-rest-api -
-
- 12:00 AM -
-
- 5 persons -
+
+ photoz-rest-api +
+
+ 2018/05/15 16:32 +
+
+ 3 {{'people' | translate}}
@@ -81,22 +73,18 @@
-
-
-
- Patternfly design document update -
+
+
+ Patternfly 4
-
-
- photoz-rest -
-
- 12:00 AM -
-
- 5 persons -
+
+ photoz-rest +
+
+ 2018/05/15 12:32 +
+
+ 12 {{'people' | translate}}
@@ -115,22 +103,18 @@
-
-
-
- Patternfly design document -
+
+
+ Patternfly document update
-
-
- photoz-rest-api -
-
- 12:00 AM -
-
- 5 persons -
+
+ photoz-rest-api +
+
+ 2018/05/10 11:32 +
+
+ 8 {{'people' | translate}}
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 07c6440066..681b33ba0e 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 @@ -8,7 +8,7 @@
-

Alice Family

+

Alice Family

Access management photoz-rest-api @@ -18,27 +18,23 @@
-
+
-
-
-
+
+
{{'sharedwithMe' | translate}}
-
-
-
+
{{'accessPermissions' | translate}}
-
+
{{'permissionRequests' | translate}}
-
+
{{'Status' | translate}}
-
@@ -55,20 +51,16 @@
-
-
-
-
+
+
Martin Liu (you) jhonsmith@paternfly.com
-
-
-
+
Read, Battery, Test-date, Status
-
-
    +
    +
    • Status @@ -86,10 +78,9 @@
    -
    +
    {{'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 f0a3c2c30f..f88b2303a2 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 @@ -9,26 +9,22 @@
-
+
-
-
-
- {{'resource' | translate}} -
+
+
+ {{'resource' | translate}}
-
-
- {{'owner' | translate}} -
-
- {{'application' | translate}} -
-
- {{'myPermissions' | translate}} -
+
+ {{'owner' | translate}} +
+
+ {{'application' | translate}} +
+
+ {{'myPermissions' | translate}}
@@ -46,22 +42,18 @@
-
-
-
- Open camera -
+
+
+ Open camera
-
-
- Chirst Ma -
-
- photoz-rest-api -
-
- Read, Battery, Test-date, Status, Delete -
+
+ Chirst Ma +
+
+ photoz-rest-api +
+
+ Read, Battery, Test-date, Status, Delete
@@ -79,22 +71,18 @@
-
-
-
- Open company server -
+
+
+ Open company server
-
-
- tzhu -
-
- photoz-rest -
-
- Read, Battery -
+
+ tzhu +
+
+ photoz-rest +
+
+ Read, Battery
@@ -112,22 +100,18 @@
-
-
-
- Personal info of Tom Li -
+
+
+ Personal info of Tom Li
-
-
- lijun -
-
- photoz-rest-api -
-
- Email, Phone, Address, Avatar, Username… -
+
+ lijun +
+
+ photoz-rest-api +
+
+ Email, Phone, Address, Avatar, Username
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 e9d2778c19..dee6898ed7 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 @@ -327,9 +327,6 @@ p.description { .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; @@ -342,7 +339,7 @@ p.description { .pfng-list-heading .list-view-pf-main-info { padding-top: 10px; padding-bottom: 10px; - font-weight: bold; + font-weight: 600; font-size: 13px; } .list-view-resources .list-view-pf-actions { @@ -351,7 +348,7 @@ p.description { } .pfng-list-heading .list-view-pf-additional-info { font-size: 12px; - font-weight: bold; + font-weight: 600; } .list-view-resources .list-view-pf-description { width: 35%; @@ -369,7 +366,7 @@ p.description { .list-view-detail .list-view-master-actions { width: 105px; } -.list-view-detail .list-view-space{ +.list-view-detail .list-view-space { width: 20px; } .list-view-resources .list-view-pf-status { @@ -383,6 +380,7 @@ p.description { } .list-view-resources .content-view-pf-pagination { border: none; + background-color: #fff; } .resources-header { margin-bottom: 20px; @@ -407,20 +405,12 @@ p.description { .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 ul { + margin-bottom: 0; +} .permission-requests-labels li { margin-bottom: 5px; margin-top: 5px; @@ -431,58 +421,74 @@ p.description { padding-right: 15px; border-radius: 20px; } +.permission-requests-labels .pficon-close { + color:#fff; +} .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; } -.resource-list-label{ +.resource-list-label { display: none; } +.resources-list .card-pf-body { + padding: 0; +} @media (max-width: 767px) { - .resource-list-label{ - display:block; - margin-bottom:0; + .no-paddding-re { + padding: 0; + } + .permission-requests-labels .m-b-s { + margin-bottom: 10px; + } + .no-paddding-re .label-warning { + margin-top: 10px; + } + .resource-list-label { + display: inline-block; + margin-bottom: 0; margin-right: 5px; } + .list-responsive-padding { + padding-left: 20px; + overflow: auto; + } + .list-view-pf .list-group-item { + padding-bottom: 10px; + } + .pfng-list-heading.list-group-item { + padding-bottom: 0px; + } .list-view-resources .list-view-pf-stacked .list-group-item-heading { font-size: 16px; + margin-bottom: 10px; } - .list-view-pf-stacked .list-group-item-heading{ + .list-view-pf-stacked .list-group-item-heading { margin-right: 10px; } - .resources-info span{ + .resources-info span { border: none; display: block; width: 100%; } - .resources-info span:first-child{ - margin-bottom: 10px; - } - .resources-info span label{ + .resources-info span label { margin-bottom: 0; } - .list-view-pf .list-head-labels{ + .list-view-pf .list-head-labels { display: none; } .list-head-label{ @@ -499,7 +505,6 @@ p.description { padding: 10px 0; } .card-linked-account .list-view-pf-additional-info { - width: 100%; margin-top: 20px; } .card-pf-application h2 a { @@ -535,21 +540,12 @@ p.description { .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; } + .margin-bottom-none{ + padding-bottom: 0; + } } /* authenticator style */