From 58fd0dea36173c8672fd77cf06df2ccfbeb4d068 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 1 Feb 2012 22:51:01 -0800 Subject: fixing some docs pages for i18n --- docs/templates/pages/javascript.mustache | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'docs/templates/pages/javascript.mustache') diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index aedd21f53..3233a9b76 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -947,17 +947,17 @@ $('#my-alert').bind('closed', function () {

{{_i}}Markup{{/i}}

{{_i}}Data attributes are integral to the button plugin. Check out the example code below for the various markup types.{{/i}}

-<!-- Add data-toggle="button" to activate toggling on a single button -->
+<!-- {{_i}}Add data-toggle="button" to activate toggling on a single button{{/i}} -->
 <button class="btn" data-toggle="button">Single Toggle</button>
 
-<!-- Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group -->
+<!-- {{_i}}Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group{{/i}} -->
 <div class="btn-group" data-toggle="buttons-checkbox">
   <button class="btn">Left</button>
   <button class="btn">Middle</button>
   <button class="btn">Right</button>
 </div>
 
-<!-- Add data-toggle="buttons-radio" for radio style toggling on btn-group -->
+<!-- {{_i}}Add data-toggle="buttons-radio" for radio style toggling on btn-group{{/i}} -->
 <div class="btn-group" data-toggle="buttons-radio">
   <button class="btn">Left</button>
   <button class="btn">Middle</button>
@@ -1052,7 +1052,7 @@ $('#my-alert').bind('closed', function () {
 
           

           
{{_i}}Using bootstrap-collapse.js{{/i}}

-          
Enable via javascript:

+          
{{_i}}Enable via javascript:{{/i}}

           
$(".collapse").collapse()

           
{{_i}}Options{{/i}}

           
@@ -1220,11 +1220,11 @@ $('#myCollapsible').on('hidden', function () {
           
{{_i}}Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.{{/i}}
 <div class="carousel">
-  <!-- Carousel items -->
+  <!-- {{_i}}Carousel items{{/i}} -->
   <div class="carousel-inner">
     ...
   </div>
-  <!-- Carousel nav -->
+  <!-- {{_i}}Carousel nav{{/i}} -->
   <a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
   <a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
 </div>
-- 
cgit v1.2.3


From 99f395bcd7ad18ec1ef63b88516e98b294b5bc12 Mon Sep 17 00:00:00 2001
From: Kyle Robinson Young 
Date: Wed, 1 Feb 2012 23:30:37 -0800
Subject: Typo fixes

---
 docs/templates/pages/javascript.mustache | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index aedd21f53..961428dbf 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -58,7 +58,7 @@
         

           
         

         

@@ -552,7 +552,7 @@ $('#myModal').on('hidden', function () {
   <li><a href="#home" data-toggle="tab">{{_i}}Home{{/i}}</a></li>
   <li><a href="#profile" data-toggle="tab">{{_i}}Profile{{/i}}</a></li>
   <li><a href="#messages" data-toggle="tab">{{_i}}Messages{{/i}}</a></li>
-  <li><a href="#ettings" data-toggle="tab">{{_i}}Settings{{/i}}</a></li>
+  <li><a href="#settings" data-toggle="tab">{{_i}}Settings{{/i}}</a></li>
 </ul>
{{_i}}Methods{{/i}}
$().tab

@@ -1069,7 +1069,7 @@ $('#my-alert').bind('closed', function () {
                
-               
+               
-- 
cgit v1.2.3


From cf488c2800293f4f243f59658b691741f4b78175 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 2 Feb 2012 09:33:18 -0800
Subject: fix incorrect uses of it's in the docs

---
 docs/templates/pages/javascript.mustache | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 3233a9b76..b8b1f3da4 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -966,7 +966,7 @@ $('#my-alert').bind('closed', function () {
 
           
{{_i}}Methods{{/i}}

           
$().button('toggle')

-          
{{_i}}Toggles push state. Gives btn the look that it's been activated.{{/i}}

+          
{{_i}}Toggles push state. Gives btn the look that it hass been activated.{{/i}}

           

             {{_i}}Heads up!{{/i}}
             {{_i}}You can enable auto toggling of a button by using the data-toggle attribute.{{/i}}
@@ -1263,7 +1263,7 @@ $('.myCarousel').carousel({
              

-               
+               

 
           
           
{{_i}}parent{{/i}}
                {{_i}}selector{{/i}}
                false{{_i}}If selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior){{/i}}{{_i}}If selector then all collapsible elements under the specified parent will be closed when this collapsible item is shown. (similar to traditional accordion behavior){{/i}}
              

              

                {{_i}}toggle{{/i}}

              

                {{_i}}slid{{/i}}{{_i}}This event is fired when the carousel has completed it's slide transition.{{/i}}{{_i}}This event is fired when the carousel has completed its slide transition.{{/i}}
              

             
           

-- 
cgit v1.2.3


From 418bf5221a70440aeecffe9ad9006b444aaf1747 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 4 Feb 2012 22:50:26 -0800
Subject: #1712: fix typo in js docs

---
 docs/templates/pages/javascript.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 29632a090..67bc83a1c 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1346,7 +1346,7 @@ $('.myCarousel').carousel({

{{_i}}Methods{{/i}}

.typeahead({{_i}}options{{/i}})

-

{{_i}}Initializes an input with a typahead.{{/i}}

+

{{_i}}Initializes an input with a typeahead.{{/i}}

\ No newline at end of file -- cgit v1.2.3 From ff91b233eb51da94451114f45e276ba325f67479 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 01:50:55 -0800 Subject: fix #1665 by correcting tabs example markup --- docs/templates/pages/javascript.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/templates/pages/javascript.mustache') diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 9850335c4..006461290 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -548,7 +548,7 @@ $('#myModal').on('hidden', function () {

{{_i}}Markup{{/i}}

{{_i}}You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element.{{/i}}

-<ul class="tabs">
+<ul class="nav nav-tabs">
   <li><a href="#home" data-toggle="tab">{{_i}}Home{{/i}}</a></li>
   <li><a href="#profile" data-toggle="tab">{{_i}}Profile{{/i}}</a></li>
   <li><a href="#messages" data-toggle="tab">{{_i}}Messages{{/i}}</a></li>
@@ -560,7 +560,7 @@ $('#myModal').on('hidden', function () {
             {{_i}}Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom.{{/i}}
           

 
-<ul class="tabs">
+<ul class="nav nav-tabs">
   <li class="active"><a href="#home">{{_i}}Home{{/i}}</a></li>
   <li><a href="#profile">{{_i}}Profile{{/i}}</a></li>
   <li><a href="#messages">{{_i}}Messages{{/i}}</a></li>
-- 
cgit v1.2.3


From 7e92b33f12d8c5840aa746094f9566f0a0a1aaf8 Mon Sep 17 00:00:00 2001
From: Pamela Fox 
Date: Mon, 6 Feb 2012 14:37:47 -0800
Subject: Adding tooltip example to javascript docs. It's particularly helpful
 to show the pre-generated HTML for tooltips, as inspecting the source will
 show post-processed HTML with data-original-title attributes and may confuse
 folks (where folks=me :).

---
 docs/templates/pages/javascript.mustache | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 57cb4eac4..c98e746c8 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -697,6 +697,9 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           
           
{{_i}}Markup{{/i}}

           
{{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.{{/i}}

+
+<a href="#" rel="tooltip" title="first tooltip">{{_i}}hover over me{{/i}}</a>
+

           
{{_i}}Methods{{/i}}

           
$().tooltip({{_i}}options{{/i}})

           
{{_i}}Attaches a tooltip handler to an element collection.{{/i}}

-- 
cgit v1.2.3


From 7dffeb471f53bc3fa974abdd567690f770c8b647 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 6 Feb 2012 23:55:18 -0800
Subject: fix #1786 to manually fix typo in js docs links

---
 docs/templates/pages/javascript.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 965819036..f74859d7e 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -725,7 +725,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
         

           
{{_i}}About popovers{{/i}}

           
{{_i}}Add small overlays of content, like those on the iPad, to any element for housing secondary information.{{/i}}

-          
* {{_i}}Requires Tooltip to be included{{/i}}

+          
* {{_i}}Requires Tooltip to be included{{/i}}

           {{_i}}Download file{{/i}}
         

         

-- 
cgit v1.2.3


From 11f72f6aa22c9d2daa9a95846e6c786afd7bc3e1 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 7 Feb 2012 00:31:01 -0800
Subject: merge in #1782, remake to compile html, add some i18n tags

---
 docs/templates/pages/javascript.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 815aa7f03..c24626f8a 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -698,7 +698,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           
{{_i}}Markup{{/i}}

           
{{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.{{/i}}

 
-<a href="#" rel="tooltip" title="first tooltip">{{_i}}hover over me{{/i}}</a>
+<a href="#" rel="tooltip" title="{{_i}}first tooltip{{/i}}">{{_i}}hover over me{{/i}}</a>
 

           
{{_i}}Methods{{/i}}

           
$().tooltip({{_i}}options{{/i}})

-- 
cgit v1.2.3


From 04fd01d4b67b8f71fe58affb34fcf4907ccabc98 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Tue, 7 Feb 2012 22:04:52 -0800
Subject: fix docs for carousel markup

---
 docs/templates/pages/javascript.mustache | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index c24626f8a..3ff0ed8b6 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1228,10 +1228,12 @@ $('#myCollapsible').on('hidden', function () {
           
{{_i}}Markup{{/i}}

           
{{_i}}Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.{{/i}}

 
-<div class="carousel">
+<div id="myCarousel" class="carousel">
   <!-- {{_i}}Carousel items{{/i}} -->
   <div class="carousel-inner">
-    ...
+    <div class="active item">…</div>
+    <div class="item">…</div>
+    <div class="item">…</div>
   </div>
   <!-- {{_i}}Carousel nav{{/i}} -->
   <a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
-- 
cgit v1.2.3


From b36a744fa74ace319b9f924f777df50591ceb62c Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Tue, 7 Feb 2012 22:32:32 -0800
Subject: remove small class

---
 docs/templates/pages/javascript.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 3ff0ed8b6..705b35b47 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -850,7 +850,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
             
{{_i}}Oh snap! You got an error!{{/i}}

             
{{_i}}Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.{{/i}}

             

-              {{_i}}Take this action{{/i}} {{_i}}Or do this{{/i}}
+              {{_i}}Take this action{{/i}} {{_i}}Or do this{{/i}}
             

           

           

-- 
cgit v1.2.3


From 02cb4df4697acacfdc65560e14994eccd6ebda7e Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 00:01:35 -0800
Subject: fix some single vs double quotes, fix typo in js docs per #1900

---
 docs/templates/pages/javascript.mustache | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 705b35b47..89e15007f 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -624,14 +624,14 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
       

         

           
{{_i}}About Tooltips{{/i}}

-          
{{_i}}Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.{{/i}}

+          
{{_i}}Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, use css3 for animations, and data-attributes for local title storage.{{/i}}

           {{_i}}Download file{{/i}}
         

         

           
{{_i}}Example use of Tooltips{{/i}}

           
{{_i}}Hover over the links below to see tooltips:{{/i}}

           

-            
{{_i}}Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.{{/i}}
+            
{{_i}}Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.{{/i}}
             

           

           

-- 
cgit v1.2.3


From cbccbed8c8ebdfe0f02502b1915106d56c90b3cc Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 00:10:26 -0800
Subject: fix javascript text on tooltips per #1862

---
 docs/templates/pages/javascript.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 89e15007f..012e195f5 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -58,7 +58,7 @@
         

           
         

         

-- 
cgit v1.2.3


From ed07a4d0ce0e769ef6efbd8d465670b26a0a5e37 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 12 Feb 2012 11:06:50 -0800
Subject: add note about popover placement

---
 docs/templates/pages/javascript.mustache | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 705b35b47..88c90ce11 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -657,7 +657,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              
              
                {{_i}}placement{{/i}}
-               {{_i}}string{{/i}}
+               {{_i}}string|function{{/i}}
                'top'
                {{_i}}how to position the tooltip{{/i}} - top | bottom | left | right
              
@@ -760,7 +760,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              
              
                {{_i}}placement{{/i}}
-               {{_i}}string{{/i}}
+               {{_i}}string|function{{/i}}
                'right'
                {{_i}}how to position the popover{{/i}} - top | bottom | left | right
              
-- 
cgit v1.2.3


From da948508447de169ab05c10a5f0a64bcb6a8aeb6 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 22:50:21 -0800
Subject: fix filename mention in js docs per #1938

---
 docs/templates/pages/javascript.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 553913d21..c072e306b 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -854,7 +854,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
             

           

           

-          
{{_i}}Using bootstrap-alerts.js{{/i}}

+          
{{_i}}Using bootstrap-alert.js{{/i}}

           
{{_i}}Enable dismissal of an alert via javascript:{{/i}}

           
$(".alert").alert()

           
{{_i}}Markup{{/i}}

-- 
cgit v1.2.3


From b3e4e5ae2212c4bda6424815871499d9c7693ee6 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Thu, 16 Feb 2012 20:33:15 -0800
Subject: add idea to modal markup exmaple

---
 docs/templates/pages/javascript.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index c072e306b..ac989f3ed 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -213,7 +213,7 @@
 

 
 
-<div class="modal">
+<div class="modal" id="myModal">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
     <h3>Modal header</h3>
-- 
cgit v1.2.3