diff options
| -rw-r--r-- | modules/gallery/helpers/movie.php | 8 | ||||
| -rw-r--r-- | modules/gallery/js/l10n_client.js | 20 | ||||
| -rw-r--r-- | modules/gallery/libraries/MY_View.php | 2 | ||||
| -rw-r--r-- | modules/gallery/views/admin_advanced_settings.html.php | 4 | ||||
| -rw-r--r-- | themes/admin_default/views/admin.html.php | 2 | ||||
| -rw-r--r-- | themes/default/views/page.html.php | 2 |
6 files changed, 22 insertions, 16 deletions
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php index 3aa40dc9..986d5f62 100644 --- a/modules/gallery/helpers/movie.php +++ b/modules/gallery/helpers/movie.php @@ -142,10 +142,12 @@ class movie_Core { if (!$ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) { if (function_exists("exec")) { $ffmpeg_path = exec("which ffmpeg"); - if ($ffmpeg_path) { - module::set_var("gallery", "ffmpeg_path", $ffmpeg_path); - } } + + if (empty($ffmpeg) && @file_exists("/usr/local/bin/ffmpeg")) { + $ffmpeg_path = "/usr/local/bin/ffmpeg"; + } + module::set_var("gallery", "ffmpeg_path", $ffmpeg_path); } return $ffmpeg_path; } diff --git a/modules/gallery/js/l10n_client.js b/modules/gallery/js/l10n_client.js index efd956e2..89c4a57d 100644 --- a/modules/gallery/js/l10n_client.js +++ b/modules/gallery/js/l10n_client.js @@ -35,20 +35,20 @@ jQuery.extend(Gallery, { if(userSelection.length > 0) { Gallery.l10nClient.filter(userSelection); Gallery.l10nClient.toggle(1); - $('#l10n-client #gL10nSearch').focus(); + $('#l10n-client #gL10nSearch').focus(); } else { if($('#l10n-client').is('.hidden')) { Gallery.l10nClient.toggle(1); if(!$.browser.safari) { $('#l10n-client #gL10nSearch').focus(); } - } else { + } else { Gallery.l10nClient.toggle(0); } } break; case 'clear': - this.filter(false); + this.filter(false); break; } } @@ -61,7 +61,7 @@ jQuery.extend(Gallery, { $('#l10n-client .labels .toggle').text('X'); /* * This CSS clashes with Gallery's CSS, probably due to - * YUI's grid / floats. + * YUI's grid / floats. if(!$.browser.msie) { $('body').css('border-bottom', '22em solid #fff'); } @@ -79,7 +79,7 @@ jQuery.extend(Gallery, { } */ $.cookie('Gallery_l10n_client', '0', {expires: 7, path: '/'}); - break; + break; } } // Get a string from the DOM tree @@ -124,7 +124,7 @@ jQuery.extend(Gallery, { $('#l10n-edit-translation').removeClass('hidden'); } } - // Filter the the string list by a search string + // Filter the string list by a search string this.filter = function(search) { if(search == false || search == '') { $('#l10n-client #l10n-search-filter-clear').focus(); @@ -153,7 +153,7 @@ Gallery.behaviors.l10nClient = function(context) { Gallery.l10nClient.toggle(0); break; } - + // If the selection changes, copy string values to the source and target fields. // Add class to indicate selected string in list widget. $('#l10n-client-string-select li').click(function() { @@ -173,7 +173,7 @@ Gallery.behaviors.l10nClient = function(context) { $('#l10n-client .labels .toggle').click(function() { if($('#l10n-client').is('.hidden')) { Gallery.l10nClient.toggle(1); - } else { + } else { Gallery.l10nClient.toggle(0); } }); @@ -184,7 +184,7 @@ Gallery.behaviors.l10nClient = function(context) { $.hotkeys.add(Gallery.l10nClient.keys['toggle'], function(){Gallery.l10nClient.key('toggle')}); $.hotkeys.add(Gallery.l10nClient.keys['clear'], {target:'#l10n-client #gL10nSearch', type:'keyup'}, function(){Gallery.l10nClient.key('clear')}); } - + // Custom listener for l10n_client livesearch $('#l10n-client #gL10nSearch').keyup(function(key) { Gallery.l10nClient.filter($('#l10n-client #gL10nSearch').val()); @@ -222,7 +222,7 @@ Gallery.behaviors.l10nClient = function(context) { // Clear the translation form fields Gallery.l10nClient.showSourceMessage('', false); $('#gL10nClientSaveForm #l10n-edit-translation').val(''); - + for (var i = 0; i < num_plural_forms; i++) { var form = plural_forms[i]; $('#gL10nClientSaveForm #l10n-edit-plural-translation-' + form).val(''); diff --git a/modules/gallery/libraries/MY_View.php b/modules/gallery/libraries/MY_View.php index bd2794a0..96dcc71b 100644 --- a/modules/gallery/libraries/MY_View.php +++ b/modules/gallery/libraries/MY_View.php @@ -44,7 +44,7 @@ class View extends View_Core { } } - public function main_element_attributes() { + public function body_attributes() { if (locale::is_rtl()) { return 'class="rtl"'; } diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php index 77aff050..34abadea 100644 --- a/modules/gallery/views/admin_advanced_settings.html.php +++ b/modules/gallery/views/admin_advanced_settings.html.php @@ -25,7 +25,11 @@ <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . p::clean($var->name)) ?>" class="gDialogLink" title="<?= t("Edit %var (%module_name)", array("var" => p::clean($var->name), "module_name" => $var->module_name)) ?>"> + <? if ($var->value): ?> <?= p::clean($var->value) ?> + <? else: ?> + <i> <?= t("empty") ?> </i> + <? endif ?> </a> </td> </tr> diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php index 721c4dd5..b7cfaa40 100644 --- a/themes/admin_default/views/admin.html.php +++ b/themes/admin_default/views/admin.html.php @@ -31,7 +31,7 @@ <?= $theme->admin_head() ?> </head> - <body <?= $theme->main_element_attributes() ?>> + <body <?= $theme->body_attributes() ?>> <?= $theme->admin_page_top() ?> <? if ($sidebar): ?> <div id="doc3" class="yui-t5 gView"> diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php index 6c77fb72..0c84129f 100644 --- a/themes/default/views/page.html.php +++ b/themes/default/views/page.html.php @@ -54,7 +54,7 @@ <?= $theme->head() ?> </head> - <body <?= $theme->main_element_attributes() ?>> + <body <?= $theme->body_attributes() ?>> <?= $theme->page_top() ?> <div id="doc4" class="yui-t5 gView"> <?= $theme->site_status() ?> |