Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

2 files changed, 48 insertions, 47 deletions

diff --git a/modules/gallery/views/admin_block_welcome.html.php b/modules/gallery/views/admin_block_welcome.html.php
index d8c96187..d3765d19 100644
--- a/modules/gallery/views/admin_block_welcome.html.php
+++ b/modules/gallery/views/admin_block_welcome.html.php
@@ -2,7 +2,7 @@
 <p>
   <?= t("This is your administration dashboard and it provides a quick overview of status messages, recent updates, and frequently used options. Add or remove blocks and rearrange them to tailor to your needs. The admin menu provides quick access to all of Gallery 3's options and settings. Here are a few of the most used options to get you started.") ?>
 </p>
-<ul>
+<ul class="g-text">
   <li>
     <?= t("General Settings - choose your <a href=\"%graphics_url\">graphics</a> and <a href=\"%language_url\">language</a> settings.",
           array("graphics_url" => html::mark_clean(url::site("admin/graphics")),
diff --git a/modules/gallery/views/admin_themes_buttonset.html.php b/modules/gallery/views/admin_themes_buttonset.html.php
index 5166f36c..bf474a26 100644
--- a/modules/gallery/views/admin_themes_buttonset.html.php
+++ b/modules/gallery/views/admin_themes_buttonset.html.php
@@ -1,47 +1,48 @@
-        <ul class="g-buttonset">
-          <li>
-            <a target="_blank"
-               <? if (isset($info['author_url'])): ?>
-               class="ui-state-default ui-icon ui-icon-person ui-corner-left"
-               href="<?= $info['author_url'] ?>"
-               <? else: ?>
-               class="ui-state-disabled ui-icon ui-icon-person ui-corner-left"
-               href="#"
-               <? endif ?>
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<ul class="g-buttonset">
+  <li>
+    <a target="_blank"
+       <? if (isset($info['author_url'])): ?>
+       class="ui-state-default ui-icon ui-icon-person ui-corner-left"
+       href="<?= $info['author_url'] ?>"
+       <? else: ?>
+       class="ui-state-disabled ui-icon ui-icon-person ui-corner-left"
+       href="#"
+       <? endif ?>
 
-               <? if (isset($info['author_name'])): ?>
-               title="<?= $info['author_name'] ?>"
-               <? endif ?>
-               >
-               <? if (isset($info['author_name'])): ?>
-               <?= $info['author_name'] ?>
-               <? endif ?>
-            </a>
-          </li>
-          <li>
-            <a target="_blank"
-               <? if (isset($info['info_url'])): ?>
-               class="ui-state-default ui-icon ui-icon-info"
-               href="<?= $info['info_url'] ?>"
-               <? else: ?>
-               class="ui-state-disabled ui-icon ui-icon-info"
-               href="#"
-               <? endif ?>
-               >
-              <?= t("info") ?>
-            </a>
-          </li>
-          <li>
-            <a target="_blank"
-               <? if (isset($info['discuss_url'])): ?>
-               class="ui-state-default ui-icon ui-icon-comment ui-corner-right"
-               href="<?= $info['discuss_url'] ?>"
-               <? else: ?>
-               class="ui-state-disabled ui-icon ui-icon-comment ui-corner-right"
-               href="#"
-               <? endif ?>
-               >
-              <?= t("discuss") ?>
-            </a>
-          </li>
-        </ul>
+       <? if (isset($info['author_name'])): ?>
+       title="<?= $info['author_name'] ?>"
+       <? endif ?>
+       >
+       <? if (isset($info['author_name'])): ?>
+       <?= $info['author_name'] ?>
+       <? endif ?>
+    </a>
+  </li>
+  <li>
+    <a target="_blank"
+       <? if (isset($info['info_url'])): ?>
+       class="ui-state-default ui-icon ui-icon-info"
+       href="<?= $info['info_url'] ?>"
+       <? else: ?>
+       class="ui-state-disabled ui-icon ui-icon-info"
+       href="#"
+       <? endif ?>
+       >
+      <?= t("info") ?>
+    </a>
+  </li>
+  <li>
+    <a target="_blank"
+       <? if (isset($info['discuss_url'])): ?>
+       class="ui-state-default ui-icon ui-icon-comment ui-corner-right"
+       href="<?= $info['discuss_url'] ?>"
+       <? else: ?>
+       class="ui-state-disabled ui-icon ui-icon-comment ui-corner-right"
+       href="#"
+       <? endif ?>
+       >
+      <?= t("discuss") ?>
+    </a>
+  </li>
+</ul>