aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-19 10:20:07 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-19 10:20:07 +0000
commit39b0af97296be5e21cf1a764addacca91349e58a (patch)
treea65631da99a3eb9913c9ed3ec5ea07313d9ac2f1
parent70ebf725581141737269ca02a4eca043ba5d680d (diff)
downloadelgg-39b0af97296be5e21cf1a764addacca91349e58a.tar.gz
elgg-39b0af97296be5e21cf1a764addacca91349e58a.tar.bz2
final amends to popups
git-svn-id: https://code.elgg.org/elgg/trunk@987 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--javascript/initialise_elgg.js34
-rw-r--r--views/default/canvas/layouts/widgets.php4
-rw-r--r--views/default/css.php5
3 files changed, 27 insertions, 16 deletions
diff --git a/javascript/initialise_elgg.js b/javascript/initialise_elgg.js
index f31b9f9a5..171874963 100644
--- a/javascript/initialise_elgg.js
+++ b/javascript/initialise_elgg.js
@@ -27,10 +27,14 @@ $(document).ready(function () {
});
- // more info buttons
- setupMoreInfoButton();
-
+ // bind more info buttons (wrapped in a function so it can be called when new widgets are dragged/created)
+ //setupMoreInfoButton();
widget_moreinfo();
+
+ // widget hover class
+ $("table.draggable_widget").bind("mouseenter mouseleave", function(e){
+ $(this).toggleClass("draggable_widget_over");
+ });
// remove widget button
@@ -106,7 +110,7 @@ $(document).ready(function () {
return false;
});
- setupMoreInfoButton();
+ widget_moreinfo();
$els.sortable( "refresh" );
@@ -131,7 +135,7 @@ $(document).ready(function () {
return false;
});
- setupMoreInfoButton();
+ widget_moreinfo();
$els.sortable( "refresh" );
@@ -201,9 +205,9 @@ function setupMoreInfoButton() {
}
-function widget_moreinfo() {
+function widget_moreinfo() {
- $("img.more_info").hover(function(e){
+ $("img.more_info").hover(function(e) {
var widgetdescription = $("input[@name='description']", this.parentNode.parentNode.parentNode ).attr('value');
@@ -212,16 +216,18 @@ function widget_moreinfo() {
$("#widget_moreinfo")
.css("top",(e.pageY + 10) + "px")
.css("left",(e.pageX + 10) + "px")
- .fadeIn("fast");
+ .fadeIn("medium");
},
- function(){
+ function() {
$("#widget_moreinfo").remove();
});
- $("img.more_info").mousemove(function(e){
- $("#widget_moreinfo")
- .css("top",(e.pageY + 10) + "px")
- .css("left",(e.pageX + 10) + "px");
- });
+
+ $("img.more_info").mousemove(function(e) {
+ //$("#widget_moreinfo")
+ // .css("top",(e.pageY + 10) + "px")
+ // .css("left",(e.pageX + 10) + "px");
+ });
+
};
diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php
index b6d8bcbf3..3ceb7305a 100644
--- a/views/default/canvas/layouts/widgets.php
+++ b/views/default/canvas/layouts/widgets.php
@@ -43,7 +43,7 @@
</h3>
</td>
<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td>
-<td width="17px" align="right"><a href="javascript:void(0);"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td>
<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td>
</tr></table>
@@ -195,6 +195,6 @@
</div><!-- /#wrapper_maincontent -->
<p></p><!-- necessary to avoid an ie7 bug? -->
</div><!-- /#layout_maincontent -->
-
+
<!-- This clearing element should immediately follow the #layout_maincontent to force the #container to contain all child floats -->
<div class="clearfloat"></div> \ No newline at end of file
diff --git a/views/default/css.php b/views/default/css.php
index ea7fef5e5..3ed6f2127 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -287,6 +287,11 @@ h6 { font-size: 0.8em; }
background: #cccccc;
margin: 10px 0 0 0;
vertical-align:text-top;
+ border:1px solid #cccccc;
+}
+
+.draggable_widget_over {
+ border: 1px solid white !important;
}
#widget_picker_gallery {