Fixed merge conflicts

joomla · May 20, 2015 · e3b08c2 · e3b08c2
1 parent 42df48b
commit e3b08c2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/administrator/components/com_contact/models/fields/modal/contact.php b/administrator/components/com_contact/models/fields/modal/contact.php
@@ -143,7 +143,7 @@ protected function getInput()
 		$html[] = '<input type="text" class="input-medium" id="' . $this->id . '_name" value="' . $title . '" disabled="disabled" size="35" />';
 		$html[] = '<a href="#modalContact"  class="btn hasTooltip" role="button"  data-toggle="modal"'
 			. ' title="' . JHtml::tooltipText('COM_CONTACT_CHANGE_CONTACT') . '">'
-			. '<i class="icon-file"></i> ' . JText::_('JSELECT')
+			. '<span class="icon-file"></span> ' . JText::_('JSELECT')
 			. '</a>';
 
 		$html[] = JHtmlBootstrap::renderModal(

diff --git a/administrator/components/com_content/models/fields/modal/article.php b/administrator/components/com_content/models/fields/modal/article.php
@@ -138,8 +138,8 @@ protected function getInput()
 		$html[] = '<span class="input-append">';
 		$html[] = '<input type="text" class="input-medium" id="' . $this->id . '_name" value="' . $title . '" disabled="disabled" size="35" />';
 		$html[] = '<a href="#modalArticle" class="btn hasTooltip" role="button"  data-toggle="modal" title="'
-			. JHtml::tooltipText('COM_CONTENT_CHANGE_ARTICLE') . '">
-		 <i class="icon-file"></i> '
+			. JHtml::tooltipText('COM_CONTENT_CHANGE_ARTICLE') . '">'
+			. '<span class="icon-file"></span> '
 			. JText::_('JSELECT') . '</a>';
 
 		// Edit article button

diff --git a/administrator/components/com_menus/models/fields/menutype.php b/administrator/components/com_menus/models/fields/menutype.php
@@ -82,7 +82,9 @@ function jSelectPosition_' . $this->id . '(name) {
 
 		$link = JRoute::_('index.php?option=com_menus&view=menutypes&tmpl=component&recordId=' . $recordId);
 		$html[] = '<span class="input-append"><input type="text" ' . $required . ' readonly="readonly" id="' . $this->id . '" value="' . $value . '"' . $size . $class . ' />';
-		$html[] = '<a href="#menuTypeModal" role="button" class="btn btn-primary" data-toggle="modal" title="' . JText::_('JSELECT') . '"><i class="icon-list icon-white"></i> ' . JText::_('JSELECT') . '</a></span>';
+		$html[] = '<a href="#menuTypeModal" role="button" class="btn btn-primary" data-toggle="modal" title="' . JText::_('JSELECT') . '">'
+			. '<span class="icon-list icon-white"></span> '
+			. JText::_('JSELECT') . '</a></span>';
 		$html[] = JHtmlBootstrap::renderModal(
 						'menuTypeModal', array(
 							'url' => $link,

diff --git a/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php b/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php
@@ -144,7 +144,7 @@ protected function getInput()
 
 		$html[] = '<a href="#modalNewsfeed"  class="btn hasTooltip" role="button"  data-toggle="modal"'
 			. ' title="' . JHtml::tooltipText('COM_NEWSFEEDS_CHANGE_FEED_BUTTON') . '">'
-			. '<i class="icon-file"></i> ' . JText::_('JSELECT')
+			. '<span class="icon-file"></span> ' . JText::_('JSELECT')
 			. '</a>';
 
 		$html[] = JHtmlBootstrap::renderModal(

diff --git a/administrator/templates/isis/error.php b/administrator/templates/isis/error.php
@@ -154,7 +154,7 @@
 					<ul class="nav nav-user<?php echo ($this->direction == 'rtl') ? ' pull-left' : ' pull-right'; ?>">
 						<li class="dropdown">
 							<a class="dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-cog"></span>
-								<b class="caret"></b></a>
+								<span class="caret"></span></a>
 							<ul class="dropdown-menu">
 								<li>
 									<span>
@@ -228,7 +228,7 @@
 					<?php if ($this->debug) : ?>
 						<?php echo $this->renderBacktrace(); ?>
 					<?php endif; ?>
-					<p><a href="<?php echo $this->baseurl; ?>" class="btn"><i class="icon-dashboard"></i> <?php echo JText::_('JGLOBAL_TPL_CPANEL_LINK_TEXT'); ?></a></p>
+					<p><a href="<?php echo $this->baseurl; ?>" class="btn"><span class="icon-dashboard"></span> <?php echo JText::_('JGLOBAL_TPL_CPANEL_LINK_TEXT'); ?></a></p>
 					<!-- End Content -->
 				</div>
 			</div>

diff --git a/layouts/joomla/editors/buttons/button.php b/layouts/joomla/editors/buttons/button.php
@@ -21,6 +21,6 @@
 		$title    = ($button->get('title')) ? $button->get('title') : $button->get('text');
 	?>
 	<a class="<?php echo $class; ?>" title="<?php echo $title; ?>" <?php echo $href, $onclick; ?> rel="<?php echo $button->get('options'); ?>">
-		<i class="icon-<?php echo $button->get('name'); ?>"></i> <?php echo $button->get('text'); ?>
+		<span class="icon-<?php echo $button->get('name'); ?>"></span> <?php echo $button->get('text'); ?>
 	</a>
 <?php endif;