Change in ovirt-engine[ovirt-engine-3.3]: branding: Allow templates to be replaced

[iheim at redhat.com]

Itamar Heim has submitted this change and it was merged.

Change subject: branding: Allow templates to be replaced
......................................................................


branding: Allow templates to be replaced

- Allowed themes the ability to override the default behaviour of
  append their templates to previous template. This allows themes
  to almost completely replace the entire welcome page.

Change-Id: Id3376500d1ceece80132089d90174e092992d36d
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1055625
Signed-off-by: Alexander Wels <awels at redhat.com>
---
M README.branding
M backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingManager.java
M backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingTheme.java
M backend/manager/modules/branding/src/test/java/org/ovirt/engine/core/branding/BrandingThemeTest.java
A backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/06-test6.brand/branding.properties
A backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/06-test6.brand/messages.properties
A backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/06-test6.brand/messages_fr.properties
M packaging/branding/ovirt.brand/branding.properties
8 files changed, 117 insertions(+), 0 deletions(-)

Approvals:
  Alon Bar-Lev: Looks good to me, but someone else must approve
  Alexander Wels: Verified
  Vojtech Szocs: Looks good to me, approved



-- 
To view, visit http://gerrit.ovirt.org/23455
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3376500d1ceece80132089d90174e092992d36d
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Alexander Wels <awels at redhat.com>
Gerrit-Reviewer: Alexander Wels <awels at redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl at redhat.com>
Gerrit-Reviewer: Einav Cohen <ecohen at redhat.com>
Gerrit-Reviewer: Itamar Heim <iheim at redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server