Commit ca06dbfe authored by Lukasz Waskiewicz's avatar Lukasz Waskiewicz
Browse files

refs #1454 poprawa HTML

poprawa labelki dla ukrytego pola
korekta kompresowania atrybutów
parent 2da44182
.column-filter{
width:30px
}
@media (min-width: 992px) {
.column-actions {
min-width: 80px;
......
......@@ -32,7 +32,7 @@
</button>
</div>
<div id="queryExecute" class="panel-body query-form">
<div layout:replace="utils/form.xhtml :: simpleFormGroup(fieldName='query', label='cocos.portal.simulationsPages.queries.query')">
<div layout:replace="utils/form.xhtml :: simpleFormGroup(fieldName='query', label='cocos.portal.simulationsPages.queries.query', targetFieldInvisible='true')">
<th:block layout:fragment="nestedContent" layout:include="simulation/sqlInput.xhtml :: sqlInput"/>
<th:block layout:fragment="nestedLabel" layout:include="simulation/common/userNofification.xhtml :: notificationControlWrapperFragment"/>
</div>
......
......@@ -15,7 +15,7 @@
</button>
</div>
<div id="queryExecute" class="panel-body query-form">
<div layout:replace="utils/form.xhtml :: simpleFormGroup(fieldName='query', label='cocos.portal.simulationsPages.queries.query')">
<div layout:replace="utils/form.xhtml :: simpleFormGroup(fieldName='query', label='cocos.portal.simulationsPages.queries.query', targetFieldInvisible='true')">
<th:block layout:fragment="nestedContent" layout:include="simulation/sqlInput.xhtml :: sqlInput"/>
<th:block layout:fragment="nestedLabel" layout:include="simulation/common/userNofification.xhtml :: notificationControlWrapperFragment"/>
</div>
......
......@@ -23,7 +23,7 @@
</button>
</div>
<div id="queryExecute" class="panel-body query-form">
<div layout:replace="utils/form.xhtml :: simpleFormGroup(fieldName='query', label='cocos.portal.simulationsPages.queries.query')">
<div layout:replace="utils/form.xhtml :: simpleFormGroup(fieldName='query', label='cocos.portal.simulationsPages.queries.query', targetFieldInvisible='true')">
<th:block layout:fragment="nestedContent" layout:include="simulation/sqlInput.xhtml :: sqlInput"/>
<th:block layout:fragment="nestedLabel" layout:include="simulation/common/userNofification.xhtml :: notificationControlWrapperFragment"/>
</div>
......
......@@ -246,7 +246,7 @@
<!-- filter -->
<th:block th:if="${column == 'filter'}">
<th width="30" class="column-filter">
<th class="column-filter">
<button title="Results" type="submit" id="table-filters" class="btn btn-default btn-xs ">
<span class="glyphicon glyphicon-filter"></span>
</button>
......
......@@ -32,7 +32,7 @@
<div layout:fragment="simpleFormGroup (fieldName)" data:fieldname="${fieldName}" class="form-group" th:classappend="${hasError}? ${errorClass?:'has-error'}"
th:assert="${!#strings.isEmpty(fieldName)}">
<label th:if="${!#strings.isEmpty(label)}" th:for="${fieldName}" th:text="#{${label}}">Label</label>
<label th:if="${!#strings.isEmpty(label)}" th:for="${#strings.isEmpty(targetFieldInvisible)?fieldName:''}" th:text="#{${label}}">Label</label>
<th:block layout:fragment="nestedLabel"></th:block>
<th:block layout:fragment="nestedContent">NESTED CONTENT</th:block>
<label class="control-label"></label>
......
......@@ -70,7 +70,7 @@
<property name="compressJavaScript" value="false" />
<property name="preservePatterns">
<list>
<value>data-\w+="[^"]+"</value>
<value>\sdata-\w+="[^"]+"</value>
</list>
</property>
</bean>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment