refs #44 fix photos menu entry behaviour/style

css/style.css

@@ -388,7 +388,6 @@ table.editFavorite input[type=text] {
     width: 100%;
     padding: 0px 3px 0px 3px;
 }
-#togglePhotosButton button,
 #toggleNonLocalizedPhotosButton button,
 #toggleContactsButton button,
 #toggleFavoritesButton button,
@@ -400,7 +399,6 @@ table.editFavorite input[type=text] {
     opacity: 1 !important;
 }
 #navigation-favorites > a,
-#navigation-photos > a,
 #navigation-nonLocalizedPhotos > a,
 #navigation-tracks > a,
 #navigation-devices > a,

js/photosController.js

@@ -37,7 +37,7 @@ PhotosController.prototype = {
             }
         });
         // click on photo menu entry
-        $('body').on('click', '#togglePhotosButton, #navigation-photos > a', function(e) {
+        $('body').on('click', '#navigation-photos > a', function(e) {
             that.toggleLayer();
             that.optionsController.saveOptionValues({photosLayer: that.map.hasLayer(that.photoLayer)});
         });
@@ -77,14 +77,11 @@ PhotosController.prototype = {
     toggleLayer: function() {
         if (this.map.hasLayer(this.photoLayer)) {
             this.hideLayer();
-            // color of the eye
-            $('#togglePhotosButton button').addClass('icon-toggle').attr('style', '');
+            $('#navigation-photos').removeClass('active');
+            $('#map').focus();
         } else {
             this.showLayer();
-            // color of the eye
-            var color = OCA.Theming.color.replace('#', '');
-            var imgurl = OC.generateUrl('/svg/core/actions/toggle?color='+color);
-            $('#togglePhotosButton button').removeClass('icon-toggle').css('background-image', 'url('+imgurl+')');
+            $('#navigation-photos').addClass('active');
         }
     },
 

templates/navigation/index.php

@@ -78,9 +78,6 @@
                 <li class="app-navigation-entry-utils-counter">
                     <span></span>
                 </li>
-                <li id="togglePhotosButton" class="app-navigation-entry-utils-menu-button" title="<?php p($l->t('Toggle photos')); ?>">
-                    <button class="icon-toggle"></button>
-                </li>
                 <li class="app-navigation-entry-utils-menu-button photosMenuButton">
                     <button></button>
                 </li>