Refs #2700 fixed the widget code with the new CSS element names

git-svn-id: http://code.elgg.org/elgg/trunk@7494 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/js/lib/ui.js b/js/lib/ui.js
index c079abda25b72de0c3ebfbd41b51cd110be0986c..01e6b65896d70e88694f767b916c87229bdf1f1a 100644 (file)
--- a/js/lib/ui.js
+++ b/js/lib/ui.js
@@ -2,7 +2,7 @@ elgg.provide('elgg.ui');
 \r
 elgg.ui.init = function () {\r
        //if the user clicks a system message, make it disappear\r
-       $('.elgg_system_message').live('click', function() {\r
+       $('.elgg-system-message').live('click', function() {\r
                $(this).stop().fadeOut('fast');\r
        });\r
        \r

diff --git a/js/lib/ui.widgets.js b/js/lib/ui.widgets.js
index 1f11f3465a448b54049f4291484769b10eaaca23..c33056d7c6bc64cffd9ae62204bf21afd4c7ac08 100644 (file)
--- a/js/lib/ui.widgets.js
+++ b/js/lib/ui.widgets.js
@@ -8,33 +8,33 @@ elgg.provide('elgg.ui.widgets');
 elgg.ui.widgets.init = function() {\r
 \r
        // widget layout?\r
-       if ($(".widget_column").length == 0) {\r
+       if ($(".widget-column").length == 0) {\r
                return;\r
        }\r
 \r
-       $(".widget_column").sortable({\r
+       $(".widget-column").sortable({\r
                items:                'div.widget',\r
-               connectWith:          '.widget_column',\r
-               handle:               'div.drag_handle',\r
+               connectWith:          '.widget-column',\r
+               handle:               'div.drag-handle',\r
                forcePlaceholderSize: true,\r
-               placeholder:          'widget_placeholder',\r
+               placeholder:          'widget-placeholder',\r
                opacity:              0.8,\r
                revert:               500,\r
                stop:                 elgg.ui.widgets.move\r
        });\r
 \r
-       $('#widget_add_button a').bind('click', function(event) {\r
-               $('.widgets_add_panel').slideToggle('medium');\r
+       $('#widget-add-button a').bind('click', function(event) {\r
+               $('.widgets-add-panel').slideToggle('medium');\r
                event.preventDefault();\r
        });\r
 \r
-       $('.widgets_add_panel li.widget_available').click(elgg.ui.widgets.add);\r
-       $('a.widget_delete_button').click(elgg.ui.widgets.remove);\r
-       $('a.widget_edit_button').click(elgg.ui.widgets.editToggle);\r
-       $('.widget_edit > form ').submit(elgg.ui.widgets.saveSettings);\r
-       $('a.widget_collapse_button').click(elgg.ui.widgets.collapseToggle);\r
+       $('.widgets-add-panel li.widget-available').click(elgg.ui.widgets.add);\r
+       $('a.widget-delete-button').click(elgg.ui.widgets.remove);\r
+       $('a.widget-edit-button').click(elgg.ui.widgets.editToggle);\r
+       $('.widget-edit > form ').submit(elgg.ui.widgets.saveSettings);\r
+       $('a.widget-collapse-button').click(elgg.ui.widgets.collapseToggle);\r
 \r
-       elgg.ui.widgets.equalHeight(".widget_column");\r
+       elgg.ui.widgets.equalHeight(".widget-column");\r
 };\r
 \r
 /**\r
@@ -46,15 +46,15 @@ elgg.ui.widgets.init = function() {
  * @return void\r
  */\r
 elgg.ui.widgets.add = function(event) {\r
-       // widget_type_<type>\r
+       // widget-type-<type>\r
        var type = $(this).attr('id');\r
-       type = type.substr(type.indexOf('widget_type_') + "widget_type_".length);\r
+       type = type.substr(type.indexOf('widget-type-') + "widget-type-".length);\r
 \r
        // if multiple instances not allow, disable this widget type add button\r
-       var multiple = $(this).attr('class').indexOf('widget_multiple') != -1;\r
+       var multiple = $(this).attr('class').indexOf('widget-multiple') != -1;\r
        if (multiple == false) {\r
-               $(this).addClass('widget_unavailable');\r
-               $(this).removeClass('widget_available');\r
+               $(this).addClass('widget-unavailable');\r
+               $(this).removeClass('widget-available');\r
                $(this).unbind('click', elgg.ui.widgets.add);\r
        }\r
 \r
@@ -62,15 +62,15 @@ elgg.ui.widgets.add = function(event) {
                data: {\r
                        handler: type,\r
                        user_guid: elgg.get_loggedin_userid(),\r
-                       context: $("input[name='widget_context']").val()\r
+                       context: $("input[name='widget-context']").val()\r
                },\r
                success: function(json) {\r
-                       $('#widget_col_1').prepend(json.output);\r
-                       var $widget = $('#widget_col_1').children(":first");\r
-                       $widget.find('a.widget_delete_button').click(elgg.ui.widgets.remove);\r
-                       $widget.find('a.widget_edit_button').click(elgg.ui.widgets.editToggle);\r
-                       $widget.find('a.widget_collapse_button').click(elgg.ui.widgets.collapseToggle);\r
-                       $widget.find('.widget_edit > form ').submit(elgg.ui.widgets.saveSettings);\r
+                       $('#widget-col-1').prepend(json.output);\r
+                       var $widget = $('#widget-col-1').children(":first");\r
+                       $widget.find('a.widget-delete-button').click(elgg.ui.widgets.remove);\r
+                       $widget.find('a.widget-edit-button').click(elgg.ui.widgets.editToggle);\r
+                       $widget.find('a.widget-collapse-button').click(elgg.ui.widgets.collapseToggle);\r
+                       $widget.find('.widget-edit > form ').submit(elgg.ui.widgets.saveSettings);\r
                }\r
        });\r
        event.preventDefault();\r
@@ -86,13 +86,13 @@ elgg.ui.widgets.add = function(event) {
  */\r
 elgg.ui.widgets.move = function(event, ui) {\r
 \r
-       // widget_<guid>\r
+       // widget-<guid>\r
        var guidString = ui.item.attr('id');\r
-       guidString = guidString.substr(guidString.indexOf('widget_') + "widget_".length);\r
+       guidString = guidString.substr(guidString.indexOf('widget-') + "widget-".length);\r
 \r
-       // widget_col_<column>\r
+       // widget-col-<column>\r
        var col = ui.item.parent().attr('id');\r
-       col = col.substr(col.indexOf('widget_col_') + "widget_col_".length);\r
+       col = col.substr(col.indexOf('widget-col-') + "widget-col-".length);\r
 \r
        elgg.action('widgets/move', {\r
                data: {\r
@@ -120,22 +120,22 @@ elgg.ui.widgets.remove = function(event) {
 \r
        // if widget type is single instance type, enable the add buton\r
        var type = $widget.attr('class');\r
-       // widget_instance_<type>\r
-       type = type.substr(type.indexOf('widget_instance_') + "widget_instance_".length);\r
-       $button = $('#widget_type_' + type);\r
-       var multiple = $button.attr('class').indexOf('widget_multiple') != -1;\r
+       // widget-instance-<type>\r
+       type = type.substr(type.indexOf('widget-instance-') + "widget-instance-".length);\r
+       $button = $('#widget-type-' + type);\r
+       var multiple = $button.attr('class').indexOf('widget-multiple') != -1;\r
        if (multiple == false) {\r
-               $button.addClass('widget_available');\r
-               $button.removeClass('widget_unavailable');\r
+               $button.addClass('widget-available');\r
+               $button.removeClass('widget-unavailable');\r
                $button.unbind('click', elgg.ui.widgets.add); // make sure we don't bind twice\r
                $button.click(elgg.ui.widgets.add);\r
        }\r
 \r
        $widget.remove();\r
 \r
-       // widget_delete_button_<guid>\r
+       // widget-delete-button-<guid>\r
        var id = $(this).attr('id');\r
-       id = id.substr(id.indexOf('widget_delete_button_') + "widget_delete_button_".length);\r
+       id = id.substr(id.indexOf('widget-delete-button-') + "widget-delete-button-".length);\r
 \r
        elgg.action('widgets/delete', {\r
                data: {\r
@@ -154,7 +154,7 @@ elgg.ui.widgets.remove = function(event) {
  * @return void\r
  */\r
 elgg.ui.widgets.editToggle = function(event) {\r
-       $(this).parent().parent().find('.widget_edit').slideToggle('medium');\r
+       $(this).parent().parent().find('.widget-edit').slideToggle('medium');\r
        event.preventDefault();\r
 }\r
 \r
@@ -165,8 +165,8 @@ elgg.ui.widgets.editToggle = function(event) {
  * @return void\r
  */\r
 elgg.ui.widgets.collapseToggle = function(event) {\r
-       $(this).toggleClass('widget_collapsed');\r
-       $(this).parent().parent().find('.widget_container').slideToggle('medium');\r
+       $(this).toggleClass('widget-collapsed');\r
+       $(this).parent().parent().find('.widget-container').slideToggle('medium');\r
        event.preventDefault();\r
 }\r
 \r
@@ -180,7 +180,7 @@ elgg.ui.widgets.collapseToggle = function(event) {
  */\r
 elgg.ui.widgets.saveSettings = function(event) {\r
        $(this).parent().slideToggle('medium');\r
-       var $widgetContent = $(this).parent().parent().children('.widget_content');\r
+       var $widgetContent = $(this).parent().parent().children('.widget-content');\r
        // @todo - change to ajax loader\r
        $widgetContent.html('loading');\r
        elgg.action('widgets/save', {\r

diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php
index 5157bb8bc8203b7ec24d5e0c4175def8cbb6dafc..0db4b88bba551164ec6478837db26b6607b21405 100644 (file)
--- a/views/default/js/initialise_elgg.php
+++ b/views/default/js/initialise_elgg.php
@@ -145,14 +145,14 @@ $(document).ready(function () {
                }
        });
 
-       elgg-system-message();
+       elgg_system_message();
 
 }); /* end document ready function */
 
 
 
 // display & hide elgg system messages
-function elgg-system-message() {
+function elgg_system_message() {
        $("#elgg-system-message").animate({opacity: 0.9}, 1000);
        $("#elgg-system-message").animate({opacity: 0.9}, 5000);
        $("#elgg-system-message").fadeOut('slow');

diff --git a/views/default/layouts/widgets.php b/views/default/layouts/widgets.php
index c5607314aec9f5d3bf95d9e76c46a79cf3a46892..130b2eaad8fe3969378fab6d6900d003d09530b3 100644 (file)
--- a/views/default/layouts/widgets.php
+++ b/views/default/layouts/widgets.php
@@ -30,11 +30,11 @@ if (elgg_can_edit_widget_layout($context)) {
 
 echo $vars['box'];
 
-$widget_class = "widget_{$num_columns}_columns";
+$widget_class = "widget-{$num_columns}-columns";
 for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
        $column_widgets = $widgets[$column_index];
 
-       echo "<div class=\"widget-column $widget_class\" id=\"widget_col_$column_index\">";
+       echo "<div class=\"widget-column $widget_class\" id=\"widget-col-$column_index\">";
        if (is_array($column_widgets) && sizeof($column_widgets) > 0) {
                foreach ($column_widgets as $widget) {
                        echo elgg_view_entity($widget);

diff --git a/views/default/widgets/add_panel.php b/views/default/widgets/add_panel.php
index 9dbc8f78f2f53d8f30b401f42d0491e76e0ef67a..d9acc55189e82bb8c6489fd846629efa6a77aaab 100644 (file)
--- a/views/default/widgets/add_panel.php
+++ b/views/default/widgets/add_panel.php
@@ -20,7 +20,7 @@ foreach ($widgets as $column_widgets) {
        <ul>
 <?php
                foreach ($widget_types as $handler => $widget_type) {
-                       $id = "widget_type_$handler";
+                       $id = "widget-type-$handler";
                        // check if widget added and only one instance allowed
                        if ($widget_type->multiple == false && in_array($handler, $current_handlers)) {
                                $class = 'widget-unavailable';
@@ -31,9 +31,9 @@ foreach ($widgets as $column_widgets) {
                        }
 
                        if ($widget_type->multiple) {
-                               $class .= ' widget_multiple';
+                               $class .= ' widget-multiple';
                        } else {
-                               $class .= ' widget_single';
+                               $class .= ' widget-single';
                        }
 
                        echo "<li title=\"$tooltip\" id=\"$id\" class=\"$class\">$widget_type->name</li>";
@@ -42,7 +42,7 @@ foreach ($widgets as $column_widgets) {
        </ul>
 <?php
        $params = array(
-               'internalname' => 'widget_context',
+               'internalname' => 'widget-context',
                'value' => $context
        );
        echo elgg_view('input/hidden', $params);

diff --git a/views/default/widgets/wrapper.php b/views/default/widgets/wrapper.php
index 4483be8870913bad43586dde723fdd3cee7f322a..2f82426ab3955ef1ca071b783f16ee6b62b0d7c6 100644 (file)
--- a/views/default/widgets/wrapper.php
+++ b/views/default/widgets/wrapper.php
@@ -20,8 +20,8 @@ $title = $widget->getTitle();
 
 $can_edit = $widget->canEdit();
 
-$widget_id = "widget_$widget->guid";
-$widget_instance = "widget_instance_$handler";
+$widget_id = "widget-$widget->guid";
+$widget_instance = "widget-instance-$handler";
 
 ?>
 <div class="widget draggable <?php echo $widget_instance?>" id="<?php echo $widget_id; ?>">