Changeset:
07472a6fbf7b
https://sourceforge.net/p/mrbs/hg-code/ci/07472a6fbf7b2df9f8c8490e5a6a3a1f32dcee2c
Author:
Campbell Morrison <[email protected]>
Date:
Sun Oct 02 14:49:55 2016 +0100
Log message:
Restructured
diffstat:
web/Themes/default/header.inc | 34 ++++++++++++++++++----------------
web/js.inc | 2 ++
2 files changed, 20 insertions(+), 16 deletions(-)
diffs (74 lines):
diff -r aaf69cc62730 -r 07472a6fbf7b web/Themes/default/header.inc
--- a/web/Themes/default/header.inc Sun Oct 02 14:38:30 2016 +0100
+++ b/web/Themes/default/header.inc Sun Oct 02 14:49:55 2016 +0100
@@ -3,6 +3,20 @@
// $Id$
+
+function print_head()
+{
+ echo "<head>\n";
+ echo "<meta charset=\"" . get_charset() . "\">\n";
+ echo "<title>" . get_vocab("mrbs") . "</title>\n";
+
+ require_once "style.inc";
+ require_once "js.inc";
+
+ echo "</head>\n";
+}
+
+
function print_header_site_info()
{
global $mrbs_company,
@@ -210,25 +224,13 @@
$year = date("Y");
}
-
http_headers();
echo DOCTYPE;
-?>
-<html>
- <head>
+ echo "<html>\n";
- <meta charset="<?php echo get_charset(); ?>">
- <title><?php echo get_vocab("mrbs") ?></title>
-
- <?php
- require_once "style.inc";
- require_once "js.inc";
- ?>
-
- </head>
-
- <?php
+ print_head();
+
// Put the filename in as a class to aid styling.
// (Use a class rather than id to avoid specificity problems)
echo "<body class=\"non_js ".htmlspecialchars($page)."\">\n";
@@ -245,7 +247,7 @@
<div class="screenonly">
-<?php
+ <?php
if (!empty($locale_warning))
{
echo "[Warning: ".$locale_warning."]";
diff -r aaf69cc62730 -r 07472a6fbf7b web/js.inc
--- a/web/js.inc Sun Oct 02 14:38:30 2016 +0100
+++ b/web/js.inc Sun Oct 02 14:49:55 2016 +0100
@@ -1,6 +1,8 @@
<?php
namespace MRBS;
+global $day, $month, $year, $room, $area, $page;
+
// $Id$
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
