Update javascript libraries; provide a generic table-row click handling

COmanage · Dec 5, 2019 · 597892d · 597892d
1 parent 715ac35
commit 597892d
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 24 deletions.
diff --git a/app/src/Template/Element/breadcrumbs.ctp b/app/src/Template/Element/breadcrumbs.ctp
@@ -101,7 +101,7 @@ if($this->request->getRequestTarget(false) != '/') {
       $target
     );
   }
-  
+
   if(!empty($vv_title)) {
     $this->Breadcrumbs->add(
       $vv_title

diff --git a/app/src/Template/Element/javascript.ctp b/app/src/Template/Element/javascript.ctp
@@ -44,7 +44,6 @@
       // Preserve the state of the most recently selected menu item if it is expandable (a "menuTop" item)
       // (we only use this behavior when the the drawer is fully-open)
       var mainMenuSelectedParentId = Cookies.get("main-menu-selected-parent-id");
-      console.log(mainMenuSelectedParentId);
       if(mainMenuSelectedParentId != undefined && mainMenuSelectedParentId != "") {
         $("#" + mainMenuSelectedParentId).addClass("active");
         $("#" + mainMenuSelectedParentId + " > a.menuTop").attr("aria-expanded","true");
@@ -202,6 +201,11 @@
       }
     });
 
+    // Generic table-row click handling
+    $('tr.linked-row').click(function (e) {
+       location.href = $(this).find('a.row-link').attr('href');
+    });
+
     // Add a spinner when a form is submitted or when any item is clicked with a "spin" class
     $("input[type='submit'], .spin").click(function() {
 

diff --git a/app/src/Template/Layout/default.ctp b/app/src/Template/Layout/default.ctp
@@ -56,9 +56,9 @@ if(isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'M
 
     <!-- Load CSS -->
     <?= $this->Html->css([
-      'bootstrap/bootstrap-4.3.1.min',
+      'bootstrap/bootstrap-4.4.1.min',
       'jquery/jquery-ui-1.12.1.custom/jquery-ui.min',
-      'jquery/metisMenu/metisMenu-2.5.2.min.css',
+      'jquery/metisMenu/metisMenu-3.0.4.min.css',
       'fonts/Font-Awesome-4.6.3/css/font-awesome.min', // XXX Font-Awesome only used for login/logout icon; replace???
       'co-base',
       'co-responsive'
@@ -153,9 +153,9 @@ if(isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'M
     <!-- Load Javascript -->
     <?= $this->Html->script([
       'jquery/jquery-3.3.1.min.js',
-      'bootstrap/bootstrap-4.3.1.min',
+      'bootstrap/bootstrap-4.4.1.min',
       'jquery/jquery-ui-1.12.1.custom/jquery-ui.min.js',
-      'jquery/metisMenu/metisMenu-2.5.2.min.js',
+      'jquery/metisMenu/metisMenu-3.0.4.min.js',
       'js-cookie/js.cookie-2.1.3.min.js',
       'jquery/spin/spin.min.js',
       'jquery/noty/jquery.noty.js',

diff --git a/app/src/Template/Matchgrids/pending.ctp b/app/src/Template/Matchgrids/pending.ctp
@@ -43,12 +43,16 @@ declare(strict_types = 1);
     <th><?= __('match.fd.request_time'); ?></th>
   </tr>
   <?php foreach($vv_pending as $p): ?>
-  <tr>
+  <tr class="linked-row spin">
     <td>
       <?= $p['sor']; ?>
     </td>
     <td>
-      <?= $this->Html->link($p['sorid'], ['action' => 'reconcile', $vv_matchgrid_id, 'rowid' => $p['id']]); ?>
+      <?= $this->Html->link(
+        $p['sorid'],
+        ['action' => 'reconcile', $vv_matchgrid_id, 'rowid' => $p['id']],
+        ['class' => 'row-link']
+      ); ?>
     </td>
     <td>
       <?= $p['request_time']; ?>

diff --git a/app/webroot/css/bootstrap/bootstrap-4.3.1.min.css b/app/webroot/css/bootstrap/bootstrap-4.3.1.min.css
diff --git a/app/webroot/css/bootstrap/bootstrap-4.4.1.min.css b/app/webroot/css/bootstrap/bootstrap-4.4.1.min.css
diff --git a/app/webroot/css/bootstrap/bootstrap.min.css.map b/app/webroot/css/bootstrap/bootstrap.min.css.map
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
@@ -1002,6 +1002,12 @@ tr:nth-child(even) td {
 td.indented {
   border-left: 3em solid #fff;
 }
+tr.linked-row {
+  cursor: pointer;
+}
+tr.linked-row:hover td {
+  background-color: #ffe;
+}
 .menuitembutton {
   width: 250px;
 }

diff --git a/app/webroot/js/bootstrap/bootstrap-4.3.1.min.js b/app/webroot/js/bootstrap/bootstrap-4.3.1.min.js
diff --git a/app/webroot/js/bootstrap/bootstrap-4.4.1.min.js b/app/webroot/js/bootstrap/bootstrap-4.4.1.min.js
diff --git a/app/webroot/js/bootstrap/bootstrap.min.js.map b/app/webroot/js/bootstrap/bootstrap.min.js.map
diff --git a/app/webroot/js/comanage.js b/app/webroot/js/comanage.js
@@ -89,7 +89,6 @@ function stopSpinner() {
   $("#coSpinner").remove();
 }
 
-
 // Returns an i18n string with tokens replaced.
 // For use in JavaScript dialogs.
 // text          - body text for the array with tokens {0}, {1}, etc
@@ -225,4 +224,5 @@ function limitPage(pageLimit,recordCount,currentPage) {
 
   // Redirect to the new page:
   window.location = currentUrl;
-}
+}
+