diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-11-14 18:20:08 +0100 |
|---|---|---|
| committer |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-11-14 20:28:04 +0100 |
| commit | 168dbefc0adebb5494297ce32912e7c47524ed3b (patch) | |
| tree | a60f898c4cb6893f80acd418e05a3d7cfd950c7c | |
| parent | 6fe1e1bad0c0164e187ce4c560c2f35bafdff9a5 (diff) | |
Page "à propos" accessible aux visiteurs
Voir #266
| -rw-r--r-- | app/i18n/en.php | 1 | ||||
| -rw-r--r-- | app/i18n/fr.php | 1 | ||||
| -rw-r--r-- | app/layout/aside_flux.phtml | 2 | ||||
| -rw-r--r-- | app/views/index/index.phtml | 1 | ||||
| -rw-r--r-- | public/themes/default/freshrss.css | 1 | ||||
| -rw-r--r-- | public/themes/flat-design/freshrss.css | 1 |
6 files changed, 5 insertions, 2 deletions
diff --git a/app/i18n/en.php b/app/i18n/en.php index 6147b268a..98665c5b6 100644 --- a/app/i18n/en.php +++ b/app/i18n/en.php @@ -12,6 +12,7 @@ return array ( 'category' => 'Category', 'shortcuts' => 'Shortcuts', 'about' => 'About', + 'about_freshrss' => 'About FreshRSS', 'your_rss_feeds' => 'Your RSS feeds', 'add_rss_feed' => 'Add a RSS feed', diff --git a/app/i18n/fr.php b/app/i18n/fr.php index e260cdf50..ca7dade41 100644 --- a/app/i18n/fr.php +++ b/app/i18n/fr.php @@ -12,6 +12,7 @@ return array ( 'category' => 'Catégorie', 'shortcuts' => 'Raccourcis', 'about' => 'À propos', + 'about_freshrss' => 'À propos de FreshRSS', 'your_rss_feeds' => 'Vos flux RSS', 'add_rss_feed' => 'Ajouter un flux RSS', diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml index 9471f1f7e..51cb3dcf7 100644 --- a/app/layout/aside_flux.phtml +++ b/app/layout/aside_flux.phtml @@ -9,6 +9,8 @@ <a class="btn btn-important" href="<?php echo _url ('configure', 'categorize'); ?>"><i class="icon i_category"></i></a> </div> </li> + <?php } elseif (login_is_conf ($this->conf)) { ?> + <li><a href="<?php echo _url ('index', 'about'); ?>"><?php echo Translate::t ('about_freshrss'); ?></a></li> <?php } ?> <li> diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml index 73e5fcc4d..bd18d2d77 100644 --- a/app/views/index/index.phtml +++ b/app/views/index/index.phtml @@ -23,6 +23,7 @@ if(!login_is_conf ($this->conf) || <div class="post content"> <h1><?php echo Translate::t ('forbidden_access'); ?></h1> <p><?php echo Translate::t ('forbidden_access_description'); ?></p> + <p><a href="<?php echo _url ('index', 'about'); ?>"><?php echo Translate::t ('about_freshrss'); ?></a></p> </div> <?php }
\ No newline at end of file diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css index 650f8eef6..2ca7e7f36 100644 --- a/public/themes/default/freshrss.css +++ b/public/themes/default/freshrss.css @@ -23,7 +23,6 @@ display: inline-block; margin: 0; text-shadow: 1px -1px 0 #ccc; - vertical-align: middle; } .header > .item.title a:hover { text-decoration: none; diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css index 32dd72c42..96bb0d455 100644 --- a/public/themes/flat-design/freshrss.css +++ b/public/themes/flat-design/freshrss.css @@ -26,7 +26,6 @@ body { .header > .item.title h1 { display: inline-block; margin: 0; - vertical-align: middle; } .header > .item.title a:hover { text-decoration: none; |