aboutsummaryrefslogtreecommitdiff
path: root/views/default/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'views/default/widgets')
-rw-r--r--views/default/widgets/controls.php6
-rw-r--r--views/default/widgets/wrapper.php21
2 files changed, 14 insertions, 13 deletions
diff --git a/views/default/widgets/controls.php b/views/default/widgets/controls.php
index 891a53595..4336a3506 100644
--- a/views/default/widgets/controls.php
+++ b/views/default/widgets/controls.php
@@ -9,7 +9,8 @@
$widget = $vars['widget'];
$params = array(
- 'text' => 'delete',
+ 'text' => ' ',
+ 'title' => elgg_echo('widget:delete', array($widget->getTitle())),
'href' => elgg_get_site_url() . "action/widgets/delete?guid=$widget->guid",
'is_action' => true,
'class' => 'widget_delete_button',
@@ -18,7 +19,8 @@ $params = array(
$delete_link = elgg_view('output/url', $params);
$params = array(
- 'text' => 'edit',
+ 'text' => ' ',
+ 'title' => elgg_echo('widget:edit'),
'href' => "#",
'class' => 'widget_edit_button',
'internalid' => "widget_edit_button_$widget->guid"
diff --git a/views/default/widgets/wrapper.php b/views/default/widgets/wrapper.php
index a8651e666..8d589aabd 100644
--- a/views/default/widgets/wrapper.php
+++ b/views/default/widgets/wrapper.php
@@ -16,10 +16,7 @@ $widgettypes = elgg_get_widget_types('all');
$handler = $widget->handler;
-$title = $widget->title;
-if (!$title) {
- $title = $widgettypes[$handler]->name;
-}
+$title = $widget->getTitle();
$can_edit = $widget->canEdit();
@@ -36,12 +33,14 @@ $widget_instance = "widget_instance_$handler";
}
?>
</div>
- <?php
- if ($can_edit) {
- echo elgg_view('widgets/settings', array('widget' => $widget));
- }
- ?>
- <div class="widget_content">
- <?php echo elgg_view("widgets/$handler/view", $vars); ?>
+ <div class="widget_container">
+ <?php
+ if ($can_edit) {
+ echo elgg_view('widgets/settings', array('widget' => $widget));
+ }
+ ?>
+ <div class="widget_content">
+ <?php echo elgg_view("widgets/$handler/view", $vars); ?>
+ </div>
</div>
</div>