Merge pull request #419 from bergware/master

Position context menu always left + below icon
This commit is contained in:
tom mortensen
2019-01-05 11:11:25 -08:00
committed by GitHub
6 changed files with 14 additions and 11 deletions

View File

@@ -135,7 +135,7 @@ function loadlist() {
$.post('/plugins/dynamix.docker.manager/include/UpdateConfig.php',{action:'wait',container:$(this).attr('container'),wait:$(this).val()});
});
if ($.cookie('docker_listview_mode')=='advanced') {$('.advanced').show(); $('.basic').hide();}
context.init({preventDoubleContext:false});
context.init({preventDoubleContext:false,left:true,above:false});
$('input[type=button]').prop('disabled',false).show('slow');
var update = false;
for (var i=0,ct; ct=docker[i]; i++) if (ct.update=='false') {update = true; break;};

View File

@@ -186,7 +186,7 @@ function loadlist() {
$(this).prop('checked', data.autostart);
},'json');
});
context.init({preventDoubleContext:false});
context.init({preventDoubleContext:false,left:true,above:false});
$('input[type=button]').prop('disabled',false).show('slow');
$('.text').click(showInput);
$('.input').blur(hideInput);

View File

@@ -14,7 +14,10 @@ Markdown="false"
* all copies or substantial portions of the Software.
*/
?>
<style>.loc{text-align:left;white-space:nowrap}</style>
<style>
.loc{text-align:left;white-space:nowrap}
#title span.left{text-transform:none}
</style>
<script>
$(function(){
$.get('/webGui/include/Browse.php',{dir:"<?=addslashes(urlencode($dir))?>",path:"<?=$path?>",user:<?=strpos($dir,'/mnt/user')===0?1:0?>},function(data){

View File

@@ -463,7 +463,7 @@ function smartMenu(table) {
opts.push({text:'Capabilities',icon:'fa-user',action:function(e){e.preventDefault();capabilities(page,disk);}});
opts.push({divider:true});
opts.push({text:'Identity',icon:'fa-home',action:function(e){e.preventDefault();identity(page,disk);}});
if (view == 'alert') {
if (view.search('green-text') == -1) {
opts.push({divider:true});
opts.push({text:'Acknowledge',icon:'fa-check-square-o',action:function(e){e.preventDefault();acknowledge(disk);}});
}
@@ -558,8 +558,8 @@ function update60() {
$.post('<?=$url?>',{cmd:'sys'},function(data) {
$.each(data.split('\0'),function(k,v) {
var load = v.slice(0,-1);
if (load >= red) var color = 'redbar';
else if (load >= orange) var color = 'orangebar';
if (load >= <?=$display['critical']?>) var color = 'redbar';
else if (load >= <?=$display['warning']?>) var color = 'orangebar';
else var color = '';
$('.sys'+k).text(v);
$('#sys'+k).animate({width:v},{step:function(){$('#sys'+k).css('overflow','visible').removeClass().addClass(color);}});
@@ -699,7 +699,7 @@ $(function() {
toggleView('users_view',true);
toggleView('shares_view',true);
portMenu();
context.init({preventDoubleContext:false});
context.init({preventDoubleContext:false,left:true,above:false});
cpuload.start();
});
</script>

View File

@@ -58,7 +58,7 @@ function loadlist() {
}
if ($('.Panel').length===0) $('#noapps').show();
$('#apps_icons').slideDown('fast');
context.init({preventDoubleContext:false});
context.init({preventDoubleContext:false,left:true,above:false});
});
}
$(function() {

View File

@@ -572,7 +572,7 @@ $(function() {
<?endif;?>
<?if ($notify['display']):?>
var opts = [{header:'Alerts', image:'/webGui/icons/alerts.png'}];
context.init({preventDoubleContext:false});
context.init({preventDoubleContext:false,left:true,above:false});
opts.push({text:'View',icon:'fa-folder-open-o',action:function(e){e.preventDefault();openNotifier('alert');}});
opts.push({divider:true});
opts.push({text:'History',icon:'fa-file-text-o',action:function(e){e.preventDefault();viewHistory('alert');}});
@@ -581,7 +581,7 @@ $(function() {
context.attach('#nav-tub1',opts);
var opts = [{header:'Warnings', image:'/webGui/icons/warnings.png'}];
context.init({preventDoubleContext:false});
context.init({preventDoubleContext:false,left:true,above:false});
opts.push({text:'View',icon:'fa-folder-open-o',action:function(e){e.preventDefault();openNotifier('warning');}});
opts.push({divider:true});
opts.push({text:'History',icon:'fa-file-text-o',action:function(e){e.preventDefault();viewHistory('warning');}});
@@ -590,7 +590,7 @@ $(function() {
context.attach('#nav-tub2',opts);
var opts = [{header:'Messages', image:'/webGui/icons/messages.png'}];
context.init({preventDoubleContext:false});
context.init({preventDoubleContext:false,left:true,above:false});
opts.push({text:'View',icon:'fa-folder-open-o',action:function(e){e.preventDefault();openNotifier('normal');}});
opts.push({divider:true});
opts.push({text:'History',icon:'fa-file-text-o',action:function(e){e.preventDefault();viewHistory('normal');}});