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

Move common parts of the url out

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-06-03 11:15:14 +05:30
parent 63db27c42b
commit babfaf1688
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/tbl_gis_visualization.lib.php
View File

@ -146,11 +146,12 @@ function PMA_getHtmlForGisVisualization(
$sql_query, $visualization, $svg_support, $data
) {
$url_params['sql_query'] = $sql_query;
$url = 'tbl_gis_visualization.php' . PMA_URL_getCommon($url_params);
$downloadUrl = 'tbl_gis_visualization.php' . PMA_URL_getCommon($url_params)
. '&saveToFile=true';
return PMA\Template::get('gis_visualization/gis_visualization')->render(array(
'url_params' => $url_params,
'url' => $url,
'downloadUrl' => $downloadUrl,
'labelCandidates' => $labelCandidates,
'spatialCandidates' => $spatialCandidates,
'visualizationSettings' => $visualizationSettings,

6
templates/gis_visualization/gis_visualization.phtml
View File

@ -49,14 +49,14 @@
</span>
<ul>
<li class="warp_link">
<a href="<?php echo $url . '&saveToFile=download&fileFormat=png'; ?>" class="disableAjax">PNG</a>
<a href="<?php echo $downloadUrl . '&fileFormat=png'; ?>" class="disableAjax">PNG</a>
</li>
<li class="warp_link">
<a href="<?php echo $url . '&saveToFile=download&fileFormat=pdf'; ?>" class="disableAjax">PDF</a>
<a href="<?php echo $downloadUrl . '&fileFormat=pdf'; ?>" class="disableAjax">PDF</a>
</li>
<?php if ($svg_support): ?>
<li class="warp_link">
<a href="<?php echo $url . '&saveToFile=download&fileFormat=svg'; ?>" class="disableAjax">SVG</a>
<a href="<?php echo $downloadUrl . '&fileFormat=svg'; ?>" class="disableAjax">SVG</a>
</li>
<?php endif; ?>
</ul>