Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixing docblock conflicts.

  • Loading branch information...
commit c3419a4e4659e0546b4411c103684b32e3cc56af 1 parent 3f38208
@nateabele nateabele authored
Showing with 0 additions and 25 deletions.
  1. +0 −25 template/helper/Html.php
View
25 template/helper/Html.php
@@ -164,17 +164,10 @@ public function link($title, $url = null, array $options = array()) {
* @param mixed $path String The name of a JavaScript file, or an array of names.
* @param array $options Available options are:
* - `'inline'` _boolean_: Whether or not the `<script />` element should be output inline.
-<<<<<<< HEAD
* When set to false, the `scripts()` handler prints out the script, and other specified
* scripts to be included in the layout. Defaults to `true`. This is useful when
* page-specific scripts are created inline in the page, and you'd like to place them
* in the `<head />` along with your other scripts.
-=======
- * When set to false, the `scripts()` handler prints out the script, and other specified
- * scripts to be included in the layout. Defaults to true.
- * This is useful when page-specific scripts are created inline in the page,
- * and you'd like to place them in the <head /> along with your other scripts.
->>>>>>> dev
* - any other options specified are rendered as HTML attributes of the element.
* @return string
* @filter This method can be filtered.
@@ -206,27 +199,16 @@ public function script($path, array $options = array()) {
/**
* Creates a `<link />` element for CSS stylesheets or a `<style />` tag. If the filename is
* prefixed with `'/'`, the path will be relative to the base path of your application.
-<<<<<<< HEAD
* Otherwise, the path will be relative to your stylesheets path, usually `webroot/css`.
-=======
- * Otherwise, the path will be relative to your Stylesheets path, usually `webroot/css`.
->>>>>>> dev
*
* @param mixed $path The name of a CSS stylesheet in `/app/webroot/css`, or an array
* containing names of CSS stylesheets in that directory.
* @param array $options Available options are:
* - `'inline'` _boolean_: Whether or not the `<style />` element should be output inline.
-<<<<<<< HEAD
* When set to `false`, the `styles()` handler prints out the styles, and other specified
* styles to be included in the layout. Defaults to `true`. This is useful when
* page-specific styles are created inline in the page, and you'd like to place them in
* the `<head />` along with your other styles.
-=======
- * When set to false, the `styles()` handler prints out the styles, and other specified
- * styles to be included in the layout. Defaults to true.
- * This is useful when page-specific styles are created inline in the page,
- * and you'd like to place them in the <head /> along with your other styles.
->>>>>>> dev
* - `'type'` _string_: By default, accepts `stylesheet` or `import`,
* which respectively correspond to `style-link` and `style-import` strings templates
* defined in `Html::$_strings`.
@@ -293,17 +275,10 @@ public function head($tag, array $options) {
* Creates a formatted `<img />` element.
*
* @param string $path Path to the image file. If the filename is prefixed with
-<<<<<<< HEAD
- * `'/'`, the path will be relative to the base path of your application. Otherwise, the path
- * will be relative to the images directory, usually `webroot/img/`. If the name starts with
- * `'http://'`, this is treated as an external URL.
- *
-=======
* `'/'`, the path will be relative to the base path of your application.
* Otherwise the path will be relative to the images directory, usually `app/webroot/img/`.
* If the name starts with `'http://'`, this is treated as an external url used as the `src`
* attribute.
->>>>>>> dev
* @param array $options Array of HTML attributes.
* @return string Returns a formatted `<img />` tag.
* @filter This method can be filtered.
Please sign in to comment.
Something went wrong with that request. Please try again.