diff -urp inline-5.x-1.1/CHANGELOG.txt inline-6.x-1.1/CHANGELOG.txt --- inline-5.x-1.1/CHANGELOG.txt 2007-04-18 13:59:46.000000000 +0200 +++ inline-6.x-1.1/CHANGELOG.txt 2008-07-13 21:40:37.000000000 +0200 @@ -1,12 +1,16 @@ -// $Id: CHANGELOG.txt,v 1.13.4.2 2007/04/18 11:59:46 sun Exp $ +// $Id: CHANGELOG.txt,v 1.13.4.3 2007/09/28 16:10:35 sun Exp $ -Inline 1.2, xxxx-xx-xx ----------------------- +Inline x.x-x.x, xxxx-xx-xx +-------------------------- +Inline 5.x-1.x, xxxx-xx-xx +-------------------------- +Fixed description of attachments is not displayed. -Inline 1.1, 2007-04-18 ----------------------- + +Inline 5.x-1.1, 2007-04-18 +-------------------------- #132427 Fixed fatal error in inline_replace_numbers() on PHP5. #133535 Fixed Images don't display inline. Fixed Inline dependencies. @@ -15,8 +19,8 @@ Fixed coding style. Added filter activation check in Inline settings. -Inline 1.0, 2007-03-28 ----------------------- +Inline 5.x-1.0, 2007-03-28 +-------------------------- Fixed coding style issues reported by Coder module. #100964 Fixed Inline and printer-friendly. #65642 Fixed make autoinline more apparent. diff -urp inline-5.x-1.1/inline.info inline-6.x-1.1/inline.info --- inline-5.x-1.1/inline.info 2007-04-18 14:05:15.000000000 +0200 +++ inline-6.x-1.1/inline.info 2008-07-13 21:40:35.000000000 +0200 @@ -1,9 +1,8 @@ -; $Id: inline.info,v 1.1.2.1 2007/03/27 03:52:31 sun Exp $ name = Inline description = Allows attached files to be placed into the body of a node either automatically or by using simple tags. package = "Input filters" -dependencies = filter upload -; Information added by drupal.org packaging script on 2007-04-18 -version = "5.x-1.1" +requirements[] = filter +requirements[] = upload +version = "6.x-1.x-dev" +core = 6.x project = "inline" - diff -urp inline-5.x-1.1/inline.module inline-6.x-1.1/inline.module --- inline-5.x-1.1/inline.module 2007-04-18 13:22:27.000000000 +0200 +++ inline-6.x-1.1/inline.module 2008-07-13 21:40:39.000000000 +0200 @@ -1,48 +1,69 @@ 'admin/settings/inline', - 'title' => t('Inline'), - 'description' => t('Manage automatic and manual inclusion of attachments in the content of your posts.'), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('inline_settings'), - 'access' => user_access('administer inline settings'), - ); - } + + $items['admin/settings/inline'] = array( + 'title' => t('Inline'), + 'description' => t('Manage automatic and manual inclusion of attachments in the content of your posts.'), + 'page callback' => 'drupal_get_form', + 'page arguments' => array('inline_settings'), + 'access arguments' => array('administer inline settings'), + ); return $items; } +/** + * Implementation of hook_perm(). + */ function inline_perm() { return array('administer inline settings'); } +/** + * Implementation of hook_theme(). + */ +function inline_theme() { + return array( + 'inline_img' => array( + 'arguments' => array('file' => NULL, 'field' => NULL), + ), + 'inline_add_to_teaser' => array( + 'arguments' => array('node' => NULL, 'file' => NULL, 'field' => NULL), + ), + 'inline_add_to_body' => array( + 'arguments' => array('node' => NULL, 'file' => NULL, 'field' => NULL), + ) + ); +} + +/** + * Implementation of hook_help(). + */ function inline_help($section = 'admin/help#inline') { $output = ''; switch ($section) { case 'admin/help#inline': return t('

Sometimes a user may want to add an image or a file inside the body of a node. This can be done with special tags that are replaced by links to the corresponding uploaded file. If the file is an image, it will be displayed inline, otherwise a link to the file will be inserted. To enable this feature and learn the proper syntax, visit the filters configuration screen.

', array('!filters' => url('admin/filters'))); - + case 'filter#short-tip': return t('You may add links to files uploaded with this node using special tags', array('!explanation-url' => url('filter/tips', NULL, 'image'))); - + case 'filter#long-tip': return t('

You may link to files uploaded with the current node using special tags. The tags will be replaced by the corresponding files. Syntax: [inline:file_id]. Parameter: file_id represents the file uploaded with the node in which to link, assuming that the first uploaded file is labeled as 1 and so on.

If the file is an image, it will be displayed inline, otherwise a link to the file will be inserted.

'); } } +/** + * Inline settings form builder function. + */ function inline_settings() { $form = array(); - + // Check if Inline filter is enabled $inline_activated = false; foreach (filter_formats() as $format) { @@ -56,7 +77,7 @@ function inline_settings() { if ($inline_activated == false) { drupal_set_message(t('Inline filter is not yet enabled for at least one input format.', array('!formats' => url('admin/settings/filters'))), 'error'); } - + $form['inline']['upload']['image_link'] = array( '#type' => 'fieldset', '#title' => t('Image output'), @@ -72,20 +93,22 @@ function inline_settings() { '1' => t('Display image with a link to the image file') ), ); - + $form['inline']['upload']['image_scaling'] = array( '#type' => 'fieldset', '#title' => t('Image dimensions and scaling'), '#collapsible' => true, '#description' => (module_exists('imagecache') ? t('Select the Imagecache presets to use for inlined images.', array('!presets' => url('admin/settings/imagecache'))) : t('Note: If Imagecache module is installed, Inline provides support for image scaling.', array('!imagecache' => url('http://drupal.org/project/imagecache')))), ); - + + // If Imagecache module exists and is enabled, we assume that we want to use + // the improved image handling instead of our own. if (module_exists('imagecache')) { $options = array(); $options[''] = 'No Imagecache processing'; - $presets = _imagecache_get_presets(); - foreach ($presets as $id => $name) { - $options[$name] = $name; + $presets = imagecache_presets(); + foreach ($presets as $preset) { + $options[$preset['presetname']] = $preset['presetname']; } $form['inline']['upload']['image_scaling']['inline_teaser_preset'] = array( '#title' => t('Teaser preset'), @@ -113,40 +136,60 @@ function inline_settings() { '#description' => t('This setting limits the dimensions of displayed images in pixels. They will not be resized. Images exceeding these dimensions are automatically not displayed.', array('!content-types' => url('admin/content/types'))), ); } - + return system_settings_form($form); } -function inline_form_alter($form_id, &$form) { +/** + * Implementation of hook_form_alter(). + * + * Allows to enable/disable auto-inline support for each content type. + */ +function inline_form_alter(&$form, &$form_state, $form_id) { if ($form_id == 'node_type_form') { $node_type = $form['orig_type']['#value']; $form['workflow']['upload_inline'] = array( '#type' => 'radios', '#title' => t('Display attachments inline automatically'), '#default_value' => variable_get('upload_inline_'. $node_type, 0), - '#options' => array(t('Disabled'), t('Only in teaser'), t('Only in body'), t('In teaser and body')), - '#description' => t('Whether or not uploaded images should be shown inline. Make sure you set the dimensions at !settings_url', array('!settings_url' => l(t('inline settings'), 'admin/settings/inline'))), + '#options' => array( + 0 => t('Disabled'), + 1 => t('Only in teaser view'), + 2 => t('Only in body view'), + 3 => t('In teaser and body view')), + '#description' => t('Choose whether uploaded images should be shown inline automatically. Make sure you set the dimensions at !settings_url', array('!settings_url' => l(t('inline settings'), 'admin/settings/inline'))), ); } } +/** + * Implementation of hook_filter(). + * + * Since Inline needs to know which files are attached to a processed node, the + * original text is simply returned here. + * + * @see inline_nodeapi(). + */ function inline_filter($op, $delta = 0, $format = -1, $text = '') { if ($op == 'list') { return array(0 => t('Inline file filter')); } - + switch ($op) { case 'description': return t('Substitutes [inline:xx] tags with the xxth file uploaded with the node.'); - + case 'prepare': return $text; - + case 'process': return $text; } } +/** + * Implementation of hook_filter_tips(). + */ function inline_filter_tips($delta, $format, $long = false) { if ($long) { return t(' @@ -170,10 +213,20 @@ function inline_filter_tips($delta, $for will be replaced by <a href=file1.pdf.png>test</a>'); } else { - return t('You may use [inline:xx] tags to display uploaded files or images inline.', array("!inline_help" => url("filter/tips/$format", NULL, 'filter-inline'))); + return t('You may use [inline:xx] tags to display uploaded files or images inline.', array("!inline_help" => url("filter/tips/$format", array('fragment' => 'filter-inline')))); } } +/** + * Implementation of hook_nodeapi(). + * + * Substitutes Inline tags with the corresponding files or images in front of + * node_view(). + * Replaces numeric file references in Inline tags (i.e. [inline:1]) with named + * file references (i.e. [inline:foo.jpg]) upon node preview and node save. + * + * @todo Break processing at all if Inline filter is not enabled. + */ function inline_nodeapi(&$node, $op, $arg) { if (!is_array($node->files)) { return; @@ -181,7 +234,7 @@ function inline_nodeapi(&$node, $op, $ar switch ($op) { case 'alter': case 'print': - // only nodes with our inline filter in the format may be altered + // Only nodes with Inline filter in the format may be processed. foreach (filter_list_format($node->format) as $filter) { if ($filter->module == 'inline') { $node->teaser = _inline_substitute_tags($node, 'teaser'); @@ -193,7 +246,10 @@ function inline_nodeapi(&$node, $op, $ar $node = _inline_auto_add($node); } return; - + + case 'rss item': + $node->teaser = _inline_substitute_tags($node, 'teaser'); + return; case 'prepare': case 'submit': $node->teaser = _inline_replace_numbers($node, 'teaser'); @@ -202,8 +258,12 @@ function inline_nodeapi(&$node, $op, $ar } } +/** + * Return the corresponding file object of an Inline tag. + */ function _inline_fileobj(&$node, $id) { if (is_numeric($id)) { + // Numeric file reference (deprecated, see #38359). $n = 1; foreach ($node->files as $file) { if ($n == $id) { @@ -214,6 +274,7 @@ function _inline_fileobj(&$node, $id) { return NULL; } else { + // Named file reference. foreach ($node->files as $file) { $file = (object)$file; if ($file->filename == $id) { @@ -225,7 +286,13 @@ function _inline_fileobj(&$node, $id) { } /** - * Prepares the file object + * Change file path of new files for previews. + * + * New files are stored in a temporary upload directory until the content + * is saved. We alter the file object accordingly, so such files may be + * displayed if the temporary directory is publicly accessible. + * + * @todo Prepend 'system/' for private files support. */ function inline_prepare_file_object($file) { $file = (object)$file; @@ -238,24 +305,31 @@ function inline_prepare_file_object($fil return $file; } +/** + * Return HTML for a link to a file. + */ function theme_inline_as_link($file) { - // prepare link text with title or filename + // Prepare link text with title or filename. $linktext = ($file->title ? $file->title : $file->filename); - + return l($linktext, file_create_url($file->filepath), array('title' => t('Download: @name (@size)', array('@name' => $file->filename, '@size' => format_size($file->filesize))))); } +/** + * Return HTML for an image. + */ function theme_inline_img($file, $field) { - $title = (!empty($file->title) ? $file->title : $file->filename); + // Prepare link text with inline title, file description or filename. + $title = !empty($file->description) ? $file->description : $file->filename; $inline_preset = $field == 'teaser' ? 'inline_teaser_preset' : 'inline_full_preset'; - + if (module_exists('imagecache') && variable_get($inline_preset, '') != '') { $image = theme('imagecache', variable_get($inline_preset, ''), $file->filepath, $title, $title, - array('class' => 'inline') + array('class' => 'inline '. $file->title) ); } else { @@ -263,39 +337,62 @@ function theme_inline_img($file, $field) $file->filepath, $title, $title, - array('class' => 'inline') + array('class' => 'inline '. $file->title) ); } - + if (variable_get('inline_link_img', '1')) { $attributes = array( - 'class' => 'inline-image-link', + 'class' => 'thickbox '. $file->title, 'title' => t("View") .': '. $title, + 'html' => TRUE, ); - $html = l($image, $file->filepath, $attributes, NULL, NULL, FALSE, TRUE); + $html = l($image, $file->filepath, $attributes); } else { $html = $image; } - + return $html; } +/** + * Insert an image in front of node teaser. + * + * @param object $node + * The node object to process. + * @param object $file + * A file object of an image to insert. + * @param string $field + * The field name to prepend with the image. + */ function theme_inline_add_to_teaser($node, $file, $field) { return theme('inline_img', $file, $field) . $node->teaser; } +/** + * Insert an image in front of node body. + * + * @param object $node + * The node object to process. + * @param object $file + * A file object of an image to insert. + * @param string $field + * The field name to prepend with the image. + */ function theme_inline_add_to_body($node, $file, $field) { return theme('inline_img', $file, $field) . $node->body; } +/** + * Automatically add all images to configured node views. + * + * This feature can be configured per content-type. + */ function _inline_auto_add($node) { - //0 Disabled - //1 Only in teaser - //2 Only in body - //3 In teaser and body switch (variable_get('upload_inline_'. $node->type, 0)) { case 1: + // Display only in teaser. foreach ($node->files as $fid => $file) { $file = inline_prepare_file_object($file); if (_inline_decide_img_tag($file)) { @@ -307,8 +404,9 @@ function _inline_auto_add($node) { } } break; - + case 2: + // Display only in body. foreach ($node->files as $fid => $file) { $file = inline_prepare_file_object($file); if (_inline_decide_img_tag($file)) { @@ -320,8 +418,9 @@ function _inline_auto_add($node) { } } break; - + case 3: + // Display in teaser and body. foreach ($node->files as $fid => $file) { $file = inline_prepare_file_object($file); if (_inline_decide_img_tag($file)) { @@ -338,19 +437,30 @@ function _inline_auto_add($node) { return $node; } +/** + * Replace all Inline tags with their corresponding files or images. + * + * @param object $node + * The node to process. + * @param string $field + * The node field to process. + * + * @return string + * The processed content of the given node field. + */ function _inline_substitute_tags(&$node, $field) { if (preg_match_all("/\[(inline|file|attachment):([^=\\]]+)=?([^\\]]*)?\]/i", $node->$field, $match)) { + $s = $r = array(); foreach ($match[2] as $key => $value) { - // fetch file object + // Ensure that we deal with a file object. $file = inline_prepare_file_object(_inline_fileobj($node, $value)); - // deal file title - $title = $match[3][$key]; - if (!empty($title)) { - $file->title = $title; - } - $replace = ""; if ($file->fid != NULL) { - //decide if we should show a link or an img tag + // Set user defined file title if given. + $title = $match[3][$key]; + if (!empty($title)) { + $file->title = $title; + } + // Decide whether to show a link or an image tag. if (_inline_decide_img_tag($file)) { $replace = theme('inline_img', $file, $field); } @@ -359,23 +469,27 @@ function _inline_substitute_tags(&$node, } } else { - $replace = "NOT FOUND: $value"; + $replace = 'NOT FOUND: '. $value .''; } - $mtch[] = $match[0][$key]; - $repl[] = $replace; + $s[] = $match[0][$key]; + $r[] = $replace; } - return str_replace($mtch, $repl, $node->$field); + // Perform the replacements and return processed field. + return str_replace($s, $r, $node->$field); } return $node->$field; } /** - * Replaces numeric file references with their respective file names. + * Replaces numeric file references with their corresponding file names. * - * @param &$node The node object to process. - * @param $field Field of node to process. + * @param object $node + * The node object to process. + * @param string $field + * A field name of the node to process. * - * @return Processed $field of $node. + * @return + * The processed content of the given node field. */ function _inline_replace_numbers($node, $field) { $tag = '/\[(inline|file|attachment):(\d+?)(=.+?)?\]/i'; @@ -383,21 +497,21 @@ function _inline_replace_numbers($node, preg_match_all($tag, $node->$field, $matches, PREG_SET_ORDER); if (!empty($matches)) { foreach ($matches as $match) { - // Attachment array key is the file ID. + // The array key of the attachment is the file ID (fid). $filekeys = array_keys($node->files); - $key = $filekeys[$match[2] - 1]; - // If a corresponding file does exist, perform the replacement. // Because a user starts counting files from 1, we substract 1 here. + $key = $filekeys[$match[2] - 1]; + // If user entered a non-existent number, continue with next tag. if (!isset($node->files[$key])) { - // If user entered a non-existent number, continue with next tag. continue; } + // If a corresponding file does exist, perform the replacement. if (is_array($node->files[$key])) { - // Node form submit + // Node form submit is an array. $filename = $node->files[$key]['filename']; } else { - // Node form prepare + // Node form prepare is an object. $filename = $node->files[$key]->filename; } $node->$field = str_replace($match[0], '['. $match[1] .':'. $filename . $match[3] .']', $node->$field); @@ -407,11 +521,13 @@ function _inline_replace_numbers($node, } /** - * Decides if a tag (<img>) or a link to a file should be rendered + * Decide if an image tag (<IMG>) or a link to a file should be rendered. * - * @param $file a file object + * @param $file + * A file object. * - * @return TRUE in case an img tag should be generated + * @return + * TRUE in case an image tag should be generated. */ function _inline_decide_img_tag($file) { $inlined = array('jpg', 'jpeg', 'pjpeg', 'gif', 'png'); @@ -421,16 +537,16 @@ function _inline_decide_img_tag($file) { return TRUE; } else { - // read settings + // Read maximum dimension settings. list($maxwidth, $maxheight) = explode(',', variable_get('inline_img_dim', '150,150')); - + if ($file->preview) { list($width, $height) = getimagesize($file->real_path); } else { list($width, $height) = getimagesize($file->filepath); } - + if (($width && $height) && ($width <= $maxwidth && $height <= $maxheight)) { return TRUE; } diff -urp inline-5.x-1.1/po/da.po inline-6.x-1.1/po/da.po --- inline-5.x-1.1/po/da.po 2006-01-13 13:36:19.000000000 +0100 +++ inline-6.x-1.1/po/da.po 2008-07-13 21:40:43.000000000 +0200 @@ -1,12 +1,12 @@ # Danish translation of Drupal (inline.module) -# Copyright 2005 Morten Wulff +# Copyright 2005, 2007 Morten Wulff msgid "" msgstr "" -"Project-Id-Version: Danish translation of Drupal (inline.module) $Id: da.po,v 1.2 2006/01/13 12:36:19 wulff Exp $\n" +"Project-Id-Version: Danish translation of Drupal (inline.module) $Id: da.po,v 1.2.4.1 2007/09/22 13:11:31 wulff Exp $\n" "POT-Creation-Date: 2005-07-06 14:43+0200\n" -"PO-Revision-Date: 2006-01-13 13:36+0100\n" -"Last-Translator: Morten Wulff \n" -"Language-Team: Danish \n" +"PO-Revision-Date: 2007-09-22 15:10+0100\n" +"Last-Translator: Morten Wulff \n" +"Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -14,93 +14,184 @@ msgstr "" "X-Poedit-Language: Danish\n" "X-Poedit-Country: DENMARK\n" -msgid "

Sometimes a user may want to add an image or a file inside the body of a node. This can be done with special tags that are replaced by links to the corresponding uploaded file. If the file is an image, it will be displayed inline, otherwise a link to the file will be inserted. To enable this feature and learn the proper syntax, visit the filters configuration screen.

" -msgstr "

Af og til kan brugerne have brug for at tilføje billeder eller filer i et indholdselements tekst. Det kan gøres med specielle mærker, der erstattes med henvisninger til de vedhæftede filer. Hvis der henvises til et vedhæftet billede vises det direkte i teksten, henvises der til en fil indsættes en henvisning til filen. Aktiver denne egenskab og læs mere om syntaksen under inddataformater.

" - -msgid "Allows users to insert uploaded files inline. Requires upload.module to work" -msgstr "Gør det muligt at integrere overførte filer i indholdselementer. Kræver at upload.module er aktiveret." - -msgid "You may add links to files uploaded with this node using special tags" -msgstr "Du kan tilføje henvisninger til vedhæftede filer vha. specielle mærker" +#: inline.module:14 +#: inline.info:0 +msgid "Inline" +msgstr "Inline" + +#: inline.module:15 +msgid "Manage automatic and manual inclusion of attachments in the content of your posts." +msgstr "Håndter automatisk og manuel integration af vedhæftede filer i brødtekst." + +#: inline.module:38 +msgid "

Sometimes a user may want to add an image or a file inside the body of a node. This can be done with special tags that are replaced by links to the corresponding uploaded file. If the file is an image, it will be displayed inline, otherwise a link to the file will be inserted. To enable this feature and learn the proper syntax, visit the filters configuration screen.

" +msgstr "

Af og til kan brugerne have brug for at tilføje billeder eller filer til brødtekst. Det kan gøres med specielle mærker, der erstattes med henvisninger til de vedhæftede filer. Hvis der henvises til et vedhæftet billede vises det direkte i teksten, henvises der til en fil indsættes en henvisning til filen. Aktiver denne egenskab og læs mere om syntaksen under filtre.

" + +#: inline.module:41 +msgid "You may add links to files uploaded with this node using special tags" +msgstr "Du kan tilføje henvisninger til vedhæftede filer vha. specielle mærker" +#: inline.module:44 msgid "" "

You may link to files uploaded with the current node using special tags. The tags will be replaced by the corresponding files. Syntax: [inline:file_id]. Parameter: file_id represents the file uploaded with the node in which to link, assuming that the first uploaded file is labeled as 1 and so on.

\n" "

If the file is an image, it will be displayed inline, otherwise a link to the file will be inserted.

" msgstr "

Du kan tilføje henvisninger til vedhæftede filer vha. specielle mærker. Mærkerne erstattes med de tilsvarende filer. Syntaks: [inline:fil_id]. Parameter: fil_id er filens nummer på listen af vedhæftede filer. Den første fil har nummer 1.

Hvis filen er et billede vil billedet blive integeret i teksten, ellers indsættes en henvisning til filen.

" -msgid "Maximum width and height for the displayed inline images (format: XXX,YYY)" -msgstr "Maksimal bredde og højde af integrerede billeder (format: xxx,yyy)" - -msgid "This setting will affect the dimensions of displayed images. They will not be resized." -msgstr "Denne indstilling påvirker størrelsen af de viste billeder. Billederne bliver ikke ændret." - -# d:\cantincorov2\modules\inline\inline.module:20 -msgid "Print link to images" -msgstr "Udskriv henvising til billeder" - -# d:\cantincorov2\modules\inline\inline.module:20 -msgid "Print only <img> tag" -msgstr "Udskriv kun <img> mærke" +#: inline.module:66 +msgid "Inline filter is not yet enabled for at least one input format." +msgstr "Inline-filtret skal aktiveres for mindst ét inddataformat." + +#: inline.module:71 +msgid "Image output" +msgstr "Billedvisning" + +#: inline.module:73 +msgid "Note: Images are only processed, if a tag is referencing them. However, there is a auto-inline feature to inline all uploaded images automatically. Auto-inline can be enabled for certain content types." +msgstr "Bemærk: Billeder behandles kun hvis et mærke henviser til dem. Der findes et funktion, der automatisk integrerer billeder. Automatisk integration kan slås til for de enkelte indholdstyper." # d:\cantincorov2\modules\inline\inline.module:20 -msgid "Print <img> tag and the link to the image" -msgstr "Udskriv <img> mærke og henvisningen til billedet" +#: inline.module:77 +msgid "Link to images" +msgstr "Link til billeder" + +#: inline.module:80 +msgid "Display image only" +msgstr "Vis kun billede" + +#: inline.module:81 +msgid "Display image with a link to the image file" +msgstr "Vis billedet med et link til billedfilen" + +#: inline.module:87 +msgid "Image dimensions and scaling" +msgstr "Billedstørrelser og skalering" + +#: inline.module:89 +msgid "Select the Imagecache presets to use for inlined images." +msgstr "Vælg hvilke Imagecache indstillinger du ønsker at bruge til integrerede billeder." + +#: inline.module:89 +msgid "Note: If Imagecache module is installed, Inline provides support for image scaling." +msgstr "Bemærk: Hvis Imagecache-modulet er aktiveret, understøtter Inline skalering af billeder." + +#: inline.module:102 +msgid "Teaser preset" +msgstr "Standard for smagsprøve" + +#: inline.module:103 +msgid "Select the Imagecache preset to use for inlined images in teaser view." +msgstr "Vælg Imagecache-indstillingen der skal bruges for billeder i smagsprøver." + +#: inline.module:109 +msgid "Full preset" +msgstr "Standard for fuld visning" + +#: inline.module:110 +msgid "Select the Imagecache preset to use for inlined images in full view." +msgstr "Vælg Imagecache-indstillingen der skal bruges for billeder i fuld visning." + +#: inline.module:119 +msgid "Maximum width and height for inline images (format: XXX,YYY)" +msgstr "Maksimal bredde og højde af integrerede billeder (format: XXX,YYY)" + +#: inline.module:124 +msgid "This setting limits the dimensions of displayed images in pixels. They will not be resized. Images exceeding these dimensions are automatically not displayed." +msgstr "Denne indstilling påvirker størrelsen af de viste billeder. Billederne bliver ikke ændret. Billeder, der overskrider dimensionerne, bliver ikke vist." + +#: inline.module:141 +msgid "Display attachments inline automatically" +msgstr "Integrer vedhæftede filer automatisk" + +#: inline.module:144 +msgid "Disabled" +msgstr "Deaktiveret" + +#: inline.module:145 +msgid "Only in teaser view" +msgstr "Kun i smagsprøve" + +#: inline.module:146 +msgid "Only in body view" +msgstr "Kun i fuld visning" + +#: inline.module:147 +msgid "In teaser and body view" +msgstr "I smagsprøve og fuld visning" + +#: inline.module:148 +msgid "Choose whether uploaded images should be shown inline automatically. Make sure you set the dimensions at !settings_url" +msgstr "Vælg om vedhæftede billeder automatisk skal integreres i indholdet. Husk at indstille dimensionerne på !settings_url" + +#: inline.module:148 +msgid "inline settings" +msgstr "indstillinger" +#: inline.module:163 msgid "Inline file filter" msgstr "Inline filter" +#: inline.module:168 msgid "Substitutes [inline:xx] tags with the xxth file uploaded with the node." msgstr "Erstatter [inline:xx] mærker med den xx'te fil hæftet til indholdselementet." +#: inline.module:183 msgid "" "\n" -"

You may link to files uploaded with the current node using special tags. The tags will be replaced by the corresponding files. For example:\n" -"\n" -" Suppose you uploaded three files (in this order):\n" -"

    \n" -"
  • imag1.png (referred as file #1)\n" -"
  • file1.pdf (referred as file #2)\n" -"
  • imag2.png (referred as file #3)\n" -"
\n" -" \n" -" 
[inline:1=test]  or  [inline:imag1.png=test]
\n" -"\n" -" will be replaced by <img src=imag1.png alt=test>\n" +" \n" +"

You may link to files uploaded with the current node using special tags. The tags will be replaced by the corresponding files. For example:\n" "\n" +" Suppose you uploaded three files (in this order):\n" +"

    \n" +"
  • imag1.png (referred as file #1)\n" +"
  • file1.pdf (referred as file #2)\n" +"
  • imag2.png (referred as file #3)\n" +"
\n" "\n" -" 
[file:1=test]  or  [file:imag1.png=test]
\n" +" 
[inline:1=test]  or  [inline:imag1.png=test]
\n" +" will be replaced by <img src=imag1.png alt=test>\n" "\n" -" will be replaced by <a href=imag1.png>test</a>\n" +" 
[file:1=test]  or  [file:imag1.png=test]
\n" +" will be replaced by <a href=imag1.png>test</a>\n" "\n" -"\n" -" 
[attachment:2=test]  or  [attachment:file1.pdf=test]
\n" -"\n" -" will be replaced by <a href=file1.pdf.png>test</a>\n" -" \n" -" " +" 
[attachment:2=test]  or  [attachment:file1.pdf=test]
\n" +" will be replaced by <a href=file1.pdf.png>test</a>" msgstr "" "\n" -"

You may link to files uploaded with the current node using special tags. The tags will be replaced by the corresponding files. For eksempel: Hvis du vedhæfter tre filer (i denne rækkefølge):

    \n" +"

    Du kan linke til vedhæftede filer vha. specielle mærker. Mærkerne erstattes med de relevante filer. For eksempel: Hvis du vedhæfter tre filer (i denne rækkefølge):

      \n" "
    • billede1.png (fil #1)\n" "
    • fil1.pdf (fil #2)\n" "
    • billede2.png (file #3)\n" "
    \n" "

    vil

    [inline:1=test]  eller  [inline:billede1.png=test]
    \n" "

    blive erstattet med

    <img src=imag1.png alt=test>

    og

    [file:1=test]  eller  [file:billede1.png=test]
    \n" -"

    vil blive erstattet med

    <a href=imag1.png>test</a>

    [attachment:2=test]  eller  [attachment:file1.pdf=test]

    vil blive erstattet med

    <a href=file1.pdf.png>test</a>

    \n" -" " +"

    vil blive erstattet med

    <a href=imag1.png>test</a>

    [attachment:2=test]  eller  [attachment:file1.pdf=test]

    vil blive erstattet med

    <a href=file1.pdf.png>test</a>

    " -msgid "You may use [inline:xx] tags to display uploaded files or images inline." -msgstr "Du kan bruge [inline:xx] mærker til at vise filer eller billeder integreret i indholdet." +#: inline.module:204 +msgid "You may use [inline:xx] tags to display uploaded files or images inline." +msgstr "Du kan bruge [inline:xx] mærker til at vise filer eller billeder integreret i indholdet." + +#: inline.module:300 +msgid "Download: @name (@size)" +msgstr "Download: @name (@size)" # d:\cantincorov2\modules\inline\inline.module:130 +#: inline.module:332 msgid "View" msgstr "Vis" -# d:\cantincorov2\modules\inline\inline.module:142;145 -msgid "Download" -msgstr "Hent" +#: inline.module:28 +msgid "administer inline settings" +msgstr "administrer inline indstillinger" +#: inline.module:0 msgid "inline" msgstr "inline" +#: inline.info:0 +msgid "Allows attached files to be placed into the body of a node either automatically or by using simple tags." +msgstr "Vedhæftede filer kan indsættes i brødteksten; enten automatisk eller ved at bruge simple mærker." + +#: inline.info:0 +msgid "Input filters" +msgstr "Input filtre" + diff -urp inline-5.x-1.1/README.txt inline-6.x-1.1/README.txt --- inline-5.x-1.1/README.txt 2005-11-21 03:09:53.000000000 +0100 +++ inline-6.x-1.1/README.txt 2008-07-13 21:40:40.000000000 +0200 @@ -1,102 +1,122 @@ -******************************************************************** - D R U P A L M O D U L E -******************************************************************** -Name: Inline module -Author: Matteo Ferrari -Dependencies: upload.module must be enabled. +/* $Id: README.txt,v 1.6.4.1 2007/11/18 21:04:45 sun Exp $ */ -******************************************************************** -DESCRIPTION: +-- SUMMARY -- -The inline.module allows you to display inline the files uploaded -with the current node, with a link to the original image. -You may link to files uploaded with the current node using special -tags. The tags will be replaced by the corresponding files. -The inline module does not attempt to resize an image; it assumes -that you (or the user) will optimize the size and resolution of your -image prior to uploading it to your Drupal; however, a setting of -this module sets the maximum display width and height for images. -If the original image is not bigger that max width and height, it -will be displayed as-is, otherwise its dimensions will be -recalculated, maintaining the same aspect ratio. +Inline module allows you to display files uploaded with the current node +inline, i.e. with a link to the original file, using special tags. The tags +will be replaced with links to the corresponding files. If a tag refers to an +image, it will be replaced with the image. -******************************************************************** -SYSTEM REQUIREMENTS +Inline module does not attempt to resize a images. It assumes that the user +will optimize the size and resolution of images prior to uploading it. A +configuration setting of this module allows to specify the maximum display +width and height for inline images. If the original image is not bigger than +the maximum width and height, it will be displayed as-is, otherwise its +dimensions will be recalculated, maintaining the same aspect ratio. -Drupal 4.5.0 or greater -PHP 4.3.0 or greater -Upload.module installed +For a full description visit the project page: + http://drupal.org/project/inline +Bug reports, feature suggestions and latest developments: + http://drupal.org/project/inline/issues -******************************************************************** -INSTALLATION: -Please refer to the INSTALL.txt file for installation directions. +-- REQUIREMENTS -- -For more details on using the module, see the help text by clicking: -/filter/tips/1#filter-inline after you install it. +* Upload module (Drupal core) -******************************************************************** -USAGE: -[file|attachment|inline:file#=title] +-- INSTALLATION -- -or +* Copy inline module to your modules directory and enable it on the admin + modules page. -[file|attachment|inline:filename=title] +-- CONFIGURATION -- -You can specify the file you want to display in two ways: -- specifying file#, which will display the #th uploaded file -- specifying filename -If the file is not found, a 'NOT FOUND' message will be printed. +* Enable 'Inline filter' in the input formats you intend to use. To do this, go + to the "administer > input formats" page (admin/filter) and then click on one + of the "configure" links. For instance, you can click on the "Configure" link + for "Filtered HTML" and then you will see a list of filters including "inline + file filter". Turn that on and click on "Save Configuration". -Specifying the file by number can cause problems if files are -deleted or changed. In this case, specifying by name is recommended. +* In admin/settings/inline you may set the maximum width and height for + displayed images, in the form width,height. Inline module will resize + logically the images by adding the proper width and height in tags, but + the image will not be physically resized. If the original image is not bigger + than max width and height, it will be displayed as-is, otherwise its + dimensions will be recalculated, maintaining the same aspect ratio. +* Add to the CSS stylesheet you're using in your theme (usually style.css) the + following lines which you can tune to your needs. This style will be used by + the module to print our images. -When dealing with files, no matter if you specify 'inline', 'file', -or 'attachment' syntax, inline prints out a link to the file. + .inline { + float: left; + display: inline; + margin: 0 1em 1em 0; + padding: 4px 4px; + } -When dealing with images, they will be shown inline only if you use -'inline' syntax; any other syntax will print a text link to the file. +* A .po file is available in order to translate the module in your language. + You can import it into your Drupal site using Locale module. -You can also specify a title for the file, by using an optional -'=Title' parameter; in this case, it will be used as a title for the -file link or as an ALT tag for an image. -If no title is specified the file name is used as the title. +-- USAGE -- -********* -EXAMPLES: +* For more details on using the module, see the help text by clicking: + /filter/tips/1#filter-inline after you install it. -Suppose you uploaded three files (in this order): -- imag1.png (referred as file #1) -- file1.pdf (referred as file #2) -- imag2.png (referred as file #3) + [inline:#=title] + or + [inline:filename=title] -[inline:1=test] or [inline:imag1.png=test] -will be replaced by test + You can specify the file you want to display in two ways: + - specifying #, which will display the #th uploaded file + - specifying filename -[file:1=test] or [file:imag1.png=test] -will be replaced by test + If the file is not found, a 'NOT FOUND' message will be output. -[attachment:2=test] or [attachment:file1.pdf=test] -will be replaced by test + Specifying the file by number can cause problems if files are deleted or + changed. In this case, specifying by name is recommended. -******************************************************************** -CREDITS: + You can also specify a title for the file, by using an optional '=Title' + parameter. In this case, it will be used as a title for the file link or as + an ALT tag for an image. If no title is specified, the file name is used as + title. - - Basic ideas taken from upload_image.module by Ber Kessels - - Many thanks to wazdog for enhancing the module and making it more usable - - Thanks to Rick Cowan for helping in the explanation of the module - - Thanks to 'inducer@news.tiker.net' for adding new functionalities and better - error control -See CHANGELOG.txt for recent credits. +-- EXAMPLES -- -******************************************************************** -BUGS AND SUGGESTIONS +* Suppose you uploaded three files (in this order): + - imag1.png (referred as file #1) + - file1.pdf (referred as file #2) + - imag2.png (referred as file #3) -Please report all bug reports and post suggestions at: -http://drupal.org/project/issues/inline +* [inline:2] or + [inline:file1.pdf] + will be replaced with file1.pdf + +* [inline:1=test] or + [inline:imag1.png=test] + will be replaced with test + +* [file:1=test] or + [file:imag1.png=test] + will be replaced with test + + +-- CONTACT -- + +Current maintainers: +* Daniel F. Kudwien (sun) - dev@unleashedmind.com + +Previous maintainers: +* Richard Archer (Richard Archer) - http://www.juggernaut.com.au +* Matteo Ferrari (matteo) - webmaster@cantincoro.org + +This project has been sponsored by: +* UNLEASHED MIND + Specialized in consulting and planning of Drupal powered sites, UNLEASHED + MIND offers installation, development, theming, customization, and hosting + to get you started. Visit http://www.unleashedmind.com for more information.