Revision: 2653
https://sourceforge.net/p/mrbs/code/2653/
Author: cimorrison
Date: 2013-01-22 17:27:42 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
Added a tooltip for the linked symbol showing the names of the linked rooms
Modified Paths:
--------------
mrbs/branches/linked_bookings/web/functions_table.inc
mrbs/branches/linked_bookings/web/lang/lang.en
mrbs/branches/linked_bookings/web/month.php
Modified: mrbs/branches/linked_bookings/web/functions_table.inc
===================================================================
--- mrbs/branches/linked_bookings/web/functions_table.inc 2013-01-22
16:34:37 UTC (rev 2652)
+++ mrbs/branches/linked_bookings/web/functions_table.inc 2013-01-22
17:27:42 UTC (rev 2653)
@@ -337,6 +337,7 @@
$is_multiday_end = $cell[$n]["is_multiday_end"];
$status = $cell[$n]["status"];
$color = $cell[$n]["color"];
+ $room_id = $cell[$n]["room_id"];
$descr = htmlspecialchars($cell[$n]["data"]);
$long_descr = htmlspecialchars($cell[$n]["long_descr"]);
$class = $color;
@@ -398,6 +399,7 @@
$is_multiday_end = $cell[$n]["is_multiday_end"];
$status = $cell[$n]["status"];
$color = $cell[$n]["color"];
+ $room_id = $cell[$n]["room_id"];
$descr = htmlspecialchars($cell[$n]["start_time"] . " " .
$cell[$n]["data"]);
$long_descr = htmlspecialchars($cell[$n]["long_descr"]);
$class = $color;
@@ -428,7 +430,12 @@
$html .= "<div class=\"celldiv slots1\">\n"; // we want clipping of
overflow
$html .= "<a href=\"view_entry.php?id=$id&".
$query_strings['booking'] . "\" title=\"$long_descr\">";
$html .= ($is_repeat) ? "<img class=\"repeat_symbol\"
src=\"images/repeat.png\" alt=\"" . get_vocab("series") . "\" title=\"" .
get_vocab("series") . "\" width=\"10\" height=\"10\">" : '';
- $html .= (count($linked) > 1) ? "<img class=\"link_symbol $c\"
src=\"images/link.png\" alt=\"" . get_vocab("linked_entry") . "\" title=\"" .
get_vocab("linked_entry") . "\" width=\"16\" height=\"16\">" : '';
+ if (count($linked) > 1)
+ {
+ $html .= "<img class=\"link_symbol $c\" src=\"images/link.png\"
alt=\"" . get_vocab("linked_entry") . "\" title=\"" .
+ get_vocab("linked_with") . "\n" . implode("\n",
get_full_room_names(array_diff($linked, array($room_id)))) .
+ "\" width=\"16\" height=\"16\">";
+ }
$html .= "$descr</a>\n";
$html .= "</div>\n";
@@ -454,6 +461,7 @@
$is_multiday_end = $cell[0]["is_multiday_end"];
$status = $cell[0]["status"];
$color = $cell[0]["color"];
+ $room_id = $cell[0]["room_id"];
$descr = htmlspecialchars($cell[0]["data"]);
$long_descr = htmlspecialchars($cell[0]["long_descr"]);
$slots = $cell[0]["slots"];
@@ -541,7 +549,12 @@
"\">\n";
$html .= "<a href=\"view_entry.php?id=$id&".
$query_strings['booking'] . "\" title=\"$long_descr\">";
$html .= ($is_repeat) ? "<img class=\"repeat_symbol $c\"
src=\"images/repeat.png\" alt=\"" . get_vocab("series") . "\" title=\"" .
get_vocab("series") . "\" width=\"10\" height=\"10\">" : '';
- $html .= (count($linked) > 1) ? "<img class=\"link_symbol $c\"
src=\"images/link.png\" alt=\"" . get_vocab("linked_entry") . "\" title=\"" .
get_vocab("linked_entry") . "\" width=\"16\" height=\"16\">" : '';
+ if (count($linked) > 1)
+ {
+ $html .= "<img class=\"link_symbol $c\" src=\"images/link.png\"
alt=\"" . get_vocab("linked_entry") . "\" title=\"" .
+ get_vocab("linked_with") . "\n" . implode("\n",
get_full_room_names(array_diff($linked, array($room_id)))) .
+ "\" width=\"16\" height=\"16\">";
+ }
$html .= "$descr</a>\n";
$html .= "</div>\n";
}
Modified: mrbs/branches/linked_bookings/web/lang/lang.en
===================================================================
--- mrbs/branches/linked_bookings/web/lang/lang.en 2013-01-22 16:34:37 UTC
(rev 2652)
+++ mrbs/branches/linked_bookings/web/lang/lang.en 2013-01-22 17:27:42 UTC
(rev 2653)
@@ -137,6 +137,7 @@
$vocab["remind_admin"] = "Remind Admin";
$vocab["series"] = "Series";
$vocab["linked_entry"] = "Linked entry";
+$vocab["linked_with"] = "Linked with:";
$vocab["request_more_info"] = "Please list the extra information you
require";
$vocab["reject_reason"] = "Please give a reason for your rejection of
this reservation request";
$vocab["send"] = "Send";
Modified: mrbs/branches/linked_bookings/web/month.php
===================================================================
--- mrbs/branches/linked_bookings/web/month.php 2013-01-22 16:34:37 UTC (rev
2652)
+++ mrbs/branches/linked_bookings/web/month.php 2013-01-22 17:27:42 UTC (rev
2653)
@@ -493,7 +493,11 @@
}
echo "<a href=\"$booking_link\" title=\"$full_text\">";
echo ($d[$cday]['is_repeat'][$i]) ? "<img class=\"repeat_symbol\"
src=\"images/repeat.png\" alt=\"" . get_vocab("series") . "\" title=\"" .
get_vocab("series") . "\" width=\"10\" height=\"10\">" : '';
- echo (count($d[$cday]['linked'][$i]) > 1) ? "<img
class=\"link_symbol\" src=\"images/link.png\" alt=\"" .
get_vocab("linked_entry") . "\" title=\"" . get_vocab("linked_entry") . "\"
width=\"16\" height=\"16\">" : '';
+ if (count($d[$cday]['linked'][$i]) > 1)
+ {
+ echo "<img class=\"link_symbol\" src=\"images/link.png\" alt=\"" .
get_vocab("linked_entry") . "\" title=\"" .
+ get_vocab("linked_with") . "\n" . implode("\n",
get_full_room_names(array_diff($d[$cday]['linked'][$i], array($room)))) . "\"
width=\"16\" height=\"16\">";
+ }
echo "$display_text</a>\n";
echo "</div>\n";
}
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
