gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #15785 - Fix #15780 - Unexpected UI of action links (text only mode)

Browse Source 
Pull-request: #15785
Fixes: #15780
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-01-15 13:42:15 +01:00
commit 6c5a7184b9
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libraries/classes/Display/Results.php
View File

@ -4795,7 +4795,7 @@ class Results
__('Create view'),
true
),
['class' => 'create_view ajax']
['class' => 'create_view ajax btn']
)
. '</span>' . "\n";
}
@ -4841,7 +4841,10 @@ class Results
__('Copy to clipboard'),
true
),
['id' => 'copyToClipBoard']
[
'id' => 'copyToClipBoard' ,
'class' => 'btn',
]
);
}
@ -4861,7 +4864,10 @@ class Results
__('Print'),
true
),
['id' => 'printView'],
[
'id' => 'printView' ,
'class' => 'btn',
],
'print_view'
);
}
@ -4968,9 +4974,9 @@ class Results
'b_tblexport',
__('Export'),
true
)
)
. "\n";
),
['class' => 'btn']
);
// prepare chart
$results_operations_html .= Util::linkOrButton(
@ -4979,9 +4985,9 @@ class Results
'b_chart',
__('Display chart'),
true
)
)
. "\n";
),
['class' => 'btn']
);
// prepare GIS chart
$geometry_found = false;
@ -5002,9 +5008,9 @@ class Results
'b_globe',
__('Visualize GIS data'),
true
)
)
. "\n";
),
['class' => 'btn']
);
}
}

5
libraries/classes/Util.php
View File

@ -2187,11 +2187,6 @@ class Util
if ($value == '') {
$value = $text;
}
if ($GLOBALS['cfg']['ActionLinksMode'] == 'text') {
return ' <input class="btn btn-link" type="submit" name="' . $button_name . '"'
. ' value="' . htmlspecialchars($value) . '"'
. ' title="' . htmlspecialchars($text) . '">' . "\n";
}
return '<button class="btn btn-link ' . $button_class . '" type="submit"'
. ' name="' . $button_name . '" value="' . htmlspecialchars($value)
. '" title="' . htmlspecialchars($text) . '">' . "\n"