You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2016/10/19 18:25:58 UTC
svn commit: r1765693 - in /vcl/trunk/web/.ht-inc: computer.php groups.php
managementnode.php schedule.php
Author: jfthomps
Date: Wed Oct 19 18:25:58 2016
New Revision: 1765693
URL: http://svn.apache.org/viewvc?rev=1765693&view=rev
Log:
very minor tweaks
computer.php: updated a comment in the header of getData
groups.php: modified viewGroups: added checks for Edge browser
managementnode.php: modified fieldWidth: added check for Edge browser
schedule.php: added param for $rscid to header of checkResourceInUse
Modified:
vcl/trunk/web/.ht-inc/computer.php
vcl/trunk/web/.ht-inc/groups.php
vcl/trunk/web/.ht-inc/managementnode.php
vcl/trunk/web/.ht-inc/schedule.php
Modified: vcl/trunk/web/.ht-inc/computer.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/computer.php?rev=1765693&r1=1765692&r2=1765693&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/computer.php (original)
+++ vcl/trunk/web/.ht-inc/computer.php Wed Oct 19 18:25:58 2016
@@ -52,7 +52,7 @@ class Computer extends Resource {
/// \param $sort - (optional) 1 to sort computers; 0 not to
/// \b includedeleted - 0 or 1; include deleted images\n
/// \b rscid - only return data for resource with this id; pass 0 for all
- /// (from image table)
+ /// (from computer table)
///
/// \return array of data as returned from getImages
///
Modified: vcl/trunk/web/.ht-inc/groups.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/groups.php?rev=1765693&r1=1765692&r2=1765693&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/groups.php (original)
+++ vcl/trunk/web/.ht-inc/groups.php Wed Oct 19 18:25:58 2016
@@ -140,7 +140,8 @@ function viewGroups() {
print "<thead>\n";
print "<tr>\n";
if(preg_match('/MSIE/i', $_SERVER['HTTP_USER_AGENT']) ||
- preg_match('/Trident/i', $_SERVER['HTTP_USER_AGENT']))
+ preg_match('/Trident/i', $_SERVER['HTTP_USER_AGENT']) ||
+ preg_match('/Edge/i', $_SERVER['HTTP_USER_AGENT']))
$w = array('54px', '38px', '200px', '142px', '65px', '142px', '59px', '58px', '63px', '73px');
else
$w = array('4.8em', '3.5em', '17em', '12em', '5em', '12em', '5em', '5em', '5.6em', '6.3em');
@@ -258,7 +259,8 @@ function viewGroups() {
print "<thead>\n";
print "<tr>\n";
if(preg_match('/MSIE/i', $_SERVER['HTTP_USER_AGENT']) ||
- preg_match('/Trident/i', $_SERVER['HTTP_USER_AGENT']))
+ preg_match('/Trident/i', $_SERVER['HTTP_USER_AGENT']) ||
+ preg_match('/Edge/i', $_SERVER['HTTP_USER_AGENT']))
$w = array('54px', '38px', '108px', '240px', '250px', '24px');
else
$w = array('4.5em', '3.5em', '9em', '20em', '21em', '1.6em');
Modified: vcl/trunk/web/.ht-inc/managementnode.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/managementnode.php?rev=1765693&r1=1765692&r2=1765693&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/managementnode.php (original)
+++ vcl/trunk/web/.ht-inc/managementnode.php Wed Oct 19 18:25:58 2016
@@ -114,7 +114,8 @@ class ManagementNode extends Resource {
return '';
}
if(preg_match('/MSIE/i', $_SERVER['HTTP_USER_AGENT']) ||
- preg_match('/Trident/i', $_SERVER['HTTP_USER_AGENT']))
+ preg_match('/Trident/i', $_SERVER['HTTP_USER_AGENT']) ||
+ preg_match('/Edge/i', $_SERVER['HTTP_USER_AGENT']))
$w = round($w * 11.5) . 'px';
else
$w = "{$w}em";
Modified: vcl/trunk/web/.ht-inc/schedule.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/schedule.php?rev=1765693&r1=1765692&r2=1765693&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/schedule.php (original)
+++ vcl/trunk/web/.ht-inc/schedule.php Wed Oct 19 18:25:58 2016
@@ -171,6 +171,8 @@ class Schedule extends Resource {
///
/// \fn checkResourceInUse($rscid)
///
+ /// \param $rscid - id of schedule
+ ///
/// \return empty string if not being used; string of where resource is
/// being used if being used
///