diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-01-23 16:29:10 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-01-23 16:29:10 -0800 |
| commit | fecac4a8596a69088270e48a90868e845fc8f4ca (patch) | |
| tree | a4683906d481d1091e218c9b6662a1997cb11086 /modules/gallery/views/form_uploadify.html.php | |
| parent | 8849594aa17768f564e45370a62f01e440570dcf (diff) | |
| parent | 3b16d0662b8a4b06f4be72165c858a1231e9bd67 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
modules/gallery/tests/xss_data.txt
Diffstat (limited to 'modules/gallery/views/form_uploadify.html.php')
| -rw-r--r-- | modules/gallery/views/form_uploadify.html.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php index f3b9c883..b3b81ecb 100644 --- a/modules/gallery/views/form_uploadify.html.php +++ b/modules/gallery/views/form_uploadify.html.php @@ -2,17 +2,21 @@ <style> #g-add-photos-canvas object { height: 33px; - left: -60px; + left: -80px; position: relative; z-index: 100; } +#g-add-photos-canvas span { + height: 33px; + width: 150px; +} #g-add-photos-button { float: left; - left: 175px; + left: 155px; padding-bottom: .5em; padding-top: .5em; position: relative; - width: 110px; + width: 150px; z-index: 1; } </style> @@ -21,6 +25,8 @@ <script type="text/javascript"> $("#g-add-photos-canvas").ready(function () { $("#g-uploadify").uploadify({ + width: 150, + height: 33, uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>", script: "<?= url::site("simple_uploader/add_photo/{$album->id}") ?>", scriptData: <?= json_encode($script_data) ?>, |