Removed aria and role attributes for maintaining leaner HTML markup in the view files.

This commit is contained in:
Alex Tselegidis 2020-09-03 14:48:58 +03:00
parent e8e3ae8598
commit 5c207751a8
8 changed files with 66 additions and 47 deletions

View file

@ -1,9 +1,9 @@
<div id="cookie-notice-modal" class="modal fade" tabindex="-1" role="dialog"> <div id="cookie-notice-modal" class="modal fade" tabindex="-1">
<div class="modal-dialog" role="document"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title"><?= lang('cookie_notice') ?></h4> <h4 class="modal-title"><?= lang('cookie_notice') ?></h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal"><span>&times;</span></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p><?= $cookie_notice_content ?></p> <p><?= $cookie_notice_content ?></p>

View file

@ -1,9 +1,9 @@
<div id="privacy-policy-modal" class="modal fade" tabindex="-1" role="dialog"> <div id="privacy-policy-modal" class="modal fade" tabindex="-1">
<div class="modal-dialog" role="document"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title"><?= lang('privacy_policy') ?></h4> <h4 class="modal-title"><?= lang('privacy_policy') ?></h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p><?= $privacy_policy_content ?></p> <p><?= $privacy_policy_content ?></p>

View file

@ -1,9 +1,9 @@
<div id="terms-and-conditions-modal" class="modal fade" tabindex="-1" role="dialog"> <div id="terms-and-conditions-modal" class="modal fade" tabindex="-1">
<div class="modal-dialog" role="document"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title"><?= lang('terms_and_conditions') ?></h4> <h4 class="modal-title"><?= lang('terms_and_conditions') ?></h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p><?= $terms_and_conditions_content ?></p> <p><?= $terms_and_conditions_content ?></p>

View file

@ -120,7 +120,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h3 class="modal-title"><?= lang('edit_appointment_title') ?></h3> <h3 class="modal-title"><?= lang('edit_appointment_title') ?></h3>
<button class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button class="close" data-dismiss="modal">&times;</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
@ -344,7 +344,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h3 class="modal-title"><?= lang('new_unavailable_title') ?></h3> <h3 class="modal-title"><?= lang('new_unavailable_title') ?></h3>
<button class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button class="close" data-dismiss="modal">&times;</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="modal-message alert d-none"></div> <div class="modal-message alert d-none"></div>
@ -410,7 +410,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h3 class="modal-title"><?= lang('new_extra_period_title') ?></h3> <h3 class="modal-title"><?= lang('new_extra_period_title') ?></h3>
<button class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button class="close" data-dismiss="modal">&times;</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="modal-message alert d-none"></div> <div class="modal-message alert d-none"></div>
@ -469,7 +469,7 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button class="close" data-dismiss="modal">&times;</button>
<h3 class="modal-title"><?= lang('select_google_calendar') ?></h3> <h3 class="modal-title"><?= lang('select_google_calendar') ?></h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">

View file

@ -38,8 +38,7 @@
<span>EASY!APPOINTMENTS</span> <span>EASY!APPOINTMENTS</span>
</div> </div>
<button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#header-menu" <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#header-menu">
aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>

View file

@ -25,16 +25,24 @@
</script> </script>
<div class="container-fluid backend-page" id="services-page"> <div class="container-fluid backend-page" id="services-page">
<ul class="nav nav-pills" role="tablist"> <ul class="nav nav-pills">
<li role="presentation" class="nav-item"><a class="nav-link active" href="#services" aria-controls="services" role="tab" data-toggle="tab"><?= lang('services') ?></a></li> <li class="nav-item">
<li role="presentation" class="nav-item"><a class="nav-link" href="#categories" aria-controls="categories" role="tab" data-toggle="tab"><?= lang('categories') ?></a></li> <a class="nav-link active" href="#services" data-toggle="tab">
<?= lang('services') ?>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#categories" data-toggle="tab">
<?= lang('categories') ?>
</a>
</li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<!-- SERVICES TAB --> <!-- SERVICES TAB -->
<div role="tabpanel" class="tab-pane active" id="services"> <div class="tab-pane active" id="services">
<div class="row"> <div class="row">
<div id="filter-services" class="filter-records col col-12 col-md-5"> <div id="filter-services" class="filter-records col col-12 col-md-5">
<form class="mb-4"> <form class="mb-4">
@ -154,7 +162,7 @@
<!-- CATEGORIES TAB --> <!-- CATEGORIES TAB -->
<div role="tabpanel" class="tab-pane" id="categories"> <div class="tab-pane" id="categories">
<div class="row"> <div class="row">
<div id="filter-categories" class="filter-records column col-12 col-md-5"> <div id="filter-categories" class="filter-records column col-12 col-md-5">
<form class="input-append mb-4"> <form class="input-append mb-4">

View file

@ -32,29 +32,29 @@
</script> </script>
<div id="settings-page" class="container-fluid backend-page"> <div id="settings-page" class="container-fluid backend-page">
<ul class="nav nav-pills" role="tablist"> <ul class="nav nav-pills">
<?php if ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE): ?> <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE): ?>
<li role="presentation" class="nav-item"> <li class="nav-item">
<a class="nav-link" href="#general" aria-controls="general" role="tab" data-toggle="tab"><?= lang('general') ?></a> <a class="nav-link" href="#general" data-toggle="tab"><?= lang('general') ?></a>
</li> </li>
<?php endif ?> <?php endif ?>
<?php if ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE): ?> <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE): ?>
<li role="presentation" class="nav-item"> <li class="nav-item">
<a class="nav-link" href="#business-logic" aria-controls="business-logic" role="tab" data-toggle="tab"><?= lang('business_logic') ?></a> <a class="nav-link" href="#business-logic" data-toggle="tab"><?= lang('business_logic') ?></a>
</li> </li>
<?php endif ?> <?php endif ?>
<?php if ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE): ?> <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE): ?>
<li role="presentation" class="nav-item"> <li class="nav-item">
<a class="nav-link" href="#legal-contents" aria-controls="legal-contents" role="tab" data-toggle="tab"><?= lang('legal_contents') ?></a> <a class="nav-link" href="#legal-contents" data-toggle="tab"><?= lang('legal_contents') ?></a>
</li> </li>
<?php endif ?> <?php endif ?>
<?php if ($privileges[PRIV_USER_SETTINGS]['view'] == TRUE): ?> <?php if ($privileges[PRIV_USER_SETTINGS]['view'] == TRUE): ?>
<li role="presentation" class="nav-item"> <li class="nav-item">
<a class="nav-link" href="#current-user" aria-controls="current-user" role="tab" data-toggle="tab"><?= lang('current_user') ?></a> <a class="nav-link" href="#current-user" data-toggle="tab"><?= lang('current_user') ?></a>
</li> </li>
<?php endif ?> <?php endif ?>
<li role="presentation" class="nav-item"> <li class="nav-item">
<a class="nav-link" href="#about-app" aria-controls="about-app" role="tab" data-toggle="tab"><?= lang('about_app') ?></a> <a class="nav-link" href="#about-app" data-toggle="tab"><?= lang('about_app') ?></a>
</li> </li>
</ul> </ul>
@ -63,7 +63,7 @@
<!-- GENERAL TAB --> <!-- GENERAL TAB -->
<?php $hidden = ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE) ? '' : 'd-none' ?> <?php $hidden = ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE) ? '' : 'd-none' ?>
<div role="tabpanel" class="tab-pane active <?= $hidden ?>" id="general"> <div class="tab-pane active <?= $hidden ?>" id="general">
<form> <form>
<fieldset> <fieldset>
<legend class="border-bottom mb-4"> <legend class="border-bottom mb-4">
@ -168,7 +168,7 @@
<div class="form-group"> <div class="form-group">
<label><?= lang('customer_notifications') ?></label> <label><?= lang('customer_notifications') ?></label>
<br> <br>
<button type="button" id="customer-notifications" class="btn btn-light" data-toggle="button" aria-pressed="false"> <button type="button" id="customer-notifications" class="btn btn-light" data-toggle="button">
<i class="far fa-envelope"></i> <i class="far fa-envelope"></i>
<?= lang('receive_notifications') ?> <?= lang('receive_notifications') ?>
</button> </button>
@ -181,7 +181,7 @@
CAPTCHA CAPTCHA
</label> </label>
<br> <br>
<button type="button" id="require-captcha" class="btn btn-light" data-toggle="button" aria-pressed="false"> <button type="button" id="require-captcha" class="btn btn-light" data-toggle="button">
<i class="fas fa-lock"></i> <i class="fas fa-lock"></i>
<?= lang('require_captcha') ?> <?= lang('require_captcha') ?>
</button> </button>
@ -194,7 +194,7 @@
<?= lang('phone_number') ?> <?= lang('phone_number') ?>
</label> </label>
<br> <br>
<button type="button" id="require-phone-number" class="btn btn-light" data-toggle="button" aria-pressed="false"> <button type="button" id="require-phone-number" class="btn btn-light" data-toggle="button">
<i class="fas fa-phone-alt"></i> <i class="fas fa-phone-alt"></i>
<?= lang('require_phone_number') ?> <?= lang('require_phone_number') ?>
</button> </button>
@ -205,7 +205,7 @@
<div class="form-group"> <div class="form-group">
<label><?= lang('any_provider') ?></label> <label><?= lang('any_provider') ?></label>
<br> <br>
<button type="button" id="display-any-provider" class="btn btn-light" data-toggle="button" aria-pressed="false"> <button type="button" id="display-any-provider" class="btn btn-light" data-toggle="button">
<i class="fas fa-user"></i> <i class="fas fa-user"></i>
<?= lang('display_any_provider') ?> <?= lang('display_any_provider') ?>
</button> </button>
@ -222,7 +222,7 @@
<!-- BUSINESS LOGIC TAB --> <!-- BUSINESS LOGIC TAB -->
<?php $hidden = ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE) ? '' : 'd-none' ?> <?php $hidden = ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE) ? '' : 'd-none' ?>
<div role="tabpanel" class="tab-pane <?= $hidden ?>" id="business-logic"> <div class="tab-pane <?= $hidden ?>" id="business-logic">
<form> <form>
<fieldset> <fieldset>
<legend class="border-bottom mb-4"> <legend class="border-bottom mb-4">
@ -308,7 +308,7 @@
<!-- LEGAL CONTENTS TAB --> <!-- LEGAL CONTENTS TAB -->
<?php $hidden = ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE) ? '' : 'd-none' ?> <?php $hidden = ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE) ? '' : 'd-none' ?>
<div role="tabpanel" class="tab-pane <?= $hidden ?>" id="legal-contents"> <div class="tab-pane <?= $hidden ?>" id="legal-contents">
<form> <form>
<fieldset> <fieldset>
<legend class="border-bottom mb-4"> <legend class="border-bottom mb-4">
@ -386,7 +386,7 @@
<!-- CURRENT USER TAB --> <!-- CURRENT USER TAB -->
<?php $hidden = ($privileges[PRIV_USER_SETTINGS]['view'] == TRUE) ? '' : 'd-none' ?> <?php $hidden = ($privileges[PRIV_USER_SETTINGS]['view'] == TRUE) ? '' : 'd-none' ?>
<div role="tabpanel" class="tab-pane <?= $hidden ?>" id="current-user"> <div class="tab-pane <?= $hidden ?>" id="current-user">
<form> <form>
<div class="row"> <div class="row">
<fieldset class="col-12 col-sm-6 personal-info-wrapper"> <fieldset class="col-12 col-sm-6 personal-info-wrapper">
@ -496,7 +496,7 @@
<!-- ABOUT TAB --> <!-- ABOUT TAB -->
<div role="tabpanel" class="tab-pane" id="about-app"> <div class="tab-pane" id="about-app">
<h3>Easy!Appointments</h3> <h3>Easy!Appointments</h3>
<p> <p>

View file

@ -36,17 +36,29 @@
<div class="container-fluid backend-page" id="users-page"> <div class="container-fluid backend-page" id="users-page">
<!-- PAGE NAVIGATION --> <!-- PAGE NAVIGATION -->
<ul class="nav nav-pills" role="tablist"> <ul class="nav nav-pills">
<li role="presentation" class="nav-item"><a class="nav-link active" href="#providers" aria-controls="providers" role="tab" data-toggle="tab"><?= lang('providers') ?></a></li> <li class="nav-item">
<li role="presentation" class="nav-item"><a class="nav-link" href="#secretaries" aria-controls="secretaries" role="tab" data-toggle="tab"><?= lang('secretaries') ?></a></li> <a class="nav-link active" href="#providers" data-toggle="tab">
<li role="presentation" class="nav-item"><a class="nav-link" href="#admins" aria-controls="admins" role="tab" data-toggle="tab"><?= lang('admins') ?></a></li> <?= lang('providers') ?>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#secretaries" data-toggle="tab">
<?= lang('secretaries') ?>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#admins" data-toggle="tab">
<?= lang('admins') ?>
</a>
</li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<!-- PROVIDERS TAB --> <!-- PROVIDERS TAB -->
<div role="tabpanel" class="tab-pane active" id="providers"> <div class="tab-pane active" id="providers">
<div class="row"> <div class="row">
<div id="filter-providers" class="filter-records column col-12 col-md-5"> <div id="filter-providers" class="filter-records column col-12 col-md-5">
<form class="mb-4"> <form class="mb-4">
@ -291,7 +303,7 @@
<!-- SECRETARIES TAB --> <!-- SECRETARIES TAB -->
<div role="tabpanel" class="tab-pane" id="secretaries"> <div class="tab-pane" id="secretaries">
<div class="row"> <div class="row">
<div id="filter-secretaries" class="filter-records column col-12 col-md-5"> <div id="filter-secretaries" class="filter-records column col-12 col-md-5">
<form class="mb-4"> <form class="mb-4">
@ -451,7 +463,7 @@
<!-- ADMINS TAB --> <!-- ADMINS TAB -->
<div role="tabpanel" class="tab-pane" id="admins"> <div class="tab-pane" id="admins">
<div class="row"> <div class="row">
<div id="filter-admins" class="filter-records column col-12 col-md-5"> <div id="filter-admins" class="filter-records column col-12 col-md-5">
<form class="mb-4"> <form class="mb-4">