keycloak-aplcache

Merge pull request #2130 from ssilvert/partial-import-description KEYCLOAK-2335:

1/29/2016 12:34:39 PM

Details

diff --git a/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties b/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
old mode 100755
new mode 100644
index 3c1a17d..bb2782d
--- a/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
+++ b/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
@@ -538,8 +538,10 @@ composite.associated-roles.tooltip=Realm level roles associated with this compos
 composite.available-roles-client.tooltip=Roles from this client that you can associate to this composite role.
 composite.associated-roles-client.tooltip=Client roles associated with this composite role.
 partial-import=Partial Import
+partial-import.tooltip=Partial import allows you to import users, clients, and other resources from a previously exported json file.
 
 file=File
+exported-json-file=Exported json file
 import-from-realm=Import from realm
 import-users=Import users
 import-clients=Import clients
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/partial-import.html b/themes/src/main/resources/theme/base/admin/resources/partials/partial-import.html
index 4c7a719..f4ab51d 100644
--- a/themes/src/main/resources/theme/base/admin/resources/partials/partial-import.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/partial-import.html
@@ -1,11 +1,14 @@
 <div class="col-sm-9 col-md-10 col-sm-push-3 col-md-push-2">
 
-    <h1>{{:: 'partial-import' | translate}}</h1>
+    <h1>
+        <span>{{:: 'partial-import' | translate}}</span>
+        <kc-tooltip>{{:: 'partial-import.tooltip' | translate}}</kc-tooltip>
+    </h1>
 
     <form class="form-horizontal" name="partialImportForm" novalidate>
         <fieldset class="border-top">
             <div class="form-group">
-                <label for="name" class="col-sm-2 control-label">{{:: 'file' | translate}}</label>
+                <label for="name" class="col-sm-2 control-label">{{:: 'exported-json-file' | translate}}</label>
 
                 <div class="col-md-6" data-ng-hide="importing">
                     <label for="import-file" class="btn btn-default">{{:: 'select-file'| translate}} <i class="pficon pficon-import"></i></label>