diff --git a/admin/admin.civicrm.php b/admin/admin.civicrm.php
new file mode 100644
index 000000000000..9e26e1fa1a67
--- /dev/null
+++ b/admin/admin.civicrm.php
@@ -0,0 +1,96 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+
+
+// Check to ensure this file is included in Joomla!
+defined('_JEXEC') or die('No direct access allowed');
+
+// check for php version and ensure its greater than 5.
+// do a fatal exit if
+if ((int ) substr(PHP_VERSION, 0, 1) < 5) {
+  echo "CiviCRM requires PHP Version 5.2 or greater. You are running PHP Version " . PHP_VERSION . "<p>";
+  exit();
+}
+
+define('CIVICRM_SETTINGS_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR . 'civicrm.settings.php');
+include_once CIVICRM_SETTINGS_PATH;
+
+civicrm_invoke();
+
+function civicrm_init() {
+  require_once 'CRM/Core/ClassLoader.php';
+  CRM_Core_ClassLoader::singleton()->register();
+
+  require_once 'PEAR.php';
+
+  $config = CRM_Core_Config::singleton();
+}
+
+function plugin_init() {
+  //invoke plugins.
+  JPluginHelper::importPlugin('civicrm');
+  $app = JFactory::getApplication();
+  $app->triggerEvent('onCiviLoad');
+}
+
+function civicrm_invoke() {
+  civicrm_init();
+
+  plugin_init();
+
+  $user = JFactory::getUser();
+
+  /* bypass synchronize if running upgrade
+   * to avoid any serious non-recoverable error
+   * which might hinder the upgrade process.
+   */
+
+  if (CRM_Utils_Array::value('task', $_REQUEST) != 'civicrm/upgrade') {
+    CRM_Core_BAO_UFMatch::synchronize($user, FALSE, 'Joomla', 'Individual', TRUE);
+  }
+
+  // Add our standard css & js
+  $resources = CRM_Core_Resources::singleton();
+  $resources->addCoreResources();
+
+  $config = CRM_Core_Config::singleton();
+  if (!$config->userFrameworkFrontend) {
+    $resources->addStyleFile('civicrm', 'css/joomla.css', -97, 'html-header');
+  }
+  else {
+    $resources->addStyleFile('civicrm', 'css/joomla_frontend.css', -97, 'html-header');
+  }
+
+  if (isset($_GET['task'])) {
+    $args = explode('/', trim($_GET['task']));
+  }
+  else {
+    $_GET['task'] = 'civicrm/dashboard';
+    $_GET['reset'] = 1;
+    $args = array('civicrm', 'dashboard');
+  }
+  CRM_Core_Invoke::invoke($args);
+}
+
diff --git a/admin/config.xml b/admin/config.xml
new file mode 100644
index 000000000000..0f70e4968d60
--- /dev/null
+++ b/admin/config.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_civicrm"
+			section="component">
+		</field>
+	</fieldset>
+</config>
diff --git a/admin/configure.php b/admin/configure.php
new file mode 100644
index 000000000000..afd2b51f6921
--- /dev/null
+++ b/admin/configure.php
@@ -0,0 +1,237 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+
+
+// escape early if called directly
+defined('_JEXEC') or die('No direct access allowed');
+
+global $civicrmUpgrade;
+$civicrmUpgrade = FALSE;
+function civicrm_setup() {
+  global $adminPath, $compileDir;
+
+  $adminPath = JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'components' . DIRECTORY_SEPARATOR . 'com_civicrm';
+
+  $jConfig = JFactory::getConfig();
+  set_time_limit(4000);
+
+  // Path to the archive
+  $archivename = $adminPath . DIRECTORY_SEPARATOR . 'civicrm.zip';
+
+  // a bit of support for the non-alternaive joomla install
+  if (file_exists($archivename)) {
+    // ensure that the site has native zip, else abort
+    if (
+      !function_exists('zip_open') ||
+      !function_exists('zip_read')
+    ) {
+      echo "Your PHP version is missing  zip functionality. Please ask your system administrator / hosting provider to recompile PHP with zip support.<p>";
+      echo "If this is a new install, you will need to uninstall CiviCRM from the Joomla Extension Manager.<p>";
+      exit();
+    }
+
+    $extractdir = $adminPath;
+    JArchive::extract($archivename, $extractdir);
+  }
+
+  $scratchDir = JPATH_SITE . DIRECTORY_SEPARATOR . 'media' . DIRECTORY_SEPARATOR . 'civicrm';
+  if (!is_dir($scratchDir)) {
+    JFolder::create($scratchDir, 0777);
+  }
+
+  $compileDir = $scratchDir . DIRECTORY_SEPARATOR . 'templates_c';
+  if (!is_dir($compileDir)) {
+    JFolder::create($compileDir, 0777);
+  }
+
+  $db = JFactory::getDBO();
+  $db->setQuery(' SELECT count( * )
+FROM information_schema.tables
+WHERE table_name LIKE "civicrm_domain"
+AND table_schema = "' . $jConfig->getValue('config.db') . '" ');
+
+  global $civicrmUpgrade;
+  $civicrmUpgrade = ($db->loadResult() == 0) ? FALSE : TRUE;
+}
+
+function civicrm_write_file($name, &$buffer) {
+  JFile::write($name, $buffer);
+}
+
+function civicrm_main() {
+  global $civicrmUpgrade, $adminPath;
+
+  civicrm_setup();
+
+  // setup vars
+  $configFile = $adminPath . DIRECTORY_SEPARATOR . 'civicrm.settings.php';
+
+  // generate backend config file
+  $string = "
+<?php
+define('CIVICRM_SETTINGS_PATH', '$configFile');
+\$error = @include_once( '$configFile' );
+if ( \$error == false ) {
+    echo \"Could not load the settings file at: {$configFile}\n\";
+    exit( );
+}
+
+// Load class loader
+require_once \$civicrm_root . '/CRM/Core/ClassLoader.php';
+CRM_Core_ClassLoader::singleton()->register();
+";
+
+  $string = trim($string);
+  civicrm_write_file($adminPath . DIRECTORY_SEPARATOR .
+    'civicrm' . DIRECTORY_SEPARATOR .
+    'civicrm.config.php',
+    $string
+  );
+
+  $liveSite = substr_replace(JURI::root(), '', -1, 1);
+  $siteKey = md5( uniqid( '', true ) . $liveSite );
+
+  // generate backend settings file
+  $string = civicrm_config(FALSE, $siteKey);
+  civicrm_write_file($configFile, $string);
+
+  // generate frontend settings file
+  $string = civicrm_config(TRUE, $siteKey);
+  civicrm_write_file(JPATH_SITE . DIRECTORY_SEPARATOR .
+    'components' . DIRECTORY_SEPARATOR .
+    'com_civicrm' . DIRECTORY_SEPARATOR .
+    'civicrm.settings.php',
+    $string
+  );
+
+  define('CIVICRM_SETTINGS_PATH', $configFile);
+  include_once CIVICRM_SETTINGS_PATH;
+
+  // for install case only
+  if (!$civicrmUpgrade) {
+    $sqlPath = $adminPath . DIRECTORY_SEPARATOR . 'civicrm' . DIRECTORY_SEPARATOR . 'sql';
+
+    civicrm_source($sqlPath . DIRECTORY_SEPARATOR . 'civicrm.mysql');
+    civicrm_source($sqlPath . DIRECTORY_SEPARATOR . 'civicrm_data.mysql');
+
+    require_once 'CRM/Core/ClassLoader.php';
+    CRM_Core_ClassLoader::singleton()->register();
+
+    require_once 'CRM/Core/Config.php';
+    $config = CRM_Core_Config::singleton();
+
+    // now also build the menu
+    require_once 'CRM/Core/Menu.php';
+    CRM_Core_Menu::store();
+  }
+}
+
+function civicrm_source($fileName, $lineMode = FALSE) {
+
+  $dsn = CIVICRM_DSN;
+
+  require_once 'DB.php';
+
+  $db = DB::connect($dsn);
+  if (PEAR::isError($db)) {
+    die("Cannot open $dsn: " . $db->getMessage());
+  }
+
+  if (!$lineMode) {
+    $string = JFile::read($fileName);
+
+    //get rid of comments starting with # and --
+    $string = preg_replace("/^#[^\n]*$/m", "\n", $string);
+    $string = preg_replace("/^\-\-[^\n]*$/m", "\n", $string);
+
+    $queries = preg_split('/;\s*$/m', $string);
+
+    foreach ($queries as $query) {
+      $query = trim($query);
+      if (!empty($query)) {
+        $res = &$db->query($query);
+        if (PEAR::isError($res)) {
+          die("Cannot execute $query: " . $res->getMessage());
+        }
+      }
+    }
+  }
+  else {
+    $fd = fopen($fileName, "r");
+    while ($string = fgets($fd)) {
+      $string = ereg_replace("\n#[^\n]*\n", "\n", $string);
+      $string = ereg_replace("\n\-\-[^\n]*\n", "\n", $string);
+      $string = trim($string);
+      if (!empty($string)) {
+        $res = &$db->query($string);
+        if (PEAR::isError($res)) {
+          die("Cannot execute $string: " . $res->getMessage());
+        }
+      }
+    }
+  }
+}
+
+function civicrm_config($frontend = FALSE, $siteKey) {
+  global $adminPath, $compileDir;
+
+  $jConfig = new JConfig();
+
+  $liveSite = substr_replace(JURI::root(), '', -1, 1);
+  $params = array(
+    'cms' => 'Joomla',
+    'crmRoot' => $adminPath . DIRECTORY_SEPARATOR . 'civicrm',
+    'templateCompileDir' => $compileDir,
+    'baseURL' => $liveSite . '/administrator/',
+    'dbUser' => $jConfig->user,
+    'dbPass' => $jConfig->password,
+    'dbHost' => $jConfig->host,
+    'dbName' => $jConfig->db,
+    'CMSdbUser' => $jConfig->user,
+    'CMSdbPass' => $jConfig->password,
+    'CMSdbHost' => $jConfig->host,
+    'CMSdbName' => $jConfig->db,
+    'siteKey' => $siteKey,
+  );
+
+  if ($frontend) {
+    $params['baseURL'] = $liveSite . '/';
+  }
+
+  $str = JFile::read($adminPath . DIRECTORY_SEPARATOR .
+    'civicrm' . DIRECTORY_SEPARATOR .
+    'templates' . DIRECTORY_SEPARATOR .
+    'CRM' . DIRECTORY_SEPARATOR .
+    'common' . DIRECTORY_SEPARATOR .
+    'civicrm.settings.php.tpl'
+  );
+  foreach ($params as $key => $value) {
+    $str = str_replace('%%' . $key . '%%', $value, $str);
+  }
+  return trim($str);
+}
+
+civicrm_main();
+
diff --git a/admin/helpers/api.php b/admin/helpers/api.php
new file mode 100644
index 000000000000..afa4ec84e34b
--- /dev/null
+++ b/admin/helpers/api.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * @version
+ * @package
+ * @copyright   @copyright CiviCRM LLC (c) 2004-2013
+ * @license		GNU/GPL v2 or later
+ */
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
+
+// Component Helper
+jimport('joomla.application.component.helper');
+class CivicrmHelperApi {
+  function civiInit() {
+    define('CIVICRM_SETTINGS_PATH', JPATH_BASE . DS . 'administrator' . DS . 'components' . DS . 'com_civicrm' . DS . 'civicrm.settings.php');
+    require_once CIVICRM_SETTINGS_PATH;
+
+    require_once 'CRM/Core/Config.php';
+    $config = CRM_Core_Config::singleton();
+  }
+
+  function civiimport($path) {
+    self::civiInit();
+
+    global $civicrm_root;
+    return JLoader::import($path, $civicrm_root, '');
+  }
+}
+
diff --git a/admin/language/en-GB/en-GB.com_civicrm.ini b/admin/language/en-GB/en-GB.com_civicrm.ini
new file mode 100644
index 000000000000..60dee8442b79
--- /dev/null
+++ b/admin/language/en-GB/en-GB.com_civicrm.ini
@@ -0,0 +1,2 @@
+COM_CIVICRM="CiviCRM"
+COM_CIVICRM_DESCRIPTION="CiviCRM"
diff --git a/admin/language/en-GB/en-GB.com_civicrm.sys.ini b/admin/language/en-GB/en-GB.com_civicrm.sys.ini
new file mode 100644
index 000000000000..208eb0bd5414
--- /dev/null
+++ b/admin/language/en-GB/en-GB.com_civicrm.sys.ini
@@ -0,0 +1 @@
+COM_CIVICRM_MENU="CiviCRM"
diff --git a/admin/license.civicrm.txt b/admin/license.civicrm.txt
new file mode 100644
index 000000000000..144eedbc61cf
--- /dev/null
+++ b/admin/license.civicrm.txt
@@ -0,0 +1,4 @@
+Joomla! is licensed under the GNU General Public License, but does not specify
+a version number of the license. As per section 9 of the GNU General Public
+License version 2 distributed with Joomla!, CiviCRM chooses to use Joomla! code
+under the terms of GNU General Public License version 3.
diff --git a/admin/plugins/civicrm/civicrm.php b/admin/plugins/civicrm/civicrm.php
new file mode 100755
index 000000000000..73c22faa8c4f
--- /dev/null
+++ b/admin/plugins/civicrm/civicrm.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * @copyright	Copyright (C) 2005 - 2011 CiviCRM LLC All rights reserved.
+ * @license		GNU Affero General Public License version 2 or later
+ */
+
+// No direct access
+defined('_JEXEC') or die;
+
+jimport('joomla.plugin.plugin');
+
+/**
+ * CiviCRM User Management Plugin
+ *
+ * @package		Joomla
+ * @subpackage	JFramework
+ * @since		1.6
+ */
+class plgUserCivicrm extends JPlugin
+{
+
+  /* resetNavigation after user is saved
+	 * Method is called after user data is stored in the database
+	 *
+	 * @param	array		$user		Holds the new user data.
+	 * @param	boolean		$isnew		True if a new user is stored.
+	 * @param	boolean		$success	True if user was succesfully stored in the database.
+	 * @param	string		$msg		Message.
+	 *
+	 * @return	void
+	 * @since	1.6
+	 * @throws	Exception on error.
+	 */
+  function onUserAfterSave($user, $isnew, $success, $msg) {
+    $app = JFactory::getApplication();
+    self::civicrmResetNavigation();
+  }
+
+  /* resetNavigation after group is saved (parent/child may impact acl)
+	 * Method is called after group is stored in the database
+	 *
+	 * @var		string	The event to trigger after saving the data.
+	 *
+	 * @return	void
+	 * @since	1.6
+	 * @throws	Exception on error.
+	 */
+  function onUserAfterSaveGroup($var) {
+    $app = JFactory::getApplication();
+    self::civicrmResetNavigation();
+  }
+
+  /* delete uf_match record after user is deleted
+	 * Method is called after user is deleted from the database
+	 *
+	 * @param	array		$user		Holds the user data.
+	 * @param	boolean		$success	True if user was succesfully removed from the database.
+	 * @param	string		$msg		Message.
+	 *
+	 * @return	void
+	 * @since	1.6
+	 * @throws	Exception on error.
+	 */
+  function onUserAfterDelete($user, $succes, $msg) {
+    $app = JFactory::getApplication();
+
+    // Instantiate CiviCRM
+    require_once JPATH_ROOT.'/administrator/components/com_civicrm/civicrm.settings.php';
+    require_once 'CRM/Core/Config.php';
+    $config = CRM_Core_Config::singleton( );
+
+    // Delete UFMatch
+    CRM_Core_BAO_UFMatch::deleteUser($user['id']);
+  }
+
+  /* trigger navigation reset when the user logs in (admin only)
+   *
+   * @user     Joomla user object
+   * @options  array of options to pass
+   *
+   * @return   void
+   * @since    1.6
+   */
+  public function onUserLogin($user, $options = array()) {
+    $app  = JFactory::getApplication();
+    if ( $app->isAdmin() ) {
+      $jUser =& JFactory::getUser();
+      $jId = $jUser->get('id');
+      self::civicrmResetNavigation( $jId );
+    }
+  }
+
+  /**
+   * Reset CiviCRM user/contact navigation cache
+   *
+   * @param $jId - the logged in joomla ID if it exists
+   *
+   * @return void
+   */
+  public function civicrmResetNavigation($jId = null) {
+    // Instantiate CiviCRM
+    if ( !class_exists('CRM_Core_Config') ) {
+      require_once JPATH_ROOT.'/administrator/components/com_civicrm/civicrm.settings.php';
+    require_once 'CRM/Core/Config.php';
+    }
+
+    $config = CRM_Core_Config::singleton( );
+
+    $cId = NULL;
+
+    //retrieve civicrm contact ID if joomla user ID is provided
+    if ( $jId ) {
+      $params = array(
+        'version' => 3,
+        'uf_id'   => $jId,
+        'return'  => 'contact_id',
+      );
+      $cId = civicrm_api('uf_match', 'getvalue', $params);
+    }
+
+    // Reset Navigation
+        CRM_Core_BAO_Navigation::resetNavigation($cId);
+  }
+
+}
diff --git a/admin/plugins/civicrm/civicrm.xml b/admin/plugins/civicrm/civicrm.xml
new file mode 100755
index 000000000000..8907ecb429ab
--- /dev/null
+++ b/admin/plugins/civicrm/civicrm.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension method="upgrade" version="1.6" type="plugin" group="user">
+	<name>CiviCRM User Management</name>
+	<author>CiviCRM, LLC</author>
+	<creationDate>January 2011</creationDate>
+	<copyright>Copyright (C) 2005 - 2011 CiviCRM. All rights reserved.</copyright>
+	<license>GNU Affero General Public License version 2 or later</license>
+	<authorEmail>info@civicrm.org</authorEmail>
+	<authorUrl>www.civicrm.org</authorUrl>
+	<version>1.0</version>
+	<description>Clear CiviCRM user navigation cache when ACL group membership altered. Remove Joomla user/CiviCRM contact mapping record when user is deleted.</description>
+	<files>
+		<filename plugin="civicrm">civicrm.php</filename>
+		<filename>index.html</filename>
+	</files>
+</extension>
diff --git a/admin/plugins/civicrm/index.html b/admin/plugins/civicrm/index.html
new file mode 100755
index 000000000000..6bfc7988e127
--- /dev/null
+++ b/admin/plugins/civicrm/index.html
@@ -0,0 +1,4 @@
+<html>
+<body>
+</body>
+</html>
\ No newline at end of file
diff --git a/admin/plugins/civicrmicon/civicrmicon.php b/admin/plugins/civicrmicon/civicrmicon.php
new file mode 100644
index 000000000000..75541994b504
--- /dev/null
+++ b/admin/plugins/civicrmicon/civicrmicon.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @copyright	Copyright (C) 2005 - 2011 CiviCRM LLC All rights reserved.
+ * @license		GNU Affero General Public License version 2 or later
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * CiviCRM QuickIcon plugin
+ */
+class plgQuickiconCivicrmicon extends JPlugin {
+
+  /**
+   * Constructor
+   *
+   * @param       object  $subject The object to observe
+   * @param       array   $config  An array that holds the plugin configuration
+   *
+   * @since       2.5
+   */
+  public function __construct(&$subject, $config) {
+    parent::__construct($subject, $config);
+    $this->loadLanguage();
+  }
+
+  /**
+   * This method is called when the Quick Icons module is constructing its set
+   * of icons. You can return an array which defines a single icon and it will
+   * be rendered right after the stock Quick Icons.
+   *
+   * @param  $context  The calling context
+   *
+   * @return array A list of icon definition associative arrays, consisting of the
+   *				 keys link, image, text and access.
+   *
+   * @since       2.5
+   */
+  public function onGetIcons($context) {
+    jimport('joomla.environment.uri');
+    return array(
+      array(
+        'link' => 'index.php?option=com_civicrm',
+        'image' => JURI::base() . 'components/com_civicrm/civicrm/i/smallLogo.png',
+        'text' => 'CiviCRM',
+        'id' => 'plg_quickicon_civicrmicon',
+      ));
+  }
+}
+
diff --git a/admin/plugins/civicrmicon/civicrmicon.xml b/admin/plugins/civicrmicon/civicrmicon.xml
new file mode 100644
index 000000000000..521b0e9d0a5e
--- /dev/null
+++ b/admin/plugins/civicrmicon/civicrmicon.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension method="upgrade" version="2.5" type="plugin" group="quickicon">
+	<name>CiviCRM QuickIcon</name>
+	<author>CiviCRM, LLC</author>
+	<creationDate>April 2012</creationDate>
+	<copyright>Copyright (C) 2005 - 2012 CiviCRM. All rights reserved.</copyright>
+	<license>GNU Affero General Public License version 2 or later</license>
+	<authorEmail>info@civicrm.org</authorEmail>
+	<authorUrl>www.civicrm.org</authorUrl>
+	<version>2.5.0</version>
+	<description>Displays link to CiviCRM in main icon Control Panel</description>
+	<files>
+		<filename plugin="civicrmicon">civicrmicon.php</filename>
+		<filename>index.html</filename>
+	</files>
+</extension>
diff --git a/admin/plugins/civicrmicon/index.html b/admin/plugins/civicrmicon/index.html
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/admin/plugins/civicrmsys/civicrmsys.php b/admin/plugins/civicrmsys/civicrmsys.php
new file mode 100644
index 000000000000..849859429481
--- /dev/null
+++ b/admin/plugins/civicrmsys/civicrmsys.php
@@ -0,0 +1,126 @@
+<?php
+
+// No direct access.
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! master extension plugin.
+ *
+ * @package    Civicrmsys.Plugin
+ * @subpackage  System.Civicrmsys
+ * @since    1.6
+ */
+class plgSystemCivicrmsys extends JPlugin
+{
+  public $scheduled;
+
+  /**
+   * After extension source code has been installed
+   *
+   * @param  JInstaller  Installer object
+   * @param  int      Extension Identifier
+   */
+  public function onExtensionBeforeInstall()
+  {
+    // called by "Upload Package" use-case
+    $this->scheduleCivicrmRebuild();
+  }
+
+  /**
+   * After extension source code has been installed
+   *
+   * @param  JInstaller  Installer object
+   * @param  int      Extension Identifier
+   */
+  public function onExtensionAfterInstall($installer, $eid)
+  {
+    if ($installer->extension instanceof JTableExtension && $installer->extension->folder == 'civicrm') {
+      //x $args = func_get_args(); dump($args, 'onExtensionAfterInstall');
+      $this->scheduleCivicrmRebuild();
+    }
+  }
+
+  /**
+   * After extension source code has been updated(?)
+   *
+   * @param  JInstaller  Installer object
+   * @param  int      Extension identifier
+   */
+  public function onExtensionAfterUpdate($installer, $eid)
+  {
+    // TODO test //if ($installer->extension instanceof JTableExtension && $installer->extension->folder == 'civicrm') {
+      $this->scheduleCivicrmRebuild();
+    //}
+  }
+
+  /**
+   * After extension configuration has been saved
+   */
+  public function onExtensionAfterSave($type, $ext)
+  {
+    // Called by "Manage Plugins" use-case -- per-plugin forms
+    if ($type == 'com_plugins.plugin' && $ext->folder == 'civicrm') {
+      $this->scheduleCivicrmRebuild();
+    }
+  }
+
+  public function onContentCleanCache($defaultgroup, $cachebase) {
+    // Called by "Manage Plugins" use-case -- both bulk operations and per-plugin forms
+    if ($defaultgroup == 'com_plugins') {
+      $this->scheduleCivicrmRebuild();
+    }
+  }
+
+  /**
+   * After extension source code has been removed
+   *
+   * @param  JInstaller  Installer object
+   * @param  int      Extension identifier
+   */
+  public function onExtensionAfterUninstall($installer, $eid, $result)
+  {
+    $this->scheduleCivicrmRebuild();
+  }
+
+  /**
+   * Ensure that the rebuild will be done
+   */
+  public function scheduleCivicrmRebuild() {
+    if ($this->scheduled) {
+      return;
+    }
+    register_shutdown_function(array($this, 'doCivicrmRebuild'));
+    // dump(TRUE, 'scheduled');
+    $this->scheduled = TRUE;
+  }
+
+  /**
+   * Perform the actual rebuild
+   */
+  public function doCivicrmRebuild() {
+    // dump($this, 'doCivicrmRebuild');
+    $this->bootstrap();
+    CRM_Core_Invoke::rebuildMenuAndCaches(TRUE);
+  }
+
+  /**
+   * Make sure that CiviCRM is loaded
+   */
+  protected function bootstrap() {
+    if (defined('CIVICRM_UF')) {
+      // already loaded settings
+      return;
+    }
+
+    $app = JFactory::getApplication(); // copied from example -- but why?
+
+    define('CIVICRM_SETTINGS_PATH', JPATH_ROOT . '/' . 'administrator/components/com_civicrm/civicrm.settings.php');
+    require_once CIVICRM_SETTINGS_PATH;
+
+    require_once 'CRM/Core/ClassLoader.php';
+    CRM_Core_ClassLoader::singleton()->register();
+
+    require_once 'CRM/Core/Config.php';
+    $civiConfig = CRM_Core_Config::singleton();
+  }
+}
diff --git a/admin/plugins/civicrmsys/civicrmsys.xml b/admin/plugins/civicrmsys/civicrmsys.xml
new file mode 100644
index 000000000000..89bc747836a8
--- /dev/null
+++ b/admin/plugins/civicrmsys/civicrmsys.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="2.5" type="plugin" group="system">
+	<name>CiviCRM System Listener</name>
+	<author>CiviCRM, LLC</author>
+	<creationDate>January 2011</creationDate>
+	<copyright>Copyright (C) 2005 - 2011 CiviCRM. All rights reserved.</copyright>
+	<license>GNU Affero General Public License version 2 or later</license>
+	<authorEmail>info@civicrm.org</authorEmail>
+	<authorUrl>www.civicrm.org</authorUrl>
+	<version>1.0</version>
+	<description>Refresh CiviCRM configuration when related extensions are added or remove</description>
+	<files>
+		<filename plugin="civicrmsys">civicrmsys.php</filename>
+		<filename>index.html</filename>
+	</files>
+</extension>
diff --git a/admin/plugins/civicrmsys/index.html b/admin/plugins/civicrmsys/index.html
new file mode 100644
index 000000000000..2efb97f319a3
--- /dev/null
+++ b/admin/plugins/civicrmsys/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/admin/plugins/example/example.php b/admin/plugins/example/example.php
new file mode 100644
index 000000000000..684ff9148c9d
--- /dev/null
+++ b/admin/plugins/example/example.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @version
+ * @package		Civicrm
+ * @subpackage	Joomla Plugin
+ * @copyright	Copyright (C) 2005 - 2011 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access
+defined('_JEXEC') or die;
+
+jimport('joomla.plugin.plugin');
+class plgCiviCRMHookExample extends JPlugin {
+
+  /**
+   * Example Civicrm Plugin. For additional examples of hook functions, check
+   * the wiki docs
+   * http://wiki.civicrm.org/confluence/display/CRMDOC/CiviCRM+hook+specification
+   *
+   * @package		Civicrm
+   * @subpackage	Joomla plugins
+   * @since		1.5
+   */
+
+  public function civicrm_summary($contactID, &$content, &$contentPlacement = CRM_Utils_Hook::SUMMARY_BELOW) {
+    $contentPlacement = $this->params->def('placement');
+    $content = "
+<table>
+   <tr><th>Hook Data</th></tr>
+   <tr><td>Data 1</td></tr>
+   <tr><td>Data 2</td></tr>
+</table>
+";
+  }
+
+  public function civicrm_tabs(&$tabs, $contactID) {
+    // unset the contribution tab, i.e. remove it from the page
+    unset($tabs[1]);
+
+    // let's add a new "contribution" tab with a different name and put it last
+    // this is just a demo, in the real world, you would create a url which would
+    // return an html snippet etc.
+    $url = CRM_Utils_System::url('civicrm/contact/view/contribution',
+      "reset=1&snippet=1&force=1&cid=$contactID"
+    );
+    $tabs[] = array(
+      'id' => 'mySupercoolTab',
+      'url' => $url,
+      'title' => 'Contribution Tab Renamed',
+      'weight' => 300,
+    );
+  }
+}
+
diff --git a/admin/plugins/example/example.xml b/admin/plugins/example/example.xml
new file mode 100644
index 000000000000..050178a2884e
--- /dev/null
+++ b/admin/plugins/example/example.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension version="1.6" type="plugin" group="civicrm">
+    <name>plgCiviCRMExample</name>
+    <author>CiviCRM LLC</author>
+    <creationDate>January 2011</creationDate>
+    <copyright>(C) CiviCRM LLC</copyright>
+    <author>CiviCRM LLC</author>
+    <authorEmail>info@civicrm.org</authorEmail>
+    <authorUrl>civicrm.org</authorUrl>
+    <license>GNU Affero General Public License version 3 or later</license>
+    <version>1.6.0</version>
+    <description>Example CiviCRM Plugin</description>
+    <files>
+        <filename plugin="example">example.php</filename>
+        <filename>index.html</filename>
+    </files>
+    <config>
+        <fields name="params">
+        <fieldset name="basic">
+            <field name="placement"
+                   type="list"
+                   default="1"
+                   description="PLG_CIVICRM__JOOMLA_FIELD_CHECK_CATEGORIES_DESC"
+                   label="PLG_CONTENT_JOOMLA_FIELD_CHECK_CATEGORIES_LABEL">
+                   <option value="1">After</option>
+                   <option value="2">Before</option>
+                   <option value="3">Replace</option>
+            </field>
+        </fieldset>
+        </fields>
+    </config>
+</extension>
diff --git a/admin/plugins/example/index.html b/admin/plugins/example/index.html
new file mode 100644
index 000000000000..6bfc7988e127
--- /dev/null
+++ b/admin/plugins/example/index.html
@@ -0,0 +1,4 @@
+<html>
+<body>
+</body>
+</html>
\ No newline at end of file
diff --git a/admin/toolbar.civicrm.html.php b/admin/toolbar.civicrm.html.php
new file mode 100644
index 000000000000..8a0bc2148d02
--- /dev/null
+++ b/admin/toolbar.civicrm.html.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * @version		$Id: toolbar.contact.html.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @package		Joomla
+ * @subpackage	Contact
+ * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @license		GNU/GPL, see LICENSE.php
+ * Joomla! is free software. This version may have been modified pursuant
+ * to the GNU General Public License, and as distributed it includes or
+ * is derivative of works licensed under the GNU General Public License or
+ * other free or open source software licenses.
+ * See COPYRIGHT.php for copyright notices and details.
+ */
+
+// no direct access
+defined('_JEXEC') or die('No direct access allowed');
+
+/**
+ * @package		Joomla
+ * @subpackage	Contact
+ */
+class TOOLBAR_civicrm {
+
+  /**
+   * Draws the tool bar for CiviCRM
+   */
+  static function _EDIT($displayAction) {
+
+    JToolBarHelper::title(JText::_('CiviCRM') . ': <small><small>[ ' . $displayAction . ' ]</small></small>', 'generic.png');
+  }
+
+  static function _DEFAULT() {
+
+    JToolBarHelper::title(JText::_('CiviCRM'), 'generic.png');
+  }
+}
+
diff --git a/admin/toolbar.civicrm.php b/admin/toolbar.civicrm.php
new file mode 100644
index 000000000000..5407ddb2f864
--- /dev/null
+++ b/admin/toolbar.civicrm.php
@@ -0,0 +1,34 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+
+
+defined('_JEXEC') or die('Restricted access');
+
+require_once (JApplicationHelper::getPath('toolbar_html'));
+
+TOOLBAR_civicrm::_DEFAULT();
+
+
+
diff --git a/script.civicrm.php b/script.civicrm.php
new file mode 100644
index 000000000000..f31d4e8d2d8a
--- /dev/null
+++ b/script.civicrm.php
@@ -0,0 +1,262 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+class Com_CiviCRMInstallerScript {
+  function install($parent) {
+    require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . 'configure.php';
+
+    global $civicrmUpgrade;
+
+    $script          = 'index.php';
+    $liveSite        = substr_replace(JURI::root(), '', -1, 1);
+    $configTaskUrl   = $liveSite . "/administrator/?option=com_civicrm&task=civicrm/admin/configtask&reset=1";
+    $upgradeUrl      = $liveSite . "/administrator/?option=com_civicrm&task=civicrm/upgrade&reset=1";
+    $registerSiteURL = "http://civicrm.org/civicrm/profile/create?reset=1&gid=15";
+
+    require_once 'CRM/Utils/System.php';
+    require_once 'CRM/Utils/Array.php';
+    if ($civicrmUpgrade) {
+      $docLink = CRM_Utils_System::docURL2('Installation and Upgrades', TRUE, 'Upgrade Guide',NULL,NULL,"wiki");
+      // UPGRADE successful status and links
+      $content = '
+  <center>
+  <table width="100%" border="0">
+    <tr>
+        <td>
+            <strong>CiviCRM component files have been UPGRADED <font color="green">succesfully</font></strong>.
+            <p><strong>Please run the <a href="' . $upgradeUrl . '">CiviCRM Database Upgrade Utility</a> now. This utility will check your database and perform any needed upgrades.</strong></p>
+            <p>Also review the <a href="' . $docLink . '">Upgrade Guide</a> for any additional steps required to complete this upgrade.</p>
+        </td>
+    </tr>
+  </table>
+  </center>';
+    }
+    else {
+      $docLink  = CRM_Utils_System::docURL2('Installation and Upgrades', FALSE, 'Installation Guide',NULL,NULL,"wiki");
+      $frontEnd = CRM_Utils_System::docURL2('Configuring Front-end Profile Listings and Forms in Joomla! Sites', FALSE, 'Create front-end forms and searchable directories using Profiles',NULL,NULL,"wiki");
+      $contri   = CRM_Utils_System::docURL2('Displaying Online Contribution Pages in Joomla! Frontend Sites', FALSE, 'Create online contribution pages',NULL,NULL,"wiki");
+      $event    = CRM_Utils_System::docURL2('Configuring Front-end Event Info and Registration in Joomla! Sites', FALSE, 'Create events with online event registration',NULL,NULL,"wiki");
+
+      // INSTALL successful status and links
+      $content = '
+  <center>
+  <table width="100%" border="0">
+    <tr>
+        <td>
+            <strong>CiviCRM component files and database tables have been INSTALLED <font color="green">succesfully</font></strong>.
+            <p><strong>Please review the ' . $docLink . ' for any additional steps required to complete the installation.</strong></p>
+            <p><strong>Then use the <a href="' . $configTaskUrl . '">Configuration Checklist</a> to review and configure CiviCRM settings for your new site.</strong></p>
+            <p><strong>Additional Resources:</strong>
+                <ul>
+                    <li>' . $frontEnd . '</li>
+                    <li>' . $contri . '</li>
+                    <li>' . $event . '</li>
+                </ul>
+            </p>
+           <p><strong>We have integrated KCFinder with CKEditor and TinyMCE, which enables user to upload images. Note that all the images uploaded using KCFinder will be public.</strong>
+            </p>
+           <p><strong>Have you registered this site at CiviCRM.org? If not, please help strengthen the CiviCRM ecosystem by taking a few minutes to <a href="' . $registerSiteURL . '" target="_blank">fill out the site registration form</a>. The information collected will help us prioritize improvements, target our communications and build the community. If you have a technical role for this site, be sure to check Keep in Touch to receive technical updates (a low volume  mailing list).</strong></p>
+        </td>
+    </tr>
+  </table>
+  </center>';
+    }
+
+    //install and enable plugins
+    $manifest  = $parent->get("manifest");
+    $parent    = $parent->getParent();
+    $source    = $parent->getPath("source");
+    $installer = new JInstaller();
+    $plgArray  = array();
+
+    foreach ($manifest->plugins->plugin as $plugin) {
+      $attributes = $plugin->attributes();
+      $plg = $source . DS . $attributes['folder'] . DS . $attributes['plugin'];
+      $installer->install($plg);
+      $plgArray[] = "'" . $attributes['plugin'] . "'";
+    }
+
+    $db              = JFactory::getDbo();
+    $tableExtensions = $db->nameQuote("#__extensions");
+    $columnElement   = $db->nameQuote("element");
+    $columnType      = $db->nameQuote("type");
+    $columnEnabled   = $db->nameQuote("enabled");
+    $plgList         = implode(',', $plgArray);
+
+    // Enable plugins
+    $db->setQuery("UPDATE $tableExtensions
+                        SET $columnEnabled = 1
+                        WHERE $columnElement IN ($plgList)
+                        AND $columnType = 'plugin'"
+    );
+    $db->query();
+
+    echo $content;
+  }
+
+  function uninstall($parent) {
+    $uninstall = FALSE;
+    // makes it easier if folks want to really uninstall
+    if ($uninstall) {
+      define('CIVICRM_SETTINGS_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR . 'civicrm.settings.php');
+      require_once CIVICRM_SETTINGS_PATH;
+
+      require_once 'CRM/Core/Config.php';
+      $config = CRM_Core_Config::singleton();
+
+      require_once 'CRM/Core/DAO.php';
+      CRM_Core_DAO::dropAllTables();
+
+      echo "You have uninstalled CiviCRM. All CiviCRM related tables have been dropped from the database.";
+    }
+    else {
+      echo "You have uninstalled CiviCRM.";
+    }
+  }
+
+  function update($parent) {
+    $this->install($parent);
+  }
+
+  function preflight($type, $parent) {}
+
+  function postflight($type, $parent) {
+    // set the default permissions
+    // only on new install
+    // CRM-9418
+    global $civicrmUpgrade;
+
+    if (!$civicrmUpgrade) {
+      $this->setDefaultPermissions();
+    }
+  }
+
+  function setDefaultPermissions() {
+    // get the current perms from the assets table and
+    // only set if its empty
+    $db = JFactory::getDbo();
+    $db->setQuery('SELECT rules FROM #__assets WHERE name = ' . $db->quote('com_civicrm'));
+    $assetRules = json_decode((string ) $db->loadResult());
+
+
+    if (count($assetRules) > 1) {
+      return;
+    }
+
+    $rules = new stdClass;
+
+    $permissions = array(
+      'Public' =>
+      array(
+        'access CiviMail subscribe/unsubscribe pages',
+        'access all custom data',
+        'access uploaded files',
+        'make online contributions',
+        'profile listings and forms',
+        'register for events',
+        'view event info',
+        'view event participants',
+      ),
+      'Registered' =>
+      array(
+        'access CiviMail subscribe/unsubscribe pages',
+        'access all custom data',
+        'access uploaded files',
+        'make online contributions',
+        'profile listings and forms',
+        'register for events',
+        'view event info',
+        'view event participants',
+      ),
+    );
+
+    require_once 'CRM/Utils/String.php';
+
+    $newPerms = array();
+    foreach ($permissions as $group => $perms) {
+
+      // get user group ID
+      $userGroupID = $this->getJoomlaUserGroupID($group);
+      if (empty($userGroupID)) {
+        // since we cant resolve this, we move on
+        continue;
+      }
+
+
+      foreach ($perms as $perm) {
+        $permString = 'civicrm.' . CRM_Utils_String::munge(strtolower($perm));
+        if (!array_key_exists($permString, $newPerms)) {
+          $newPerms[$permString] = array();
+        }
+        $newPerms[$permString][] = $userGroupID;
+      }
+    }
+
+    if (empty($newPerms)) {
+      return;
+    }
+
+    // now merge the two newPerms and rules
+    foreach ($newPerms as $perm => $groups) {
+      if (empty($rules->$perm)) {
+        $rulesArray = array();
+      }
+      else {
+        $rulesArray = (array ) $rules->$perm;
+      }
+
+      foreach ($groups as $group) {
+        $present = FALSE;
+        foreach ($rulesArray as $key => $val) {
+          if ((int ) $key == $group) {
+            $present = TRUE;
+            break;
+          }
+        }
+        if (!$present) {
+          $rulesArray[(string ) $group] = 1;
+        }
+      }
+
+      $rules->$perm = (object ) $rulesArray;
+    }
+
+    $rulesString = json_encode($rules);
+    $db->setQuery('UPDATE #__assets SET rules = ' .
+      $db->quote($rulesString) .
+      ' WHERE name = ' .
+      $db->quote('com_civicrm')
+    );
+    if (!$db->query()) {
+      echo 'Seems like setting default actions failed<p>';
+    }
+  }
+
+  function getJoomlaUserGroupID($title) {
+    $db = JFactory::getDbo();
+    $db->setQuery('SELECT id FROM #__usergroups where title = ' . $db->quote($title));
+    return (int) $db->loadResult();
+  }
+}
+
diff --git a/site/civicrm.html.php b/site/civicrm.html.php
new file mode 100644
index 000000000000..85f2d09f34be
--- /dev/null
+++ b/site/civicrm.html.php
@@ -0,0 +1,9 @@
+<?php
+//////////////////////////////////////////////////
+// CiviCRM Front-end Profile - Presentation Layer
+//////////////////////////////////////////////////
+
+defined('_JEXEC') or die('No direct access allowed');
+
+// PUT ALL YOUR FRONT-END HTML CODE HERE...PRESENTATION
+
diff --git a/site/civicrm.php b/site/civicrm.php
new file mode 100644
index 000000000000..e8520baad74f
--- /dev/null
+++ b/site/civicrm.php
@@ -0,0 +1,77 @@
+<?php
+//////////////////////////////////////////////////
+// CiviCRM Front-end Profile - Logic Layer
+//////////////////////////////////////////////////
+
+defined('_JEXEC') or die('No direct access allowed');
+
+// check for php version and ensure its greater than 5.
+// do a fatal exit if
+if ((int ) substr(PHP_VERSION, 0, 1) < 5) {
+  echo "CiviCRM requires PHP Version 5.2 or greater. You are running PHP Version " . PHP_VERSION . "<p>";
+  exit();
+}
+
+define('CIVICRM_SETTINGS_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR . 'civicrm.settings.php');
+include_once CIVICRM_SETTINGS_PATH;
+
+civicrm_invoke();
+
+function civicrm_init() {
+
+  require_once 'CRM/Core/ClassLoader.php';
+  CRM_Core_ClassLoader::singleton()->register();
+
+  require_once 'PEAR.php';
+
+  $config = CRM_Core_Config::singleton();
+
+  // this is the front end, so let others know
+  $config->userFrameworkFrontend = 1;
+}
+
+function civicrm_invoke() {
+  civicrm_init();
+
+  // check and ensure that we have a valid session
+  if (!empty($_POST)) {
+    // the session should not be empty
+    // however for standalone forms, it will not have any CiviCRM variables in the
+    // session either, so dont check for it
+    if (count($_SESSION) <= 1) {
+      $config = CRM_Core_Config::singleton();
+      CRM_Utils_System::redirect($config->userFrameworkBaseURL);
+    }
+  }
+
+  // add all the values from the itemId param
+  // overrride the GET values if conflict
+  if (CRM_Utils_Array::value('Itemid', $_GET)) {
+    $component = JComponentHelper::getComponent('com_civicrm');
+    $menu      = JSite::getMenu();
+    $params    = $menu->getParams($_GET['Itemid']);
+    $args      = array('task', 'id', 'gid', 'pageId', 'action', 'csid', 'component');
+    $view      = CRM_Utils_Array::value('view', $_GET);
+    if ($view) {
+      $args[] = 'reset';
+    }
+    foreach ($args as $a) {
+      $val = $params->get($a, NULL);
+      if ($val !== NULL && $view) {
+        $_REQUEST[$a] = $_GET[$a] = $val;
+      }
+    }
+  }
+
+  $task = CRM_Utils_Array::value('task', $_GET, '');
+  $args = explode('/', trim($task));
+
+  CRM_Core_Resources::singleton()->addCoreResources();
+  CRM_Utils_System_Joomla::addHTMLHead();
+
+  $user = JFactory::getUser();
+  CRM_Core_BAO_UFMatch::synchronize($user, FALSE, 'Joomla', 'Individual', TRUE);
+
+  CRM_Core_Invoke::invoke($args);
+}
+
diff --git a/site/elements/civicontribpages.php b/site/elements/civicontribpages.php
new file mode 100644
index 000000000000..76c660577a04
--- /dev/null
+++ b/site/elements/civicontribpages.php
@@ -0,0 +1,69 @@
+<?php
+/*
+   +--------------------------------------------------------------------+
+   | CiviCRM version 4.3                                                |
+   +--------------------------------------------------------------------+
+   | This file is a part of CiviCRM.                                    |
+   |                                                                    |
+   | CiviCRM is free software; you can copy, modify, and distribute it  |
+   | under the terms of the GNU Affero General Public License           |
+   | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+   |                                                                    |
+   | CiviCRM is distributed in the hope that it will be useful, but     |
+   | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+   | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+   | See the GNU Affero General Public License for more details.        |
+   |                                                                    |
+   | You should have received a copy of the GNU Affero General Public   |
+   | License and the CiviCRM Licensing Exception along                  |
+   | with this program; if not, contact CiviCRM LLC                     |
+   | at info[AT]civicrm[DOT]org. If you have questions about the        |
+   | GNU Affero General Public License or the licensing of CiviCRM,     |
+   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+   +--------------------------------------------------------------------+
+  */
+
+
+// Retrieve list of CiviCRM contribution pages
+// Active
+// Check to ensure this file is included in Joomla!
+defined('_JEXEC') or die('Restricted access');
+class JFormFieldCiviContribPages extends JFormField {
+
+  /**
+   * Element name
+   *
+   * @access	protected
+   * @var		string
+   */
+  var $type = 'CiviContribPages';
+
+  protected function getInput() {
+
+    $value = $this->value;
+    $name = $this->name;
+
+    // Initiate CiviCRM
+    define('CIVICRM_SETTINGS_PATH', JPATH_ROOT . '/' . 'administrator/components/com_civicrm/civicrm.settings.php');
+    require_once CIVICRM_SETTINGS_PATH;
+
+    require_once 'CRM/Core/ClassLoader.php';
+    CRM_Core_ClassLoader::singleton()->register();
+
+    require_once 'CRM/Core/Config.php';
+    $config = CRM_Core_Config::singleton();
+
+    $options   = array();
+    $options[] = JHTML::_('select.option', '0', JText::_('- Select Contribution Page -'));
+    $query     = 'SELECT id,title  FROM civicrm_contribution_page WHERE is_active = 1 ORDER BY title';
+    $dao       = CRM_Core_DAO::executeQuery($query);
+    while ($dao->fetch()) {
+      $options[] = JHTML::_('select.option', $dao->id, $dao->title);
+    }
+    return JHTML::_('select.genericlist', $options, $name,
+      NULL, 'value', 'text', $value, $name
+    );
+  }
+}
+
+
diff --git a/site/elements/civicontribpagespcp.php b/site/elements/civicontribpagespcp.php
new file mode 100644
index 000000000000..c37577c95593
--- /dev/null
+++ b/site/elements/civicontribpagespcp.php
@@ -0,0 +1,78 @@
+<?php
+/*
+   +--------------------------------------------------------------------+
+   | CiviCRM version 4.3                                                |
+   +--------------------------------------------------------------------+
+   | This file is a part of CiviCRM.                                    |
+   |                                                                    |
+   | CiviCRM is free software; you can copy, modify, and distribute it  |
+   | under the terms of the GNU Affero General Public License           |
+   | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+   |                                                                    |
+   | CiviCRM is distributed in the hope that it will be useful, but     |
+   | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+   | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+   | See the GNU Affero General Public License for more details.        |
+   |                                                                    |
+   | You should have received a copy of the GNU Affero General Public   |
+   | License and the CiviCRM Licensing Exception along                  |
+   | with this program; if not, contact CiviCRM LLC                     |
+   | at info[AT]civicrm[DOT]org. If you have questions about the        |
+   | GNU Affero General Public License or the licensing of CiviCRM,     |
+   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+   +--------------------------------------------------------------------+
+  */
+
+
+// Retrieve list of CiviCRM PCP's contribution pages
+// Active
+
+// Check to ensure this file is included in Joomla!
+defined('_JEXEC') or die('Restricted access');
+class JFormFieldCiviContribPagesPCP extends JFormField {
+
+  /**
+   * Element name
+   *
+   * @access	protected
+   * @var		string
+   */
+  var $type = 'CiviContribPagesPCP';
+
+  protected function getInput() {
+
+    $value = $this->value;
+    $name = $this->name;
+
+    // Initiate CiviCRM
+    define('CIVICRM_SETTINGS_PATH', JPATH_ROOT . '/' . 'administrator/components/com_civicrm/civicrm.settings.php');
+    require_once CIVICRM_SETTINGS_PATH;
+
+    require_once 'CRM/Core/ClassLoader.php';
+    CRM_Core_ClassLoader::singleton()->register();
+
+    require_once 'CRM/Core/Config.php';
+    $config = CRM_Core_Config::singleton();
+
+    // Get list of all ContribPagesPCP  and assign to options array
+    $options = array();
+
+    $query = "SELECT cp.id, cp.title 
+		          FROM civicrm_contribution_page cp, civicrm_pcp_block pcp 
+		          WHERE cp.is_active = 1 
+				    AND pcp.is_active = 1 
+					AND pcp.entity_id = cp.id 
+				    AND pcp.entity_table = 'civicrm_contribution_page'
+				  ORDER BY cp.title;";
+
+    $dao = CRM_Core_DAO::executeQuery($query);
+    while ($dao->fetch()) {
+      $options[] = JHTML::_('select.option', $dao->id, $dao->title);
+    }
+
+    return JHTML::_('select.genericlist', $options, $name,
+      NULL, 'value', 'text', $value, $name
+    );
+  }
+}
+
diff --git a/site/elements/civicustomsearch.php b/site/elements/civicustomsearch.php
new file mode 100644
index 000000000000..75fe49654302
--- /dev/null
+++ b/site/elements/civicustomsearch.php
@@ -0,0 +1,67 @@
+<?php
+/*
+   +--------------------------------------------------------------------+
+   | CiviCRM version 4.3                                                |
+   +--------------------------------------------------------------------+
+   | This file is a part of CiviCRM.                                    |
+   |                                                                    |
+   | CiviCRM is free software; you can copy, modify, and distribute it  |
+   | under the terms of the GNU Affero General Public License           |
+   | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+   |                                                                    |
+   | CiviCRM is distributed in the hope that it will be useful, but     |
+   | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+   | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+   | See the GNU Affero General Public License for more details.        |
+   |                                                                    |
+   | You should have received a copy of the GNU Affero General Public   |
+   | License and the CiviCRM Licensing Exception along                  |
+   | with this program; if not, contact CiviCRM LLC                     |
+   | at info[AT]civicrm[DOT]org. If you have questions about the        |
+   | GNU Affero General Public License or the licensing of CiviCRM,     |
+   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+   +--------------------------------------------------------------------+
+  */
+
+
+// Retrieve list of CiviCRM profiles
+// Active
+// Check to ensure this file is included in Joomla!
+defined('_JEXEC') or die('Restricted access');
+class JFormFieldCivicustomsearch extends JFormField {
+
+  /**
+   * Element name
+   *
+   * @access	protected
+   * @var		string
+   */
+  var $type = 'Civicustomsearch';
+
+  protected function getInput() {
+    $value = $this->value;
+    $name = $this->name;
+
+    // Initiate CiviCRM
+    define('CIVICRM_SETTINGS_PATH', JPATH_ROOT . '/' . 'administrator/components/com_civicrm/civicrm.settings.php');
+    require_once CIVICRM_SETTINGS_PATH;
+
+    require_once 'CRM/Core/ClassLoader.php';
+    CRM_Core_ClassLoader::singleton()->register();
+
+    require_once 'CRM/Core/Config.php';
+    $config = CRM_Core_Config::singleton();
+    $query = "
+SELECT value, description
+FROM civicrm_option_value
+WHERE option_group_id =24
+";
+    $dao = CRM_Core_DAO::executeQuery($query);
+    while ($dao->fetch()) {
+      $options[] = JHTML::_('select.option', $dao->value, $dao->description);
+    }
+
+    return JHTML::_('select.genericlist', $options, $name, NULL, 'value', 'text', $dao->value);
+  }
+}
+
diff --git a/site/elements/civievents.php b/site/elements/civievents.php
new file mode 100644
index 000000000000..d045e3dc4977
--- /dev/null
+++ b/site/elements/civievents.php
@@ -0,0 +1,80 @@
+<?php
+/*
+   +--------------------------------------------------------------------+
+   | CiviCRM version 4.3                                                |
+   +--------------------------------------------------------------------+
+   | This file is a part of CiviCRM.                                    |
+   |                                                                    |
+   | CiviCRM is free software; you can copy, modify, and distribute it  |
+   | under the terms of the GNU Affero General Public License           |
+   | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+   |                                                                    |
+   | CiviCRM is distributed in the hope that it will be useful, but     |
+   | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+   | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+   | See the GNU Affero General Public License for more details.        |
+   |                                                                    |
+   | You should have received a copy of the GNU Affero General Public   |
+   | License and the CiviCRM Licensing Exception along                  |
+   | with this program; if not, contact CiviCRM LLC                     |
+   | at info[AT]civicrm[DOT]org. If you have questions about the        |
+   | GNU Affero General Public License or the licensing of CiviCRM,     |
+   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+   +--------------------------------------------------------------------+
+  */
+
+// Retrieve list of CiviCRM events
+// Active, current or future
+
+// Check to ensure this file is included in Joomla!
+defined('_JEXEC') or die('Restricted access');
+class JFormFieldCiviEvents extends JFormField {
+
+  /**
+   * Element name
+   *
+   * @access	protected
+   * @var		string
+   */
+  var $type = 'CiviEvents';
+
+  protected function getInput() {
+
+    $value = $this->value;
+    $name = $this->name;
+    // Initiate CiviCRM
+    define('CIVICRM_SETTINGS_PATH', JPATH_ROOT . '/' . 'administrator/components/com_civicrm/civicrm.settings.php');
+    require_once CIVICRM_SETTINGS_PATH;
+
+    require_once 'CRM/Core/ClassLoader.php';
+    CRM_Core_ClassLoader::singleton()->register();
+
+    require_once 'CRM/Core/Config.php';
+    $config = CRM_Core_Config::singleton();
+
+    $params = array(
+      'version' => '3',
+      'is_active' => 1,
+      'isCurrent' => 1,
+      'return.title' => 1,
+      'return.id' => 1,
+      'return.end_date' => 1,
+      'return.start_date' => 1,
+    );
+    $events      = civicrm_api('event', 'get', $params);
+    $currentdate = date("Y-m-d H:i:s");
+    $options     = array();
+    $options[]   = JHTML::_('select.option', '', JText::_('- Select Event -'));
+    foreach ($events['values'] as $event) {
+      if (strtotime($event['start_date']) >= strtotime($currentdate) ||
+        strtotime($event['end_date']) >= strtotime($currentdate)
+      ) {
+        $options[] = JHTML::_('select.option', $event['id'], $event['event_title']);
+      }
+    }
+
+    return JHTML::_('select.genericlist', $options, $name, NULL, 'value', 'text', $value);
+  }
+}
+
+
diff --git a/site/elements/civieventsonline.php b/site/elements/civieventsonline.php
new file mode 100644
index 000000000000..714a94fbdb14
--- /dev/null
+++ b/site/elements/civieventsonline.php
@@ -0,0 +1,56 @@
+<?php
+// Retrieve list of CiviCRM events
+// Active, current or future, online
+
+// Check to ensure this file is included in Joomla!
+defined('_JEXEC') or die('Restricted access');
+class JFormFieldCiviEventsOnline extends JFormField {
+
+  /**
+   * Element name
+   *
+   * @access	protected
+   * @var		string
+   */
+  var $type = 'CiviEventsOnline';
+
+  protected function getInput() {
+    $value = $this->value;
+    $name = $this->name;
+
+    // Initiate CiviCRM
+    define('CIVICRM_SETTINGS_PATH', JPATH_ROOT . '/' . 'administrator/components/com_civicrm/civicrm.settings.php');
+    require_once CIVICRM_SETTINGS_PATH;
+
+    require_once 'CRM/Core/ClassLoader.php';
+    CRM_Core_ClassLoader::singleton()->register();
+
+    require_once 'CRM/Core/Config.php';
+    $config = CRM_Core_Config::singleton();
+
+    $params = array(
+      'version' => '3',
+      'is_online_registration' => 1,
+      'is_active' => 1,
+      'isCurrent' => 1,
+      'return.title' => 1,
+      'return.id' => 1,
+      'return.end_date' => 1,
+      'return.start_date' => 1,
+    );
+    $events      = civicrm_api('event', 'get', $params);
+    $currentdate = date("Y-m-d H:i:s");
+    $options     = array();
+    $options[]   = JHTML::_('select.option', '', JText::_('- Select Event -'));
+    foreach ($events['values'] as $event) {
+      if (strtotime($event['start_date']) >= strtotime($currentdate) ||
+        strtotime($event['end_date']) >= strtotime($currentdate)
+      ) {
+        $options[] = JHTML::_('select.option', $event['id'], $event['event_title']);
+      }
+    }
+    return JHTML::_('select.genericlist', $options, $name, NULL, 'value', 'text', $value);
+  }
+}
+
+
diff --git a/site/elements/civipcps.php b/site/elements/civipcps.php
new file mode 100644
index 000000000000..2dc9fdc092a5
--- /dev/null
+++ b/site/elements/civipcps.php
@@ -0,0 +1,69 @@
+<?php
+/*
+   +--------------------------------------------------------------------+
+   | CiviCRM version 4.3                                                |
+   +--------------------------------------------------------------------+
+   | This file is a part of CiviCRM.                                    |
+   |                                                                    |
+   | CiviCRM is free software; you can copy, modify, and distribute it  |
+   | under the terms of the GNU Affero General Public License           |
+   | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+   |                                                                    |
+   | CiviCRM is distributed in the hope that it will be useful, but     |
+   | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+   | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+   | See the GNU Affero General Public License for more details.        |
+   |                                                                    |
+   | You should have received a copy of the GNU Affero General Public   |
+   | License and the CiviCRM Licensing Exception along                  |
+   | with this program; if not, contact CiviCRM LLC                     |
+   | at info[AT]civicrm[DOT]org. If you have questions about the        |
+   | GNU Affero General Public License or the licensing of CiviCRM,     |
+   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+   +--------------------------------------------------------------------+
+  */
+
+
+// Retrieve list of CiviCRM contribution page PCP'S
+// Active
+
+// Check to ensure this file is included in Joomla!
+defined('_JEXEC') or die('Restricted access');
+class JFormFieldCiviPCPs extends JFormField {
+
+  /**
+   * Element name
+   *
+   * @access	protected
+   * @var		string
+   */
+  var $type = 'CiviPCPs';
+
+  protected function getInput() {
+
+    $value = $this->value;
+    $name = $this->name;
+
+    // Initiate CiviCRM
+    define('CIVICRM_SETTINGS_PATH', JPATH_ROOT . '/' . 'administrator/components/com_civicrm/civicrm.settings.php');
+    require_once CIVICRM_SETTINGS_PATH;
+
+    require_once 'CRM/Core/ClassLoader.php';
+    CRM_Core_ClassLoader::singleton()->register();
+
+    require_once 'CRM/Core/Config.php';
+    $config = CRM_Core_Config::singleton();
+
+    // Get list of all profiles and assign to options array
+    $options = array();
+
+    $query = 'SELECT id, title FROM civicrm_pcp WHERE is_active = 1 AND status_id = 2 ORDER BY title';
+    $dao = CRM_Core_DAO::executeQuery($query);
+    while ($dao->fetch()) {
+      $options[] = JHTML::_('select.option', $dao->id, $dao->title);
+    }
+    return JHTML::_('select.genericlist', $options, $name, NULL, 'value', 'text', $value);
+  }
+}
+
+
diff --git a/site/elements/civiprofiles.php b/site/elements/civiprofiles.php
new file mode 100644
index 000000000000..96255c4f4dfc
--- /dev/null
+++ b/site/elements/civiprofiles.php
@@ -0,0 +1,64 @@
+<?php
+/*
+   +--------------------------------------------------------------------+
+   | CiviCRM version 4.3                                                |
+   +--------------------------------------------------------------------+
+   | This file is a part of CiviCRM.                                    |
+   |                                                                    |
+   | CiviCRM is free software; you can copy, modify, and distribute it  |
+   | under the terms of the GNU Affero General Public License           |
+   | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+   |                                                                    |
+   | CiviCRM is distributed in the hope that it will be useful, but     |
+   | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+   | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+   | See the GNU Affero General Public License for more details.        |
+   |                                                                    |
+   | You should have received a copy of the GNU Affero General Public   |
+   | License and the CiviCRM Licensing Exception along                  |
+   | with this program; if not, contact CiviCRM LLC                     |
+   | at info[AT]civicrm[DOT]org. If you have questions about the        |
+   | GNU Affero General Public License or the licensing of CiviCRM,     |
+   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+   +--------------------------------------------------------------------+
+  */
+
+
+// Retrieve list of CiviCRM profiles
+// Active
+// Check to ensure this file is included in Joomla!
+defined('_JEXEC') or die('Restricted access');
+class JFormFieldCiviProfiles extends JFormField {
+
+  /**
+   * Element name
+   *
+   * @access	protected
+   * @var		string
+   */
+  var $type = 'CiviProfiles';
+
+  protected function getInput() {
+    $value = $this->value;
+    $name = $this->name;
+
+    // Initiate CiviCRM
+    define('CIVICRM_SETTINGS_PATH', JPATH_ROOT . '/' . 'administrator/components/com_civicrm/civicrm.settings.php');
+    require_once CIVICRM_SETTINGS_PATH;
+
+    require_once 'CRM/Core/ClassLoader.php';
+    CRM_Core_ClassLoader::singleton()->register();
+
+    require_once 'CRM/Core/Config.php';
+    $config = CRM_Core_Config::singleton();
+
+    $ufGroups = CRM_Core_PseudoConstant::ufGroup();
+    $options[] = JHTML::_('select.option', '', JText::_('- Select Profile -'));
+    foreach ($ufGroups as $key => $values) {
+      $options[] = JHTML::_('select.option', $key, $values);
+    }
+    return JHTML::_('select.genericlist', $options, $name, NULL, 'value', 'text', $value);
+  }
+}
+
+
diff --git a/site/views/Contributions/metadata.xml b/site/views/Contributions/metadata.xml
new file mode 100644
index 000000000000..58692e205033
--- /dev/null
+++ b/site/views/Contributions/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<view title="CiviCRM Contribution Pages">
+	  <message></message>
+	</view>
+</metadata>
diff --git a/site/views/Contributions/tmpl/default.php b/site/views/Contributions/tmpl/default.php
new file mode 100644
index 000000000000..922fcdbc84ee
--- /dev/null
+++ b/site/views/Contributions/tmpl/default.php
@@ -0,0 +1,31 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2009 Elin Waring
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+
+defined('_JEXEC') or die('Restricted access');
+
diff --git a/site/views/Contributions/tmpl/default.xml b/site/views/Contributions/tmpl/default.xml
new file mode 100644
index 000000000000..afb927be48d3
--- /dev/null
+++ b/site/views/Contributions/tmpl/default.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="Contribution Page" >
+	     <message></message>
+	</layout>
+    <state>
+        <name>CiviCRM Contribution Page</name>
+        <creationDate>07/26/2010</creationDate>
+        <copyright>(C) CiviCRM LLC</copyright>
+        <author>CiviCRM LLC</author>
+        <authorEmail>info@civicrm.org</authorEmail>
+        <authorUrl>civicrm.org</authorUrl>
+        <version>3.4</version>
+        <description>CiviCRM Contribution Pages</description>
+       	<config> 
+	  <fields name="params" addfieldpath="/administrator/components/com_civicrm/civicrm/joomla/site/elements"> 
+	    <fieldset name="basic"> 
+	      <field name="task" type="hidden" default="civicrm/contribute/transact" label="Choose CiviCRM task" />
+              <field name="id" type="civicontribpages" label="Select Contribution Page" description="Configured CiviCRM Contribution Pages" />
+	      <field name="reset" type="hidden" size="5" default="1" label="Reset" description="Keep this set to 1. This is needed for the form to work properly." />
+	    </fieldset> 
+	  </fields> 
+	</config>
+    </state>
+ </metadata>
+  
diff --git a/site/views/Contributions/tmpl/pcp.php b/site/views/Contributions/tmpl/pcp.php
new file mode 100644
index 000000000000..922fcdbc84ee
--- /dev/null
+++ b/site/views/Contributions/tmpl/pcp.php
@@ -0,0 +1,31 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2009 Elin Waring
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+
+defined('_JEXEC') or die('Restricted access');
+
diff --git a/site/views/Contributions/tmpl/pcp.xml b/site/views/Contributions/tmpl/pcp.xml
new file mode 100644
index 000000000000..dd6e50df953d
--- /dev/null
+++ b/site/views/Contributions/tmpl/pcp.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="Create Personal Campaign Pages" >
+	</layout>
+    <state>
+        <name>CiviCRM PCP</name>
+        <creationDate>07/26/2010</creationDate>
+        <copyright>(C) CiviCRM LLC</copyright>
+        <author>CiviCRM LLC</author>
+        <authorEmail>info@civicrm.org</authorEmail>
+        <authorUrl>civicrm.org</authorUrl>
+	 <version>4.0</version>
+        <description>CiviCRM contribution pages which support personal campaign pages.</description>
+        <config>
+	  <fields name="params" addfieldpath="/administrator/components/com_civicrm/civicrm/joomla/site/elements">
+ 	    <fieldset name="basic">
+	      <field name="task" type="hidden" default="civicrm/contribute/campaign" />
+	      <field name="pageId" type="civicontribpagespcp" label="Select Contribution Page" description="CiviCRM Contribution Pages with PCP enabled." />
+	      <field name="reset" type="hidden" size="5" default="1" label="Reset" />
+	      <field name="action" type="hidden" size="6" default="add" label="Action" description="Sets action to add for creating PCP. This is needed for the form to work properly." />
+              <field name="component" type="hidden" size="5" default="contribute" label="Component" />
+            </fieldset>
+          </fields>
+        </config>
+    </state>
+</metadata>
+
diff --git a/site/views/Contributions/tmpl/pcpinfo.php b/site/views/Contributions/tmpl/pcpinfo.php
new file mode 100644
index 000000000000..922fcdbc84ee
--- /dev/null
+++ b/site/views/Contributions/tmpl/pcpinfo.php
@@ -0,0 +1,31 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2009 Elin Waring
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+
+defined('_JEXEC') or die('Restricted access');
+
diff --git a/site/views/Contributions/tmpl/pcpinfo.xml b/site/views/Contributions/tmpl/pcpinfo.xml
new file mode 100644
index 000000000000..4c0d1c006129
--- /dev/null
+++ b/site/views/Contributions/tmpl/pcpinfo.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+        <layout title="View Personal Campaign Page" >
+	</layout>
+    <state>
+        <name>CiviCRM PCP</name>
+        <creationDate>07/26/2010</creationDate>
+        <copyright>(C) CiviCRM LLC</copyright>
+        <author>CiviCRM LLC</author>
+        <authorEmail>info@civicrm.org</authorEmail>
+        <authorUrl>civicrm.org</authorUrl>
+	 <version>4.0</version>
+        <description>CiviCRM Personal Campaign Information Pages</description>
+	<config>
+          <fields name="params" addfieldpath="/administrator/components/com_civicrm/civicrm/joomla/site/elements">
+	    <fieldset name="basic">
+	      <field name="task" type="hidden" default="civicrm/pcp/info" />
+	      <field name="id" type="civipcps" label="Select Personal Campaign Page" description="CiviCRM Personal Campaign Pages" />
+	      <field name="reset" type="hidden" size="5" default="1" label="Reset" />
+            </fieldset>
+          </fields>
+	</config>
+    </state>
+</metadata>
+
diff --git a/site/views/Contributions/view.html.php b/site/views/Contributions/view.html.php
new file mode 100644
index 000000000000..ea8e80dc2be6
--- /dev/null
+++ b/site/views/Contributions/view.html.php
@@ -0,0 +1,37 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2009 Elin Waring
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+// escape early if called directly
+defined('_JEXEC') or die('No direct access allowed'); 
+
+
+  //////////////////////////////////////////////////
+  // CiviCRM Front-end Profile - Presentation Layer
+  //////////////////////////////////////////////////
+
+// PUT ALL YOUR FRONT-END HTML CODE HERE...PRESENTATION
diff --git a/site/views/CustomSearch/metadata.xml b/site/views/CustomSearch/metadata.xml
new file mode 100644
index 000000000000..f9697ec86fba
--- /dev/null
+++ b/site/views/CustomSearch/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<view title="CiviCRM Profile">
+		<message></message>
+	</view>
+</metadata>
\ No newline at end of file
diff --git a/site/views/CustomSearch/tmpl/default.php b/site/views/CustomSearch/tmpl/default.php
new file mode 100644
index 000000000000..f157f2b3d170
--- /dev/null
+++ b/site/views/CustomSearch/tmpl/default.php
@@ -0,0 +1,29 @@
+<?php // no direct access
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2009 Elin Waring
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+defined('_JEXEC') or die('Restricted access'); ?>
diff --git a/site/views/CustomSearch/tmpl/default.xml b/site/views/CustomSearch/tmpl/default.xml
new file mode 100644
index 000000000000..4562a2399f8f
--- /dev/null
+++ b/site/views/CustomSearch/tmpl/default.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+    <layout title="Custom Search">
+      <message>
+      </message>
+    </layout>
+    <state>
+        <name>CiviCRM</name>
+        <creationDate>07/07/2011</creationDate>
+        <copyright>(C) CiviCRM LLC</copyright>
+        <author>CiviCRM LLC</author>
+        <authorEmail>info@civicrm.org</authorEmail>
+        <authorUrl>civicrm.org</authorUrl>
+        <version>4.0</version>
+		<name>Custom Search</name>
+        <description>CiviCRM Custom Search</description>
+	<config>	
+        <fields name="params" addfieldpath="/administrator/components/com_civicrm/civicrm/joomla/site/elements">
+	  <fieldset name="basic"> 
+        	<field name="task" type="hidden" default="civicrm/contact/search/custom" label="" />
+  	  	<field name="csid" type="civicustomsearch" label="Select Custom Search" description="Configured Custom Search" />
+        	<field name="reset" type="hidden" size="5" default="1" label="Reset" description="Keep this set to 1. This is needed for the form to work properly." />
+	  </fieldset> 	
+        </fields>
+        </config>
+	</state>
+</metadata>
diff --git a/site/views/CustomSearch/view.html.php b/site/views/CustomSearch/view.html.php
new file mode 100644
index 000000000000..1b5800eeda6e
--- /dev/null
+++ b/site/views/CustomSearch/view.html.php
@@ -0,0 +1,42 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2009 Elin Waring
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+defined('_JEXEC') or die('No direct access allowed'); 
+
+ //////////////////////////////////////////////////
+  // CiviCRM Front-end Profile - Presentation Layer
+  //////////////////////////////////////////////////
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC (c) 2004-2013
+ * $Id$
+ *
+ */
+
diff --git a/site/views/Dashboard/metadata.xml b/site/views/Dashboard/metadata.xml
new file mode 100644
index 000000000000..377755a00102
--- /dev/null
+++ b/site/views/Dashboard/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<view title="CiviCRM Dashboard">
+		<message></message>
+	</view>
+</metadata>
\ No newline at end of file
diff --git a/site/views/Dashboard/tmpl/default.xml b/site/views/Dashboard/tmpl/default.xml
new file mode 100644
index 000000000000..e64f6a7eff13
--- /dev/null
+++ b/site/views/Dashboard/tmpl/default.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+  <layout title="CiviCRM Dashboard">
+    <message>
+    </message>
+  </layout>
+  <state>
+    <name>Dashboard</name>
+    <creationDate>04/01/2008</creationDate>
+    <copyright>(C) CiviCRM LLC</copyright>
+    <author>CiviCRM LLC</author>
+    <authorEmail>info@civicrm.org</authorEmail>
+    <authorUrl>civicrm.org</authorUrl>
+    <version>2.2</version>
+    <description>CiviCRM Dashboard</description>
+    <config>
+    <fields name="params">
+    <fieldset name="advanced"> 
+      <field name="task" type="hidden" default="civicrm/user" />
+      <field name="reset" type="hidden" size="5" default="1"  />
+    </fieldset>
+    </fields>
+    </config>
+  </state>
+</metadata>
diff --git a/site/views/Dashboard/view.html.php b/site/views/Dashboard/view.html.php
new file mode 100644
index 000000000000..27e32b08624b
--- /dev/null
+++ b/site/views/Dashboard/view.html.php
@@ -0,0 +1,38 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2009 Elin Waring
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+  //////////////////////////////////////////////////
+  // CiviCRM Front-end Profile - Presentation Layer
+  //////////////////////////////////////////////////
+
+defined('_JEXEC') or die('No direct access allowed'); 
+//pulling in the content of the file below.
+//require_once ( JPATH_ADMINISTRATOR .DS.'components'.DS.'com_civicrm'.DS.'CRM'.DS.'Contact'.DS.'Page'.DS.'View'.DS.'UserDashBoard.php' );
+
+// PUT ALL YOUR FRONT-END HTML CODE HERE...PRESENTATION
+
diff --git a/site/views/Events/metadata.xml b/site/views/Events/metadata.xml
new file mode 100644
index 000000000000..298f776bf0e2
--- /dev/null
+++ b/site/views/Events/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<view title="CiviCRM Events">
+	  <message></message>
+	</view>
+</metadata>
diff --git a/site/views/Events/tmpl/default.php b/site/views/Events/tmpl/default.php
new file mode 100644
index 000000000000..a0bf49d2c86e
--- /dev/null
+++ b/site/views/Events/tmpl/default.php
@@ -0,0 +1,152 @@
+<?php // no direct access
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2009 Elin Waring
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+defined('_JEXEC') or die('Restricted access'); ?>
+<?php if ( $this->params->def( 'show_page_title', 1 ) ) : ?>
+	<div class="componentheading <?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+		<?php echo $this->escape($this->params->get('page_title')); ?>
+	</div>
+<?php endif; ?>
+
+<?php if ( ($this->params->def('image', -1) != -1) || $this->params->def('show_comp_description', 1) ) : ?>
+<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<tr>
+	<td valign="top" class="contentdescription <?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<?php
+		if ( isset($this->image) ) :  echo $this->image; endif;
+		echo $this->params->get('comp_description');
+	?>
+	</td>
+</tr>
+</table>
+<?php endif; ?>
+
+<div class="vevent">
+	<h2><span class="summary"><?php echo $this->$event.title ?></span></h2>	
+    <div class="display-block">
+	<table class="form-layout">
+      <?php if  $event.summary ?>
+		<tr><td colspan="2" class="report"><?php echo $this->$event.summary ?></td></tr>
+      	<?php endif; ?>
+      	<?php if $event.description ?>
+      		<tr><td colspan="2" class="report">
+		<span class="summary"><?php echo $this->$event.description ?></span></td></tr>
+		<?php endif; ?>
+	<tr><td><label><?php echo JText::_('When') ?></label></td>
+            <td width="90%">
+	    <abbr class="dtstart" title="<?php echo $event.event_start_date ?>">
+	    	<?php echo $event.event_start_date|crmDate ?></abbr>
+	
+	<?php if $event.event_end_date}
+		&nbsp; JText::_('through') &nbsp;
+                /* Only show end time if end date = start date */
+                <?php if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d" ?>
+			<abbr class="dtend" title="<?php echo this->$event.event_end_date ?>">
+			<?php echo this->$event.event_end_date|crmDate:0:1 ?>
+			</abbr>        
+                else
+			<abbr class="dtend" title="<?php echo this->$event.event_end_date?>">
+			<?php echo this->$event.event_end_date|crmDate ?>
+			</abbr> 	
+               <?php endif; ?>
+           <?php endif; ?>
+            </td>
+	</tr>
+	
+	<?php if $isShowLocation ?>
+        	<?php if $location.1.name || $location.1.address ?>
+        	    <tr><td><label>JText::_('Location')</label></td>
+              	        <td><?php if $location.1.name ?>
+				<span class="fn org">{$location.1.name}</span><br />{/if}
+                 		<?php echo this->$location.1.address.display|nl2br ?>
+                		<?php if ( $event.is_map && 
+                                   $config->mapAPIKey && 
+                                   ( ( !empty($location.1.address.geo_code_1) AND is_numeric($location.1.address.geo_code_1) ) || 
+                                     ( $config->mapGeoCoding && !empty($location.1.address.city) AND !empty($location.1.address.state_province) ) ) ) ?>
+                 		<br/><a href="<?php echo this->$mapURL ?>" title="JText::_('Map this Address')">JText::_('Map this Location')</a>
+					<?php endif; ?>
+                 	</td>
+          	    </tr>
+		     <?php endif; ?>
+      	       <?php endif; ?>/*End of isShowLocation condition*/	
+			   <?php if $location.1.phone.1.phone || $location.1.email.1.email ?>
+				<tr><td><label>JText::_('Contact')</label></td>
+					<td>	/* loop on any phones and emails for this event */
+               		<?php foreach from=$location.1.phone item=phone ?>
+                		<?php if $phone.phone ?>
+               		     		<?php if $phone.phone_type}{$phone.phone_type_display}:  ?>
+						<span class="tel">"<?php echo this->$phone.phone ?>"</span> <br />
+                			<?php endif; ?>
+					<?php endforeach; ?>
+
+					<?php foreach from=$location.1.email item=email ?>
+						<?php if $email.email ?>
+                    			JText::_('Email:') <span class="email"><a href="mailto:{$email.email}">{$email.email}</a></span>
+                  		<?php endif; ?>
+                	<?php endforeach; ?>
+            	</td>
+            </tr>
+       <?php endif; ?>
+    
+	<?php if $event.is_monetary eq 1 && $feeBlock.value ?> 
+      	<tr><td style="vertical-align:top;"><label>{$event.fee_label}</label></td>
+            <td>
+            <table class="form-layout-compressed">
+			//need to do this part
+			{section name=loop start=1 loop=11}
+        	    {assign var=idx value=$smarty.section.loop.index}
+                	<tr><td>{$feeBlock.label.$idx}</td>
+                        <td>{$feeBlock.value.$idx|crmMoney}</td>
+                    </tr>
+         	 {/section}
+         	</table>
+            </td>
+        </tr>
+       <?php endif; ?>
+	</table>
+
+    <?php include file="CRM/Contact/Page/View/InlineCustomData.tpl" mainEditForm=1 ?>
+
+    /* Show link to Event Registration page if event if configured for online reg AND we are NOT coming from Contact Dashboard (CRM-2046) */
+	<?php if  $is_online_registration AND $context NEQ 'dashboard' ?>
+        <div class="action-link">
+			/*change to joomla url*/
+            <strong><a href="{$registerURL}" title="{$registerText}">{$registerText}</a></strong>
+        </div>
+    <?php endif; ?>
+	</div>
+	<?php if  $event.is_public ?>
+      <div class="action-link">
+         {capture assign=icalFile}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`"}{/capture}
+         {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&page=1&id=`$event.id`"}{/capture}
+
+         <a href="{$icalFile}">&raquo; JText::_('Download iCalendar File')</a> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="{$icalFeed}" title="JText::_('iCalendar Feed')"><img src="{$config->resourceBase}i/ical_feed.gif" alt="JText::_('iCalendar Feed')" /></a> 
+      </div>
+    <?php endif; ?>
+</div>
+
diff --git a/site/views/Events/tmpl/default.xml b/site/views/Events/tmpl/default.xml
new file mode 100644
index 000000000000..7fb9ceaf5547
--- /dev/null
+++ b/site/views/Events/tmpl/default.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="Event Information Page" >
+	     <message></message>
+	</layout>
+    <state>
+        <name>CiviCRM</name>
+        <creationDate>07/26/2010</creationDate>
+        <copyright>(C) CiviCRM LLC</copyright>
+        <author>CiviCRM LLC</author>
+        <authorEmail>info@civicrm.org</authorEmail>
+        <authorUrl>civicrm.org</authorUrl>
+        <version>3.2</version>
+        <description>CiviCRM event information page. Only current/future, active events are available (next 25 upcoming events).</description>
+	<name>Standard Event Information Layout</name>
+	<config>
+		<fields name="params" addfieldpath="/administrator/components/com_civicrm/civicrm/joomla/site/elements">
+	          <fieldset name="basic">
+		    <field name="id" type="civievents" label="Select Event" description="Configured CiviCRM Event" />
+	            <field name="task" type="hidden" default="civicrm/event/info" label="Choose CiviCRM task" />
+	  	    <field name="reset" type="hidden" size="5" default="1" label="Reset" description="Keep this set to 1. This is needed for the form to work properly." />
+		  </fieldset>  
+		</fields>
+	</config>
+ 	</state>
+ </metadata>
+  
diff --git a/site/views/Events/tmpl/eventlisting.php b/site/views/Events/tmpl/eventlisting.php
new file mode 100644
index 000000000000..f157f2b3d170
--- /dev/null
+++ b/site/views/Events/tmpl/eventlisting.php
@@ -0,0 +1,29 @@
+<?php // no direct access
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2009 Elin Waring
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+defined('_JEXEC') or die('Restricted access'); ?>
diff --git a/site/views/Events/tmpl/eventlisting.xml b/site/views/Events/tmpl/eventlisting.xml
new file mode 100644
index 000000000000..cc03c94b9be1
--- /dev/null
+++ b/site/views/Events/tmpl/eventlisting.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<metadata>
+  <layout title="Event Listing">
+   <message>Display a list of current/future public events.</message>
+  </layout>
+  
+  <state>
+    <name>CiviCRM</name>
+    <creationDate>11/11/2010</creationDate>
+    <copyright>(C) CiviCRM LLC</copyright>
+    <author>CiviCRM LLC</author>
+    <authorEmail>info@civicrm.org</authorEmail>
+    <authorUrl>civicrm.org</authorUrl>
+    <version>3.3</version>
+    <description>List of all active, current, public events.</description>
+    <name>Event Listing</name>
+  <fields name="params">
+     <fieldset name="basic">
+        <field name="spacer" type="spacer" class="text" 
+               label="The event listing page has no parameter options to configure." />
+	<field name="task"  type="hidden" default="civicrm/event/ical" />
+	<field name="reset" type="hidden" size="1" default="1" />
+     </fieldset> 
+    </fields>
+  <fields name="request">
+      <fieldset name="request">
+	 <field name="spacer" type="spacer" class="text"
+	        label="The event listing page has no parameter options to configure." />
+   	 <field name="html" type="hidden" default="1" />
+	 <field name="page" type="hidden" default="1" />
+      </fieldset>
+  </fields>
+
+  </state>
+</metadata>
diff --git a/site/views/Events/tmpl/participantlisting.php b/site/views/Events/tmpl/participantlisting.php
new file mode 100644
index 000000000000..f157f2b3d170
--- /dev/null
+++ b/site/views/Events/tmpl/participantlisting.php
@@ -0,0 +1,29 @@
+<?php // no direct access
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2009 Elin Waring
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+defined('_JEXEC') or die('Restricted access'); ?>
diff --git a/site/views/Events/tmpl/participantlisting.xml b/site/views/Events/tmpl/participantlisting.xml
new file mode 100644
index 000000000000..e70ea9cce468
--- /dev/null
+++ b/site/views/Events/tmpl/participantlisting.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+  <layout title="Participant Listing">
+    <message/>
+  </layout>
+  
+  <state>
+    <name>CiviCRM</name>
+    <creationDate>11/11/2010</creationDate>
+    <copyright>(C) CiviCRM LLC</copyright>
+    <author>CiviCRM LLC</author>
+    <authorEmail>info@civicrm.org</authorEmail>
+    <authorUrl>civicrm.org</authorUrl>
+    <version>3.3</version>
+    <description>
+      Participant listing page. Be sure to enable this option in your event settings and select a listing template before creating a menu item.
+    </description>
+    <name>Participant Listing</name>
+  <fields name="params"  addfieldpath="/administrator/components/com_civicrm/civicrm/joomla/site/elements">
+     <fieldset name="basic">
+        <field name="id" type="civieventsonline" label="Select Event" description="Configured CiviCRM Event"/>
+        <field name="task" type="hidden" default="civicrm/event/participant" label=""/>
+        <field name="reset" type="hidden" size="5" default="1" label="Reset" description="Keep this set to 1. This is needed for the form to work properly."/>
+     </fieldset>
+  </fields>
+  </state>
+</metadata>
diff --git a/site/views/Events/tmpl/register.php b/site/views/Events/tmpl/register.php
new file mode 100644
index 000000000000..50a13d2dbc75
--- /dev/null
+++ b/site/views/Events/tmpl/register.php
@@ -0,0 +1,155 @@
+<?php // no direct access
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2009 Elin Waring
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+defined('_JEXEC') or die('Restricted access'); ?>
+<?php if ( $this->params->def( 'show_page_title', 1 ) ) : ?>
+	<div class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+		<?php echo $this->escape($this->params->get('page_title')); ?>
+	</div>
+<?php endif; ?>
+
+<?php if ( ($this->params->def('image', -1) != -1) || $this->params->def('show_comp_description', 1) ) : ?>
+<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<tr>
+	<td valign="top" class="contentdescription<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<?php
+		if ( isset($this->image) ) :  echo $this->image; endif;
+		echo $this->params->get('comp_description');
+	?>
+	</td>
+</tr>
+</table>
+<?php endif; ?>
+
+<div class="vevent">
+	<h2><span class="summary"><?php echo $this->$event.title ?></span></h2>	
+    <div class="display-block">
+	<table class="form-layout">
+      	<?php if $event.summary ?>
+		<tr><td colspan="2" class="report"><?php echo $this->$event.summary ?></td></tr>
+      	<?php endif; ?>
+      	<?php if $event.description ?>
+      		<tr><td colspan="2" class="report">
+		<span class="summary"><?php echo $this->$event.description ?></span></td></tr>
+	<?php endif; ?>
+	<tr><td><label>JText::_('When')</label></td>
+            <td width="90%">
+	    <abbr class="dtstart" title="{$event.event_start_date}">
+	    	<?php echo $this->$event.event_start_date|crmDate ?></abbr>
+	
+	<?php if $event.event_end_date ?>
+		&nbsp; JText::_('through') &nbsp;
+                /* Only show end time if end date = start date*/
+                <?php if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d" ?>
+			<abbr class="dtend" title="<?php echo $this->$event.event_end_date ?>">
+			<?php echo $this->$event.event_end_date|crmDate:0:1 ?>
+			</abbr>        
+                <?php else ?>
+			<abbr class="dtend" title="<?php echo $this->$event.event_end_date ?>">
+			<?php echo $this->$event.event_end_date|crmDate?>
+			</abbr> 	
+                <?php endif; ?>
+            <?php endif; ?>
+            </td>
+	</tr>
+	
+	<?php if $isShowLocation ?>
+        	<?php if $location.1.name || $location.1.address ?>
+        	    <tr><td><label>JText::_('Location')</label></td>
+              	        <td><?php if $location.1.name ?>
+				<span class="fn org"><?php echo $this->$location.1.name ?></span><br />
+			<?php endif; ?>
+                 		<?php echo $this->$location.1.address.display|nl2br ?>
+                		<?php if ( $event.is_map && 
+                                   $config->mapAPIKey && 
+                                   ( ( !empty($location.1.address.geo_code_1) AND is_numeric($location.1.address.geo_code_1) ) || 
+                                     ( $config->mapGeoCoding && !empty($location.1.address.city) AND !empty($location.1.address.state_province) ) ) )  ?>
+                 		<br/><a href="<?php echo $mapURL ?>" title="JText::_('Map this Address')">JText::_('Map this Location')</a>
+              	  		<?php endif; ?>
+                 	</td>
+          	    </tr>
+		<?php endif; ?>
+      	<?php endif; ?>/*End of isShowLocation condition*/  
+
+	<?php if $location.1.phone.1.phone || $location.1.email.1.email ?>
+            <tr><td><label>JText::_('Contact')</label></td>
+            	<td>	/* loop on any phones and emails for this event */
+               		<?php foreach from=$location.1.phone item=phone ?>
+                		<?php if $phone.phone ?>
+               		     		<?php if $phone.phone_type}{$phone.phone_type_display}:<?php endif; ?> 
+						<span class="tel">{$phone.phone}</span> <br />
+                			<?php endif; ?>
+                	<?php endforeach; ?>
+
+
+			<?php foreach from=$location.1.email item=email ?>
+        			<?php if $email.email ?>
+                    			JText::_('Email:') <span class="email"><a href="mailto:{$email.email}">{$email.email}</a></span>
+                  		<?php endif; ?>
+                	<?php endforeach; ?>
+            	</td>
+            </tr>
+        <?php endif; ?>
+    
+	<?php if $event.is_monetary eq 1 && $feeBlock.value ?> 
+      	<tr><td style="vertical-align:top;"><label>{$event.fee_label}</label></td>
+            <td>
+            <table class="form-layout-compressed">
+			//need to do
+	         {section name=loop start=1 loop=11}
+        	    {assign var=idx value=$smarty.section.loop.index}
+                	<tr><td>{$feeBlock.label.$idx}</td>
+                        <td>{$feeBlock.value.$idx|crmMoney}</td>
+                    </tr>
+         	 {/section}
+         	</table>
+            </td>
+        </tr>
+        <?php endif; ?>
+	</table>
+
+    {include file="CRM/Contact/Page/View/InlineCustomData.tpl" mainEditForm=1} 
+
+    /* Show link to Event Registration page if event if configured for online reg AND we are NOT coming from Contact Dashboard (CRM-2046) */
+    <?php if $is_online_registration AND $context NEQ 'dashboard' ?>
+        <div class="action-link">
+            <strong><a href="<?php echo this-> $registerURL ?>" title="<?php echo this->$registerText ?>"><?php echo this->$registerText ?></a></strong>
+        </div>
+    <?php endif; ?>
+	</div>
+     <?php ifif $event.is_public  ?>
+      <div class="action-link">
+	  //need to do
+         {capture assign=icalFile}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`"}{/capture}
+         {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&page=1&id=`$event.id`"}{/capture}
+
+         <a href="{$icalFile}">&raquo; JText::_('Download iCalendar File')</a> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="{$icalFeed}" title="JText::_('iCalendar Feed')"><img src="{$config->resourceBase}i/ical_feed.gif" alt="JText::_('iCalendar Feed')" /></a> 
+      </div>
+    <?php endif; ?>
+</div>
+
diff --git a/site/views/Events/tmpl/register.xml b/site/views/Events/tmpl/register.xml
new file mode 100644
index 000000000000..0b365c4c9272
--- /dev/null
+++ b/site/views/Events/tmpl/register.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="Event Registration Form" >
+	     <message></message>
+	</layout>
+    <state>
+        <name>CiviCRM</name>
+        <creationDate>07/26/2010</creationDate>
+        <copyright>(C) CiviCRM LLC</copyright>
+        <author>CiviCRM LLC</author>
+        <authorEmail>info@civicrm.org</authorEmail>
+        <authorUrl>civicrm.org</authorUrl>
+        <version>3.2</version>
+        <description>CiviCRM event registration. Only current/future, active, online events are available (next 25 upcoming events).</description>
+	<name>Standard Event Registration Layout</name>
+	<config>	
+        <fields name="params" addfieldpath="/administrator/components/com_civicrm/civicrm/joomla/site/elements">
+	   <fieldset name="basic">
+			<field name="id" type="civieventsonline" label="Select Event" description="Configured CiviCRM Event" />
+	  		<field name="task" type="hidden" default="civicrm/event/register" label="" />
+	  		<field name="reset" type="hidden" size="5" default="1" label="Reset" description="Keep this set to 1. This is needed for the form to work properly." />
+         </fieldset>
+       </fields>
+       </config> 
+    </state>
+ </metadata>
+  
diff --git a/site/views/Events/view.html.php b/site/views/Events/view.html.php
new file mode 100644
index 000000000000..38a44cf0cc4f
--- /dev/null
+++ b/site/views/Events/view.html.php
@@ -0,0 +1,35 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2009 Elin Waring
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+  //////////////////////////////////////////////////
+  // CiviCRM Front-end Profile - Presentation Layer
+  //////////////////////////////////////////////////
+
+defined('_JEXEC') or die('No direct access allowed'); 
+
+// PUT ALL YOUR FRONT-END HTML CODE HERE...PRESENTATION
diff --git a/site/views/MailingList/metadata.xml b/site/views/MailingList/metadata.xml
new file mode 100644
index 000000000000..e4f1195fe14d
--- /dev/null
+++ b/site/views/MailingList/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<view title="Mailing List Subscription">
+		<message>Use this link to allow users to signup for mailing lists by being added to public access groups. Note that the addition of contacts to groups will respect your single or double opt-in settings in CiviCRM.</message>
+	</view>
+</metadata>
\ No newline at end of file
diff --git a/site/views/MailingList/tmpl/default.xml b/site/views/MailingList/tmpl/default.xml
new file mode 100644
index 000000000000..6811113a9b21
--- /dev/null
+++ b/site/views/MailingList/tmpl/default.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+  <layout title="Mailing List Subscription">
+    <message>
+    </message>
+  </layout>
+  <state>
+    <name>Mailing List Subscription</name>
+    <creationDate>11/11/2010</creationDate>
+    <copyright>(C) CiviCRM LLC</copyright>
+    <author>CiviCRM LLC</author>
+    <authorEmail>info@civicrm.org</authorEmail>
+    <authorUrl>civicrm.org</authorUrl>
+    <version>3.2</version>
+    <description>Use this link to allow users to signup for mailing lists by being added to public access groups. Note that the addition of contacts to groups will respect your single or double opt-in settings in CiviCRM.</description>
+   <config> 
+    <fields name="params">
+      <fieldset name="advanced">
+       <field name="task" type="hidden" default="civicrm/mailing/subscribe" />
+       <field name="reset" type="hidden" size="5" default="1"  />
+      </fieldset>
+    </fields>
+   </config>
+  </state>
+</metadata>
diff --git a/site/views/MailingList/view.html.php b/site/views/MailingList/view.html.php
new file mode 100644
index 000000000000..1e4ff9d065a4
--- /dev/null
+++ b/site/views/MailingList/view.html.php
@@ -0,0 +1,33 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2010 Brian Shaughnessy
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+  //////////////////////////////////////////////////
+  // CiviCRM Front-end Presentation Layer
+  //////////////////////////////////////////////////
+
+defined('_JEXEC') or die('No direct access allowed'); 
diff --git a/site/views/Profiles/metadata.xml b/site/views/Profiles/metadata.xml
new file mode 100644
index 000000000000..f9697ec86fba
--- /dev/null
+++ b/site/views/Profiles/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<view title="CiviCRM Profile">
+		<message></message>
+	</view>
+</metadata>
\ No newline at end of file
diff --git a/site/views/Profiles/tmpl/default.php b/site/views/Profiles/tmpl/default.php
new file mode 100644
index 000000000000..7ff6c5c5c7b3
--- /dev/null
+++ b/site/views/Profiles/tmpl/default.php
@@ -0,0 +1,183 @@
+<?php // no direct access
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2009 Elin Waring
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+defined('_JEXEC') or die('Restricted access'); ?>
+<?php if ( $this->params->def( 'show_page_title', 1 ) ) : ?>
+	<div class="componentheading <?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+		<?php echo $this->escape($this->params->get('page_title')); ?>
+	</div>
+<?php endif; ?>
+
+<?php if ( ($this->params->def('image', -1) != -1) || $this->params->def('show_comp_description', 1) ) : ?>
+<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<tr>
+	<td valign="top" class="contentdescription <?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<?php
+		if ( isset($this->image) ) :  echo $this->image; endif;
+		echo $this->params->get('comp_description');
+	?>
+	</td>
+</tr>
+</table>
+<?php endif; ?>
+/* wrap in crm-container div so crm styles are used */
+<div id="crm-container" lang="{$config->lcMessages|truncate:2:"":true}" xml:lang="{$config->lcMessages|truncate:2:"":true}">
+
+  /*create is mode 1*/   
+    <?php strip ?>
+    <?php if $help_pre && $action neq 4 ?>
+    <div class="messages help"><?php echo $this->$help_pre ?></div>
+    <?php endif; ?>
+
+    <?php include file="CRM/common/CMSUser.tpl" ?>
+
+    {assign var=zeroField value="Initial Non Existent Fieldset"}
+    {assign var=fieldset  value=$zeroField}
+    {foreach from=$fields item=field key=fieldName}
+
+		<?php if $field.groupTitle != $fieldset ?>
+			<?php if $fieldset != $zeroField ?>
+			   </table>
+				<?php if $groupHelpPost ?>
+				  <div class="messages help"><?php echo $this->$groupHelpPost ?></div>
+			   <?php endif; ?>
+
+	  
+				  </fieldset>
+				  </div>
+			<?php endif; ?>
+
+   
+           {assign var="groupId" value="id_"|cat:$field.group_id}
+			<?php if $context neq 'dialog' ?>
+				  <div id="<?php echo $this->$groupId ?>_show" class="section-hidden section-hidden-border">
+				  <a href="#" onclick="hide('<?php echo $this->$groupId ?>_show'); show('<?php echo $this->$groupId ?>'); return false;"><img src="<?php echo $this->$config->resourceBase ?>i/TreePlus.gif" class="action-icon" alt="{ts}open section{/ts}"/></a><label>{ts}{$field.groupTitle}{/ts}</label><br />
+				   </div>
+
+				  <div id="<?php echo $this->$groupId} ?>">
+				  <fieldset><legend><a href="#" onclick="hide('<?php echo $this->$groupId ?>'); show('<?php echo $this->$groupId ?>_show'); return false;"><img src="<?php echo $this->$config->resourceBase ?>i/TreeMinus.gif" class="action-icon" alt="{ts}close section{/ts}"/></a>{ts}{$field.groupTitle}{/ts}</legend>
+			   {else}
+				  <div>
+			  <fieldset><legend>{ts}{$field.groupTitle}{/ts}</legend>
+			<?php endif; ?>	
+		<?php endif; ?>
+			{assign var=fieldset  value=`$field.groupTitle`}
+			{assign var=groupHelpPost  value=`$field.groupHelpPost`}
+		<?php if  $field.groupHelpPre ?>
+				<div class="messages help">{$field.groupHelpPre}</div>
+			<?php endif; ?>
+			<table class="form-layout-compressed">
+		<?php endif; ?>
+
+		{assign var=n value=$field.name}
+	   <?php if $field.options_per_line ?>
+		<tr>
+        <td class="option-label">{$form.$n.label}</td>
+        <td>
+	    {assign var="count" value="1"}
+        {strip}
+        <table class="form-layout-compressed">
+        <tr>
+          /* sort by fails for option per line. Added a variable to iterate through the element array*/
+		  {assign var="index" value="1"}
+          {foreach name=outer key=key item=item from=$form.$n}
+          <?php if $index < 10 ?>
+              {assign var="index" value=`$index+1`}
+          {else}
+              <td class="labels font-light">{$form.$n.$key.html}</td>
+              <?php if $count == $field.options_per_line ?>
+                  </tr>
+                   <tr>
+                   {assign var="count" value="1"}
+              {else}
+          	       {assign var="count" value=`$count+1`}
+              <?php endif; ?>
+          <?php endif; ?>  
+	{/foreach}
+        </tr>
+        </table>
+        {/strip}
+        </td>
+    </tr>
+	{else}
+        <tr>
+           <td class="label">{$form.$n.label}</td>
+           <td>
+           <?php if $n|substr:0:3 eq 'im-' ?>
+             {assign var="provider" value=$n|cat:"-provider_id"}
+             {$form.$provider.html}&nbsp;
+           <?php endif; ?>
+           {$form.$n.html}
+           </td>
+        </tr>
+	  {if $form.$n.type eq 'file'}
+	      <tr><td class="label"></td><td>{$customFiles.$n.displayURL}</td></tr>
+	      <tr><td class="label"></td><td>{$customFiles.$n.deleteURL}</td></tr>
+	  <?php endif; ?> 
+	<?php endif; ?>
+        /* Show explanatory text for field if not in 'view' mode */
+        <?php if $field.help_post && $action neq 4 && $form.$n.html ?><tr><td>&nbsp;</td><td class="description">{$field.help_post}</td></tr>
+        <?php endif; ?>
+
+    {/foreach}
+
+        <?php if $addToGroupId ?>
+	        <tr><td class="label">{$form.group[$addToGroupId].label}</td><td>{$form.group[$addToGroupId].html}</td></tr>
+        <?php endif; ?>
+
+    <?php if $isCaptcha   ?>
+        {include file='CRM/common/ReCAPTCHA.tpl'}
+     <?php endif; ?>
+
+    </table>
+
+    <?php if $field.groupHelpPost ?>
+        <div class="messages help">{$field.groupHelpPost}</div>
+    <?php endif; ?>
+
+ 
+        </fieldset>
+        </div>
+
+
+     <?php if $help_post && $action neq 4 ?>
+	 <br /><div class="messages help">{$help_post}</div>
+	 <?php endif; ?>
+    {/strip}
+</div> /* end crm-container div */
+
+<script type="text/javascript">
+  <?php if $mode ne 8 and $context ne 'dialog' ?>
+
+    var showBlocks = new Array({$showBlocks});
+    var hideBlocks = new Array({$hideBlocks});
+
+    /* hide and display the appropriate blocks as directed by the php code */
+    on_load_init_blocks( showBlocks, hideBlocks );
+    
+  <?php endif; ?>
diff --git a/site/views/Profiles/tmpl/default.xml b/site/views/Profiles/tmpl/default.xml
new file mode 100644
index 000000000000..41ee10b16d5a
--- /dev/null
+++ b/site/views/Profiles/tmpl/default.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+    <layout title="Profile Create Form">
+      <message>
+      </message>
+	</layout>
+    <state>
+        <name>CiviCRM</name>
+        <creationDate>07/26/2010</creationDate>
+        <copyright>(C) CiviCRM LLC</copyright>
+        <author>CiviCRM LLC</author>
+        <authorEmail>info@civicrm.org</authorEmail>
+        <authorUrl>civicrm.org</authorUrl>
+        <version>3.2</version>
+		<name>Profile Create Form</name>
+        <description>CiviCRM form to create a new record using a profile.</description>
+        <config>
+          <fields name="params" addfieldpath="/administrator/components/com_civicrm/civicrm/joomla/site/elements">
+            <fieldset name="basic"> 
+               <field name="task" type="hidden" default="civicrm/profile/create" label="" />
+	       <field name="gid" type="civiprofiles" label="Select Profile" description="Configured CiviCRM Profile" />
+               <field name="reset" type="hidden" size="5" default="1" label="Reset" description="Keep this set to 1. This is needed for the form to work properly." />
+		</fieldset>
+          </fields>
+	</config>	
+    </state>
+</metadata>
diff --git a/site/views/Profiles/tmpl/edit.php b/site/views/Profiles/tmpl/edit.php
new file mode 100644
index 000000000000..27212bbc8fc4
--- /dev/null
+++ b/site/views/Profiles/tmpl/edit.php
@@ -0,0 +1,202 @@
+<?php // no direct access
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2009 Elin Waring
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+defined('_JEXEC') or die('Restricted access'); ?>
+<?php if ( $this->params->def( 'show_page_title', 1 ) ) : ?>
+  <div class="componentheading <?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+    <?php echo $this->escape($this->params->get('page_title')); ?>
+  </div>
+<?php endif; ?>
+
+<?php if ( ($this->params->def('image', -1) != -1) || $this->params->def('show_comp_description', 1) ) : ?>
+<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<tr>
+  <td valign="top" class="contentdescription <?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+  <?php
+    if ( isset($this->image) ) :  echo $this->image; endif;
+    echo $this->params->get('comp_description');
+  ?>
+  </td>
+</tr>
+</table>
+<?php endif; ?>
+  // Make sure you are logged in and have the necessary access rights
+    if ($user->get('gid') < 19) {
+        JResponse::setHeader('HTTP/1.0 403',true);
+              JError::raiseWarning( 403, JText::_('ALERTNOTAUTH') );
+      return;
+    }
+/*  edit (mode=8) pages */
+<script type="text/javascript" src="{$config->resourceBase}js/Common.js"></script>
+{if ! empty( $fields )}
+/* wrap in crm-container div so crm styles are used */
+<div id="crm-container" lang="{$config->lcMessages|truncate:2:"":true}" xml:lang="{$config->lcMessages|truncate:2:"":true}">
+
+        {include file="CRM/Form/body.tpl"}
+
+
+    {strip}
+    {if $help_pre && $action neq 4}
+    <div class="messages help">{$help_pre}</div>
+    {/if}
+
+    {include file="CRM/common/CMSUser.tpl"}
+
+    {assign var=zeroField value="Initial Non Existent Fieldset"}
+    {assign var=fieldset  value=$zeroField}
+    {foreach from=$fields item=field key=fieldName}
+
+    {if $field.groupTitle != $fieldset}
+        {if $fieldset != $zeroField}
+           </table>
+           {if $groupHelpPost}
+              <div class="messages help">{$groupHelpPost}</div>
+           {/if}
+
+
+              </fieldset>
+
+        {/if}
+
+
+            <fieldset>
+
+     {if $context neq 'dialog'}
+              <div id="{$groupId}_show" class="section-hidden section-hidden-border">
+              <a href="#" onclick="hide('{$groupId}_show'); show('{$groupId}'); return false;"><img src="{$config->resourceBase}i/TreePlus.gif" class="action-icon" alt="{ts}open section{/ts}"/></a><label>{ts}{$field.groupTitle}{/ts}</label><br />
+               </div>
+
+              <div id="{$groupId}">
+              <fieldset><legend><a href="#" onclick="hide('{$groupId}'); show('{$groupId}_show'); return false;"><img src="{$config->resourceBase}i/TreeMinus.gif" class="action-icon" alt="{ts}close section{/ts}"/></a>{ts}{$field.groupTitle}{/ts}</legend>
+           {else}
+              <div>
+        <fieldset><legend>{ts}{$field.groupTitle}{/ts}</legend>
+     {/if}
+        {/if}
+        {assign var=fieldset  value=`$field.groupTitle`}
+        {assign var=groupHelpPost  value=`$field.groupHelpPost`}
+        {if $field.groupHelpPre}
+            <div class="messages help">{$field.groupHelpPre}</div>
+        {/if}
+        <table class="form-layout-compressed">
+     {/if}
+
+    {assign var=n value=$field.name}
+    {if $field.options_per_line}
+  <tr>
+        <td class="option-label">{$form.$n.label}</td>
+        <td>
+      {assign var="count" value="1"}
+        {strip}
+        <table class="form-layout-compressed">
+        <tr>
+          {* sort by fails for option per line. Added a variable to iterate through the element array*}
+          {assign var="index" value="1"}
+          {foreach name=outer key=key item=item from=$form.$n}
+          {if $index < 10}
+              {assign var="index" value=`$index+1`}
+          {else}
+              <td class="labels font-light">{$form.$n.$key.html}</td>
+              {if $count == $field.options_per_line}
+                  </tr>
+                   <tr>
+                   {assign var="count" value="1"}
+              {else}
+                   {assign var="count" value=`$count+1`}
+              {/if}
+          {/if}
+          {/foreach}
+        </tr>
+        </table>
+        {/strip}
+        </td>
+    </tr>
+  {else}
+        <tr>
+           <td class="label">{$form.$n.label}</td>
+           <td>
+           {if $n|substr:0:3 eq 'im-'}
+             {assign var="provider" value=$n|cat:"-provider_id"}
+             {$form.$provider.html}&nbsp;
+           {/if}
+           {$form.$n.html}
+           </td>
+        </tr>
+    {if $form.$n.type eq 'file'}
+        <tr><td class="label"></td><td>{$customFiles.$n.displayURL}</td></tr>
+        <tr><td class="label"></td><td>{$customFiles.$n.deleteURL}</td></tr>
+    {/if}
+  {/if}
+        {* Show explanatory text for field if not in 'view' mode *}
+        {if $field.help_post && $action neq 4 && $form.$n.html}<tr><td>&nbsp;</td><td class="description">{$field.help_post}</td></tr>
+        {/if}
+
+    {/foreach}
+
+        {if $addToGroupId}
+          <tr><td class="label">{$form.group[$addToGroupId].label}</td><td>{$form.group[$addToGroupId].html}</td></tr>
+        {/if}
+
+    {if $isCaptcha  }
+        {include file='CRM/common/ReCAPTCHA.tpl'}
+     {/if}
+
+    </table>
+
+    {if $field.groupHelpPost}
+        <div class="messages help">{$field.groupHelpPost}</div>
+    {/if}
+
+        </fieldset>
+
+
+
+
+{/if}
+     {if $help_post && $action neq 4}<br /><div class="messages help">{$help_post}</div>{/if}
+    {/strip}
+
+</div> /* end crm-container div */
+
+<script type="text/javascript">
+  {if $mode ne 8 and $context ne 'dialog' }
+
+    var showBlocks = new Array({$showBlocks});
+    var hideBlocks = new Array({$hideBlocks});
+
+    /* hide and display the appropriate blocks as directed by the php code */
+  on_load_init_blocks( showBlocks, hideBlocks );
+
+  {/if}
+
+
+
+
+
+
+
diff --git a/site/views/Profiles/tmpl/edit.xml b/site/views/Profiles/tmpl/edit.xml
new file mode 100644
index 000000000000..9ea61911aae4
--- /dev/null
+++ b/site/views/Profiles/tmpl/edit.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+    <layout title="Profile Edit Form">
+      <message>
+      </message>
+    </layout>
+    <state>
+        <name>CiviCRM</name>
+        <creationDate>07/26/2010</creationDate>
+        <copyright>(C) CiviCRM LLC</copyright>
+        <author>CiviCRM LLC</author>
+        <authorEmail>info@civicrm.org</authorEmail>
+        <authorUrl>civicrm.org</authorUrl>
+        <version>3.2</version>
+		<name>Profile Edit Layout</name>
+		<description>CiviCRM Profile Edit Form</description>
+	<config>	
+          <fields name="params" addfieldpath="/administrator/components/com_civicrm/civicrm/joomla/site/elements">
+            <fieldset name="basic"> 
+              <field name="task" type="hidden" default="civicrm/profile/edit" label="" />
+ 	      <field name="gid" type="civiprofiles" label="Select Profile" description="Configured CiviCRM Profile" />
+              <field name="reset" type="hidden" size="5" default="1" label="Reset" description="Keep this set to 1. This is needed for the form to work properly." />
+	    </fieldset>
+          </fields>
+        </config>
+    </state>
+</metadata>
diff --git a/site/views/Profiles/tmpl/search.php b/site/views/Profiles/tmpl/search.php
new file mode 100644
index 000000000000..fb9d39ac0d34
--- /dev/null
+++ b/site/views/Profiles/tmpl/search.php
@@ -0,0 +1,140 @@
+<?php // no direct access
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2009 Elin Waring
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+defined('_JEXEC') or die('Restricted access'); ?>
+<?php if ( $this->params->def( 'show_page_title', 1 ) ) : ?>
+	<div class="componentheading <?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+		<?php echo $this->escape($this->params->get('page_title')); ?>
+	</div>
+<?php endif; ?>
+
+<?php if ( ($this->params->def('image', -1) != -1) || $this->params->def('show_comp_description', 1) ) : ?>
+<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<tr>
+	<td valign="top" class="contentdescription <?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<?php
+		if ( isset($this->image) ) :  echo $this->image; endif;
+		echo $this->params->get('comp_description');
+	?>
+	</td>
+</tr>
+</table>
+<?php endif; ?>
+//from Search.tpl
+{if ! empty( $fields )}
+
+ {if $groupId }
+    <div id="id_{$groupId}_show" class="section-hidden section-hidden-border">
+       <a href="#" onclick="hide('id_{$groupId}_show'); show('id_{$groupId}'); return false;"><img src="{$config->resourceBase}i/TreePlus.gif" class="action-icon" alt="{ts}open section{/ts}"/></a><label>{ts}New Search{/ts}</label><br />
+    </div>
+
+    <div id="id_{$groupId}">
+      <fieldset><legend><a href="#" onclick="hide('id_{$groupId}'); show('id_{$groupId}_show'); return false;"><img src="{$config->resourceBase}i/TreeMinus.gif" class="action-icon" alt="{ts}close section{/ts}"/></a>{ts}Search Criteria{/ts}</legend>
+{else}
+    <div>
+{/if}
+
+    <table class="form-layout-compressed">
+    {foreach from=$fields item=field key=fieldName}
+        {assign var=n value=$field.name}
+	{if $field.is_search_range}
+	   {assign var=from value=$field.name|cat:'_from'}
+	   {assign var=to value=$field.name|cat:'_to'}
+	        <tr>
+        	    <td class="label">{$form.$from.label}</td>
+	            <td class="description">{$form.$from.html}</td>
+	            <td class="label">{$form.$to.label}</td>
+        	    <td class="description">{$form.$to.html}</td>
+	        </tr>
+	{elseif $field.options_per_line}
+	<tr>
+        <td class="option-label">{$form.$n.label}</td>
+        <td>
+	    {assign var="count" value="1"}
+        {strip}
+        <table class="form-layout-compressed">
+        <tr>
+          {* sort by fails for option per line. Added a variable to iterate through the element array*}
+          {assign var="index" value="1"}
+          {foreach name=outer key=key item=item from=$form.$n}
+          {if $index < 10}
+              {assign var="index" value=`$index+1`}
+          {else}
+              <td class="labels font-light">{$form.$n.$key.html}</td>
+              {if $count == $field.options_per_line}
+                  </tr>
+                   <tr>
+                   {assign var="count" value="1"}
+              {else}
+          	       {assign var="count" value=`$count+1`}
+              {/if}
+          {/if}
+          {/foreach}
+        </tr>
+        </table>
+        {/strip}
+        </td>
+    </tr>
+	{else}
+	        <tr>
+        	    <td class="label">{$form.$n.label}</td>
+	            <td class="description">{$form.$n.html}</td>
+        	</tr>
+	{/if}
+    {/foreach}
+    <tr><td></td><td>{$form.buttons.html}</td></tr>
+    </table>
+</div>
+
+{if $groupId}
+<script type="text/javascript">
+    {if empty($rows) }
+	var showBlocks = new Array("id_{$groupId}");
+        var hideBlocks = new Array("id_{$groupId}_show");
+    {else}
+	var showBlocks = new Array("id_{$groupId}_show");
+        var hideBlocks = new Array("id_{$groupId}");
+    {/if}
+    {* hide and display the appropriate blocks as directed by the php code *}
+    on_load_init_blocks( showBlocks, hideBlocks );
+</script>
+{/if}
+
+{else} {* empty fields *}
+    <div class="messages status">
+      <dl>
+        <dt><img src="{$config->resourceBase}i/Inform.gif" alt="{ts}status{/ts}" /></dt>
+        <dd>{ts}No fields in this Profile have been configured as searchable. Ask the site administrator to check the Profile setup.{/ts}</dd>
+      </dl>
+    </div>
+{/if}
+
+
+
+
+
diff --git a/site/views/Profiles/tmpl/search.xml b/site/views/Profiles/tmpl/search.xml
new file mode 100644
index 000000000000..1b5bef839133
--- /dev/null
+++ b/site/views/Profiles/tmpl/search.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+    <layout title="Profile Search Form">
+      <message>
+      </message>
+    </layout>
+    <state>
+        <name>CiviCRM</name>
+        <creationDate>07/26/2010</creationDate>
+        <copyright>(C) CiviCRM LLC</copyright>
+        <author>CiviCRM LLC</author>
+        <authorEmail>info@civicrm.org</authorEmail>
+        <authorUrl>civicrm.org</authorUrl>
+        <version>3.2</version>
+		<name>Profile Search Layout</name>
+        <description>CiviCRM Profile Search Form</description>
+        <config>
+	  <fields name="params" addfieldpath="/administrator/components/com_civicrm/civicrm/joomla/site/elements">
+            <fieldset name="basic"> 
+              <field name="task" type="hidden" default="civicrm/profile" label="" />
+	      <field name="gid" type="civiprofiles" label="Select Profile" description="Configured CiviCRM Profile" />
+              <field name="reset" type="hidden" size="5" default="1" label="Reset" description="Keep this set to 1. This is needed for the form to work properly." />
+	    </fieldset> 
+          </fields>
+        </config>
+    
+	</state>
+</metadata>
diff --git a/site/views/Profiles/tmpl/view.php b/site/views/Profiles/tmpl/view.php
new file mode 100644
index 000000000000..033bfba1f7f3
--- /dev/null
+++ b/site/views/Profiles/tmpl/view.php
@@ -0,0 +1,208 @@
+<?php // no direct access
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2009 Elin Waring
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+defined('_JEXEC') or die('Restricted access'); ?>
+<?php if ( $this->params->def( 'show_page_title', 1 ) ) : ?>
+	<div class="componentheading <?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+		<?php echo $this->escape($this->params->get('page_title')); ?>
+	</div>
+<?php endif; ?>
+
+<?php if ( ($this->params->def('image', -1) != -1) || $this->params->def('show_comp_description', 1) ) : ?>
+<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<tr>
+	<td valign="top" class="contentdescription <?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<?php
+		if ( isset($this->image) ) :  echo $this->image; endif;
+		echo $this->params->get('comp_description');
+	?>
+	</td>
+</tr>
+</table>
+<?php endif; ?>
+
+{* wrap in crm-container div so crm styles are used *}
+<div id="crm-container" lang="{$config->lcMessages|truncate:2:"":true}" xml:lang="{$config->lcMessages|truncate:2:"":true}">
+
+    {if $mode eq 8 || $mode eq 1}
+        {include file="CRM/Form/body.tpl"}
+    {/if}
+    
+    {strip}
+    {if $help_pre && $action neq 4}
+    <div class="messages help">{$help_pre}</div>
+    {/if}
+
+    {include file="CRM/common/CMSUser.tpl"}
+
+    {assign var=zeroField value="Initial Non Existent Fieldset"}
+    {assign var=fieldset  value=$zeroField}
+    {foreach from=$fields item=field key=fieldName}
+
+    {if $field.groupTitle != $fieldset}
+        {if $fieldset != $zeroField}
+           </table>
+           {if $groupHelpPost}
+              <div class="messages help">{$groupHelpPost}</div>
+           {/if}
+
+           {if $mode eq 8}
+              </fieldset>
+           {else}
+              </fieldset>
+              </div>
+           {/if}
+        {/if}
+
+        {if $mode eq 8}
+            <fieldset>
+        {else} 
+           {assign var="groupId" value="id_"|cat:$field.group_id}
+	   {if $context neq 'dialog'}
+              <div id="{$groupId}_show" class="section-hidden section-hidden-border">
+              <a href="#" onclick="hide('{$groupId}_show'); show('{$groupId}'); return false;"><img src="{$config->resourceBase}i/TreePlus.gif" class="action-icon" alt="{ts}open section{/ts}"/></a><label>{ts}{$field.groupTitle}{/ts}</label><br />
+               </div>
+
+              <div id="{$groupId}">
+              <fieldset><legend><a href="#" onclick="hide('{$groupId}'); show('{$groupId}_show'); return false;"><img src="{$config->resourceBase}i/TreeMinus.gif" class="action-icon" alt="{ts}close section{/ts}"/></a>{ts}{$field.groupTitle}{/ts}</legend>
+           {else}
+              <div>
+	      <fieldset><legend>{ts}{$field.groupTitle}{/ts}</legend>
+	   {/if}	
+        {/if}
+        {assign var=fieldset  value=`$field.groupTitle`}
+        {assign var=groupHelpPost  value=`$field.groupHelpPost`}
+        {if $field.groupHelpPre}
+            <div class="messages help">{$field.groupHelpPre}</div>
+        {/if}
+        <table class="form-layout-compressed">
+     {/if}
+
+    {assign var=n value=$field.name}
+    {if $field.options_per_line}
+	<tr>
+        <td class="option-label">{$form.$n.label}</td>
+        <td>
+	    {assign var="count" value="1"}
+        {strip}
+        <table class="form-layout-compressed">
+        <tr>
+          {* sort by fails for option per line. Added a variable to iterate through the element array*}
+          {assign var="index" value="1"}
+          {foreach name=outer key=key item=item from=$form.$n}
+          {if $index < 10}
+              {assign var="index" value=`$index+1`}
+          {else}
+              <td class="labels font-light">{$form.$n.$key.html}</td>
+              {if $count == $field.options_per_line}
+                  </tr>
+                   <tr>
+                   {assign var="count" value="1"}
+              {else}
+          	       {assign var="count" value=`$count+1`}
+              {/if}
+          {/if}
+          {/foreach}
+        </tr>
+        </table>
+        {/strip}
+        </td>
+    </tr>
+	{else}
+        <tr>
+           <td class="label">{$form.$n.label}</td>
+           <td>
+           {if $n|substr:0:3 eq 'im-'}
+             {assign var="provider" value=$n|cat:"-provider_id"}
+             {$form.$provider.html}&nbsp;
+           {/if}
+           {$form.$n.html}
+           </td>
+        </tr>
+	  {if $form.$n.type eq 'file'}
+	      <tr><td class="label"></td><td>{$customFiles.$n.displayURL}</td></tr>
+	      <tr><td class="label"></td><td>{$customFiles.$n.deleteURL}</td></tr>
+	  {/if} 
+	{/if}
+        {* Show explanatory text for field if not in 'view' mode *}
+        {if $field.help_post && $action neq 4 && $form.$n.html}<tr><td>&nbsp;</td><td class="description">{$field.help_post}</td></tr>
+        {/if}
+
+    {/foreach}
+
+        {if $addToGroupId}
+	        <tr><td class="label">{$form.group[$addToGroupId].label}</td><td>{$form.group[$addToGroupId].html}</td></tr>
+        {/if}
+
+    {if $isCaptcha && ( $mode eq 8 || $mode eq 4 || $mode eq 1 ) }
+        {include file='CRM/common/ReCAPTCHA.tpl'}
+     {/if}
+
+    </table>
+
+    {if $field.groupHelpPost}
+        <div class="messages help">{$field.groupHelpPost}</div>
+    {/if}
+
+    {if $mode eq 8}
+        </fieldset>
+    {else}
+        </fieldset>
+        </div>
+    {/if}
+
+
+{if $mode eq 4}
+<div class="crm-submit-buttons"> 
+     {$form.buttons.html}
+</div>
+{/if}
+     {if $help_post && $action neq 4}<br /><div class="messages help">{$help_post}</div>{/if}
+    {/strip}
+
+</div> {* end crm-container div *}
+
+<script type="text/javascript">
+  {if $mode ne 8 and $context ne 'dialog' }
+
+    var showBlocks = new Array({$showBlocks});
+    var hideBlocks = new Array({$hideBlocks});
+
+    {* hide and display the appropriate blocks as directed by the php code *}
+    on_load_init_blocks( showBlocks, hideBlocks );
+    
+  {/if}
+
+  
+</script>
+{/if} {* fields array is not empty *}
+
+
+
+
+
diff --git a/site/views/Profiles/tmpl/view.xml b/site/views/Profiles/tmpl/view.xml
new file mode 100644
index 000000000000..2d83baef10c8
--- /dev/null
+++ b/site/views/Profiles/tmpl/view.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+    <layout title="Profile View Page">
+      <message>
+      </message>
+    </layout>
+    <state>
+        <name>CiviCRM</name>
+        <creationDate>07/26/2010</creationDate>
+        <copyright>(C) CiviCRM LLC</copyright>
+        <author>CiviCRM LLC</author>
+        <authorEmail>info@civicrm.org</authorEmail>
+        <authorUrl>civicrm.org</authorUrl>
+        <version>3.2</version>
+		<name>Profile View Layout</name>
+        <description>CiviCRM Profile View</description>
+	<config>	
+        <fields name="params" addfieldpath="/administrator/components/com_civicrm/civicrm/joomla/site/elements">
+	  <fieldset name="basic"> 
+        	<field name="task" type="hidden" default="civicrm/profile/view" label="" />
+  	  	<field name="gid" type="civiprofiles" label="Select Profile" description="Configured CiviCRM Profile" />
+        	<field name="reset" type="hidden" size="5" default="1" label="Reset" description="Keep this set to 1. This is needed for the form to work properly." />
+	  </fieldset> 	
+        </fields>
+        </config>
+	</state>
+</metadata>
diff --git a/site/views/Profiles/view.html.php b/site/views/Profiles/view.html.php
new file mode 100644
index 000000000000..1b5800eeda6e
--- /dev/null
+++ b/site/views/Profiles/view.html.php
@@ -0,0 +1,42 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
+/*
+ * Copyright (C) 2009 Elin Waring
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+defined('_JEXEC') or die('No direct access allowed'); 
+
+ //////////////////////////////////////////////////
+  // CiviCRM Front-end Profile - Presentation Layer
+  //////////////////////////////////////////////////
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC (c) 2004-2013
+ * $Id$
+ *
+ */
+