diff options
| -rw-r--r-- | actions/edit.php | 4 | ||||
| -rw-r--r-- | views/default/input/cover_checkbox.php | 39 | ||||
| -rw-r--r-- | views/default/tidypics/forms/edit.php | 23 |
3 files changed, 17 insertions, 49 deletions
diff --git a/actions/edit.php b/actions/edit.php index 359e83fb0..f5c66a1d8 100644 --- a/actions/edit.php +++ b/actions/edit.php @@ -15,6 +15,8 @@ $access = get_input('access_id');
$tags = get_input('tidypicstags');
$subtype = get_input('subtype');
+ $cover = get_input('cover');
+ if (is_array($cover)) $cover = $cover[0];
$container_guid = get_input('container_guid');
@@ -59,7 +61,7 @@ }
//if cover meta is sent from image save as metadata
- if ($subtype == 'image' && get_input('cover') == elgg_echo('album:cover:yes')) {
+ if ($subtype == 'image' && $cover == elgg_echo('album:cover')) {
$album = get_entity($container_guid);
$album->cover = $entity->guid;
}
diff --git a/views/default/input/cover_checkbox.php b/views/default/input/cover_checkbox.php deleted file mode 100644 index 04132661d..000000000 --- a/views/default/input/cover_checkbox.php +++ /dev/null @@ -1,39 +0,0 @@ -<?php
-
- /**
- * Elgg custom checkbox input used to define an album cover
- * @ forms/edit.php
- * i made custom check box because the default checkboxes allows for more than one box.
- * it handles the checkboxes via arrays, but i only need one and i did not want to use time figuring it all out
- * simple and sweet , one checkbox.
- *
- *
- * @uses $vars['value'] The current value, if any
- * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
- * @uses $vars['options'] An array of strings representing the options for the checkbox field
- *
- */
- - $class = $vars['class']; - if (!$class) $class = "input-checkboxes"; -
- foreach($vars['options'] as $label => $option) {
- - if ($option != $vars['value']) {
- $selected = "";
- } else {
- $selected = "checked = \"checked\"";
- }
-
- $labelint = (int) $label;
- if ("{$label}" == "{$labelint}") {
- $label = $option;
- } - - $disabled = ""; - if ($vars['disabled']) $disabled = ' disabled="yes" ';
- echo "<label><input type=\"checkbox\" $disabled {$vars['js']} name=\"{$vars['internalname']}\" {$selected} value=\"".htmlentities($option, null, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";
- }
-
-?>
\ No newline at end of file diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php index 533852413..a504cde60 100644 --- a/views/default/tidypics/forms/edit.php +++ b/views/default/tidypics/forms/edit.php @@ -72,21 +72,26 @@ <?php
if ($subtype == 'image') {
- // should this album be the cover for the album
-
- // try to determine if it is already the cover - the pass of this variable doesn't work - leave for next version
- $guid = $vars['entity']->guid;
$container_guid = $vars['entity']->container_guid;
- $cover_guid = get_entity($container_guid)->cover;
- if($cover_guid == $vars['entity']->guid)
- $cover = 'yes';
+
+ // should this image be the cover for the album - only ask for non-cover photos
+ // determine if it is already the cover
+ $img_guid = $vars['entity']->guid;
+ $album = get_entity($container_guid);
+ $cover_guid = $album->cover;
+
+ if ($cover_guid != $img_guid) {
?>
<p>
- <label><?php echo elgg_echo("album:cover"); ?></label>
- <?php echo elgg_view("input/cover_checkbox", array( "internalname" => "cover", "value" => $cover, 'options' => array(elgg_echo('album:cover:yes')))); ?>
+<?php echo elgg_view('input/checkboxes', array('internalname' => "cover",
+ 'options' => array(elgg_echo("album:cover")),
+ ));
+?>
</p>
<?php
+ }
+
} else {
// album so display access control
?>
|