First cleanup of COmanage Match UI/UX (CO-1662)

COmanage · Oct 1, 2018 · ad15300 · ad15300
1 parent ecee7a1
commit ad15300
Show file tree

Hide file tree

Showing 34 changed files with 3,711 additions and 422 deletions.
diff --git a/app/composer.lock b/app/composer.lock
diff --git a/app/src/Locale/en_US/default.po b/app/src/Locale/en_US/default.po
@@ -26,6 +26,9 @@
 msgid "match.meta.lang"
 msgstr "en"
 
+msgid "match.meta.logo"
+msgstr "COmanage Logo"
+
 msgid "match.meta.match"
 msgstr "COmanage Match"
 
@@ -333,6 +336,9 @@ msgstr "Assign This Reference ID"
 msgid "match.op.save"
 msgstr "Save"
 
+msgid "match.op.skip_to_content"
+msgstr "Skip to main content"
+
 ### Results
 msgid "match.rs.build"
 msgstr "Matchgrid schema successfully applied"

diff --git a/app/src/Template/Element/Flash/default.ctp b/app/src/Template/Element/Flash/default.ctp
@@ -1,10 +1,23 @@
 <?php
-$class = 'message';
-if (!empty($params['class'])) {
+  $class = 'message';
+  if (!empty($params['class'])) {
     $class .= ' ' . $params['class'];
-}
-if (!isset($params['escape']) || $params['escape'] !== false) {
+  }
+  if (!isset($params['escape']) || $params['escape'] !== false) {
     $message = h($message);
-}
+  }
 ?>
+<?php /*
 <div class="<?= h($class) ?>" onclick="this.classList.add('hidden');"><?= $message ?></div>
+*/ ?>
+
+<?php
+  if(!empty($message)) {
+    // Strip tags then escape quotes before handing Flash message to noty.js
+    $filteredMessage = filter_var(filter_var($message,FILTER_SANITIZE_STRING,FILTER_FLAG_NO_ENCODE_QUOTES),FILTER_SANITIZE_MAGIC_QUOTES);
+    // Replace all newlines with html breaks
+    $filteredMessage = str_replace(array("\r", "\n"), '<br/>', $filteredMessage);
+    print "<script>generateFlash('" . $filteredMessage . "', '" . $class . "');</script>";
+  }
+?>
+
diff --git a/app/src/Template/Element/Flash/error.ctp b/app/src/Template/Element/Flash/error.ctp
@@ -1,6 +1,20 @@
 <?php
-if (!isset($params['escape']) || $params['escape'] !== false) {
+  if (!isset($params['escape']) || $params['escape'] !== false) {
     $message = h($message);
-}
+  }
 ?>
+<?php /*
 <div class="message error" onclick="this.classList.add('hidden');"><?= $message ?></div>
+*/ ?>
+
+
+<?php
+  if(!empty($message)) {
+    // Strip tags then escape quotes before handing Flash message to noty.js
+    $filteredMessage = filter_var(filter_var($message,FILTER_SANITIZE_STRING,FILTER_FLAG_NO_ENCODE_QUOTES),FILTER_SANITIZE_MAGIC_QUOTES);
+    // Replace all newlines with html breaks
+    $filteredMessage = str_replace(array("\r", "\n"), '<br/>', $filteredMessage);
+    print "<script>generateFlash('" . $filteredMessage . "', 'error');</script>";
+  }
+?>
+
diff --git a/app/src/Template/Element/Flash/success.ctp b/app/src/Template/Element/Flash/success.ctp
@@ -3,4 +3,16 @@ if (!isset($params['escape']) || $params['escape'] !== false) {
     $message = h($message);
 }
 ?>
+<?php /*
 <div class="message success" onclick="this.classList.add('hidden')"><?= $message ?></div>
+*/ ?>
+
+<?php
+  if(!empty($message)) {
+    // Strip tags then escape quotes before handing Flash message to noty.js
+    $filteredMessage = filter_var(filter_var($message,FILTER_SANITIZE_STRING,FILTER_FLAG_NO_ENCODE_QUOTES),FILTER_SANITIZE_MAGIC_QUOTES);
+    // Replace all newlines with html breaks
+    $filteredMessage = str_replace(array("\r", "\n"), '<br/>', $filteredMessage);
+    print "<script>generateFlash('" . $filteredMessage . "', 'success');</script>";
+  }
+?>
diff --git a/app/src/Template/Element/menuMain.ctp b/app/src/Template/Element/menuMain.ctp
@@ -28,8 +28,6 @@
 // XXX we're using the same cookie as registry to determine collapsing of the menu, 
 //     we should probably have our own cookie (note other cookies already use "match" prefix)
 ?>
-XXX PLACEHOLDER BECAUSE<br />
-MENU DOESNT ALIGN
 <ul id="main-menu" class="metismenu">
   <?php
     if(!empty($vv_cur_mg)) {

diff --git a/app/src/Template/Element/menuUser.ctp b/app/src/Template/Element/menuUser.ctp
@@ -26,7 +26,6 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 ?>
-Hello, World
 <?php if(!empty($vv_user)): ?>
   <div id="user">
     <a href="#" class="topMenu" id="user-links">

diff --git a/app/src/Template/Layout/default.ctp b/app/src/Template/Layout/default.ctp
@@ -75,11 +75,23 @@ if(isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'M
     <?= $this->fetch('css') ?>
     <?= $this->fetch('script') ?>
   </head>
-
-  <body onload="js_onload_call_hooks()>
+
+  <?php
+    // cleanse the controller and action strings and insert them into the body classes
+    $controller_stripped = preg_replace('/[^a-zA-Z0-9\-_]/', '', $this->request->getParam('controller'));
+    $action_stripped = preg_replace('/[^a-zA-Z0-9\-_]/', '', $this->request->getParam('action'));
+    $bodyClasses = $controller_stripped . ' ' .$action_stripped;
+
+    // add further body classes as needed
+    if($this->Session->check('Auth.User') != NULL) {
+      $bodyClasses .= ' logged-in';
+    } else {
+      $bodyClasses .= ' logged-out';
+    }
+  ?>
+  <body class="<?= $bodyClasses ?>" onload="js_onload_call_hooks()">
     <div id="skip-to-content-box">
-<!-- XXX shouldn't the text be localized, here and in Registry? -->
-      <a href="#content-start" id="skip-to-content">Skip to main content.</a>
+      <a href="#content-start" id="skip-to-content"><?= __('match.op.skip_to_content') ?></a>
     </div>
 
     <!-- Primary layout -->
@@ -96,7 +108,6 @@ if(isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'M
       <header id="banner" class="mdl-layout__header mdl-layout__header--scroll">
         <div class="mdl-layout__header-row">
           <div id="collaborationTitle">
-<!-- XXX fonts are different? -->
             <?= __('match.meta.match'); ?>
           </div>
 
@@ -107,8 +118,7 @@ if(isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'M
 // XXX background needs to be on green (and primary gear should be green)
                   "COmanage-Logo-LG-onBlue.png",
                   array(
-                    // XXX this should be localized (and in Registry also)
-                    'alt' => 'COmanage Logo'
+                    'alt' => __('match.meta.logo')
                   )
                 ),'/',
                 array('escape' => false)
@@ -155,6 +165,9 @@ if(isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'M
       'jquery/metisMenu/metisMenu.min.js',
       'js-cookie/js.cookie-2.1.3.min.js',
       'jquery/spin.min.js',
+      'jquery/noty/jquery.noty.js',
+      'jquery/noty/layouts/topCenter.js',
+      'jquery/noty/themes/comanage.js',
       'comanage.js'
     ]) . "\n"; ?>
 

diff --git a/app/src/Template/Matchgrids/fields.inc b/app/src/Template/Matchgrids/fields.inc
@@ -34,16 +34,15 @@ use \App\Lib\Enum\ReferenceIdEnum;
     // Hide or show gadgets according to current state
 
     var method = document.getElementById('referenceid-method').value;
-    
+
     if(method == '<?= ReferenceIdEnum::Sequence ?>') {
       $("#referenceid-start").closest('li').show('fade');
     } else {
-      $("#referenceid-start").closest('li').hide('fade');
+      $("#referenceid-start").closest('li').hide();
     }
   }
 
   function js_local_onload() {
-// XXX this doesn't run, probably because comanage.js doesn't load correctly?
     fields_update_gadgets();
   }
 </script>

diff --git a/app/src/Template/Permissions/fields.inc b/app/src/Template/Permissions/fields.inc
@@ -36,7 +36,7 @@ use \App\Lib\Enum\PermissionEnum;
     var perm = document.getElementById('permission').value;
 
     if(perm == '<?= PermissionEnum::PlatformAdmin ?>') {
-      $("#matchgrid-id").closest('li').hide('fade');
+      $("#matchgrid-id").closest('li').hide();
     } else {
       $("#matchgrid-id").closest('li').show('fade');
     }

diff --git a/app/src/Template/Standard/add-edit-view.ctp b/app/src/Template/Standard/add-edit-view.ctp
@@ -33,7 +33,11 @@ $modelsName = $this->name;
 // $tablename = models
 $tableName = \Cake\Utility\Inflector::tableize($this->name);
 ?>
-<h1><?= $vv_title; ?></h1>
+<div class="titleNavContainer">
+  <div class="pageTitle">
+    <h1><?= $vv_title; ?></h1>
+  </div>
+</div>
 <?php    
   if($action == 'add' || $action == 'edit') {
     // By default, the form will POST to the current controller