aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6293 from carlosantoniodasilva/render-partial-refactorJosé Valim2012-05-132-38/+37
|\ | | | | Improve and cleanup a bit partial renderer
| * Improve and cleanup a bit partial rendererCarlos Antonio da Silva2012-05-122-38/+37
| | | | | | | | | | | | | | | | | | | | * Remove template assignment: there is no need for this assignment, given we are rendering a collection with possibly different templates, and a second call to render (with the same instance) would behave differently if the template is set. * Remove segments array in favor of Array#map * Use local vars whenever possible * Cache local template keys, remove defaults from find_template
* | Do not add `:include_blank` option if prompt is presentRafael Mendonça França2012-05-131-3/+3
| |
* | Only set `:include_blank` if the value of this options is not presentRafael Mendonça França2012-05-131-1/+1
| |
* | `:include_blank` should be true if the size option is nilRafael Mendonça França2012-05-131-2/+2
| |
* | Merge pull request #6225 from ↵Rafael Mendonça França2012-05-131-0/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acapilleri/select_with_required_true_include_first_option_blank HTML5 validation error with options_from_collection_for_select Fixes #5908 Conflicts: actionpack/CHANGELOG.md
| * | Always include the options :include_blank if the select has a required attributeangelo giovanni capilleri2012-05-131-0/+5
| | | | | | | | | | | | and display size 1 and not multiple attribute, Fixes #5908
* | | Merge pull request #6171 from oscardelben/move_token_tag_if_blockRafael Mendonça França2012-05-121-3/+3
|\ \ \ | |_|/ |/| | Switch token_tag if block
| * | Switch token_tag if blockOscar Del Ben2012-05-051-3/+3
| | |
* | | update example outputs of some asset helpersVijay Dev2012-05-121-18/+18
| | | | | | | | | | | | | | | | | | | | | Changed /images and /fonts to /assets in the examples of image_path, image_tag and font_path helpers [ci skip]
* | | Revert "Merge pull request #6142 from spartan-developer/master"José Valim2012-05-124-10/+12
| | | | | | | | | | | | | | | This reverts commit 667d0bdd90ef6e6b691f0cc4cf5535b8da69f248, reversing changes made to 4ae6bab6bb02c9390188a49f9a749400f6a0ac94.
* | | Merge pull request #6142 from spartan-developer/masterJosé Valim2012-05-124-12/+10
|\ \ \ | | | | | | | | refactored extracting :size => 'XxY' into an extract_size! method
| * | | refactored extracting :size => 'XxY' into an extract_size! methodNicholas Yianilos2012-05-034-12/+10
| | | |
* | | | Move require to where it's neededSantiago Pastorino2012-05-113-0/+3
| |_|/ |/| |
* | | fix a couple of formatting issues [ci skip]Vijay Dev2012-05-091-2/+4
| | |
* | | update some examples in asset tag helper docs [ci skip]Vijay Dev2012-05-091-15/+15
| | |
* | | remove redundant and stray line [ci skip]Vijay Dev2012-05-091-2/+0
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-083-92/+167
|\ \ \
| * | | Fix NumberHelper options wrapping to prevent verbatim blocks being rendered ↵Mark J. Titorenko2012-05-081-92/+161
| | | | | | | | | | | | | | | | instead of line continuations. While I'm at it, wrap long comment lines consistently.
| * | | Add example for image_submit_tag with confirmation. [ci skip]Edward Tsech2012-05-081-0/+3
| | | |
| * | | Added reference to I18n.localize, as discussed here:Ernesto Tagwerker2012-05-041-0/+3
| | | | | | | | | | | | | | | | https://github.com/rails/rails/issues/4027
* | | | Change unless + else into if + elseShaliko Usubov2012-05-061-3/+3
| | | |
* | | | Fix typo in submit_tag helper documentationAlex Soulim2012-05-061-1/+1
| | | |
* | | | check checkboxes with array of strings as :checked optionVasiliy Ermolovich2012-05-051-1/+1
| |_|/ |/| |
* | | fix doc [ci skip]Vijay Dev2012-05-041-1/+1
| | |
* | | Merge pull request #6154 from shaliko/patch-1Vijay Dev2012-05-041-1/+6
|\ \ \ | | | | | | | | Update documentation for button_to.
| * | | Update documentation for button_to.Shalva Usubov2012-05-041-1/+6
| |/ /
* / / Adjust error message for partial names starting with an uppercase letter.Marc-Andre Lafortune2012-05-041-2/+2
|/ /
* | Fix example url in text helperAlexey Vakhov2012-05-021-1/+1
| |
* | Fix form tag with non GET/POST method exampleAlexey Vakhov2012-05-021-1/+1
| |
* | Documentation fix in options_for_select helper. Fixed display errors caused ↵Rodrigo Pavano2012-05-011-9/+26
|/ | | | by mixing Ruby and HTML code inside the same pre tag [ci skip]
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-011-1/+1
|\
| * Code-format references to config settingsMark Rushakoff2012-04-271-1/+1
| |
* | distance_of_time_in_words: Add/tweak comments to understand time intervals ↵Elliot Winkler2012-04-301-7/+12
| | | | | | | | better
* | distance_of_time_in_words: 45-60 days is about 2 months, not about 1 monthElliot Winkler2012-04-301-2/+3
| |
* | split CDATA end token in cdata_section helperSergey Nartimov2012-04-301-1/+5
| |
* | Merge pull request #3726 from JanDupal/fix-date-helper-hiddenJosé Valim2012-04-301-0/+2
|\ \ | | | | | | fix Helpers::DateHelper with :use_hidden - hide separators
| * | fix Helpers::DateHelper with :use_hidden - hide separatorsJan Dupal2011-11-221-0/+2
| | |
* | | Merge pull request #6077 from ↵José Valim2012-04-301-27/+33
|\ \ \ | | | | | | | | | | | | | | | | dmitriy-kiriyenko/improve_signature_of_time_in_words_helper Replace boolean argument with an options hash.
| * | | Replace boolean argument with an options hash.Dmitriy Kiriyenko2012-04-301-27/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces `include_seconds` argument with an option key `include_seconds => true` in options hash. Also `time_ago_in_words` now passes options hash, including a `locale` key, which makes in compatible with `distance_of_time_in_words`.
* | | | wrap translate defaults to use translate helper features, closes #1102Sergey Nartimov2012-04-301-0/+16
|/ / /
* | | Remove `button_to_function` and `link_to_function` helpersRafael Mendonça França2012-04-301-35/+0
| | |
* | | Add missing require when helpers are used in isolationRafael Mendonça França2012-04-301-0/+1
| | |
* | | Merge pull request #6059 from rafaelfranca/check_box_invertedJosé Valim2012-04-291-4/+2
|\ \ \ | | | | | | | | Change check_box to work inverting the checked and unchecked value
| * | | Change check_box to work inverting the checked and unchecked valueRafael Mendonça França2012-04-291-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes: * Boolean with inverted logic * Integer with inverted logic * BigDecimal with inverted logic Fixes #3995
* | | | Add changelog entry and some docs for collection + layoutCarlos Antonio da Silva2012-04-291-3/+7
| | | |
* | | | Move layout logic with collection to be handled only with explicit template ↵Carlos Antonio da Silva2012-04-291-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | is given Layout is never an available option when rendering with the shortcut `render @collection`.
* | | | Allow access to current object_counter variable from layout when rendering ↵Carlos Antonio da Silva2012-04-291-1/+2
| | | | | | | | | | | | | | | | with partial + collection
* | | | Allow layout to access current object being rendered when using render ↵Carlos Antonio da Silva2012-04-291-1/+1
| | | | | | | | | | | | | | | | partial + object
* | | | Allow layout rendering to access current object being rendered when using ↵Carlos Antonio da Silva2012-04-291-6/+11
|/ / / | | | | | | | | | partial + collection