diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-10-01 18:31:28 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-10-01 18:31:28 +0200 |
| commit | ceda55c75b158fc1cf4813fe0f258527754b9289 (patch) | |
| tree | 7c84ac32cc845ab1d70ea5a3fb263c6613de34b0 /app/views | |
| parent | cb7ba3e47576aa1d0c3f53e5966f831e6540bbc3 (diff) | |
| parent | f241fc1841df89285ecb6f124f0d70198d712b2f (diff) | |
Merge pull request #1651 from FreshRSS/dev1.8.0
Release 1.8.0
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/subscription/bookmarklet.phtml | 13 | ||||
| -rw-r--r-- | app/views/update/checkInstall.phtml | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/app/views/subscription/bookmarklet.phtml b/app/views/subscription/bookmarklet.phtml new file mode 100644 index 000000000..162501be6 --- /dev/null +++ b/app/views/subscription/bookmarklet.phtml @@ -0,0 +1,13 @@ +<?php $this->partial('aside_subscription'); ?> + +<div class="post"> + <a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a> + + <legend><?php echo _t('sub.bookmarklet.title'); ?></legend> + <p><a class="btn btn-important" href="javascript:(function(){var%20url%20=%20location.href;var%20otherWindow=window.open('about:blank','_blank');otherWindow.opener=null;otherWindow.location='<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&url_rss='+encodeURIComponent(url);})();"><?php echo _t('sub.bookmarklet.label'); ?></a></p> + <?php echo _t('sub.bookmarklet.documentation'); ?> + + <legend><?php echo _t('sub.firefox.title'); ?></legend> + <p><?php echo _t('sub.firefox.documentation'); ?></p> + <pre>browser.contentHandlers.types.number.uri → <?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&url_rss=%s</pre> +</div>
\ No newline at end of file diff --git a/app/views/update/checkInstall.phtml b/app/views/update/checkInstall.phtml index 543ab43de..33d78cbe7 100644 --- a/app/views/update/checkInstall.phtml +++ b/app/views/update/checkInstall.phtml @@ -9,7 +9,7 @@ <p class="alert <?php echo $status ? 'alert-success' : 'alert-error'; ?>"> <?php if ($key === 'php') { - echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok'), PHP_VERSION, '5.3.3'); + echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok'), PHP_VERSION, '5.3.8'); } else { echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok')); } |