From ce469c01b6cb63b38e914ad7dcedc271b6dccb50 Mon Sep 17 00:00:00 2001 From: Arnold Daniels Date: Tue, 17 Jul 2012 23:07:27 +0200 Subject: [PATCH] Documented Row link js Added bootstrap-rowlink.js to Makefile Added jasny/rowlink.less to jasny/bootstrap.less --- Makefile | 8 +-- docs/templates/layout.mustache | 1 + docs/templates/pages/index.mustache | 5 ++ docs/templates/pages/javascript.mustache | 87 ++++++++++++++++++++++-- js/bootstrap-rowlink.js | 2 +- less/jasny/bootstrap.less | 1 + 6 files changed, 95 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index b20b7067..d6b2857a 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ build: @cp -r fonts docs/assets/ @cp js/tests/vendor/jquery.js docs/assets/js/ @echo "Compiling documentation... ${CHECK} Done" - @cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-inputmask.js > docs/assets/js/bootstrap.js + @cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-inputmask.js js/bootstrap-rowlink.js > docs/assets/js/bootstrap.js @uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js @echo "/**\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js @cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js @@ -69,7 +69,7 @@ bootstrap: recess --compress ${BOOTSTRAP_LESS} ${JASNY_BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} ${JASNY_BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css recess --compress ${BOOTSTRAP_RESPONSIVE_LESS} ${JASNY_BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css - cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-inputmask.js > bootstrap/js/bootstrap.js + cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-inputmask.js js/bootstrap-rowlink.js > bootstrap/js/bootstrap.js uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js @@ -84,13 +84,13 @@ jasny-bootstrap: mkdir -p jasny-bootstrap/css mkdir -p jasny-bootstrap/js mkdir -p jasny-bootstrap/fonts - cp js/bootstrap-inputmask.js jasny-bootstrap/js + cp js/bootstrap-inputmask.js js/bootstrap-rowlink.js jasny-bootstrap/js cp fonts/* jasny-bootstrap/fonts/ recess --compile ${JASNY_BOOTSTRAP_LESS} > jasny-bootstrap/css/jasny-bootstrap.css recess --compress ${JASNY_BOOTSTRAP_LESS} > jasny-bootstrap/css/jasny-bootstrap.min.css recess --compile ${JASNY_BOOTSTRAP_RESPONSIVE_LESS} > jasny-bootstrap/css/jasny-bootstrap-responsive.css recess --compress ${JASNY_BOOTSTRAP_RESPONSIVE_LESS} > jasny-bootstrap/css/jasny-bootstrap-responsive.min.css - cat js/bootstrap-inputmask.js > jasny-bootstrap/js/jasny-bootstrap.js + cat js/bootstrap-inputmask.js js/bootstrap-rowlink.js > jasny-bootstrap/js/jasny-bootstrap.js uglifyjs -nc jasny-bootstrap/js/jasny-bootstrap.js > jasny-bootstrap/js/jasny-bootstrap.min.tmp.js echo "/*!\n* Jasny-Bootstrap.js by @ArnoldDaniels\n* Copyright 2012 Jasny BV.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > jasny-bootstrap/js/copyright.js cat jasny-bootstrap/js/copyright.js jasny-bootstrap/js/jasny-bootstrap.min.tmp.js > jasny-bootstrap/js/jasny-bootstrap.min.js diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index 90e3ad49..a8dddd67 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -122,6 +122,7 @@ + diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index eaddcf54..7ddbfb5a 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -61,6 +61,11 @@

{{_i}}Force the user to enter data conform a specific format.{{/i}}

{{_i}}Unlike validation, the user can't enter any other key than the ones specified by the mask.{{/i}}

+
+

{{_i}}Row link{{/i}}

+

{{_i}}Don't like when can only click on one column in a table?{{/i}}

+

{{_i}}Row link is a simple javascript plugin that makes the whole row clickable.{{/i}}

+
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index eb686d7d..1b840bce 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -2,7 +2,7 @@ ================================================== -->

{{_i}}Javascript for Bootstrap{{/i}}

-

{{_i}}Bring Bootstrap's components to life—now with 13 custom jQuery plugins.{{/i}} +

{{_i}}Bring Bootstrap's components to life—now with 14 custom jQuery plugins.{{/i}}

+
+

{{_i}}Row link{{/i}}

+

{{_i}}A simple plugin, to turn table rows into clickable links.{{/i}}

+

Typeahead

{{_i}}A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.{{/i}}

+
+

{{_i}}Input mask{{/i}}

{{_i}}Make sure the user types in the data that you want, by using an input mask.{{/i}}

-
-

{{_i}}Transitions{{/i}} *

{{_i}}For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.{{/i}}

@@ -1348,6 +1358,75 @@ $('.carousel').carousel({ + + + +
@@ -1496,4 +1575,4 @@ $('.carousel').carousel({

{{_i}}Initializes an input with an input mask.{{/i}}

- \ No newline at end of file + diff --git a/js/bootstrap-rowlink.js b/js/bootstrap-rowlink.js index ada784a7..3b964fd2 100644 --- a/js/bootstrap-rowlink.js +++ b/js/bootstrap-rowlink.js @@ -2,7 +2,7 @@ * bootstrap-rowlink.js j1 * http://jasny.github.com/bootstrap/javascript.html#rowlink * ============================================================ - * Copyright 2011 Jasny BV, Netherlands. + * Copyright 2012 Jasny BV, Netherlands. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/less/jasny/bootstrap.less b/less/jasny/bootstrap.less index 49159254..4f361226 100644 --- a/less/jasny/bootstrap.less +++ b/less/jasny/bootstrap.less @@ -20,6 +20,7 @@ @import "forms-uneditable.less"; @import "forms-editor.less"; @import "actions-areas.less"; +@import "rowlink.less"; // Components: Buttons & Alerts @import "action-links.less";