Author: jfthomps
Date: Fri Apr 27 16:50:30 2012
New Revision: 1331497
URL: http://svn.apache.org/viewvc?rev=1331497&view=rev
Log:
VCL-576
Finalizing for 2.3 release
images.php: modified AJsubmitSetImageProduction - added resRefresh() call to
returned javascript so page contents get refreshed to make reservation that was
ended disappear
itecsauth.php: modified updateITECSUser - commented out adding user to demo
group
requests.php: minor typo in comment
privileges.js: modified focusFirstNode - fixed to work with dojo 1.6; added
code to expand all parents of focused node if they are not already expanded
(can happen if tree saved cookie is erased)
privileges.css: changed .dijitTreeNodeSelected to .dijitTreeRowSelected
vcl.css: changed .privtreeselected color from black to white to make it show up
better
Modified:
incubator/vcl/trunk/web/.ht-inc/authmethods/itecsauth.php
incubator/vcl/trunk/web/.ht-inc/images.php
incubator/vcl/trunk/web/.ht-inc/requests.php
incubator/vcl/trunk/web/css/privileges.css
incubator/vcl/trunk/web/css/vcl.css
incubator/vcl/trunk/web/js/privileges.js
Modified: incubator/vcl/trunk/web/.ht-inc/authmethods/itecsauth.php
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/authmethods/itecsauth.php?rev=1331497&r1=1331496&r2=1331497&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/authmethods/itecsauth.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/authmethods/itecsauth.php Fri Apr 27
16:50:30 2012
@@ -241,8 +241,8 @@ function updateITECSUser($userid) {
$user = mysql_fetch_assoc($qh);
# add account to demo group
- $demoid = getUserGroupID('demo', getAffiliationID('ITECS'));
- updateGroups(array($demoid), $user['id']);
+ #$demoid = getUserGroupID('demo', getAffiliationID('ITECS'));
+ #updateGroups(array($demoid), $user['id']);
}
$user["groups"] = getUsersGroups($user["id"], 1);
Modified: incubator/vcl/trunk/web/.ht-inc/images.php
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/images.php?rev=1331497&r1=1331496&r2=1331497&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/images.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/images.php Fri Apr 27 16:50:30 2012
@@ -2547,7 +2547,8 @@ function AJsubmitSetImageProduction() {
. "</button>"
. "</div>';"
. "dlg.set(\"content\", content);"
- . "dlg.show();";
+ . "dlg.show();"
+ . "resRefresh();";
print $a;
}
Modified: incubator/vcl/trunk/web/.ht-inc/requests.php
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/requests.php?rev=1331497&r1=1331496&r2=1331497&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/requests.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/requests.php Fri Apr 27 16:50:30 2012
@@ -356,7 +356,7 @@ function AJshowRequestSuggestedTimes() {
$requestid = getContinuationVar('requestid', '');
$extendonly = getContinuationVar('extendonly', 0);
if($now && $start < time()) {
- # $start sould have been decreased by 15 minutes
+ # $start should have been decreased by 15 minutes
$start = $start + 900;
}
if($server)
Modified: incubator/vcl/trunk/web/css/privileges.css
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/css/privileges.css?rev=1331497&r1=1331496&r2=1331497&view=diff
==============================================================================
--- incubator/vcl/trunk/web/css/privileges.css (original)
+++ incubator/vcl/trunk/web/css/privileges.css Fri Apr 27 16:50:30 2012
@@ -27,7 +27,7 @@
.privtreediv .dijitFolderClosed {
background-image: none;
}
-.privtreediv .dijitTreeNodeSelected .dijitTreeLabel {
+.privtreediv .dijitTreeRowSelected .dijitTreeLabel {
background-color: #678DB2;
color: white;
}
Modified: incubator/vcl/trunk/web/css/vcl.css
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/css/vcl.css?rev=1331497&r1=1331496&r2=1331497&view=diff
==============================================================================
--- incubator/vcl/trunk/web/css/vcl.css (original)
+++ incubator/vcl/trunk/web/css/vcl.css Fri Apr 27 16:50:30 2012
@@ -250,7 +250,7 @@
.privtreeselected {
background-color: #678db2;
- color: black;
+ color: white;
}
#maintenancenotice {
Modified: incubator/vcl/trunk/web/js/privileges.js
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/js/privileges.js?rev=1331497&r1=1331496&r2=1331497&view=diff
==============================================================================
--- incubator/vcl/trunk/web/js/privileges.js (original)
+++ incubator/vcl/trunk/web/js/privileges.js Fri Apr 27 16:50:30 2012
@@ -126,21 +126,34 @@ function focusFirstNode(id) {
if(tree._itemNodesMap && tree._itemNodesMap[id]) {
var children = tree.rootNode.getChildren();
var fc = children[0];
- if(fc === tree._itemNodesMap[id][0]) {
- }
- else {
+ if(fc !== tree._itemNodesMap[id][0]) {
fc.setSelected(false);
- //tree._itemNodesMap[id][0].setSelected(true);
- //tree._selectNode(tree._itemNodesMap[id][0]);
- //dojo.addClass(tree._itemNodesMap[id][0].labelNode,
'privtreeselected');
}
- tree._selectNode(tree._itemNodesMap[id][0]);
+ tree._onNodeFocus(tree._itemNodesMap[id][0]);
tree.lastLabel = tree._itemNodesMap[id][0].labelNode;
dojo.addClass(tree._itemNodesMap[id][0].labelNode,
'privtreeselected');
tree.lastFocused = tree._itemNodesMap[id][0];
var nodename = tree.lastLabel.innerHTML;
updateNodeLabels(nodename);
}
+ else if(tree._itemNodesMap &&
+ tree.model.root.children &&
+ tree._itemNodesMap[tree.model.root.children[0].name[0]]) {
+ var pnodeids = new Array();
+ var node = tree.store._itemsByIdentity[id];
+ while(node._RRM) {
+ for(var pid in node._RRM) {
+ pnodeids.push(pid);
+ node = tree.store._itemsByIdentity[pid];
+ }
+ }
+ var pid;
+ while(pid = pnodeids.pop()) {
+ var pnode = tree._itemNodesMap[pid][0];
+ tree._expandNode(pnode);
+ }
+ setTimeout(function() {focusFirstNode(id);}, 10);
+ }
else {
setTimeout(function() {focusFirstNode(id);}, 500);
}
