From eb8257a52e8ebc683450ad2a4d33890e18eb1317 Mon Sep 17 00:00:00 2001 From: June Zhang Date: Fri, 11 May 2018 06:14:56 +0800 Subject: [PATCH] Fixes KEYCLOAK-7090 Applications page - HTML (#5189) --- .../account/messages/messages_en.properties | 14 + .../applications-page.component.css | 41 ++- .../applications-page.component.html | 318 +++++++++++++++--- .../account/resources/styles.css | 10 +- 4 files changed, 324 insertions(+), 59 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 43c4a692ae..110de18f29 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 @@ -6,6 +6,8 @@ doAdd=Add doSignOut=Sign Out doLogIn=Log In + + editAccountHtmlTitle=Edit Account personalInfoHtmlTitle=Personal Info federatedIdentitiesHtmlTitle=Federated Identities @@ -227,3 +229,15 @@ locale_ru=\u0420\u0443\u0441\u0441\u043a\u0438\u0439 locale_sk=Sloven\u010dina locale_sv=Svenska locale_zh-CN=\u4e2d\u6587\u7b80\u4f53 + +# Applications +applicaitonName=Name +applicationType=Application Type +applicationInUse=In-use app only +clearAllFilter=Clear all filters +activeFilters=Active filters +filterByName=Filter By Name ... +allApps=All applications +internalApps=Internal applications +thirdpartyApps=Third-Party applications +appResults=Results diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/applications-page/applications-page.component.css b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/applications-page/applications-page.component.css index 090ab1b5b6..7f81beaa0a 100644 --- a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/applications-page/applications-page.component.css +++ b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/applications-page/applications-page.component.css @@ -14,4 +14,43 @@ height: 54px; line-height: 50px; width: 54px; -}*/ \ No newline at end of file +}*/ + +/*------applications-------*/ +.card-description { + margin-left: 20px; + margin-top: -20px; + margin-bottom: 30px; +} +.list-group-item-text .app-info { + list-style: none; + padding: 0; +} +.list-group-item-text .app-info li { + display: inline-block; + min-width: 160px; + margin-top: 10px; +} +.divide-line { + width: 100%; + height: 1px; + background-color: #ededed; + margin-bottom: 20px; +} +.app-form .col-md-6 { + line-height: 23px; +} +.remove-notice { + color: #666; + margin-top: 5px; +} +.list-view-pf-view { + margin-top: 0; +} +.card-pf-body { + margin-top: 0; +} +.list-view-pf .current-color { + font-weight: bold; + color: #4F9207; +} diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/applications-page/applications-page.component.html b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/applications-page/applications-page.component.html index 075d64a94c..f58debde79 100644 --- a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/applications-page/applications-page.component.html +++ b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/applications-page/applications-page.component.html @@ -1,54 +1,266 @@ - - -
- -
-
- - -
-
- -
-
- - -
-
- -
-
- - -
-
+
+

{{'applicationsHtmlTitle' | translate}}

- - \ No newline at end of file + + +
+
+
+
+
+ +
+
+ + +
+ +
+
+
+
+ + +
+
+
+ +
+ +
+
+
+
40 {{'appResults' | translate}}
+

{{'activeFilters' | translate}}

+
    +
  • + + {{'applicaitonName' | translate}}: nameofthething + + +
    • +
  • + + {{'applicaitonName' | translate}}: nameofthething + + +
    • +
  • + + {{'applicaitonName' | translate}}: nameofthething + + +
    • +
+

{{'clearAllFilter' | translate}}

+
+
+
+
+ + + +
+ +
+
+
+
+ +
+
+
+ +
+
+
+
+ Admin CLI +
+
+ +
+
+
+
+ + + +
+
+
+
+
+
+ +
+
+
+ +
+
+
+
+ Admin CLI +
+
+ +
+
+
+
+ + + +
+
+
+ + + + + +
+ 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 2f212bd72c..f40d3a9899 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 @@ -49,7 +49,7 @@ p.description { /* Introduction Message on the left */ .introMessage { margin: 10px 20px 20px 0; - + /* Device Activity */ .card-title{ margin-left: 20px; @@ -67,20 +67,20 @@ p.description { .activity-item { padding-left: 60px; } -.activity-item ul{ +.activity-item ul { list-style: none; } -.activity-item h3 .fa{ +.activity-item h3 .fa { margin-left: -30px; margin-right: 5px; font-size: 20px; } -.btn-logout{ +.btn-logout { margin-left: 40px; margin-bottom: 20px; margin-top: 5px; } -.list-view-pf .current-color{ +.list-view-pf .current-color { font-weight: bold; color: #4F9207!important; }