Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions Resources/Private/Templates/Core/List.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ <h1>{f:translate(key:'view.core')}</h1>

<f:form action="list" name="filter" object="{filter}" class="form-inline mb-3">
<div class="form-group">
<label>{f:translate(key:'coreFilter.usage')}</label>
<label for="form-usage" class="form-label">{f:translate(key:'coreFilter.usage')}</label>
<f:form.select property="usage"
options="{1:'{f:translate(key:\'coreFilter.usage.1\')}',0:'{f:translate(key:\'coreFilter.usage.0\')}'}"
class="form-control"/>
id="form-usage"
class="form-select"/>
</div>

<button class="btn btn-default">
Expand Down
22 changes: 12 additions & 10 deletions Resources/Private/Templates/Extension/List.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@ <h1>{f:translate(key:'view.usedExtensions')}</h1>

<f:form action="list" name="filter" object="{filter}" class="form-inline mb-3">

<div class="form-group">
<label>{f:translate(key:'extensionFilter.name')}</label>
<f:form.textfield property="name" class="form-control" />
</div>
<div class="row">
<div class="col form-group">
<label for="form-name" class="form-label">{f:translate(key:'extensionFilter.name')}</label>
<f:form.textfield property="name" id="form-name" class="form-control" />
</div>

<div class="form-group">
<label>{f:translate(key:'extensionFilter.exactSearch')}</label>
<div class="checkbox">
<f:form.checkbox property="exactSearch" value="1" />
</div>
</div>
<div class="col form-group">
<label for="form-exactSearch" class="form-label">{f:translate(key:'extensionFilter.exactSearch')}</label>
<div class="form-check">
<f:form.checkbox property="exactSearch" id="form-exactSearch" class="form-check-input" value="1" />
</div>
</div>
</div>
<button class="btn btn-default">
{core:icon(identifier:'actions-search')} {f:translate(key:'search')}
</button>
Expand Down
23 changes: 12 additions & 11 deletions Resources/Private/Templates/Statistic/Index.html
Original file line number Diff line number Diff line change
Expand Up @@ -237,40 +237,41 @@ <h3>{f:translate(key:'lastImport.header')}</h3>

<f:section name="searchfilter">
<div class="form-group">
<label for="form-client">{f:translate(key:'tx_t3monitoring_domain_model_client')}</label>
<label for="form-client" class="form-label">{f:translate(key:'tx_t3monitoring_domain_model_client')}</label>
<f:form.textfield property="searchWord" id="form-client" class="form-control"/>
</div>

<div class="form-group">
<label for="form-core">Core</label>
<label for="form-core" class="form-label">Core</label>
<f:form.select property="version" id="form-core" options="{coreVersions}"
class="form-control" prependOptionLabel="" prependOptionValue=""/>
class="form-select" prependOptionLabel="" prependOptionValue=""/>
</div>

<f:if condition="{slaVersions}">
<div class="form-group">
<label for="form-sla">{f:translate(key:'tx_t3monitoring_domain_model_sla')}</label>
<label for="form-sla" class="form-label">{f:translate(key:'tx_t3monitoring_domain_model_sla')}</label>
<f:form.select property="sla" id="form-sla" options="{slaVersions}"
optionValueField="uid" optionLabelField="title" class="form-control"
optionValueField="uid" optionLabelField="title" class="form-select"
prependOptionLabel="" prependOptionValue=""/>
</div>
</f:if>

<f:if condition="{tagVersions}">
<div class="form-group">
<label for="form-tag">{f:translate(key:'tag')}</label>
<label for="form-tag" class="form-label">{f:translate(key:'tag')}</label>
<f:form.select property="tag" id="form-tag" options="{tagVersions}"
optionValueField="uid" optionLabelField="title" class="form-control"
optionValueField="uid" optionLabelField="title" class="form-select"
prependOptionLabel="" prependOptionValue=""/>
</div>
</f:if>

<fieldset>
<legend class="legend">{f:translate(key:'filter.fieldset.core')}</legend>
<legend class="form-legend">{f:translate(key:'filter.fieldset.core')}</legend>
<div class="checkbox">
<label>
<f:form.checkbox property="withInsecureCore" value="1"/>
{f:translate(key:'tx_t3monitoring_domain_model_client.insecure_core')}</label>
{f:translate(key:'tx_t3monitoring_domain_model_client.insecure_core')}
</label>
</div>

<div class="checkbox">
Expand All @@ -280,7 +281,7 @@ <h3>{f:translate(key:'lastImport.header')}</h3>
</div>
</fieldset>
<fieldset>
<legend class="legend">{f:translate(key:'filter.fieldset.extensions')}</legend>
<legend class="form-legend">{f:translate(key:'filter.fieldset.extensions')}</legend>
<div class="checkbox">
<label>
<f:form.checkbox property="withOutdatedExtensions" value="1"/>
Expand All @@ -294,7 +295,7 @@ <h3>{f:translate(key:'lastImport.header')}</h3>
</div>
</fieldset>
<fieldset>
<legend class="legend">{f:translate(key:'filter.fieldset.misc')}</legend>
<legend class="form-legend">{f:translate(key:'filter.fieldset.misc')}</legend>
<div class="checkbox">
<label>
<f:form.checkbox property="withErrorMessage" value="1"/>
Expand Down
12 changes: 10 additions & 2 deletions Resources/Public/Css/t3monitoring.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
.filter fieldset {
margin: 0 0 1rem;
}

.filter legend {
margin: 0;
font-size: 14px;
margin: 0 0 0.5rem;
font-size: 12px;
}

.client-list th,
Expand All @@ -19,3 +23,7 @@
border: 0;
margin: 0;
}

.dt-info {
padding: 0.5rem 1rem;
}