Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 6 insertions, 6 deletions

diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php
index 8ea1beb6..d2472fdc 100644
--- a/modules/gallery/views/admin_maintenance_show_log.html.php
+++ b/modules/gallery/views/admin_maintenance_show_log.html.php
@@ -2,18 +2,18 @@
 <script type="text/javascript">
   dismiss = function() {
     window.location.reload();
-  }
-  download = function(){
+  };
+  download = function() {
     // send request
     $('<form action="<?= url::site("admin/maintenance/save_log/$task->id?csrf=$csrf") ?>" method="post"></form>').
 appendTo('body').submit().remove();
   };
 </script>
-<div id="gTaskLogDialog">
+<div id="g-task-log-dialog">
   <h1> <?= $task->name ?> </h1>
-  <div class="gTaskLog">
+  <div class="g-task-log g-text-small">
     <pre><?= html::purify($task->get_log()) ?></pre>
   </div>
-  <button id="gCloseButton" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Close") ?></button>
-  <button id="gSaveButton" class="ui-state-default ui-corner-all" onclick="download()"><?= t("Save") ?></button>
+  <button id="g-close" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Close") ?></button>
+  <button id="g-save" class="ui-state-default ui-corner-all" onclick="download()"><?= t("Save") ?></button>
 </div>