litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved flash message handling

Browse source
This commit is contained in:
Graham Triggs 2017-09-22 23:42:13 +01:00
parent 4a52c56504
commit 8855405881
4 changed files with 36 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css
View file

@ -293,7 +293,31 @@ table.classHierarchy {
margin-right: 0px; margin-right: 0px;
} }
section#container div { section#container div {
width: auto; width: auto;
} }
#flash-message {
border: 1px dotted #E2C822;
background-color: #FFF9D7;
padding: .5em;
margin-bottom: 10px;
}
#welcome-message {
border: 1px dotted #E2C822;
background-color: #FFF9D7;
padding: .25em;
margin-bottom: 8px;
}
#flash-msg-container,
#welcome-msg-container {
width: 600px;
height:34px;
position: absolute;
z-index: 99;
margin-left: auto;
margin-right: auto;
left: 0;
right: 0;
top: 0;
}

16
webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/message.ftl
View file

@ -1,15 +1,15 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#if flash?has_content> <#if flash?has_content>
<div id="wrapper-content" role="main" class="container"> <#if flash?starts_with(i18n().menu_welcomestart) >
<#if flash?starts_with(i18n().menu_welcomestart) > <section id="welcome-msg-container" role="container">
<section id="welcome-msg-container" role="container"> <section id="welcome-message" role="alert">${flash}</section>
<section id="welcome-message" role="alert">${flash}</section> </section>
</section> <#else>
<#else> <section id="flash-msg-container" role="container">
<section id="flash-message" role="alert"> <section id="flash-message" role="alert">
${flash} ${flash}
</section> </section>
</#if> </section>
</div> </#if>
</#if> </#if>

1
webapp/src/main/webapp/themes/wilma/css/wilma.css
View file

@ -737,6 +737,7 @@ p.password-note {
padding: .25em; padding: .25em;
margin-bottom: 8px; margin-bottom: 8px;
} }
#flash-msg-container,
#welcome-msg-container { #welcome-msg-container {
margin-bottom: 8px; margin-bottom: 8px;
margin-top: -10px; margin-top: -10px;

4
webapp/src/main/webapp/themes/wilma/templates/menu.ftl
View file

@ -19,8 +19,8 @@
<section id="welcome-message" role="alert">${flash}</section> <section id="welcome-message" role="alert">${flash}</section>
</section> </section>
<#else> <#else>
<section id="flash-message" role="alert"> <section id="flash-msg-container" role="container">
${flash} <section id="flash-message" role="alert">${flash}</section>
</section> </section>
</#if> </#if>
</#if> </#if>