Revision: 1022
http://mrbs.svn.sourceforge.net/mrbs/?rev=1022&view=rev
Author: cimorrison
Date: 2009-02-15 12:54:30 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
- Changed the print media CSS so that it can use different table and cell
border colours from the screen view. Without this, cell boundaries are
invisible when printed.
- As part of this change moved the selection of theme from the CSS file to the
config file, which makes sense as all major configuration choices are made in
the config file
Modified Paths:
--------------
mrbs/trunk/web/Themes/classic126.inc
mrbs/trunk/web/Themes/default.inc
mrbs/trunk/web/config.inc.php
mrbs/trunk/web/mrbs.css.php
mrbs/trunk/web/style.inc
Added Paths:
-----------
mrbs/trunk/web/mrbs-print.css.php
Removed Paths:
-------------
mrbs/trunk/web/mrbs-print.css
Modified: mrbs/trunk/web/Themes/classic126.inc
===================================================================
--- mrbs/trunk/web/Themes/classic126.inc 2009-02-14 23:32:30 UTC (rev
1021)
+++ mrbs/trunk/web/Themes/classic126.inc 2009-02-15 12:54:30 UTC (rev
1022)
@@ -31,6 +31,12 @@
$main_table_month_invalid_color = "#d1d9de"; // background colour for
invalid days in the month view
$main_table_times_back_color = "#fff0f0"; // background colour for the
times/periods column
+// border colours for the main table when it is printed. These are used by
mrbs-print.css.php
+$main_table_border_color_print = "#888888"; // border colour for the
main table (print view)
+$main_table_header_border_color_print = "#888888"; // border colour for
day/week/month tables - header (print view)
+$main_table_body_h_border_color_print = "#888888"; // border colour for
day/week/month tables - body, horizontal (print view)
+$main_table_body_v_border_color_print = "#888888"; // border colour for
day/week/month tables - body, vertical (print view)
+
$report_table_border_color = $standard_font_color;
$report_h2_border_color = $banner_back_color; // border colour for
<h2> in report.php
$report_h3_border_color = "#879AA8"; // border colour for
<h2> in report.php
Modified: mrbs/trunk/web/Themes/default.inc
===================================================================
--- mrbs/trunk/web/Themes/default.inc 2009-02-14 23:32:30 UTC (rev 1021)
+++ mrbs/trunk/web/Themes/default.inc 2009-02-15 12:54:30 UTC (rev 1022)
@@ -31,6 +31,12 @@
$main_table_month_invalid_color = "#d1d9de"; // background colour for
invalid days in the month view
$main_table_times_back_color = $header_back_color; // background colour
for the times/periods column
+// border colours for the main table when it is printed. These are used by
mrbs-print.css.php
+$main_table_border_color_print = "#888888"; // border colour for the
main table (print view)
+$main_table_header_border_color_print = "#888888"; // border colour for
day/week/month tables - header (print view)
+$main_table_body_h_border_color_print = "#888888"; // border colour for
day/week/month tables - body, horizontal (print view)
+$main_table_body_v_border_color_print = "#888888"; // border colour for
day/week/month tables - body, vertical (print view)
+
$report_table_border_color = $standard_font_color;
$report_h2_border_color = $banner_back_color; // border colour for
<h2> in report.php
$report_h3_border_color = "#879AA8"; // border colour for
<h2> in report.php
Modified: mrbs/trunk/web/config.inc.php
===================================================================
--- mrbs/trunk/web/config.inc.php 2009-02-14 23:32:30 UTC (rev 1021)
+++ mrbs/trunk/web/config.inc.php 2009-02-15 12:54:30 UTC (rev 1022)
@@ -40,6 +40,7 @@
// Uncomment this to NOT use PHP persistent (pooled) database connections:
// $db_nopersist = 1;
+
/*********************************
* Site identification information
*********************************/
@@ -71,6 +72,25 @@
/*******************
+ * Themes
+ *******************/
+
+// Choose a theme for the MRBS styling.
+
+// The most commonly changed colours, dimensions and fonts have been extracted
from the main CSS file and
+// put into include files in the Themes directory. If you want to change the
colour scheme, you should
+// be able to do it by changing the values in the theme file. More advanced
styling changes can be made
+// by changing the rules in the CSS file.
+
+// Available options are:
+
+// "default" Default MRBS theme
+// "classic126" Same colour scheme as MRBS 1.2.6
+
+$theme = "default";
+
+
+/*******************
* Calendar settings
*******************/
Deleted: mrbs/trunk/web/mrbs-print.css
===================================================================
--- mrbs/trunk/web/mrbs-print.css 2009-02-14 23:32:30 UTC (rev 1021)
+++ mrbs/trunk/web/mrbs-print.css 2009-02-15 12:54:30 UTC (rev 1022)
@@ -1,5 +0,0 @@
-/* $Id$ */
-
-div.screenonly { display: none; }
-
-a.new_booking img { display: none; }
Added: mrbs/trunk/web/mrbs-print.css.php
===================================================================
--- mrbs/trunk/web/mrbs-print.css.php (rev 0)
+++ mrbs/trunk/web/mrbs-print.css.php 2009-02-15 12:54:30 UTC (rev 1022)
@@ -0,0 +1,32 @@
+<?php
+
+// $Id$
+
+header("Content-type: text/css");
+include "config.inc.php";
+include "Themes/$theme.inc";
+
+?>
+
+div.screenonly { display: none; }
+
+a.new_booking img { display: none; }
+
+<?php
+// redefine table and cell border colours so that they are visible in the
print view
+// (in the screen view the boundaries are visible due to the different
background colours)
+?>
+table.dwm_main {
+ border-width: 1px;
+ border-color: <?php echo $main_table_border_color_print ?>;}
+
+.dwm_main th {
+ border-left-color: <?php echo $main_table_header_border_color_print ?>}
+
+.dwm_main td {
+ border-top-color: <?php echo $main_table_body_h_border_color_print ?>;
+ border-left-color: <?php echo $main_table_body_v_border_color_print ?>}
+
+.dwm_main#month_main td {
+ border-top-color: <?php echo $main_table_body_h_border_color_print ?>}
+
Property changes on: mrbs/trunk/web/mrbs-print.css.php
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: mrbs/trunk/web/mrbs.css.php
===================================================================
--- mrbs/trunk/web/mrbs.css.php 2009-02-14 23:32:30 UTC (rev 1021)
+++ mrbs/trunk/web/mrbs.css.php 2009-02-15 12:54:30 UTC (rev 1022)
@@ -4,21 +4,9 @@
header("Content-type: text/css");
include "config.inc.php";
+include "Themes/$theme.inc";
-// ***** THEMES ************************
-// The most commonly changed colours, dimensions and fonts have been extracted
from the main CSS file and
-// put into include files in the Themes directory. If you want to change the
colour scheme, you should
-// be able to do it by changing the values in the theme file. More advanced
styling changes can be made
-// by changing the rules in this file.
-
-// You need to have one of the these theme statements un-commented.
-
-include "Themes/default.inc"; // Default MRBS theme
-// include "Themes/classic126.inc"; // Same colour scheme as MRBS 1.2.6
-
-
-
// ***** SETTINGS ***********************
$month_cell_scrolling = TRUE; // set to TRUE if you want the cells in the
month view to scroll if there are too
Modified: mrbs/trunk/web/style.inc
===================================================================
--- mrbs/trunk/web/style.inc 2009-02-14 23:32:30 UTC (rev 1021)
+++ mrbs/trunk/web/style.inc 2009-02-15 12:54:30 UTC (rev 1022)
@@ -12,7 +12,7 @@
// stylesheet for browsers IE6 or below must contain the string 'ielte6'.
?>
<link rel="stylesheet" href="mrbs.css.php" type="text/css">
- <link rel="stylesheet" media="print" href="mrbs-print.css" type="text/css">
+ <link rel="stylesheet" media="print" href="mrbs-print.css.php"
type="text/css">
<!--[if IE]>
<link rel="stylesheet" href="mrbs-ie.css" type="text/css">
<![endif]-->
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
