Merge branch 'master' into talmdal_dev

Conflicts:
	modules/user/views/admin_users.html.php

1 files changed, 30 insertions, 28 deletions

diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php
index d034066a..af38cb41 100644
--- a/modules/watermark/views/admin_watermarks.html.php
+++ b/modules/watermark/views/admin_watermarks.html.php
@@ -1,37 +1,39 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="#g-watermarks">
+<div class="g-block">
   <h1> <?= t("Watermarks") ?> </h1>
   <p>
     <?= t("You can have one watermark for your Gallery.  This watermark will be applied to all thumbnails and resized images, but it will not be applied to your full size images.  To make sure that your guests can only see watermarked images, you should restrict access to your full size images.") ?>
   </p>
 
-  <? if (empty($name)): ?>
-  <a href="<?= url::site("admin/watermarks/form_add") ?>"
-     title="<?= t("Upload a watermark")->for_html_attr() ?>"
-     class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-document-b"></span><?= t("Upload a watermark") ?></a>
-  <? else: ?>
-  <h2> <?= t("Active Watermark") ?> </h2>
-  <p>
-    <?= t("Note that changing this watermark will require you to rebuild all of your thumbnails and resized images.") ?>
-  </p>
-  <div>
-    <div class="image">
-      <img width="<?= $width ?>" height="<?= $height ?>" src="<?= $url ?>"/>
-      <p>
-        <?= t("Position: %position", array("position" => watermark::position($position))) ?>
-      </p>
-      <p>
-        <?= t("Transparency: %transparency%", array("transparency" => module::get_var("watermark", "transparency"))) ?>
-      </p>
-    </div>
-    <div class="controls">
-      <a href="<?= url::site("admin/watermarks/form_edit") ?>"
-         title="<?= t("Edit Watermark")->for_html_attr() ?>"
-         class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-pencil"></span><?= t("edit") ?></a>
-      <a href="<?= url::site("admin/watermarks/form_delete") ?>"
-         title="<?= t("Delete Watermark")->for_html_attr() ?>"
-         class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
+  <div class="g-block-content">
+    <? if (empty($name)): ?>
+    <a href="<?= url::site("admin/watermarks/form_add") ?>"
+       title="<?= t("Upload a watermark")->for_html_attr() ?>"
+       class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-document-b"></span><?= t("Upload a watermark") ?></a>
+    <? else: ?>
+    <h2> <?= t("Active Watermark") ?> </h2>
+    <p>
+      <?= t("Note that changing this watermark will require you to rebuild all of your thumbnails and resized images.") ?>
+    </p>
+    <div>
+      <div class="g-photo">
+        <img width="<?= $width ?>" height="<?= $height ?>" src="<?= $url ?>" />
+        <p>
+          <?= t("Position: %position", array("position" => watermark::position($position))) ?>
+        </p>
+        <p>
+          <?= t("Transparency: %transparency%", array("transparency" => module::get_var("watermark", "transparency"))) ?>
+        </p>
+      </div>
+      <div class="controls">
+        <a href="<?= url::site("admin/watermarks/form_edit") ?>"
+           title="<?= t("Edit Watermark")->for_html_attr() ?>"
+           class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-pencil"></span><?= t("edit") ?></a>
+        <a href="<?= url::site("admin/watermarks/form_delete") ?>"
+           title="<?= t("Delete Watermark")->for_html_attr() ?>"
+           class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
+      </div>
     </div>
+    <? endif ?>
   </div>
-  <? endif ?>
 </div>