some more clean-up

diff --git a/start.php b/start.php
index ce0af73122db68562514820e5a47b3c8b909ef06..f094bd2f43f83c32760c58ae60f0bbe11780ca7e 100644 (file)
--- a/start.php
+++ b/start.php
@@ -27,8 +27,8 @@ function tidypics_init() {
        elgg_register_page_handler('photos', 'tidypics_page_handler');
 
        // Extend CSS
-       elgg_extend_view('css/elgg', 'tidypics/css');
-       elgg_extend_view('css/admin', 'tidypics/css');
+       elgg_extend_view('css/elgg', 'photos/css');
+       elgg_extend_view('css/admin', 'photos/css');
 
        // Register the JavaScript lib
        $js = elgg_get_simplecache_url('js', 'photos/tidypics');

diff --git a/views/default/object/image/summary.php b/views/default/object/image/summary.php
index 16c197098f4d0e432ad21480ca07c5b5dc271fa0..ed8ceff38c1296b0e149c6d83d14addea5db699c 100644 (file)
--- a/views/default/object/image/summary.php
+++ b/views/default/object/image/summary.php
@@ -15,6 +15,8 @@ $img = elgg_view_entity_icon($image, 'small');
 $header = elgg_view('output/url', array(
        'text' => $image->getTitle(),
        'href' => $image->getURL(),
+       'is_trusted' => true,
+       'class' => 'tidypics-heading',
 ));
 
 $body = elgg_view('output/url', array(

diff --git a/views/default/tidypics/css.php b/views/default/photos/css.php
similarity index 100%
rename from views/default/tidypics/css.php
rename to views/default/photos/css.php

diff --git a/views/default/tidypics/albums.php b/views/default/tidypics/albums.php
deleted file mode 100644 (file)
index 61daadb..0000000
--- a/views/default/tidypics/albums.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-//the number of albums to display
-$number = (int)$vars['num_albums'];
-if (!$number) {
-       $number = 5;
-}
-
-$owner = page_owner_entity();
-$owner_albums = elgg_get_entities(array(
-       "type" => "object",
-       "subtype" => "album",
-       "container_guid" => page_owner(),
-       "limit" => $number,
-));
-
-echo '<div id="tidypics_album_widget_container">';
-
-if ($owner_albums) {
-       foreach ($owner_albums as $album) {
-
-               $album_cover_guid = $album->getCoverImageGuid();
-               if ($album_cover_guid) {
-                       $album_cover = '<img src="'.$vars['url'].'mod/tidypics/thumbnail.php?file_guid='.$album_cover_guid.'&size=small"  class="tidypics_album_cover"  alt="' . $album->title . '"/>';
-               } else {
-                       $album_cover = '<img src="'.$vars['url'].'mod/tidypics/graphics/empty_album.png" class="tidypics_album_cover" alt="' . $album->title . '">';
-               }
-?>
-<div class="tidypics_album_widget_single_item">
-       <div class="tidypics_album_widget_title"><a href="<?php echo $album->getURL();?>"><?php echo $album->title;?></a></div>
-       <div class="tidypics_album_widget_timestamp"> <?php echo elgg_echo("album:created:on") . ' ' . friendly_time($album->time_created);?></div>
-                       <?php
-                       //get the number of comments
-                       $numcomments = elgg_count_comments($album);
-                       if ($numcomments) {
-                               echo "<a href=\"{$album->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a><br>";
-                       }
-?>
-       <a href="<?php echo $album->getURL();?>"><?php echo $album_cover;?></a>
-</div>
-               <?php
-       } //end of foreach loop
-
-       // bottom link to all group/user albums
-       if (is_null($owner->username) || empty($owner->username)) {
-               echo '<p class="profile_info_edit_buttons"><a href="' . $vars['url'] . 'pg/photos/world">' . elgg_echo('album:all') . '</a></p>';
-       } else {
-               echo '<p class="tidypics_download"><a href="' . $vars['url'] . 'pg/photos/owned/' . $owner->username . '">' . elgg_echo('album:more') . '</a></p>';
-       }
-
-}
-
-if (can_write_to_container(0, $owner->guid)) {
-       echo '<p class="tidypics_download"><a href=' . $CONFIG->wwwroot .'pg/photos/new/' . $owner->username . '>' . elgg_echo("album:create") . '</a></p>';
-}
-
-
-//close album_widget_container div
-echo "</div>";

diff --git a/views/default/tidypics/breadcrumbs.php b/views/default/tidypics/breadcrumbs.php
deleted file mode 100644 (file)
index e9f491b..0000000
--- a/views/default/tidypics/breadcrumbs.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-$file_guid = $vars['file_guid'];
-$page_owner = page_owner_entity();
-
-$first_level_text = '';
-$first_level_link = $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username;
-if (get_loggedin_userid() == $page_owner->guid) {
-       $first_level_text = elgg_echo('album:yours');
-} else {
-       $first_level_text = sprintf(elgg_echo('album:user'), $page_owner->name);
-}
-?>
-<a href="<?php echo $first_level_link; ?>"><?php echo $first_level_text; ?></a>
-<?php
-$second_level_text = '';
-if (isset($vars['album'])) {
-       $second_level_text = $vars['album']->title;
-       $second_level_link = $vars['album']->getURL();
-       ?>
->>  <a href="<?php echo $second_level_link; ?>"><?php echo $second_level_text; ?></a>
-       <?php
-}
-

diff --git a/views/default/tidypics/content_wrapper.php b/views/default/tidypics/content_wrapper.php
deleted file mode 100644 (file)
index 08146b3..0000000
--- a/views/default/tidypics/content_wrapper.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-       echo elgg_view_title($vars['title']);
-?>
-<div class="contentWrapper tidypics_wrapper">
-<div class="clearfloat"></div>
-<?php
-       echo $vars['content'];
-?>
-<div class="clearfloat"></div>
-</div>
\ No newline at end of file

diff --git a/views/default/tidypics/groupprofile_albums.php b/views/default/tidypics/groupprofile_albums.php
deleted file mode 100644 (file)
index 85b3242..0000000
--- a/views/default/tidypics/groupprofile_albums.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/***********************************************
- *
- *  This is used on the group profile page
- *
- ***********************************************/
-
-if ($vars['entity']->photos_enable != 'no') {
-       echo '<div id="tidypics_group_profile">';
-?>
-       <h2><a href="<?php echo $CONFIG->wwwroot . "pg/photos/owned/group:" . $vars['entity']->guid; ?>">Group albums</a></h2>
-<?php
-       //echo '<h2>' . elgg_echo('album:group') . '</h2>';
-       echo elgg_view('tidypics/albums', array('num_albums' => 5));
-       echo '</div>';
-}

diff --git a/views/default/tidypics/hover_menu.php b/views/default/tidypics/hover_menu.php
deleted file mode 100644 (file)
index 240891f..0000000
--- a/views/default/tidypics/hover_menu.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-       /**
-        * Elgg hoverover extender for tidypics
-        * 
-        */
-
-?>
-
-       <p class="user_menu_file <?php if(get_context() == 'photos') echo 'profile_select';?>">
-               <a href="<?php echo $vars['url']; ?>pg/photos/owned/<?php echo $vars['entity']->username; ?>"><?php echo elgg_echo("albums"); ?></a>    
-       </p>
\ No newline at end of file