Skip to content

Commit

Permalink
Merge pull request #257 from Addepar/ebryn/fix-html
Browse files Browse the repository at this point in the history
Fix various invalid HTML
  • Loading branch information
ebryn committed Jan 13, 2015
2 parents 31c20a9 + cfb73ec commit 46463d0
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion app/templates/ember_table/_sub_navigation.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
{{#link-to 'emberTable.community-examples'}}
<ul class="list-unstyled project-navigation">
<li class="sub-title">Community Examples</li>
<ul>
</ul>
{{/link-to}}
</div>
4 changes: 2 additions & 2 deletions app/templates/ember_table/ajax_table/ajax_cell.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{#if view.row.isLoaded}}
<img width="30" {{bind-attr src="view.cellContent"}}></img>
<img width="30" {{bind-attr src="view.cellContent"}}>
{{else}}
<img src="img/loading.gif" style="padding: 8px;"></img>
<img src="img/loading.gif" style="padding: 8px;">
{{/if}}
2 changes: 1 addition & 1 deletion app/templates/ember_table/bars.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,5 @@
</pre>
</div>
</div>
</div>

</div>
16 changes: 8 additions & 8 deletions app/templates/ember_table/documentation.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -299,20 +299,20 @@
<td>templateName</td>
<td>'table-cell'</td>
<td><p>The name of the template to be rendered into the cell.
Used for rendering custom templates.<p></td>
Used for rendering custom templates.</p></td>
</tr>
<tr>
<td>classNames</td>
<td>['ember-table-cell']</td>
<td><p>The class names applied to the cell. Override to give
the cell custom styling (border, background color, etc).<p></td>
the cell custom styling (border, background color, etc).</p></td>
</tr>
<tr>
<td>classNameBindings</td>
<td>'column.textAlign'</td>
<td><p>A binding used to dynamically associate class names
with this table cell. E.g. you can bind to a column property
to have cell colors or styles vary across columns.<p></td>
to have cell colors or styles vary across columns.</p></td>
</tr>
<tr>
<td>styleBindings</td>
Expand All @@ -321,7 +321,7 @@
<p>
Values which are bound to the cell's style attr. See
<code>Ember.StyleBindingsMixin</code> documentation for more details.
<p>
</p>
</td>
</tr>
</table>
Expand All @@ -336,22 +336,22 @@
<tr>
<td>templateName</td>
<td>'header-cell'</td>
<td><p>See description in <code>Ember.Table.TableCell</code>.<p></td>
<td><p>See description in <code>Ember.Table.TableCell</code>.</p></td>
</tr>
<tr>
<td>classNames</td>
<td>['ember-table-cell', 'ember-table-header-cell']</td>
<td><p>See description in <code>Ember.Table.TableCell</code>.<p></td>
<td><p>See description in <code>Ember.Table.TableCell</code>.</p></td>
</tr>
<tr>
<td>classNameBindings</td>
<td>['column.isSortable:sortable', 'column.textAlign']</td>
<td><p>See description in <code>Ember.Table.TableCell</code>.<p></td>
<td><p>See description in <code>Ember.Table.TableCell</code>.</p></td>
</tr>
<tr>
<td>styleBindings</td>
<td>['width', 'height']</td>
<td><p>See description in <code>Ember.Table.TableCell</code>.<p></td>
<td><p>See description in <code>Ember.Table.TableCell</code>.</p></td>
</tr>
</table>
</div>
1 change: 0 additions & 1 deletion app/templates/ember_table/financial.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -282,5 +282,4 @@ App.FinancialTableHeaderTreeCell = Ember.Table.HeaderCell.extend
</div>
</div>

</div>
</div>
2 changes: 1 addition & 1 deletion app/templates/ember_table/overview.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ $ node examples.js</code></pre>
<div class="col-md-6">
<hr>
<h1>Contributing</h1>
<p>You can contribute to this project in one of two ways:
<p>You can contribute to this project in one of two ways:</p>
<ul class="styled">
<li>Browse the ember-table <a target="_BLANK" href="https://github.com/Addepar/ember-table/issues?state=open">issues</a> and report bugs</li>
<li>Clone the ember-table repo, make some changes according to our development guidelines and issue a pull-request with your changes.</li>
Expand Down

0 comments on commit 46463d0

Please sign in to comment.