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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-02-27 09:13:08 +01:00
commit b6b3edb7dd
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/Scripts.class.php
View File

@ -73,10 +73,14 @@ class PMA_Scripts
$scripts[] = "scripts[]=" . $value['filename'];
}
}
$separator = PMA_URL_getArgSeparator();
$url = 'js/get_scripts.js.php'
. PMA_URL_getCommon(array(), 'none')
. $separator . implode($separator, $scripts);
$static_scripts = sprintf(
'<script type="text/javascript" '
. 'src="js/get_scripts.js.php%s&%s"></script>',
PMA_URL_getCommon(array(), 'none'), implode("&", $scripts)
'<script type="text/javascript" src="%s"></script>',
htmlspecialchars($url)
);
return $static_scripts . $dynamic_scripts;
}

5
test/classes/PMA_Scripts_test.php
View File

@ -11,6 +11,7 @@
require_once 'libraries/Scripts.class.php';
require_once 'libraries/js_escape.lib.php';
require_once 'libraries/url_generating.lib.php';
/**
* Tests for Script.class.php
@ -78,7 +79,7 @@ class PMA_Scripts_Test extends PHPUnit_Framework_TestCase
{
$this->assertEquals(
'<script type="text/javascript" src="js/get_scripts.js.php?lang=en'
. '&token=token&scripts[]=common.js"></script>',
. '&amp;token=token&amp;scripts[]=common.js"></script>',
$this->_callPrivateFunction(
'_includeFiles',
array(
@ -107,7 +108,7 @@ class PMA_Scripts_Test extends PHPUnit_Framework_TestCase
$this->assertRegExp(
'@<script type="text/javascript" src="js/get_scripts.js.php\\?lang=en'
. '&token=token&scripts\\[\\]=common.js"></script><script type="text/'
. '&amp;token=token&amp;scripts\\[\\]=common.js"></script><script type="text/'
. 'javascript">// <!\\[CDATA\\[' . "\n"
. 'AJAX.scriptHandler.add\\("common.js",1\\);' . "\n"
. '\\$\\(function\\(\\) \\{AJAX.fireOnload\\("common.js"\\);\\}\\);'

7
themes/pmahomme/css/common.css.php
View File

@ -924,7 +924,6 @@ ul#topmenu2 li {
.menucontainer {
<?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'dcdcdc'); ?>
border-top: 1px solid #aaa;
border-bottom: 1px solid #ccc;
}
/* default tab styles */
@ -972,6 +971,11 @@ ul#topmenu ul.only {
ul#topmenu > li {
border-right: 1px solid #fff;
border-left: 1px solid #ccc;
border-bottom: 1px solid #ccc;
}
ul#topmenu > li:first-child {
border-left: 0;
}
/* default tab styles */
@ -1020,6 +1024,7 @@ ul#topmenu2 a.tabactive {
ul#topmenu > li.active {
/* border-bottom: 0pt solid <?php echo $GLOBALS['cfg']['MainBackground']; ?>; */
border-right: 0;
border-bottom-color: #fff;
}
/* end topmenu */