4 files changed, 6 insertions, 22 deletions
diff --git a/themes/default/css/fix-ie.css b/themes/default/css/fix-ie.css
index 0b37acd2..3d9604e6 100644
--- a/themes/default/css/fix-ie.css
+++ b/themes/default/css/fix-ie.css
@@ -10,7 +10,7 @@
   zoom: 1;
 }
 
-#gHeader #gLogo {
+#gHeader #gLogo img {
   margin-top: 5px;
   margin-bottom: 0;
 }
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index e37de70e..48ded542 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -422,7 +422,7 @@ form .gError,
 
 /* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gHeader #gLogo {
+#gHeader #gLogo img {
   float: left;
   margin: -4px 10px 0 0;
 }
@@ -1046,7 +1046,7 @@ form .gError,
 .rtl input[type="submit"],
 .rtl input[type="reset"],
 .rtl .gShortForm li,
-.rtl #gHeader #gLogo,
+.rtl #gHeader #gLogo img,
 .rtl #gContent #gAlbumGrid .gItem,
 .rtl #gSiteMenu,
 .rtl .gBreadcrumbs li,
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index b38cffed..51f55b41 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -3,8 +3,8 @@
 <? if ($header_text = module::get_var("gallery", "header_text")): ?>
 <?= $header_text ?>
 <? else: ?>
-<a href="<?= url::site("albums/1") ?>">
-  <img width="107" height="48" id="gLogo" alt="<?= t("Gallery: Your photos on your web site") ?>" src="<?= $theme->theme_url("images/logo.png") ?>" />
+<a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home") ?>">
+  <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->theme_url("images/logo.png") ?>" />
 </a>
 <? endif ?>
 
diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index 134e3571..c2fb0e30 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -12,23 +12,7 @@
     <? endif ?>
   </ul>
 
-  <a id="gMovieId-<?= $item->id ?>"
-     href="<?= $item->file_url(true) ?>"
-     style="display: block; width: <?= $item->width ?>px; height: <?= $item->height ?>px">
-  </a>
-  <script>
-    flowplayer("gMovieId-<?= $item->id ?>", "<?= url::abs_file("lib/flowplayer.swf") ?>", {
-      plugins: {
-        h264streaming: {
-          url: "<?= url::abs_file("lib/flowplayer.h264streaming.swf") ?>"
-        },
-        controls: {
-          autoHide: 'always',
-          hideDelay: 2000
-        }
-      }
-    })
-  </script>
+  <?= $item->movie_img(array("class" => "gMovie", "id" => "gMovieId-{$item->id}")) ?>
 
   <div id="gInfo">
     <h1><?= p::clean($item->title) ?></h1>