diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/account.html.ep | 28 | ||||
| -rw-r--r-- | templates/social_list.html.ep | 25 | 
2 files changed, 41 insertions, 12 deletions
diff --git a/templates/account.html.ep b/templates/account.html.ep index d3305a2..1da49be 100644 --- a/templates/account.html.ep +++ b/templates/account.html.ep @@ -92,10 +92,10 @@  					% }  					% elsif ($acc->{accept_follow_requests}) {  						<span>Accounts können dir auf Anfrage folgen -						% if ($num_follow_requests == 1) { +						% if ($num_rx_follow_requests == 1) {  							– <a href="/account/social/follow-requests"><strong>eine</strong> offene Anfrage</a> -						% } elsif ($num_follow_requests) { -							– <a href="/account/social/follow-requests"><strong><%= $num_follow_requests %></strong> offene Anfragen</a> +						% } elsif ($num_rx_follow_requests) { +							– <a href="/account/social/follow-requests"><strong><%= $num_rx_follow_requests %></strong> offene Anfragen</a>  						% }  						</span>  					% } @@ -179,7 +179,7 @@  	</div>  </div> -% if ($num_follow_requests or $num_followers or $num_following or $num_blocked) { +% if ($num_rx_follow_requests or $num_tx_follow_requests or $num_followers or $num_following or $num_blocked) {  	<div class="row">  		<div class="col s12">  			<h2>Interaktion</h2> @@ -190,14 +190,24 @@  				<tr>  					<th scope="row">Anfragen</th>  					<td> -						% if ($num_follow_requests == 0) { -							<span style="color: #999999;">keine offen</span> +						% if ($num_rx_follow_requests == 0) { +							<span style="color: #999999;">keine eingehend</span>  						% } -						% elsif ($num_follow_requests == 1) { -							<a href="/account/social/follow-requests"><strong>ein</strong> Account</a> +						% elsif ($num_rx_follow_requests == 1) { +							<a href="/account/social/follow-requests-received"><strong>eine</strong> eingehend</a>  						% }  						% else { -							<a href="/account/social/follow-requests"><strong><%= $num_follow_requests %></strong> Accounts</a> +							<a href="/account/social/follow-requests-received"><strong><%= $num_rx_follow_requests %></strong> eingehend</a> +						% } +						<br/> +						% if ($num_tx_follow_requests == 0) { +							<span style="color: #999999;">keine ausgehend</span> +						% } +						% elsif ($num_tx_follow_requests == 1) { +							<a href="/account/social/follow-requests-sent"><strong>eine</strong> ausgehend</a> +						% } +						% else { +							<a href="/account/social/follow-requests-sent"><strong><%= $num_tx_follow_requests %></strong> ausgehend</a>  						% }  					</td>  				</tr> diff --git a/templates/social_list.html.ep b/templates/social_list.html.ep index 9808512..1a3e441 100644 --- a/templates/social_list.html.ep +++ b/templates/social_list.html.ep @@ -2,10 +2,10 @@  %= csrf_field  %= hidden_field redirect_to => '/account'  % my $count = scalar @{$entries}; -% if ($type eq 'follow-requests') { +% if ($type eq 'follow-requests-received') {  	<div class="row">  		<div class="col s12"> -			<h2>Folge-Anfragen</h2> +			<h2>Erhaltene Folge-Anfragen</h2>  		</div>  	</div>  	% if ($notifications) { @@ -52,6 +52,18 @@  	</div>  	-->  % } +% elsif ($type eq 'follow-requests-sent') { +	<div class="row"> +		<div class="col s12"> +			<h2>Gestellte Folge-Anfragen</h2> +		</div> +	</div> +	<div class="row center-align"> +		<div class="col s12"> +			<i class="material-icons">cancel</i><br/> Zurücknehmen +		</div> +	</div> +% }  % elsif ($type eq 'followers') {  	<div class="row">  		<div class="col s12"> @@ -168,7 +180,7 @@  				% for my $entry (@{$entries}) {  					<tr>  						<td><a href="/p/<%= $entry->{name} %>"><%= $entry->{name} %></a></td> -						% if ($type eq 'follow-requests') { +						% if ($type eq 'follow-requests-received') {  							<td class="right-align">  								<button class="btn-flat waves-effect waves-light" type="submit" name="block" value="<%= $entry->{id} %>">  									<i class="material-icons" aria-label="blockieren">block</i> @@ -185,6 +197,13 @@  								</button>  							</td>  						% } +						% elsif ($type eq 'follow-requests-sent') { +							<td class="right-align"> +								<button class="btn-flat waves-effect waves-light" type="submit" name="cancel_follow_request" value="<%= $entry->{id} %>"> +									<i class="material-icons" aria-label="zurücknehmen">cancel</i> +								</button> +							</td> +						% }  						% elsif ($type eq 'followers') {  							<td class="right-align">  								<button class="btn-flat waves-effect waves-light" type="submit" name="block" value="<%= $entry->{id} %>">  | 
