diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-09-25 10:52:13 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-09-25 10:52:13 +0000 |
| commit | 5fbf28cc38593d3ed9739924baee01b3ad30223b (patch) | |
| tree | c72d1058b2995e777ac1c32bedfcb16f84806768 /modules/lightbox | |
| parent | 06fabd4903f8958da80813e76873a3f5caee1e3e (diff) | |
| download | webtrees-5fbf28cc38593d3ed9739924baee01b3ad30223b.tar.gz webtrees-5fbf28cc38593d3ed9739924baee01b3ad30223b.tar.bz2 webtrees-5fbf28cc38593d3ed9739924baee01b3ad30223b.zip | |
Tidy up menu code
Diffstat (limited to 'modules/lightbox')
| -rw-r--r-- | modules/lightbox/functions/lb_link.php | 4 | ||||
| -rw-r--r-- | modules/lightbox/functions/lightbox_print_media_row.php | 35 |
2 files changed, 18 insertions, 21 deletions
diff --git a/modules/lightbox/functions/lb_link.php b/modules/lightbox/functions/lb_link.php index 6c0ee83eda..9a928d7d99 100644 --- a/modules/lightbox/functions/lb_link.php +++ b/modules/lightbox/functions/lb_link.php @@ -81,7 +81,7 @@ if (!defined('WT_WEBTREES')) { $submenu->addClass("submenuitem".$classSuffix, "submenuitem".$classSuffix); $menu->addSubMenu($submenu); - $menu->printMenu(); + echo $menu->getMenu(); ?> <script language="JavaScript" type="text/javascript"> function ilinkitem(mediaid, type) { @@ -97,5 +97,3 @@ if (!defined('WT_WEBTREES')) { // if ($media["XREF"] != "") { // print_link_menu($media2["XREF"]); // } - -?> diff --git a/modules/lightbox/functions/lightbox_print_media_row.php b/modules/lightbox/functions/lightbox_print_media_row.php index 489fdab457..a6f13f3152 100644 --- a/modules/lightbox/functions/lightbox_print_media_row.php +++ b/modules/lightbox/functions/lightbox_print_media_row.php @@ -324,13 +324,13 @@ function lightbox_print_media_row($rtype, $rowm, $pid) { //View Edit Menu ---------------------------------- if (!$reorder) { // If not reordering media print View or View-Edit Menu - print "<tr>"; - print "<td width=\"5px\"></td>"; - print "<td valign=\"bottom\" align=\"center\" nowrap=\"nowrap\">"; - $menu->printMenu(); - print "</td>"; - print "<td width=\"5px\"></td>"; - print "</tr>" . "\n"; + echo "<tr>"; + echo "<td width=\"5px\"></td>"; + echo "<td valign=\"bottom\" align=\"center\" nowrap=\"nowrap\">"; + echo $menu->getMenu(); + echo "</td>"; + echo "<td width=\"5px\"></td>"; + echo "</tr>" . "\n"; } // print "</table>" . "\n"; @@ -343,13 +343,13 @@ function lightbox_print_media_row($rtype, $rowm, $pid) { //if (!media_exists($rowm['m_file'])) { if (!media_exists($mainMedia)) { if (!media_exists($rowm['m_file'])) { - print "<tr>"; - print "<td ></td>"; - print "<td valign=\"bottom\" align=\"center\" nowrap=\"nowrap\">"; - $menu->printMenu(); - print "</td>"; - print "<td ></td>"; - print "</tr>" . "\n"; + echo "<tr>"; + echo "<td ></td>"; + echo "<td valign=\"bottom\" align=\"center\" nowrap=\"nowrap\">"; + echo $menu->getMenu(); + echo "</td>"; + echo "<td ></td>"; + echo "</tr>" . "\n"; } } @@ -360,9 +360,8 @@ function lightbox_print_media_row($rtype, $rowm, $pid) { print "<input type=\"hidden\" name=\"order1[$media_data]\" value=\"$sort_i\" />" . "\n"; $sort_i++; - print "</li>"; - print "\n\n"; - return true; + print "</li>"; + print "\n\n"; + return true; } -?> |