Author: acoburn
Date: Tue Aug 7 17:46:00 2012
New Revision: 1370391
URL: http://svn.apache.org/viewvc?rev=1370391&view=rev
Log:
VCL-607
The 'default' skin was hard-coded in initGlobals() when there was a global
constant DEFAULTTHEME already defined. These two lines in initGlobals()
determined the
theme for the login screen, and this change makes that determination
configurable in conf.php
Modified:
vcl/trunk/web/.ht-inc/conf-default.php
vcl/trunk/web/.ht-inc/utils.php
Modified: vcl/trunk/web/.ht-inc/conf-default.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/conf-default.php?rev=1370391&r1=1370390&r2=1370391&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/conf-default.php (original)
+++ vcl/trunk/web/.ht-inc/conf-default.php Tue Aug 7 17:46:00 2012
@@ -85,7 +85,7 @@ define("USEFILTERINGSELECT", 1); // set
// the filteringselect can be a little slow
for a large number of items
define("FILTERINGSELECTTHRESHOLD", 1000); // if USEFILTERINGSELECT = 1, only
use them for selects up to this size
-define("DEFAULTTHEME", 'default'); // this is the theme that will be used when
the site is placed in maintenance if $_COOKIE['VCLSKIN'] is not set
+define("DEFAULTTHEME", 'default'); // this is the theme that will be used for
the selectAuth page or when the site is placed in maintenance if
$_COOKIE['VCLSKIN'] is not set
define("HELPFAQURL", "http://vcl.example.org/help-faq/";);
define("ALLOWADDSHIBUSERS", 0); // this is only related to using Shibboleth
authentication for an affiliation that does not
Modified: vcl/trunk/web/.ht-inc/utils.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/utils.php?rev=1370391&r1=1370390&r2=1370391&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/utils.php (original)
+++ vcl/trunk/web/.ht-inc/utils.php Tue Aug 7 17:46:00 2012
@@ -164,12 +164,12 @@ function initGlobals() {
$skin = 'example2';
break;
default:
- $skin = 'default';
+ $skin = DEFAULTTHEME;
break;
}
}
else
- $skin = 'default';
+ $skin = DEFAULTTHEME;
if($mode != 'selectauth' && $mode != 'submitLogin')
require_once("themes/$skin/page.php");
