diff options
author | David Underwood <david.underwood@jadedpixel.com> | 2013-06-27 08:32:53 -0400 |
---|---|---|
committer | David Underwood <david.underwood@jadedpixel.com> | 2013-06-27 08:32:53 -0400 |
commit | 8dfe7c73e1f62dfcc24e175123e1e71a08ebb57c (patch) | |
tree | a7cf48dece1a9321acfe06105d109f283282d166 /templates/project | |
parent | 86d8c29db3087ce53f8c198cea6036c025d83855 (diff) | |
parent | 6e19ec4ef1508d45f84a395972023fce75fcec35 (diff) |
Merge branch 'master' of github.com:Shopify/dashing
* 'master' of github.com:Shopify/dashing:
render titles correctly
Diffstat (limited to 'templates/project')
-rw-r--r-- | templates/project/dashboards/sample.erb | 2 | ||||
-rw-r--r-- | templates/project/dashboards/sampletv.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/project/dashboards/sample.erb b/templates/project/dashboards/sample.erb index 7435b56..d41d538 100644 --- a/templates/project/dashboards/sample.erb +++ b/templates/project/dashboards/sample.erb @@ -1,4 +1,4 @@ -<% content_for(:title) { "My super sweet dashboard" } %> +<% content_for :title do %>My super sweet dashboard<% end %> <div class="gridster"> <ul> <li data-row="1" data-col="1" data-sizex="2" data-sizey="1"> diff --git a/templates/project/dashboards/sampletv.erb b/templates/project/dashboards/sampletv.erb index 7ac9112..b88e636 100644 --- a/templates/project/dashboards/sampletv.erb +++ b/templates/project/dashboards/sampletv.erb @@ -8,7 +8,7 @@ $(function() { </script> -<% content_for(:title) { "1080p dashboard" } %> +<% content_for :title do %>1080p dashboard<% end %> <div class="gridster"> <ul> |