aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-19 22:34:17 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-19 22:34:17 +0000
commit2da8c3e8428f09bab7aefa39cadc0a4f2d6f7a80 (patch)
treea29bd9de401337c69575b402793d0a8bef1f32e7 /views/default
parente99c8b979a149dc6693b0e82762a9ca550ece86b (diff)
downloadelgg-2da8c3e8428f09bab7aefa39cadc0a4f2d6f7a80.tar.gz
elgg-2da8c3e8428f09bab7aefa39cadc0a4f2d6f7a80.tar.bz2
improving interactions of widgets - containment wasn't working due to height issues
git-svn-id: http://code.elgg.org/elgg/trunk@7353 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default')
-rw-r--r--views/default/css.php12
-rw-r--r--views/default/layouts/widgets.php7
-rw-r--r--views/default/widgets/add_panel.php (renamed from views/default/widgets/add.php)2
-rw-r--r--views/default/widgets/settings.php (renamed from views/default/widgets/editwrapper.php)0
-rw-r--r--views/default/widgets/wrapper.php2
5 files changed, 16 insertions, 7 deletions
diff --git a/views/default/css.php b/views/default/css.php
index 29930d445..286beeece 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -881,21 +881,21 @@ li.navigation_more ul li {
margin-bottom: 15px;
margin-right: 5px;
}
-.widgets_add {
+.widgets_add_panel {
padding: 10px;
margin: 0 5px 15px;
background: #dedede;
}
-.widgets_add ul {
+.widgets_add_panel ul {
padding: 0;
margin: 0;
}
-.widgets_add li {
+.widgets_add_panel li {
float: left;
margin: 2px 10px;
list-style: none;
}
-.widgets_add li a {
+.widgets_add_panel li a {
display: block;
width: 200px;
padding: 4px;
@@ -906,7 +906,11 @@ li.navigation_more ul li {
padding: 2px;
margin: 0 5px 15px;
}
+.widget:hover {
+ background-color: #cccccc;
+}
.widget_title {
+ background-color: #dedede;
height: 30px;
line-height: 30px;
}
diff --git a/views/default/layouts/widgets.php b/views/default/layouts/widgets.php
index 055b0453e..692d01acc 100644
--- a/views/default/layouts/widgets.php
+++ b/views/default/layouts/widgets.php
@@ -25,9 +25,11 @@ if (elgg_can_edit_widgets()) {
'widgets' => $widgets,
'context' => $context,
);
- echo elgg_view('widgets/add', $params);
+ echo elgg_view('widgets/add_panel', $params);
}
+echo '<div class="widget_layout">';
+
echo $vars['box'];
$widget_class = "widget_{$num_columns}_columns";
@@ -43,4 +45,7 @@ for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
echo '</div>';
}
+echo '<div class="clearfloat"></div>';
+echo '</div>';
+
elgg_pop_context(); \ No newline at end of file
diff --git a/views/default/widgets/add.php b/views/default/widgets/add_panel.php
index c8576cf06..70d80f41c 100644
--- a/views/default/widgets/add.php
+++ b/views/default/widgets/add_panel.php
@@ -6,7 +6,7 @@ $widget_types = elgg_get_widget_types();
$context = $vars['context'];
?>
-<div class="widgets_add hidden">
+<div class="widgets_add_panel hidden">
<p>
<?php echo elgg_echo('widgets:add:description'); ?>
</p>
diff --git a/views/default/widgets/editwrapper.php b/views/default/widgets/settings.php
index 73166b718..73166b718 100644
--- a/views/default/widgets/editwrapper.php
+++ b/views/default/widgets/settings.php
diff --git a/views/default/widgets/wrapper.php b/views/default/widgets/wrapper.php
index 8e92c119b..6963989f9 100644
--- a/views/default/widgets/wrapper.php
+++ b/views/default/widgets/wrapper.php
@@ -35,7 +35,7 @@ $can_edit = $widget->canEdit();
</div>
<?php
if ($can_edit) {
- echo elgg_view('widgets/editwrapper', array('widget' => $widget));
+ echo elgg_view('widgets/settings', array('widget' => $widget));
}
?>
<div class="widget_content">