From 8e34d70b279a52c64eec2f2b727416f7b1b1bca3 Mon Sep 17 00:00:00 2001 From: fisharebest Date: Sat, 25 Sep 2010 19:25:10 +0000 Subject: --- modules/lightbox/admin_config.php | 3 +-- modules/lightbox/functions/lb_head.php | 3 +-- modules/lightbox/functions/lb_horiz_sort.php | 2 +- modules/lightbox/functions/lb_indi_doors_0.php | 2 +- modules/lightbox/functions/lb_indi_doors_1.php | 4 ++-- modules/lightbox/functions/lightbox_print_media.php | 19 +++++++++---------- modules/lightbox/help_text.php | 6 +++--- modules/lightbox/lb_editconfig.php | 2 +- modules/lightbox/module.php | 10 +++++----- 9 files changed, 24 insertions(+), 27 deletions(-) (limited to 'modules/lightbox') diff --git a/modules/lightbox/admin_config.php b/modules/lightbox/admin_config.php index b90056a7ca..27ac4ef9ed 100644 --- a/modules/lightbox/admin_config.php +++ b/modules/lightbox/admin_config.php @@ -46,9 +46,8 @@ if (WT_USER_IS_ADMIN) { ?> getName()); ?> - + diff --git a/modules/lightbox/functions/lb_head.php b/modules/lightbox/functions/lb_head.php index d0c51f56f1..9b65615b3b 100644 --- a/modules/lightbox/functions/lb_head.php +++ b/modules/lightbox/functions/lb_head.php @@ -60,7 +60,7 @@ $reorder=safe_get('reorder', '1', '0'); "inverselink.php?linktoid=&linkto=person", "win04", "resizable=1, scrollbars=1, top=50, HEIGHT=300, WIDTH=450 "); win04.focus() } - + function goto_config_lightbox() { window.location = "module.php?mod=lightbox&mod_action=lb_editconfig&pid=&gedcom=#lightbox"; } @@ -242,4 +242,3 @@ require_once WT_ROOT.'includes/media_reorder_count.php'; print ""; } -?> diff --git a/modules/lightbox/functions/lb_horiz_sort.php b/modules/lightbox/functions/lb_horiz_sort.php index 45edecf0ab..ff16e7dfd2 100644 --- a/modules/lightbox/functions/lb_horiz_sort.php +++ b/modules/lightbox/functions/lb_horiz_sort.php @@ -44,7 +44,7 @@ if (!defined('WT_WEBTREES')) { function getGroupOrder() { // var sections = document.getElementsByClassName('section'); var sections = $$('.section'); - + var alerttext = ''; var order = ''; diff --git a/modules/lightbox/functions/lb_indi_doors_0.php b/modules/lightbox/functions/lb_indi_doors_0.php index 84fc59882d..9dfca9cac8 100644 --- a/modules/lightbox/functions/lb_indi_doors_0.php +++ b/modules/lightbox/functions/lb_indi_doors_0.php @@ -60,4 +60,4 @@ if (!defined('WT_WEBTREES')) {
-
+
diff --git a/modules/lightbox/functions/lb_indi_doors_1.php b/modules/lightbox/functions/lb_indi_doors_1.php index 108ab25cce..3ffdfa4377 100644 --- a/modules/lightbox/functions/lb_indi_doors_1.php +++ b/modules/lightbox/functions/lb_indi_doors_1.php @@ -63,5 +63,5 @@ if (!defined('WT_WEBTREES')) {
- -
+ +
diff --git a/modules/lightbox/functions/lightbox_print_media.php b/modules/lightbox/functions/lightbox_print_media.php index 29bddff516..1e386922fc 100644 --- a/modules/lightbox/functions/lightbox_print_media.php +++ b/modules/lightbox/functions/lightbox_print_media.php @@ -58,7 +58,7 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f global $is_media, $cntm1, $cntm2, $cntm3, $cntm4, $t, $mgedrec; global $res, $typ2b, $edit, $tabno, $n, $item, $items, $p, $note, $rowm, $note_text, $reorder; global $action, $order, $order2, $rownum, $rownum1, $rownum2, $rownum3, $rownum4, $media_data, $sort_i; - + global $GEDCOM_ID_PREFIX; $ged_id=get_id_from_gedcom($GEDCOM); @@ -270,13 +270,13 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f $foundObjs[$rowm['m_media']]=true; } } - + // ===================================================================================== //-- Objects are removed from the $current_objes list as they are printed. //-- Any "Extra" objects left in the list are new objects recently added to the gedcom - //-- but not yet accepted into the database. + //-- but not yet accepted into the database. //-- We will print them too, and put any "Extra Items not in DB" into a new Row. - + // Firstly, get count of Items in Database for this Individual $indiobjs = "SELECT "; $indiobjs .= "m_media, m_ext, m_file, m_titl, m_gedfile, m_gedrec, mm_gid, mm_gedrec FROM `##media`, `##media_mapping` where "; @@ -330,7 +330,7 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f echo ""; echo $row['m_media']; echo ""; - + $res = lightbox_print_media_row('new', $row, $pid); $media_found = $media_found || $res; } @@ -347,7 +347,7 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f $row['m_gedrec'] = $newrec; $et = preg_match("/(\.\w+)$/", $row['m_file'], $ematch); $ext = ""; - if ($et>0) { + if ($et>0) { $ext = substr(trim($ematch[1]), 1); } $row['m_ext'] = $ext; @@ -361,7 +361,7 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f echo ""; echo $row['m_media']; echo ""; - + $res = lightbox_print_media_row('new', $row, $pid); $media_found = $media_found || $res; } @@ -370,7 +370,7 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f } } } - + // No "Extra" Media Items ============================ if ($kind==5 && $ct==$numindiobjs) { // "Extra" Media Item in GEDCOM but NOT in DB ======== @@ -401,11 +401,10 @@ Requests for commercial publication of these or other UK census images appearing echo ''; echo '' . "\n\n"; } - + } if ($media_found) return $is_media="YES" ; else return $is_media="NO" ; } -?> diff --git a/modules/lightbox/help_text.php b/modules/lightbox/help_text.php index de6fe041ad..9e1e5276f6 100644 --- a/modules/lightbox/help_text.php +++ b/modules/lightbox/help_text.php @@ -42,9 +42,9 @@ case 'lb_tt_balloon': $title=i18n::translate('Album Tab Thumbnail - Notes Link Tooltip'); $text=i18n::translate('This option lets you determine whether the \'View Notes\' link should show a \'Balloon\' Tooltip or \'Normal\' Tooltip when clicked.

The link shown here show you the Notes associated with a Media item (if available).
'); break; - -// VERSION 4.1.3 - + +// VERSION 4.1.3 + case 'mediatab': $title=i18n::translate('Media Tab Appearance'); $text=i18n::translate('This option lets you determine whether the Media tab should be shown on the Individual Information page.

When this option is set to Hide, only the Lightbox tab will be shown.
'); diff --git a/modules/lightbox/lb_editconfig.php b/modules/lightbox/lb_editconfig.php index b056640170..59d1fec0b8 100644 --- a/modules/lightbox/lb_editconfig.php +++ b/modules/lightbox/lb_editconfig.php @@ -211,7 +211,7 @@ if ($action=='update' && !isset($security_user)) { - + diff --git a/modules/lightbox/module.php b/modules/lightbox/module.php index 0e2b7c737b..4b2e788b73 100644 --- a/modules/lightbox/module.php +++ b/modules/lightbox/module.php @@ -73,7 +73,7 @@ class lightbox_WT_Module extends WT_Module implements WT_Module_Config, WT_Modul global $MULTI_MEDIA; return $MULTI_MEDIA && (WT_USER_CAN_EDIT || $this->get_media_count()>0); } - + // Implement WT_Module_Tab public function getTabContent() { global $MULTI_MEDIA, $MEDIA_EXTERNAL; @@ -86,7 +86,7 @@ class lightbox_WT_Module extends WT_Module implements WT_Module_Config, WT_Modul ob_start(); require_once 'modules/lightbox/functions/lb_head.php'; - + $media_found = false; if (!$this->controller->indi->canDisplayDetails()) { print "\n"; @@ -111,16 +111,16 @@ class lightbox_WT_Module extends WT_Module implements WT_Module_Config, WT_Modul public function getPreLoadContent() { ob_start(); require_once WT_ROOT.'modules/lightbox/functions/lb_call_js.php'; - return ob_get_clean(); + return ob_get_clean(); } - + // Implement WT_Module_Tab public function getJSCallback() { return 'CB_Init();'; } protected $mediaCount = null; - + private function get_media_count() { if ($this->mediaCount===null) { $ct = preg_match("/\d OBJE/", $this->controller->indi->getGedcomRecord()); -- cgit v1.3