Skip to content

Commit

Permalink
IT-515: Restored old theme
Browse files Browse the repository at this point in the history
  • Loading branch information
eugeniosant committed Jan 29, 2024
1 parent af1c3bc commit 5fb440c
Show file tree
Hide file tree
Showing 45 changed files with 4,114 additions and 33 deletions.
30 changes: 0 additions & 30 deletions .github/workflows/publication.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,9 @@ env:
PR_CHECKER_PATH: ".github/pr-title-checker-config.json"

DOCKER_KEYCLOAK_IMAGE_BASE_NAME: entando/entando-keycloak
DOCKER_SSO_IMAGE_BASE_NAME: entando/entando-redhat-sso
DOCKER_KEYCLOAK_IMAGE_ARCHITECTURE: linux/amd64,linux/arm64
DOCKER_SSO_IMAGE_ARCHITECTURE: linux/amd64
DOCKER_IMAGE_CONTEXT: .
DOCKER_KEYCLOAK_IMAGE_FILE: Dockerfile.keycloak
DOCKER_SSO_IMAGE_FILE: Dockerfile.redhat-sso
DOCKER_IMAGE_PUSH: true

jobs:
Expand Down Expand Up @@ -54,23 +51,6 @@ jobs:
type=sha
type=raw,event=pr,value={{base_ref}}
- name: Docker meta-sso
id: meta-sso
uses: docker/metadata-action@v4
with:
images: |
${{ env.DOCKER_SSO_IMAGE_BASE_NAME }}
tags: |
type=schedule
type=ref,event=branch
type=ref,event=pr
type=ref,event=tag
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
type=sha
type=raw,event=pr,value={{branch}}
- name: Set up QEMU
uses: docker/setup-qemu-action@v2

Expand Down Expand Up @@ -101,13 +81,3 @@ jobs:
tags: ${{ steps.meta-keycloak.outputs.tags }}
labels: ${{ steps.meta-keycloak.outputs.labels }}
platforms: ${{ env.DOCKER_KEYCLOAK_IMAGE_ARCHITECTURE }}

- name: Build sso
uses: docker/build-push-action@v4
with:
context: ${{ env.DOCKER_IMAGE_CONTEXT }}
file: ${{ env.DOCKER_SSO_IMAGE_FILE }}
push: ${{ env.DOCKER_IMAGE_PUSH }}
tags: ${{ steps.meta-sso.outputs.tags }}
labels: ${{ steps.meta-sso.outputs.labels }}
platforms: ${{ env.DOCKER_SSO_IMAGE_ARCHITECTURE }}
4 changes: 2 additions & 2 deletions Dockerfile.keycloak
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM quay.io/keycloak/keycloak:23.0.3 as builder
FROM quay.io/keycloak/keycloak:23.0.4 as builder

RUN /opt/keycloak/bin/kc.sh build

FROM quay.io/keycloak/keycloak:23.0.3
FROM quay.io/keycloak/keycloak:23.0.4

COPY themes/entando /opt/keycloak/themes/entando
COPY --from=builder /opt/keycloak/ /opt/keycloak/
Expand Down
2 changes: 1 addition & 1 deletion entando-project
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ENTANDO_PRJ_NAME=entando-keycloak
ENTANDO_PRJ_VERSION=7.2.0-SNAPSHOT
ENTANDO_PRJ_VERSION=7.3.1-SNAPSHOT
ENTANDO_PRJ_IMAGE_NAME=entando-keycloak
ENTANDO_PRJ_IMAGE_REGISTRY="registry.hub.docker.com"
ENTANDO_PRJ_BUILD_COMMAND=.ent/enp-build.sh
Expand Down
3 changes: 3 additions & 0 deletions themes/entando_old/admin/resources/css/logo.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.navbar-pf .navbar-brand {
background: url('../img/entando-logo.svg') no-repeat 0px 15px;
}
1 change: 1 addition & 0 deletions themes/entando_old/admin/resources/img/entando-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions themes/entando_old/admin/theme.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
parent=keycloak
import=common/keycloak
styles=node_modules/patternfly/dist/css/patternfly.min.css node_modules/patternfly/dist/css/patternfly-additions.min.css node_modules/select2/select2.css css/styles.css lib/angular/treeview/css/angular.treeview.css node_modules/text-security/dist/text-security.css css/logo.css
55 changes: 55 additions & 0 deletions themes/entando_old/login/login.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<#import "template.ftl" as layout>
<@layout.registrationLayout displayInfo=social.displayInfo; section>
<#if section = "title">
${msg("loginTitle",(realm.displayName!''))}
<#elseif section = "form">
<form class="LoginPage__form" action="${url.loginAction}" method="post">
<div class="LoginPage__formGroup">
<div class="LoginPage__inputGroup">
<label class="LoginPage__label">${msg("username")}</label>
<input type="text" name="username" tabindex="1" class="LoginPage__input" id="username" placeholder="Username" />
</div>
<div class="LoginPage__inputGroup extra-margin">
<label class="LoginPage__label">${msg("password")}</label>
<input type="password" name="password" tabindex="2" class="LoginPage__input" id="password" placeholder="Password" />
</div>
<#if message?has_content>
<div class="LoginPage__error">${message.summary?no_esc}</div>
<div class="LoginPage__actionGroup" style="margin-top: 0;">
<div></div>
<button class="LoginPage__button" type="submit">${msg("doLogIn")}</button>
<div class="LoginPage__loading">
<div class="LoginPage__spinner" />
</div>
</div>
<#else>
<div class="LoginPage__actionGroup">
<div></div>
<button class="LoginPage__button" type="submit">${msg("doLogIn")}</button>
<div class="LoginPage__loading">
<div class="LoginPage__spinner" />
</div>
</div>
</#if>
</div>
<#if social.providers??>
<div class="LoginPage__social">
${msg("socialLogin")}
</div>
</#if>
<div>
<#if social.providers??>
<div id="social-providers">
<div id="kc-social-providers">
<ul class="list horizontal">
<#list social.providers as p>
<li><a href="${p.loginUrl}" id="zocial-${p.alias}" class="button zocial ${p.providerId}">${p.displayName}</a></li>
</#list>
</ul>
</div>
</div>
</#if>
</div>
</form>
</#if>
</@layout.registrationLayout>
Loading

0 comments on commit 5fb440c

Please sign in to comment.