Revision: 1086
http://mrbs.svn.sourceforge.net/mrbs/?rev=1086&view=rev
Author: cimorrison
Date: 2009-04-03 17:14:20 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Changed the use of "times" as a class and variable name for the first column,
as with transposed tables it is now not accurate. Now using "row_labels"
instead. No change to MRBS functionality.
Modified Paths:
--------------
mrbs/trunk/web/Themes/classic126.inc
mrbs/trunk/web/Themes/default.inc
mrbs/trunk/web/functions.inc
mrbs/trunk/web/mrbs.css.php
Modified: mrbs/trunk/web/Themes/classic126.inc
===================================================================
--- mrbs/trunk/web/Themes/classic126.inc 2009-04-03 16:52:17 UTC (rev
1085)
+++ mrbs/trunk/web/Themes/classic126.inc 2009-04-03 17:14:20 UTC (rev
1086)
@@ -29,7 +29,7 @@
$main_table_body_v_border_color = $main_table_body_h_border_color; // border
colour for day/week/month tables - body, vertical
$main_table_month_color = "#ffffff"; // background colour for days
in the month view
$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
+$main_table_labels_back_color = "#fff0f0"; // background colour for the
row labels column
// border colours for the main table when it is printed. These are used by
mrbs-print.css.php
$main_table_border_color_print = "#777777"; // border colour for the
main table (print view)
Modified: mrbs/trunk/web/Themes/default.inc
===================================================================
--- mrbs/trunk/web/Themes/default.inc 2009-04-03 16:52:17 UTC (rev 1085)
+++ mrbs/trunk/web/Themes/default.inc 2009-04-03 17:14:20 UTC (rev 1086)
@@ -29,7 +29,7 @@
$main_table_body_v_border_color = $body_background_color; // border colour for
day/week/month tables - body, vertical
$main_table_month_color = "#ffffff"; // background colour for days
in the month view
$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
+$main_table_labels_back_color = $header_back_color; // background colour
for the row labels column
// border colours for the main table when it is printed. These are used by
mrbs-print.css.php
$main_table_border_color_print = "#879AA8"; // border colour for the
main table (print view)
Modified: mrbs/trunk/web/functions.inc
===================================================================
--- mrbs/trunk/web/functions.inc 2009-04-03 16:52:17 UTC (rev 1085)
+++ mrbs/trunk/web/functions.inc 2009-04-03 17:14:20 UTC (rev 1086)
@@ -1340,7 +1340,7 @@
{
global $enable_periods, $periods;
- tdcell("times", 1);
+ tdcell("row_labels", 1);
echo "<div class=\"celldiv1\">\n";
if ( $enable_periods )
{
@@ -1363,7 +1363,7 @@
// $link the href to be used for the link
function draw_room_cell($row, $link)
{
- tdcell("times", 1);
+ tdcell("row_labels", 1);
echo "<div class=\"celldiv1\">\n";
echo "<a href=\"$link\" title=\"" . get_vocab("viewweek") . " " .
$row['description'] . "\">";
echo htmlspecialchars($row['room_name']) . ($row['capacity'] > 0 ?
"(".$row['capacity'].")" : "");
@@ -1376,7 +1376,7 @@
// $link the href to be used for the link
function draw_day_cell($text, $link)
{
- tdcell("times", 1);
+ tdcell("row_labels", 1);
echo "<div class=\"celldiv1\">\n";
echo "<a href=\"$link\" title=\"" . get_vocab("viewday") . "\">$text</a>\n";
echo "</div></td>\n";
Modified: mrbs/trunk/web/mrbs.css.php
===================================================================
--- mrbs/trunk/web/mrbs.css.php 2009-04-03 16:52:17 UTC (rev 1085)
+++ mrbs/trunk/web/mrbs.css.php 2009-04-03 17:14:20 UTC (rev 1086)
@@ -111,16 +111,17 @@
/* ------------ DAY/WEEK/MONTH.PHP ------------------*/
<?php
-$column_hidden_width = 0; // (%) width of the column for hidden days (set to
0 for no column at all; 1 for a narrow column)
-$column_times_width = 1; // (%) width of the times/periods columns (will
expand if necessary)
+$column_hidden_width = 0; // (%) width of the column for hidden days
(set to 0 for no column at all; 1 for a narrow column);
+ // when $times_along_top is TRUE, hidden
days (rows) are not shown at all
+$column_row_labels_width = 1; // (%) width of the row label columns (will
expand if necessary)
// week view: work out what percentage of the width is available to
// normal columns (ie columns that are not hidden)
$n_hidden_days = count($hidden_days);
-$column_week = 100 - $column_times_width; // subtract the width
of the left hand column
+$column_week = 100 - $column_row_labels_width; // subtract the
width of the left hand column
if ($row_labels_both_sides)
{
- $column_week -= $column_times_width; // and the right hand
column if present
+ $column_week -= $column_row_labels_width; // and the right
hand column if present
}
$column_week -= ($column_hidden_width * $n_hidden_days); // subtract the width
of the hidden columns
if ($n_hidden_days < 7) // (avoid the div by
zero)
@@ -174,9 +175,9 @@
.dwm_main th a:link {color: <?php echo $anchor_link_color_header ?>;
text-decoration: none; font-weight: normal}
.dwm_main th a:visited {color: <?php echo $anchor_visited_color_header ?>;
text-decoration: none; font-weight: normal}
.dwm_main th a:hover {color: <?php echo $anchor_hover_color_header ?>;
text-decoration:underline; font-weight: normal}
-.dwm_main#day_main th.first_last {width: <?php echo $column_times_width ?>%}
+.dwm_main#day_main th.first_last {width: <?php echo $column_row_labels_width
?>%}
.dwm_main#week_main th {width: <?php echo $column_week ?>%}
-.dwm_main#week_main th.first_last {width: <?php echo $column_times_width ?>%;
vertical-align: bottom}
+.dwm_main#week_main th.first_last {width: <?php echo $column_row_labels_width
?>%; vertical-align: bottom}
.dwm_main#month_main th {width: <?php echo $column_month ?>%}
.dwm_main#month_main td {border-top: <?php echo $main_table_cell_border_width
?>px solid <?php echo $main_table_body_v_border_color ?>}
.dwm_main#month_main td.valid {background-color: <?php echo
$main_table_month_color ?>}
@@ -251,10 +252,10 @@
td.row_highlight {background-color: <?php echo $row_highlight_color ?>} /*
used for highlighting a row */
td.even_row {background-color: <?php echo $row_even_color ?>} /*
even rows in the day view */
td.odd_row {background-color: <?php echo $row_odd_color ?>} /*
odd rows in the day view */
-td.times {background-color: <?php echo $main_table_times_back_color
?>; white-space: nowrap} /* used for the column with times/periods */
-.times a:link {color: <?php echo $anchor_link_color_header ?>;
text-decoration: none; font-weight: normal}
-.times a:visited {color: <?php echo $anchor_visited_color_header ?>;
text-decoration: none; font-weight: normal}
-.times a:hover {color: <?php echo $anchor_hover_color_header ?>;
text-decoration:underline; font-weight: normal}
+td.row_labels {background-color: <?php echo $main_table_labels_back_color
?>; white-space: nowrap} /* used for the row labels column */
+.row_labels a:link {color: <?php echo $anchor_link_color_header ?>;
text-decoration: none; font-weight: normal}
+.row_labels a:visited {color: <?php echo $anchor_visited_color_header ?>;
text-decoration: none; font-weight: normal}
+.row_labels a:hover {color: <?php echo $anchor_hover_color_header ?>;
text-decoration:underline; font-weight: normal}
<?php
// HIGHLIGHTING: Set styles for the highlighted cells under the cursor (the
time/period cell and the current cell)
@@ -286,7 +287,7 @@
// corresponds to the start of a booking when you hover over a booked cell.
The fourth rule provides highlighting in the month view.
?>
.dwm_main tr:hover td:hover.odd_row, .dwm_main tr:hover td:hover.even_row
{background-color: <?php echo $row_highlight_color ?>}
-.dwm_main tr:hover td.times {background-color: <?php echo $row_highlight_color
?>; color: <?php echo $standard_font_color ?>}
+.dwm_main tr:hover td.row_labels {background-color: <?php echo
$row_highlight_color ?>; color: <?php echo $standard_font_color ?>}
.dwm_main#month_main td:hover.valid {background-color: <?php echo
$row_highlight_color ?>}
@@ -370,7 +371,7 @@
// one booking in a time slot.
?>
-.times div.celldiv1 {overflow: visible} /* we want to see the content in
the row label columns */
+.row_labels div.celldiv1 {overflow: visible} /* we want to see the content in
the row label columns */
div.mini, div.maxi {position: relative} /* establish a relative position
for the absolute position to follow */
div.multiple_control {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
