thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into clostridium

Browse source 
* master:
  Drop isEditing
  Fix table widths
This commit is contained in:
Matthew Dillon 2015-09-10 16:26:28 -07:00
commit f4939a962e
6 changed files with 30 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/pods/protected/characteristics/show/template.hbs
View file

@ -1,6 +1,6 @@
<div class="grid-1">
<div class="span-1">
<fieldset class="flakes-information-box {{if isEditing 'is-editing'}}">
<fieldset class="flakes-information-box">
<legend>
{{model.characteristicName}}
</legend>

46
app/pods/protected/compare/results/template.hbs
View file

@ -1,27 +1,25 @@
<div class="overflow-div">
<table class="flakes-table">
<thead>
<table class="flakes-table">
<thead>
<tr>
<th>Characteristic</th>
{{#each strains as |strain|}}
<th>
{{#link-to 'protected.strains.show' strain.id classBinding="data.typeStrain:type-strain"}}
{{strain.fullNameMU}}
{{/link-to}}
</th>
{{/each}}
</tr>
</thead>
<tbody>
{{#each model as |row|}}
<tr>
<th>Characteristic</th>
{{#each strains as |strain|}}
<th>
{{#link-to 'protected.strains.show' strain.id classBinding="data.typeStrain:type-strain"}}
{{strain.fullNameMU}}
{{/link-to}}
</th>
{{#each row key="@index" as |col|}}
<td>{{col}}</td>
{{/each}}
</tr>
</thead>
<tbody>
{{#each model as |row|}}
<tr>
{{#each row key="@index" as |col|}}
<td>{{col}}</td>
{{/each}}
</tr>
{{/each}}
</tbody>
</table>
<hr>
<a href="{{csvLink}}" download>Download as CSV</a>
</div>
{{/each}}
</tbody>
</table>
<hr>
<a href="{{csvLink}}" download>Download as CSV</a>

2
app/pods/protected/species/show/template.hbs
View file

@ -1,6 +1,6 @@
<div class="grid-1">
<div class="span-1">
<fieldset class="flakes-information-box {{if isEditing 'is-editing'}}">
<fieldset class="flakes-information-box">
<legend>
Species <em>{{model.speciesName}}</em>
</legend>

2
app/pods/protected/strains/show/template.hbs
View file

@ -1,5 +1,5 @@
<div class="span-1">
<fieldset class="flakes-information-box {{if isEditing 'is-editing'}}">
<fieldset class="flakes-information-box">
<legend>
Strain {{model.strainNameMU}}
</legend>

2
app/pods/protected/users/show/template.hbs
View file

@ -1,5 +1,5 @@
<div class="span-1">
<fieldset class="flakes-information-box {{if isEditing 'is-editing'}}">
<fieldset class="flakes-information-box">
<legend>
{{model.name}}
</legend>

12
app/styles/app.css
View file

@ -7,10 +7,6 @@
overflow: auto;
}
.measurements-container {
padding: 2em 0em 0em 0em;
}
.select2-container {
width: 100%;
}
@ -19,14 +15,14 @@
cursor: pointer;
}
.is-editing {
background-color: #FFFCE2;
}
.type-strain {
color: #5CA934;
}
table.flakes-table td {
white-space: normal;
}
/* BEGIN https://github.com/tobiasahlin/SpinKit */
.spinner {
width: 40px;