summaryrefslogtreecommitdiff
path: root/modules/gallery/views
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gallery/views')
-rw-r--r--modules/gallery/views/admin_advanced_settings.html.php4
-rw-r--r--modules/gallery/views/admin_dashboard.html.php7
-rw-r--r--modules/gallery/views/admin_modules.html.php6
-rw-r--r--modules/gallery/views/admin_movies.html.php44
-rw-r--r--modules/gallery/views/form_uploadify.html.php2
-rw-r--r--modules/gallery/views/in_place_edit.html.php2
-rw-r--r--modules/gallery/views/menu_ajax_link.html.php2
-rw-r--r--modules/gallery/views/movieplayer.html.php58
-rw-r--r--modules/gallery/views/upgrader.html.php11
9 files changed, 85 insertions, 51 deletions
diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index 6745f0df..f4f0c81d 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -39,8 +39,8 @@
<script>
$(document).ready(function() {
- $("#g-admin-advanced-settings-filter").keyup(function() {
- var filter = $(this).attr("value");
+ $("#g-admin-advanced-settings-filter").on("input keyup", function() {
+ var filter = $(this).val();
if (filter) {
$("tr.setting-row").fadeOut("fast");
$("tr.setting-row").each(function() {
diff --git a/modules/gallery/views/admin_dashboard.html.php b/modules/gallery/views/admin_dashboard.html.php
index f391547e..cf90ef28 100644
--- a/modules/gallery/views/admin_dashboard.html.php
+++ b/modules/gallery/views/admin_dashboard.html.php
@@ -31,6 +31,13 @@
});
});
</script>
+<div>
+ <? if ($obsolete_modules_message): ?>
+ <p class="g-warning">
+ <?= $obsolete_modules_message ?>
+ </p>
+ <? endif ?>
+</div>
<div id="g-admin-dashboard">
<?= $blocks ?>
</div>
diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
index 5a7f7b6c..96576ae4 100644
--- a/modules/gallery/views/admin_modules.html.php
+++ b/modules/gallery/views/admin_modules.html.php
@@ -46,6 +46,12 @@
<?= t("Power up your Gallery by <a href=\"%url\">adding more modules</a>! Each module provides new cool features.", array("url" => "http://codex.galleryproject.org/Category:Gallery_3:Modules")) ?>
</p>
+ <? if ($obsolete_modules_message): ?>
+ <p class="g-warning">
+ <?= $obsolete_modules_message ?>
+ </p>
+ <? endif ?>
+
<div class="g-block-content">
<form id="g-module-update-form" method="post" action="<?= url::site("admin/modules/confirm") ?>">
<?= access::csrf_form_field() ?>
diff --git a/modules/gallery/views/admin_movies.html.php b/modules/gallery/views/admin_movies.html.php
new file mode 100644
index 00000000..abf8fb29
--- /dev/null
+++ b/modules/gallery/views/admin_movies.html.php
@@ -0,0 +1,44 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div id="g-movies-admin" class="g-block ui-helper-clearfix">
+ <h1> <?= t("Movies settings") ?> </h1>
+ <p>
+ <?= t("Gallery comes with everything it needs to upload and play movies.") ?>
+ <?= t("However, it needs the FFmpeg toolkit to extract thumbnails and size information from them.") ?>
+ </p>
+ <p>
+ <?= t("Although popular, FFmpeg is not installed on all Linux systems.") ?>
+ <?= t("To use FFmpeg without fully installing it, download a pre-compiled, <b>static build</b> of FFmpeg from one of the links <a href=\"%url\">here</a>.", array("url" => "http://ffmpeg.org/download.html")) ?>
+ <?= t("Then, put the \"ffmpeg\" file in Gallery's \"bin\" directory (e.g. \"/gallery3/bin\"), where Gallery will auto-detect it.") ?>
+ </p>
+ <p>
+ <?= t("Movies will work without FFmpeg, but their thumbnails will be placeholders.") ?>
+ </p>
+ <p>
+ <?= t("Can't get FFmpeg configured on your system? <a href=\"%url\">We can help!</a>",
+ array("url" => "http://codex.galleryproject.org/Gallery3:FAQ#Why_does_it_say_I.27m_missing_ffmpeg.3F")) ?>
+ </p>
+
+ <div class="g-available">
+ <h2> <?= t("Current configuration") ?> </h2>
+ <div id="g-ffmpeg" class="g-block">
+ <img class="logo" width="284" height="70" src="<?= url::file("modules/gallery/images/ffmpeg.png") ?>" alt="<? t("Visit the FFmpeg project site") ?>" />
+ <p>
+ <?= t("FFmpeg is a cross-platform standalone audio/video program.") ?><br/>
+ <?= t("Please refer to the <a href=\"%url\">FFmpeg website</a> for more information.", array("url" => "http://ffmpeg.org")) ?>
+ </p>
+ <div class="g-module-status g-info">
+ <? if ($ffmpeg_dir): ?>
+ <? if ($ffmpeg_version): ?>
+ <p><?= t("FFmpeg version %version was found in %dir", array("version" => $ffmpeg_version, "dir" => $ffmpeg_dir)) ?></p>
+ <? else: ?>
+ <p><?= t("FFmpeg (of unknown version) was found in %dir", array("dir" => $ffmpeg_dir)) ?></p>
+ <? endif ?>
+ <? else: ?>
+ <p><?= t("We could not locate FFmpeg on your system.") ?></p>
+ <? endif ?>
+ </div>
+ </div>
+ </div>
+
+ <?= $form ?>
+</div>
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>
diff --git a/modules/gallery/views/in_place_edit.html.php b/modules/gallery/views/in_place_edit.html.php
index 2d6cbe90..c2515a03 100644
--- a/modules/gallery/views/in_place_edit.html.php
+++ b/modules/gallery/views/in_place_edit.html.php
@@ -8,7 +8,7 @@
<li>
<?= form::submit(array("class" => "submit ui-state-default"), t("Save")) ?>
</li>
- <li><a href="#" class="g-cancel"><?= t("Cancel") ?></a></li>
+ <li><button class="g-cancel ui-state-default ui-corner-all"><?= t("Cancel") ?></button></li>
<? if (!empty($errors["input"])): ?>
<li>
<p id="g-in-place-edit-message" class="g-error"><?= $errors["input"] ?></p>
diff --git a/modules/gallery/views/menu_ajax_link.html.php b/modules/gallery/views/menu_ajax_link.html.php
index 06cd6f92..66df84c9 100644
--- a/modules/gallery/views/menu_ajax_link.html.php
+++ b/modules/gallery/views/menu_ajax_link.html.php
@@ -4,7 +4,7 @@
class="g-ajax-link <?= $menu->css_class ?>"
href="<?= $menu->url ?>"
title="<?= $menu->label->for_html_attr() ?>"
- ajax_handler="<?= $menu->ajax_handler ?>">
+ data-ajax-handler="<?= $menu->ajax_handler ?>">
<?= $menu->label->for_html() ?>
</a>
</li>
diff --git a/modules/gallery/views/movieplayer.html.php b/modules/gallery/views/movieplayer.html.php
index edb5184c..f78cc91a 100644
--- a/modules/gallery/views/movieplayer.html.php
+++ b/modules/gallery/views/movieplayer.html.php
@@ -1,49 +1,17 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= html::anchor($url, "", $attrs) ?>
+<div <?= html::attributes($div_attrs) ?>>
+ <video <?= html::attributes($video_attrs) ?>>
+ <source <?= html::attributes($source_attrs) ?>>
+ </video>
+</div>
<script type="text/javascript">
- var id = "<?= $attrs["id"] ?>";
- var max_size = <?= $max_size ?>;
- // set the size of the movie html anchor, taking into account max_size and height of control bar
- function set_movie_size(width, height) {
- if((width > max_size) || (height > max_size)) {
- if (width > height) {
- height = Math.ceil(height * max_size / width);
- width = max_size;
- } else {
- width = Math.ceil(width * max_size / height);
- height = max_size;
- }
- }
- height += flowplayer(id).getConfig().plugins.controls.height;
- $("#" + id).css({width: width, height: height});
- };
- // setup flowplayer
- flowplayer(id,
+ $("#<?= $div_attrs["id"] ?> video").mediaelementplayer(
$.extend(true, {
- "src": "<?= url::abs_file("lib/flowplayer.swf") ?>",
- "wmode": "transparent",
- "provider": "pseudostreaming"
- }, <?= json_encode($fp_params) ?>),
- $.extend(true, {
- "plugins": {
- "pseudostreaming": {
- "url": "<?= url::abs_file("lib/flowplayer.pseudostreaming-byterange.swf") ?>"
- },
- "controls": {
- "autoHide": "always",
- "hideDelay": 2000,
- "height": 24
- }
- },
- "clip": {
- "scaling": "fit",
- "onMetaData": function(clip) {
- // set movie size a second time using actual size from metadata
- set_movie_size(parseInt(clip.metaData.width), parseInt(clip.metaData.height));
- }
- }
- }, <?= json_encode($fp_config) ?>)
- ).ipad();
- // set movie size using width and height passed from movie_img function
- $("document").ready(set_movie_size(<?= $width ?>, <?= $height ?>));
+ defaultVideoWidth: <?= $width ?>,
+ defaultVideoHeight: <?= $height ?>,
+ startVolume: 1.0,
+ features: ["playpause", "progress", "current", "duration", "volume", "fullscreen"],
+ pluginPath: "<?= url::abs_file("lib/mediaelementjs/") ?>"
+ }, <?= json_encode($player_options) ?>)
+ );
</script>
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index edfaf720..2e485c08 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -17,7 +17,7 @@
<a id="dialog_close_link" style="display: none" onclick="$('#dialog').fadeOut(); return false;" href="#" class="close">[x]</a>
<div id="busy" style="display: none">
<h1>
- <img width="16" height="16" src="<?= url::file("themes/wind/images/loading-small.gif") ?>"/>
+ <img width="16" height="16" src="<?= url::file("modules/gallery/images/loading-small.gif") ?>"/>
<?= t("Upgrade in progress!") ?>
</h1>
<p>
@@ -90,6 +90,15 @@
</div>
<? endif ?>
+ <? if ($obsolete_modules_message): ?>
+ <div id="obsolete_modules_message">
+ <p>
+ <span class="failed"><?= t("Warning!") ?></span>
+ <?= $obsolete_modules_message ?>
+ </p>
+ </div>
+ <? endif ?>
+
<table>
<tr class="<?= $done ? "muted" : "" ?>">
<th class="name"> <?= t("Module name") ?> </th>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 06:03:09 +0000