diff options
| author | Richard Beales <[email protected]> | 2013-03-20 16:59:19 +0000 |
|---|---|---|
| committer | Richard Beales <[email protected]> | 2013-03-20 16:59:19 +0000 |
| commit | 77accf45df3072bf0e3fe1e919bb75fc14313119 (patch) | |
| tree | 84be283769a6849f4916880739044a163e6f4761 /prefs.php | |
| parent | 04ed8b423abd9046ac4ee6813cf5e98b37aad2a3 (diff) | |
| parent | 2d2d08fc41dec694ac0895368eff3eb80a173a5b (diff) | |
fix merge conflict with stylesheet tags
Diffstat (limited to 'prefs.php')
| -rw-r--r-- | prefs.php | 25 |
1 files changed, 14 insertions, 11 deletions
@@ -15,8 +15,6 @@ login_sequence($link); - $dt_add = time(); - no_cache_incantation(); header('Content-Type: text/html; charset=utf-8'); @@ -26,21 +24,26 @@ <html> <head> <title><?php echo PAGE_TITLE ?> : <?php echo __("Preferences") ?></title> - <link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/> - <link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/> + + <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?> + <?php echo stylesheet_tag("tt-rss.css"); ?> <?php print_user_stylesheet($link) ?> <link rel="shortcut icon" type="image/png" href="images/favicon.png"/> - <script type="text/javascript" src="lib/prototype.js"></script> - <script type="text/javascript" src="lib/position.js"></script> - <script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script> - <script type="text/javascript" src="lib/dojo/dojo.js"></script> - <script type="text/javascript" src="lib/dijit/dijit.js"></script> - <script type="text/javascript" src="lib/dojo/tt-rss-layer.js"></script> + <?php + foreach (array("lib/prototype.js", + "lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls", + "lib/dojo/dojo.js", + "lib/dijit/dijit.js", + "lib/dojo/tt-rss-layer.js", + "localized_js.php", + "errors.php?mode=js") as $jsfile) { + + echo javascript_tag($jsfile); - <script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script> + } ?> <script type="text/javascript"> <?php |