Merge pull request #3565 from murrant/widgets

Scrollable widgets
This commit is contained in:
Neil Lathwood
2016-05-26 20:28:49 +01:00
3 changed files with 15 additions and 7 deletions

View File

@@ -1863,4 +1863,11 @@ label {
padding: 5px; padding: 5px;
border-radius: 4px; border-radius: 4px;
box-shadow: 0 5px 15px rgba(0,0,0,.5); box-shadow: 0 5px 15px rgba(0,0,0,.5);
} }
.edit-widget, .close-widget { cursor: pointer; }
.widget_body {
overflow-y: auto;
width: 100%;
height: calc(100% - 35px);
}

View File

@@ -15,7 +15,7 @@ if (defined('show_settings')) {
$current_mode = isset($widget_settings['mode']) ? $widget_settings['mode'] : 0; $current_mode = isset($widget_settings['mode']) ? $widget_settings['mode'] : 0;
$current_width = isset($widget_settings['tile_width']) ? $widget_settings['tile_width'] : 10; $current_width = isset($widget_settings['tile_width']) ? $widget_settings['tile_width'] : 10;
$common_output[] = ' $common_output[] = '
<form class="form-horizontal" onsubmit="widget_settings(this); return false;"> <form class="form-horizontal" onsubmit="return widget_settings(this)">
<div class="form-group"> <div class="form-group">
<label for="tile_width" class="col-sm-4 control-label">Tile width</label> <label for="tile_width" class="col-sm-4 control-label">Tile width</label>
<div class="col-sm-6"> <div class="col-sm-6">

View File

@@ -169,7 +169,7 @@ foreach (array('Private','Shared (Read)','Shared') as $k=>$v) {
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<?php <?php
foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widgets) { foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widgets) {
echo ' <li><a href="javascript:return false;" name="place_widget" data-widget_id="'.$widgets['widget_id'] .'">'. $widgets['widget_title'] .'</a></li>'; echo ' <li><a href="javacript:void(0)" class="place_widget" data-widget_id="'.$widgets['widget_id'] .'">'. $widgets['widget_title'] .'</a></li>';
} }
?> ?>
</ul> </ul>
@@ -316,7 +316,7 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg
}); });
}); });
$('a[name="place_widget"]').on('click', function(event, state) { $('.place_widget').on('click', function(event, state) {
var widget_id = $(this).data('widget_id'); var widget_id = $(this).data('widget_id');
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
@@ -458,11 +458,11 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg
'<header class="widget_header"><span id="widget_title_'+data.user_widget_id+'">'+data.title+ '<header class="widget_header"><span id="widget_title_'+data.user_widget_id+'">'+data.title+
'</span>'+ '</span>'+
'<span class="fade-edit pull-right">'+ '<span class="fade-edit pull-right">'+
'<a href="javascript:return false;" class="fa fa-pencil-square-o edit-widget" data-widget-id="'+data.user_widget_id+'" aria-label="Settings" data-toggle="tooltip" data-placement="top" title="Settings">&nbsp;</a>&nbsp;'+ '<i class="fa fa-pencil-square-o edit-widget" data-widget-id="'+data.user_widget_id+'" aria-label="Settings" data-toggle="tooltip" data-placement="top" title="Settings">&nbsp;</i>&nbsp;'+
'<a href="javascript:return false;" class="text-danger fa fa-times close-widget" data-widget-id="'+data.user_widget_id+'" aria-label="Close" data-toggle="tooltip" data-placement="top" title="Remove">&nbsp;</a>&nbsp;'+ '<i class="text-danger fa fa-times close-widget" data-widget-id="'+data.user_widget_id+'" aria-label="Close" data-toggle="tooltip" data-placement="top" title="Remove">&nbsp;</i>&nbsp;'+
'</span>'+ '</span>'+
'</header>'+ '</header>'+
'<div class="widget_body" id="widget_body_'+data.user_widget_id+'" style="height: 100%; width:100%;">'+data.widget+'</div>'+ '<div class="widget_body" id="widget_body_'+data.user_widget_id+'">'+data.widget+'</div>'+
'\<script\>var timeout'+data.user_widget_id+' = grab_data('+data.user_widget_id+','+data.refresh+',\''+data.widget+'\');\<\/script\>'+ '\<script\>var timeout'+data.user_widget_id+' = grab_data('+data.user_widget_id+','+data.refresh+',\''+data.widget+'\');\<\/script\>'+
'</li>'; '</li>';
if (data.hasOwnProperty('col') && data.hasOwnProperty('row')) { if (data.hasOwnProperty('col') && data.hasOwnProperty('row')) {
@@ -506,6 +506,7 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg
} }
}); });
} }
return false;
} }
function widget_reload(id,data_type) { function widget_reload(id,data_type) {