From 665f665f1980111899bf0d9a6360cfe0e797c3bf Mon Sep 17 00:00:00 2001
From: Carlos Proensa <proensa@gmail.com>
Date: Sat, 25 Mar 2017 13:29:32 +0100
Subject: [PATCH] Move assigned projects outside of form

Move the list of assigned projects outside of the form in account_page.
This list is not editable, so it must not be part of the form.

Fixes: #21552
---
 account_page.php | 66 +++++++++++++++++++++++++++++++++---------------
 1 file changed, 45 insertions(+), 21 deletions(-)

diff --git a/account_page.php b/account_page.php
index 2adcb4beff..b7c7314cc4 100644
--- a/account_page.php
+++ b/account_page.php
@@ -258,27 +258,6 @@
 					<?php echo get_enum_element( 'access_levels', current_user_get_access_level() ); ?>
 				</td>
 			</tr>
-			<?php
-			$t_projects = user_get_assigned_projects( auth_get_current_user_id() );
-			if( count( $t_projects ) > 0 ) {
-				echo '<tr>';
-				echo '<td class="category">' . lang_get( 'assigned_projects' ) . '</td>';
-				echo '<td>';
-				foreach( $t_projects AS $t_project_id=>$t_project ) {
-					$t_project_name = string_attribute( $t_project['name'] );
-					$t_view_state = $t_project['view_state'];
-					$t_access_level = $t_project['access_level'];
-					$t_access_level = get_enum_element( 'access_levels', $t_access_level );
-					$t_view_state = get_enum_element( 'project_view_state', $t_view_state );
-
-					echo '<div class="col-md-3 col-xs-6 no-padding">' . $t_project_name . '</div> <div class="col-md-9 col-xs-6"><span class="label label-default">' . $t_access_level . '</span><span class="bold padding-left-4">' . $t_view_state . '</span></div>';
-					echo '<div class="clearfix"></div>';
-					echo '<div class="space-4"></div>';
-				}
-				echo '</td>';
-				echo '</tr>';
-			}
-			?>
 				</fieldset>
 			</table>
 		</div>
@@ -294,6 +273,51 @@
 	</div>
 </div>
 
+<?php
+$t_projects = user_get_assigned_projects( auth_get_current_user_id() );
+if( !empty( $t_projects ) ) {
+?>
+	<div class="space-10"></div>
+
+	<div class="widget-box widget-color-blue2">
+		<div class="widget-header widget-header-small">
+			<h4 class="widget-title lighter">
+				<i class="ace-icon fa fa-user"></i>
+				<?php echo lang_get( 'assigned_projects' ) ?>
+			</h4>
+		</div>
+		<div class="widget-body">
+			<div class="widget-main no-padding">
+				<div class="table-responsive">
+					<table class="table table-bordered table-condensed table-striped">
+						<?php
+							echo '<tr>';
+							echo '<td class="category">' . lang_get( 'assigned_projects' ) . '</td>';
+							echo '<td>';
+							foreach( $t_projects AS $t_project_id => $t_project ) {
+								$t_project_name = string_attribute( $t_project['name'] );
+								$t_view_state = $t_project['view_state'];
+								$t_access_level = $t_project['access_level'];
+								$t_access_level = get_enum_element( 'access_levels', $t_access_level );
+								$t_view_state = get_enum_element( 'project_view_state', $t_view_state );
+
+								echo '<div class="col-md-3 col-xs-6 no-padding">' . $t_project_name . '</div>'
+										. '<div class="col-md-9 col-xs-6">'
+										. '<span class="label label-default">' . $t_access_level . '</span>'
+										. '<span class="bold padding-left-4">' . $t_view_state . '</span></div>';
+								echo '<div class="clearfix"></div>';
+								echo '<div class="space-4"></div>';
+							}
+							echo '</td>';
+							echo '</tr>';
+						?>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+<?php } ?>
+
 	</form>
 </div>