diff options
| author | shadlaws <shad@shadlaws.com> | 2013-02-14 23:42:20 +0100 |
|---|---|---|
| committer | shadlaws <shad@shadlaws.com> | 2013-02-14 23:42:20 +0100 |
| commit | f212f6a794c4aff96446b99e4824a9e2c8cfb259 (patch) | |
| tree | 977380e90394bc7da2e93e2b116e2cf9b985e62f /modules/gallery/views/form_uploadify.html.php | |
| parent | 21acbbf549f3167d14c89270683ef06746552d75 (diff) | |
#2003 - Add admin/movies screen.
Added admin/movies screen analogous to the admin/graphics screen so the user can:
- see how FFmpeg is configured (path and version, similar to toolkits in admin/graphics)
- get some instructions on how to install FFmpeg if not found
- change the movie_allow_uploads setting
- ask Gallery to rebuild their movie thumbs
Specifics:
- admin_movies, admin_movies.html (new) - new Movies admin screen
- ffmpeg.png (new) - logo for admin screen
- movie::get_ffmpeg_version (new) - return version number and date of FFmpeg
- form_uploadify.html - change admin message if movie uploads are disabled
- gallery_event::admin_menu - added Movies link to Settings
- xss_data.txt - updated golden file for unit tests
Diffstat (limited to 'modules/gallery/views/form_uploadify.html.php')
| -rw-r--r-- | modules/gallery/views/form_uploadify.html.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php index 4426514a..c13e3418 100644 --- a/modules/gallery/views/form_uploadify.html.php +++ b/modules/gallery/views/form_uploadify.html.php @@ -131,7 +131,7 @@ <? if (identity::active_user()->admin && !$movies_allowed): ?> <p class="g-warning"> - <?= t("Can't find <i>ffmpeg</i> on your system. Movie uploading disabled. <a href=\"%help_url\">Help!</a>", array("help_url" => "http://codex.galleryproject.org/Gallery3:FAQ#Why_does_it_say_I.27m_missing_ffmpeg.3F")) ?> + <?= t("Movie uploading is disabled on your system. <a href=\"%help_url\">Help!</a>", array("help_url" => url::site("admin/movies"))) ?> </p> <? endif ?> </div> |