diff options
| -rw-r--r-- | css/gallerybutton.css | 5 | ||||
| -rw-r--r-- | js/gallerybutton.js | 8 | ||||
| -rw-r--r-- | templates/part.content.php | 16 | ||||
| -rw-r--r-- | templates/public.php | 16 |
4 files changed, 22 insertions, 23 deletions
diff --git a/css/gallerybutton.css b/css/gallerybutton.css index 9e1152a6..10c144e6 100644 --- a/css/gallerybutton.css +++ b/css/gallerybutton.css @@ -14,7 +14,7 @@ } #controls .button.left-switch-button { - float: left; + float: right; display: inline; border-radius: 3px 0 0 3px; margin-left: 3px; @@ -23,10 +23,9 @@ } #controls .button.right-switch-button { - float: left; + float: right; display: inline; border-radius: 0 3px 3px 0; - margin-left: -1px; } .button.left-switch-button img, diff --git a/js/gallerybutton.js b/js/gallerybutton.js index ca0d29a5..24d3a40f 100644 --- a/js/gallerybutton.js +++ b/js/gallerybutton.js @@ -59,13 +59,13 @@ $(document).ready(function () { // Toggle for opening files list as gallery view GalleryButton.button = - $('<div class="button view-switcher left-switch-button disabled-button">' + - '<img class="svg" src="' + OC.imagePath('core', 'actions/toggle-filelist.svg') + + $('<div id="gallery-button" class="button view-switcher right-switch-button inactive-button">' + + '<img class="svg" src="' + OC.imagePath('core', 'actions/toggle-pictures.svg') + '"' + 'alt="' + t('gallery', 'Picture view') + '"/>' + '</div>' + - '<div id="gallery-button" class="button view-switcher right-switch-button inactive-button">' + - '<img class="svg" src="' + OC.imagePath('core', 'actions/toggle-pictures.svg') + + '<div class="button view-switcher left-switch-button disabled-button">' + + '<img class="svg" src="' + OC.imagePath('core', 'actions/toggle-filelist.svg') + '"' + 'alt="' + t('gallery', 'Picture view') + '"/>' + '</div>'); diff --git a/templates/part.content.php b/templates/part.content.php index 7051870c..fd1155b1 100644 --- a/templates/part.content.php +++ b/templates/part.content.php @@ -44,26 +44,26 @@ style( <div id="controls"> <div id='breadcrumbs'></div> <!-- toggle for opening the current album as file list --> - <div id="filelist-button" class="button view-switcher left-switch-button inactive-button"> - <img class="svg" src="<?php print_unescaped( - image_path('core', 'actions/toggle-filelist.svg') - ); ?>" alt="<?php p($l->t('File list')); ?>"/> - </div> <div class="button view-switcher right-switch-button disabled-button"> <img class="svg" src="<?php print_unescaped( image_path('core', 'actions/toggle-pictures.svg') ); ?>" alt="<?php p($l->t('Picture view')); ?>"/> </div> - <div id="sort-name-button" class="button sorting left-switch-button"> + <div id="filelist-button" class="button view-switcher left-switch-button inactive-button"> <img class="svg" src="<?php print_unescaped( - image_path($_['appName'], 'nameasc.svg') - ); ?>" alt="<?php p($l->t('Sort by name')); ?>"/> + image_path('core', 'actions/toggle-filelist.svg') + ); ?>" alt="<?php p($l->t('File list')); ?>"/> </div> <div id="sort-date-button" class="button sorting right-switch-button"> <img class="svg" src="<?php print_unescaped( image_path($_['appName'], 'dateasc.svg') ); ?>" alt="<?php p($l->t('Sort by date')); ?>"/> </div> + <div id="sort-name-button" class="button sorting left-switch-button"> + <img class="svg" src="<?php print_unescaped( + image_path($_['appName'], 'nameasc.svg') + ); ?>" alt="<?php p($l->t('Sort by name')); ?>"/> + </div> <span class="right"> <div id="album-info-button" class="button"> <span class="ribbon black"></span> diff --git a/templates/public.php b/templates/public.php index a6cbb5d1..728be169 100644 --- a/templates/public.php +++ b/templates/public.php @@ -105,27 +105,27 @@ style( <div id="controls"> <div id="breadcrumbs"></div> <!-- toggle for opening the current album as file list --> + <div class="button view-switcher right-switch-button disabled-button"> + <img class="svg" src="<?php print_unescaped( + image_path('core', 'actions/toggle-pictures.svg') + ); ?>" alt="<?php p($l->t('Picture view')); ?>"/> + </div> <div id="filelist-button" class="button view-switcher left-switch-button inactive-button "> <img class="svg" src="<?php print_unescaped( image_path('core', 'actions/toggle-filelist.svg') ); ?>" alt="<?php p($l->t('File list')); ?>"/> </div> - <div class="button view-switcher right-switch-button disabled-button"> + <div id="sort-date-button" class="button sorting right-switch-button"> <img class="svg" src="<?php print_unescaped( - image_path('core', 'actions/toggle-pictures.svg') - ); ?>" alt="<?php p($l->t('Picture view')); ?>"/> + image_path($_['appName'], 'dateasc.svg') + ); ?>" alt="<?php p($l->t('Sort by date')); ?>"/> </div> <div id="sort-name-button" class="button sorting left-switch-button"> <img class="svg" src="<?php print_unescaped( image_path($_['appName'], 'nameasc.svg') ); ?>" alt="<?php p($l->t('Sort by name')); ?>"/> </div> - <div id="sort-date-button" class="button sorting right-switch-button"> - <img class="svg" src="<?php print_unescaped( - image_path($_['appName'], 'dateasc.svg') - ); ?>" alt="<?php p($l->t('Sort by date')); ?>"/> - </div> <span class="right"> <div id="album-info-button" class="button"> <span class="ribbon black"></span> |