casraf/snpr
1
0
Fork 0
mirror of https://github.com/chenasraf/snpr.git synced 2026-05-18 01:39:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #386 from openSNP/UIfixes2

Browse Source 
two more for #375
This commit is contained in:
Philipp Bayer
2017-06-03 15:59:48 +08:00
committed by GitHub
parent 47dd2152c2 5fc8a6eb21
commit 203defdc53
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/genotypes/index.html.erb
View File

@@ -17,7 +17,6 @@
<thead>
<tr>
<th>User</th>
<th>#</th>
<th><%= sortable "id", "ID"%></th>
<th><%= sortable "created_at", "Created"%></th>
<th><%= sortable "filetype", "Type"%></th>
@@ -29,7 +28,6 @@
<td class="table-cell vertical-centered">
<%= link_to(image_tag(g.user.avatar.url(:head), :class => "img-circle", :width => "50px") + " #{g.user.name}", g.user) %>
</td>
<td class="table-cell vertical-centered"><%= Genotype.all.sort { |a,b| a.id <=> b.id }.index(g) + 1 %></td>
<td class="table-cell vertical-centered"><%= g.id %></td>
<td class="table-cell vertical-centered"><%= g.created_at%></td>
<td class="table-cell vertical-centered"><%= g.filetype %></td>

8
app/views/users/_user_is_not_user.html.erb
View File

@@ -41,7 +41,6 @@
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#genotypes" aria-controls="gentypes" role="tab" data-toggle="tab">Genotypes</a></li>
<li role="presentation"><a href="#variations" aria-controls="variations" role="tab" data-toggle="tab">Variations</a></li>
<li role="presentation"><a ha href="#snps" aria-controls="snps" role="tab" data-toggle="tab"><%=@first_name%>'s SNPs</a></li>
</ul>
<div class="tab-content">
@@ -69,11 +68,4 @@
<% end %>
</div>
<div role="tabpanel" class="tab-pane well tabs__one-tab" id="snps">
<% if 1==2 %>
<%= render "snps" %>
<% else %>
<p>This user has not entered any snps yet.</p>
<% end %>
</div>
</div>