Merge branch 'master' into talmdal_dev

6 files changed, 8 insertions, 8 deletions

diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 6200e8b4..5e78376b 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -66,7 +66,7 @@ class Movies_Controller extends Items_Controller {
 
     if ($valid) {
       $new_ext = pathinfo($form->edit_item->filename->value, PATHINFO_EXTENSION);
-      $old_ext = pathinfo($photo->name, PATHINFO_EXTENSION);
+      $old_ext = pathinfo($movie->name, PATHINFO_EXTENSION);
       if (strcasecmp($new_ext, $old_ext)) {
         $form->edit_item->filename->add_error("illegal_extension", 1);
         $valid = false;
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 107b35cc..7ad75f85 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -116,6 +116,9 @@
 
     <? if ($finished_tasks->count()): ?>
     <div id="g-finished-tasks">
+      <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
+           class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
+         <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
       <h2> <?= t("Finished tasks") ?> </h2>
       <table>
         <tr>
@@ -135,9 +138,6 @@
             <?= t("Owner") ?>
           </th>
           <th>
-            <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
-                 class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
-               <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
             <?= t("Action") ?>
           </th>
         </tr>
diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php
index ff7ac50e..d2472fdc 100644
--- a/modules/gallery/views/admin_maintenance_show_log.html.php
+++ b/modules/gallery/views/admin_maintenance_show_log.html.php
@@ -11,7 +11,7 @@ appendTo('body').submit().remove();
 </script>
 <div id="g-task-log-dialog">
   <h1> <?= $task->name ?> </h1>
-  <div class="g-task-log g-txt-small">
+  <div class="g-task-log g-text-small">
     <pre><?= html::purify($task->get_log()) ?></pre>
   </div>
   <button id="g-close" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Close") ?></button>
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index 53972b70..76756b66 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -57,7 +57,7 @@
   <div id="g-status">
     <?= t("Starting up...") ?>
   </div>
-  <div class="g-txt-right">
+  <div class="g-text-right">
     <button id="g-pause-button" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Pause") ?></button>
     <button id="g-done-button" class="ui-state-default ui-corner-all" style="display: none" onclick="dismiss()"><?= t("Close") ?></button>
   </div>
diff --git a/modules/gallery/views/login_ajax.html.php b/modules/gallery/views/login_ajax.html.php
index 9741db0c..36647f9d 100644
--- a/modules/gallery/views/login_ajax.html.php
+++ b/modules/gallery/views/login_ajax.html.php
@@ -38,7 +38,7 @@
     </li>
     <? if (identity::is_writable()): ?>
     <li>
-      <a href="#" id="g-password-reset" class="g-right g-txt-small"><?= t("Forgot your password?") ?></a>
+      <a href="#" id="g-password-reset" class="g-right g-text-small"><?= t("Forgot your password?") ?></a>
     </li>
     <? endif ?>
   </ul>
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 661f1532..18ad9403 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -85,7 +85,7 @@
             <td>
               <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
             </td>
-            <td class="g-actions">
+            <td>
               <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
                   open_text="<?= t("Close") ?>"
                   class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left">