Make header buttons, line them up nicely and float them to the right

so that they don't push the album grid down.

3 files changed, 15 insertions, 7 deletions

diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index ea887225..e73c253d 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -1,8 +1,10 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
 <div id="gAlbumHeader">
+  <div id="gAlbumHeaderButtons">
+    <?= $theme->album_top() ?>
+  </div>
   <h1><?= $item->title_edit ?></h1>
   <span class="gUnderState"><?= $item->description_edit ?></span>
-  <?= $theme->album_top() ?>
 </div>
 
 <ul id="gAlbumGrid">
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 1229bc00..6ac30d86 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -1,10 +1,14 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
-<div id="gItem">
-  <a href="" class="gButtonLink">
-    <?= sprintf(_("Full size (%dx%d)"), $item->width, $item->height) ?>
-  </a>
-  <?= $theme->photo_top() ?>
+<div id="gItemHeader">
+  <div id="gItemHeaderButtons">
+    <a href="" class="gButtonLink">
+      <?= sprintf(_("Full size (%dx%d)"), $item->width, $item->height) ?>
+    </a>
+    <?= $theme->photo_top() ?>
+  </div>
+</div>
 
+<div id="gItem">
   <img id="gPhotoID-<?= $item->id ?>" alt="photo" src="<?= $item->resize_url() ?>"
        width="<?= $item->resize_width ?>"
        height="<?= $item->resize_height ?>" />
diff --git a/themes/default/views/tag.html.php b/themes/default/views/tag.html.php
index a4254e06..4c507d0d 100644
--- a/themes/default/views/tag.html.php
+++ b/themes/default/views/tag.html.php
@@ -1,7 +1,9 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
 <div id="gAlbumHeader">
+  <div id="gAlbumHeaderButtons">
+    <?= $theme->tag_top() ?>
+  </div>
   <h1><?= $tag->name ?></h1>
-  <?= $theme->tag_top() ?>
 </div>
 
 <ul id="gAlbumGrid">