added img() to HTML helper

3 files changed, 51 insertions, 23 deletions

diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index f88bc0723..0c884502f 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -184,41 +184,48 @@ if (! function_exists('br'))
 /**

  * Image

  *

- * Generates an image tag

+ * Generates an <img /> element

  *

  * @access	public

- * @param	integer

+ * @param	mixed

  * @return	string

  */	

-if (! function_exists('image'))

+if (! function_exists('img'))

 {

-	function image($src = '', $alt = '', $index_page = FALSE)

+	function img($src = '', $index_page = FALSE)

 	{

-		$CI =& get_instance();

-	

-		$css = '';

+		if ( ! is_array($src) )

+		{

+			$src = array('src' => $src);

+		}

+

+		$img = '<img ';

 		

-		foreach ($stylesheets as $stylesheet)

+		foreach ($src as $k=>$v)

 		{

-			if (strpos($stylesheet, '://') !== FALSE)

-			{

-				$href = ' href="'.$stylesheet.'"';			

-			}

-			elseif ($index_page === TRUE)

+

+			if ($k == 'src' AND strpos($v, '://') === FALSE)

 			{

-				$href = ' href="'.$CI->config->site_url($stylesheet).'"';

+				$CI =& get_instance();

+

+				if ($index_page === TRUE)

+				{

+					$img .= ' src="'.$CI->config->site_url($v).'" ';

+				}

+				else

+				{

+					$img .= ' src="'.$CI->config->slash_item('base_url').$v.'" ';

+				}

 			}

 			else

 			{

-				$href = ' href="'.$CI->config->slash_item('base_url').$stylesheet.'"';

+				$img .= " $k=\"$v\" ";

 			}

-	

-			$media = ($media !== '') ? ' media="'.$media.'"' : '';

-	

-			$css .= 'link type="text/css" rel="stylesheet"'.$href.$media.' />'."\n";

 		}

-	

-		return $css;

+

+		$img .= '/>';

+

+		return $img;

 	}

 }

 

@@ -244,7 +251,7 @@ if (! function_exists('link_tag'))
 	{

 		$CI =& get_instance();

 

-		$link = 'link ';

+		$link = '<link ';

 

 		if (is_array($href))

 		{

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 4124540aa..908037a67 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -132,6 +132,7 @@ Change Log
 	<li>Helpers &amp; Plugins

 		<ul>

 			<li>Added link_tag() to the <a href="./helpers/html_helper.html">HTML helper.</a></li>

+			<li>Added img() to the <a href="./helpers/html_helper.html">HTML helper.</a></li>

 			<li>Added ability to <a href="./general/helpers.html">"extend" Helpers</a>.</li>

 			<li>Added an <a href="./helpers/email_helper.html">email helper</a> into core helpers.</li>

 		    <li>Added <kbd>strip_quotes()</kbd> function to <a href="./helpers/string_helper.html">string helper</a>.</li>

diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html
index d230a6630..42f467d27 100644
--- a/user_guide/helpers/html_helper.html
+++ b/user_guide/helpers/html_helper.html
@@ -78,7 +78,27 @@ Directory Helper
 second the size of the heading.  Example:</p>

 <code>echo heading('Welcome!', 3);</code>

 <p>The above would produce:  &lt;h3>Welcome!&lt;/h3></p>

-

+<h2>img()</h2>

+<p>Lets you create HTML &lt;img /&gt; tags.  The first parameter  contains the image source. There is data, the

+    second the size of the heading.  Example:</p>

+<code>img('images/picture.jpg');<br />

+// gives &lt;img src=&quot;http://site.com/images/picture.jpg&quot; /&gt;</code>

+<p>There is an optional second parameter that is a TRUE/FALSE value that specifics if the src should have the page specified by $config['index_page'] added to the address it creates. Presumably, this would be if you were using a media controller.</p>

+<p><code>img('images/picture.jpg', TRUE);<br />

+// gives &lt;img src=&quot;http://site.com/index.php/images/picture.jpg&quot; /&gt;</code></p>

+<p>Additionally, an associative array can be passed to the img() function for complete control over all attributes and values.</p>

+<p><code> $image_properties = array(<br />

+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'src' =&gt; 'images/picture.jpg',<br />

+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'alt' =&gt; 'Me, demonstrating how to eat 4 slices of pizza at one time',<br />

+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'class' =&gt; 'post_images',<br />

+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'width' =&gt; '200',<br />

+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'height' =&gt; '200',<br />

+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'title' =&gt; 'That was quite a night',<br />

+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'rel' =&gt; 'lightbox',<br />

+    );<br />

+    <br />

+    img($image_properties);<br />

+    // &lt;img src=&quot;http://site.com/index.php/images/picture.jpg&quot; alt=&quot;Me, demonstrating how to eat 4 slices of pizza at one time&quot; class=&quot;post_images&quot; width=&quot;200&quot; height=&quot;200&quot; title=&quot;That was quite a night&quot; rel=&quot;lightbox&quot; /&gt;</code></p>

 <h2>link_tag()</h2>

 <p>Lets you create HTML &lt;link /> tags.  This is useful for stylesheet links, as well as other links. The parameters are href, with optional rel, type, title, media and index_page. index_page is a TRUE/FALSE value that specifics if the href should have the page specified by $config['index_page'] added to the address it creates.<code>

 link_tag('css/mystyles.css');<br />