diff options
| -rw-r--r-- | includes/media_tab_head.php | 11 | ||||
| -rw-r--r-- | modules_v3/media/module.php | 12 |
2 files changed, 5 insertions, 18 deletions
diff --git a/includes/media_tab_head.php b/includes/media_tab_head.php index 02386dce59..491999f4a8 100644 --- a/includes/media_tab_head.php +++ b/includes/media_tab_head.php @@ -29,9 +29,6 @@ if (!defined('WT_WEBTREES')) { } global $gedrec, $pid; - -require_once WT_ROOT.'js/prototype.js.htm'; -require_once WT_ROOT.'js/scriptaculous.js.htm'; ?> <script type="text/javascript"> <!-- @@ -44,7 +41,7 @@ require_once WT_ROOT.'js/scriptaculous.js.htm'; <?php // Find if indi and family associated media exists and then count them ( $tot_med_ct) - require 'includes/media_reorder_count.php'; + require WT_ROOT.'includes/media_reorder_count.php'; $gedrec = find_gedcom_record($pid, WT_GED_ID); $regexp = "/OBJE @(.*)@/"; @@ -52,12 +49,6 @@ require_once WT_ROOT.'js/scriptaculous.js.htm'; // If media exists and is greater than 1 item --------------------- if ($tot_med_ct>1) { - echo "<table border=\"0\" width=\"100%\"><tr>"; - // echo "<td class=\"width10 center wrap\" valign=\"top\"></td>"; //Popup Reorder Media - echo "<td class=\"width15 center wrap\" valign=\"top\">"; echo "<button type=\"button\" title=\"". WT_I18N::translate('Re-order media')."\" onclick=\"reorder_media();\">". WT_I18N::translate('Re-order media') ."</button>"; - echo "</td>"; - //echo "<td width=\"5%\"> </td>"; - echo "</tr></table>"; } diff --git a/modules_v3/media/module.php b/modules_v3/media/module.php index 985e1d7ba1..226fb6fb43 100644 --- a/modules_v3/media/module.php +++ b/modules_v3/media/module.php @@ -61,16 +61,13 @@ class media_WT_Module extends WT_Module implements WT_Module_Tab { global $NAV_MEDIA, $controller; ob_start(); + echo '<table class="facts_table">'; // For Reorder media ------------------------------------ if (WT_USER_GEDCOM_ADMIN) { - echo "<center>"; - require_once './includes/media_tab_head.php'; - echo "</center>"; + echo '<tr><td colspan="2">'; + require_once WT_ROOT.'includes/media_tab_head.php'; + echo '</td></tr>'; } - ?> - <div id="media_content"> - <table class="facts_table"> - <?php $media_found = false; if (!$controller->record->canDisplayDetails()) { echo "<tr><td class=\"facts_value\">"; @@ -95,7 +92,6 @@ class media_WT_Module extends WT_Module implements WT_Module_Tab { } ?> </table> - </div> <?php return '<div id="'.$this->getName().'_content">'.ob_get_clean().'</div>'; } |