[media] Remove unused code (aces#3705)

This removes the validFilters and formToFilter variables which are unused when using React.

[Help Editor] Remove unused 'indent' variable (aces#3757)

Added spec/README for conflict resolver module (aces#3375)

This adds a README for the conflict resolver outlining the purpose of the module, following the template set out by the imaging_browser module.

Added ModalWindow Component to Tabs

Added Webpack Config

added scroll on Modal Window

added functionality to Panel

updated composer to be able to use namespaces

added containerIndex to webpack

added Modal Window and Loader

updated ModalWindow

Added Modal Window functionality

updated Modal Window

Updated Modal Window

added functionality to form.js

Altered Database class to allow on duplicate update

update documentation for on duplicate key update

edited Form.js

Made changes to Modal Window

Updated Modal Window

Edited Loader and Media

Rebased

Altered Modal Window and Loader

Removed debugging message

Made changes to filter form and datatable

change loader css

Made changes to Form.js and CSS

Added error props to Form.js

Added JSON Router Dependencies
;

Altered Filter Form to Prevent Infinite Loop

Recompiled JSX

composer.json

@@ -27,6 +27,6 @@
         "psr-4": {
             "LORIS\\": "src/"
         },
-        "classmap": ["project/libraries", "php/libraries", "php/exceptions", "php/interfaces"]
+        "classmap": ["project/libraries", "php/libraries", "php/exceptions", "php/interfaces", "modules/biobank/php"]
     }
 }

htdocs/bootstrap/css/custom-css.css

@@ -65,9 +65,6 @@ Note: other colors are currenly inherited from Bootstrap default color palette
 /*
  *	Making the table header font colour white
  */
-table th{
-    color: white;
-}
 .table>thead>tr>th>a {
     color: #ffffff;
 }
@@ -453,3 +450,22 @@ a.btn.btn-primary {
 .sweet-alert p {
   word-wrap: break-word;
 }
+
+/* Loader customizations */
+.loader {
+    position: relative;
+    top: 50%;
+    transform: translateY(-50%);
+    margin: auto;
+    border: 8px solid #FFFFFF; /* White */
+    border-top: 8px solid #A6D3F5; /* Blue */
+    border-left: 8px solid #A6D3F5; /* Blue */
+    border-radius: 50%;
+    animation: spin 0.8s linear infinite;
+}
+
+@keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+}
+

jsx/FilterForm.js

@@ -38,7 +38,7 @@ class FilterForm extends React.Component {
     this.queryString = QueryString.get();
   }
 
-  componentDidMount() {
+  componentWillReceiveProps() {
     let filter = {};
     let queryString = this.queryString;
 
@@ -178,15 +178,9 @@ class FilterForm extends React.Component {
     }
 
     return (
-      <Panel
-        id={this.props.id}
-        height={this.props.height}
-        title={this.props.title}
-      >
-        <FormElement {...this.props}>
-          {formChildren}
-        </FormElement>
-      </Panel>
+      <FormElement {...this.props}>
+        {formChildren}
+      </FormElement>
     );
   }
 }