public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 17:35:56 +00:00
Code Issues Releases Wiki Activity

fix merge conflict with stylesheet tags

Browse Source
This commit is contained in:
Richard Beales
2013-03-20 16:59:19 +00:00
parent 04ed8b423a 2d2d08fc41
commit 77accf45df
42 changed files with 1564 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
prefs.php
View File

@@ -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) {
<script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
echo javascript_tag($jsfile);
} ?>
<script type="text/javascript">
<?php