aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2019-10-01 18:12:21 +0200
committerGravatar GitHub <noreply@github.com> 2019-10-01 18:12:21 +0200
commit37b52b7361d3ac15273ca19a0b96ef74299e759e (patch)
tree23ab272309a6e1ddc23bdd52ef4db130b11c6287 /app
parent7ae4e9f159c9f0678d767dd29baa6cec8f0b04d8 (diff)
Trim whitespace (#2544)
Diffstat (limited to 'app')
-rw-r--r--app/shares.php10
-rw-r--r--app/views/helpers/index/normal/entry_header.phtml29
-rw-r--r--app/views/index/tos.phtml20
-rw-r--r--app/views/user/profile.phtml6
-rw-r--r--app/views/user/validateEmail.phtml34
5 files changed, 49 insertions, 50 deletions
diff --git a/app/shares.php b/app/shares.php
index 71860c9e3..9df83617a 100644
--- a/app/shares.php
+++ b/app/shares.php
@@ -139,9 +139,9 @@ return array(
'method' => 'GET',
),
'lemmy' => array(
- 'url' => '~URL~/create_post?url=~LINK~&name=~TITLE~',
- 'transform' => array('rawurlencode'),
- 'form' => 'advanced',
- 'method' => 'GET',
- ),
+ 'url' => '~URL~/create_post?url=~LINK~&name=~TITLE~',
+ 'transform' => array('rawurlencode'),
+ 'form' => 'advanced',
+ 'method' => 'GET',
+ ),
);
diff --git a/app/views/helpers/index/normal/entry_header.phtml b/app/views/helpers/index/normal/entry_header.phtml
index 7873b16e4..82c209bb2 100644
--- a/app/views/helpers/index/normal/entry_header.phtml
+++ b/app/views/helpers/index/normal/entry_header.phtml
@@ -28,21 +28,20 @@
}
}
?><li class="item website"><a href="<?php echo _url('index', 'index', 'get', 'f_' . $this->feed->id()); ?>"><img class="favicon" src="<?php echo $this->feed->favicon(); ?>" alt="✇" /> <span><?php echo $this->feed->name(); ?></span></a></li>
- <li class="item title"><a target="_blank" rel="noreferrer" href="<?php echo $this->entry->link(); ?>"><?php echo $this->entry->title(); ?></a><?php
- if ($topline_display_authors) {
- ?><div class="item author">
- <?php
- $authors = $this->entry->authors();
- if (is_array($authors)):
- $first = true;
- foreach ($authors as $author):
- echo $first ? $author : ', ' . $author;
- $first = false;
- endforeach;
- endif;
- ?></div><?php
- }
- ?></li>
+ <li class="item title"><a target="_blank" rel="noreferrer" href="<?php echo $this->entry->link(); ?>"><?php echo $this->entry->title(); ?></a><?php
+ if ($topline_display_authors):
+ ?><div class="item author"><?php
+ $authors = $this->entry->authors();
+ if (is_array($authors)) {
+ $first = true;
+ foreach ($authors as $author) {
+ echo $first ? $author : ', ' . $author;
+ $first = false;
+ }
+ }
+ ?></div><?php
+ endif;
+ ?></li>
<?php if ($topline_date) { ?><li class="item date"><?php echo $this->entry->date(); ?> </li><?php } ?>
<?php if ($topline_link) { ?><li class="item link"><a target="_blank" rel="noreferrer" href="<?php echo $this->entry->link(); ?>"><?php echo _i('link'); ?></a></li><?php } ?>
</ul>
diff --git a/app/views/index/tos.phtml b/app/views/index/tos.phtml
index 79c597244..1b3498134 100644
--- a/app/views/index/tos.phtml
+++ b/app/views/index/tos.phtml
@@ -1,13 +1,13 @@
<div class="post content">
- <?php if ($this->can_register) { ?>
- <a href="<?php echo _url('auth', 'register'); ?>">
- <?php echo _t('gen.action.back'); ?>
- </a>
- <?php } else { ?>
- <a href="<?php echo _url('index', 'index'); ?>">
- <?php echo _t('gen.action.back'); ?>
- </a>
- <?php } ?>
+ <?php if ($this->can_register) { ?>
+ <a href="<?php echo _url('auth', 'register'); ?>">
+ <?php echo _t('gen.action.back'); ?>
+ </a>
+ <?php } else { ?>
+ <a href="<?php echo _url('index', 'index'); ?>">
+ <?php echo _t('gen.action.back'); ?>
+ </a>
+ <?php } ?>
- <?php echo $this->terms_of_service; ?>
+ <?php echo $this->terms_of_service; ?>
</div>
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index df43642dd..de717b36e 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -1,7 +1,7 @@
<?php
- if (!$this->disable_aside) {
- $this->partial('aside_configure');
- }
+ if (!$this->disable_aside) {
+ $this->partial('aside_configure');
+ }
?>
<div class="post">
diff --git a/app/views/user/validateEmail.phtml b/app/views/user/validateEmail.phtml
index a246c222e..51517f5eb 100644
--- a/app/views/user/validateEmail.phtml
+++ b/app/views/user/validateEmail.phtml
@@ -1,22 +1,22 @@
<div class="post">
- <p>
- <?php echo _t('user.email.validation.need_to', FreshRSS_Context::$system_conf->title); ?>
- </p>
+ <p>
+ <?php echo _t('user.email.validation.need_to', FreshRSS_Context::$system_conf->title); ?>
+ </p>
- <p>
- <?php echo _t('user.email.validation.email_sent_to', FreshRSS_Context::$user_conf->mail_login); ?>
- </p>
+ <p>
+ <?php echo _t('user.email.validation.email_sent_to', FreshRSS_Context::$user_conf->mail_login); ?>
+ </p>
- <form action="<?php echo _url('user', 'sendValidationEmail'); ?>" method="post">
- <input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
- <button type="submit" class="btn">
- <?php echo _t('user.email.validation.resend_email'); ?>
- </button>
- </form>
+ <form action="<?php echo _url('user', 'sendValidationEmail'); ?>" method="post">
+ <input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
+ <button type="submit" class="btn">
+ <?php echo _t('user.email.validation.resend_email'); ?>
+ </button>
+ </form>
- <p>
- <small>
- <?php echo _t('user.email.validation.change_email', _url('user', 'profile')); ?>
- </small>
- </p>
+ <p>
+ <small>
+ <?php echo _t('user.email.validation.change_email', _url('user', 'profile')); ?>
+ </small>
+ </p>
</div>