Bug techjoomla#231 fix: backend>> The title of form view of field gro…

…up is not appropriate

admin_language/en-GB/en-GB.com_tjfields.ini

@@ -339,8 +339,6 @@ COM_TJFIELDS_FORM_DESC_CITY_CITY_JTEXT="Enter City Language Constant"
 COM_TJFIELDS_FORM_DESC_CITY_CITY_JTEXT_HELP="*You will need to add this constant in the language file you are using. <br/>English language file for city names is located at - YOUR_SITE/language/en-GB/en-GB.tjgeo.city.ini<br/>e.g. Add this in language file-<br/>TJ_GEO_CITY_NEWYORK="_QQ_"New York"_QQ_""
 COM_TJFIELDS_FILTER_SELECT_REGION="- Select Region"
 COM_TJFIELDS_CITY_EXISTS_IN_REGION_COUNTRY="Another city with same name exists in selcted country and region."
-
-<<<<<<< HEAD
 COM_TJLMS_COMPONENT="LMS"
 COM_JTICKETING_COMPONENT="Ticketing"
 COM_TJUCM_COMPONENT="UCM"
@@ -354,14 +352,12 @@ COM_TJFIELDS_PAGE_EDIT_GROUP ="Types - Edit Field Group"
 COM_TJFIELDS_PAGE_ADD_FIELD  ="Types - New Field"
 COM_TJFIELDS_PAGE_EDIT_FIELD ="Types - Edit Field"
 
-=======
 COM_TJFIELDS_TITLE_COMPONENT="Fields"
 COM_TJFIELDS_TITLE_COMPONENT_GROUPS="Field Groups"
 COM_TJFIELDS_ADD_GROUP="Field Group: Add"
 COM_TJFIELDS_EDIT_GROUP="Field Group: Edit"
 COM_TJFIELDS_ADD_FIELD="Field: Add"
 COM_TJFIELDS_EDIT_FIELD="Field: Edit"
->>>>>>> origin/Bug#154244
 COM_TJFIELDS_GROUP_TITLE_ALREADY_EXISTS="Field group with same name already exists"
 
 ;validation

administrator/views/group/view.html.php

@@ -75,7 +75,6 @@ protected function addToolbar()
 			$checkedOut = false;
 		}
 
-		$component_title = '';
 		//$component_title = JText::_('COM_TJFIELDS_TITLE_COMPONENT');
 
 		if (!empty($client))
@@ -102,6 +101,14 @@ protected function addToolbar()
 		);
 
 
+		if (JVERSION >= '3.0')
+		{
+			JToolbarHelper::title($viewTitle, 'pencil-2');
+		}
+		else
+		{
+			JToolbarHelper::title($viewTitle, 'group.png');
+		}
 
 		$canDo = TjfieldsHelper::getActions($client['0'], 'group');