com web/master: Make it possible to use the 'secondscreen': include/functions.inc
| From: | Hannes Magnusson | Date: | Fri, 27 Dec 2013 08:38:57 +0000 |
| Subject: | com web/master: Make it possible to use the 'secondscreen': include/functions.inc | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-17847@lists.php.net to get a copy of this message | ||
Commit: 6502584601f21ea9ac126ccdd5803fc224130aba
Author: Hannes Magnusson <bjori@mongodb.com> Fri, 27 Dec 2013 00:38:57 -0800
Parents: fb9584d3c91f61b800692b98611483fb053bd864
Branches: master
Link: http://git.php.net/?p=web/master.git;a=commitdiff;h=6502584601f21ea9ac126ccdd5803fc224130aba
Log:
Make it possible to use the 'secondscreen'
Changed paths:
M include/functions.inc
Diff:
diff --git a/include/functions.inc b/include/functions.inc
index df3f535..d956d6c 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -16,7 +16,10 @@ function require_token()
// -----------------------------------------------------------------------------------
-function head($title="") {
+function head($title="", $config = array()) {
+ $dconfig = array("columns" => 1);
+
+ $config = array_merge($dconfig, $config);
$SUBDOMAIN = "master";
$TITLE = $title ?: "master";
$LINKS = array(
@@ -41,10 +44,16 @@ function head($title="") {
$LINKS[] = array("href" => "/login.php?action=logout",
"text" => "Logout");
}
include __DIR__ . "/../shared/templates/header.inc";
- echo '<section class="fullscreen">';
+ if ($config["columns"] > 1) {
+ echo '<section class="mainscreen">';
+ } else {
+ echo '<section class="fullscreen">';
+ }
}
-function foot() {
+function foot($secondscreen) {
+ $SECONDSCREEN = $secondscreen;
+
$JS = array(
"//ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min..js",
);