added cancel button to delete tag menu and cleaned up submit buttons

diff --git a/views/default/js/tagging.php b/views/default/js/tagging.php
index a79914196ae0ae6ecfcb286d7e3752414fc14bbb..193ce14584c03fd0f3d0431cdb6c1e097dd0d4a5 100644 (file)
--- a/views/default/js/tagging.php
+++ b/views/default/js/tagging.php
@@ -257,6 +257,8 @@
        {\r
                offsetY = 60;\r
                \r
+               stopTagging();\r
+               \r
                divWidth = $('#delete_tag_menu').width();\r
                imgOffset = $('#tidypics_image').offset();\r
                imgWidth  = $('#tidypics_image').width();\r
@@ -279,4 +281,19 @@
                        }\r
                );\r
        }\r
+       \r
+       function hideDeleteMenu()\r
+       {\r
+               $('#delete_tag_menu').hide();\r
+               \r
+               // restart tag hovering\r
+               $('#tidypics_image').hover(\r
+                       function(){\r
+                               $('.tidypics_tag').show();\r
+                       },\r
+                       function(){\r
+                               $('.tidypics_tag').hide();\r
+                       }\r
+               );\r
+       }\r
 </script>
\ No newline at end of file

diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php
index fcb0b8d4e291c0e0138a091e3bc1edc651cbd04e..2cdc2f95761b4addea937de15bf1396d7670bcb5 100644 (file)
--- a/views/default/tidypics/tagging.php
+++ b/views/default/tidypics/tagging.php
@@ -48,8 +48,8 @@
        }\r
        $content .= "</ul>";\r
 \r
-       $content .= "<fieldset><button class='submit_button' type='submit'>" . elgg_echo('tidypics:actiontag') . "</button></fieldset>";\r
-\r
+       $content .= "<input type='submit' value='" . elgg_echo('tidypics:actiontag') . "' class='submit_button' />";\r
+       \r
        echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'form-phototagging', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'body' => $content));\r
 \r
 ?>\r
@@ -63,7 +63,9 @@
                        $name = "tags[{$id}]";\r
                        $content .= elgg_view("input/checkboxes", array('options' => array($text[0] => $text[0]), 'internalname' => $name, 'value' => '' ));\r
                }\r
-               $content .= "<fieldset><button class='submit_button' type='submit'>" . elgg_echo('tidypics:actiondelete') . "</button></fieldset>";\r
+\r
+               $content .= "<input type='submit' value='" . elgg_echo('tidypics:actiondelete') . "' class='submit_button' />";\r
+               $content .= "<input type='button' value='" . elgg_echo('cancel') . "' class='cancel_button' onclick='hideDeleteMenu();' />"; \r
 \r
                echo elgg_view('input/form', array('internalname' => 'form-deletetag', 'action' => "{$vars['url']}action/tidypics/deletetag", 'body' => $content));\r
 \r