Clean up view HTML

This commit is contained in:
James Cole
2018-01-12 18:42:48 +01:00
parent 89e0791e2f
commit 4984eda320
61 changed files with 78 additions and 201 deletions

View File

@@ -1,4 +1,3 @@
<!-- Modal dialog to show transactions matching these triggers -->
<div class="modal fade" id="testTriggerModal" tabindex="-1" role="dialog" aria-labelledby="testTriggerLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">

View File

@@ -20,7 +20,7 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
<!-- optional fields -->
{# optional fields #}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
@@ -30,7 +30,7 @@
</div>
</div>
<!-- panel for options -->
{# panel for options #}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3>

View File

@@ -22,7 +22,7 @@
</div>
<div class="col-lg-6 col-md-12 col-sm-6">
<!-- optional fields -->
{# optional fields #}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
@@ -32,7 +32,7 @@
</div>
</div>
<!-- panel for options -->
{# panel for options #}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3>

View File

@@ -28,8 +28,6 @@
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
{{ ExpandedForm.date('start_date', first) }}
{{ ExpandedForm.date('end_date', today) }}
<!-- ACCOUNTS -->
{{ ExpandedForm.multiCheckbox('accounts',accountList, checkedAccounts, {' class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
</div>
</div>

View File

@@ -25,7 +25,7 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
<!-- optional fields -->
{# optional fields #}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
@@ -37,14 +37,12 @@
</div>
</div>
<!-- RULE TRIGGERS -->
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'rule_triggers'|_ }}</h3>
</div>
<!-- display any error -->
<div class="box-body rule-trigger-box">
<table class="table table-condensed table-bordered table-striped">
<thead>
@@ -73,7 +71,6 @@
{% include '/rules/partials/test-trigger-modal' %}
<!-- RULE ACTIONS -->
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">
@@ -107,7 +104,7 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<!-- panel for options -->
{# panel for options #}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3>

View File

@@ -24,7 +24,7 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
<!-- optional fields -->
{# optional fields #}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
@@ -36,14 +36,12 @@
</div>
</div>
<!-- RULE TRIGGERS -->
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'rule_triggers'|_ }}</h3>
</div>
<!-- display any error -->
<div class="box-body rule-trigger-box">
<table class="table table-condensed table-bordered table-striped">
<thead>
@@ -72,7 +70,6 @@
{% include '/rules/partials/test-trigger-modal' %}
<!-- RULE ACTIONS -->
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">
@@ -106,7 +103,7 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<!-- panel for options -->
{# panel for options #}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3>

View File

@@ -28,8 +28,6 @@
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
{{ ExpandedForm.date('start_date', first) }}
{{ ExpandedForm.date('end_date', today) }}
<!-- ACCOUNTS -->
{{ ExpandedForm.multiCheckbox('accounts',accountList, checkedAccounts, {' class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
</div>
</div>