This commit is contained in:
Stian Thorgersen 2014-02-05 15:31:00 +00:00
parent 455aca9dc0
commit 85de070a1c
11 changed files with 12 additions and 17 deletions

View file

@ -1,6 +1,6 @@
<#-- TODO: Only a placeholder, implementation needed --> <#-- TODO: Only a placeholder, implementation needed -->
<#import "template.ftl" as layout> <#import "template.ftl" as layout>
<@layout.registrationLayout bodyClass=""; section> <@layout.registrationLayout; section>
<#if section = "title"> <#if section = "title">
${rb.errorTitle} ${rb.errorTitle}

View file

@ -1,5 +1,5 @@
<#import "template.ftl" as layout> <#import "template.ftl" as layout>
<@layout.registrationLayout bodyClass=""; section> <@layout.registrationLayout; section>
<#if section = "title"> <#if section = "title">
${rb.loginTotpTitle} ${rb.loginTotpTitle}

View file

@ -1,5 +1,5 @@
<#import "template.ftl" as layout> <#import "template.ftl" as layout>
<@layout.registrationLayout bodyClass=""; section> <@layout.registrationLayout; section>
<#if section = "title"> <#if section = "title">
${rb.emailForgotHeader} ${rb.emailForgotHeader}

View file

@ -1,5 +1,5 @@
<#import "template.ftl" as layout> <#import "template.ftl" as layout>
<@layout.registrationLayout bodyClass=""; section> <@layout.registrationLayout; section>
<#if section = "title"> <#if section = "title">
${rb.loginTitle} ${realm.name} ${rb.loginTitle} ${realm.name}

View file

@ -1,5 +1,5 @@
<#import "template.ftl" as layout> <#import "template.ftl" as layout>
<@layout.registrationLayout bodyClass=""; section> <@layout.registrationLayout; section>
<#if section = "title"> <#if section = "title">
${rb.emailUpdateHeader} ${rb.emailUpdateHeader}

View file

@ -1,5 +1,5 @@
<#import "template.ftl" as layout> <#import "template.ftl" as layout>
<@layout.registrationLayout bodyClass=""; section> <@layout.registrationLayout; section>
<#if section = "title"> <#if section = "title">
${rb.loginProfileTitle} ${rb.loginProfileTitle}

View file

@ -1,5 +1,5 @@
<#import "template.ftl" as layout> <#import "template.ftl" as layout>
<@layout.registrationLayout bodyClass=""; section> <@layout.registrationLayout; section>
<#if section = "title"> <#if section = "title">
${rb.emailUsernameForgotHeader} ${rb.emailUsernameForgotHeader}

View file

@ -1,5 +1,5 @@
<#import "template.ftl" as layout> <#import "template.ftl" as layout>
<@layout.registrationLayout bodyClass="email"; section> <@layout.registrationLayout; section>
<#if section = "title"> <#if section = "title">
${rb.emailVerifyTitle} ${rb.emailVerifyTitle}

View file

@ -1,6 +1,6 @@
<#ftl strip_whitespace=true strip_text=true> <#ftl strip_whitespace=true strip_text=true>
<#import "template.ftl" as layout> <#import "template.ftl" as layout>
<@layout.registrationLayout bodyClass="" displaySocial=social.displaySocialProviders; section> <@layout.registrationLayout displaySocial=social.displaySocialProviders displaySeparator=realm.registrationAllowed; section>
<#if section = "title">${rb.loginTitle} ${realm.name} <#if section = "title">${rb.loginTitle} ${realm.name}
<#elseif section = "header"> <#elseif section = "header">

View file

@ -1,5 +1,5 @@
<#import "template.ftl" as layout> <#import "template.ftl" as layout>
<@layout.registrationLayout bodyClass="register" ; section> <@layout.registrationLayout bodyClass="register" displaySeparator=true; section>
<#if section = "title"> <#if section = "title">
${rb.registerWith} ${realm.name} ${rb.registerWith} ${realm.name}

View file

@ -1,4 +1,4 @@
<#macro registrationLayout bodyClass isSeparator=false forceSeparator=false displaySocial=false> <#macro registrationLayout bodyClass="" displaySeparator=false displaySocial=false>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
@ -23,12 +23,7 @@
<div class="content"> <div class="content">
<h2 id="kc-header"><#nested "header"></h2> <h2 id="kc-header"><#nested "header"></h2>
<div class="background-area"> <div class="background-area">
<#if !forceSeparator && realm?has_content> <div class="form-area ${displaySocial?string('social','')} ${displaySeparator?string('separator','')} clearfix">
<#assign drawSeparator = realm.registrationAllowed>
<#else>
<#assign drawSeparator = isSeparator>
</#if>
<div class="form-area ${displaySocial?string('social','')} ${(drawSeparator)?string('separator','')} clearfix">
<div class="section app-form"> <div class="section app-form">
<#if message?has_content> <#if message?has_content>
<div class="feedback ${message.type} bottom-left show"> <div class="feedback ${message.type} bottom-left show">