Better handling of disabled avatar setting on mobile

mantisbt · Jul 9, 2014 · 7dcd086 · 7dcd086
1 parent 96d1dd3
commit 7dcd086
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/core/classes/TimelineEvent.class.php b/core/classes/TimelineEvent.class.php
@@ -104,7 +104,7 @@ public function html_start( $t_action_icon = 'fa-check') {
 		$t_avatar = user_get_avatar( $this->user_id, 40 );
         $t_html = '<div class="profile-activity clearfix">';
 
-		if( $t_avatar !== false ) {
+		if( $t_avatar !== false && $t_avatar[0] != false) {
 			$t_avatar_url = $t_avatar[0];
 			$t_html .= '<img class="pull-left" src="' . $t_avatar_url . '"/>';
 		} else {

diff --git a/core/layout_api.php b/core/layout_api.php
@@ -362,7 +362,8 @@ function layout_navbar() {
     echo '</span>';
     echo '</a>';
 
-    echo '<button type="button" class="navbar-toggle navbar-toggle-img collapsed pull-right" data-toggle="collapse" data-target=".navbar-buttons,.navbar-menu">';
+	$t_toggle_class = (OFF == config_get( 'show_avatar' ) ? 'navbar-toggle' : 'navbar-toggle-img');
+    echo '<button type="button" class="navbar-toggle ' . $t_toggle_class . ' collapsed pull-right" data-toggle="collapse" data-target=".navbar-buttons,.navbar-menu">';
 	echo '<span class="sr-only">Toggle user menu</span>';
     layout_navbar_user_avatar();
 	echo '</button>';
@@ -376,13 +377,15 @@ function layout_navbar() {
 
     echo '</div>';
 
-    echo '<div class="hidden-xs navbar-buttons navbar-header pull-right navbar-collapse collapse">';
+	echo '<div class="hidden-xs">';
+    echo '<div class="navbar-buttons navbar-header pull-right navbar-collapse collapse">';
     echo '<ul class="nav ace-nav">';
     layout_navbar_projects_menu();
     # user buttons such as messages, notifications and user menu
     layout_navbar_user_menu();
     echo '</ul>';
     echo '</div>';
+	echo '</div>';
 
     # mobile view
     echo '<div class="hidden-sm hidden-md hidden-lg">';
@@ -616,7 +619,7 @@ function layout_navbar_subproject_option_list( $p_parent_id, $p_project_id = nul
  * @return null
  */
 function layout_navbar_user_avatar( $p_img_class = '' ) {
-    $t_default_avatar = '<i class="ace-icon fa fa-user fa-3x white"></i> ';
+    $t_default_avatar = '<i class="ace-icon fa fa-user fa-2x white"></i> ';
 
     if( OFF === config_get( 'show_avatar' ) ) {
         echo $t_default_avatar;

diff --git a/css/ace-mantis.css b/css/ace-mantis.css
@@ -124,7 +124,7 @@ pre {
     border-radius: 4px !important;
 }
 .profile-activity img {
-    border-radius: 4px !important;
+    border-radius: 15% !important;
     margin-bottom: 6px !important;
 }
 
@@ -135,7 +135,7 @@ pre {
 .avatar
 {
     border: 2px solid #c9d6e5;
-    border-radius: 4px;
+    border-radius: 15%;
     box-shadow: none;
     margin:0;
     max-width: 80px;