10 files changed, 12 insertions, 4 deletions
diff --git a/modules/gallery/controllers/admin_advanced_settings.php b/modules/gallery/controllers/admin_advanced_settings.php
index d9a281b5..6f4e9403 100644
--- a/modules/gallery/controllers/admin_advanced_settings.php
+++ b/modules/gallery/controllers/admin_advanced_settings.php
@@ -20,6 +20,7 @@
 class Admin_Advanced_Settings_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
+    $view->page_title = t("Advanced settings");
     $view->content = new View("admin_advanced_settings.html");
     $view->content->vars = ORM::factory("var")
       ->order_by("module_name")
diff --git a/modules/gallery/controllers/admin_dashboard.php b/modules/gallery/controllers/admin_dashboard.php
index adc0df16..76c42612 100644
--- a/modules/gallery/controllers/admin_dashboard.php
+++ b/modules/gallery/controllers/admin_dashboard.php
@@ -20,6 +20,7 @@
 class Admin_Dashboard_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
+    $view->page_title = t("Dashboard");
     $view->content = new View("admin_dashboard.html");
     $view->content->blocks = block_manager::get_html("dashboard_center");
     $view->sidebar = "<div id=\"g-admin-dashboard-sidebar\">" .
diff --git a/modules/gallery/controllers/admin_graphics.php b/modules/gallery/controllers/admin_graphics.php
index abbd8986..de98035d 100644
--- a/modules/gallery/controllers/admin_graphics.php
+++ b/modules/gallery/controllers/admin_graphics.php
@@ -20,6 +20,7 @@
 class Admin_Graphics_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
+    $view->page_title = t("Graphics settings");
     $view->content = new View("admin_graphics.html");
     $view->content->tk = graphics::detect_toolkits();
     $view->content->active = module::get_var("gallery", "graphics_toolkit", "none");
diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index 1ca777dc..0f134fcd 100644
--- a/modules/gallery/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
@@ -20,6 +20,7 @@
 class Admin_Languages_Controller extends Admin_Controller {
   public function index($share_translations_form=null) {
     $v = new Admin_View("admin.html");
+    $v->page_title = t("Languages and translations");
     $v->content = new View("admin_languages.html");
                 $v->content->available_locales = locales::available();
     $v->content->installed_locales = locales::installed();
diff --git a/modules/gallery/controllers/admin_modules.php b/modules/gallery/controllers/admin_modules.php
index 30e1ace5..bf638a37 100644
--- a/modules/gallery/controllers/admin_modules.php
+++ b/modules/gallery/controllers/admin_modules.php
@@ -20,6 +20,7 @@
 class Admin_Modules_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
+    $view->page_title = t("Modules");
     $view->content = new View("admin_modules.html");
     $view->content->available = module::available();
     print $view;
diff --git a/modules/gallery/controllers/admin_sidebar.php b/modules/gallery/controllers/admin_sidebar.php
index 73f84d2f..fb857e4e 100644
--- a/modules/gallery/controllers/admin_sidebar.php
+++ b/modules/gallery/controllers/admin_sidebar.php
@@ -20,6 +20,7 @@
 class Admin_Sidebar_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
+    $view->page_title = t("Manage sidebar");
     $view->content = new View("admin_sidebar.html");
     $view->content->csrf = access::csrf_token();
     $view->content->available = new View("admin_sidebar_blocks.html");
diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index cf4fb77a..15a42ee5 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -20,6 +20,7 @@
 class Admin_Theme_Options_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
+    $view->page_title = t("Theme options");
     $view->content = new View("admin_theme_options.html");
     $view->content->form = theme::get_edit_form_admin();
     print $view;
diff --git a/modules/gallery/controllers/admin_themes.php b/modules/gallery/controllers/admin_themes.php
index 327ea6c8..e59eadaf 100644
--- a/modules/gallery/controllers/admin_themes.php
+++ b/modules/gallery/controllers/admin_themes.php
@@ -20,6 +20,7 @@
 class Admin_Themes_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
+    $view->page_title = t("Theme choice");
     $view->content = new View("admin_themes.html");
     $view->content->admin = module::get_var("gallery", "active_admin_theme");
     $view->content->site = module::get_var("gallery", "active_site_theme");
diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index 8ab85a30..28d6fba7 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -295,7 +295,6 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
     } catch (ORM_Validation_Exception $e) {
       $this->assert_same(array("description" => "length",
                                "name" => "required",
-                               "slug" => "required",
                                "title" => "required",
                                "album_cover_item_id" => "invalid_item",
                                "parent_id" => "invalid",
diff --git a/modules/gallery/views/movieplayer.html.php b/modules/gallery/views/movieplayer.html.php
index f7af8d93..2e79b620 100644
--- a/modules/gallery/views/movieplayer.html.php
+++ b/modules/gallery/views/movieplayer.html.php
@@ -5,12 +5,13 @@
     "<?= $attrs["id"] ?>",
     {
       src: "<?= url::abs_file("lib/flowplayer.swf") ?>",
-      wmode: "transparent"
+      wmode: "transparent",
+      provider: "pseudostreaming"
     },
     {
       plugins: {
-        h264streaming: {
-          url: "<?= url::abs_file("lib/flowplayer.h264streaming.swf") ?>"
+        pseudostreaming: {
+          url: "<?= url::abs_file("lib/flowplayer.pseudostreaming.swf") ?>"
         },
         controls: {
           autoHide: 'always',