diff options
| -rw-r--r-- | admin_media.php | 2 | ||||
| -rw-r--r-- | help_text.php | 9 | ||||
| -rw-r--r-- | includes/functions/functions_charts.php | 2 | ||||
| -rw-r--r-- | includes/functions/functions_edit.php | 2 | ||||
| -rw-r--r-- | includes/functions/functions_mediadb.php | 1 | ||||
| -rw-r--r-- | modules_v3/media/module.php | 2 | ||||
| -rw-r--r-- | repo.php | 2 | ||||
| -rw-r--r-- | source.php | 2 |
8 files changed, 9 insertions, 13 deletions
diff --git a/admin_media.php b/admin_media.php index 3ac70de243..67854a6087 100644 --- a/admin_media.php +++ b/admin_media.php @@ -802,7 +802,7 @@ if (check_media_structure()) { <?php echo "<a href=\"#\" onclick=\"expand_layer('uploadmedia');\">".WT_I18N::translate('Upload media files')."</a>". help_link('upload_media'); ?> </td>--> <td class="wrap"> - <a href="#" onclick="window.open('addmedia.php?action=showmediaform&linktoid=new', '_blank', 'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1'); return false;"> <?php echo WT_I18N::translate('Add a new media object')."</a>". help_link('add_media'); ?> + <a href="#" onclick="window.open('addmedia.php?action=showmediaform&linktoid=new', '_blank', 'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1'); return false;"> <?php echo WT_I18N::translate('Add a new media object')."</a>". help_link('OBJE'); ?> </td> <?php $tempURL = WT_SCRIPT_NAME.'?'; diff --git a/help_text.php b/help_text.php index 97cfb33e30..74f807e135 100644 --- a/help_text.php +++ b/help_text.php @@ -737,9 +737,9 @@ case 'OBJE': $title=WT_Gedcom_Tag::getLabel('OBJE'); $text= '<p>'. - WT_I18N::translate('A media object is a record in the family tree that contains information about a media file. This information may include a title, a copyright notice, a transcript, privacy restictions, etc. The actual media file, such as a photo or video, is stored externally. This file can be either be stored locally on this webserver or remotely on a file-sharing webserver.'). + WT_I18N::translate('A media object is a record in the family tree that contains information about a media file. This information may include a title, a copyright notice, a transcript, privacy restictions, etc. The actual media file, such as the photo or video, can be either be stored locally on this webserver or remotely on another webserver.'). '<p></p>'. - WT_I18N::translate('Thumbnails will be created automatically from images. You may wish to specify your own thumbnail, such as a still image from a video or a photograph of the speaker in an audio recording. Thumbnails must be stored locally. You cannot specify a location on a remote webserver.'). + WT_I18N::translate('Thumbnails will be created automatically from images. You are able to specify your own thumbnail, such as a still image from a video or a photograph of the speaker in an audio recording. Thumbnails must be stored locally. You cannot specify a location on a remote webserver.'). '</p>'; break; @@ -2065,11 +2065,6 @@ case 'add_husband': $text=WT_I18N::translate('By clicking this link, you can add a <u>new</u> male person and link this person to the principal individual as a new husband.<br /><br />Just click the link, and you will get a pop up window to add the new person. Fill out as many boxes as you can and click the <b>Save</b> button.<br /><br />That\'s all.'); break; -case 'add_media': - $title=WT_I18N::translate('Add a new media object'); - $text=WT_I18N::translate('Adding multimedia files (MM) to the GEDCOM is a very nice feature. Although this program already has a great look without media, if you add pictures or other MM to your relatives, it will only get better.<br /><br /><b>What you should understand about MM.</b><br />There are many formats of MM. Although <b>webtrees</b> can handle most of them, there some things to consider.<br /><ul><li><b>Formats</b><br />Pictures can be edited and saved in many formats. For example, .jpg, .png, .bmp, .gif, etc. If the same original picture was used to create each of the formats, the viewed image will appear to be the same size no matter which format is used. However, the image files stored in the database will vary considerably in size. Generally, .jpg images are considered to the most efficient in terms of storage space.</li><li><b>Image size</b><br />The larger the original image, the larger will be the resultant file\'s size. The picture should fit on the screen without scrolling; the maximum width or height should not be more than the width or height of the screen. <b>webtrees</b> is designed for screens of 1024x768 pixels but not all of this space is available for viewing pictures; the picture\'s size should be set accordingly. To reduce file sizes, smaller pictures are more desirable.</li><li><b>Resolution</b><br />The resolution of a picture is usually measured in "dpi" (dots/inch), but this is valid only for printed pictures. When considering pictures shown on screen, the only correct way is to use total dots or pixels. When printed, the picture could have a resolution of 150 - 300 dpi or more depending on the printer. Screen resolutions are rarely better than 50 pixels per inch. If your picture will never be printed, you can safely lower its resolution (and consequently its file size) without affecting picture quality. If a low-resolution picture is printed with too great a magnification, its quality will suffer; it will have a grainy appearance.</li><li><b>Color depth</b><br />Another way to keep a file small is to decrease the number of colors that you use. The number of colors can differ from pure black and white (two colors) to true colors (millions of colors) and anything in between. You can see that the more colors are used, the bigger the size of the files.</li></ul><b>Why is it important to keep the file size small?</b><br /><ul><li>First of all: Our webspace is limited. The more large files there are, the more web space we need on the server. The more space we need, the higher our costs.</li><li>Bandwidth. The more data our server has to send to the remote location (your location), the more we have to pay. This is because the carrying capacity of the server\'s connection to the Internet is limited, and the link has to be shared (and paid for) by all of the applications running on the server. <b>webtrees</b> is one of many applications that share the server. The cost is normally apportioned according to the amount of data each application sends and receives.</li><li>Download time. If you have large files, the user (also you) will have to wait long for the page to download from the server. Not everybody is blessed with a cable connection, broadband or DSL.</li></ul><b>How to upload your MM</b><br />There are two ways to upload media to the site. If you have a lot of media items to upload you should contact the site administrator to discuss the best ways. If it has been enabled by your site administrator, you can use the Upload Media form under your My Page menu. You can also use the Upload option on the Multimedia form to upload media items.'); - break; - case 'add_media_linkid': $title=WT_I18N::translate('Link ID'); $text=WT_I18N::translate('Each media item should be associated with one or more person, family, or source records in your database.<br /><br />To establish such a link, you can enter or search for the ID of the person, family, or source at the same time as you create the media item. You can also establish the link later through editing options on the Manage MultiMedia page, or by adding media items through the Add Media link available on the Individual, Family, or Source Details pages.'); diff --git a/includes/functions/functions_charts.php b/includes/functions/functions_charts.php index 48c4e63993..483d49dd06 100644 --- a/includes/functions/functions_charts.php +++ b/includes/functions/functions_charts.php @@ -475,7 +475,7 @@ function print_family_facts($family) { // -- new media if (get_gedcom_setting(WT_GED_ID, 'MEDIA_UPLOAD') >= WT_USER_ACCESS_LEVEL) { echo '<tr><td class="descriptionbox">'; - echo WT_I18N::translate('Add media'), help_link('add_media'); + echo WT_I18N::translate('Add media'), help_link('OBJE'); echo '</td><td class="optionbox">'; echo "<a href=\"#\" onclick=\"window.open('addmedia.php?action=showmediaform&linktoid={$famid}', '_blank', 'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1'); return false;\">", WT_I18N::translate('Add a new media object'), '</a>'; echo '<br />'; diff --git a/includes/functions/functions_edit.php b/includes/functions/functions_edit.php index 3f13840df4..380d3c0238 100644 --- a/includes/functions/functions_edit.php +++ b/includes/functions/functions_edit.php @@ -1892,7 +1892,7 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) { if ($tag=="OBJE") { //-- Add new obje to fact echo "<a href=\"#\" onclick=\"return expand_layer('newobje');\"><img id=\"newobje_img\" src=\"", $WT_IMAGES["plus"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", WT_I18N::translate('Add a new media object'), "</a>"; - echo help_link('add_media'); + echo help_link('OBJE'); echo "<br />"; echo "<div id=\"newobje\" style=\"display: none;\">"; if ($printSaveButton) echo "<input type=\"submit\" value=\"", WT_I18N::translate('Save'), "\" />"; diff --git a/includes/functions/functions_mediadb.php b/includes/functions/functions_mediadb.php index acecaf2821..823105209a 100644 --- a/includes/functions/functions_mediadb.php +++ b/includes/functions/functions_mediadb.php @@ -1443,6 +1443,7 @@ function show_media_form($pid, $action = "newentry", $filename = "", $linktoid = } else { echo WT_I18N::translate('Edit media object'); } + echo help_link('OBJE'); echo "</td></tr>"; echo "<tr><td colspan=\"2\" class=\"descriptionbox\"><input type=\"submit\" value=\"", WT_I18N::translate('Save'), "\" /></td></tr>"; if ($linktoid == "new" || ($linktoid == "" && $action != "update")) { diff --git a/modules_v3/media/module.php b/modules_v3/media/module.php index c1fb15afcd..fb905bbcee 100644 --- a/modules_v3/media/module.php +++ b/modules_v3/media/module.php @@ -87,7 +87,7 @@ class media_WT_Module extends WT_Module implements WT_Module_Tab { if (WT_USER_CAN_EDIT && $controller->record->canDisplayDetails() && get_gedcom_setting(WT_GED_ID, 'MEDIA_UPLOAD') >= WT_USER_ACCESS_LEVEL) { ?> <tr> - <td class="facts_label"><?php echo WT_I18N::translate('Add media'), help_link('add_media'); ?></td> + <td class="facts_label"><?php echo WT_I18N::translate('Add media'), help_link('OBJE'); ?></td> <td class="facts_value"> <a href="#" onclick="window.open('addmedia.php?action=showmediaform&linktoid=<?php echo $controller->record->getXref(); ?>', '_blank', 'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1'); return false;"> <?php echo WT_I18N::translate('Add a new media object'); ?></a><br /> <a href="#" onclick="window.open('inverselink.php?linktoid=<?php echo $controller->record->getXref(); ?>&linkto=person', '_blank', 'top=50,left=50,width=400,height=300,resizable=1,scrollbars=1'); return false;"><?php echo WT_I18N::translate('Link to an existing media object'); ?></a> @@ -121,7 +121,7 @@ echo '<div id="repo-tabs"> // new media if (get_gedcom_setting(WT_GED_ID, 'MEDIA_UPLOAD') >= WT_USER_ACCESS_LEVEL) { echo '<tr><td class="descriptionbox">'; - echo WT_I18N::translate('Add media'), help_link('add_media'); + echo WT_I18N::translate('Add media'), help_link('OBJE'); echo '</td><td class="optionbox">'; echo '<a href="#" onclick="window.open(\'addmedia.php?action=showmediaform&linktoid=', $controller->record->getXref(), '\', \'_blank\', \'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1\'); return false;">', WT_I18N::translate('Add a new media object'), '</a>'; echo '<br />'; diff --git a/source.php b/source.php index 38f9d00a59..ab425d5150 100644 --- a/source.php +++ b/source.php @@ -129,7 +129,7 @@ echo '<div id="source-tabs"> // new media if (get_gedcom_setting(WT_GED_ID, 'MEDIA_UPLOAD') >= WT_USER_ACCESS_LEVEL) { echo '<tr><td class="descriptionbox">'; - echo WT_I18N::translate('Add media'), help_link('add_media'); + echo WT_I18N::translate('Add media'), help_link('OBJE'); echo '</td><td class="optionbox">'; echo '<a href="#" onclick="window.open(\'addmedia.php?action=showmediaform&linktoid=', $controller->record->getXref(), '\', \'_blank\', \'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1\'); return false;">', WT_I18N::translate('Add a new media object'), '</a>'; echo '<br />'; |