aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/default/object/album.php17
-rw-r--r--views/default/object/image.php13
-rw-r--r--views/default/tidypics/css.php29
-rw-r--r--views/default/tidypics/groupprofile_albums.php10
4 files changed, 35 insertions, 34 deletions
diff --git a/views/default/object/album.php b/views/default/object/album.php
index a1b238812..a94f12590 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -63,23 +63,6 @@
<?php
echo '<div id="tidypics_desc">'.autop($desc).'</div>';
- if ($file->canEdit()) { // add controls
-
-?>
- <div id="tidypics_controls">
- <a href="<?php echo $vars['url'] . "pg/photos/upload/" . $file_guid ;?>"><?php echo elgg_echo('album:addpix');?></a>
- <a href="<?php echo $vars['url']; ?>mod/tidypics/edit.php?file_guid=<?php echo $file->getGUID(); ?>"><?php echo elgg_echo('album:edit'); ?></a>&nbsp;
-
- <?php echo elgg_view('output/confirmlink',array(
- 'href' => $vars['url'] . "action/tidypics/delete?file=" . $file->getGUID(),
- 'text' => elgg_echo("album:delete"),
- 'confirm' => elgg_echo("album:delete:confirm"),
- ));
- ?>
- </div>
-<?php
- }
-
// display the simple image views. Uses: via 'object/image.php'
$count = get_entities("object","image", $file_guid, '', 999);
diff --git a/views/default/object/image.php b/views/default/object/image.php
index 97095822e..79939bfbb 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -87,18 +87,7 @@
echo '</div>';
?>
<div id="tidypics_controls">
- <a target="_new" href="<?php echo $vars['url']; ?>action/tidypics/download?file_guid=<?php echo $file->getGUID(); ?>"><?php echo elgg_echo("image:download"); ?></a>&nbsp;
-<?php
- if ($file->canEdit()) { // add edit controls
-?>
- <a href="<?php echo $vars['url']; ?>mod/tidypics/edit.php?file_guid=<?php echo $file->getGUID(); ?>"><?php echo elgg_echo('image:edit'); ?></a>&nbsp;
- <?php echo elgg_view('output/confirmlink',array(
- 'href' => $vars['url'] . "action/tidypics/delete?file=" . $file->getGUID(),
- 'text' => elgg_echo("image:delete"),
- 'confirm' => elgg_echo("image:delete:confirm"),
- ));
- }
- ?>
+<div class="tidypics_download"><p><a href="<?php echo $vars['url']; ?>action/tidypics/download?file_guid=<?php echo $file_guid; ?>"><?php echo elgg_echo("image:download"); ?></a></p></div>
</div>
<div id="tidypics_info">
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index c1957d5d9..3c935e8c5 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -27,6 +27,35 @@
margin:10px;
}
+#group_albums_widget {
+-webkit-border-radius: 8px;
+-moz-border-radius: 8px;
+background:white none repeat scroll 0 0;
+margin:0 0 20px;
+padding:0 0 5px;
+}
+
+.tidypics_download a {
+ font: 12px/100% Arial, Helvetica, sans-serif;
+ font-weight: bold;
+ color: white;
+ background:#4690d6;
+ border:none;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ width: auto;
+ height: 25px;
+ padding: 3px 6px 3px 6px;
+ margin:10px 0 10px 0;
+ cursor: pointer;
+}
+.tidypics_download a:hover {
+ background: black;
+ color:white;
+ text-decoration: none;
+}
+
+
/* independent album view only */
.album_images{
diff --git a/views/default/tidypics/groupprofile_albums.php b/views/default/tidypics/groupprofile_albums.php
index ff63a38d1..d975f5f99 100644
--- a/views/default/tidypics/groupprofile_albums.php
+++ b/views/default/tidypics/groupprofile_albums.php
@@ -11,7 +11,7 @@ if ($vars['entity']->photos_enable != 'no') {
$owner = page_owner_entity();
$owner_albums = get_entities("object", "album", page_owner(), "", $number, 0, false);
- echo '<div id="group_albums_widget">';
+ echo '<div id="group_albums_widget">';
echo '<h2>' . elgg_echo('albums') . '</h2>';
if ($owner_albums) {
@@ -50,11 +50,11 @@ if ($vars['entity']->photos_enable != 'no') {
echo "</div>";
} else {
- echo '<div id="no_album_found">';
- echo '<p class="pages_add_title">'.elgg_echo("album:none").'</p>';
+ //echo '<div id="no_album_found">';
+ //echo '<p class="pages_add_title">'.elgg_echo("album:none").'</p>';
if ($owner && ($owner->canWriteToContainer($_SESSION['user']))){
- echo '<a class="add_topic_button" href='.$CONFIG->url .'pg/photos/new/'.$owner->username.'>'.elgg_echo("album:add").'</a>';
- echo '</div>';
+ //echo '<a class="add_topic_button" href='.$CONFIG->url .'pg/photos/new/'.$owner->username.'>'.elgg_echo("album:add").'</a>';
+ //echo '</div>';
}
}