diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-02-28 12:13:19 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-02-28 12:13:19 +0100 |
| commit | 3b2f9533c363406087cf77c56db16a120b9523c7 (patch) | |
| tree | 14743e94e95a6970e5dfe06bd5414deaed25d0ee /app/layout | |
| parent | 830c5aad03ff4d0cfbde4fcf275b04de6c4f4019 (diff) | |
| parent | 995cf58d249c6a2ddfd042cc5b509914295c882f (diff) | |
Merge pull request #1078 from Alkarex/CSP-no-inline
Content-Security-Policy
Diffstat (limited to 'app/layout')
| -rw-r--r-- | app/layout/aside_feed.phtml | 2 | ||||
| -rw-r--r-- | app/layout/aside_subscription.phtml | 2 | ||||
| -rw-r--r-- | app/layout/layout.phtml | 7 | ||||
| -rw-r--r-- | app/layout/nav_menu.phtml | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index 307db6af8..4e1903a7a 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -19,7 +19,7 @@ <a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('index.menu.about'); ?></a> <?php } ?> - <form id="mark-read-aside" method="post" style="display: none"></form> + <form id="mark-read-aside" method="post" aria-hidden="true"></form> <ul class="tree"> <li class="tree-folder category all<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>"> diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml index 8a54e2dc2..fa10d63e8 100644 --- a/app/layout/aside_subscription.phtml +++ b/app/layout/aside_subscription.phtml @@ -10,7 +10,7 @@ </li> <li class="item"> - <a onclick="return false;" href="javascript:(function(){var%20url%20=%20location.href;window.open('<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&url_rss='+encodeURIComponent(url), '_blank');})();"> + <a class="bookmarkClick" href="javascript:(function(){var%20url%20=%20location.href;window.open('<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&url_rss='+encodeURIComponent(url), '_blank');})();"> <?php echo _t('sub.menu.bookmark'); ?> </a> </li> diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index 1d3afbf71..99a3717bc 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -1,3 +1,6 @@ +<?php + FreshRSS::preLayout(); +?> <!DOCTYPE html> <html lang="<?php echo FreshRSS_Context::$user_conf->language; ?>" xml:lang="<?php echo FreshRSS_Context::$user_conf->language; ?>"> <head> @@ -5,9 +8,9 @@ <meta name="viewport" content="initial-scale=1.0" /> <?php echo self::headTitle(); ?> <?php echo self::headStyle(); ?> - <script>//<![CDATA[ + <script id="jsonVars" type="application/json"> <?php $this->renderHelper('javascript_vars'); ?> - //]]></script> + </script> <?php echo self::headScript(); ?> <?php $url_base = Minz_Request::currentRequest(); diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index 3a755b560..0f303beb8 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -79,7 +79,7 @@ ); ?> - <form id="mark-read-menu" method="post" style="display: none"></form> + <form id="mark-read-menu" method="post" aria-hidden="true"></form> <div class="stick" id="nav_menu_read_all"> <?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?> |