Fixed: Now all buttons have a type (button / reset)

+ belonging adaptations in JS:
. removed e.preventDefault as no longer needed with button type=button
. removed empty text value settings with button type=reset

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
This commit is contained in:
Cris
2021-02-23 11:27:03 +01:00
committed by cris-technikum
parent 4ebd5a85bb
commit 6446e424a9
8 changed files with 43 additions and 62 deletions
@@ -290,11 +290,11 @@ $this->load->view(
<!-- Action Button 'Abbrechen'-->
<div class="pull-right">
<button id="approveAnrechnungDetail-begruendung-abbrechen"
class="btn btn-default btn-w200">
class="btn btn-default btn-w200" type="reset">
<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
</button>
<button id="approveAnrechnungDetail-reject-anrechnung-confirm"
class="btn btn-primary btn-w200">
class="btn btn-primary btn-w200" type="button">
<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
</button>
</div>
@@ -311,11 +311,11 @@ $this->load->view(
<!-- Action Button 'Abbrechen'-->
<div class="pull-right">
<button id="approveAnrechnungDetail-genehmigung-abbrechen"
class="btn btn-default btn-w200">
class="btn btn-default btn-w200" type="reset">
<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
</button>
<button id="approveAnrechnungDetail-approve-anrechnung-confirm"
class="btn btn-primary btn-w200">
class="btn btn-primary btn-w200" type="button">
<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
</button>
</div>
@@ -333,14 +333,17 @@ $this->load->view(
<div class="pull-right">
<button id="approveAnrechnungDetail-withdraw-anrechnung-approvement"
class="btn btn-default btn-w200 <?php echo ($anrechnungData->status_kurzbz == 'approved' ||
$anrechnungData->status_kurzbz == 'rejected') ? '' : 'hidden' ?>">
$anrechnungData->status_kurzbz == 'rejected') ? '' : 'hidden' ?>"
type="button">
<?php echo ucfirst($this->p->t('global', 'zuruecknehmen')); ?>
</button>
<button id="approveAnrechnungDetail-reject-anrechnung-ask" class="btn btn-danger btn-w200"
type="button"
<?php echo $anrechnungData->status_kurzbz == 'inProgressDP' ? '' : 'disabled' ?>>
<?php echo ucfirst($this->p->t('global', 'ablehnen')); ?>
</button>
<button id="approveAnrechnungDetail-approve-anrechnung-ask" class="btn btn-primary btn-w200"
type="button"
<?php echo $anrechnungData->status_kurzbz == 'inProgressDP' ? '' : 'disabled' ?>>
<?php echo ucfirst($this->p->t('global', 'genehmigen')); ?>
</button>
@@ -155,11 +155,12 @@ $this->load->view(
<br>
<!-- Action Button 'Abbrechen'-->
<div class="pull-right">
<button id="approveAnrechnungUebersicht-begruendung-abbrechen" class="btn btn-default btn-w200">
<button id="approveAnrechnungUebersicht-begruendung-abbrechen"
class="btn btn-default btn-w200" type="reset">
<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
</button>
<button id="approveAnrechnungUebersicht-reject-anrechnungen-confirm"
class="btn btn-primary btn-w200">
class="btn btn-primary btn-w200" type="button">
<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
</button>
</div>
@@ -173,11 +174,12 @@ $this->load->view(
<br>
<!-- Action Button 'Abbrechen'-->
<div class="pull-right">
<button id="approveAnrechnungUebersicht-empfehlung-abbrechen" class="btn btn-default btn-w200">
<button id="approveAnrechnungUebersicht-empfehlung-abbrechen"
class="btn btn-default btn-w200" type="reset">
<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
</button>
<button id="approveAnrechnungUebersicht-approve-anrechnungen-confirm"
class="btn btn-primary btn-w200">
class="btn btn-primary btn-w200" type="button">
<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
</button>
</div>
@@ -221,11 +223,14 @@ $this->load->view(
<div class="col-xs-9">
<div class="pull-right">
<button id="approveAnrechnungUebersicht-request-recommendation"
class="btn btn-default btn-w200 btn-mr50"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungAnfordern')); ?></button>
class="btn btn-default btn-w200 btn-mr50" type="button">
<?php echo ucfirst($this->p->t('anrechnung', 'empfehlungAnfordern')); ?></button>
<button id="approveAnrechnungUebersicht-reject-anrechnungen-ask"
class="btn btn-danger btn-w200"><?php echo ucfirst($this->p->t('global', 'ablehnen')); ?></button>
class="btn btn-danger btn-w200" type="button">
<?php echo ucfirst($this->p->t('global', 'ablehnen')); ?></button>
<button id="approveAnrechnungUebersicht-approve-anrechnungen-ask"
class="btn btn-primary btn-w200"><?php echo ucfirst($this->p->t('global', 'genehmigen')); ?></button>
class="btn btn-primary btn-w200" type="button">
<?php echo ucfirst($this->p->t('global', 'genehmigen')); ?></button>
</div>
</div>
</div>
@@ -209,11 +209,11 @@ $this->load->view(
<!-- Action Button Abbrechen & Bestaetigen-->
<div class="pull-right">
<button id="reviewAnrechnungDetail-begruendung-abbrechen"
class="btn btn-default btn-w200">
class="btn btn-default btn-w200" type="reset">
<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
</button>
<button id="reviewAnrechnungDetail-dont-recommend-anrechnung-confirm"
class="btn btn-primary btn-w200">
class="btn btn-primary btn-w200" type="button">
<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
</button>
</div>
@@ -229,11 +229,11 @@ $this->load->view(
<!-- Action Button Abbrechen & Bestaetigen-->
<div class="pull-right">
<button id="reviewAnrechnungDetail-empfehlung-abbrechen"
class="btn btn-default btn-w200">
class="btn btn-default btn-w200" type="reset">
<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
</button>
<button id="reviewAnrechnungDetail-recommend-anrechnung-confirm"
class="btn btn-primary btn-w200">
class="btn btn-primary btn-w200" type="button">
<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
</button>
</div>
@@ -248,10 +248,12 @@ $this->load->view(
<div class="pull-right">
<button id="reviewAnrechnungDetail-dont-recommend-anrechnung-ask" class="btn btn-danger btn-w200"
type="button"
<?php echo is_null($empfehlungData->empfehlung) ? '' : 'disabled' ?>>
<?php echo ucfirst($this->p->t('anrechnung', 'nichtEmpfehlen')); ?>
</button>
<button id="reviewAnrechnungDetail-recommend-anrechnung-ask" class="btn btn-primary btn-w200"
type="button"
<?php echo is_null($empfehlungData->empfehlung) ? '' : 'disabled' ?>>
<?php echo ucfirst($this->p->t('anrechnung', 'empfehlen')); ?>
</button>
@@ -154,11 +154,12 @@ $this->load->view(
<br>
<!-- Action Button Abbrechen & Bestaetigen-->
<div class="pull-right">
<button id="reviewAnrechnungUebersicht-begruendung-abbrechen" class="btn btn-default btn-w200">
<button id="reviewAnrechnungUebersicht-begruendung-abbrechen"
class="btn btn-default btn-w200" type="reset">
<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
</button>
<button id="reviewAnrechnungUebersicht-dont-recommend-anrechnungen-confirm"
class="btn btn-primary btn-w200">
class="btn btn-primary btn-w200" type="button">
<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
</button>
</div>
@@ -172,11 +173,12 @@ $this->load->view(
<br>
<!-- Action Button 'Abbrechen'-->
<div class="pull-right">
<button id="reviewAnrechnungUebersicht-empfehlung-abbrechen" class="btn btn-default btn-w200">
<button id="reviewAnrechnungUebersicht-empfehlung-abbrechen"
class="btn btn-default btn-w200" type="reset">
<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
</button>
<button id="reviewAnrechnungUebersicht-recommend-anrechnungen-confirm"
class="btn btn-primary btn-w200">
class="btn btn-primary btn-w200" type="button">
<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
</button>
</div>
@@ -222,9 +224,11 @@ $this->load->view(
<div class="col-xs-9">
<div class="pull-right">
<button id="reviewAnrechnungUebersicht-dont-recommend-anrechnungen-ask"
class="btn btn-danger btn-w200"><?php echo ucfirst($this->p->t('anrechnung', 'nichtEmpfehlen')); ?></button>
class="btn btn-danger btn-w200" type="button">
<?php echo ucfirst($this->p->t('anrechnung', 'nichtEmpfehlen')); ?></button>
<button id="reviewAnrechnungUebersicht-recommend-anrechnungen-ask"
class="btn btn-primary btn-w200"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlen')); ?></button>
class="btn btn-primary btn-w200" type="button">
<?php echo ucfirst($this->p->t('anrechnung', 'empfehlen')); ?></button>
</div>
</div>
</div>