Merge pull request #15 from bluzphp/develop

Fixed HTML
bluzphp · Oct 12, 2017 · c73d0df · c73d0df
2 parents dabc8b3 + a8e4685
commit c73d0df
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/application/modules/contact-us/views/crud.phtml b/application/modules/contact-us/views/crud.phtml
@@ -17,25 +17,25 @@
     </div>
     <div class="modal-body">
       <div class="form-group row">
-        <label class="control-label col-lg-2" for="name"><?= __('Name') ?>:</label>
+        <label class="col-form-label col-lg-2" for="name"><?= __('Name') ?>:</label>
         <div class="col-lg-10">
           <input type="text" class="form-control" id="name" name="name" value="<?= $row->name ?>" required/>
         </div>
       </div>
       <div class="form-group row">
-        <label class="control-label col-lg-2" for="email"><?= __('Email') ?>:</label>
+        <label class="col-form-label col-lg-2" for="email"><?= __('Email') ?>:</label>
         <div class="col-lg-10">
           <input type="email" class="form-control" id="email" name="email" value="<?= $row->email ?>" required/>
         </div>
       </div>
       <div class="form-group row">
-        <label class="control-label col-lg-2" for="subject"><?= __('Subject') ?>:</label>
+        <label class="col-form-label col-lg-2" for="subject"><?= __('Subject') ?>:</label>
         <div class="col-lg-10">
           <input type="text" class="form-control" id="subject" name="subject" value="<?= $row->subject ?>" required/>
         </div>
       </div>
       <div class="form-group row">
-        <label for="content" class="control-label col-lg-2"><?= __('Message') ?>:</label>
+        <label for="content" class="col-form-label col-lg-2"><?= __('Message') ?>:</label>
         <div class="col-lg-10">
           <textarea rows="12" cols="26" id="content" class="form-control redactor" name="message"
                     required><?= $row->message ?></textarea>

diff --git a/application/modules/contact-us/views/grid.phtml b/application/modules/contact-us/views/grid.phtml
@@ -113,7 +113,7 @@
   <script>
     require(['jquery'], function ($) {
       $(function () {
-        $('#read, #answer').on('success.ajax.bluz', function () {
+        $('#read, #answer').on('success.bluz.ajax', function () {
           let icon = $(this).find('i');
           (icon.hasClass('fa-square-o') && icon.removeClass()) ? icon.addClass('fa-check-square-o fa') : icon.addClass('fa-square-o fa')
         });

diff --git a/application/modules/contact-us/views/index.phtml b/application/modules/contact-us/views/index.phtml
@@ -12,14 +12,14 @@
   <div class="modal-body">
     <?php if ($this->user()) : ?>
       <div class="form-group row">
-        <label for="subject" class="control-label col-lg-2"><?= __('Subject') ?>:<sup
+        <label for="subject" class="col-form-label col-lg-2"><?= __('Subject') ?>:<sup
               class="text-danger">*</sup></label>
         <div class="col-lg-6">
           <input type="text" class="form-control" id="subject" name="subject" value="<?=esc($subject)?>" required/>
         </div>
       </div>
       <div class="form-group row">
-        <label for="content" class="control-label col-lg-2"><?= __('Message') ?>:<sup
+        <label for="content" class="col-form-label col-lg-2"><?= __('Message') ?>:<sup
               class="text-danger">*</sup></label>
         <div class="col-lg-6">
               <textarea rows="5" cols="10" id="content" class="form-control redactor" name="message"
@@ -28,27 +28,27 @@
       </div>
     <?php else : ?>
       <div class="form-group row">
-        <label for="name" class="control-label col-lg-2"><?= __('Name') ?>:<sup class="text-danger">*</sup></label>
+        <label for="name" class="col-form-label col-lg-2"><?= __('Name') ?>:<sup class="text-danger">*</sup></label>
         <div class="col-lg-6">
           <input type="text" class="form-control" id="name" name="name" value="<?=esc($name)?>" required/>
         </div>
       </div>
       <div class="form-group row">
-        <label for="email" class="control-label col-lg-2"><?= __('Email') ?>:<sup
+        <label for="email" class="col-form-label col-lg-2"><?= __('Email') ?>:<sup
               class="text-danger">*</sup></label>
         <div class="col-lg-6">
           <input type="email" class="form-control" id="email" name="email" value="<?=esc($email)?>" required/>
         </div>
       </div>
       <div class="form-group row">
-        <label for="subject" class="control-label col-lg-2"><?= __('Subject') ?>:<sup
+        <label for="subject" class="col-form-label col-lg-2"><?= __('Subject') ?>:<sup
               class="text-danger">*</sup></label>
         <div class="col-lg-6">
           <input type="text" class="form-control" id="subject" name="subject" value="<?=esc($subject)?>" required/>
         </div>
       </div>
       <div class="form-group row">
-        <label for="content" class="control-label col-lg-2"><?= __('Message') ?>:<sup
+        <label for="content" class="col-form-label col-lg-2"><?= __('Message') ?>:<sup
               class="text-danger">*</sup></label>
         <div class="col-lg-6">
               <textarea rows="12" cols="26" id="content" class="form-control redactor" name="message"