Merge branch 'sort-as-title-button' of git://github.com/sembrestels/Tidypics

diff --cc start.php
index b365a65a74931e6498ff9517a3548e8b1860eea7,363b9ae97ae72075cce05de9968c0053d6a7bc81..07100fb8a08178502b83f30909fc4966e230a878
--- 1/start.php
--- 2/start.php
+++ b/start.php
@@@ -306,9 -329,21 +306,9 @@@ function tidypics_entity_menu_setup($ho
                        );
                        $return[] = ElggMenuItem::factory($options);
                }
 -
 -              if (elgg_get_plugin_setting('tagging', 'tidypics')) {
 -                      $options = array(
 -                              'name' => 'tagging',
 -                              'text' => elgg_echo('tidypics:actiontag'),
 -                              'href' => '#',
 -                              'title' => elgg_echo('tidypics:tagthisphoto'),
 -                              'rel' => 'photo-tagging',
 -                              'priority' => 80,
 -                      );
 -                      $return[] = ElggMenuItem::factory($options);
 -              }
        }
  
-       // only show these options if there are images
+       // only show slideshow link if there are images
        if (elgg_instanceof($entity, 'object', 'album') && $entity->getSize() > 0) {
                $url = $entity->getURL() . '?limit=50&view=rss';
                $url = elgg_format_url($url);

diff --cc views/default/photos/css.php
Simple merge