diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2012-10-16 21:14:48 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2012-10-16 21:14:48 +0000 |
| commit | a12ede0a39515b7b97aa8a3415f60d1c9752e3e6 (patch) | |
| tree | dbcb339d37e812479874142f5ab120e715d0349c /modules/gallery | |
| parent | b76a96ff97b73427e33bf6323cdc703a73612124 (diff) | |
| parent | 31681bf834d5dc560b9898d9c30903f08ecb1966 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery')
| -rw-r--r-- | modules/gallery/css/gallery.css | 1 | ||||
| -rw-r--r-- | modules/gallery/helpers/locales.php | 1 | ||||
| -rw-r--r-- | modules/gallery/views/form_uploadify.html.php | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css index ecf89565..9d773699 100644 --- a/modules/gallery/css/gallery.css +++ b/modules/gallery/css/gallery.css @@ -39,6 +39,7 @@ #g-add-photos-canvas object { z-index: 100; + padding: 0em; } #g-add-photos-canvas .uploadifyQueue { diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php index 0b1e16d3..f4837e01 100644 --- a/modules/gallery/helpers/locales.php +++ b/modules/gallery/helpers/locales.php @@ -110,6 +110,7 @@ class locales_Core { $l["sl_SI"] = "Slovenščina"; // Slovenian $l["sr_CS"] = "Srpski"; // Serbian $l["sv_SE"] = "Svenska"; // Swedish + $l["th_TH"] = "ภาษาไทย"; // Thai $l["tn_ZA"] = "Setswana"; // Setswana $l["tr_TR"] = "Türkçe"; // Turkish $l["uk_UA"] = "українська"; // Ukrainian diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php index 22332e82..c1f985c3 100644 --- a/modules/gallery/views/form_uploadify.html.php +++ b/modules/gallery/views/form_uploadify.html.php @@ -23,8 +23,8 @@ if (swfobject.hasFlashPlayerVersion("<?= $flash_minimum_version ?>")) { $("#g-uploadify").uploadify({ - width: 150, - height: 33, + width: 298, + height: 32, uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>", script: "<?= url::site("uploader/add_photo/{$album->id}") ?>", scriptData: <?= json_encode($script_data) ?>, |