diff options
| -rw-r--r-- | views/default/js/tagging.php | 17 | ||||
| -rw-r--r-- | views/default/tidypics/tagging.php | 8 |
2 files changed, 22 insertions, 3 deletions
diff --git a/views/default/js/tagging.php b/views/default/js/tagging.php index a79914196..193ce1458 100644 --- a/views/default/js/tagging.php +++ b/views/default/js/tagging.php @@ -257,6 +257,8 @@ {
offsetY = 60;
+ stopTagging();
+
divWidth = $('#delete_tag_menu').width();
imgOffset = $('#tidypics_image').offset();
imgWidth = $('#tidypics_image').width();
@@ -279,4 +281,19 @@ }
);
}
+
+ function hideDeleteMenu()
+ {
+ $('#delete_tag_menu').hide();
+
+ // restart tag hovering
+ $('#tidypics_image').hover(
+ function(){
+ $('.tidypics_tag').show();
+ },
+ function(){
+ $('.tidypics_tag').hide();
+ }
+ );
+ }
</script>
\ No newline at end of file diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php index fcb0b8d4e..2cdc2f957 100644 --- a/views/default/tidypics/tagging.php +++ b/views/default/tidypics/tagging.php @@ -48,8 +48,8 @@ }
$content .= "</ul>";
- $content .= "<fieldset><button class='submit_button' type='submit'>" . elgg_echo('tidypics:actiontag') . "</button></fieldset>";
-
+ $content .= "<input type='submit' value='" . elgg_echo('tidypics:actiontag') . "' class='submit_button' />";
+
echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'form-phototagging', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'body' => $content));
?>
@@ -63,7 +63,9 @@ $name = "tags[{$id}]";
$content .= elgg_view("input/checkboxes", array('options' => array($text[0] => $text[0]), 'internalname' => $name, 'value' => '' ));
}
- $content .= "<fieldset><button class='submit_button' type='submit'>" . elgg_echo('tidypics:actiondelete') . "</button></fieldset>";
+
+ $content .= "<input type='submit' value='" . elgg_echo('tidypics:actiondelete') . "' class='submit_button' />";
+ $content .= "<input type='button' value='" . elgg_echo('cancel') . "' class='cancel_button' onclick='hideDeleteMenu();' />";
echo elgg_view('input/form', array('internalname' => 'form-deletetag', 'action' => "{$vars['url']}action/tidypics/deletetag", 'body' => $content));
|