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

3 files changed, 15 insertions, 35 deletions

diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index 07134475..d4b7b0c1 100644
--- a/modules/gallery/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -49,13 +49,14 @@
             </tr>
             <? $i = 0 ?>
             <? foreach ($available_locales as $code => $display_name):  ?>
-            <? if ($i == (count($available_locales)/2)): ?>
-            <table>
-              <tr>
-                <th> <?= t("Installed") ?> </th>
-                <th> <?= t("Language") ?> </th>
-                <th> <?= t("Default language") ?> </th>
-              </tr>
+            <? if ($i == (int) (count($available_locales)/2)): ?>
+          </table>
+          <table>
+            <tr>
+              <th> <?= t("Installed") ?> </th>
+              <th> <?= t("Language") ?> </th>
+              <th> <?= t("Default language") ?> </th>
+            </tr>
             <? endif ?>
             <tr class="<?= (isset($installed_locales[$code])) ? "g-available" : "" ?><?= ($default_locale == $code) ? " g-selected" : "" ?>">
               <td> <?= form::checkbox("installed_locales[]", $code, isset($installed_locales[$code])) ?> </td>
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 137cb353..d811f913 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -1,25 +1,4 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<style>
-#g-add-photos-canvas object {
-  height: 33px;
-  left: -80px;
-  position: relative;
-  z-index: 100;
-}
-#g-add-photos-canvas span {
-  height: 33px;
-  width: 150px;
-}
-#g-add-photos-button {
-  float: left;
-  left: 155px;
-  padding-bottom: .5em;
-  padding-top: .5em;
-  position: relative;
-  width: 150px;
-  z-index: 1;
-}
-</style>
 <script type="text/javascript" src="<?= url::file("lib/swfobject.js") ?>"></script>
 <script type="text/javascript" src="<?= url::file("lib/uploadify/jquery.uploadify.min.js") ?>"></script>
 <script type="text/javascript">
@@ -113,7 +92,7 @@
   <p>
     <?= t("Photos will be uploaded to album: ") ?>
   </p>
-  <ul class="g-breadcrumbs">
+  <ul class="g-breadcrumbs ui-helper-clearfix">
     <? foreach ($album->parents() as $i => $parent): ?>
     <li<? if ($i == 0) print " class=\"g-first\"" ?>> <?= html::clean($parent->title) ?> </li>
     <? endforeach ?>
@@ -121,11 +100,11 @@
   </ul>
 </div>
 
-<div id="g-add-photos-canvas" style="text-align: center;clear: both">
-  <a id="g-add-photos-button" class="ui-corner-all" href="#"><?= t("Select photos...") ?></a>
+<div id="g-add-photos-canvas">
+  <button id="g-add-photos-button" class="g-button ui-state-default ui-corner-all" href="#"><?= t("Select photos...") ?></button>
   <span id="g-uploadify"></span>
 </div>
-<div id="g-add-photos-status" style="text-align: center;">
-  <ul>
+<div id="g-add-photos-status">
+  <ul id="g-action-status" class="g-message-block">
   </ul>
 </div>
diff --git a/modules/gallery/views/kohana/error.php b/modules/gallery/views/kohana/error.php
index 26628cf2..d55105a0 100644
--- a/modules/gallery/views/kohana/error.php
+++ b/modules/gallery/views/kohana/error.php
@@ -204,7 +204,7 @@
                       <pre><?= $name?></pre>
                     </td>
                     <td class="value">
-                      <pre><?= Kohana_Exception::dump($arg) ?></pre>
+                      <pre><?= Kohana_Exception::safe_dump($arg, $name) ?></pre>
                     </td>
                   </tr>
                   <? endforeach?>
@@ -265,7 +265,7 @@
                   </code>
                 </td>
                 <td class="value">
-                  <pre><?= Kohana_Exception::dump($value) ?></pre>
+                  <pre><?= Kohana_Exception::safe_dump($value, $key) ?></pre>
                 </td>
               </tr>
               <? endforeach?>