From 97d7fd65c2de2d7e394fc4dd52704700766d00f8 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Mon, 23 Mar 2015 08:41:51 +0100 Subject: [PATCH 1/3] KEYCLOAK-1127 Change theme structure from 'type/name' to 'name/type' --- .../org/keycloak/theme/ClassLoaderTheme.java | 8 +-- .../keycloak/theme/FolderThemeProvider.java | 54 +++++++----------- .../base => base/account}/account.ftl | 0 .../base => base/account}/draft.access.ftl | 0 .../account}/federatedIdentity.ftl | 0 .../{account/base => base/account}/log.ftl | 0 .../account}/messages/messages_de.properties | 0 .../account}/messages/messages_en.properties | 0 .../base => base/account}/password.ftl | 0 .../base => base/account}/sessions.ftl | 0 .../base => base/account}/template.ftl | 0 .../{account/base => base/account}/totp.ftl | 0 .../{admin/base => base/admin}/index.ftl | 0 .../admin}/resources/css/styles.css | 0 .../base => base/admin}/resources/js/app.js | 0 .../resources/js/controllers/applications.js | 0 .../resources/js/controllers/oauth-clients.js | 0 .../admin}/resources/js/controllers/realm.js | 0 .../admin}/resources/js/controllers/users.js | 0 .../admin}/resources/js/loaders.js | 0 .../admin}/resources/js/services.js | 0 .../partials/application-clustering-node.html | 0 .../partials/application-clustering.html | 0 .../partials/application-credentials.html | 0 .../partials/application-detail.html | 0 .../application-identity-provider.html | 0 .../partials/application-import.html | 0 .../partials/application-installation.html | 0 .../resources/partials/application-keys.html | 0 .../resources/partials/application-list.html | 0 .../partials/application-mappers-add.html | 0 .../partials/application-mappers.html | 0 .../partials/application-revocation.html | 0 .../partials/application-role-detail.html | 0 .../partials/application-role-list.html | 0 .../partials/application-saml-key-export.html | 0 .../partials/application-saml-key-import.html | 0 .../partials/application-saml-keys.html | 0 .../partials/application-scope-mappings.html | 0 .../partials/application-sessions.html | 0 .../resources/partials/brute-force.html | 0 .../admin}/resources/partials/claims.html | 0 .../resources/partials/defense-headers.html | 0 .../resources/partials/federated-generic.html | 0 .../partials/federated-kerberos.html | 0 .../resources/partials/federated-ldap.html | 0 .../admin}/resources/partials/home.html | 0 .../admin}/resources/partials/menu.html | 0 .../admin}/resources/partials/notfound.html | 0 .../partials/oauth-client-claims.html | 0 .../partials/oauth-client-credentials.html | 0 .../partials/oauth-client-detail.html | 0 .../oauth-client-identity-provider.html | 0 .../partials/oauth-client-installation.html | 0 .../resources/partials/oauth-client-list.html | 0 .../partials/oauth-client-mappers-add.html | 0 .../partials/oauth-client-mappers.html | 0 .../oauth-client-protocol-mapper-detail.html | 0 .../partials/oauth-client-revocation.html | 0 .../partials/oauth-client-scope-mappings.html | 0 .../partials/protocol-mapper-detail.html | 0 .../partials/realm-cache-settings.html | 0 .../resources/partials/realm-create.html | 0 .../resources/partials/realm-credentials.html | 0 .../partials/realm-default-roles.html | 0 .../resources/partials/realm-detail.html | 0 .../partials/realm-events-config.html | 0 .../resources/partials/realm-events.html | 0 .../realm-identity-provider-export.html | 0 .../realm-identity-provider-facebook.html | 0 .../realm-identity-provider-github.html | 0 .../realm-identity-provider-google.html | 0 .../realm-identity-provider-oidc.html | 0 .../realm-identity-provider-saml.html | 0 .../realm-identity-provider-social.html | 0 .../realm-identity-provider-twitter.html | 0 .../partials/realm-identity-provider.html | 0 .../admin}/resources/partials/realm-keys.html | 0 .../admin}/resources/partials/realm-list.html | 0 .../partials/realm-login-settings.html | 0 .../admin}/resources/partials/realm-menu.html | 0 .../admin}/resources/partials/realm-smtp.html | 0 .../partials/realm-theme-settings.html | 0 .../resources/partials/realm-tokens.html | 0 .../resources/partials/role-detail.html | 0 .../admin}/resources/partials/role-list.html | 0 .../resources/partials/role-mappings.html | 0 .../resources/partials/server-info.html | 0 .../resources/partials/session-realm.html | 0 .../partials/session-revocation.html | 0 .../partials/user-attribute-entry.html | 0 .../resources/partials/user-credentials.html | 0 .../resources/partials/user-detail.html | 0 .../partials/user-federated-identity.html | 0 .../resources/partials/user-federation.html | 0 .../admin}/resources/partials/user-list.html | 0 .../resources/partials/user-sessions.html | 0 .../resources/templates/kc-dropdown.html | 0 .../admin}/resources/templates/kc-modal.html | 0 .../templates/kc-navigation-application.html | 0 .../templates/kc-navigation-oauth-client.html | 0 .../resources/templates/kc-navigation.html | 0 .../admin}/resources/templates/kc-switch.html | 0 .../base => base/admin}/theme.properties | 0 .../theme/{login/base => base/login}/code.ftl | 0 .../{login/base => base/login}/error.ftl | 0 .../theme/{login/base => base/login}/info.ftl | 0 .../base => base/login}/login-config-totp.ftl | 0 .../base => base/login}/login-oauth-grant.ftl | 0 .../login}/login-reset-password.ftl | 0 .../{login/base => base/login}/login-totp.ftl | 0 .../login}/login-update-password.ftl | 0 .../login}/login-update-profile.ftl | 0 .../login}/login-verify-email.ftl | 0 .../{login/base => base/login}/login.ftl | 0 .../login}/messages/messages_de.properties | 0 .../login}/messages/messages_en.properties | 0 .../{login/base => base/login}/register.ftl | 0 .../{login/base => base/login}/template.ftl | 0 .../account}/resources/css/account.css | 0 .../account}/resources/img/header-bkgrnd.png | Bin .../account}/theme.properties | 0 .../admin}/resources/css/admin-console.css | 0 .../admin}/resources/css/base-styles.css | 0 .../resources/css/img/sprite-table-nav.png | Bin .../admin}/resources/css/img/sprites.png | Bin .../admin}/resources/css/overrides.css | 0 .../admin}/resources/css/sprites.css | 0 .../admin}/resources/css/styles.css | 0 .../admin}/resources/css/tables.css | 0 .../admin}/resources/img/brand.svg | 0 .../admin}/resources/img/favicon.ico | Bin .../admin}/resources/img/header-bkgrnd.png | Bin .../resources/img/icon-collapse-expand.png | Bin .../resources/img/icon-sidebar-active.png | Bin .../admin}/resources/img/logo.png | Bin .../admin}/resources/img/select-arrow.png | Bin .../resources/img/sprite-arrow-down.png | Bin .../admin}/resources/img/sprites-gray.png | Bin .../admin}/resources/img/sprites-gray.svg | 0 .../admin}/resources/img/sprites-white.png | Bin .../admin}/theme.properties | 0 .../resources/lib/angular/angular-cookies.js | 0 .../resources/lib/angular/angular-loader.js | 0 .../resources/lib/angular/angular-mocks.js | 0 .../resources/lib/angular/angular-resource.js | 0 .../resources/lib/angular/angular-route.js | 0 .../resources/lib/angular/angular-sanitize.js | 0 .../resources/lib/angular/angular-scenario.js | 0 .../common}/resources/lib/angular/angular.js | 0 .../angular/jstd-scenario-adapter-config.js | 0 .../lib/angular/jstd-scenario-adapter.js | 0 .../common}/resources/lib/angular/select2.js | 0 .../lib/angular/ui-bootstrap-tpls-0.11.0.js | 0 .../resources/lib/angular/version.json | 0 .../common}/resources/lib/angular/version.txt | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../font-awesome/fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../resources/lib/filesaver/FileSaver.js | 0 .../resources/lib/fileupload/FileAPI.min.js | 0 .../angular-file-upload-html5-shim.js | 0 .../angular-file-upload-html5-shim.min.js | 0 .../fileupload/angular-file-upload-shim.js | 0 .../angular-file-upload-shim.min.js | 0 .../lib/fileupload/angular-file-upload.js | 0 .../lib/fileupload/angular-file-upload.min.js | 0 .../resources/lib/jquery/jquery-1.10.2.js | 0 .../lib/patternfly/css/patternfly.css | 0 .../lib/patternfly/css/patternfly.min.css | 0 .../fonts/OpenSans-Bold-webfont.eot | Bin .../fonts/OpenSans-Bold-webfont.svg | 0 .../fonts/OpenSans-Bold-webfont.ttf | Bin .../fonts/OpenSans-Bold-webfont.woff | Bin .../fonts/OpenSans-BoldItalic-webfont.eot | Bin .../fonts/OpenSans-BoldItalic-webfont.svg | 0 .../fonts/OpenSans-BoldItalic-webfont.ttf | Bin .../fonts/OpenSans-BoldItalic-webfont.woff | Bin .../fonts/OpenSans-ExtraBold-webfont.eot | Bin .../fonts/OpenSans-ExtraBold-webfont.svg | 0 .../fonts/OpenSans-ExtraBold-webfont.ttf | Bin .../fonts/OpenSans-ExtraBold-webfont.woff | Bin .../OpenSans-ExtraBoldItalic-webfont.eot | Bin .../OpenSans-ExtraBoldItalic-webfont.svg | 0 .../OpenSans-ExtraBoldItalic-webfont.ttf | Bin .../OpenSans-ExtraBoldItalic-webfont.woff | Bin .../fonts/OpenSans-Italic-webfont.eot | Bin .../fonts/OpenSans-Italic-webfont.svg | 0 .../fonts/OpenSans-Italic-webfont.ttf | Bin .../fonts/OpenSans-Italic-webfont.woff | Bin .../fonts/OpenSans-Light-webfont.eot | Bin .../fonts/OpenSans-Light-webfont.svg | 0 .../fonts/OpenSans-Light-webfont.ttf | Bin .../fonts/OpenSans-Light-webfont.woff | Bin .../fonts/OpenSans-LightItalic-webfont.eot | Bin .../fonts/OpenSans-LightItalic-webfont.svg | 0 .../fonts/OpenSans-LightItalic-webfont.ttf | Bin .../fonts/OpenSans-LightItalic-webfont.woff | Bin .../fonts/OpenSans-Regular-webfont.eot | Bin .../fonts/OpenSans-Regular-webfont.svg | 0 .../fonts/OpenSans-Regular-webfont.ttf | Bin .../fonts/OpenSans-Regular-webfont.woff | Bin .../fonts/OpenSans-Semibold-webfont.eot | Bin .../fonts/OpenSans-Semibold-webfont.svg | 0 .../fonts/OpenSans-Semibold-webfont.ttf | Bin .../fonts/OpenSans-Semibold-webfont.woff | Bin .../fonts/OpenSans-SemiboldItalic-webfont.eot | Bin .../fonts/OpenSans-SemiboldItalic-webfont.svg | 0 .../fonts/OpenSans-SemiboldItalic-webfont.ttf | Bin .../OpenSans-SemiboldItalic-webfont.woff | Bin .../fonts/PatternFlyIcons-webfont.eot | Bin .../fonts/PatternFlyIcons-webfont.svg | 0 .../fonts/PatternFlyIcons-webfont.ttf | Bin .../fonts/PatternFlyIcons-webfont.woff | Bin .../resources/lib/patternfly/img/bg-login.jpg | Bin .../resources/lib/patternfly/img/brand-lg.png | Bin .../resources/lib/patternfly/img/brand.png | Bin .../resources/lib/patternfly/img/brand.svg | 0 .../resources/lib/patternfly/img/logo.png | Bin .../resources/lib/patternfly/img/logo.svg | 0 .../resources/lib/patternfly/js/patternfly.js | 0 .../lib/patternfly/js/patternfly.min.js | 0 .../resources/lib/select2-3.4.1/LICENSE | 0 .../resources/lib/select2-3.4.1/README.md | 0 .../lib/select2-3.4.1/component.json | 0 .../resources/lib/select2-3.4.1/release.sh | 0 .../lib/select2-3.4.1/select2-spinner.gif | Bin .../resources/lib/select2-3.4.1/select2.css | 0 .../lib/select2-3.4.1/select2.jquery.json | 0 .../resources/lib/select2-3.4.1/select2.js | 0 .../lib/select2-3.4.1/select2.min.js | 0 .../resources/lib/select2-3.4.1/select2.png | Bin .../lib/select2-3.4.1/select2_locale_ar.js | 0 .../lib/select2-3.4.1/select2_locale_ca.js | 0 .../lib/select2-3.4.1/select2_locale_cs.js | 0 .../lib/select2-3.4.1/select2_locale_da.js | 0 .../lib/select2-3.4.1/select2_locale_de.js | 0 .../lib/select2-3.4.1/select2_locale_el.js | 0 .../select2_locale_en.js.template | 0 .../lib/select2-3.4.1/select2_locale_es.js | 0 .../lib/select2-3.4.1/select2_locale_et.js | 0 .../lib/select2-3.4.1/select2_locale_eu.js | 0 .../lib/select2-3.4.1/select2_locale_fi.js | 0 .../lib/select2-3.4.1/select2_locale_fr.js | 0 .../lib/select2-3.4.1/select2_locale_gl.js | 0 .../lib/select2-3.4.1/select2_locale_he.js | 0 .../lib/select2-3.4.1/select2_locale_hr.js | 0 .../lib/select2-3.4.1/select2_locale_hu.js | 0 .../lib/select2-3.4.1/select2_locale_id.js | 0 .../lib/select2-3.4.1/select2_locale_is.js | 0 .../lib/select2-3.4.1/select2_locale_it.js | 0 .../lib/select2-3.4.1/select2_locale_ja.js | 0 .../lib/select2-3.4.1/select2_locale_ko.js | 0 .../lib/select2-3.4.1/select2_locale_lt.js | 0 .../lib/select2-3.4.1/select2_locale_lv.js | 0 .../lib/select2-3.4.1/select2_locale_mk.js | 0 .../lib/select2-3.4.1/select2_locale_nl.js | 0 .../lib/select2-3.4.1/select2_locale_no.js | 0 .../lib/select2-3.4.1/select2_locale_pl.js | 0 .../lib/select2-3.4.1/select2_locale_pt-BR.js | 0 .../lib/select2-3.4.1/select2_locale_pt-PT.js | 0 .../lib/select2-3.4.1/select2_locale_ro.js | 0 .../lib/select2-3.4.1/select2_locale_ru.js | 0 .../lib/select2-3.4.1/select2_locale_sk.js | 0 .../lib/select2-3.4.1/select2_locale_sv.js | 0 .../lib/select2-3.4.1/select2_locale_tr.js | 0 .../lib/select2-3.4.1/select2_locale_ua.js | 0 .../lib/select2-3.4.1/select2_locale_vi.js | 0 .../lib/select2-3.4.1/select2_locale_zh-CN.js | 0 .../lib/select2-3.4.1/select2_locale_zh-TW.js | 0 .../resources/lib/select2-3.4.1/select2x2.png | Bin .../lib/zocial/zocial-regular-webfont.eot | Bin .../lib/zocial/zocial-regular-webfont.svg | 0 .../lib/zocial/zocial-regular-webfont.ttf | Bin .../lib/zocial/zocial-regular-webfont.woff | Bin .../common}/resources/lib/zocial/zocial.css | 0 .../email}/email-verification.ftl | 0 .../email}/event-login_error.ftl | 0 .../email}/event-remove_totp.ftl | 0 .../email}/event-update_password.ftl | 0 .../email}/event-update_totp.ftl | 0 .../email}/messages/messages_de.properties | 0 .../email}/messages/messages_en.properties | 0 .../email}/password-reset.ftl | 0 .../login}/resources/css/login.css | 0 .../login}/resources/img/login-bg.png | Bin .../login}/theme.properties | 0 .../welcome/resources}/favicon.ico | Bin .../welcome}/resources/index.html | 0 .../welcome}/resources/jboss_community.png | Bin .../welcome}/resources/keycloak.css | 0 .../welcome}/resources/keycloak_logo.png | Bin .../account}/resources/css/account.css | 0 .../account}/resources/img/favicon.ico | Bin .../resources/img/icon-sidebar-active.png | Bin .../account}/resources/img/keycloak-logo.png | Bin .../account}/resources/img/logo.png | Bin .../account}/theme.properties | 0 .../admin}/css/styles.css | 0 .../admin}/theme.properties | 0 .../login}/resources/css/login.css | 0 .../login/resources/img}/favicon.ico | Bin .../img/feedback-error-arrow-down.png | Bin .../resources/img/feedback-error-sign.png | Bin .../img/feedback-success-arrow-down.png | Bin .../resources/img/feedback-success-sign.png | Bin .../img/feedback-warning-arrow-down.png | Bin .../resources/img/feedback-warning-sign.png | Bin .../login}/resources/img/keycloak-logo.png | Bin .../login}/theme.properties | 0 .../keycloak/testutils/KeycloakServer.java | 3 +- 317 files changed, 24 insertions(+), 41 deletions(-) rename forms/common-themes/src/main/resources/theme/{account/base => base/account}/account.ftl (100%) rename forms/common-themes/src/main/resources/theme/{account/base => base/account}/draft.access.ftl (100%) rename forms/common-themes/src/main/resources/theme/{account/base => base/account}/federatedIdentity.ftl (100%) rename forms/common-themes/src/main/resources/theme/{account/base => base/account}/log.ftl (100%) rename forms/common-themes/src/main/resources/theme/{account/base => base/account}/messages/messages_de.properties (100%) rename forms/common-themes/src/main/resources/theme/{account/base => base/account}/messages/messages_en.properties (100%) rename forms/common-themes/src/main/resources/theme/{account/base => base/account}/password.ftl (100%) rename forms/common-themes/src/main/resources/theme/{account/base => base/account}/sessions.ftl (100%) rename forms/common-themes/src/main/resources/theme/{account/base => base/account}/template.ftl (100%) rename forms/common-themes/src/main/resources/theme/{account/base => base/account}/totp.ftl (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/index.ftl (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/css/styles.css (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/js/app.js (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/js/controllers/applications.js (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/js/controllers/oauth-clients.js (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/js/controllers/realm.js (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/js/controllers/users.js (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/js/loaders.js (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/js/services.js (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-clustering-node.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-clustering.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-credentials.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-detail.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-identity-provider.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-import.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-installation.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-keys.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-list.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-mappers-add.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-mappers.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-revocation.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-role-detail.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-role-list.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-saml-key-export.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-saml-key-import.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-saml-keys.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-scope-mappings.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/application-sessions.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/brute-force.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/claims.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/defense-headers.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/federated-generic.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/federated-kerberos.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/federated-ldap.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/home.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/menu.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/notfound.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/oauth-client-claims.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/oauth-client-credentials.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/oauth-client-detail.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/oauth-client-identity-provider.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/oauth-client-installation.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/oauth-client-list.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/oauth-client-mappers-add.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/oauth-client-mappers.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/oauth-client-protocol-mapper-detail.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/oauth-client-revocation.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/oauth-client-scope-mappings.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/protocol-mapper-detail.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-cache-settings.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-create.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-credentials.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-default-roles.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-detail.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-events-config.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-events.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-identity-provider-export.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-identity-provider-facebook.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-identity-provider-github.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-identity-provider-google.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-identity-provider-oidc.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-identity-provider-saml.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-identity-provider-social.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-identity-provider-twitter.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-identity-provider.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-keys.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-list.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-login-settings.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-menu.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-smtp.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-theme-settings.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/realm-tokens.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/role-detail.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/role-list.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/role-mappings.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/server-info.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/session-realm.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/session-revocation.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/user-attribute-entry.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/user-credentials.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/user-detail.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/user-federated-identity.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/user-federation.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/user-list.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/partials/user-sessions.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/templates/kc-dropdown.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/templates/kc-modal.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/templates/kc-navigation-application.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/templates/kc-navigation-oauth-client.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/templates/kc-navigation.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/resources/templates/kc-switch.html (100%) rename forms/common-themes/src/main/resources/theme/{admin/base => base/admin}/theme.properties (100%) rename forms/common-themes/src/main/resources/theme/{login/base => base/login}/code.ftl (100%) rename forms/common-themes/src/main/resources/theme/{login/base => base/login}/error.ftl (100%) rename forms/common-themes/src/main/resources/theme/{login/base => base/login}/info.ftl (100%) rename forms/common-themes/src/main/resources/theme/{login/base => base/login}/login-config-totp.ftl (100%) rename forms/common-themes/src/main/resources/theme/{login/base => base/login}/login-oauth-grant.ftl (100%) rename forms/common-themes/src/main/resources/theme/{login/base => base/login}/login-reset-password.ftl (100%) rename forms/common-themes/src/main/resources/theme/{login/base => base/login}/login-totp.ftl (100%) rename forms/common-themes/src/main/resources/theme/{login/base => base/login}/login-update-password.ftl (100%) rename forms/common-themes/src/main/resources/theme/{login/base => base/login}/login-update-profile.ftl (100%) rename forms/common-themes/src/main/resources/theme/{login/base => base/login}/login-verify-email.ftl (100%) rename forms/common-themes/src/main/resources/theme/{login/base => base/login}/login.ftl (100%) rename forms/common-themes/src/main/resources/theme/{login/base => base/login}/messages/messages_de.properties (100%) rename forms/common-themes/src/main/resources/theme/{login/base => base/login}/messages/messages_en.properties (100%) rename forms/common-themes/src/main/resources/theme/{login/base => base/login}/register.ftl (100%) rename forms/common-themes/src/main/resources/theme/{login/base => base/login}/template.ftl (100%) rename forms/common-themes/src/main/resources/theme/{account/keycloak => keycloak/account}/resources/css/account.css (100%) rename forms/common-themes/src/main/resources/theme/{account/keycloak => keycloak/account}/resources/img/header-bkgrnd.png (100%) rename forms/common-themes/src/main/resources/theme/{account/keycloak => keycloak/account}/theme.properties (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => keycloak/admin}/resources/css/admin-console.css (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => keycloak/admin}/resources/css/base-styles.css (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => keycloak/admin}/resources/css/img/sprite-table-nav.png (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => keycloak/admin}/resources/css/img/sprites.png (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => keycloak/admin}/resources/css/overrides.css (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => keycloak/admin}/resources/css/sprites.css (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => keycloak/admin}/resources/css/styles.css (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => keycloak/admin}/resources/css/tables.css (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => keycloak/admin}/resources/img/brand.svg (100%) rename forms/common-themes/src/main/resources/theme/{account/patternfly => keycloak/admin}/resources/img/favicon.ico (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => keycloak/admin}/resources/img/header-bkgrnd.png (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => keycloak/admin}/resources/img/icon-collapse-expand.png (100%) rename forms/common-themes/src/main/resources/theme/{account/patternfly => keycloak/admin}/resources/img/icon-sidebar-active.png (100%) rename forms/common-themes/src/main/resources/theme/{account/patternfly => keycloak/admin}/resources/img/logo.png (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => keycloak/admin}/resources/img/select-arrow.png (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => keycloak/admin}/resources/img/sprite-arrow-down.png (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => keycloak/admin}/resources/img/sprites-gray.png (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => keycloak/admin}/resources/img/sprites-gray.svg (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => keycloak/admin}/resources/img/sprites-white.png (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => keycloak/admin}/theme.properties (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/angular/angular-cookies.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/angular/angular-loader.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/angular/angular-mocks.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/angular/angular-resource.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/angular/angular-route.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/angular/angular-sanitize.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/angular/angular-scenario.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/angular/angular.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/angular/jstd-scenario-adapter-config.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/angular/jstd-scenario-adapter.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/angular/select2.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/angular/ui-bootstrap-tpls-0.11.0.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/angular/version.json (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/angular/version.txt (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.svg (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/components/font-awesome/fonts/FontAwesome.otf (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/components/font-awesome/fonts/fontawesome-webfont.eot (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/components/font-awesome/fonts/fontawesome-webfont.svg (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/components/font-awesome/fonts/fontawesome-webfont.ttf (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/components/font-awesome/fonts/fontawesome-webfont.woff (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/filesaver/FileSaver.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/fileupload/FileAPI.min.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/fileupload/angular-file-upload-html5-shim.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/fileupload/angular-file-upload-html5-shim.min.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/fileupload/angular-file-upload-shim.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/fileupload/angular-file-upload-shim.min.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/fileupload/angular-file-upload.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/fileupload/angular-file-upload.min.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/jquery/jquery-1.10.2.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/css/patternfly.css (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/css/patternfly.min.css (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.eot (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.svg (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.ttf (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.woff (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.eot (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.svg (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.ttf (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.woff (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.eot (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.svg (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.ttf (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.woff (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.eot (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.svg (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.ttf (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.woff (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.eot (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.svg (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.ttf (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.woff (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Light-webfont.eot (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Light-webfont.svg (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Light-webfont.ttf (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Light-webfont.woff (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.eot (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.svg (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.ttf (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.woff (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.eot (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.svg (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.ttf (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.woff (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.eot (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.svg (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.ttf (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.woff (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.eot (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.svg (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.ttf (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.woff (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.eot (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.svg (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.ttf (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.woff (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/img/bg-login.jpg (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/img/brand-lg.png (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/img/brand.png (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/img/brand.svg (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/img/logo.png (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/img/logo.svg (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/js/patternfly.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/patternfly/js/patternfly.min.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/LICENSE (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/README.md (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/component.json (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/release.sh (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2-spinner.gif (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2.css (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2.jquery.json (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2.min.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2.png (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_ar.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_ca.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_cs.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_da.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_de.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_el.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_en.js.template (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_es.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_et.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_eu.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_fi.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_fr.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_gl.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_he.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_hr.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_hu.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_id.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_is.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_it.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_ja.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_ko.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_lt.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_lv.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_mk.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_nl.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_no.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_pl.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_pt-BR.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_pt-PT.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_ro.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_ru.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_sk.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_sv.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_tr.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_ua.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_vi.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_zh-CN.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2_locale_zh-TW.js (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/select2-3.4.1/select2x2.png (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/zocial/zocial-regular-webfont.eot (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/zocial/zocial-regular-webfont.svg (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/zocial/zocial-regular-webfont.ttf (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/zocial/zocial-regular-webfont.woff (100%) rename forms/common-themes/src/main/resources/theme/{common/keycloak => keycloak/common}/resources/lib/zocial/zocial.css (100%) rename forms/common-themes/src/main/resources/theme/{email/keycloak => keycloak/email}/email-verification.ftl (100%) rename forms/common-themes/src/main/resources/theme/{email/keycloak => keycloak/email}/event-login_error.ftl (100%) rename forms/common-themes/src/main/resources/theme/{email/keycloak => keycloak/email}/event-remove_totp.ftl (100%) rename forms/common-themes/src/main/resources/theme/{email/keycloak => keycloak/email}/event-update_password.ftl (100%) rename forms/common-themes/src/main/resources/theme/{email/keycloak => keycloak/email}/event-update_totp.ftl (100%) rename forms/common-themes/src/main/resources/theme/{email/keycloak => keycloak/email}/messages/messages_de.properties (100%) rename forms/common-themes/src/main/resources/theme/{email/keycloak => keycloak/email}/messages/messages_en.properties (100%) rename forms/common-themes/src/main/resources/theme/{email/keycloak => keycloak/email}/password-reset.ftl (100%) rename forms/common-themes/src/main/resources/theme/{login/keycloak => keycloak/login}/resources/css/login.css (100%) rename forms/common-themes/src/main/resources/theme/{login/keycloak => keycloak/login}/resources/img/login-bg.png (100%) rename forms/common-themes/src/main/resources/theme/{login/keycloak => keycloak/login}/theme.properties (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak/resources/img => keycloak/welcome/resources}/favicon.ico (100%) rename forms/common-themes/src/main/resources/theme/{welcome/keycloak => keycloak/welcome}/resources/index.html (100%) rename forms/common-themes/src/main/resources/theme/{welcome/keycloak => keycloak/welcome}/resources/jboss_community.png (100%) rename forms/common-themes/src/main/resources/theme/{welcome/keycloak => keycloak/welcome}/resources/keycloak.css (100%) rename forms/common-themes/src/main/resources/theme/{welcome/keycloak => keycloak/welcome}/resources/keycloak_logo.png (100%) rename forms/common-themes/src/main/resources/theme/{account/patternfly => patternfly/account}/resources/css/account.css (100%) rename forms/common-themes/src/main/resources/theme/{login/patternfly => patternfly/account}/resources/img/favicon.ico (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => patternfly/account}/resources/img/icon-sidebar-active.png (100%) rename forms/common-themes/src/main/resources/theme/{account/patternfly => patternfly/account}/resources/img/keycloak-logo.png (100%) rename forms/common-themes/src/main/resources/theme/{admin/keycloak => patternfly/account}/resources/img/logo.png (100%) rename forms/common-themes/src/main/resources/theme/{account/patternfly => patternfly/account}/theme.properties (100%) rename forms/common-themes/src/main/resources/theme/{admin/patternfly/resources => patternfly/admin}/css/styles.css (100%) rename forms/common-themes/src/main/resources/theme/{admin/patternfly => patternfly/admin}/theme.properties (100%) rename forms/common-themes/src/main/resources/theme/{login/patternfly => patternfly/login}/resources/css/login.css (100%) rename forms/common-themes/src/main/resources/theme/{welcome/keycloak/resources => patternfly/login/resources/img}/favicon.ico (100%) rename forms/common-themes/src/main/resources/theme/{login/patternfly => patternfly/login}/resources/img/feedback-error-arrow-down.png (100%) rename forms/common-themes/src/main/resources/theme/{login/patternfly => patternfly/login}/resources/img/feedback-error-sign.png (100%) rename forms/common-themes/src/main/resources/theme/{login/patternfly => patternfly/login}/resources/img/feedback-success-arrow-down.png (100%) rename forms/common-themes/src/main/resources/theme/{login/patternfly => patternfly/login}/resources/img/feedback-success-sign.png (100%) rename forms/common-themes/src/main/resources/theme/{login/patternfly => patternfly/login}/resources/img/feedback-warning-arrow-down.png (100%) rename forms/common-themes/src/main/resources/theme/{login/patternfly => patternfly/login}/resources/img/feedback-warning-sign.png (100%) rename forms/common-themes/src/main/resources/theme/{login/patternfly => patternfly/login}/resources/img/keycloak-logo.png (100%) rename forms/common-themes/src/main/resources/theme/{login/patternfly => patternfly/login}/theme.properties (100%) diff --git a/forms/common-themes/src/main/java/org/keycloak/theme/ClassLoaderTheme.java b/forms/common-themes/src/main/java/org/keycloak/theme/ClassLoaderTheme.java index c95edd2ea7..3e92be880b 100755 --- a/forms/common-themes/src/main/java/org/keycloak/theme/ClassLoaderTheme.java +++ b/forms/common-themes/src/main/java/org/keycloak/theme/ClassLoaderTheme.java @@ -2,13 +2,11 @@ package org.keycloak.theme; import org.keycloak.freemarker.Theme; -import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.Locale; import java.util.Properties; -import java.util.ResourceBundle; /** * @author Stian Thorgersen @@ -42,7 +40,7 @@ public class ClassLoaderTheme implements Theme { this.type = type; this.classLoader = classLoader; - String themeRoot = "theme/" + type.toString().toLowerCase() + "/" + name + "/"; + String themeRoot = "theme/" + name + "/" + type.toString().toLowerCase() + "/"; this.templateRoot = themeRoot; this.resourceRoot = themeRoot + "resources/"; @@ -60,10 +58,6 @@ public class ClassLoaderTheme implements Theme { } } - public ClassLoaderTheme() { - - } - @Override public String getName() { return name; diff --git a/forms/common-themes/src/main/java/org/keycloak/theme/FolderThemeProvider.java b/forms/common-themes/src/main/java/org/keycloak/theme/FolderThemeProvider.java index b8c7c89840..df653699bb 100755 --- a/forms/common-themes/src/main/java/org/keycloak/theme/FolderThemeProvider.java +++ b/forms/common-themes/src/main/java/org/keycloak/theme/FolderThemeProvider.java @@ -15,10 +15,10 @@ import java.util.Set; */ public class FolderThemeProvider implements ThemeProvider { - private File rootDir; + private File themesDir; - public FolderThemeProvider(File rootDir) { - this.rootDir = rootDir; + public FolderThemeProvider(File themesDir) { + this.themesDir = themesDir; } @Override @@ -28,51 +28,41 @@ public class FolderThemeProvider implements ThemeProvider { @Override public Theme getTheme(String name, Theme.Type type) throws IOException { - if (hasTheme(name, type)) { - return new FolderTheme(new File(getTypeDir(type), name), type); - } - return null; + File themeDir = getThemeDir(name, type); + return themeDir.isDirectory() ? new FolderTheme(themeDir, type) : null; } @Override public Set nameSet(Theme.Type type) { - File typeDir = getTypeDir(type); - if (typeDir != null) { - File[] themes = typeDir.listFiles(new FileFilter() { - @Override - public boolean accept(File pathname) { - return pathname.isDirectory(); - } - }); - + final String typeName = type.name().toLowerCase(); + File[] themeDirs = themesDir.listFiles(new FileFilter() { + @Override + public boolean accept(File pathname) { + return pathname.isDirectory() && new File(pathname, typeName).isDirectory(); + } + }); + if (themeDirs != null) { Set names = new HashSet(); - for (File t : themes) { - names.add(t.getName()); + for (File themeDir : themeDirs) { + names.add(themeDir.getName()); } return names; + } else { + return Collections.emptySet(); } - - return Collections.emptySet(); - } - - private File getTypeDir(Theme.Type type) { - if (rootDir != null && rootDir.isDirectory()) { - File typeDir = new File(rootDir, type.name().toLowerCase()); - if (typeDir.isDirectory()) { - return typeDir; - } - } - return null; } @Override public boolean hasTheme(String name, Theme.Type type) { - File typeDir = getTypeDir(type); - return typeDir != null && new File(typeDir, name).isDirectory(); + return getThemeDir(name, type).isDirectory(); } @Override public void close() { } + private File getThemeDir(String name, Theme.Type type) { + return new File(themesDir, name + File.separator + type.name().toLowerCase()); + } + } diff --git a/forms/common-themes/src/main/resources/theme/account/base/account.ftl b/forms/common-themes/src/main/resources/theme/base/account/account.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/base/account.ftl rename to forms/common-themes/src/main/resources/theme/base/account/account.ftl diff --git a/forms/common-themes/src/main/resources/theme/account/base/draft.access.ftl b/forms/common-themes/src/main/resources/theme/base/account/draft.access.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/base/draft.access.ftl rename to forms/common-themes/src/main/resources/theme/base/account/draft.access.ftl diff --git a/forms/common-themes/src/main/resources/theme/account/base/federatedIdentity.ftl b/forms/common-themes/src/main/resources/theme/base/account/federatedIdentity.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/base/federatedIdentity.ftl rename to forms/common-themes/src/main/resources/theme/base/account/federatedIdentity.ftl diff --git a/forms/common-themes/src/main/resources/theme/account/base/log.ftl b/forms/common-themes/src/main/resources/theme/base/account/log.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/base/log.ftl rename to forms/common-themes/src/main/resources/theme/base/account/log.ftl diff --git a/forms/common-themes/src/main/resources/theme/account/base/messages/messages_de.properties b/forms/common-themes/src/main/resources/theme/base/account/messages/messages_de.properties similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/base/messages/messages_de.properties rename to forms/common-themes/src/main/resources/theme/base/account/messages/messages_de.properties diff --git a/forms/common-themes/src/main/resources/theme/account/base/messages/messages_en.properties b/forms/common-themes/src/main/resources/theme/base/account/messages/messages_en.properties similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/base/messages/messages_en.properties rename to forms/common-themes/src/main/resources/theme/base/account/messages/messages_en.properties diff --git a/forms/common-themes/src/main/resources/theme/account/base/password.ftl b/forms/common-themes/src/main/resources/theme/base/account/password.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/base/password.ftl rename to forms/common-themes/src/main/resources/theme/base/account/password.ftl diff --git a/forms/common-themes/src/main/resources/theme/account/base/sessions.ftl b/forms/common-themes/src/main/resources/theme/base/account/sessions.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/base/sessions.ftl rename to forms/common-themes/src/main/resources/theme/base/account/sessions.ftl diff --git a/forms/common-themes/src/main/resources/theme/account/base/template.ftl b/forms/common-themes/src/main/resources/theme/base/account/template.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/base/template.ftl rename to forms/common-themes/src/main/resources/theme/base/account/template.ftl diff --git a/forms/common-themes/src/main/resources/theme/account/base/totp.ftl b/forms/common-themes/src/main/resources/theme/base/account/totp.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/base/totp.ftl rename to forms/common-themes/src/main/resources/theme/base/account/totp.ftl diff --git a/forms/common-themes/src/main/resources/theme/admin/base/index.ftl b/forms/common-themes/src/main/resources/theme/base/admin/index.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/index.ftl rename to forms/common-themes/src/main/resources/theme/base/admin/index.ftl diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/css/styles.css b/forms/common-themes/src/main/resources/theme/base/admin/resources/css/styles.css similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/css/styles.css rename to forms/common-themes/src/main/resources/theme/base/admin/resources/css/styles.css diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/app.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/js/app.js rename to forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/applications.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js rename to forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/applications.js diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/oauth-clients.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/oauth-clients.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/oauth-clients.js rename to forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/oauth-clients.js diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/realm.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/realm.js rename to forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/users.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/users.js rename to forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/loaders.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/loaders.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/js/loaders.js rename to forms/common-themes/src/main/resources/theme/base/admin/resources/js/loaders.js diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/services.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/services.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/js/services.js rename to forms/common-themes/src/main/resources/theme/base/admin/resources/js/services.js diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-clustering-node.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-clustering-node.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-clustering-node.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-clustering-node.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-clustering.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-clustering.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-clustering.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-clustering.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-credentials.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-credentials.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-credentials.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-credentials.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-detail.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-detail.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-detail.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-identity-provider.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-identity-provider.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-identity-provider.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-identity-provider.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-import.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-import.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-import.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-import.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-installation.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-installation.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-installation.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-installation.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-keys.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-keys.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-keys.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-keys.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-list.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-list.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-list.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-mappers-add.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-mappers-add.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-mappers-add.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-mappers-add.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-mappers.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-mappers.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-mappers.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-mappers.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-revocation.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-revocation.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-revocation.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-revocation.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-role-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-role-detail.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-role-detail.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-role-detail.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-role-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-role-list.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-role-list.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-role-list.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-saml-key-export.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-saml-key-export.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-saml-key-export.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-saml-key-export.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-saml-key-import.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-saml-key-import.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-saml-key-import.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-saml-key-import.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-saml-keys.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-saml-keys.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-saml-keys.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-saml-keys.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-scope-mappings.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-scope-mappings.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-scope-mappings.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-scope-mappings.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-sessions.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-sessions.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-sessions.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/application-sessions.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/brute-force.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/brute-force.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/brute-force.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/brute-force.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/claims.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/claims.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/claims.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/claims.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/defense-headers.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/defense-headers.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/defense-headers.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/defense-headers.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/federated-generic.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-generic.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/federated-generic.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-generic.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/federated-kerberos.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-kerberos.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/federated-kerberos.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-kerberos.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/federated-ldap.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/federated-ldap.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/home.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/home.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/home.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/home.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/menu.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/menu.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/menu.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/menu.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/notfound.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/notfound.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/notfound.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/notfound.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-claims.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-claims.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-claims.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-claims.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-credentials.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-credentials.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-credentials.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-credentials.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-detail.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-detail.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-detail.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-identity-provider.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-identity-provider.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-identity-provider.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-identity-provider.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-installation.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-installation.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-installation.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-installation.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-list.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-list.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-list.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-mappers-add.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-mappers-add.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-mappers-add.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-mappers-add.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-mappers.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-mappers.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-mappers.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-mappers.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-protocol-mapper-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-protocol-mapper-detail.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-protocol-mapper-detail.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-protocol-mapper-detail.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-revocation.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-revocation.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-revocation.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-revocation.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-scope-mappings.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-scope-mappings.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-scope-mappings.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/oauth-client-scope-mappings.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/protocol-mapper-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/protocol-mapper-detail.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/protocol-mapper-detail.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/protocol-mapper-detail.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-cache-settings.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-cache-settings.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-cache-settings.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-cache-settings.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-create.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-create.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-create.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-create.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-credentials.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-credentials.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-credentials.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-credentials.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-default-roles.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-default-roles.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-default-roles.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-default-roles.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-detail.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-detail.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-detail.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-events-config.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events-config.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-events-config.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events-config.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-events.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-events.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-export.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-export.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-export.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-export.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-facebook.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-facebook.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-facebook.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-facebook.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-github.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-github.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-github.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-github.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-google.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-google.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-google.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-google.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-oidc.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-oidc.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-oidc.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-oidc.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-saml.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-saml.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-saml.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-saml.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-social.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-social.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-social.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-social.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-twitter.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-twitter.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-twitter.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-twitter.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-keys.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-keys.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-keys.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-keys.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-list.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-list.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-list.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-login-settings.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-login-settings.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-login-settings.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-login-settings.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-menu.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-menu.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-menu.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-menu.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-smtp.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-smtp.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-smtp.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-smtp.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-theme-settings.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-theme-settings.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-theme-settings.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-theme-settings.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-tokens.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-tokens.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-tokens.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-tokens.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/role-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-detail.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/role-detail.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-detail.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/role-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/role-list.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/role-mappings.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-mappings.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/role-mappings.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-mappings.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/server-info.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/server-info.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/server-info.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/server-info.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-realm.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/session-realm.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-realm.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/session-realm.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-revocation.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/session-revocation.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-revocation.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/session-revocation.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-attribute-entry.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-attribute-entry.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-attribute-entry.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-attribute-entry.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-credentials.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-credentials.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-credentials.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-credentials.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-detail.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-detail.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-detail.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-federated-identity.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federated-identity.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-federated-identity.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federated-identity.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-federation.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federation.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-federation.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federation.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-list.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-sessions.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-sessions.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/templates/kc-dropdown.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-dropdown.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/templates/kc-dropdown.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-dropdown.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/templates/kc-modal.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-modal.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/templates/kc-modal.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-modal.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/templates/kc-navigation-application.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-navigation-application.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/templates/kc-navigation-application.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-navigation-application.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/templates/kc-navigation-oauth-client.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-navigation-oauth-client.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/templates/kc-navigation-oauth-client.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-navigation-oauth-client.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/templates/kc-navigation.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-navigation.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/templates/kc-navigation.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-navigation.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/templates/kc-switch.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-switch.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/resources/templates/kc-switch.html rename to forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-switch.html diff --git a/forms/common-themes/src/main/resources/theme/admin/base/theme.properties b/forms/common-themes/src/main/resources/theme/base/admin/theme.properties similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/base/theme.properties rename to forms/common-themes/src/main/resources/theme/base/admin/theme.properties diff --git a/forms/common-themes/src/main/resources/theme/login/base/code.ftl b/forms/common-themes/src/main/resources/theme/base/login/code.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/base/code.ftl rename to forms/common-themes/src/main/resources/theme/base/login/code.ftl diff --git a/forms/common-themes/src/main/resources/theme/login/base/error.ftl b/forms/common-themes/src/main/resources/theme/base/login/error.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/base/error.ftl rename to forms/common-themes/src/main/resources/theme/base/login/error.ftl diff --git a/forms/common-themes/src/main/resources/theme/login/base/info.ftl b/forms/common-themes/src/main/resources/theme/base/login/info.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/base/info.ftl rename to forms/common-themes/src/main/resources/theme/base/login/info.ftl diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl b/forms/common-themes/src/main/resources/theme/base/login/login-config-totp.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl rename to forms/common-themes/src/main/resources/theme/base/login/login-config-totp.ftl diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-oauth-grant.ftl b/forms/common-themes/src/main/resources/theme/base/login/login-oauth-grant.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/base/login-oauth-grant.ftl rename to forms/common-themes/src/main/resources/theme/base/login/login-oauth-grant.ftl diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-reset-password.ftl b/forms/common-themes/src/main/resources/theme/base/login/login-reset-password.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/base/login-reset-password.ftl rename to forms/common-themes/src/main/resources/theme/base/login/login-reset-password.ftl diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-totp.ftl b/forms/common-themes/src/main/resources/theme/base/login/login-totp.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/base/login-totp.ftl rename to forms/common-themes/src/main/resources/theme/base/login/login-totp.ftl diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-update-password.ftl b/forms/common-themes/src/main/resources/theme/base/login/login-update-password.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/base/login-update-password.ftl rename to forms/common-themes/src/main/resources/theme/base/login/login-update-password.ftl diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-update-profile.ftl b/forms/common-themes/src/main/resources/theme/base/login/login-update-profile.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/base/login-update-profile.ftl rename to forms/common-themes/src/main/resources/theme/base/login/login-update-profile.ftl diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-verify-email.ftl b/forms/common-themes/src/main/resources/theme/base/login/login-verify-email.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/base/login-verify-email.ftl rename to forms/common-themes/src/main/resources/theme/base/login/login-verify-email.ftl diff --git a/forms/common-themes/src/main/resources/theme/login/base/login.ftl b/forms/common-themes/src/main/resources/theme/base/login/login.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/base/login.ftl rename to forms/common-themes/src/main/resources/theme/base/login/login.ftl diff --git a/forms/common-themes/src/main/resources/theme/login/base/messages/messages_de.properties b/forms/common-themes/src/main/resources/theme/base/login/messages/messages_de.properties similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/base/messages/messages_de.properties rename to forms/common-themes/src/main/resources/theme/base/login/messages/messages_de.properties diff --git a/forms/common-themes/src/main/resources/theme/login/base/messages/messages_en.properties b/forms/common-themes/src/main/resources/theme/base/login/messages/messages_en.properties similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/base/messages/messages_en.properties rename to forms/common-themes/src/main/resources/theme/base/login/messages/messages_en.properties diff --git a/forms/common-themes/src/main/resources/theme/login/base/register.ftl b/forms/common-themes/src/main/resources/theme/base/login/register.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/base/register.ftl rename to forms/common-themes/src/main/resources/theme/base/login/register.ftl diff --git a/forms/common-themes/src/main/resources/theme/login/base/template.ftl b/forms/common-themes/src/main/resources/theme/base/login/template.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/base/template.ftl rename to forms/common-themes/src/main/resources/theme/base/login/template.ftl diff --git a/forms/common-themes/src/main/resources/theme/account/keycloak/resources/css/account.css b/forms/common-themes/src/main/resources/theme/keycloak/account/resources/css/account.css similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/keycloak/resources/css/account.css rename to forms/common-themes/src/main/resources/theme/keycloak/account/resources/css/account.css diff --git a/forms/common-themes/src/main/resources/theme/account/keycloak/resources/img/header-bkgrnd.png b/forms/common-themes/src/main/resources/theme/keycloak/account/resources/img/header-bkgrnd.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/keycloak/resources/img/header-bkgrnd.png rename to forms/common-themes/src/main/resources/theme/keycloak/account/resources/img/header-bkgrnd.png diff --git a/forms/common-themes/src/main/resources/theme/account/keycloak/theme.properties b/forms/common-themes/src/main/resources/theme/keycloak/account/theme.properties similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/keycloak/theme.properties rename to forms/common-themes/src/main/resources/theme/keycloak/account/theme.properties diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/admin-console.css b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/admin-console.css similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/admin-console.css rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/admin-console.css diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/base-styles.css b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/base-styles.css similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/base-styles.css rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/base-styles.css diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/img/sprite-table-nav.png b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/img/sprite-table-nav.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/img/sprite-table-nav.png rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/img/sprite-table-nav.png diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/img/sprites.png b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/img/sprites.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/img/sprites.png rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/img/sprites.png diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/overrides.css b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/overrides.css similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/overrides.css rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/overrides.css diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/sprites.css b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/sprites.css similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/sprites.css rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/sprites.css diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/styles.css b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/styles.css similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/styles.css rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/styles.css diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/tables.css b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/tables.css similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/tables.css rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/tables.css diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/brand.svg b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/brand.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/brand.svg rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/brand.svg diff --git a/forms/common-themes/src/main/resources/theme/account/patternfly/resources/img/favicon.ico b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/favicon.ico similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/patternfly/resources/img/favicon.ico rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/favicon.ico diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/header-bkgrnd.png b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/header-bkgrnd.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/header-bkgrnd.png rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/header-bkgrnd.png diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/icon-collapse-expand.png b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/icon-collapse-expand.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/icon-collapse-expand.png rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/icon-collapse-expand.png diff --git a/forms/common-themes/src/main/resources/theme/account/patternfly/resources/img/icon-sidebar-active.png b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/icon-sidebar-active.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/patternfly/resources/img/icon-sidebar-active.png rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/icon-sidebar-active.png diff --git a/forms/common-themes/src/main/resources/theme/account/patternfly/resources/img/logo.png b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/logo.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/patternfly/resources/img/logo.png rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/logo.png diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/select-arrow.png b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/select-arrow.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/select-arrow.png rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/select-arrow.png diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/sprite-arrow-down.png b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/sprite-arrow-down.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/sprite-arrow-down.png rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/sprite-arrow-down.png diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/sprites-gray.png b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/sprites-gray.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/sprites-gray.png rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/sprites-gray.png diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/sprites-gray.svg b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/sprites-gray.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/sprites-gray.svg rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/sprites-gray.svg diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/sprites-white.png b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/sprites-white.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/sprites-white.png rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/sprites-white.png diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/theme.properties b/forms/common-themes/src/main/resources/theme/keycloak/admin/theme.properties similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/theme.properties rename to forms/common-themes/src/main/resources/theme/keycloak/admin/theme.properties diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/angular-cookies.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular-cookies.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/angular-cookies.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular-cookies.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/angular-loader.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular-loader.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/angular-loader.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular-loader.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/angular-mocks.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular-mocks.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/angular-mocks.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular-mocks.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/angular-resource.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular-resource.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/angular-resource.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular-resource.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/angular-route.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular-route.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/angular-route.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular-route.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/angular-sanitize.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular-sanitize.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/angular-sanitize.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular-sanitize.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/angular-scenario.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular-scenario.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/angular-scenario.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular-scenario.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/angular.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/angular.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/jstd-scenario-adapter-config.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/jstd-scenario-adapter-config.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/jstd-scenario-adapter-config.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/jstd-scenario-adapter-config.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/jstd-scenario-adapter.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/jstd-scenario-adapter.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/jstd-scenario-adapter.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/jstd-scenario-adapter.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/select2.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/select2.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/select2.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/select2.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/ui-bootstrap-tpls-0.11.0.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/ui-bootstrap-tpls-0.11.0.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/ui-bootstrap-tpls-0.11.0.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/ui-bootstrap-tpls-0.11.0.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/version.json b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/version.json similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/version.json rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/version.json diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/version.txt b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/version.txt similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/angular/version.txt rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/angular/version.txt diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.svg rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.svg diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/font-awesome/fonts/FontAwesome.otf b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/font-awesome/fonts/FontAwesome.otf rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/font-awesome/fonts/FontAwesome.otf diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/font-awesome/fonts/fontawesome-webfont.eot b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/font-awesome/fonts/fontawesome-webfont.eot rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/font-awesome/fonts/fontawesome-webfont.eot diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/font-awesome/fonts/fontawesome-webfont.svg b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/font-awesome/fonts/fontawesome-webfont.svg rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/font-awesome/fonts/fontawesome-webfont.svg diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/font-awesome/fonts/fontawesome-webfont.ttf b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/font-awesome/fonts/fontawesome-webfont.ttf rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/font-awesome/fonts/fontawesome-webfont.woff b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/components/font-awesome/fonts/fontawesome-webfont.woff rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/components/font-awesome/fonts/fontawesome-webfont.woff diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/filesaver/FileSaver.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/filesaver/FileSaver.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/filesaver/FileSaver.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/filesaver/FileSaver.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/fileupload/FileAPI.min.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/fileupload/FileAPI.min.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/fileupload/FileAPI.min.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/fileupload/FileAPI.min.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/fileupload/angular-file-upload-html5-shim.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/fileupload/angular-file-upload-html5-shim.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/fileupload/angular-file-upload-html5-shim.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/fileupload/angular-file-upload-html5-shim.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/fileupload/angular-file-upload-html5-shim.min.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/fileupload/angular-file-upload-html5-shim.min.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/fileupload/angular-file-upload-html5-shim.min.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/fileupload/angular-file-upload-html5-shim.min.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/fileupload/angular-file-upload-shim.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/fileupload/angular-file-upload-shim.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/fileupload/angular-file-upload-shim.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/fileupload/angular-file-upload-shim.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/fileupload/angular-file-upload-shim.min.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/fileupload/angular-file-upload-shim.min.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/fileupload/angular-file-upload-shim.min.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/fileupload/angular-file-upload-shim.min.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/fileupload/angular-file-upload.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/fileupload/angular-file-upload.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/fileupload/angular-file-upload.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/fileupload/angular-file-upload.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/fileupload/angular-file-upload.min.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/fileupload/angular-file-upload.min.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/fileupload/angular-file-upload.min.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/fileupload/angular-file-upload.min.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/jquery/jquery-1.10.2.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/jquery/jquery-1.10.2.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/jquery/jquery-1.10.2.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/jquery/jquery-1.10.2.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/css/patternfly.css b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/css/patternfly.css similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/css/patternfly.css rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/css/patternfly.css diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/css/patternfly.min.css b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/css/patternfly.min.css similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/css/patternfly.min.css rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/css/patternfly.min.css diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.eot b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.eot similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.eot rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.eot diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.svg b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.svg rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.svg diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.ttf b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.ttf similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.ttf rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.ttf diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.woff b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.woff similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.woff rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Bold-webfont.woff diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.eot b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.eot similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.eot rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.eot diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.svg b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.svg rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.svg diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.ttf b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.ttf similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.ttf rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.ttf diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.woff b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.woff similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.woff rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-BoldItalic-webfont.woff diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.eot b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.eot similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.eot rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.eot diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.svg b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.svg rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.svg diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.ttf b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.ttf similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.ttf rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.ttf diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.woff b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.woff similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.woff rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-ExtraBold-webfont.woff diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.eot b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.eot similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.eot rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.eot diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.svg b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.svg rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.svg diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.ttf b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.ttf similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.ttf rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.ttf diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.woff b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.woff similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.woff rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-ExtraBoldItalic-webfont.woff diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.eot b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.eot similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.eot rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.eot diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.svg b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.svg rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.svg diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.ttf b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.ttf similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.ttf rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.ttf diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.woff b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.woff similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.woff rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Italic-webfont.woff diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Light-webfont.eot b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Light-webfont.eot similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Light-webfont.eot rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Light-webfont.eot diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Light-webfont.svg b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Light-webfont.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Light-webfont.svg rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Light-webfont.svg diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Light-webfont.ttf b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Light-webfont.ttf similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Light-webfont.ttf rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Light-webfont.ttf diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Light-webfont.woff b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Light-webfont.woff similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Light-webfont.woff rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Light-webfont.woff diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.eot b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.eot similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.eot rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.eot diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.svg b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.svg rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.svg diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.ttf b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.ttf similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.ttf rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.ttf diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.woff b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.woff similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.woff rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-LightItalic-webfont.woff diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.eot b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.eot similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.eot rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.eot diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.svg b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.svg rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.svg diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.ttf b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.ttf similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.ttf rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.ttf diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.woff b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.woff similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.woff rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Regular-webfont.woff diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.eot b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.eot similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.eot rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.eot diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.svg b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.svg rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.svg diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.ttf b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.ttf similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.ttf rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.ttf diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.woff b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.woff similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.woff rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-Semibold-webfont.woff diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.eot b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.eot similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.eot rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.eot diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.svg b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.svg rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.svg diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.ttf b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.ttf similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.ttf rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.ttf diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.woff b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.woff similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.woff rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/OpenSans-SemiboldItalic-webfont.woff diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.eot b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.eot similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.eot rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.eot diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.svg b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.svg rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.svg diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.ttf b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.ttf similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.ttf rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.ttf diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.woff b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.woff similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.woff rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/fonts/PatternFlyIcons-webfont.woff diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/img/bg-login.jpg b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/bg-login.jpg similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/img/bg-login.jpg rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/bg-login.jpg diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/img/brand-lg.png b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/brand-lg.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/img/brand-lg.png rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/brand-lg.png diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/img/brand.png b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/brand.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/img/brand.png rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/brand.png diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/img/brand.svg b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/brand.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/img/brand.svg rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/brand.svg diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/img/logo.png b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/logo.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/img/logo.png rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/logo.png diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/img/logo.svg b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/logo.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/img/logo.svg rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/logo.svg diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/js/patternfly.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/js/patternfly.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/js/patternfly.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/js/patternfly.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/js/patternfly.min.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/js/patternfly.min.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/patternfly/js/patternfly.min.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/js/patternfly.min.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/LICENSE b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/LICENSE similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/LICENSE rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/LICENSE diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/README.md b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/README.md similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/README.md rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/README.md diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/component.json b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/component.json similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/component.json rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/component.json diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/release.sh b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/release.sh similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/release.sh rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/release.sh diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2-spinner.gif b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2-spinner.gif similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2-spinner.gif rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2-spinner.gif diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2.css b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2.css similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2.css rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2.css diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2.jquery.json b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2.jquery.json similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2.jquery.json rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2.jquery.json diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2.min.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2.min.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2.min.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2.min.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2.png b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2.png rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2.png diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_ar.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ar.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_ar.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ar.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_ca.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ca.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_ca.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ca.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_cs.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_cs.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_cs.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_cs.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_da.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_da.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_da.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_da.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_de.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_de.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_de.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_de.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_el.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_el.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_el.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_el.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_en.js.template b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_en.js.template similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_en.js.template rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_en.js.template diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_es.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_es.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_es.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_es.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_et.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_et.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_et.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_et.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_eu.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_eu.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_eu.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_eu.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_fi.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_fi.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_fi.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_fi.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_fr.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_fr.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_fr.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_fr.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_gl.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_gl.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_gl.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_gl.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_he.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_he.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_he.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_he.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_hr.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_hr.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_hr.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_hr.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_hu.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_hu.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_hu.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_hu.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_id.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_id.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_id.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_id.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_is.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_is.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_is.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_is.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_it.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_it.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_it.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_it.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_ja.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ja.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_ja.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ja.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_ko.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ko.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_ko.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ko.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_lt.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_lt.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_lt.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_lt.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_lv.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_lv.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_lv.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_lv.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_mk.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_mk.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_mk.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_mk.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_nl.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_nl.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_nl.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_nl.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_no.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_no.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_no.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_no.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_pl.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_pl.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_pl.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_pl.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_pt-BR.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_pt-BR.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_pt-BR.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_pt-BR.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_pt-PT.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_pt-PT.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_pt-PT.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_pt-PT.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_ro.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ro.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_ro.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ro.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_ru.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ru.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_ru.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ru.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_sk.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_sk.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_sk.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_sk.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_sv.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_sv.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_sv.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_sv.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_tr.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_tr.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_tr.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_tr.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_ua.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ua.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_ua.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ua.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_vi.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_vi.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_vi.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_vi.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_zh-CN.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_zh-CN.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_zh-CN.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_zh-CN.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_zh-TW.js b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_zh-TW.js similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2_locale_zh-TW.js rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_zh-TW.js diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2x2.png b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2x2.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/select2-3.4.1/select2x2.png rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2x2.png diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/zocial/zocial-regular-webfont.eot b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/zocial/zocial-regular-webfont.eot similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/zocial/zocial-regular-webfont.eot rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/zocial/zocial-regular-webfont.eot diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/zocial/zocial-regular-webfont.svg b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/zocial/zocial-regular-webfont.svg similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/zocial/zocial-regular-webfont.svg rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/zocial/zocial-regular-webfont.svg diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/zocial/zocial-regular-webfont.ttf b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/zocial/zocial-regular-webfont.ttf similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/zocial/zocial-regular-webfont.ttf rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/zocial/zocial-regular-webfont.ttf diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/zocial/zocial-regular-webfont.woff b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/zocial/zocial-regular-webfont.woff similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/zocial/zocial-regular-webfont.woff rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/zocial/zocial-regular-webfont.woff diff --git a/forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/zocial/zocial.css b/forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/zocial/zocial.css similarity index 100% rename from forms/common-themes/src/main/resources/theme/common/keycloak/resources/lib/zocial/zocial.css rename to forms/common-themes/src/main/resources/theme/keycloak/common/resources/lib/zocial/zocial.css diff --git a/forms/common-themes/src/main/resources/theme/email/keycloak/email-verification.ftl b/forms/common-themes/src/main/resources/theme/keycloak/email/email-verification.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/email/keycloak/email-verification.ftl rename to forms/common-themes/src/main/resources/theme/keycloak/email/email-verification.ftl diff --git a/forms/common-themes/src/main/resources/theme/email/keycloak/event-login_error.ftl b/forms/common-themes/src/main/resources/theme/keycloak/email/event-login_error.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/email/keycloak/event-login_error.ftl rename to forms/common-themes/src/main/resources/theme/keycloak/email/event-login_error.ftl diff --git a/forms/common-themes/src/main/resources/theme/email/keycloak/event-remove_totp.ftl b/forms/common-themes/src/main/resources/theme/keycloak/email/event-remove_totp.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/email/keycloak/event-remove_totp.ftl rename to forms/common-themes/src/main/resources/theme/keycloak/email/event-remove_totp.ftl diff --git a/forms/common-themes/src/main/resources/theme/email/keycloak/event-update_password.ftl b/forms/common-themes/src/main/resources/theme/keycloak/email/event-update_password.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/email/keycloak/event-update_password.ftl rename to forms/common-themes/src/main/resources/theme/keycloak/email/event-update_password.ftl diff --git a/forms/common-themes/src/main/resources/theme/email/keycloak/event-update_totp.ftl b/forms/common-themes/src/main/resources/theme/keycloak/email/event-update_totp.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/email/keycloak/event-update_totp.ftl rename to forms/common-themes/src/main/resources/theme/keycloak/email/event-update_totp.ftl diff --git a/forms/common-themes/src/main/resources/theme/email/keycloak/messages/messages_de.properties b/forms/common-themes/src/main/resources/theme/keycloak/email/messages/messages_de.properties similarity index 100% rename from forms/common-themes/src/main/resources/theme/email/keycloak/messages/messages_de.properties rename to forms/common-themes/src/main/resources/theme/keycloak/email/messages/messages_de.properties diff --git a/forms/common-themes/src/main/resources/theme/email/keycloak/messages/messages_en.properties b/forms/common-themes/src/main/resources/theme/keycloak/email/messages/messages_en.properties similarity index 100% rename from forms/common-themes/src/main/resources/theme/email/keycloak/messages/messages_en.properties rename to forms/common-themes/src/main/resources/theme/keycloak/email/messages/messages_en.properties diff --git a/forms/common-themes/src/main/resources/theme/email/keycloak/password-reset.ftl b/forms/common-themes/src/main/resources/theme/keycloak/email/password-reset.ftl similarity index 100% rename from forms/common-themes/src/main/resources/theme/email/keycloak/password-reset.ftl rename to forms/common-themes/src/main/resources/theme/keycloak/email/password-reset.ftl diff --git a/forms/common-themes/src/main/resources/theme/login/keycloak/resources/css/login.css b/forms/common-themes/src/main/resources/theme/keycloak/login/resources/css/login.css similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/keycloak/resources/css/login.css rename to forms/common-themes/src/main/resources/theme/keycloak/login/resources/css/login.css diff --git a/forms/common-themes/src/main/resources/theme/login/keycloak/resources/img/login-bg.png b/forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/login-bg.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/keycloak/resources/img/login-bg.png rename to forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/login-bg.png diff --git a/forms/common-themes/src/main/resources/theme/login/keycloak/theme.properties b/forms/common-themes/src/main/resources/theme/keycloak/login/theme.properties similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/keycloak/theme.properties rename to forms/common-themes/src/main/resources/theme/keycloak/login/theme.properties diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/favicon.ico b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/favicon.ico similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/favicon.ico rename to forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/favicon.ico diff --git a/forms/common-themes/src/main/resources/theme/welcome/keycloak/resources/index.html b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/index.html similarity index 100% rename from forms/common-themes/src/main/resources/theme/welcome/keycloak/resources/index.html rename to forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/index.html diff --git a/forms/common-themes/src/main/resources/theme/welcome/keycloak/resources/jboss_community.png b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/jboss_community.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/welcome/keycloak/resources/jboss_community.png rename to forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/jboss_community.png diff --git a/forms/common-themes/src/main/resources/theme/welcome/keycloak/resources/keycloak.css b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/keycloak.css similarity index 100% rename from forms/common-themes/src/main/resources/theme/welcome/keycloak/resources/keycloak.css rename to forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/keycloak.css diff --git a/forms/common-themes/src/main/resources/theme/welcome/keycloak/resources/keycloak_logo.png b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/keycloak_logo.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/welcome/keycloak/resources/keycloak_logo.png rename to forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/keycloak_logo.png diff --git a/forms/common-themes/src/main/resources/theme/account/patternfly/resources/css/account.css b/forms/common-themes/src/main/resources/theme/patternfly/account/resources/css/account.css similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/patternfly/resources/css/account.css rename to forms/common-themes/src/main/resources/theme/patternfly/account/resources/css/account.css diff --git a/forms/common-themes/src/main/resources/theme/login/patternfly/resources/img/favicon.ico b/forms/common-themes/src/main/resources/theme/patternfly/account/resources/img/favicon.ico similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/patternfly/resources/img/favicon.ico rename to forms/common-themes/src/main/resources/theme/patternfly/account/resources/img/favicon.ico diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/icon-sidebar-active.png b/forms/common-themes/src/main/resources/theme/patternfly/account/resources/img/icon-sidebar-active.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/icon-sidebar-active.png rename to forms/common-themes/src/main/resources/theme/patternfly/account/resources/img/icon-sidebar-active.png diff --git a/forms/common-themes/src/main/resources/theme/account/patternfly/resources/img/keycloak-logo.png b/forms/common-themes/src/main/resources/theme/patternfly/account/resources/img/keycloak-logo.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/patternfly/resources/img/keycloak-logo.png rename to forms/common-themes/src/main/resources/theme/patternfly/account/resources/img/keycloak-logo.png diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/logo.png b/forms/common-themes/src/main/resources/theme/patternfly/account/resources/img/logo.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/logo.png rename to forms/common-themes/src/main/resources/theme/patternfly/account/resources/img/logo.png diff --git a/forms/common-themes/src/main/resources/theme/account/patternfly/theme.properties b/forms/common-themes/src/main/resources/theme/patternfly/account/theme.properties similarity index 100% rename from forms/common-themes/src/main/resources/theme/account/patternfly/theme.properties rename to forms/common-themes/src/main/resources/theme/patternfly/account/theme.properties diff --git a/forms/common-themes/src/main/resources/theme/admin/patternfly/resources/css/styles.css b/forms/common-themes/src/main/resources/theme/patternfly/admin/css/styles.css similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/patternfly/resources/css/styles.css rename to forms/common-themes/src/main/resources/theme/patternfly/admin/css/styles.css diff --git a/forms/common-themes/src/main/resources/theme/admin/patternfly/theme.properties b/forms/common-themes/src/main/resources/theme/patternfly/admin/theme.properties similarity index 100% rename from forms/common-themes/src/main/resources/theme/admin/patternfly/theme.properties rename to forms/common-themes/src/main/resources/theme/patternfly/admin/theme.properties diff --git a/forms/common-themes/src/main/resources/theme/login/patternfly/resources/css/login.css b/forms/common-themes/src/main/resources/theme/patternfly/login/resources/css/login.css similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/patternfly/resources/css/login.css rename to forms/common-themes/src/main/resources/theme/patternfly/login/resources/css/login.css diff --git a/forms/common-themes/src/main/resources/theme/welcome/keycloak/resources/favicon.ico b/forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/favicon.ico similarity index 100% rename from forms/common-themes/src/main/resources/theme/welcome/keycloak/resources/favicon.ico rename to forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/favicon.ico diff --git a/forms/common-themes/src/main/resources/theme/login/patternfly/resources/img/feedback-error-arrow-down.png b/forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-error-arrow-down.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/patternfly/resources/img/feedback-error-arrow-down.png rename to forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-error-arrow-down.png diff --git a/forms/common-themes/src/main/resources/theme/login/patternfly/resources/img/feedback-error-sign.png b/forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-error-sign.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/patternfly/resources/img/feedback-error-sign.png rename to forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-error-sign.png diff --git a/forms/common-themes/src/main/resources/theme/login/patternfly/resources/img/feedback-success-arrow-down.png b/forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-success-arrow-down.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/patternfly/resources/img/feedback-success-arrow-down.png rename to forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-success-arrow-down.png diff --git a/forms/common-themes/src/main/resources/theme/login/patternfly/resources/img/feedback-success-sign.png b/forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-success-sign.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/patternfly/resources/img/feedback-success-sign.png rename to forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-success-sign.png diff --git a/forms/common-themes/src/main/resources/theme/login/patternfly/resources/img/feedback-warning-arrow-down.png b/forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-warning-arrow-down.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/patternfly/resources/img/feedback-warning-arrow-down.png rename to forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-warning-arrow-down.png diff --git a/forms/common-themes/src/main/resources/theme/login/patternfly/resources/img/feedback-warning-sign.png b/forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-warning-sign.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/patternfly/resources/img/feedback-warning-sign.png rename to forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-warning-sign.png diff --git a/forms/common-themes/src/main/resources/theme/login/patternfly/resources/img/keycloak-logo.png b/forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/keycloak-logo.png similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/patternfly/resources/img/keycloak-logo.png rename to forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/keycloak-logo.png diff --git a/forms/common-themes/src/main/resources/theme/login/patternfly/theme.properties b/forms/common-themes/src/main/resources/theme/patternfly/login/theme.properties similarity index 100% rename from forms/common-themes/src/main/resources/theme/login/patternfly/theme.properties rename to forms/common-themes/src/main/resources/theme/patternfly/login/theme.properties diff --git a/testsuite/integration/src/main/java/org/keycloak/testutils/KeycloakServer.java b/testsuite/integration/src/main/java/org/keycloak/testutils/KeycloakServer.java index 73c78e0589..79b36deb91 100755 --- a/testsuite/integration/src/main/java/org/keycloak/testutils/KeycloakServer.java +++ b/testsuite/integration/src/main/java/org/keycloak/testutils/KeycloakServer.java @@ -47,7 +47,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Properties; -import java.util.concurrent.atomic.AtomicBoolean; /** * @author Stian Thorgersen @@ -292,7 +291,7 @@ public class KeycloakServer { di.setDeploymentName("Keycloak"); di.setDefaultServletConfig(new DefaultServletConfig(true)); - di.addWelcomePage("theme/welcome/keycloak/resources/index.html"); + di.addWelcomePage("theme/keycloak/welcome/resources/index.html"); FilterInfo filter = Servlets.filter("SessionFilter", KeycloakSessionServletFilter.class); di.addFilter(filter); From a3073db6c09829599ab3247637a3d994169d245c Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Mon, 23 Mar 2015 08:48:37 +0100 Subject: [PATCH 2/3] Update theme examples for new theme structure --- examples/themes/README.md | 10 ++-------- .../account}/resources/css/account.css | 0 .../account}/resources/img/red-hat-logo.png | Bin .../account}/theme.properties | 0 .../admin}/resources/css/overrides.css | 0 .../admin}/resources/img/red-hat-logo.png | Bin .../admin}/theme.properties | 0 .../login}/resources/css/login.css | 0 .../login}/resources/img/red-hat-logo.png | Bin .../login}/theme.properties | 0 .../welcome}/resources/index.html | 0 .../welcome}/resources/red-hat-logo.png | Bin .../welcome}/theme.properties | 0 .../login}/resources/css/styles.css | 0 .../login}/resources/img/bkgrnd.jpg | Bin .../login}/resources/img/logo.png | Bin .../sunrise => sunrise/login}/theme.properties | 0 .../account}/resources/css/account.css | 0 .../account}/resources/img/logo.png | Bin .../aerogear => aerogear/account}/theme.properties | 0 .../admin}/resources/css/styles.css | 0 .../admin}/resources/img/logo.png | Bin .../aerogear => aerogear/admin}/theme.properties | 0 .../login}/resources/css/login.css | 0 .../login}/resources/img/logo.png | Bin .../aerogear => aerogear/login}/theme.properties | 0 26 files changed, 2 insertions(+), 8 deletions(-) rename examples/themes/src/main/resources/theme/{account/logo-example => logo-example/account}/resources/css/account.css (100%) rename examples/themes/src/main/resources/theme/{account/logo-example => logo-example/account}/resources/img/red-hat-logo.png (100%) rename examples/themes/src/main/resources/theme/{account/logo-example => logo-example/account}/theme.properties (100%) rename examples/themes/src/main/resources/theme/{admin/logo-example => logo-example/admin}/resources/css/overrides.css (100%) rename examples/themes/src/main/resources/theme/{admin/logo-example => logo-example/admin}/resources/img/red-hat-logo.png (100%) rename examples/themes/src/main/resources/theme/{admin/logo-example => logo-example/admin}/theme.properties (100%) rename examples/themes/src/main/resources/theme/{login/logo-example => logo-example/login}/resources/css/login.css (100%) rename examples/themes/src/main/resources/theme/{login/logo-example => logo-example/login}/resources/img/red-hat-logo.png (100%) rename examples/themes/src/main/resources/theme/{login/logo-example => logo-example/login}/theme.properties (100%) rename examples/themes/src/main/resources/theme/{welcome/logo-example => logo-example/welcome}/resources/index.html (100%) rename examples/themes/src/main/resources/theme/{welcome/logo-example => logo-example/welcome}/resources/red-hat-logo.png (100%) rename examples/themes/src/main/resources/theme/{welcome/logo-example => logo-example/welcome}/theme.properties (100%) rename examples/themes/src/main/resources/theme/{login/sunrise => sunrise/login}/resources/css/styles.css (100%) rename examples/themes/src/main/resources/theme/{login/sunrise => sunrise/login}/resources/img/bkgrnd.jpg (100%) rename examples/themes/src/main/resources/theme/{login/sunrise => sunrise/login}/resources/img/logo.png (100%) rename examples/themes/src/main/resources/theme/{login/sunrise => sunrise/login}/theme.properties (100%) rename project-integrations/aerogear-ups/auth-server/src/main/resources/theme/{account/aerogear => aerogear/account}/resources/css/account.css (100%) rename project-integrations/aerogear-ups/auth-server/src/main/resources/theme/{account/aerogear => aerogear/account}/resources/img/logo.png (100%) rename project-integrations/aerogear-ups/auth-server/src/main/resources/theme/{account/aerogear => aerogear/account}/theme.properties (100%) rename project-integrations/aerogear-ups/auth-server/src/main/resources/theme/{admin/aerogear => aerogear/admin}/resources/css/styles.css (100%) rename project-integrations/aerogear-ups/auth-server/src/main/resources/theme/{admin/aerogear => aerogear/admin}/resources/img/logo.png (100%) rename project-integrations/aerogear-ups/auth-server/src/main/resources/theme/{admin/aerogear => aerogear/admin}/theme.properties (100%) rename project-integrations/aerogear-ups/auth-server/src/main/resources/theme/{login/aerogear => aerogear/login}/resources/css/login.css (100%) rename project-integrations/aerogear-ups/auth-server/src/main/resources/theme/{login/aerogear => aerogear/login}/resources/img/logo.png (100%) rename project-integrations/aerogear-ups/auth-server/src/main/resources/theme/{login/aerogear => aerogear/login}/theme.properties (100%) diff --git a/examples/themes/README.md b/examples/themes/README.md index 75ec61abdd..ad60677741 100644 --- a/examples/themes/README.md +++ b/examples/themes/README.md @@ -21,7 +21,7 @@ Then open $KEYCLOAK_HOME/standalone/configuration/keycloak-server.json and regis } } -Alternatively you can copy `src/main/resources/theme/login` to `standalone/configuration/themes/login/`. +Alternatively you can copy `src/main/resources/theme/sunrise` to `standalone/configuration/themes/`. Once you've added the theme open the admin console, select your realm, click on `Theme`. In the dropdown for `Login Theme` select `sunrise`. Click `Save` and login to the realm to see the new theme in action. @@ -46,13 +46,7 @@ Then open $KEYCLOAK_HOME/standalone/configuration/keycloak-server.json and regis } } -Alternatively you can copy: - -* `account/logo-example` to `standalone/configuration/themes/account/` -* `login/logo-example` to `standalone/configuration/themes/login/` -* `admin/logo-example` to `standalone/configuration/themes/admin/` -* `welcome/logo-example` to `standalone/configuration/themes/welcome/` - +Alternatively you can copy `src/main/resources/theme/logo-example` to `standalone/configuration/themes/`. Once you've added the theme open the admin console, select your realm, click on `Theme`. In the dropdowns for `Login Theme`, `Account Theme` and `Admin Console Theme` select `logo-example`. Click `Save` and login to the realm to see the new theme in action. diff --git a/examples/themes/src/main/resources/theme/account/logo-example/resources/css/account.css b/examples/themes/src/main/resources/theme/logo-example/account/resources/css/account.css similarity index 100% rename from examples/themes/src/main/resources/theme/account/logo-example/resources/css/account.css rename to examples/themes/src/main/resources/theme/logo-example/account/resources/css/account.css diff --git a/examples/themes/src/main/resources/theme/account/logo-example/resources/img/red-hat-logo.png b/examples/themes/src/main/resources/theme/logo-example/account/resources/img/red-hat-logo.png similarity index 100% rename from examples/themes/src/main/resources/theme/account/logo-example/resources/img/red-hat-logo.png rename to examples/themes/src/main/resources/theme/logo-example/account/resources/img/red-hat-logo.png diff --git a/examples/themes/src/main/resources/theme/account/logo-example/theme.properties b/examples/themes/src/main/resources/theme/logo-example/account/theme.properties similarity index 100% rename from examples/themes/src/main/resources/theme/account/logo-example/theme.properties rename to examples/themes/src/main/resources/theme/logo-example/account/theme.properties diff --git a/examples/themes/src/main/resources/theme/admin/logo-example/resources/css/overrides.css b/examples/themes/src/main/resources/theme/logo-example/admin/resources/css/overrides.css similarity index 100% rename from examples/themes/src/main/resources/theme/admin/logo-example/resources/css/overrides.css rename to examples/themes/src/main/resources/theme/logo-example/admin/resources/css/overrides.css diff --git a/examples/themes/src/main/resources/theme/admin/logo-example/resources/img/red-hat-logo.png b/examples/themes/src/main/resources/theme/logo-example/admin/resources/img/red-hat-logo.png similarity index 100% rename from examples/themes/src/main/resources/theme/admin/logo-example/resources/img/red-hat-logo.png rename to examples/themes/src/main/resources/theme/logo-example/admin/resources/img/red-hat-logo.png diff --git a/examples/themes/src/main/resources/theme/admin/logo-example/theme.properties b/examples/themes/src/main/resources/theme/logo-example/admin/theme.properties similarity index 100% rename from examples/themes/src/main/resources/theme/admin/logo-example/theme.properties rename to examples/themes/src/main/resources/theme/logo-example/admin/theme.properties diff --git a/examples/themes/src/main/resources/theme/login/logo-example/resources/css/login.css b/examples/themes/src/main/resources/theme/logo-example/login/resources/css/login.css similarity index 100% rename from examples/themes/src/main/resources/theme/login/logo-example/resources/css/login.css rename to examples/themes/src/main/resources/theme/logo-example/login/resources/css/login.css diff --git a/examples/themes/src/main/resources/theme/login/logo-example/resources/img/red-hat-logo.png b/examples/themes/src/main/resources/theme/logo-example/login/resources/img/red-hat-logo.png similarity index 100% rename from examples/themes/src/main/resources/theme/login/logo-example/resources/img/red-hat-logo.png rename to examples/themes/src/main/resources/theme/logo-example/login/resources/img/red-hat-logo.png diff --git a/examples/themes/src/main/resources/theme/login/logo-example/theme.properties b/examples/themes/src/main/resources/theme/logo-example/login/theme.properties similarity index 100% rename from examples/themes/src/main/resources/theme/login/logo-example/theme.properties rename to examples/themes/src/main/resources/theme/logo-example/login/theme.properties diff --git a/examples/themes/src/main/resources/theme/welcome/logo-example/resources/index.html b/examples/themes/src/main/resources/theme/logo-example/welcome/resources/index.html similarity index 100% rename from examples/themes/src/main/resources/theme/welcome/logo-example/resources/index.html rename to examples/themes/src/main/resources/theme/logo-example/welcome/resources/index.html diff --git a/examples/themes/src/main/resources/theme/welcome/logo-example/resources/red-hat-logo.png b/examples/themes/src/main/resources/theme/logo-example/welcome/resources/red-hat-logo.png similarity index 100% rename from examples/themes/src/main/resources/theme/welcome/logo-example/resources/red-hat-logo.png rename to examples/themes/src/main/resources/theme/logo-example/welcome/resources/red-hat-logo.png diff --git a/examples/themes/src/main/resources/theme/welcome/logo-example/theme.properties b/examples/themes/src/main/resources/theme/logo-example/welcome/theme.properties similarity index 100% rename from examples/themes/src/main/resources/theme/welcome/logo-example/theme.properties rename to examples/themes/src/main/resources/theme/logo-example/welcome/theme.properties diff --git a/examples/themes/src/main/resources/theme/login/sunrise/resources/css/styles.css b/examples/themes/src/main/resources/theme/sunrise/login/resources/css/styles.css similarity index 100% rename from examples/themes/src/main/resources/theme/login/sunrise/resources/css/styles.css rename to examples/themes/src/main/resources/theme/sunrise/login/resources/css/styles.css diff --git a/examples/themes/src/main/resources/theme/login/sunrise/resources/img/bkgrnd.jpg b/examples/themes/src/main/resources/theme/sunrise/login/resources/img/bkgrnd.jpg similarity index 100% rename from examples/themes/src/main/resources/theme/login/sunrise/resources/img/bkgrnd.jpg rename to examples/themes/src/main/resources/theme/sunrise/login/resources/img/bkgrnd.jpg diff --git a/examples/themes/src/main/resources/theme/login/sunrise/resources/img/logo.png b/examples/themes/src/main/resources/theme/sunrise/login/resources/img/logo.png similarity index 100% rename from examples/themes/src/main/resources/theme/login/sunrise/resources/img/logo.png rename to examples/themes/src/main/resources/theme/sunrise/login/resources/img/logo.png diff --git a/examples/themes/src/main/resources/theme/login/sunrise/theme.properties b/examples/themes/src/main/resources/theme/sunrise/login/theme.properties similarity index 100% rename from examples/themes/src/main/resources/theme/login/sunrise/theme.properties rename to examples/themes/src/main/resources/theme/sunrise/login/theme.properties diff --git a/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/account/aerogear/resources/css/account.css b/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/account/resources/css/account.css similarity index 100% rename from project-integrations/aerogear-ups/auth-server/src/main/resources/theme/account/aerogear/resources/css/account.css rename to project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/account/resources/css/account.css diff --git a/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/account/aerogear/resources/img/logo.png b/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/account/resources/img/logo.png similarity index 100% rename from project-integrations/aerogear-ups/auth-server/src/main/resources/theme/account/aerogear/resources/img/logo.png rename to project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/account/resources/img/logo.png diff --git a/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/account/aerogear/theme.properties b/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/account/theme.properties similarity index 100% rename from project-integrations/aerogear-ups/auth-server/src/main/resources/theme/account/aerogear/theme.properties rename to project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/account/theme.properties diff --git a/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/admin/aerogear/resources/css/styles.css b/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/admin/resources/css/styles.css similarity index 100% rename from project-integrations/aerogear-ups/auth-server/src/main/resources/theme/admin/aerogear/resources/css/styles.css rename to project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/admin/resources/css/styles.css diff --git a/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/admin/aerogear/resources/img/logo.png b/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/admin/resources/img/logo.png similarity index 100% rename from project-integrations/aerogear-ups/auth-server/src/main/resources/theme/admin/aerogear/resources/img/logo.png rename to project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/admin/resources/img/logo.png diff --git a/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/admin/aerogear/theme.properties b/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/admin/theme.properties similarity index 100% rename from project-integrations/aerogear-ups/auth-server/src/main/resources/theme/admin/aerogear/theme.properties rename to project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/admin/theme.properties diff --git a/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/login/aerogear/resources/css/login.css b/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/login/resources/css/login.css similarity index 100% rename from project-integrations/aerogear-ups/auth-server/src/main/resources/theme/login/aerogear/resources/css/login.css rename to project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/login/resources/css/login.css diff --git a/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/login/aerogear/resources/img/logo.png b/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/login/resources/img/logo.png similarity index 100% rename from project-integrations/aerogear-ups/auth-server/src/main/resources/theme/login/aerogear/resources/img/logo.png rename to project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/login/resources/img/logo.png diff --git a/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/login/aerogear/theme.properties b/project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/login/theme.properties similarity index 100% rename from project-integrations/aerogear-ups/auth-server/src/main/resources/theme/login/aerogear/theme.properties rename to project-integrations/aerogear-ups/auth-server/src/main/resources/theme/aerogear/login/theme.properties From 1dadfc9726f18ea4a5d27e1d6c2fbc00349ec110 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Mon, 23 Mar 2015 10:45:54 +0100 Subject: [PATCH 3/3] Updated themes docs --- docbook/reference/en/en-US/modules/themes.xml | 174 ++++++++++++++---- .../ExtendingThemeManagerFactory.java | 6 +- .../keycloak/freemarker/FreeMarkerUtil.java | 2 +- .../java/org/keycloak/theme/FolderTheme.java | 6 +- .../keycloak/theme/FolderThemeProvider.java | 2 +- 5 files changed, 146 insertions(+), 44 deletions(-) diff --git a/docbook/reference/en/en-US/modules/themes.xml b/docbook/reference/en/en-US/modules/themes.xml index 3996b3a0b0..db3d659a48 100755 --- a/docbook/reference/en/en-US/modules/themes.xml +++ b/docbook/reference/en/en-US/modules/themes.xml @@ -2,18 +2,18 @@ Themes - Keycloak provides theme support for login forms and account management. This allows customizing the look - and feel of end-user facing pages so they can be integrated with your brand and applications. + Keycloak provides theme support for web pages and emails. This allows customizing the look + and feel of end-user facing pages so they can be integrated with your applications.
Theme types - There are several types of themes in Keycloak: + A theme can support several types to customize different aspects of Keycloak. The types currently available + are: Account - Account management Admin - Admin console - Common - Shared resources for themes Email - Emails Login - Login forms Welcome - Welcome pages @@ -28,6 +28,11 @@ the theme used for a realm open the Keycloak Admin Console, select your realm from the drop-down box in the top left corner. Under Settings click on Theme. + + To set the theme for the master Keycloak admin console set the admin console theme for + the master realm. To set the theme for per realm admin access control set the admin console + theme for the corresponding realm. + To change the welcome theme you need to edit standalone/configuration/keycloak-server.json and add welcomeTheme to the theme element, for example: @@ -43,9 +48,8 @@
Default themes - Keycloak comes bundled with default themes in standalone/configuration/themes. It is - not recommended to edit these themes directly. Instead you should create a new theme to extend a default - theme. A good reference is to copy the keycloak themes as these extend the base theme to add styling. + Keycloak comes bundled with default themes in standalone/configuration/themes. You should + not edit the bundled themes directly. Instead create a new theme that extends a bundled theme.
@@ -65,24 +69,63 @@ A theme can extend another theme. When extending a theme you can override individual files (templates, stylesheets, etc.). The recommended way to create a theme is to extend the base theme. The base theme provides templates - and a default message bundle. It should be possible to achieve the customization required by styling these - templates. + and a default message bundle. If you decide to override templates bear in mind that you may need to update + your templates when upgrading to a new release to include any changes made to the original template. - To create a new theme, create a folder in .../standalone/configuration/themes/<theme type>. - The name of the folder is the name of the theme. Then create a file theme.properties inside the theme folder. - The contents of the file should be: + Before creating a theme it's a good idea to disable caching as this makes it possible to edit theme resources + without restarting the server. To do this open ../standalone/configuration/keycloak-server.json + for theme set staticMaxAge to -1 and + cacheTemplates and cacheThemes to false. For example: +[ + Remember to re-enable caching in production as it will significantly impact performance. - parent=base - You have now created your theme. Check that it works by configuring it for a realm. It should look the same - as the base theme as you've not added anything to it yet. The next sections will describe how to modify - the theme. + To create a new theme create a directory for the theme in .../standalone/configuration/themes. + The name of the directory should be the name of the theme. For example to create a theme called example-theme + create the directory .../standalone/configuration/themes/example-theme. Inside the theme + directory you then need to create a directory for each of the types your theme is going to provide. For example + to add the login type to the example-theme theme create the directory + .../standalone/configuration/themes/example-theme/login. + + + For each type create a file theme.properties which allows setting some configuration for + the theme, for example what theme it overrides and if it should import any themes. For the above example we + want to override the base theme and import common resources from the Keycloak theme. To do this create the + file .../standalone/configuration/themes/example-theme/login/theme.properties with the + following contents: +[ + + + You have now created a theme with support for the login type. To check that it works open the admin console. + Select your realm and click on Themes. For Login Theme select + example-theme and click Save. Then open the login page for the realm. + You can do this either by login through your application or by opening http://localhost:8080/realms/<realm name>/account. + + + To see the effect of changing the parent theme, set parent=keycloak in theme.properties + and refresh the login page. To follow the rest of the documentation set it back to parent=base + before continuing. +
Stylesheets - A theme can have one or more stylesheets, to add a stylesheet create a file inside resources/css (for example resources/css/styles.css) - inside your theme folder. Then registering it in theme.properties by adding: + A theme can have one or more stylesheets, to add a stylesheet create a file inside resources/css + (for example resources/css/styles.css) inside your theme folder. Then registering it + in theme.properties by adding: styles=css/styles.css @@ -90,6 +133,17 @@ as you want. For example: styles=css/styles.css css/more-styles.css + For the example-theme above add example-theme/login/resources/css/styles.css with the + following content: +[ + Then edit example-theme/login/theme.properties and add styles=css/styles.css. + Refresh the login page to see your changes. It's not pretty, but you can see how easily you can modify the + styles for your theme.
Scripts @@ -121,9 +175,8 @@
Messages - Text in the templates are loaded from message bundles. Currently internationalization isn't supported, - but that will be added in a later release. A theme that extends another theme will inherit all messages - from the parents message bundle, but can override individual messages. For example to replace + Text in the templates are loaded from message bundles. A theme that extends another theme will inherit + all messages from the parents message bundle, but can override individual messages. For example to replace Username on the login form with Your Username create the file messages/messages.properties inside your theme folder and add the following content: @@ -134,30 +187,79 @@ Keycloak uses Freemarker Templates in order to generate HTML. These templates are defined in .ftl files and can be overriden from the base theme. - Check out the Freemarker website on how to form a template file. + Check out the Freemarker website on how to form a template file. To override the login template for the + example-theme copy ../standalone/configuration/themes/base/login/login.ftl + to ../standalone/configuration/themes/example-theme/login and open it in an editor. After + the first line (<#import ...>) add <h1>HELLO WORLD!</h1> then refresh + the page.
+
+ Deploying themes + + Themes can be deployed to Keycloak by copying the theme directory to ../standalone/configuration/themes + or it can be deployed as a module. For a single server or during development just copying the theme is fine, but + in a cluster or domain it's recommended to deploy as a module. + + + To deploy a theme as a module you need to create an jar (it's basically just a zip with jar extension) with + the theme resources and a file META/keycloak-server.json that describes the themes contained + in the archive. For example example-theme.jar with the contents: + + META-INF/keycloak-themes.json + theme/example-theme/login/theme.properties + theme/example-theme/login/login.ftl + theme/example-theme/login/resources/css/styles.css + + The contents of META-INF/keycloak-server.json in this case would be: +[ + As you can see a single jar can contain multiple themes and each theme can support one or more types. + + + The deploy the jar as a module to Keycloak you can either manually create the module or use jboss-cli. + It's simplest to use jboss-cli as it creates the required directories and module descriptor + for you. To deploy the above jar jboss-cli run: +[ + If you're on windows run KEYCLOAK_HOME/bin/jboss-cli.bat. + + + This command creates modules/org/example/exampletheme/main containing example-theme.jar + and module.xml. + + + Once you've created the module you need to register it with Keycloak do this by editing + ../standalone/configuration/keycloak-server.json and adding the module to theme/module/modules. For example: +[ + + + If a theme is deployed to ../standalone/configuration/themes and as a module the first + is used. + +
+
SPIs For full control of login forms and account management Keycloak provides a number of SPIs. -
- Theme SPI - - The Theme SPI allows creating different mechanisms to load themes for the default FreeMarker based - implementations of login forms and account management. To create a theme provider you will need to implement - org.keycloak.freemarker.ThemeProviderFactory and org.keycloak.freemarker.ThemeProvider. - - - Keycloak comes with two theme providers, one that loads themes from the classpath (used by default themes) - and another that loads themes from a folder (used by custom themes). Looking at these - would be a good place to start to create your own theme provider. You can find them inside - forms/common-themes on GitHub or the source download. - -
Account SPI diff --git a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/ExtendingThemeManagerFactory.java b/forms/common-freemarker/src/main/java/org/keycloak/freemarker/ExtendingThemeManagerFactory.java index 2fdaf0513c..42fa50e361 100755 --- a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/ExtendingThemeManagerFactory.java +++ b/forms/common-freemarker/src/main/java/org/keycloak/freemarker/ExtendingThemeManagerFactory.java @@ -11,9 +11,7 @@ import java.util.concurrent.ConcurrentHashMap; */ public class ExtendingThemeManagerFactory implements ThemeProviderFactory { - private ConcurrentHashMap themeCache = new ConcurrentHashMap(); - - private ExtendingThemeManager themeManager; + private ConcurrentHashMap themeCache; @Override public ThemeProvider create(KeycloakSession session) { @@ -23,7 +21,7 @@ public class ExtendingThemeManagerFactory implements ThemeProviderFactory { @Override public void init(Config.Scope config) { if(Config.scope("theme").getBoolean("cacheThemes", true)) { - themeCache = new ConcurrentHashMap(); + themeCache = new ConcurrentHashMap<>(); } } diff --git a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/FreeMarkerUtil.java b/forms/common-freemarker/src/main/java/org/keycloak/freemarker/FreeMarkerUtil.java index 8f2dc0e534..e41d671c28 100755 --- a/forms/common-freemarker/src/main/java/org/keycloak/freemarker/FreeMarkerUtil.java +++ b/forms/common-freemarker/src/main/java/org/keycloak/freemarker/FreeMarkerUtil.java @@ -20,7 +20,7 @@ public class FreeMarkerUtil { public FreeMarkerUtil() { if (Config.scope("theme").getBoolean("cacheTemplates", true)) { - cache = new ConcurrentHashMap(); + cache = new ConcurrentHashMap<>(); } } diff --git a/forms/common-themes/src/main/java/org/keycloak/theme/FolderTheme.java b/forms/common-themes/src/main/java/org/keycloak/theme/FolderTheme.java index 0edc92ee5f..7d9ce2abb8 100644 --- a/forms/common-themes/src/main/java/org/keycloak/theme/FolderTheme.java +++ b/forms/common-themes/src/main/java/org/keycloak/theme/FolderTheme.java @@ -18,11 +18,13 @@ public class FolderTheme implements Theme { private String parentName; private String importName; private File themeDir; + private String name; private Type type; private final Properties properties; - public FolderTheme(File themeDir, Type type) throws IOException { + public FolderTheme(File themeDir, String name, Type type) throws IOException { this.themeDir = themeDir; + this.name = name; this.type = type; this.properties = new Properties(); @@ -36,7 +38,7 @@ public class FolderTheme implements Theme { @Override public String getName() { - return themeDir.getName(); + return name; } @Override diff --git a/forms/common-themes/src/main/java/org/keycloak/theme/FolderThemeProvider.java b/forms/common-themes/src/main/java/org/keycloak/theme/FolderThemeProvider.java index df653699bb..90d8ba66bf 100755 --- a/forms/common-themes/src/main/java/org/keycloak/theme/FolderThemeProvider.java +++ b/forms/common-themes/src/main/java/org/keycloak/theme/FolderThemeProvider.java @@ -29,7 +29,7 @@ public class FolderThemeProvider implements ThemeProvider { @Override public Theme getTheme(String name, Theme.Type type) throws IOException { File themeDir = getThemeDir(name, type); - return themeDir.isDirectory() ? new FolderTheme(themeDir, type) : null; + return themeDir.isDirectory() ? new FolderTheme(themeDir, name, type) : null; } @Override