Revision: 1088
http://mrbs.svn.sourceforge.net/mrbs/?rev=1088&view=rev
Author: cimorrison
Date: 2009-04-03 18:23:19 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Simplified the CSS for merged cells a little. No change to MRBS functionality
or look and feel.
Modified Paths:
--------------
mrbs/trunk/web/functions.inc
mrbs/trunk/web/mrbs.css.php
Modified: mrbs/trunk/web/functions.inc
===================================================================
--- mrbs/trunk/web/functions.inc 2009-04-03 17:55:17 UTC (rev 1087)
+++ mrbs/trunk/web/functions.inc 2009-04-03 18:23:19 UTC (rev 1088)
@@ -725,7 +725,7 @@
echo "</tr><tr>";
}
tdcell($ct, 1);
- echo "<div class=\"celldiv1\" " . // put the description inside a div
which will give clipping in case of long names
+ echo "<div class=\"celldiv slots1\" " . // put the description inside a
div which will give clipping in case of long names
"title=\"$typel[$ct]\">\n"; // but put the name in the title so
you can still read it all if you hover over it
echo "$typel[$ct]</div></td>\n";
}
@@ -1168,7 +1168,7 @@
<?php
// First draw the mini table
- echo "<div class=\"celldiv1 mini\">\n";
+ echo "<div class=\"celldiv slots1 mini\">\n";
echo "<div class=\"multiple_control\"
onClick=\"document.getElementById('$td_id').className = 'multiple_booking
maximized $cell_class'\">+</div>\n";
echo "<table>\n";
echo "<tbody>\n";
@@ -1222,7 +1222,7 @@
echo "<td class=\"$color\"" .
(($n==0) ? " style=\"border-top-width: 0\"" : "") . // no border
for first row
">\n";
- echo "<div class=\"celldiv1\">\n"; // we want clipping of overflow
+ echo "<div class=\"celldiv slots1\">\n"; // we want clipping of
overflow
echo " <a href=\"view_entry.php?id=$id&". $query_strings['booking']
. "\" title=\"$long_descr\">$descr</a>\n";
echo "</div>\n";
@@ -1278,7 +1278,7 @@
// If the room isn't booked then allow it to be booked
if (!isset($id))
{
- echo "<div class=\"celldiv1\">\n"; // a bookable slot is only one
unit high
+ echo "<div class=\"celldiv slots1\">\n"; // a bookable slot is only
one unit high
if ($javascript_cursor)
{
@@ -1316,11 +1316,11 @@
{
if ($times_along_top)
{
- echo "<div class=\"celldiv1\">\n";
+ echo "<div class=\"celldiv slots1\">\n";
}
else
{
- echo "<div class=\"celldiv" . $slots . "\">\n"; // we want
clipping of overflow
+ echo "<div class=\"celldiv slots" . $slots . "\">\n"; // we want
clipping of overflow
}
echo " <a href=\"view_entry.php?id=$id&".
$query_strings['booking'] . "\" title=\"$long_descr\">$descr</a>\n";
echo "</div>\n";
@@ -1341,7 +1341,7 @@
global $enable_periods, $periods;
tdcell("row_labels", 1);
- echo "<div class=\"celldiv1\">\n";
+ echo "<div class=\"celldiv slots1\">\n";
if ( $enable_periods )
{
@@ -1364,7 +1364,7 @@
function draw_room_cell($row, $link)
{
tdcell("row_labels", 1);
- echo "<div class=\"celldiv1\">\n";
+ echo "<div class=\"celldiv slots1\">\n";
echo "<a href=\"$link\" title=\"" . get_vocab("viewweek") . " " .
$row['description'] . "\">";
echo htmlspecialchars($row['room_name']) . ($row['capacity'] > 0 ?
"(".$row['capacity'].")" : "");
echo "</a>\n";
@@ -1377,7 +1377,7 @@
function draw_day_cell($text, $link)
{
tdcell("row_labels", 1);
- echo "<div class=\"celldiv1\">\n";
+ echo "<div class=\"celldiv slots1\">\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 17:55:17 UTC (rev 1087)
+++ mrbs/trunk/web/mrbs.css.php 2009-04-03 18:23:19 UTC (rev 1088)
@@ -313,9 +313,9 @@
<?php
-/* CELLDIV CLASSES
+/* SLOTS CLASSES
-The next section generates the celldiv classes (i.e. celldiv1, celldiv2,
etc.). We need
+The next section generates the slot classes (i.e. slots1, slots2, etc.). We
need
enough of them so that they cover a booking spanning all the slots.
These classes are used to control the styling of the main div in a cell in the
main display table.
@@ -333,7 +333,7 @@
that we only need the style declaration for each row.)
In the classes below
-- celldivN is the class for displaying a booking N slots long
+- slotsN is the class for displaying a booking N slots long
- height is the height of N slots (ie N * $main_cell_height)
- you need to specify max-height so that clipping works correctly in Firefox
- you need to specify height so that clipping works correctly in IE and also
@@ -358,8 +358,7 @@
$div_height = $div_height + (($i-1)*$main_table_cell_border_width);
$div_height = (int) $div_height; // Make absolutely sure it's an int to
avoid generating invalid CSS
- echo "div.celldiv" . $i . " {" .
- "display: block; overflow: hidden; margin: 0; padding: 0; " .
+ echo "div.slots" . $i . " {" .
"height:" . $div_height . "px; " .
"max-height: " . $div_height . "px; " .
"min-height: " . $div_height . "px;}\n";
@@ -371,7 +370,8 @@
// one booking in a time slot.
?>
-.row_labels div.celldiv1 {overflow: visible} /* we want to see the content in
the row label columns */
+div.celldiv {overflow: hidden; margin: 0; padding: 0}
+.row_labels div.celldiv {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
