Merge branch 'master' into ldap
This commit is contained in:
		
						commit
						49ece7be6a
					
				| 
						 | 
					@ -28,7 +28,7 @@
 | 
				
			||||||
				<% if user_signed_in? %>
 | 
									<% if user_signed_in? %>
 | 
				
			||||||
					<li class="dropdown active">
 | 
										<li class="dropdown active">
 | 
				
			||||||
						<a class="orbit-bar-account" href="#" data-toggle="dropdown">
 | 
											<a class="orbit-bar-account" href="#" data-toggle="dropdown">
 | 
				
			||||||
							<img class="member-img" src="/assets/menber-pic.png" />
 | 
												<img class="member-img" src="/assets/person.png" />
 | 
				
			||||||
							<%#= image_tag current_user.avatar.thumb.url, :class => 'member-img' %>
 | 
												<%#= image_tag current_user.avatar.thumb.url, :class => 'member-img' %>
 | 
				
			||||||
							<span class="member-name"><%= current_user.name %></span>
 | 
												<span class="member-name"><%= current_user.name %></span>
 | 
				
			||||||
						</a>
 | 
											</a>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue