rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Merge branch '19-replace-form-cancel-button-labels-with-back' into 'master'

Browse source 
Resolve "Replace form Cancel button labels with "Back""

Closes #19

See merge request jankstudio/resq!15
This commit is contained in:
Ramon Gutierrez 2018-02-19 17:14:07 +00:00
commit e878d646f6
15 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
templates/battery-manufacturer/form.html.twig
View file

@ -50,7 +50,7 @@
<div class="row">
<div class="col-lg-12">
<button type="submit" class="btn btn-success">Submit</button>
<a href="{{ url('bmfg_list') }}" class="btn btn-secondary">Cancel</a>
<a href="{{ url('bmfg_list') }}" class="btn btn-secondary">Back</a>
</div>
</div>
</div>

2
templates/battery-model/form.html.twig
View file

@ -50,7 +50,7 @@
<div class="row">
<div class="col-lg-12">
<button type="submit" class="btn btn-success">Submit</button>
<a href="{{ url('bmodel_list') }}" class="btn btn-secondary">Cancel</a>
<a href="{{ url('bmodel_list') }}" class="btn btn-secondary">Back</a>
</div>
</div>
</div>

2
templates/battery-size/form.html.twig
View file

@ -50,7 +50,7 @@
<div class="row">
<div class="col-lg-12">
<button type="submit" class="btn btn-success">Submit</button>
<a href="{{ url('bsize_list') }}" class="btn btn-secondary">Cancel</a>
<a href="{{ url('bsize_list') }}" class="btn btn-secondary">Back</a>
</div>
</div>
</div>

2
templates/battery/form.html.twig
View file

@ -252,7 +252,7 @@
<div class="col-lg-12">
<input type="hidden" name="image_file" value="{{ obj.getImageFile }}">
<button type="submit" class="btn btn-success">Submit</button>
<a href="{{ url('battery_list') }}" class="btn btn-secondary">Cancel</a>
<a href="{{ url('battery_list') }}" class="btn btn-secondary">Back</a>
</div>
</div>
</div>

2
templates/customer/form.html.twig
View file

@ -152,7 +152,7 @@
<div class="row">
<div class="col-lg-12">
<button type="submit" class="btn btn-success">Submit</button>
<a href="{{ url('customer_list') }}" class="btn btn-secondary">Cancel</a>
<a href="{{ url('customer_list') }}" class="btn btn-secondary">Back</a>
</div>
</div>
</div>

2
templates/hub/form.html.twig
View file

@ -150,7 +150,7 @@
<div class="row">
<div class="col-lg-12">
<button type="submit" class="btn btn-success">Submit</button>
<a href="{{ url('hub_list') }}" class="btn btn-secondary">Cancel</a>
<a href="{{ url('hub_list') }}" class="btn btn-secondary">Back</a>
</div>
</div>
</div>

2
templates/job-order/form.html.twig
View file

@ -572,7 +572,7 @@
<div class="col-lg-12">
<button type="submit" class="btn btn-success">{{ mode == 'update-fulfillment' ? 'Fulfill' : 'Submit' }}</button>
{% if mode != 'create' %}
<a href="{{ return_url }}" class="btn btn-secondary">Cancel</a>
<a href="{{ return_url }}" class="btn btn-secondary">Back</a>
{% endif %}
</div>
</div>

2
templates/outlet/form.html.twig
View file

@ -129,7 +129,7 @@
<div class="row">
<div class="col-lg-12">
<button type="submit" class="btn btn-success">Submit</button>
<a href="{{ url('outlet_list') }}" class="btn btn-secondary">Cancel</a>
<a href="{{ url('outlet_list') }}" class="btn btn-secondary">Back</a>
</div>
</div>
</div>

2
templates/promo/form.html.twig
View file

@ -77,7 +77,7 @@
<div class="row">
<div class="col-lg-12">
<button type="submit" class="btn btn-success">Submit</button>
<a href="{{ url('promo_list') }}" class="btn btn-secondary">Cancel</a>
<a href="{{ url('promo_list') }}" class="btn btn-secondary">Back</a>
</div>
</div>
</div>

2
templates/rider/form.html.twig
View file

@ -188,7 +188,7 @@
<div class="col-lg-12">
<input type="hidden" name="image_file" value="{{ obj.getImageFile() }}">
<button type="submit" class="btn btn-success">Submit</button>
<a href="{{ url('rider_list') }}" class="btn btn-secondary">Cancel</a>
<a href="{{ url('rider_list') }}" class="btn btn-secondary">Back</a>
</div>
</div>
</div>

2
templates/role/form.html.twig
View file

@ -80,7 +80,7 @@
<div class="row">
<div class="col-lg-12">
<button type="submit" class="btn btn-success">Submit</button>
<a href="{{ url('role_list') }}" class="btn btn-secondary">Cancel</a>
<a href="{{ url('role_list') }}" class="btn btn-secondary">Back</a>
</div>
</div>
</div>

2
templates/ticket/form.html.twig
View file

@ -102,7 +102,7 @@
<div class="row">
<div class="col-lg-12">
<button type="submit" class="btn btn-success">Submit</button>
<a href="{{ redirect_url }}" class="btn btn-secondary">Cancel</a>
<a href="{{ redirect_url }}" class="btn btn-secondary">Back</a>
</div>
</div>
</div>

2
templates/user/form.html.twig
View file

@ -169,7 +169,7 @@
<div class="row">
<div class="col-lg-12">
<button type="submit" class="btn btn-success">Submit</button>
<a href="{{ url(mode == 'profile' ? 'home' : 'user_list') }}" class="btn btn-secondary">Cancel</a>
<a href="{{ url(mode == 'profile' ? 'home' : 'user_list') }}" class="btn btn-secondary">Back</a>
</div>
</div>
</div>

2
templates/vehicle-manufacturer/form.html.twig
View file

@ -50,7 +50,7 @@
<div class="row">
<div class="col-lg-12">
<button type="submit" class="btn btn-success">Submit</button>
<a href="{{ url('vmfg_list') }}" class="btn btn-secondary">Cancel</a>
<a href="{{ url('vmfg_list') }}" class="btn btn-secondary">Back</a>
</div>
</div>
</div>

2
templates/vehicle/form.html.twig
View file

@ -86,7 +86,7 @@
<div class="row">
<div class="col-lg-12">
<button type="submit" class="btn btn-success">Submit</button>
<a href="{{ url('vehicle_list') }}" class="btn btn-secondary">Cancel</a>
<a href="{{ url('vehicle_list') }}" class="btn btn-secondary">Back</a>
</div>
</div>
</div>