diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2011-07-22 00:28:17 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2011-07-22 00:28:17 +0200 |
| commit | 9950f06c5925d3ae30916a50e0433104fcec4693 (patch) | |
| tree | ff12ab75723431b3f0d099fdc3422473f1ac2236 | |
| parent | d9a79c0f7eade4915b236c1581ed30714ecab3ff (diff) | |
| parent | 828a26c69ee3a4920c35265e972e759ed800a461 (diff) | |
| download | nextcloud-server-9950f06c5925d3ae30916a50e0433104fcec4693.tar.gz nextcloud-server-9950f06c5925d3ae30916a50e0433104fcec4693.zip | |
Merge branch 'master' into interface
| -rw-r--r-- | apps/files_imageviewer/js/lightbox.js | 4 | ||||
| -rw-r--r-- | core/templates/layout.admin.php | 1 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/apps/files_imageviewer/js/lightbox.js b/apps/files_imageviewer/js/lightbox.js index 25da2bc6835..6e45547ebb4 100644 --- a/apps/files_imageviewer/js/lightbox.js +++ b/apps/files_imageviewer/js/lightbox.js @@ -36,7 +36,7 @@ function showLightbox(container,img){ img.width = maxHeight * ratio; } else { img.width = maxWidth; - img.height = maxWidth * ratio; + img.height = maxWidth / ratio; } } container.empty(); @@ -55,4 +55,4 @@ function hideLightbox(){ $('#lightbox').hide(); lightBoxShown=false; } -}
\ No newline at end of file +} diff --git a/core/templates/layout.admin.php b/core/templates/layout.admin.php index aa1de65c084..e83cf6861bf 100644 --- a/core/templates/layout.admin.php +++ b/core/templates/layout.admin.php @@ -23,7 +23,6 @@ echo $header['text']; echo '</'.$header['tag'].'>'; ?> - <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> <?php endforeach; ?> </head> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index dedb6e2e4a1..ffdb7937ae7 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -23,7 +23,6 @@ echo $header['text']; echo '</'.$header['tag'].'>'; ?> - <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> <?php endforeach; ?> </head> |