continuing to work on cleaning up css

diff --git a/docs/css_guide.txt b/docs/css_guide.txt
index 235410963579bd5ee796c8f5dac8c4c20ffc0ee8..9663cad1aaeefcad95d2afd3ad4ae00920367444 100644 (file)
--- a/docs/css_guide.txt
+++ b/docs/css_guide.txt
@@ -14,7 +14,7 @@ CSS elements:
 \r
 #tidypics_desc - description/caption in image and album views \r
 \r
-#tidypics_info - holds metadata about image/album like tags\r
+.tidypics_info - holds metadata about image/album like tags\r
 \r
 #tidypics_controls - image view controls (download, start tagging, etc.)\r
 \r
@@ -68,17 +68,17 @@ CSS elements:
 .river_object_album_comment \r
 \r
 /* ----------- tagging ---------------- */\r
-#tagging_instructions \r
+#tidypics_tag_instructions \r
 \r
-#tag_instruct_text \r
+#tidypics_tag_instruct_text \r
 \r
-#tag_instruct_button_div \r
+#tidypics_tag_instruct_button_div \r
 \r
-#tag_instruct_button \r
+#tidypics_tag_instruct_button \r
 \r
-#tag_menu \r
+#tidypics_tag_menu \r
 \r
-#delete_tag_menu \r
+#tidypics_delete_tag_menu \r
 \r
 .tidypics_tag \r
 \r

diff --git a/views/default/js/tagging.php b/views/default/js/tagging.php
index 193ce14584c03fd0f3d0431cdb6c1e097dd0d4a5..586291b4cc16aa2703eb4f7fd2378018de8753a8 100644 (file)
--- a/views/default/js/tagging.php
+++ b/views/default/js/tagging.php
@@ -12,9 +12,9 @@
 \r
        // add to DOM as soon as ready\r
        $(document).ready(function () {\r
-                       $('ul#phototagging-menu li').quicksearch({\r
+                       $('ul#tidypics_phototag_list li').quicksearch({\r
                                position: 'before',\r
-                               attached: 'ul#phototagging-menu',\r
+                               attached: 'ul#tidypics_phototag_list',\r
                                loaderText: '',\r
                                inputClass: 'input-filter',\r
                                labelText: "<p><?php echo elgg_echo('tidypics:tagthisphoto'); ?></p>",\r
@@ -59,7 +59,7 @@
 \r
                addTagEvents();\r
                \r
-               $('.phototag-links').hover(\r
+               $('.tidypics_phototag_links').hover(\r
                        function(){\r
                                code = this.id.substr(7); // cut off taglink to get unique id\r
                                $('#tag'+code).show();\r
@@ -136,10 +136,10 @@
                \r
                tagging = 1;\r
                \r
-               $('#tag_control').text("Stop Tagging");\r
+               $('#tidypics_tag_control').text("Stop Tagging");\r
                \r
                showTagInstruct();\r
-               $('#delete_tag_menu').hide();\r
+               $('#tidypics_delete_tag_menu').hide();\r
 \r
                $('#tidypics_image').hover(\r
                        function(){\r
@@ -169,7 +169,7 @@
                hideTagInstruct();\r
                hideTagMenu();\r
 \r
-               $('#tag_control').text("Tag this photo");\r
+               $('#tidypics_tag_control').text("Tag this photo");\r
 \r
                $('img#tidypics_image').imgAreaSelect( {hide: true, disable: true} );\r
 \r
@@ -197,7 +197,7 @@
                        _top = imgOffset.top + oCoordenates.y2;\r
                        _left = imgOffset.left + oCoordenates.x2 + offsetX;\r
 \r
-                       $('#tag_menu').show().css({\r
+                       $('#tidypics_tag_menu').show().css({\r
                                "top": _top + "px",\r
                                "left": _left + "px"\r
                        });\r
@@ -209,14 +209,14 @@
 \r
        function hideTagMenu()\r
        {\r
-               $('#tag_menu').hide();\r
+               $('#tidypics_tag_menu').hide();\r
        }\r
 \r
        function showTagInstruct()\r
        {\r
                offsetY = -60;\r
                \r
-               divWidth = $('#tagging_instructions').width();\r
+               divWidth = $('#tidypics_tag_instructions').width();\r
                imgOffset = $('#tidypics_image').offset();\r
                imgWidth  = $('#tidypics_image').width();\r
                offsetX   = parseInt((imgWidth - divWidth)/2);\r
@@ -224,7 +224,7 @@
                _top = imgOffset.top + offsetY;\r
                _left = imgOffset.left + offsetX;\r
 \r
-               $('#tagging_instructions').show().css({\r
+               $('#tidypics_tag_instructions').show().css({\r
                        "top": _top + "px",\r
                        "left": _left + "px"\r
                });\r
@@ -232,7 +232,7 @@
 \r
        function hideTagInstruct()\r
        {\r
-               $('#tagging_instructions').hide();\r
+               $('#tidypics_tag_instructions').hide();\r
        }\r
 \r
        function addTag()\r
@@ -267,7 +267,7 @@
                _top = imgOffset.top + offsetY;\r
                _left = imgOffset.left + offsetX;\r
 \r
-               $('#delete_tag_menu').show().css({\r
+               $('#tidypics_delete_tag_menu').show().css({\r
                        "top": _top + "px",\r
                        "left": _left + "px"\r
                });\r
@@ -284,7 +284,7 @@
        \r
        function hideDeleteMenu()\r
        {\r
-               $('#delete_tag_menu').hide();\r
+               $('#tidypics_delete_tag_menu').hide();\r
                \r
                // restart tag hovering\r
                $('#tidypics_image').hover(\r

diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index ec4757c2c801575ae09c8125560fdeeebd93e031..03238881324785f1a5a1c827c34a25b082208639 100644 (file)
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -176,7 +176,7 @@ padding:0 0 5px;
 }
 
 /* ----------- tagging ---------------- */
-#tagging_instructions {
+#tidypics_tag_instructions {
 background:#BBDAF7; 
 border:1px solid #4690D6;  
 padding:10px;
@@ -188,21 +188,21 @@ position:absolute;
 z-index:10000;
 }
 
-#tag_instruct_text {
+#tidypics_tag_instruct_text {
 padding-top: 3px;
 float: left;
 }
 
-#tag_instruct_button_div {
+#tidypics_tag_instruct_button_div {
 float: left;
 margin-left: 15px;
 }
 
-#tag_instruct_button {
+#tidypics_tag_instruct_button {
 margin:0;
 }
 
-#tag_menu {
+#tidypics_tag_menu {
 border:1px solid #3B5999; 
 width:200px; 
 position:absolute;
@@ -214,7 +214,7 @@ font-size:12px;
 text-align:left;
 }
 
-#delete_tag_menu {
+#tidypics_delete_tag_menu {
 border:1px solid #3B5999; 
 width:200px; 
 position:absolute;

diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php
index 5940a013862e9f08b67a4b10b6eaca28e3dc9ffd..b4597a99fbb327dd64a22398fbb8085f716966ca 100644 (file)
--- a/views/default/tidypics/image_menu.php
+++ b/views/default/tidypics/image_menu.php
@@ -19,7 +19,7 @@
                // only owner and friends of owner can tag\r
                if ($viewer && $viewer->guid == $owner->guid || user_is_friend($owner->guid, $viewer->guid)) {\r
 ?>\r
-<li id="start_tagging"><a id="tag_control" href="javascript:void(0)" onclick="startTagging()"><?= elgg_echo('tidypics:tagthisphoto') ?></a></li>\r
+<li id="start_tagging"><a id="tidypics_tag_control" href="javascript:void(0)" onclick="startTagging()"><?= elgg_echo('tidypics:tagthisphoto') ?></a></li>\r
 <?php\r
                }\r
                \r

diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php
index 2cdc2f95761b4addea937de15bf1396d7670bcb5..400e6f1ba1093c7fa527121acd52ae46634eaa1a 100644 (file)
--- a/views/default/tidypics/tagging.php
+++ b/views/default/tidypics/tagging.php
@@ -14,7 +14,7 @@
        <ul>\r
 <?php\r
                foreach ($links as $id=>$link) {\r
-                       echo "<li><a class='phototag-links' id='taglink{$id}' href='{$link[1]}'>{$link[0]}</a></li>";\r
+                       echo "<li><a class='tidypics_phototag_links' id='taglink{$id}' href='{$link[1]}'>{$link[0]}</a></li>";\r
                }\r
 ?>\r
        </ul>\r
@@ -22,11 +22,11 @@
 <?php \r
        } \r
 ?>\r
-<div id='tagging_instructions'>\r
-       <div id='tag_instruct_text'><?php echo elgg_echo('tidypics:taginstruct'); ?></div>\r
-       <div id='tag_instruct_button_div'><button class='submit_button' id='tag_instruct_button' onclick='stopTagging()'><?php echo elgg_echo('tidypics:finish_tagging'); ?></button></div>\r
+<div id='tidypics_tag_instructions'>\r
+       <div id='tidypics_tag_instruct_text'><?php echo elgg_echo('tidypics:taginstruct'); ?></div>\r
+       <div id='tidypics_tag_instruct_button_div'><button class='submit_button' id='tidypics_tag_instruct_button' onclick='stopTagging()'><?php echo elgg_echo('tidypics:finish_tagging'); ?></button></div>\r
 </div>\r
-<div id="tag_menu">\r
+<div id="tidypics_tag_menu">\r
 <?php\r
 \r
        if($viewer) {\r
@@ -37,7 +37,7 @@
                $content .= "<input type='hidden' name='user_id' id='user_id' value='' />";\r
                $content .= "<input type='hidden' name='word' id='word' value='' />";\r
        \r
-               $content .= "<ul id='phototagging-menu'>";\r
+               $content .= "<ul id='tidypics_phototag_list'>";\r
                $content .= "<li><a href='javascript:void(0)' onClick='selectUser({$viewer->getGUID()},\"{$viewer->name}\")'> {$viewer->name} (" . elgg_echo('me') . ")</a></li>";\r
        \r
                if ($friends) {\r
@@ -50,11 +50,11 @@
 \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
+       echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'tidypics_phototag_form', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'body' => $content));\r
 \r
 ?>\r
 </div>\r
-<div id="delete_tag_menu">\r
+<div id="tidypics_delete_tag_menu">\r
 <?php\r
        if ($photo_tags) {\r
                echo elgg_echo('tidypics:deltag_title') . '<br />';\r
@@ -67,10 +67,10 @@
                $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
+               echo elgg_view('input/form', array('internalname' => 'phototag_deletetag_form', 'action' => "{$vars['url']}action/tidypics/deletetag", 'body' => $content));\r
 \r
        }\r
-       echo '</div>'; // delete_tag_menu\r
+       echo '</div>'; // tidypics_delete_tag_menu\r
        \r
        echo elgg_view('js/tagging', array('photo_tags_json' => $photo_tags_json,) );\r
 ?>
\ No newline at end of file