There was a problem.
')}})})},this),error:$.proxy(function(html){$content.html('There was a problem.
')},this)})},this))}if(widgetSettings.collapsible){var $collapseButton=$('').appendTo($buttons);$collapseButton.mousedown($.proxy(function(e){widget.toggleClass('collapsed')},this))}$heading.hover($.proxy(function(){$buttons.show()},this),$.proxy(function(){$buttons.hide()},this))},attachStylesheet:function(href){return $('').appendTo('head')},makeSortable:function(){var $sortableItems=this.getWidgets();$sortableItems.find(this.settings.headingSelector).css({cursor:'move'}).mousedown($.proxy(function(e){$sortableItems.css({width:''});$(e.currentTarget).parent().css({width:$(e.currentTarget).parent().width()+'px'})},this)).mouseup($.proxy(function(e){if(!$(e.currentTarget).parent().hasClass('dragging')){$(e.currentTarget).parent().css({width:''})}else{$(this.settings.columnSelector).sortable('disable')}},this));$(this.settings.columnSelector).sortable({items:$sortableItems,connectWith:$(this.settings.columnSelector),handle:this.settings.headingSelector,placeholder:'widget-placeholder',forcePlaceholderSize:true,revert:300,delay:100,opacity:0.8,containment:'document',start:$.proxy(function(e,ui){$(ui.helper).addClass('dragging')},this),stop:$.proxy(function(e,ui){$(ui.item).css({width:''}).removeClass('dragging');$(this.settings.columnSelector).sortable('enable');var $widgets=this.getWidgets(),order=[];for(var i=0;i<$widgets.length;i++){var $widget=$($widgets[i]),col=parseInt($widget.parents('ul.column').attr('id').substr(-1));order.push(col+':'+$widget.attr('id'))};$.ajax({type:'GET',url:url+'?D=cp&C=addons_modules&M=show_module_cp&module=dashee&method=update_widget_order',data:'order='+order.join('|'),dataTyle:'html',success:function(html){$.ee_notice("Widget order updated.",{type:'success'})},error:function(html){$.ee_notice("ERROR: Unable to update widget order in DB.",{type:'error',open:true})}})},this)})}};$().ready(function(){$('a[href="#collapse"]').parent('.button').css('float','left');$('a[href="#expand"]').parent('.button').css('float','left');$('a[href="#collapse"]').click(function(){dashEE.getWidgets().addClass('collapsed')});$('a[href="#expand"]').click(function(){dashEE.getWidgets().removeClass('collapsed')});$('a[href="#widgets"]').click(function(){if($('a[href="#widgets"]').html()=='Widgets'){$('#dashListing .content').html('
');$('#dashListing').slideDown();$.ajax({type:'GET',url:url+'?D=cp&C=addons_modules&M=show_module_cp&module=dashee&method=get_widget_listing',dataTyle:'html',success:function(html){$('#dashListing .content').html(html)},error:function(html){$('#dashListing .content').html('
There was a problem.
')}});$('a[href="#widgets"]').html('Close Widgets')}else{$('#dashListing').slideUp();$('a[href="#widgets"]').html('Widgets')}});$('a[href="#save-layout"]').click($.proxy(function(e){$('#dashSaveLayout').dialog({resizable:false,height:210,width:350,modal:true,buttons:{'Cancel':function(){$(this).dialog("close")},'Save':$.proxy(function(){$.ajax({type:'POST',url:url+'/?D=cp&C=addons_modules&M=show_module_cp&module=dashee&method=save_layout',data:$('#dashSaveLayout form').serialize(),dataTyle:'html',success:$.proxy(function(html){$.ee_notice('Your layout has been saved. Click "Settings" to assign it to a member group.',{type:'success',open:true});$('#dashSaveLayout').dialog('close')},this),error:$.proxy(function(html){$.ee_notice("ERROR: The widget you selected could not be removed.",{type:'error',open:true})},this)})},this)},title:'Save Layout'});return false},this));$('a.dashLoad').click(function(e){e.preventDefault();href=$(this).attr('href');$('#dashConfirmLoad').dialog({resizable:false,height:140,modal:true,buttons:{'Cancel':function(){$(this).dialog("close")},'OK':function(){$(this).dialog("close");window.location=href}},title:'Please Confirm'})});$('a.dashDelete').click(function(e){e.preventDefault();href=$(this).attr('href');$('#dashConfirmDelete').dialog({resizable:false,height:140,modal:true,buttons:{'No':function(){$(this).dialog("close")},'Yes':function(){$(this).dialog("close");window.location=href}},title:'Please Confirm'})});$('a.dashHelp').click(function(){$('.dashLayoutHelp').dialog({resizable:false,width:450,modal:true,title:'dashEE Layouts'})});dashEE.init()})})(jQuery); -======= -(function($){var url=window.location.href;url=url.split('?')[0];var dashEE={settings:{columnSelector:'.column',widgetSelector:'.widget',headingSelector:'.heading',buttonsSelector:'.buttons',contentSelector:'.widget-content',widgetDefault:{movable:true,removable:true,collapsible:true,editable:false},widgetIndividual:{dynamic:{movable:false,removable:true,collapsible:true,editable:true}}},getWidgets:function(){return $(this.settings.widgetSelector)},init:function(){var $widgets=this.getWidgets();for(var i=0;i<$widgets.length;i++){var $widget=$($widgets[i]);this.initWidget($widget)}this.makeSortable()},getWidgetSettings:function(id){var widgetSettings=(id&&this.settings.widgetIndividual[id])?this.settings.widgetIndividual[id]:{};return $.extend({},this.settings.widgetDefault,widgetSettings)},initWidget:function(widget){var $heading=$(this.settings.headingSelector,widget),$buttons=$(this.settings.buttonsSelector,$heading),$content=$(this.settings.contentSelector,widget),id=widget.attr('id'),widgetSettings=dashEE.getWidgetSettings(widget.attr('dashee')),col=widget.parents(this.settings).attr('id').substr(-1);if(widgetSettings.removable){var $removeBtn=$('').appendTo($buttons);$removeBtn.mousedown($.proxy(function(e){e.stopPropagation()},this));$removeBtn.click($.proxy(function(e){col=widget.parents(this.settings).attr('id').substr(-1);$('#dashConfirm').dialog({resizable:false,height:140,modal:true,buttons:{'No':function(){$(this).dialog("close")},'Yes':$.proxy(function(){$.ajax({type:'GET',url:url+'/?D=cp&C=addons_modules&M=show_module_cp&module=dashee&method=remove_widget&col='+col+'&wgt='+id,dataTyle:'html',success:$.proxy(function(html){widget.animate({opacity:0},$.proxy(function(){widget.wrap('').parent().slideUp($.proxy(function(){widget.remove()},this))},this));$.ee_notice("Widget has been removed.",{type:'success'});setTimeout("$('#dashConfirm').dialog('close');",750)},this),error:$.proxy(function(html){$.ee_notice("ERROR: The widget you selected could not be removed.",{type:'error',open:true})},this)})},this)},title:'Remove Widget'});return false},this))}if(widgetSettings.editable){var $editButton=$('').appendTo($buttons);$editButton.mousedown($.proxy(function(e){e.stopPropagation()},this));$editButton.click($.proxy(function(){$content.html('There was a problem.
')}})})},this),error:$.proxy(function(html){$content.html('There was a problem.
')},this)})},this))}if(widgetSettings.collapsible){var $collapseButton=$('').appendTo($buttons);$collapseButton.mousedown($.proxy(function(e){widget.toggleClass('collapsed')},this))}$heading.hover($.proxy(function(){$buttons.show()},this),$.proxy(function(){$buttons.hide()},this))},attachStylesheet:function(href){return $('').appendTo('head')},makeSortable:function(){var $sortableItems=this.getWidgets();$sortableItems.find(this.settings.headingSelector).css({cursor:'move'}).mousedown($.proxy(function(e){$sortableItems.css({width:''});$(e.currentTarget).parent().css({width:$(e.currentTarget).parent().width()+'px'})},this)).mouseup($.proxy(function(e){if(!$(e.currentTarget).parent().hasClass('dragging')){$(e.currentTarget).parent().css({width:''})}else{$(this.settings.columnSelector).sortable('disable')}},this));$(this.settings.columnSelector).sortable({items:$sortableItems,connectWith:$(this.settings.columnSelector),handle:this.settings.headingSelector,placeholder:'widget-placeholder',forcePlaceholderSize:true,revert:300,delay:100,opacity:0.8,containment:'document',start:$.proxy(function(e,ui){$(ui.helper).addClass('dragging')},this),stop:$.proxy(function(e,ui){$(ui.item).css({width:''}).removeClass('dragging');$(this.settings.columnSelector).sortable('enable');var $widgets=this.getWidgets(),order=[];for(var i=0;i<$widgets.length;i++){var $widget=$($widgets[i]),col=parseInt($widget.parents('ul.column').attr('id').substr(-1));order.push(col+':'+$widget.attr('id'))};$.ajax({type:'GET',url:url+'?D=cp&C=addons_modules&M=show_module_cp&module=dashee&method=update_widget_order',data:'order='+order.join('|'),dataTyle:'html',success:function(html){$.ee_notice("Widget order updated.",{type:'success'})},error:function(html){$.ee_notice("ERROR: Unable to update widget order in DB.",{type:'error',open:true})}})},this)})}};$().ready(function(){$('a[href="#collapse"]').parent('.button').css('float','left');$('a[href="#expand"]').parent('.button').css('float','left');$('a[href="#collapse"]').click(function(){dashEE.getWidgets().addClass('collapsed')});$('a[href="#expand"]').click(function(){dashEE.getWidgets().removeClass('collapsed')});$('a[href="#widgets"]').click(function(){if($('a[href="#widgets"]').html()=='Widgets'){$('#dashListing .content').html('
');$('#dashListing').slideDown();$.ajax({type:'GET',url:url+'?D=cp&C=addons_modules&M=show_module_cp&module=dashee&method=get_widget_listing',dataTyle:'html',success:function(html){$('#dashListing .content').html(html)},error:function(html){$('#dashListing .content').html('
There was a problem.
')}});$('a[href="#widgets"]').html('Close Widgets')}else{$('#dashListing').slideUp();$('a[href="#widgets"]').html('Widgets')}});$('a[href="#save-layout"]').click($.proxy(function(e){$('#dashSaveLayout').dialog({resizable:false,height:210,width:350,modal:true,buttons:{'Cancel':function(){$(this).dialog("close")},'Save':$.proxy(function(){$.ajax({type:'POST',url:url+'/?D=cp&C=addons_modules&M=show_module_cp&module=dashee&method=save_layout',data:$('#dashSaveLayout form').serialize(),dataTyle:'html',success:$.proxy(function(html){$.ee_notice('Your layout has been saved. Click "Settings" to assign it to a member group.',{type:'success',open:true});$('#dashSaveLayout').dialog('close')},this),error:$.proxy(function(html){$.ee_notice("ERROR: The widget you selected could not be removed.",{type:'error',open:true})},this)})},this)},title:'Save Layout'});return false},this));$('a.dashLoad').click(function(e){e.preventDefault();confirm_popup('#dashConfirmLoad',$(this).attr('href'))});$('a.dashDelete').click(function(e){e.preventDefault();confirm_popup('#dashConfirmDelete',$(this).attr('href'))});$('a.dashReset').click(function(e){e.preventDefault();confirm_popup('#dashConfirmReset',$(this).attr('href'),190)});$('a.dashLayoutHelp').click(function(){help_popup('#dashLayoutHelp','dashEE Layouts',450)});$('a.dashLockHelp').click(function(){help_popup('#dashLockHelp','Lock Layouts')});dashEE.init()})})(jQuery);function confirm_popup(txtid,href,boxheight){if(boxheight==''){boxheight=140}$(txtid).dialog({resizable:false,height:boxheight,modal:true,buttons:{'OK':function(){$(this).dialog("close");window.location=href},'Cancel':function(){$(this).dialog("close")}},title:'Please Confirm'})}function help_popup(txtid,boxtitle,boxwidth){if(boxtitle==''){boxtitle='dashEE Help'}if(boxwidth==''){boxwidth=250}$(txtid).dialog({resizable:false,width:boxwidth,modal:true,buttons:{'OK':function(){$(this).dialog("close")}},title:boxtitle})} ->>>>>>> dev +(function($){var url=window.location.href;url=url.split('?')[0];var dashEE={settings:{columnSelector:'.column',widgetSelector:'.widget',headingSelector:'.heading',buttonsSelector:'.buttons',contentSelector:'.widget-content',widgetDefault:{movable:true,removable:true,collapsible:true,editable:false},widgetIndividual:{dynamic:{movable:false,removable:true,collapsible:true,editable:true}}},getWidgets:function(){return $(this.settings.widgetSelector)},init:function(){var $widgets=this.getWidgets();for(var i=0;i<$widgets.length;i++){var $widget=$($widgets[i]);this.initWidget($widget)}this.makeSortable()},getWidgetSettings:function(id){var widgetSettings=(id&&this.settings.widgetIndividual[id])?this.settings.widgetIndividual[id]:{};return $.extend({},this.settings.widgetDefault,widgetSettings)},initWidget:function(widget){var $heading=$(this.settings.headingSelector,widget),$buttons=$(this.settings.buttonsSelector,$heading),$content=$(this.settings.contentSelector,widget),id=widget.attr('id'),widgetSettings=dashEE.getWidgetSettings(widget.attr('dashee')),col=widget.parents(this.settings).attr('id').substr(-1);if(widgetSettings.removable){var $removeBtn=$('').appendTo($buttons);$removeBtn.mousedown($.proxy(function(e){e.stopPropagation()},this));$removeBtn.click($.proxy(function(e){col=widget.parents(this.settings).attr('id').substr(-1);$('#dashConfirm').dialog({resizable:false,height:140,modal:true,buttons:{'Yes':$.proxy(function(){$.ajax({type:'GET',url:url+'/?D=cp&C=addons_modules&M=show_module_cp&module=dashee&method=remove_widget&col='+col+'&wgt='+id,dataTyle:'html',success:$.proxy(function(html){widget.animate({opacity:0},$.proxy(function(){widget.wrap('').parent().slideUp($.proxy(function(){widget.remove()},this))},this));$.ee_notice("Widget has been removed.",{type:'success'});setTimeout("$('#dashConfirm').dialog('close');",750)},this),error:$.proxy(function(html){$.ee_notice("ERROR: The widget you selected could not be removed.",{type:'error',open:true})},this)})},this),'No':function(){$(this).dialog("close")}},title:'Remove Widget'});return false},this))}if(widgetSettings.editable){var $editButton=$('').appendTo($buttons);$editButton.mousedown($.proxy(function(e){e.stopPropagation()},this));$editButton.click($.proxy(function(){$content.html('There was a problem.
')}})})},this),error:$.proxy(function(html){$content.html('There was a problem.
')},this)})},this))}if(widgetSettings.collapsible){var $collapseButton=$('').appendTo($buttons);$collapseButton.mousedown($.proxy(function(e){widget.toggleClass('collapsed')},this))}$heading.hover($.proxy(function(){$buttons.show()},this),$.proxy(function(){$buttons.hide()},this))},attachStylesheet:function(href){return $('').appendTo('head')},makeSortable:function(){var $sortableItems=this.getWidgets();$sortableItems.find(this.settings.headingSelector).css({cursor:'move'}).mousedown($.proxy(function(e){$sortableItems.css({width:''});$(e.currentTarget).parent().css({width:$(e.currentTarget).parent().width()+'px'})},this)).mouseup($.proxy(function(e){if(!$(e.currentTarget).parent().hasClass('dragging')){$(e.currentTarget).parent().css({width:''})}else{$(this.settings.columnSelector).sortable('disable')}},this));$(this.settings.columnSelector).sortable({items:$sortableItems,connectWith:$(this.settings.columnSelector),handle:this.settings.headingSelector,placeholder:'widget-placeholder',forcePlaceholderSize:true,revert:300,delay:100,opacity:0.8,containment:'document',start:$.proxy(function(e,ui){$(ui.helper).addClass('dragging')},this),stop:$.proxy(function(e,ui){$(ui.item).css({width:''}).removeClass('dragging');$(this.settings.columnSelector).sortable('enable');var $widgets=this.getWidgets(),order=[];for(var i=0;i<$widgets.length;i++){var $widget=$($widgets[i]),col=parseInt($widget.parents('ul.column').attr('id').substr(-1));order.push(col+':'+$widget.attr('id'))};$.ajax({type:'GET',url:url+'?D=cp&C=addons_modules&M=show_module_cp&module=dashee&method=update_widget_order',data:'order='+order.join('|'),dataTyle:'html',success:function(html){$.ee_notice("Widget order updated.",{type:'success'})},error:function(html){$.ee_notice("ERROR: Unable to update widget order in DB.",{type:'error',open:true})}})},this)})}};$().ready(function(){$('a[href="#collapse"]').parent('.button').css('float','left');$('a[href="#expand"]').parent('.button').css('float','left');$('a[href="#collapse"]').click(function(){dashEE.getWidgets().addClass('collapsed')});$('a[href="#expand"]').click(function(){dashEE.getWidgets().removeClass('collapsed')});$('a[href="#widgets"]').click(function(){if($('a[href="#widgets"]').html()=='Widgets'){$('#dashListing .content').html('
');$('#dashListing').slideDown();$.ajax({type:'GET',url:url+'?D=cp&C=addons_modules&M=show_module_cp&module=dashee&method=get_widget_listing',dataTyle:'html',success:function(html){$('#dashListing .content').html(html)},error:function(html){$('#dashListing .content').html('
There was a problem.
')}});$('a[href="#widgets"]').html('Close Widgets')}else{$('#dashListing').slideUp();$('a[href="#widgets"]').html('Widgets')}});$('a[href="#save-layout"]').click($.proxy(function(e){$('#dashSaveLayout').dialog({resizable:false,height:210,width:350,modal:true,buttons:{'Cancel':function(){$(this).dialog("close")},'Save':$.proxy(function(){$.ajax({type:'POST',url:url+'/?D=cp&C=addons_modules&M=show_module_cp&module=dashee&method=save_layout',data:$('#dashSaveLayout form').serialize(),dataTyle:'html',success:$.proxy(function(html){$.ee_notice('Your layout has been saved. Click "Settings" to assign it to a member group.',{type:'success',open:true});$('#dashSaveLayout').dialog('close')},this),error:$.proxy(function(html){$.ee_notice("ERROR: The widget you selected could not be removed.",{type:'error',open:true})},this)})},this)},title:'Save Layout'});return false},this));$('a.dashLoad').click(function(e){e.preventDefault();confirm_popup('#dashConfirmLoad',$(this).attr('href'))});$('a.dashDelete').click(function(e){e.preventDefault();confirm_popup('#dashConfirmDelete',$(this).attr('href'))});$('a.dashReset').click(function(e){e.preventDefault();confirm_popup('#dashConfirmReset',$(this).attr('href'),190)});$('a.dashLayoutHelp').click(function(){help_popup('#dashLayoutHelp','dashEE Layouts',450)});$('a.dashLockHelp').click(function(){help_popup('#dashLockHelp','Lock Layouts')});dashEE.init()})})(jQuery);function confirm_popup(txtid,href,boxheight){if(boxheight==''){boxheight=140}$(txtid).dialog({resizable:false,height:boxheight,modal:true,buttons:{'OK':function(){$(this).dialog("close");window.location=href},'Cancel':function(){$(this).dialog("close")}},title:'Please Confirm'})}function help_popup(txtid,boxtitle,boxwidth){if(boxtitle==''){boxtitle='dashEE Help'}if(boxwidth==''){boxwidth=250}$(txtid).dialog({resizable:false,width:boxwidth,modal:true,buttons:{'OK':function(){$(this).dialog("close")}},title:boxtitle})} \ No newline at end of file diff --git a/third_party/dashee/language/english/lang.dashee.php b/third_party/dashee/language/english/lang.dashee.php index e91e8a9..14ef8d5 100755 --- a/third_party/dashee/language/english/lang.dashee.php +++ b/third_party/dashee/language/english/lang.dashee.php @@ -72,12 +72,8 @@ This allows you to create different dashboard layouts tailored for different member groups. Please note: the defaults set here will only affect new users who are visiting the module for the first time. If they have already logged in and viewed the dashEE module their existing configuration will remain the same.', -<<<<<<< HEAD - -======= 'help_lock' => 'Locking a member groups dashEE layout will prevent those users from making any changes to their dashboard. They will not see the standard Expand All, Collapse All, Widgets or Setting options. They will also not be able to move or modify widget settings.
', ->>>>>>> dev // Widgets 'wgt_create_links_name' => 'EE Create Links', diff --git a/third_party/dashee/views/settings.php b/third_party/dashee/views/settings.php index 68ffecc..bfa5815 100644 --- a/third_party/dashee/views/settings.php +++ b/third_party/dashee/views/settings.php @@ -42,11 +42,7 @@ if($is_admin): -<<<<<<< HEAD - $this->table->set_caption(lang('capLayouts').' What\'s this?'); -======= $this->table->set_caption(lang('capLayouts').' What\'s this?'); ->>>>>>> dev $this->table->set_heading( lang('thName'), @@ -88,21 +84,12 @@ $this->table->set_heading( lang('thMemberGroup'), lang('thDescription'), -<<<<<<< HEAD -======= lang('thLocked'), ->>>>>>> dev lang('thLayout') ); foreach($member_groups as $group) { -<<<<<<< HEAD - $this->table->add_row( - $group->title, - $group->description ? $group->description : '--', - form_dropdown('group_layouts['.$group->id.']', $opts_layouts, array_key_exists($group->id, $group_layouts) ? $group_layouts[$group->id] : $default_id) -======= if(array_key_exists($group->id, $group_layouts)) { $layout_id = $group_layouts[$group->id]['layout_id']; @@ -119,7 +106,6 @@ $group->description ? $group->description : '--', form_checkbox('group_locked['.$group->id.']','locked', $locked, ($group->id == 1 ? 'disabled="disabled"' : '')) . ' ' . lang('lblLock') . ' (?)', form_dropdown('group_layouts['.$group->id.']', $opts_layouts, $layout_id) ->>>>>>> dev ); } @@ -127,34 +113,17 @@ ?> -<<<<<<< HEAD - - -======= ->>>>>>> dev -<<<<<<< HEAD - - - - - -======= ->>>>>>> dev \ No newline at end of file