aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
Diffstat (limited to 'views/default')
-rw-r--r--views/default/object/image.php9
-rw-r--r--views/default/tidypics/forms/admin.php5
2 files changed, 11 insertions, 3 deletions
diff --git a/views/default/object/image.php b/views/default/object/image.php
index 21ee3ff1d..ebac9c775 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -200,12 +200,15 @@ if ($photo_tags) {
<div id="tidypics_info">
<?php if (!is_null($tags)) { ?>
<div class="object_tag_string"><?php echo elgg_view('output/tags',array('value' => $tags));?></div>
-<?php } ?>
-<div id="rate_container">
+<?php }
+ if (get_plugin_setting('photo_ratings', 'tidypics') != "disabled") {
+?>
+ <div id="rate_container">
<?php echo elgg_view('rate/rate', array('entity'=> $vars['entity'])); ?>
</div>
<?
-
+ }
+
echo elgg_echo('image:by');?> <b><a href="<?php echo $vars['url']; ?>pg/profile/<?php echo $owner->username; ?>"><?php echo $owner->name; ?></a></b> <?php echo $friendlytime;
?>
</div>
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index 64e1ed3d1..c5d71409c 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -45,6 +45,11 @@
if(!$download_link) $download_link = "enabled";
$form_body .= '<p class="admin_debug">' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => 'enabled'), 'internalname' => 'download_link', 'value' => $download_link )) . "</p>";
+ // Download Link
+ $photo_ratings = $plugin->photo_ratings;
+ if(!$photo_ratings) $photo_ratings = "disabled";
+ $form_body .= '<p class="admin_debug">' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:photo_ratings') => 'enabled'), 'internalname' => 'photo_ratings', 'value' => $photo_ratings )) . "</p>";
+
// Show EXIF
$exif = $plugin->exif;
if(!$exif) $exif = "disabled";