From 36d622e2f0357189c696693bb232f60bc03db5bd Mon Sep 17 00:00:00 2001 From: fisharebest Date: Sat, 19 Nov 2011 13:02:05 +0000 Subject: Remove classes .rtl and .lrt - these exist to correct the alignment when we apply "center" at a parent element. We have now removed the "center", and no longer need this markup. --- includes/functions/functions_charts.php | 2 +- includes/functions/functions_edit.php | 22 ++++++------ includes/functions/functions_mediadb.php | 53 +++++++++++++--------------- includes/functions/functions_print.php | 14 ++++---- includes/functions/functions_print_lists.php | 22 ++++++------ includes/media_reorder.php | 6 ++-- 6 files changed, 56 insertions(+), 63 deletions(-) (limited to 'includes') diff --git a/includes/functions/functions_charts.php b/includes/functions/functions_charts.php index 483d49dd06..31bed418e8 100644 --- a/includes/functions/functions_charts.php +++ b/includes/functions/functions_charts.php @@ -76,7 +76,7 @@ function print_sosa_number($sosa, $pid = "", $arrowDirection = "up") { * @param string $gparid optional gd-parent ID (descendancy booklet) */ function print_family_parents($famid, $sosa = 0, $label="", $parid="", $gparid="", $personcount="1") { - global $show_full, $TEXT_DIRECTION, $SHOW_EMPTY_BOXES, $pbwidth, $pbheight, $WT_IMAGES, $GEDCOM; + global $show_full, $SHOW_EMPTY_BOXES, $pbwidth, $pbheight, $WT_IMAGES, $GEDCOM; $ged_id=get_id_from_gedcom($GEDCOM); diff --git a/includes/functions/functions_edit.php b/includes/functions/functions_edit.php index 380d3c0238..2afa46ff19 100644 --- a/includes/functions/functions_edit.php +++ b/includes/functions/functions_edit.php @@ -543,7 +543,7 @@ function remove_subline($oldrecord, $linenum) { function print_indi_form($nextaction, $famid, $linenum='', $namerec='', $famtag="CHIL", $sextag='') { global $pid, $WT_IMAGES, $WORD_WRAPPED_NOTES; global $NPFX_accept, $SPFX_accept, $NSFX_accept, $FILE_FORM_accept; - global $bdm, $TEXT_DIRECTION, $STANDARD_NAME_FACTS, $REVERSED_NAME_FACTS, $ADVANCED_NAME_FACTS, $ADVANCED_PLAC_FACTS; + global $bdm, $STANDARD_NAME_FACTS, $REVERSED_NAME_FACTS, $ADVANCED_NAME_FACTS, $ADVANCED_PLAC_FACTS; global $QUICK_REQUIRED_FACTS, $QUICK_REQUIRED_FAMFACTS, $NO_UPDATE_CHAN; $SURNAME_TRADITION=get_gedcom_setting(WT_GED_ID, 'SURNAME_TRADITION'); @@ -865,7 +865,7 @@ function print_indi_form($nextaction, $famid, $linenum='', $namerec='', $famtag= } } if (WT_USER_IS_ADMIN) { - echo ""; + echo ""; echo WT_Gedcom_Tag::getLabel('CHAN'), ""; if ($NO_UPDATE_CHAN) { echo ""; @@ -1397,9 +1397,9 @@ function add_simple_tag($tag, $upperlevel='', $label='', $readOnly='', $noClose= echo " >"; if (in_array($fact, $subnamefacts) || $fact=="LATI" || $fact=="LONG") { - echo ""; + echo ""; } else { - echo ""; + echo ""; } @@ -1814,7 +1814,7 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) { echo "
"; echo "
"; if ($printSaveButton) echo ""; - echo ""; + echo "
"; // 2 SOUR $source = "SOUR @"; add_simple_tag("$level $source"); @@ -1851,7 +1851,7 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) { echo "
"; } if ($printSaveButton) echo ""; - echo "
"; + echo "
"; // 2 ASSO add_simple_tag(($level)." ASSO @"); // 3 RELA @@ -1870,7 +1870,7 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) { echo "
"; echo "
"; if ($printSaveButton) echo ""; - echo "
"; + echo "
"; // 2 NOTE add_simple_tag(($level)." NOTE ".$text); echo "
"; @@ -1883,7 +1883,7 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) { echo "
"; echo "
"; if ($printSaveButton) echo ""; - echo ""; + echo "
"; // 2 SHARED NOTE add_simple_tag(($level)." SHARED_NOTE "); @@ -1896,7 +1896,7 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) { echo "
"; echo "
"; if ($printSaveButton) echo ""; - echo "
"; + echo "
"; add_simple_tag($level." OBJE"); echo "
"; } @@ -1908,7 +1908,7 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) { echo "
"; echo "
"; if ($printSaveButton) echo ""; - echo ""; + echo "
"; // 2 RESN add_simple_tag(($level)." RESN ".$text); echo "
"; @@ -2373,7 +2373,7 @@ function create_add_form($fact) { function create_edit_form($gedrec, $linenum, $level0type) { global $WORD_WRAPPED_NOTES; global $pid, $tags, $ADVANCED_PLAC_FACTS, $date_and_time; - global $FULL_SOURCES, $TEXT_DIRECTION; + global $FULL_SOURCES; $tags=array(); $gedlines = explode("\n", $gedrec); // -- find the number of lines in the record diff --git a/includes/functions/functions_mediadb.php b/includes/functions/functions_mediadb.php index 823105209a..68e64996e8 100644 --- a/includes/functions/functions_mediadb.php +++ b/includes/functions/functions_mediadb.php @@ -1183,11 +1183,10 @@ function get_media_folders() { * process the form for uploading media files */ function process_uploadMedia_form() { - global $TEXT_DIRECTION; global $MEDIA_DIRECTORY, $USE_MEDIA_FIREWALL, $MEDIA_FIREWALL_THUMBS, $MEDIATYPE; global $thumbnail, $whichFile1, $whichFile2; - echo ""; + echo "
"; echo "
"; for ($i=1; $i<6; $i++) { if (!empty($_FILES['mediafile'.$i]["name"]) || !empty($_FILES['thumbnail'.$i]["name"])) { @@ -1307,7 +1306,7 @@ function process_uploadMedia_form() { * @param bool $showthumb the setting of the "show thumbnail" option (required by admin_media.php) */ function show_mediaUpload_form($URL, $showthumb=false) { - global $MEDIA_DIRECTORY_LEVELS, $MEDIA_DIRECTORY, $TEXT_DIRECTION; + global $MEDIA_DIRECTORY_LEVELS, $MEDIA_DIRECTORY; $AUTO_GENERATE_THUMBS=get_gedcom_setting(WT_GED_ID, 'AUTO_GENERATE_THUMBS'); @@ -1340,48 +1339,48 @@ function show_mediaUpload_form($URL, $showthumb=false) { // Print 5 forms for uploading images for ($i=1; $i<6; $i++) { - echo ''; + echo '
'; echo ''; - echo ''; - echo ''; if ($thumbSupport != "") { - echo ''; } - echo ''; - echo ''; if (WT_USER_GEDCOM_ADMIN) { - echo ''; - echo ''; } else { - echo ''; + echo ''; } if (WT_USER_GEDCOM_ADMIN && $MEDIA_DIRECTORY_LEVELS>0) { - echo ''; - echo '
', WT_I18N::translate('Media file'), ':  ', $i, '
'; + echo '
'; echo WT_I18N::translate('Media file to upload'), help_link('upload_media_file'); echo ''; + echo ''; echo ''; echo '
'; + echo '
'; echo WT_I18N::translate('Automatic thumbnail'), help_link('generate_thumb'); - echo ''; + echo ''; echo ''; echo '   ', WT_I18N::translate('Generate thumbnail automatically from '), $thumbSupport; echo '
'; + echo '
'; echo WT_I18N::translate('Thumbnail to upload'), help_link('upload_thumbnail_file'); echo ''; + echo ''; echo ''; echo '
'; + echo '
'; echo WT_I18N::translate('File name on server'), help_link('upload_server_file'); echo ''; + echo ''; echo ''; if ($i==1) echo "
", WT_I18N::translate('Do not change to keep original file name.'), ""; echo '
'; + echo '
'; echo WT_I18N::translate('Folder name on server'), help_link('upload_server_folder'); echo ''; + echo ''; echo '"; - echo ""; + echo "
"; echo ""; echo ""; if ($linktoid == "new" || ($linktoid == "" && $action != "update")) { - echo ""; // Check for thumbnail generation support if (WT_USER_GEDCOM_ADMIN) { @@ -1495,14 +1494,14 @@ function show_media_form($pid, $action = "newentry", $filename = "", $linktoid = if ($thumbSupport != "") { $thumbSupport = substr($thumbSupport, 2); // Trim off first ", " - echo ""; } - echo ""; } else echo ""; @@ -1528,11 +1527,11 @@ function show_media_form($pid, $action = "newentry", $filename = "", $linktoid = } echo ""; - echo ""; - echo "'; echo ''; - echo '
"; if ($action == "newentry") { echo WT_I18N::translate('Add a new media object'); @@ -1447,7 +1446,7 @@ function show_media_form($pid, $action = "newentry", $filename = "", $linktoid = echo "
"; + echo "
"; echo WT_I18N::translate('Enter a Person, Family, or Source ID'), help_link('add_media_linkid'); echo ""; print_findindi_link("gid", ""); @@ -1477,7 +1476,7 @@ function show_media_form($pid, $action = "newentry", $filename = "", $linktoid = } if ($gedfile == "FILE") { // Box for user to choose to upload file from local computer - echo "
"; + echo "
"; echo WT_I18N::translate('Media file to upload').help_link('upload_media_file')."
"; + echo "
"; echo WT_I18N::translate('Automatic thumbnail'), help_link('generate_thumb'); echo ""; echo ""; echo "   " . WT_I18N::translate('Generate thumbnail automatically from ') . $thumbSupport; echo "
"; + echo "
"; echo WT_I18N::translate('Thumbnail to upload').help_link('upload_thumbnail_file')."
"; + echo ""; echo ""; echo WT_I18N::translate('File name on server'), help_link('upload_server_file'); echo ""; + echo ""; if (WT_USER_GEDCOM_ADMIN) { echo ""; } */ @@ -1556,7 +1555,7 @@ function show_media_form($pid, $action = "newentry", $filename = "", $linktoid = // Box for user to choose the folder to store the image if (!$isExternal && $MEDIA_DIRECTORY_LEVELS > 0) { - echo '
'; + echo '
'; if (empty($folder)) { if (!empty($_SESSION['upload_folder'])) $folder = $_SESSION['upload_folder']; else $folder = ''; @@ -1747,7 +1746,7 @@ function show_media_form($pid, $action = "newentry", $filename = "", $linktoid = } } if (WT_USER_IS_ADMIN) { - echo "
"; + echo "
"; echo WT_Gedcom_Tag::getLabel('CHAN'), ""; if ($NO_UPDATE_CHAN) { echo ""; @@ -1811,8 +1810,6 @@ function findImageSize($file) { */ function PrintMediaLinks($links, $size = "small") { - global $TEXT_DIRECTION; - if (count($links) == 0) return false; diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php index 1a7fc33d95..71bf6c7553 100644 --- a/includes/functions/functions_print.php +++ b/includes/functions/functions_print.php @@ -1110,17 +1110,15 @@ function format_fact_place(WT_Event $event, $anchor=false, $sub=false, $lds=fals * @param string $key indi pid */ function format_first_major_fact($key, $majorfacts = array("BIRT", "CHR", "BAPM", "DEAT", "BURI", "BAPL", "ADOP")) { - global $TEXT_DIRECTION; - $html=''; $person = WT_GedcomRecord::getInstance($key); if (is_null($person)) return; foreach ($majorfacts as $indexval => $fact) { $event = $person->getFactByType($fact); if (!is_null($event) && $event->hasDatePlace() && $event->canShow()) { - $html.='
'; + $html.='
'; $html .= $event->getLabel(); - $html.=' '.format_fact_date($event, $person, false, false).format_fact_place($event).'
'; + $html.=' '.format_fact_date($event, $person, false, false).format_fact_place($event).''; break; } } @@ -1162,7 +1160,7 @@ function CheckFactUnique($uniquefacts, $recfacts, $type) { * @param string $type the type of record INDI, FAM, SOUR etc */ function print_add_new_fact($id, $usedfacts, $type) { - global $TEXT_DIRECTION, $WT_SESSION; + global $WT_SESSION; // -- Add from clipboard if ($WT_SESSION->clipboard) { @@ -1171,7 +1169,7 @@ function print_add_new_fact($id, $usedfacts, $type) { if ($fact["type"]==$type || $fact["type"]=='all') { if ($newRow) { $newRow = false; - echo '
'; + echo '
'; echo help_link('add_from_clipboard'); echo WT_I18N::translate('Add from clipboard'), '
'; @@ -1234,10 +1232,10 @@ function print_add_new_fact($id, $usedfacts, $type) { $translated_addfacts[$addfact] = WT_Gedcom_Tag::getLabel($addfact); } uasort($translated_addfacts, 'factsort'); - echo '
'; + echo '
'; echo WT_I18N::translate('Add new fact'); echo help_link('add_facts'), ''; + echo ''; echo ""; echo '
"; - echo WT_Gedcom_Tag::getLabel('CHAN'), ""; + echo "
"; + echo WT_Gedcom_Tag::getLabel('CHAN'), ""; if ($NO_UPDATE_CHAN) { echo ""; } else { -- cgit v1.3