From a37cfa723d1986ce6d8ec3de0c86c1326c286139 Mon Sep 17 00:00:00 2001 From: Tobias Braner Date: Thu, 15 May 2014 11:30:46 +0200 Subject: [PATCH 1/2] Before you could not add text to progessbars. With this minor fix you can use the block helpers of bs-progress and bs-progressbar to create progress bars with custom text. --- app/templates/components/bs-progressbar.hbs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/templates/components/bs-progressbar.hbs b/app/templates/components/bs-progressbar.hbs index 85976c5..d0b8818 100644 --- a/app/templates/components/bs-progressbar.hbs +++ b/app/templates/components/bs-progressbar.hbs @@ -1 +1,5 @@ -{{progress}}% Complete \ No newline at end of file +{{#if template}} + {{yield}} +{{else}} + {{progress}}% Complete +{{/if}} \ No newline at end of file From e2d6d8faa8a31d9eeb335e7e96450873f27f3907 Mon Sep 17 00:00:00 2001 From: Tobias Braner Date: Thu, 15 May 2014 15:47:33 +0200 Subject: [PATCH 2/2] Updated the documentation for the progress bar --- .../showcase/show_components/progressbar.md | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/app/templates/showcase/show_components/progressbar.md b/app/templates/showcase/show_components/progressbar.md index 0515c2e..dea58be 100644 --- a/app/templates/showcase/show_components/progressbar.md +++ b/app/templates/showcase/show_components/progressbar.md @@ -114,4 +114,27 @@ Multiple bars can be placed into the same _bs-progress_ to stack them: \{\{bs-progressbar type="warning" progress="20"\}\} \{\{bs-progressbar type="danger" progress="10"\}\} \{\{/bs-progress\}\} +``` + +## With label + +A label can be added to the progress bar as mentioned +[here](http://getbootstrap.com/components/#progress-label). That works by using +_bs-progress_ and _bs-progressbar_ as block helpers. The inner content will be +displayed as label. + +
+ {{#bs-progress}} + {{#bs-progressbar type="success" progress="100"}} + custom label + {{/bs-progressbar}} + {{/bs-progress}} +
+ +``` html + \{\{#bs-progress\}\} + \{\{#bs-progressbar type="success" progress="100"\}\} + custom label + \{\{/bs-progressbar\}\} + \{\{/bs-progress\}\} ``` \ No newline at end of file