diff options
| -rw-r--r-- | app/views/index/logs.phtml | 2 | ||||
| -rw-r--r-- | app/views/user/profile.phtml | 1 | ||||
| -rw-r--r-- | p/api/index.php (renamed from p/api/index.html) | 11 | ||||
| -rw-r--r-- | p/themes/BlueLagoon/BlueLagoon.css | 2 | ||||
| -rw-r--r-- | p/themes/Dark/dark.css | 2 | ||||
| -rw-r--r-- | p/themes/Flat/flat.css | 2 | ||||
| -rw-r--r-- | p/themes/Origine/origine.css | 2 | ||||
| -rw-r--r-- | p/themes/Pafat/pafat.css | 2 | ||||
| -rw-r--r-- | p/themes/Screwdriver/screwdriver.css | 2 | ||||
| -rw-r--r-- | p/themes/base-theme/base.css | 2 |
10 files changed, 19 insertions, 9 deletions
diff --git a/app/views/index/logs.phtml b/app/views/index/logs.phtml index 02256bd98..0938491c3 100644 --- a/app/views/index/logs.phtml +++ b/app/views/index/logs.phtml @@ -10,7 +10,7 @@ <?php $items = $this->logsPaginator->items(); ?> <?php if (!empty($items)) { ?> - <div class="logs"> + <div class="loglist"> <?php $this->logsPaginator->render('logs_pagination.phtml', 'page'); ?> <?php foreach ($items as $log) { ?> diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml index 7ae2c7ede..a97970927 100644 --- a/app/views/user/profile.phtml +++ b/app/views/user/profile.phtml @@ -37,6 +37,7 @@ <input type="password" id="apiPasswordPlain" name="apiPasswordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/> <a class="btn toggle-password" data-toggle="apiPasswordPlain"><?php echo _i('key'); ?></a> </div> + <?php echo _i('help'); ?> <kbd><a href="../api/"><?php echo Minz_Url::display('/api/greader.php', 'html', true); ?></a></kbd> </div> </div> <?php } ?> diff --git a/p/api/index.html b/p/api/index.php index 8da0bcb58..3ab4e02b3 100644 --- a/p/api/index.html +++ b/p/api/index.php @@ -11,8 +11,17 @@ <h1>FreshRSS API</h1> <h2>Google Reader compatible API</h2> +<dl> +<dt>Your API address:</dt> +<dd><?php +require('../../constants.php'); +require(LIB_PATH . '/lib_rss.php'); //Includes class autoloader +Minz_Configuration::register('system', DATA_PATH . '/config.php', DATA_PATH . '/config.default.php'); +echo Minz_Url::display('/api/greader.php', 'html', true); +?></dd> +</dl> <ul> -<li><a href="greader.php/check%2Fcompatibility" rel="nofollow">Check full server configuration (with <code>%2F</code> support)</a></li> +<li><a href="greader.php/check%2Fcompatibility" rel="nofollow">Check full server configuration</a></li> <li><a href="greader.php/check/compatibility" rel="nofollow">Check partial server configuration (without <code>%2F</code> support)</a></li> </ul> diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css index e1b93dac9..d64ffd9a0 100644 --- a/p/themes/BlueLagoon/BlueLagoon.css +++ b/p/themes/BlueLagoon/BlueLagoon.css @@ -1054,7 +1054,7 @@ opacity: 1; /*=== LOGS */ /*=========*/ -.logs { +.loglist { border: 1px solid #aaa; border-radius: 5px; overflow: hidden; diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css index 65ee0a049..f72ed8b5b 100644 --- a/p/themes/Dark/dark.css +++ b/p/themes/Dark/dark.css @@ -928,7 +928,7 @@ a.btn { /*=== LOGS */ /*=========*/ -.logs { +.loglist { overflow: hidden; border: 1px solid #333; } diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css index 1e5cdf8ff..0672c6a38 100644 --- a/p/themes/Flat/flat.css +++ b/p/themes/Flat/flat.css @@ -921,7 +921,7 @@ a.btn { /*=== LOGS */ /*=========*/ -.logs { +.loglist { overflow: hidden; border: 1px solid #aaa; } diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index ee08b33bb..da461087b 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -966,7 +966,7 @@ a.btn { /*=== LOGS */ /*=========*/ -.logs { +.loglist { border: 1px solid #aaa; border-radius: 5px; overflow: hidden; diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css index 374471ebc..5e46a63ca 100644 --- a/p/themes/Pafat/pafat.css +++ b/p/themes/Pafat/pafat.css @@ -977,7 +977,7 @@ a.btn { /*=== LOGS */ /*=========*/ -.logs { +.loglist { border: 1px solid #aaa; border-radius: 5px; overflow: hidden; diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css index 8754b0b2f..b7bbd923e 100644 --- a/p/themes/Screwdriver/screwdriver.css +++ b/p/themes/Screwdriver/screwdriver.css @@ -1052,7 +1052,7 @@ opacity: 1; /*=== LOGS */ /*=========*/ -.logs { +.loglist { border: 1px solid #aaa; border-radius: 5px; overflow: hidden; diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css index 6c788371d..192a957c9 100644 --- a/p/themes/base-theme/base.css +++ b/p/themes/base-theme/base.css @@ -731,7 +731,7 @@ a.btn { /*=== LOGS */ /*=========*/ -.logs { +.loglist { overflow: hidden; } .log { |