Author: jfthomps Date: Tue Oct 14 19:58:48 2014 New Revision: 1631861 URL: http://svn.apache.org/r1631861 Log: VCL-593 - Documentation Links on VCL Home Page
conf-default.php: -changed DOCUMENTATIONURL to https://cwiki.apache.org/confluence/display/VCL/Using+VCL from https://cwiki.apache.org/VCLDOCS/ since the latter is way out of date -added NOAUTH_HOMENAV define and array utils.php: added getUsingVCL themes/default/page.php: now set charset of Content-Type to utf-8 for all locales instead of just non-English ones; added printing of NOAUTH_HOMENAV links if not authed and NOAUTH_HOMENAV is set to 1 Modified: vcl/trunk/web/.ht-inc/conf-default.php vcl/trunk/web/.ht-inc/utils.php vcl/trunk/web/themes/default/page.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=1631861&r1=1631860&r2=1631861&view=diff ============================================================================== --- vcl/trunk/web/.ht-inc/conf-default.php (original) +++ vcl/trunk/web/.ht-inc/conf-default.php Tue Oct 14 19:58:48 2014 @@ -80,7 +80,7 @@ define("MIN_BLOCK_MACHINES", 1); /// defines the max number of block request machines define("MAX_BLOCK_MACHINES", 70); /// defines the URL used for the Documentation link in the navigation list -define("DOCUMENTATIONURL", "https://cwiki.apache.org/VCLDOCS/";); +define("DOCUMENTATIONURL", "https://cwiki.apache.org/confluence/display/VCL/Using+VCL";); define("USEFILTERINGSELECT", 1); // set to 1 to use a dojo filteringselects for some of the select boxes // 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 @@ -109,6 +109,19 @@ $ENABLE_ITECSAUTH = 0; // use ITECS $xmlrpcBlockAPIUsers = array(3, # 3 = vclsystem ); +# boolean value of 0 or 1 to enable documentation links on login page and page +# where authentication method is selected +# 0 = disables; 1 = enabled +define("NOAUTH_HOMENAV", 0); + +# documentation links to display on login page and page +# where authentication method is selected when NOAUTH_HOMENAV is set to 1 +$NOAUTH_HOMENAV = array ( + "What is VCL" => "http://vcl.apache.org/";, + "How to use VCL" => "https://cwiki.apache.org/confluence/display/VCL/Using+VCL";, + "Report a Problem" => "mailto:"; . HELPEMAIL, +); + @require_once(".ht-inc/secrets.php"); $authMechs = array( Modified: vcl/trunk/web/.ht-inc/utils.php URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/utils.php?rev=1631861&r1=1631860&r2=1631861&view=diff ============================================================================== --- vcl/trunk/web/.ht-inc/utils.php (original) +++ vcl/trunk/web/.ht-inc/utils.php Tue Oct 14 19:58:48 2014 @@ -12577,6 +12577,23 @@ function getExtraCSS() { //////////////////////////////////////////////////////////////////////////////// /// +/// \fn getUsingVCL() +/// +/// \return string of HTML +/// +/// \brief generates HTML of list item links from $NOAUTH_HOMENAV in conf.php +/// +//////////////////////////////////////////////////////////////////////////////// +function getUsingVCL() { + global $NOAUTH_HOMENAV; + $rt = ''; + foreach($NOAUTH_HOMENAV as $name => $url) + $rt .= "<li><a href=\"$url\">" . _($name) . "</a></li>\n"; + return $rt; +} + +//////////////////////////////////////////////////////////////////////////////// +/// /// \fn getDojoHTML($refresh) /// /// \param $refresh - 1 to set page to refresh, 0 not to Modified: vcl/trunk/web/themes/default/page.php URL: http://svn.apache.org/viewvc/vcl/trunk/web/themes/default/page.php?rev=1631861&r1=1631860&r2=1631861&view=diff ============================================================================== --- vcl/trunk/web/themes/default/page.php (original) +++ vcl/trunk/web/themes/default/page.php Tue Oct 14 19:58:48 2014 @@ -37,10 +37,10 @@ function getHeader($refresh) { $usenls = 0; $usenlsstr = "false"; if(! preg_match('/^en/', $locale)) { - $rt .= "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n"; $usenls = 1; $usenlsstr = "true"; } + $rt .= "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n"; $rt .= "<title>VCL :: Virtual Computing Lab</title>\n"; $rt .= "<link rel=stylesheet type=\"text/css\" href=\"css/vcl.css\">\n"; $rt .= "<link rel=stylesheet type=\"text/css\" href=\"themes/default/css/vcl.css\">\n"; @@ -86,7 +86,7 @@ function getHeader($refresh) { $rt .= " <table class=\"themelayouttable\" summary=\"\">\n"; $rt .= " <TR valign=top>\n"; - if($authed) + if($authed || NOAUTH_HOMENAV) $rt .= " <TD class=\"thememenu\">\n"; else $rt .= " <TD class=\"thememenunoauth\">\n"; @@ -98,6 +98,11 @@ function getHeader($refresh) { $rt .= "</ul>\n"; $rt .= "<img src=\"themes/default/images/menu_dividerblock.jpg\" border=0 width=\"158px\" height=\"83px\" alt=\"\"><br/>\n"; } + elseif(NOAUTH_HOMENAV) { + $rt .= "<ul>\n"; + $rt .= getUsingVCL(); + $rt .= "</ul>\n"; + } $rt .= "</div>\n"; $rt .= " </TD>\n"; $rt .= " <TD class=\"themecontent\">\n";
