diff options
| -rw-r--r-- | docs/css_guide.txt | 14 | ||||
| -rw-r--r-- | views/default/js/tagging.php | 26 | ||||
| -rw-r--r-- | views/default/tidypics/css.php | 12 | ||||
| -rw-r--r-- | views/default/tidypics/image_menu.php | 2 | ||||
| -rw-r--r-- | views/default/tidypics/tagging.php | 20 |
5 files changed, 37 insertions, 37 deletions
diff --git a/docs/css_guide.txt b/docs/css_guide.txt index 235410963..9663cad1a 100644 --- a/docs/css_guide.txt +++ b/docs/css_guide.txt @@ -14,7 +14,7 @@ CSS elements: #tidypics_desc - description/caption in image and album views
-#tidypics_info - holds metadata about image/album like tags
+.tidypics_info - holds metadata about image/album like tags
#tidypics_controls - image view controls (download, start tagging, etc.)
@@ -68,17 +68,17 @@ CSS elements: .river_object_album_comment
/* ----------- tagging ---------------- */
-#tagging_instructions
+#tidypics_tag_instructions
-#tag_instruct_text
+#tidypics_tag_instruct_text
-#tag_instruct_button_div
+#tidypics_tag_instruct_button_div
-#tag_instruct_button
+#tidypics_tag_instruct_button
-#tag_menu
+#tidypics_tag_menu
-#delete_tag_menu
+#tidypics_delete_tag_menu
.tidypics_tag
diff --git a/views/default/js/tagging.php b/views/default/js/tagging.php index 193ce1458..586291b4c 100644 --- a/views/default/js/tagging.php +++ b/views/default/js/tagging.php @@ -12,9 +12,9 @@ // add to DOM as soon as ready
$(document).ready(function () {
- $('ul#phototagging-menu li').quicksearch({
+ $('ul#tidypics_phototag_list li').quicksearch({
position: 'before',
- attached: 'ul#phototagging-menu',
+ attached: 'ul#tidypics_phototag_list',
loaderText: '',
inputClass: 'input-filter',
labelText: "<p><?php echo elgg_echo('tidypics:tagthisphoto'); ?></p>",
@@ -59,7 +59,7 @@ addTagEvents();
- $('.phototag-links').hover(
+ $('.tidypics_phototag_links').hover(
function(){
code = this.id.substr(7); // cut off taglink to get unique id
$('#tag'+code).show();
@@ -136,10 +136,10 @@ tagging = 1;
- $('#tag_control').text("Stop Tagging");
+ $('#tidypics_tag_control').text("Stop Tagging");
showTagInstruct();
- $('#delete_tag_menu').hide();
+ $('#tidypics_delete_tag_menu').hide();
$('#tidypics_image').hover(
function(){
@@ -169,7 +169,7 @@ hideTagInstruct();
hideTagMenu();
- $('#tag_control').text("Tag this photo");
+ $('#tidypics_tag_control').text("Tag this photo");
$('img#tidypics_image').imgAreaSelect( {hide: true, disable: true} );
@@ -197,7 +197,7 @@ _top = imgOffset.top + oCoordenates.y2;
_left = imgOffset.left + oCoordenates.x2 + offsetX;
- $('#tag_menu').show().css({
+ $('#tidypics_tag_menu').show().css({
"top": _top + "px",
"left": _left + "px"
});
@@ -209,14 +209,14 @@ function hideTagMenu()
{
- $('#tag_menu').hide();
+ $('#tidypics_tag_menu').hide();
}
function showTagInstruct()
{
offsetY = -60;
- divWidth = $('#tagging_instructions').width();
+ divWidth = $('#tidypics_tag_instructions').width();
imgOffset = $('#tidypics_image').offset();
imgWidth = $('#tidypics_image').width();
offsetX = parseInt((imgWidth - divWidth)/2);
@@ -224,7 +224,7 @@ _top = imgOffset.top + offsetY;
_left = imgOffset.left + offsetX;
- $('#tagging_instructions').show().css({
+ $('#tidypics_tag_instructions').show().css({
"top": _top + "px",
"left": _left + "px"
});
@@ -232,7 +232,7 @@ function hideTagInstruct()
{
- $('#tagging_instructions').hide();
+ $('#tidypics_tag_instructions').hide();
}
function addTag()
@@ -267,7 +267,7 @@ _top = imgOffset.top + offsetY;
_left = imgOffset.left + offsetX;
- $('#delete_tag_menu').show().css({
+ $('#tidypics_delete_tag_menu').show().css({
"top": _top + "px",
"left": _left + "px"
});
@@ -284,7 +284,7 @@ function hideDeleteMenu()
{
- $('#delete_tag_menu').hide();
+ $('#tidypics_delete_tag_menu').hide();
// restart tag hovering
$('#tidypics_image').hover(
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index ec4757c2c..032388813 100644 --- 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 5940a0138..b4597a99f 100644 --- 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
if ($viewer && $viewer->guid == $owner->guid || user_is_friend($owner->guid, $viewer->guid)) {
?>
-<li id="start_tagging"><a id="tag_control" href="javascript:void(0)" onclick="startTagging()"><?= elgg_echo('tidypics:tagthisphoto') ?></a></li>
+<li id="start_tagging"><a id="tidypics_tag_control" href="javascript:void(0)" onclick="startTagging()"><?= elgg_echo('tidypics:tagthisphoto') ?></a></li>
<?php
}
diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php index 2cdc2f957..400e6f1ba 100644 --- a/views/default/tidypics/tagging.php +++ b/views/default/tidypics/tagging.php @@ -14,7 +14,7 @@ <ul>
<?php
foreach ($links as $id=>$link) {
- echo "<li><a class='phototag-links' id='taglink{$id}' href='{$link[1]}'>{$link[0]}</a></li>";
+ echo "<li><a class='tidypics_phototag_links' id='taglink{$id}' href='{$link[1]}'>{$link[0]}</a></li>";
}
?>
</ul>
@@ -22,11 +22,11 @@ <?php
}
?>
-<div id='tagging_instructions'>
- <div id='tag_instruct_text'><?php echo elgg_echo('tidypics:taginstruct'); ?></div>
- <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>
+<div id='tidypics_tag_instructions'>
+ <div id='tidypics_tag_instruct_text'><?php echo elgg_echo('tidypics:taginstruct'); ?></div>
+ <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>
</div>
-<div id="tag_menu">
+<div id="tidypics_tag_menu">
<?php
if($viewer) {
@@ -37,7 +37,7 @@ $content .= "<input type='hidden' name='user_id' id='user_id' value='' />";
$content .= "<input type='hidden' name='word' id='word' value='' />";
- $content .= "<ul id='phototagging-menu'>";
+ $content .= "<ul id='tidypics_phototag_list'>";
$content .= "<li><a href='javascript:void(0)' onClick='selectUser({$viewer->getGUID()},\"{$viewer->name}\")'> {$viewer->name} (" . elgg_echo('me') . ")</a></li>";
if ($friends) {
@@ -50,11 +50,11 @@ $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));
+ echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'tidypics_phototag_form', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'body' => $content));
?>
</div>
-<div id="delete_tag_menu">
+<div id="tidypics_delete_tag_menu">
<?php
if ($photo_tags) {
echo elgg_echo('tidypics:deltag_title') . '<br />';
@@ -67,10 +67,10 @@ $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));
+ echo elgg_view('input/form', array('internalname' => 'phototag_deletetag_form', 'action' => "{$vars['url']}action/tidypics/deletetag", 'body' => $content));
}
- echo '</div>'; // delete_tag_menu
+ echo '</div>'; // tidypics_delete_tag_menu
echo elgg_view('js/tagging', array('photo_tags_json' => $photo_tags_json,) );
?>
\ No newline at end of file |