This is an automated email from the ASF dual-hosted git repository.
jfthomps pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/vcl.git
The following commit(s) were added to refs/heads/develop by this push:
new 08bf9514 VCL-1144 - minor improvements to Resource grouping and
mapping page
08bf9514 is described below
commit 08bf9514e36f63ac654d91fbce634b7e21c6ace5
Author: Josh Thompson <jftho...@ncsu.edu>
AuthorDate: Tue Feb 20 16:40:39 2024 -0500
VCL-1144 - minor improvements to Resource grouping and mapping page
resource.php:
-modified groupByResourceHTML, groupByGroupHTML, mapByResGroupHTML, and
mapByMapToGroupHTML: changed width of DataGrids to match the width of their
containing tables
-modified mapByResGroupHTML and mapByMapToGroupHTML: added ContentPane for
containing message about no access for users without mapping access, previously
the no access message was poorly displayed and not in its own tab
resources.js: modified Resource.prototype.addRemItemCB: added check for
data.items.status == 'invalid'
---
web/.ht-inc/resource.php | 22 ++++++++++++++--------
web/js/resources.js | 3 +++
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/web/.ht-inc/resource.php b/web/.ht-inc/resource.php
index f6ea570c..4ba93ec8 100644
--- a/web/.ht-inc/resource.php
+++ b/web/.ht-inc/resource.php
@@ -801,7 +801,7 @@ class Resource {
$h .= "selectionMode=\"extended\">\n";
$h .= "<thead>\n";
$h .= "<tr>\n";
- $h .= "<th field=\"name\" width=\"160px\"></th>\n";
+ $h .= "<th field=\"name\" width=\"220px\"></th>\n";
$h .= "</tr>\n";
$h .= "</thead>\n";
$h .= "</table>\n";
@@ -830,7 +830,7 @@ class Resource {
$h .= "selectionMode=\"extended\">\n";
$h .= "<thead>\n";
$h .= "<tr>\n";
- $h .= "<th field=\"name\" width=\"160px\"></th>\n";
+ $h .= "<th field=\"name\" width=\"220px\"></th>\n";
$h .= "</tr>\n";
$h .= "</thead>\n";
$h .= "</table>\n";
@@ -984,7 +984,7 @@ class Resource {
$h .= "selectionMode=\"extended\" sortInfo=\"1\">\n";
$h .= "<thead>\n";
$h .= "<tr>\n";
- $h .= "<th field=\"name\" width=\"160px\"></th>\n";
+ $h .= "<th field=\"name\" width=\"220px\"></th>\n";
$h .= "</tr>\n";
$h .= "</thead>\n";
$h .= "</table>\n";
@@ -1013,7 +1013,7 @@ class Resource {
$h .= "selectionMode=\"extended\" sortInfo=\"1\">\n";
$h .= "<thead>\n";
$h .= "<tr>\n";
- $h .= "<th field=\"name\" width=\"160px\"></th>\n";
+ $h .= "<th field=\"name\" width=\"220px\"></th>\n";
$h .= "</tr>\n";
$h .= "</thead>\n";
$h .= "</table>\n";
@@ -1164,7 +1164,10 @@ class Resource {
$h = '';
if(! count($groups) || ! count($mapgroups)) {
+ $h .= "<div id=\"mapbyresgroupdiv\"
dojoType=\"dijit.layout.ContentPane\" ";
+ $h .= "title=\"" . i("Map By {$this->restypename}
Group") . "\">\n";
$h .= i("You don't have access to manage any mappings
for this resource type.");
+ $h .= "</div>\n";
return $h;
}
@@ -1189,7 +1192,7 @@ class Resource {
$h .= "selectionMode=\"extended\">\n";
$h .= "<thead>\n";
$h .= "<tr>\n";
- $h .= "<th field=\"name\" width=\"160px\"></th>\n";
+ $h .= "<th field=\"name\" width=\"220px\"></th>\n";
$h .= "</tr>\n";
$h .= "</thead>\n";
$h .= "</table>\n";
@@ -1220,7 +1223,7 @@ class Resource {
$h .= "selectionMode=\"extended\">\n";
$h .= "<thead>\n";
$h .= "<tr>\n";
- $h .= "<th field=\"name\" width=\"160px\"></th>\n";
+ $h .= "<th field=\"name\" width=\"220px\"></th>\n";
$h .= "</tr>\n";
$h .= "</thead>\n";
$h .= "</table>\n";
@@ -1357,8 +1360,11 @@ class Resource {
$h = '';
if(! count($mapgroups) || ! count($groups)) {
+ $h .= "<div id=\"mapbymaptogroupdiv\"
dojoType=\"dijit.layout.ContentPane\" ";
+ $h .= "title=\"" . i("Map By {$this->maptypename}
Group") . "\">\n";
$h .= "You don't have access to manage any mappings for
this resource ";
$h .= "type.<br>\n";
+ $h .= "</div>\n";
return $h;
}
@@ -1383,7 +1389,7 @@ class Resource {
$h .= "selectionMode=\"extended\">\n";
$h .= "<thead>\n";
$h .= "<tr>\n";
- $h .= "<th field=\"name\" width=\"160px\"></th>\n";
+ $h .= "<th field=\"name\" width=\"220px\"></th>\n";
$h .= "</tr>\n";
$h .= "</thead>\n";
$h .= "</table>\n";
@@ -1412,7 +1418,7 @@ class Resource {
$h .= "selectionMode=\"extended\">\n";
$h .= "<thead>\n";
$h .= "<tr>\n";
- $h .= "<th field=\"name\" width=\"160px\"></th>\n";
+ $h .= "<th field=\"name\" width=\"220px\"></th>\n";
$h .= "</tr>\n";
$h .= "</thead>\n";
$h .= "</table>\n";
diff --git a/web/js/resources.js b/web/js/resources.js
index aa0dd5f7..6a15e614 100644
--- a/web/js/resources.js
+++ b/web/js/resources.js
@@ -116,6 +116,9 @@ Resource.prototype.addRemItemCB = function(data, ioArgs) {
else if(data.items.status == 'noaccess') {
alert(_('You do not have access to the submitted resource or
group'));
}
+ else if(data.items.status == 'invalid') {
+ alert(_('Invalid value submitted'));
+ }
document.body.style.cursor = 'default';
}
