summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/gallery.common.css111
-rw-r--r--modules/gallery/helpers/gallery_installer.php9
-rw-r--r--modules/gallery/helpers/graphics.php5
-rw-r--r--modules/gallery/js/l10n_client.js13
-rw-r--r--modules/gallery/module.info2
-rw-r--r--modules/gallery/views/admin_maintenance_task.html.php2
-rw-r--r--modules/gallery/views/l10n_client.html.php5
7 files changed, 143 insertions, 4 deletions
diff --git a/lib/gallery.common.css b/lib/gallery.common.css
new file mode 100644
index 00000000..ca90a484
--- /dev/null
+++ b/lib/gallery.common.css
@@ -0,0 +1,111 @@
+/* ####### states, interactions, positioning ########### */
+
+/* states */
+
+.g-active, .g-enabled, .g-available, .g-editable, .g-selected, .g-highlight {
+ font-weight: bold;
+}
+.g-inactive, .g-disabled, .g-unavailable, .g-uneditable, .g-locked, .g-unselected, .g-understate {
+ color: #ccc;
+ font-weight: normal;
+}
+
+.g-error, .g-denied {
+
+}
+.g-success, .g-allowed {
+
+}
+.g-info {
+
+}
+.g-warning {
+
+}
+
+.g-open {
+
+}
+.g-closed {
+
+}
+
+.g-installed {
+
+}
+.g-default {
+
+}
+
+/* interactions */
+
+.g-draggable, .ui-draggable {
+ cursor: move;
+}
+.g-target {
+
+}
+
+
+
+/* positioning */
+
+.g-right {
+ float: right;
+}
+.g-left {
+ float: left;
+}
+
+/* order */
+
+.g-first {
+
+}
+.g-last {
+
+}
+.g-even-row {
+
+}
+.g-odd-row {
+
+}
+
+/* text */
+
+.g-txt-small {
+ font-size: .8em;
+}
+.g-txt-big {
+ font-size: 1.2em;
+}
+.g-txt-right {
+ text-align: right;
+}
+
+/* ####### reusable containers/widgets ########### */
+
+.g-dialog {
+
+}
+
+.g-button { /* a link styled like a button */
+
+}
+
+.g-progressbar {
+
+}
+
+.g-block {
+
+}
+
+.g-message-box {
+
+}
+
+.g-list-horizontal {
+
+}
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index a212ef85..40830bc0 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -223,6 +223,7 @@ class gallery_installer {
module::set_var("gallery", "resize_size", 640);
module::set_var("gallery", "default_locale", "en_US");
module::set_var("gallery", "image_quality", 75);
+ module::set_var("gallery", "image_sharpen", 15);
// Add rules for generating our thumbnails and resizes
graphics::add_rule(
@@ -259,7 +260,7 @@ class gallery_installer {
module::set_var("gallery", "show_credits", 1);
// @todo this string needs to be picked up by l10n_scanner
module::set_var("gallery", "credits", "Powered by <a href=\"%url\">Gallery %version</a>");
- module::set_version("gallery", 10);
+ module::set_version("gallery", 11);
}
static function upgrade($version) {
@@ -336,6 +337,12 @@ class gallery_installer {
module::set_version("gallery", $version = 10);
}
+
+ if ($version == 10) {
+ module::set_var("gallery", "image_sharpen", 15);
+
+ module::set_version("gallery", $version = 11);
+ }
}
static function uninstall() {
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 7dc46eeb..2892011f 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -206,10 +206,15 @@ class graphics_Core {
// Image would get upscaled; do nothing
copy($input_file, $output_file);
} else {
+ try {
Image::factory($input_file)
->resize($options["width"], $options["height"], $options["master"])
->quality(module::get_var("gallery", "image_quality"))
+ ->sharpen(module::get_var("gallery", "image_sharpen"))
->save($output_file);
+ } catch (Exception $e) {
+ Kohana::log("error", $e->getMessage());
+ }
}
module::event("graphics_resize_completed", $input_file, $output_file, $options);
diff --git a/modules/gallery/js/l10n_client.js b/modules/gallery/js/l10n_client.js
index 80fe166b..35986e5a 100644
--- a/modules/gallery/js/l10n_client.js
+++ b/modules/gallery/js/l10n_client.js
@@ -205,6 +205,19 @@ Gallery.behaviors.l10nClient = function(context) {
Gallery.l10nClient.toggle(0);
}
});
+
+ // Close the l10n client using an AJAX call and refreshing the page
+ $('#gCloseL10n').click(function(event) {
+ $.ajax({
+ type: "GET",
+ url: toggle_l10n_mode_url,
+ data: "csrf=" + csrf,
+ success: function() {
+ window.location.reload(true);
+ }
+ });
+ event.preventDefault();
+ });
// Register keybindings using jQuery hotkeys
// TODO: Either remove hotkeys code or add query.hotkeys.js.
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index dfb1a7a2..6b9dd1ba 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
name = "Gallery 3"
description = "Gallery core application"
-version = 10
+version = 11
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index 0eb0b38c..509e87b5 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -4,7 +4,7 @@
var animation = null;
var delta = 1;
animate_progress_bar = function() {
- var current_value = Number($(".gProgressBar div").css("width").replace("%", ""));
+ var current_value = parseInt($(".gProgressBar div").css("width").replace("%", ""));
if (target_value > current_value) {
// speed up
delta = Math.min(delta + 0.04, 3);
diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index 5ee7eca3..6c440b68 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -3,7 +3,8 @@
<div class="labels">
<span id="l10n-client-toggler">
<a id="gMinimizeL10n">_</a>
- <a id="gCloseL10n" href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>">X</a>
+ <a id="gCloseL10n" title="<?= t("Stop the translation mode") ?>"
+ href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>">X</a>
</span>
<div class="label strings"><h2><?= t("Page Text") ?>
<? if (!Input::instance()->get('show_all_l10n_messages')): ?>
@@ -76,5 +77,7 @@
var MSG_CLOSE_X = "<?= t("X") ?>";
var l10n_client_data = <?= json_encode($string_list) ?>;
var plural_forms = <?= json_encode($plural_forms) ?>;
+ var toggle_l10n_mode_url = "<?= url::site("l10n_client/toggle_l10n_mode") ?>";
+ var csrf = "<?= access::csrf_token() ?>";
</script>
</div>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 19:02:09 +0000