Commit fb126c69 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

optionally show journey comment in public user status 

Closes #19
parent 094c536e

lib/Travelynx/Controller/Account.pm

+10 −3
Original line number Diff line number Diff line
@@ -221,6 +221,12 @@ sub privacy { 
		else {

			$public_level &= ~0x02;

		}

		if ( $self->param('public_comment') ) {

			$public_level |= 0x04;

		}

		else {

			$public_level &= ~0x04;

		}

		$self->set_privacy( $user->{id}, $public_level );



		$self->flash( success => 'privacy' );
@@ -228,6 +234,7 @@ sub privacy { 
	}

	else {

		$self->param( public_status  => $public_level & 0x02 ? 1 : 0 );

		$self->param( public_comment => $public_level & 0x04 ? 1 : 0 );

		$self->render( 'privacy', name => $user->{name} );

	}

}

lib/Travelynx/Controller/Traveling.pm

+7 −5
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ sub user_status { 
		$self->render(

			'user_status',

			name         => $name,

			public_level => $user->{public_level},

			journey      => $status,

			twitter      => \%tw_data,

		);
@@ -98,6 +99,7 @@ sub public_status_card { 
		$self->render(

			'_public_status_card',

			name         => $name,

			public_level => $user->{public_level},

			journey      => $status

		);

	}

templates/_checked_in.html.ep

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
			<i class="material-icons small right sync-failed-marker grey-text" style="display: none;">sync_problem</i>

			<span class="card-title">Eingecheckt in <%= $journey->{train_type} %> <%= $journey->{train_no} %></span>

			% if ($journey->{comment}) {

				<p><%= $journey->{comment} %>.</p>

				<p><%= $journey->{comment} %></p>

			% }

			<p>

				<div class="center-align countdown"

templates/_public_status_card.html.ep

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ 
		<div class="card-content">

			<i class="material-icons small right sync-failed-marker grey-text" style="display: none;">sync_problem</i>

			<span class="card-title"><%= $name %> ist unterwegs</span>

			% if ($public_level & 0x04 and $journey->{comment}) {

				<p>„<%= $journey->{comment} %>“</p>

			% }

			<p>

				% if ($journey->{train_line}) {

					<div class="center-align"><b><%= $journey->{train_type} %> <%= $journey->{train_line} %></b> <%= $journey->{train_no} %></div>

templates/account.html.ep

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ 
					% if ($acc->{is_public} & 0x02) {

						Aktueller Status

					% }

					% if (($acc->{is_public} & 0x06) == 0x06) {

						mit Kommentar

					% }

				</td>

			</tr>

			<tr>