Skip to content

LUT-31380 : fix step titles or group titles, hidden #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
evdnjde wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

LUT-31380 : fix step titles or group titles, hidden #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion webapp/WEB-INF/templates/skin/plugins/forms/composite_template/view_group.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
</div>
</#if>
<fieldset class="<#if id_display??> display_field_${id_display} d-none</#if>" style="position:relative;">
<legend>${group.title} <#if indexIteration &gt; 0>(${indexIteration+1})</#if>
<#if !group.title?ends_with('hidden')>
<legend>${group.title} <#if indexIteration &gt; 0>(${indexIteration+1})</#if>
</#if>
<#if group.description!=''>
<div class="helpBox">${group.description}</div>
</#if>
Expand Down
4 changes: 3 additions & 1 deletion webapp/WEB-INF/templates/skin/plugins/forms/composite_template/view_step.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<div class="card">
<h3 class="card-header">${step.title}</h3>
<#if !step.title?ends_with('hidden')>
<h3 class="card-header">${step.title}</h3>
</#if>
<div id="step-content" class="card-body">
${stepContent}
<#if display_captcha>${captcha}</#if>
Expand Down
5 changes: 3 additions & 2 deletions webapp/WEB-INF/templates/util/plugins/forms/breadcrumb/horizontal_breadcrumb.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@

<#if list_steps?has_content>
<nav id="horizontal-breadcrumb" aria-label="breadcrumb">
<ol class="breadcrumb">
<#list list_steps as step>
<#if step?has_next>
<li class="breadcrumb-item"><button class="btn btn-link" name="action_doGoToStep" type="submit" value="${step?index}">${step.title}</button></li>
<li class="breadcrumb-item"><button class="btn btn-link" name="action_doGoToStep" type="submit" value="${step?index}">${step.title!?replace('- hidden','')}</button></li>
<#else>
<li class="breadcrumb-item active" aria-current="page">${step.title}</li>
<li class="breadcrumb-item active" aria-current="page">${step.title!?replace('- hidden','')}</li>
</#if>
</#list>
</ol>
Expand Down
2 changes: 1 addition & 1 deletion webapp/WEB-INF/templates/util/plugins/forms/breadcrumb/vertical_breadcrumb.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="panel panel-default">
<#list list_steps as step>
<div class="panel-heading">
<h3 class="panel-title">${step.title}</h3>
<h3 class="panel-title">${step.title!?replace('- hidden','')}</h3>
</div>
</#list>
</div>
Expand Down