From: cash Date: Wed, 17 Nov 2010 03:33:06 +0000 (+0000) Subject: Refs #821 #1793 early widget layout - does not include edit settings, delete, collaps... X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=7c41b1812fdbd8b8e4f7d2d04446107feb50fd22;p=lorea%2Felgg.git Refs #821 #1793 early widget layout - does not include edit settings, delete, collapsing, reloading, or adding widgets git-svn-id: http://code.elgg.org/elgg/trunk@7329 36083f99-b078-4883-b0ff-0f9b5a30f544 --- diff --git a/js/lib/ui.widgets.js b/js/lib/ui.widgets.js index bce5aea0f..cf13d6e95 100644 --- a/js/lib/ui.widgets.js +++ b/js/lib/ui.widgets.js @@ -1,45 +1,14 @@ elgg.provide('elgg.ui.widgets'); elgg.ui.widgets.init = function() { - // COLLAPSABLE WIDGETS (on Dashboard & Profile pages) - $('a.toggle_box_contents').live('click', elgg.ui.widgets.toggleContent); - $('a.toggle_box_edit_panel').live('click', elgg.ui.widgets.toggleEditPanel); - $('a.toggle_customise_edit_panel').live('click', elgg.ui.widgets.toggleCustomizeEditPanel); - - // WIDGET GALLERY EDIT PANEL - // Sortable widgets - var els = [ - '#leftcolumn_widgets', - '#middlecolumn_widgets', - '#rightcolumn_widgets', - '#widget_picker_gallery' - ].join(','); - - $(els).sortable({ - items: '.draggable_widget', - handle: '.drag_handle', + $(".widget_column" ).sortable({ + items: 'div.widget', + connectWith: '.widget_column', + handle: 'div.drag_handle', forcePlaceholderSize: true, - placeholder: 'ui-state-highlight', - cursor: 'move', - opacity: 0.9, - appendTo: 'body', - connectWith: els, - stop: function(e, ui) { - // refresh list before updating hidden fields with new widget order - $(this).sortable("refresh"); - - var widgetNamesLeft = elgg.ui.widgets.outputList('#leftcolumn_widgets'), - widgetNamesMiddle = elgg.ui.widgets.outputList('#middlecolumn_widgets'), - widgetNamesRight = elgg.ui.widgets.outputList('#rightcolumn_widgets'); - - $('#debugField1').val(widgetNamesLeft); - $('#debugField2').val(widgetNamesMiddle); - $('#debugField3').val(widgetNamesRight); - } + placeholder: 'widget_placeholder' }); - // bind more info buttons - called when new widgets are created - elgg.ui.widgets.moreinfo(); }; //List active widgets for each page column @@ -109,18 +78,6 @@ elgg.ui.widgets.toggleContent = function(e) { return false; }; -// toggle widget box edit panel -elgg.ui.widgets.toggleEditPanel = function () { - $(this.parentNode.parentNode).children(".collapsable_box_editpanel").slideToggle("fast"); - return false; -}; - -// toggle customise edit panel -elgg.ui.widgets.toggleCustomizeEditPanel = function () { - $('#customise_editpanel').slideToggle("fast"); - return false; -}; - /** * @deprecated Use elgg.ui.widgets.* */ diff --git a/views/default/css.php b/views/default/css.php index 923d7c958..8409ceb8b 100644 --- a/views/default/css.php +++ b/views/default/css.php @@ -17,6 +17,7 @@ SUBMENU current page/tool submenu in sidebar PAGINATION re-usable default page navigation ELGG TABBED NAVIGATION re-usable tabbed navigation + WIDGETS LOGIN / REGISTER login box, register, and lost password page styles CONTENT HEADER DEFAULT COMMENTS @@ -25,7 +26,7 @@ GENERAL FORM ELEMENTS default styles for all elgg input/form elements FRIENDS PICKER LIKES - + MISC */ /* Colors: @@ -855,6 +856,54 @@ li.navigation_more ul li { background: white; } +/* *************************************** + WIDGETS +*************************************** */ +.widget_column { + float: right; + min-height: 15px; +} +.widget_col_1 { + width: 100%; +} +.widget_col_2 { + width: 48%; + margin-right: 4%; +} +.widget_col_3 { + width: 32%; + margin-right: 2%; +} +.widget_col_4 { + width: 23.5%; + margin-right: 2%; +} +.widget_first_col { + margin-right: 0; +} +.widget { + background-color: #dedede; + padding: 2px; + margin-bottom: 15px; +} +.widget_title { + height: 30px; + line-height: 30px; +} +.widget_title h3 { + padding: 0 5px; +} +.widget_content { + background-color: #ffffff; + padding: 10px; +} +.drag_handle { + cursor: move; +} +.widget_placeholder { + border: 2px dashed #dedede; + margin-bottom: 15px; +} /* *************************************** LOGIN / REGISTER @@ -1653,3 +1702,12 @@ p.elgg_likes_owner { .user_picker_entry .delete_button { margin-right:10px; } + +/* *************************************** + MISC +*************************************** */ +#dashboard_info { + float: left; + width: 66%; + margin-bottom: 15px; +} \ No newline at end of file diff --git a/views/default/layouts/widgets.php b/views/default/layouts/widgets.php index d114edfcf..21d942080 100644 --- a/views/default/layouts/widgets.php +++ b/views/default/layouts/widgets.php @@ -1,337 +1,44 @@ 0 && $owner && $owner->canEdit()) { - - - - if(get_loggedin_userid() == elgg_get_page_owner_guid() || ($owner instanceof ElggGroup && $owner->canEdit())){ - - if (elgg_get_context() == "profile") { - ?> - -
- -
- - - - - - - - - - - - - - - - - -
- - - - - canEdit())){ - - if (elgg_get_context() != "profile") { - ?> - -
- -
- - - -
- 0) - foreach($area3widgets as $widget) { - echo elgg_view_entity($widget); - } - - ?> - -
-
- - -
- - 0) - foreach($area1widgets as $widget) { - echo elgg_view_entity($widget); - } - - ?> - -
- - 		- - -
- - - 0) - foreach($area2widgets as $widget) { - echo elgg_view_entity($widget); - } - - ?> - -
+ echo ''; +} -
+elgg_pop_context(); \ No newline at end of file diff --git a/views/default/widgets/wrapper.php b/views/default/widgets/wrapper.php index c89a878ca..13d8da50e 100644 --- a/views/default/widgets/wrapper.php +++ b/views/default/widgets/wrapper.php @@ -6,13 +6,7 @@ * @subpackage Core */ -static $widgettypes; - -$callback = get_input('callback'); - -if (!isset($widgettypes)) { - $widgettypes = get_widget_types(); -} +$widgettypes = get_widget_types(); if ($vars['entity'] instanceof ElggObject && $vars['entity']->getSubtype() == 'widget') { $handler = $vars['entity']->handler; @@ -25,78 +19,12 @@ if ($vars['entity'] instanceof ElggObject && $vars['entity']->getSubtype() == 'w $title = elgg_echo("error"); } -if ($callback != "true") { - - ?> - -
-
-
- -canEdit()) { ?> -

+?> +
+
+

Widget Title

+
+
+

Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.

- canEdit()) { - ?> -
elgg_view("widgets/{$handler}/edit",$vars), - 'entity' => $vars['entity'] - ) - ); - - ?>
- -
- getGUID()}\">"; -} else { // end if callback != "true" - if (elgg_view_exists("widgets/{$handler}/view")) { - echo elgg_view("widgets/{$handler}/view",$vars); - } else { - echo elgg_echo('widgets:handlernotfound'); - } - - ?> - - - "; - - ?> -
-
-
- - - -