diff --git a/oss/joomla/trunk/plugins/authentication/example.php b/oss/joomla/trunk/plugins/authentication/example.php index ec334646..d7f3c591 100644 --- a/oss/joomla/trunk/plugins/authentication/example.php +++ b/oss/joomla/trunk/plugins/authentication/example.php @@ -1,85 +1,85 @@ -status = JAUTHENTICATE_STATUS_SUCCESS; - $response->error_message = ''; - // You may also define other variables: - /* - $yourUser = YourClass::getUser( $credentials ); - $response->email = $yourUser->email; - $response->fullname = $yourUser->name; - */ - return true; - } - else - { - $response->status = JAUTHENTICATE_STATUS_FAILURE; - $response->error_message = 'Could not authenticate'; - return false; - } - } -} +status = JAUTHENTICATE_STATUS_SUCCESS; + $response->error_message = ''; + // You may also define other variables: + /* + $yourUser = YourClass::getUser( $credentials ); + $response->email = $yourUser->email; + $response->fullname = $yourUser->name; + */ + return true; + } + else + { + $response->status = JAUTHENTICATE_STATUS_FAILURE; + $response->error_message = 'Could not authenticate'; + return false; + } + } +} diff --git a/oss/joomla/trunk/plugins/authentication/example.xml b/oss/joomla/trunk/plugins/authentication/example.xml index ba9669e7..2e69e809 100644 --- a/oss/joomla/trunk/plugins/authentication/example.xml +++ b/oss/joomla/trunk/plugins/authentication/example.xml @@ -3,7 +3,7 @@ Authentication - Example Joomla! Project November 2005 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/authentication/gmail.php b/oss/joomla/trunk/plugins/authentication/gmail.php index e8fc122f..943ca4d3 100644 --- a/oss/joomla/trunk/plugins/authentication/gmail.php +++ b/oss/joomla/trunk/plugins/authentication/gmail.php @@ -1,106 +1,106 @@ -status = JAUTHENTICATE_STATUS_SUCCESS; - $response->error_message = ''; - $response->email = $credentials['username']; - $response->fullname = $credentials['username']; - } - else - { - $response->status = JAUTHENTICATE_STATUS_FAILURE; - $response->error_message = 'Failed to authenticate: ' . $message; - } - } -} +status = JAUTHENTICATE_STATUS_SUCCESS; + $response->error_message = ''; + $response->email = $credentials['username']; + $response->fullname = $credentials['username']; + } + else + { + $response->status = JAUTHENTICATE_STATUS_FAILURE; + $response->error_message = 'Failed to authenticate: ' . $message; + } + } +} diff --git a/oss/joomla/trunk/plugins/authentication/gmail.xml b/oss/joomla/trunk/plugins/authentication/gmail.xml index c4e6d828..c4bc681b 100644 --- a/oss/joomla/trunk/plugins/authentication/gmail.xml +++ b/oss/joomla/trunk/plugins/authentication/gmail.xml @@ -3,7 +3,7 @@ Authentication - GMail Joomla! Project February 2006 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/authentication/joomla.php b/oss/joomla/trunk/plugins/authentication/joomla.php index 43075dcb..1f78a447 100644 --- a/oss/joomla/trunk/plugins/authentication/joomla.php +++ b/oss/joomla/trunk/plugins/authentication/joomla.php @@ -1,105 +1,105 @@ -status = JAUTHENTICATE_STATUS_FAILURE; - $response->error_message = 'Empty password not allowed'; - return false; - } - - // Initialize variables - $conditions = ''; - - // Get a database object - $db =& JFactory::getDBO(); - - $query = 'SELECT `id`, `password`, `gid`' - . ' FROM `#__users`' - . ' WHERE username=' . $db->Quote( $credentials['username'] ) - ; - $db->setQuery( $query ); - $result = $db->loadObject(); - - - if($result) - { - $parts = explode( ':', $result->password ); - $crypt = $parts[0]; - $salt = @$parts[1]; - $testcrypt = JUserHelper::getCryptedPassword($credentials['password'], $salt); - - if ($crypt == $testcrypt) { - $user = JUser::getInstance($result->id); // Bring this in line with the rest of the system - $response->email = $user->email; - $response->fullname = $user->name; - $response->status = JAUTHENTICATE_STATUS_SUCCESS; - $response->error_message = ''; - } else { - $response->status = JAUTHENTICATE_STATUS_FAILURE; - $response->error_message = 'Invalid password'; - } - } - else - { - $response->status = JAUTHENTICATE_STATUS_FAILURE; - $response->error_message = 'User does not exist'; - } - } -} +status = JAUTHENTICATE_STATUS_FAILURE; + $response->error_message = 'Empty password not allowed'; + return false; + } + + // Initialize variables + $conditions = ''; + + // Get a database object + $db =& JFactory::getDBO(); + + $query = 'SELECT `id`, `password`, `gid`' + . ' FROM `#__users`' + . ' WHERE username=' . $db->Quote( $credentials['username'] ) + ; + $db->setQuery( $query ); + $result = $db->loadObject(); + + + if($result) + { + $parts = explode( ':', $result->password ); + $crypt = $parts[0]; + $salt = @$parts[1]; + $testcrypt = JUserHelper::getCryptedPassword($credentials['password'], $salt); + + if ($crypt == $testcrypt) { + $user = JUser::getInstance($result->id); // Bring this in line with the rest of the system + $response->email = $user->email; + $response->fullname = $user->name; + $response->status = JAUTHENTICATE_STATUS_SUCCESS; + $response->error_message = ''; + } else { + $response->status = JAUTHENTICATE_STATUS_FAILURE; + $response->error_message = 'Invalid password'; + } + } + else + { + $response->status = JAUTHENTICATE_STATUS_FAILURE; + $response->error_message = 'User does not exist'; + } + } +} diff --git a/oss/joomla/trunk/plugins/authentication/joomla.xml b/oss/joomla/trunk/plugins/authentication/joomla.xml index 49e574b3..26c9cd03 100644 --- a/oss/joomla/trunk/plugins/authentication/joomla.xml +++ b/oss/joomla/trunk/plugins/authentication/joomla.xml @@ -3,7 +3,7 @@ Authentication - Joomla Joomla! Project November 2005 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/authentication/ldap.php b/oss/joomla/trunk/plugins/authentication/ldap.php index 480ed3eb..8c0a732e 100644 --- a/oss/joomla/trunk/plugins/authentication/ldap.php +++ b/oss/joomla/trunk/plugins/authentication/ldap.php @@ -1,162 +1,162 @@ -type = 'LDAP'; - // LDAP does not like Blank passwords (tries to Anon Bind which is bad) - if (empty($credentials['password'])) - { - $response->status = JAUTHENTICATE_STATUS_FAILURE; - $response->error_message = 'LDAP can not have blank password'; - return false; - } - - // load plugin params info - $ldap_email = $this->params->get('ldap_email'); - $ldap_fullname = $this->params->get('ldap_fullname'); - $ldap_uid = $this->params->get('ldap_uid'); - $auth_method = $this->params->get('auth_method'); - - jimport('joomla.client.ldap'); - $ldap = new JLDAP($this->params); - - if (!$ldap->connect()) - { - $response->status = JAUTHENTICATE_STATUS_FAILURE; - $response->error_message = 'Unable to connect to LDAP server'; - return; - } - - switch($auth_method) - { - case 'search': - { - // Bind using Connect Username/password - // Force anon bind to mitigate misconfiguration like [#7119] - if(strlen($this->params->get('username'))) $bindtest = $ldap->bind(); - else $bindtest = $ldap->anonymous_bind(); - - - if($bindtest) - { - // Search for users DN - $binddata = $ldap->simple_search(str_replace("[search]", $credentials['username'], $this->params->get('search_string'))); - if(isset($binddata[0]) && isset($binddata[0]['dn'])) { - // Verify Users Credentials - $success = $ldap->bind($binddata[0]['dn'],$credentials['password'],1); - // Get users details - $userdetails = $binddata; - } else { - $response->status = JAUTHENTICATE_STATUS_FAILURE; - $response->error_message = 'Unable to find user'; - } - } - else - { - $response->status = JAUTHENTICATE_STATUS_FAILURE; - $response->error_message = 'Unable to bind to LDAP'; - } - } break; - - case 'bind': - { - // We just accept the result here - $success = $ldap->bind($credentials['username'],$credentials['password']); - if($success) { - $userdetails = $ldap->simple_search(str_replace("[search]", $credentials['username'], $this->params->get('search_string'))); - } else { - $response->status = JAUTHENTICATE_STATUS_FAILURE; - $response->error_message = 'Failed binding to LDAP server'; - } - } break; - } - - if(!$success) - { - $response->status = JAUTHENTICATE_STATUS_FAILURE; - if(!strlen($response->error_message)) $response->error_message = 'Incorrect username/password'; - } - else - { - // Grab some details from LDAP and return them - if (isset($userdetails[0][$ldap_uid][0])) { - $response->username = $userdetails[0][$ldap_uid][0]; - } - - if (isset($userdetails[0][$ldap_email][0])) { - $response->email = $userdetails[0][$ldap_email][0]; - } - - if(isset($userdetails[0][$ldap_fullname][0])) { - $response->fullname = $userdetails[0][$ldap_fullname][0]; - } else { - $response->fullname = $credentials['username']; - } - - // Were good - So say so. - $response->status = JAUTHENTICATE_STATUS_SUCCESS; - $response->error_message = ''; - } - - $ldap->close(); - } -} +type = 'LDAP'; + // LDAP does not like Blank passwords (tries to Anon Bind which is bad) + if (empty($credentials['password'])) + { + $response->status = JAUTHENTICATE_STATUS_FAILURE; + $response->error_message = 'LDAP can not have blank password'; + return false; + } + + // load plugin params info + $ldap_email = $this->params->get('ldap_email'); + $ldap_fullname = $this->params->get('ldap_fullname'); + $ldap_uid = $this->params->get('ldap_uid'); + $auth_method = $this->params->get('auth_method'); + + jimport('joomla.client.ldap'); + $ldap = new JLDAP($this->params); + + if (!$ldap->connect()) + { + $response->status = JAUTHENTICATE_STATUS_FAILURE; + $response->error_message = 'Unable to connect to LDAP server'; + return; + } + + switch($auth_method) + { + case 'search': + { + // Bind using Connect Username/password + // Force anon bind to mitigate misconfiguration like [#7119] + if(strlen($this->params->get('username'))) $bindtest = $ldap->bind(); + else $bindtest = $ldap->anonymous_bind(); + + + if($bindtest) + { + // Search for users DN + $binddata = $ldap->simple_search(str_replace("[search]", $credentials['username'], $this->params->get('search_string'))); + if(isset($binddata[0]) && isset($binddata[0]['dn'])) { + // Verify Users Credentials + $success = $ldap->bind($binddata[0]['dn'],$credentials['password'],1); + // Get users details + $userdetails = $binddata; + } else { + $response->status = JAUTHENTICATE_STATUS_FAILURE; + $response->error_message = 'Unable to find user'; + } + } + else + { + $response->status = JAUTHENTICATE_STATUS_FAILURE; + $response->error_message = 'Unable to bind to LDAP'; + } + } break; + + case 'bind': + { + // We just accept the result here + $success = $ldap->bind($credentials['username'],$credentials['password']); + if($success) { + $userdetails = $ldap->simple_search(str_replace("[search]", $credentials['username'], $this->params->get('search_string'))); + } else { + $response->status = JAUTHENTICATE_STATUS_FAILURE; + $response->error_message = 'Failed binding to LDAP server'; + } + } break; + } + + if(!$success) + { + $response->status = JAUTHENTICATE_STATUS_FAILURE; + if(!strlen($response->error_message)) $response->error_message = 'Incorrect username/password'; + } + else + { + // Grab some details from LDAP and return them + if (isset($userdetails[0][$ldap_uid][0])) { + $response->username = $userdetails[0][$ldap_uid][0]; + } + + if (isset($userdetails[0][$ldap_email][0])) { + $response->email = $userdetails[0][$ldap_email][0]; + } + + if(isset($userdetails[0][$ldap_fullname][0])) { + $response->fullname = $userdetails[0][$ldap_fullname][0]; + } else { + $response->fullname = $credentials['username']; + } + + // Were good - So say so. + $response->status = JAUTHENTICATE_STATUS_SUCCESS; + $response->error_message = ''; + } + + $ldap->close(); + } +} diff --git a/oss/joomla/trunk/plugins/authentication/ldap.xml b/oss/joomla/trunk/plugins/authentication/ldap.xml index 8568d811..92c0b1d8 100644 --- a/oss/joomla/trunk/plugins/authentication/ldap.xml +++ b/oss/joomla/trunk/plugins/authentication/ldap.xml @@ -3,7 +3,7 @@ Authentication - LDAP Joomla! Project November 2005 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/authentication/openid.php b/oss/joomla/trunk/plugins/authentication/openid.php index aaeb7e36..fa42d17d 100644 --- a/oss/joomla/trunk/plugins/authentication/openid.php +++ b/oss/joomla/trunk/plugins/authentication/openid.php @@ -1,274 +1,274 @@ -type = JAUTHENTICATE_STATUS_FAILURE; - $response->error_message = "Could not create the FileStore directory '$store_path'. " . " Please check the effective permissions."; - return false; - } - - // Create store object - $store = new Auth_OpenID_FileStore($store_path); - - // Create a consumer object - $consumer = new Auth_OpenID_Consumer($store); - - if (!isset ($_SESSION['_openid_consumer_last_token'])) { - // Begin the OpenID authentication process. - if (!$auth_request = $consumer->begin($credentials['username'])) { - $response->type = JAUTHENTICATE_STATUS_FAILURE; - $response->error_message = 'Authentication error : could not connect to the openid server'; - return false; - } - - $sreg_request = Auth_OpenID_SRegRequest::build( - array ('email'), - array ('fullname','language','timezone') - ); - - if ($sreg_request) { - $auth_request->addExtension($sreg_request); - } - $policy_uris = array(); - if ($this->params->get( 'phishing-resistant', 0)) { - $policy_uris[] = 'http://schemas.openid.net/pape/policies/2007/06/phishing-resistant'; - } - - if ($this->params->get( 'multi-factor', 0)) { - $policy_uris[] = 'http://schemas.openid.net/pape/policies/2007/06/multi-factor'; - } - - if ($this->params->get( 'multi-factor-physical', 0)) { - $policy_uris[] = 'http://schemas.openid.net/pape/policies/2007/06/multi-factor-physical'; - } - - $pape_request = new Auth_OpenID_PAPE_Request($policy_uris); - if ($pape_request) { - $auth_request->addExtension($pape_request); - } - - //Create the entry url - $entry_url = isset ($options['entry_url']) ? $options['entry_url'] : JURI :: base(); - $entry_url = JURI :: getInstance($entry_url); - - unset ($options['entry_url']); //We don't need this anymore - - //Create the url query information - $options['return'] = isset($options['return']) ? base64_encode($options['return']) : base64_encode(JURI::base()); - $options[JUtility::getToken()] = 1; - - $process_url = sprintf($entry_url->toString()."?option=com_user&task=login&username=%s", $credentials['username']); - $process_url .= '&'.JURI::buildQuery($options); - - $session->set('return_url', $process_url ); - - $trust_url = $entry_url->toString(array ( - 'path', - 'host', - 'port', - 'scheme' - )); - $session->set('trust_url', $trust_url); - // For OpenID 1, send a redirect. For OpenID 2, use a Javascript - // form to send a POST request to the server. - if ($auth_request->shouldSendRedirect()) { - $redirect_url = $auth_request->redirectURL($trust_url, $process_url); - - // If the redirect URL can't be built, display an error - // message. - if (Auth_OpenID :: isFailure($redirect_url)) { - displayError("Could not redirect to server: " . $redirect_url->message); - } else { - // Send redirect. - $mainframe->redirect($redirect_url); - return false; - } - } else { - // Generate form markup and render it. - $form_id = 'openid_message'; - $form_html = $auth_request->htmlMarkup($trust_url, $process_url, false, array ( - 'id' => $form_id - )); - // Display an error if the form markup couldn't be generated; - // otherwise, render the HTML. - if (Auth_OpenID :: isFailure($form_html)) { - //displayError("Could not redirect to server: " . $form_html->message); - } else { - JResponse :: setBody($form_html); - echo JResponse :: toString($mainframe->getCfg('gzip')); - $mainframe->close(); - return false; - } - } - } - $result = $consumer->complete($session->get('return_url')); - switch ($result->status) { - case Auth_OpenID_SUCCESS : - { - $sreg_resp = Auth_OpenID_SRegResponse::fromSuccessResponse($result); - - $sreg = $sreg_resp->contents(); - $usermode = $this->params->get('usermode', 2); -/* in the following code, we deal with the transition from the old openid version to the new openid version - In the old version, the username was always taken straight from the login form. In the new version, we get a - username back from the openid provider. This is necessary for a number of reasons. First, providers such as - yahoo.com allow you to enter only the provider name in the username field (i.e. yahoo.com or flickr.com). Taking - this as the username would obviously cause problems because everybody who had an id from yahoo.com would have username - yahoo.com. Second, it is necessary because with the old way, we rely on the user entering the id the same every time. - This is bad because if the user enters the http:// one time and not the second time, they end up as two different users. - There are two possible settings here - the first setting, is to always use the new way, which is to get the username from - the provider after authentication. The second setting is to check if the username exists that we got from the provider. If it - doesn't, then we check if the entered username exists. If it does, then we update the database with the username from the provider - and continue happily along with the new username. - We had talked about a third option, which would be to always used the old way, but that seems insecure in the case of somebody using - a yahoo.com ID. -*/ - if ($usermode && $usermode == 1) { - $response->username = $result->getDisplayIdentifier(); - } else { - // first, check if the provider provided username exists in the database - $db = &JFactory::getDBO(); - $query = 'SELECT username FROM #__users'. - ' WHERE username='.$db->Quote($result->getDisplayIdentifier()). - ' AND password=\'\''; - $db->setQuery($query); - $dbresult = $db->loadObject(); - if ($dbresult) { - // if so, we set our username value to the provided value - $response->username = $result->getDisplayIdentifier(); - } else { - // if it doesn't, we check if the username from the from exists in the database - $query = 'SELECT username FROM #__users'. - ' WHERE username='.$db->Quote( $credentials['username'] ). - ' AND password=\'\''; - $db->setQuery($query); - $dbresult = $db->loadObject(); - if ($dbresult) { - // if it does, we update the database - $query = 'UPDATE #__users SET username='.$db->Quote($result->getDisplayIdentifier()). - ' WHERE username='.$db->Quote($credentials['username']); - $db->setQuery($query); - $db->query(); - if (!$db->query()) { - $response->status = JAUTHENTICATE_STATUS_FAILURE; - $response->error_message = $db->getErrorMsg(); - //break out of the switch if we hit an error with our query - break; - } - } - $response->username = $result->getDisplayIdentifier(); - // we return the username provided by the openid provider - } - } - $response->status = JAUTHENTICATE_STATUS_SUCCESS; - $response->error_message = ''; - if (!isset($sreg['email'])) { - $response->email = str_replace( array('http://', 'https://'), '', $response->username ); - $response->email = str_replace( '/', '-', $response->email ); - $response->email .= '@openid.'; - } else { - $response->email = $sreg['email']; - } - $response->fullname = isset ($sreg['fullname']) ? $sreg['fullname'] : $response->username; - $response->language = isset ($sreg['language']) ? $sreg['language'] : ''; - $response->timezone = isset ($sreg['timezone']) ? $sreg['timezone'] : ''; - } - break; - - case Auth_OpenID_CANCEL : - { - $response->status = JAUTHENTICATE_STATUS_CANCEL; - $response->error_message = 'Authentication cancelled'; - } - break; - - case Auth_OpenID_FAILURE : - { - $response->status = JAUTHENTICATE_STATUS_FAILURE; - $response->error_message = 'Authentication failed'; - } - break; - } - } - - // function -} +type = JAUTHENTICATE_STATUS_FAILURE; + $response->error_message = "Could not create the FileStore directory '$store_path'. " . " Please check the effective permissions."; + return false; + } + + // Create store object + $store = new Auth_OpenID_FileStore($store_path); + + // Create a consumer object + $consumer = new Auth_OpenID_Consumer($store); + + if (!isset ($_SESSION['_openid_consumer_last_token'])) { + // Begin the OpenID authentication process. + if (!$auth_request = $consumer->begin($credentials['username'])) { + $response->type = JAUTHENTICATE_STATUS_FAILURE; + $response->error_message = 'Authentication error : could not connect to the openid server'; + return false; + } + + $sreg_request = Auth_OpenID_SRegRequest::build( + array ('email'), + array ('fullname','language','timezone') + ); + + if ($sreg_request) { + $auth_request->addExtension($sreg_request); + } + $policy_uris = array(); + if ($this->params->get( 'phishing-resistant', 0)) { + $policy_uris[] = 'http://schemas.openid.net/pape/policies/2007/06/phishing-resistant'; + } + + if ($this->params->get( 'multi-factor', 0)) { + $policy_uris[] = 'http://schemas.openid.net/pape/policies/2007/06/multi-factor'; + } + + if ($this->params->get( 'multi-factor-physical', 0)) { + $policy_uris[] = 'http://schemas.openid.net/pape/policies/2007/06/multi-factor-physical'; + } + + $pape_request = new Auth_OpenID_PAPE_Request($policy_uris); + if ($pape_request) { + $auth_request->addExtension($pape_request); + } + + //Create the entry url + $entry_url = isset ($options['entry_url']) ? $options['entry_url'] : JURI :: base(); + $entry_url = JURI :: getInstance($entry_url); + + unset ($options['entry_url']); //We don't need this anymore + + //Create the url query information + $options['return'] = isset($options['return']) ? base64_encode($options['return']) : base64_encode(JURI::base()); + $options[JUtility::getToken()] = 1; + + $process_url = sprintf($entry_url->toString()."?option=com_user&task=login&username=%s", $credentials['username']); + $process_url .= '&'.JURI::buildQuery($options); + + $session->set('return_url', $process_url ); + + $trust_url = $entry_url->toString(array ( + 'path', + 'host', + 'port', + 'scheme' + )); + $session->set('trust_url', $trust_url); + // For OpenID 1, send a redirect. For OpenID 2, use a Javascript + // form to send a POST request to the server. + if ($auth_request->shouldSendRedirect()) { + $redirect_url = $auth_request->redirectURL($trust_url, $process_url); + + // If the redirect URL can't be built, display an error + // message. + if (Auth_OpenID :: isFailure($redirect_url)) { + displayError("Could not redirect to server: " . $redirect_url->message); + } else { + // Send redirect. + $mainframe->redirect($redirect_url); + return false; + } + } else { + // Generate form markup and render it. + $form_id = 'openid_message'; + $form_html = $auth_request->htmlMarkup($trust_url, $process_url, false, array ( + 'id' => $form_id + )); + // Display an error if the form markup couldn't be generated; + // otherwise, render the HTML. + if (Auth_OpenID :: isFailure($form_html)) { + //displayError("Could not redirect to server: " . $form_html->message); + } else { + JResponse :: setBody($form_html); + echo JResponse :: toString($mainframe->getCfg('gzip')); + $mainframe->close(); + return false; + } + } + } + $result = $consumer->complete($session->get('return_url')); + switch ($result->status) { + case Auth_OpenID_SUCCESS : + { + $sreg_resp = Auth_OpenID_SRegResponse::fromSuccessResponse($result); + + $sreg = $sreg_resp->contents(); + $usermode = $this->params->get('usermode', 2); +/* in the following code, we deal with the transition from the old openid version to the new openid version + In the old version, the username was always taken straight from the login form. In the new version, we get a + username back from the openid provider. This is necessary for a number of reasons. First, providers such as + yahoo.com allow you to enter only the provider name in the username field (i.e. yahoo.com or flickr.com). Taking + this as the username would obviously cause problems because everybody who had an id from yahoo.com would have username + yahoo.com. Second, it is necessary because with the old way, we rely on the user entering the id the same every time. + This is bad because if the user enters the http:// one time and not the second time, they end up as two different users. + There are two possible settings here - the first setting, is to always use the new way, which is to get the username from + the provider after authentication. The second setting is to check if the username exists that we got from the provider. If it + doesn't, then we check if the entered username exists. If it does, then we update the database with the username from the provider + and continue happily along with the new username. + We had talked about a third option, which would be to always used the old way, but that seems insecure in the case of somebody using + a yahoo.com ID. +*/ + if ($usermode && $usermode == 1) { + $response->username = $result->getDisplayIdentifier(); + } else { + // first, check if the provider provided username exists in the database + $db = &JFactory::getDBO(); + $query = 'SELECT username FROM #__users'. + ' WHERE username='.$db->Quote($result->getDisplayIdentifier()). + ' AND password=\'\''; + $db->setQuery($query); + $dbresult = $db->loadObject(); + if ($dbresult) { + // if so, we set our username value to the provided value + $response->username = $result->getDisplayIdentifier(); + } else { + // if it doesn't, we check if the username from the from exists in the database + $query = 'SELECT username FROM #__users'. + ' WHERE username='.$db->Quote( $credentials['username'] ). + ' AND password=\'\''; + $db->setQuery($query); + $dbresult = $db->loadObject(); + if ($dbresult) { + // if it does, we update the database + $query = 'UPDATE #__users SET username='.$db->Quote($result->getDisplayIdentifier()). + ' WHERE username='.$db->Quote($credentials['username']); + $db->setQuery($query); + $db->query(); + if (!$db->query()) { + $response->status = JAUTHENTICATE_STATUS_FAILURE; + $response->error_message = $db->getErrorMsg(); + //break out of the switch if we hit an error with our query + break; + } + } + $response->username = $result->getDisplayIdentifier(); + // we return the username provided by the openid provider + } + } + $response->status = JAUTHENTICATE_STATUS_SUCCESS; + $response->error_message = ''; + if (!isset($sreg['email'])) { + $response->email = str_replace( array('http://', 'https://'), '', $response->username ); + $response->email = str_replace( '/', '-', $response->email ); + $response->email .= '@openid.'; + } else { + $response->email = $sreg['email']; + } + $response->fullname = isset ($sreg['fullname']) ? $sreg['fullname'] : $response->username; + $response->language = isset ($sreg['language']) ? $sreg['language'] : ''; + $response->timezone = isset ($sreg['timezone']) ? $sreg['timezone'] : ''; + } + break; + + case Auth_OpenID_CANCEL : + { + $response->status = JAUTHENTICATE_STATUS_CANCEL; + $response->error_message = 'Authentication cancelled'; + } + break; + + case Auth_OpenID_FAILURE : + { + $response->status = JAUTHENTICATE_STATUS_FAILURE; + $response->error_message = 'Authentication failed'; + } + break; + } + } + + // function +} diff --git a/oss/joomla/trunk/plugins/authentication/openid.xml b/oss/joomla/trunk/plugins/authentication/openid.xml index 3494f812..6bbd7ed4 100644 --- a/oss/joomla/trunk/plugins/authentication/openid.xml +++ b/oss/joomla/trunk/plugins/authentication/openid.xml @@ -3,7 +3,7 @@ Authentication - OpenID Joomla! Project February 2006 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org @@ -12,22 +12,22 @@ openid.php - - - - - - - - + + + + + + + + - - - + + + - - - - - + + + + + diff --git a/oss/joomla/trunk/plugins/content/emailcloak.php b/oss/joomla/trunk/plugins/content/emailcloak.php index 19fa3722..1e6582be 100644 --- a/oss/joomla/trunk/plugins/content/emailcloak.php +++ b/oss/joomla/trunk/plugins/content/emailcloak.php @@ -1,166 +1,226 @@ -registerEvent('onPrepareContent', 'plgContentEmailCloak'); - -/** - * Plugin that cloaks all emails in content from spambots via Javascript. - * - * @param object|string An object with a "text" property or the string to be - * cloaked. - * @param array Additional parameters. See {@see plgEmailCloak()}. - * @param int Optional page number. Unused. Defaults to zero. - * @return boolean True on success. - */ -function plgContentEmailCloak(&$row, &$params, $page=0) -{ - if (is_object($row)) { - return plgEmailCloak($row->text, $params); - } - return plgEmailCloak($row, $params); -} - -/** - * Genarate a search pattern based on link and text. - * - * @param string The target of an e-mail link. - * @param string The text enclosed by the link. - * @return string A regular expression that matches a link containing the - * parameters. - */ -function plgContentEmailCloak_searchPattern ($link, $text) { - // anyText - $pattern = '~(?:' . $text . '~i'; - - return $pattern; -} - -/** - * Cloak all emails in text from spambots via Javascript. - * - * @param string The string to be cloaked. - * @param array Additional parameters. Parameter "mode" (integer, default 1) - * replaces addresses with "mailto:" links if nonzero. - * @return boolean True on success. - */ -function plgEmailCloak(&$text, &$params) -{ - - /* - * Check for presence of {emailcloak=off} which is explicits disables this - * bot for the item. - */ - if (JString::strpos($text, '{emailcloak=off}') !== false) { - $text = JString::str_ireplace('{emailcloak=off}', '', $text); - return true; - } - - // Simple performance check to determine whether bot should process further. - if (JString::strpos($text, '@') === false) { - return true; - } - - $plugin = & JPluginHelper::getPlugin('content', 'emailcloak'); - - // Load plugin params info - $pluginParams = new JParameter($plugin->params); - $mode = $pluginParams->def('mode', 1); - - // any@email.address.com - $searchEmail = '([\w\.\-]+\@(?:[a-z0-9\.\-]+\.)+(?:[a-z0-9\-]{2,4}))'; - // any@email.address.com?subject=anyText - $searchEmailLink = $searchEmail . '([?&][\x20-\x7f][^"<>]+)'; - // anyText - $searchText = '([\x20-\x7f][^<>]+)'; - - /* - * Search for derivatives of link code email@amail.com - */ - $pattern = plgContentEmailCloak_searchPattern($searchEmail, $searchEmail); - while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE)) { - $mail = $regs[1][0]; - $mailText = $regs[2][0]; - - // Check to see if mail text is different from mail addy - $replacement = JHTML::_('email.cloak', $mail, $mode, $mailText); - - // Replace the found address with the js cloaked email - $text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0])); - } - - /* - * Search for derivatives of link code - * anytext - */ - $pattern = plgContentEmailCloak_searchPattern($searchEmail, $searchText); - while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE)) { - $mail = $regs[1][0]; - $mailText = $regs[2][0]; - - $replacement = JHTML::_('email.cloak', $mail, $mode, $mailText, 0); - - // Replace the found address with the js cloaked email - $text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0])); - } - - /* - * Search for derivatives of link code email@amail.com - */ - $pattern = plgContentEmailCloak_searchPattern($searchEmailLink, $searchEmail); - while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE)) { - $mail = $regs[1][0] . $regs[2][0]; - $mailText = $regs[3][0]; - // Needed for handling of Body parameter - $mail = str_replace( '&', '&', $mail ); - - // Check to see if mail text is different from mail addy - $replacement = JHTML::_('email.cloak', $mail, $mode, $mailText); - - // Replace the found address with the js cloaked email - $text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0])); - } - - /* - * Search for derivatives of link code anytext - */ - $pattern = plgContentEmailCloak_searchPattern($searchEmailLink, $searchText); - while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE)) { - $mail = $regs[1][0] . $regs[2][0]; - $mailText = $regs[3][0]; - // Needed for handling of Body parameter - $mail = str_replace('&', '&', $mail); - - $replacement = JHTML::_('email.cloak', $mail, $mode, $mailText, 0); - - // Replace the found address with the js cloaked email - $text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0])); - } - - // Search for plain text email@amail.com - $pattern = '~' . $searchEmail . '([^a-z0-9]|$)~i'; - while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE)) { - $mail = $regs[1][0]; - $replacement = JHTML::_('email.cloak', $mail, $mode); - - // Replace the found address with the js cloaked email - $text = substr_replace($text, $replacement, $regs[1][1], strlen($mail)); - } - return true; -} +registerEvent('onPrepareContent', 'plgContentEmailCloak'); + +/** + * Plugin that cloaks all emails in content from spambots via Javascript. + * + * @param object|string An object with a "text" property or the string to be + * cloaked. + * @param array Additional parameters. See {@see plgEmailCloak()}. + * @param int Optional page number. Unused. Defaults to zero. + * @return boolean True on success. + */ +function plgContentEmailCloak(&$row, &$params, $page=0) +{ + if (is_object($row)) { + return plgEmailCloak($row->text, $params); + } + return plgEmailCloak($row, $params); +} + +/** + * Genarate a search pattern based on link and text. + * + * @param string The target of an e-mail link. + * @param string The text enclosed by the link. + * @return string A regular expression that matches a link containing the + * parameters. + */ +function plgContentEmailCloak_searchPattern ($link, $text) { + // anyText + $pattern = '~(?:' . $text . '~i'; + + return $pattern; +} + +/** + * Cloak all emails in text from spambots via Javascript. + * + * @param string The string to be cloaked. + * @param array Additional parameters. Parameter "mode" (integer, default 1) + * replaces addresses with "mailto:" links if nonzero. + * @return boolean True on success. + */ +function plgEmailCloak(&$text, &$params) +{ + + /* + * Check for presence of {emailcloak=off} which is explicits disables this + * bot for the item. + */ + if (JString::strpos($text, '{emailcloak=off}') !== false) { + $text = JString::str_ireplace('{emailcloak=off}', '', $text); + return true; + } + + // Simple performance check to determine whether bot should process further. + if (JString::strpos($text, '@') === false) { + return true; + } + + $plugin = & JPluginHelper::getPlugin('content', 'emailcloak'); + + // Load plugin params info + $pluginParams = new JParameter($plugin->params); + $mode = $pluginParams->def('mode', 1); + + // split the string into parts to exclude strcipt tags from being handled + $text = explode( ' $str ) { + if ( $i == 0 ) { + plgEmailCloakString( $text[$i], $mode ); + } else { + $str_split = explode( '', $str ); + foreach ( $str_split as $j => $str_split_part ) { + if ( ( $j % 2 ) == 1 ) { + plgEmailCloakString( $str_split[$i], $mode ); + } + } + $text[$i] = implode( '', $str_split ); + } + } + $text = implode( ']+)'; + // anyText + $searchText = '((?:[\x20-\x7f]|[\xA1-\xFF]|[\xC2-\xDF][\x80-\xBF]|[\xE0-\xEF][\x80-\xBF]{2}|[\xF0-\xF4][\x80-\xBF]{3})[^<>]+)'; + + //$searchText = '(+)'; + //Any Image link + $searchImage = "(]+>)"; + + /* + * Search for derivatives of link code email@amail.com + */ + $pattern = plgContentEmailCloak_searchPattern($searchEmail, $searchEmail); + while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE)) { + $mail = $regs[2][0]; + $mailText = $regs[3][0]; + + // Check to see if mail text is different from mail addy + $replacement = JHTML::_('email.cloak', $mail, $mode, $mailText); + + // Replace the found address with the js cloaked email + $text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0])); + } + + /* + * Search for derivatives of link code + * anytext + */ + $pattern = plgContentEmailCloak_searchPattern($searchEmail, $searchText); + while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE)) { + $prefix = $regs[1][0]; + $mail = $regs[2][0]; + $suffix = $regs[3][0]; + $attribs = $regs[4][0]; + $mailText = $regs[5][0]; + + $replacement = JHTML::_('email.cloak', $mail, $mode, $mailText, 0, $prefix, $suffix, $attribs); + + // Replace the found address with the js cloaked email + $text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0])); + } + + /* + * Search for derivatives of link code + * + */ + $pattern = plgContentEmailCloak_searchPattern($searchEmail, $searchImage); + while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE)) { + $prefix = $regs[1][0]; + $mail = $regs[2][0]; + $suffix = $regs[3][0]; + $attribs = $regs[4][0]; + $mailText = $regs[5][0]; + + $replacement = JHTML::_('email.cloak', $mail, $mode, $mailText, 0, $prefix, $suffix, $attribs); + + // Replace the found address with the js cloaked email + $text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0])); + } + + /* + * Search for derivatives of link code email@amail.com + */ + $pattern = plgContentEmailCloak_searchPattern($searchEmailLink, $searchEmail); + while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE)) { + $mail = $regs[2][0] . $regs[3][0]; + $mailText = $regs[6][0]; + // Needed for handling of Body parameter + $mail = str_replace( '&', '&', $mail ); + + // Check to see if mail text is different from mail addy + $replacement = JHTML::_('email.cloak', $mail, $mode, $mailText); + + // Replace the found address with the js cloaked email + $text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0])); + } + + /* + * Search for derivatives of link code anytext + */ + $pattern = plgContentEmailCloak_searchPattern($searchEmailLink, $searchText); + while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE)) { + $mail = $regs[2][0] . $regs[3][0]; + $mailText = $regs[6][0]; + // Needed for handling of Body parameter + $mail = str_replace('&', '&', $mail); + + $replacement = JHTML::_('email.cloak', $mail, $mode, $mailText, 0); + + // Replace the found address with the js cloaked email + $text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0])); + } + + // Search for plain text email@amail.com + $pattern = '~' . $searchEmail . '([^a-z0-9]|$)~i'; + while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE)) { + $mail = $regs[1][0]; + $replacement = JHTML::_('email.cloak', $mail, $mode); + + // Replace the found address with the js cloaked email + $text = substr_replace($text, $replacement, $regs[1][1], strlen($mail)); + } + return true; +} diff --git a/oss/joomla/trunk/plugins/content/emailcloak.xml b/oss/joomla/trunk/plugins/content/emailcloak.xml index 6b3e97a5..6e355065 100644 --- a/oss/joomla/trunk/plugins/content/emailcloak.xml +++ b/oss/joomla/trunk/plugins/content/emailcloak.xml @@ -3,7 +3,7 @@ Content - Email Cloaking Joomla! Project November 2005 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/content/example.php b/oss/joomla/trunk/plugins/content/example.php index 3706f9d8..7921394b 100644 --- a/oss/joomla/trunk/plugins/content/example.php +++ b/oss/joomla/trunk/plugins/content/example.php @@ -1,148 +1,148 @@ -text is also available - * @param object The article params - * @param int The 'page' number - */ - function onPrepareContent( &$article, &$params, $limitstart ) - { - global $mainframe; - - } - - /** - * Example after display title method - * - * Method is called by the view and the results are imploded and displayed in a placeholder - * - * @param object The article object. Note $article->text is also available - * @param object The article params - * @param int The 'page' number - * @return string - */ - function onAfterDisplayTitle( &$article, &$params, $limitstart ) - { - global $mainframe; - - return ''; - } - - /** - * Example before display content method - * - * Method is called by the view and the results are imploded and displayed in a placeholder - * - * @param object The article object. Note $article->text is also available - * @param object The article params - * @param int The 'page' number - * @return string - */ - function onBeforeDisplayContent( &$article, &$params, $limitstart ) - { - global $mainframe; - - return ''; - } - - /** - * Example after display content method - * - * Method is called by the view and the results are imploded and displayed in a placeholder - * - * @param object The article object. Note $article->text is also available - * @param object The article params - * @param int The 'page' number - * @return string - */ - function onAfterDisplayContent( &$article, &$params, $limitstart ) - { - global $mainframe; - - return ''; - } - - /** - * Example before save content method - * - * Method is called right before content is saved into the database. - * Article object is passed by reference, so any changes will be saved! - * NOTE: Returning false will abort the save with an error. - * You can set the error by calling $article->setError($message) - * - * @param object A JTableContent object - * @param bool If the content is just about to be created - * @return bool If false, abort the save - */ - function onBeforeContentSave( &$article, $isNew ) - { - global $mainframe; - - return true; - } - - /** - * Example after save content method - * Article is passed by reference, but after the save, so no changes will be saved. - * Method is called right after the content is saved - * - * - * @param object A JTableContent object - * @param bool If the content is just about to be created - * @return void - */ - function onAfterContentSave( &$article, $isNew ) - { - global $mainframe; - - return true; - } - -} +text is also available + * @param object The article params + * @param int The 'page' number + */ + function onPrepareContent( &$article, &$params, $limitstart ) + { + global $mainframe; + + } + + /** + * Example after display title method + * + * Method is called by the view and the results are imploded and displayed in a placeholder + * + * @param object The article object. Note $article->text is also available + * @param object The article params + * @param int The 'page' number + * @return string + */ + function onAfterDisplayTitle( &$article, &$params, $limitstart ) + { + global $mainframe; + + return ''; + } + + /** + * Example before display content method + * + * Method is called by the view and the results are imploded and displayed in a placeholder + * + * @param object The article object. Note $article->text is also available + * @param object The article params + * @param int The 'page' number + * @return string + */ + function onBeforeDisplayContent( &$article, &$params, $limitstart ) + { + global $mainframe; + + return ''; + } + + /** + * Example after display content method + * + * Method is called by the view and the results are imploded and displayed in a placeholder + * + * @param object The article object. Note $article->text is also available + * @param object The article params + * @param int The 'page' number + * @return string + */ + function onAfterDisplayContent( &$article, &$params, $limitstart ) + { + global $mainframe; + + return ''; + } + + /** + * Example before save content method + * + * Method is called right before content is saved into the database. + * Article object is passed by reference, so any changes will be saved! + * NOTE: Returning false will abort the save with an error. + * You can set the error by calling $article->setError($message) + * + * @param object A JTableContent object + * @param bool If the content is just about to be created + * @return bool If false, abort the save + */ + function onBeforeContentSave( &$article, $isNew ) + { + global $mainframe; + + return true; + } + + /** + * Example after save content method + * Article is passed by reference, but after the save, so no changes will be saved. + * Method is called right after the content is saved + * + * + * @param object A JTableContent object + * @param bool If the content is just about to be created + * @return void + */ + function onAfterContentSave( &$article, $isNew ) + { + global $mainframe; + + return true; + } + +} diff --git a/oss/joomla/trunk/plugins/content/example.xml b/oss/joomla/trunk/plugins/content/example.xml index 72a4a381..d91b06dd 100644 --- a/oss/joomla/trunk/plugins/content/example.xml +++ b/oss/joomla/trunk/plugins/content/example.xml @@ -3,7 +3,7 @@ Content - Example Joomla! Project July 2007 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/content/loadmodule.php b/oss/joomla/trunk/plugins/content/loadmodule.php index 05fc98fa..a65c726e 100644 --- a/oss/joomla/trunk/plugins/content/loadmodule.php +++ b/oss/joomla/trunk/plugins/content/loadmodule.php @@ -1,87 +1,87 @@ -registerEvent( 'onPrepareContent', 'plgContentLoadModule' ); - -/** -* Plugin that loads module positions within content -*/ -function plgContentLoadModule( &$row, &$params, $page=0 ) -{ - $db =& JFactory::getDBO(); - // simple performance check to determine whether bot should process further - if ( JString::strpos( $row->text, 'loadposition' ) === false ) { - return true; - } - - // Get plugin info - $plugin =& JPluginHelper::getPlugin('content', 'loadmodule'); - - // expression to search for - $regex = '/{loadposition\s*.*?}/i'; - - $pluginParams = new JParameter( $plugin->params ); - - // check whether plugin has been unpublished - if ( !$pluginParams->get( 'enabled', 1 ) ) { - $row->text = preg_replace( $regex, '', $row->text ); - return true; - } - - // find all instances of plugin and put in $matches - preg_match_all( $regex, $row->text, $matches ); - - // Number of plugins - $count = count( $matches[0] ); - - // plugin only processes if there are any instances of the plugin in the text - if ( $count ) { - // Get plugin parameters - $style = $pluginParams->def( 'style', -2 ); - - plgContentProcessPositions( $row, $matches, $count, $regex, $style ); - } -} - -function plgContentProcessPositions ( &$row, &$matches, $count, $regex, $style ) -{ - for ( $i=0; $i < $count; $i++ ) - { - $load = str_replace( 'loadposition', '', $matches[0][$i] ); - $load = str_replace( '{', '', $load ); - $load = str_replace( '}', '', $load ); - $load = trim( $load ); - - $modules = plgContentLoadPosition( $load, $style ); - $row->text = str_replace($matches[0][$i], $modules, $row->text ); - } - - // removes tags without matching module positions - $row->text = preg_replace( $regex, '', $row->text ); -} - -function plgContentLoadPosition( $position, $style=-2 ) -{ - $document = &JFactory::getDocument(); - $renderer = $document->loadRenderer('module'); - $params = array('style'=>$style); - - $contents = ''; - foreach (JModuleHelper::getModules($position) as $mod) { - $contents .= $renderer->render($mod, $params); - } - return $contents; +registerEvent( 'onPrepareContent', 'plgContentLoadModule' ); + +/** +* Plugin that loads module positions within content +*/ +function plgContentLoadModule( &$row, &$params, $page=0 ) +{ + $db =& JFactory::getDBO(); + // simple performance check to determine whether bot should process further + if ( JString::strpos( $row->text, 'loadposition' ) === false ) { + return true; + } + + // Get plugin info + $plugin =& JPluginHelper::getPlugin('content', 'loadmodule'); + + // expression to search for + $regex = '/{loadposition\s*.*?}/i'; + + $pluginParams = new JParameter( $plugin->params ); + + // check whether plugin has been unpublished + if ( !$pluginParams->get( 'enabled', 1 ) ) { + $row->text = preg_replace( $regex, '', $row->text ); + return true; + } + + // find all instances of plugin and put in $matches + preg_match_all( $regex, $row->text, $matches ); + + // Number of plugins + $count = count( $matches[0] ); + + // plugin only processes if there are any instances of the plugin in the text + if ( $count ) { + // Get plugin parameters + $style = $pluginParams->def( 'style', -2 ); + + plgContentProcessPositions( $row, $matches, $count, $regex, $style ); + } +} + +function plgContentProcessPositions ( &$row, &$matches, $count, $regex, $style ) +{ + for ( $i=0; $i < $count; $i++ ) + { + $load = str_replace( 'loadposition', '', $matches[0][$i] ); + $load = str_replace( '{', '', $load ); + $load = str_replace( '}', '', $load ); + $load = trim( $load ); + + $modules = plgContentLoadPosition( $load, $style ); + $row->text = str_replace($matches[0][$i], $modules, $row->text ); + } + + // removes tags without matching module positions + $row->text = preg_replace( $regex, '', $row->text ); +} + +function plgContentLoadPosition( $position, $style=-2 ) +{ + $document = &JFactory::getDocument(); + $renderer = $document->loadRenderer('module'); + $params = array('style'=>$style); + + $contents = ''; + foreach (JModuleHelper::getModules($position) as $mod) { + $contents .= $renderer->render($mod, $params); + } + return $contents; } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/content/loadmodule.xml b/oss/joomla/trunk/plugins/content/loadmodule.xml index fe7a4817..1a0fc881 100644 --- a/oss/joomla/trunk/plugins/content/loadmodule.xml +++ b/oss/joomla/trunk/plugins/content/loadmodule.xml @@ -3,7 +3,7 @@ Content - Load Modules Joomla! Project November 2005 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/content/pagebreak.php b/oss/joomla/trunk/plugins/content/pagebreak.php index 00bd231f..fae9b79d 100644 --- a/oss/joomla/trunk/plugins/content/pagebreak.php +++ b/oss/joomla/trunk/plugins/content/pagebreak.php @@ -1,295 +1,295 @@ -registerEvent( 'onPrepareContent', 'plgContentPagebreak' ); - -/** -* Page break plugin -* -* Usage: -*
-*
-* or -*
-* or -*
-* or -*
-* -*/ -function plgContentPagebreak( &$row, &$params, $page=0 ) -{ - // expression to search for - $regex = '#]*?)class=(\"|\')system-pagebreak(\"|\')([^>]*?)\/*>#iU'; - - // Get Plugin info - $plugin =& JPluginHelper::getPlugin('content', 'pagebreak'); - $pluginParams = new JParameter( $plugin->params ); - - $print = JRequest::getBool('print'); - $showall = JRequest::getBool('showall'); - - JPlugin::loadLanguage( 'plg_content_pagebreak' ); - - if (!$pluginParams->get('enabled', 1)) { - $print = true; - } - - if ($print) { - $row->text = preg_replace( $regex, '
', $row->text ); - return true; - } - - //simple performance check to determine whether bot should process further - if ( strpos( $row->text, 'class="system-pagebreak' ) === false && strpos( $row->text, 'class=\'system-pagebreak' ) === false ) { - return true; - } - - $db =& JFactory::getDBO(); - $view = JRequest::getCmd('view'); - - if(!$page) { - $page = 0; - } - - - // check whether plugin has been unpublished - if (!JPluginHelper::isEnabled('content', 'pagebreak') || $params->get( 'intro_only' )|| $params->get( 'popup' ) || $view != 'article') { - $row->text = preg_replace( $regex, '', $row->text ); - return; - } - - // find all instances of plugin and put in $matches - $matches = array(); - preg_match_all( $regex, $row->text, $matches, PREG_SET_ORDER ); - - if (($showall && $pluginParams->get('showall', 1) )) - { - $hasToc = $pluginParams->get( 'multipage_toc', 1 ); - if ( $hasToc ) { - // display TOC - $page = 1; - plgContentCreateTOC( $row, $matches, $page ); - } else { - $row->toc = ''; - } - $row->text = preg_replace( $regex, '
', $row->text ); - return true; - } - - // split the text around the plugin - $text = preg_split( $regex, $row->text ); - - // count the number of pages - $n = count( $text ); - - $row->pagebreaktitle = $row->title; - - // we have found at least one plugin, therefore at least 2 pages - if ($n > 1) - { - // Get plugin parameters - $pluginParams = new JParameter( $plugin->params ); - $title = $pluginParams->get( 'title', 1 ); - $hasToc = $pluginParams->get( 'multipage_toc', 1 ); - - // adds heading or title to Title - if ( $title ) - { - if ( $page ) { - $page_text = $page + 1; - if ( $page && @$matches[$page-1][2] ) - { - $attrs = JUtility::parseAttributes($matches[$page-1][0]); - - if ( @$attrs['title'] ) { - $row->title = $row->title.' - '.$attrs['title']; - } else { - $thispage = $page + 1; - $row->title = $row->title.' - '.JText::_( 'Page' ).' '.$thispage; - } - } - } - } - - // reset the text, we already hold it in the $text array - $row->text = ''; - - // display TOC - if ( $hasToc ) { - plgContentCreateTOC( $row, $matches, $page ); - } else { - $row->toc = ''; - } - - // traditional mos page navigation - jimport('joomla.html.pagination'); - $pageNav = new JPagination( $n, $page, 1 ); - - // page counter - $row->text .= '
'; - $row->text .= $pageNav->getPagesCounter(); - $row->text .= '
'; - - // page text - $text[$page] = str_replace("
", "", $text[$page]); - $row->text .= $text[$page]; - - $row->text .= '
'; - $row->text .= '
'; - - // adds navigation between pages to bottom of text - if ( $hasToc ) { - plgContentCreateNavigation( $row, $page, $n ); - } - - // page links shown at bottom of page if TOC disabled - if (!$hasToc) { - $row->text .= $pageNav->getPagesLinks(); - } - - $row->text .= '

'; - } - - return true; -} - -function plgContentCreateTOC( &$row, &$matches, &$page ) -{ - - if (isset($row->pagebreaktitle)) {$heading = $row->pagebreaktitle;} else {$heading = $row->title;} - $limitstart = JRequest::getInt('limitstart', 0); - $showall = JRequest::getInt('showall', 0); - - // TOC Header - $row->toc = ' - - - - - '; - - // TOC First Page link - $class = ($limitstart === 0 && $showall === 0) ? 'toclink active' : 'toclink'; - $row->toc .= ' - - - - '; - - $i = 2; - - foreach ( $matches as $bot ) - { - $link = JRoute::_( '&showall=&limitstart='. ($i-1) ); - - - if ( @$bot[0] ) - { - $attrs2 = JUtility::parseAttributes($bot[0]); - - if ( @$attrs2['alt'] ) - { - $title = stripslashes( $attrs2['alt'] ); - } - elseif ( @$attrs2['title'] ) - { - $title = stripslashes( $attrs2['title'] ); - } - else - { - $title = JText::sprintf( 'Page #', $i ); - } - } - else - { - $title = JText::sprintf( 'Page #', $i ); - } - - $class = ($limitstart == $i-1) ? 'toclink active' : 'toclink'; - $row->toc .= ' - - - - '; - $i++; - } - - // Get Plugin info - $plugin =& JPluginHelper::getPlugin('content', 'pagebreak'); - - $params = new JParameter( $plugin->params ); - - if ($params->get('showall') ) - { - $link = JRoute::_( '&showall=1&limitstart='); - $class = ($showall == 1) ? 'toclink active' : 'toclink'; - $row->toc .= ' - - - - '; - } - $row->toc .= '
' - . JText::_( 'Article Index' ) . - '
- ' - . $heading . - ' -
- ' - . $title . - ' -
- ' - . JText::_( 'All Pages' ) . - ' -
'; -} - -function plgContentCreateNavigation( &$row, $page, $n ) -{ - $pnSpace = ""; - if (JText::_( '<' ) || JText::_( '>' )) $pnSpace = " "; - - if ( $page < $n-1 ) - { - $page_next = $page + 1; - - $link_next = JRoute::_( '&limitstart='. ( $page_next ) ); - // Next >> - $next = '' . JText::_( 'Next' ) . $pnSpace . JText::_( '>' ) . JText::_( '>' ) .''; - } - else - { - $next = JText::_( 'Next' ); - } - - if ( $page > 0 ) - { - $page_prev = $page - 1 == 0 ? "" : $page - 1; - - $link_prev = JRoute::_( '&limitstart='. ( $page_prev) ); - // << Prev - $prev = ''. JText::_( '<' ) . JText::_( '<' ) . $pnSpace . JText::_( 'Prev' ) .''; - } - else - { - $prev = JText::_( 'Prev' ); - } - - $row->text .= '
' . $prev . ' - ' . $next .'
'; -} +registerEvent( 'onPrepareContent', 'plgContentPagebreak' ); + +/** +* Page break plugin +* +* Usage: +*
+*
+* or +*
+* or +*
+* or +*
+* +*/ +function plgContentPagebreak( &$row, &$params, $page=0 ) +{ + // expression to search for + $regex = '#]*?)class=(\"|\')system-pagebreak(\"|\')([^>]*?)\/*>#iU'; + + // Get Plugin info + $plugin =& JPluginHelper::getPlugin('content', 'pagebreak'); + $pluginParams = new JParameter( $plugin->params ); + + $print = JRequest::getBool('print'); + $showall = JRequest::getBool('showall'); + + JPlugin::loadLanguage( 'plg_content_pagebreak' ); + + if (!$pluginParams->get('enabled', 1)) { + $print = true; + } + + if ($print) { + $row->text = preg_replace( $regex, '
', $row->text ); + return true; + } + + //simple performance check to determine whether bot should process further + if ( strpos( $row->text, 'class="system-pagebreak' ) === false && strpos( $row->text, 'class=\'system-pagebreak' ) === false ) { + return true; + } + + $db =& JFactory::getDBO(); + $view = JRequest::getCmd('view'); + + if(!$page) { + $page = 0; + } + + + // check whether plugin has been unpublished + if (!JPluginHelper::isEnabled('content', 'pagebreak') || $params->get( 'intro_only' )|| $params->get( 'popup' ) || $view != 'article') { + $row->text = preg_replace( $regex, '', $row->text ); + return; + } + + // find all instances of plugin and put in $matches + $matches = array(); + preg_match_all( $regex, $row->text, $matches, PREG_SET_ORDER ); + + if (($showall && $pluginParams->get('showall', 1) )) + { + $hasToc = $pluginParams->get( 'multipage_toc', 1 ); + if ( $hasToc ) { + // display TOC + $page = 1; + plgContentCreateTOC( $row, $matches, $page ); + } else { + $row->toc = ''; + } + $row->text = preg_replace( $regex, '
', $row->text ); + return true; + } + + // split the text around the plugin + $text = preg_split( $regex, $row->text ); + + // count the number of pages + $n = count( $text ); + + $row->pagebreaktitle = $row->title; + + // we have found at least one plugin, therefore at least 2 pages + if ($n > 1) + { + // Get plugin parameters + $pluginParams = new JParameter( $plugin->params ); + $title = $pluginParams->get( 'title', 1 ); + $hasToc = $pluginParams->get( 'multipage_toc', 1 ); + + // adds heading or title to Title + if ( $title ) + { + if ( $page ) { + $page_text = $page + 1; + if ( $page && @$matches[$page-1][2] ) + { + $attrs = JUtility::parseAttributes($matches[$page-1][0]); + + if ( @$attrs['title'] ) { + $row->title = $row->title.' - '.$attrs['title']; + } else { + $thispage = $page + 1; + $row->title = $row->title.' - '.JText::_( 'Page' ).' '.$thispage; + } + } + } + } + + // reset the text, we already hold it in the $text array + $row->text = ''; + + // display TOC + if ( $hasToc ) { + plgContentCreateTOC( $row, $matches, $page ); + } else { + $row->toc = ''; + } + + // traditional mos page navigation + jimport('joomla.html.pagination'); + $pageNav = new JPagination( $n, $page, 1 ); + + // page counter + $row->text .= '
'; + $row->text .= $pageNav->getPagesCounter(); + $row->text .= '
'; + + // page text + $text[$page] = str_replace("
", "", $text[$page]); + $row->text .= $text[$page]; + + $row->text .= '
'; + $row->text .= '
'; + + // adds navigation between pages to bottom of text + if ( $hasToc ) { + plgContentCreateNavigation( $row, $page, $n ); + } + + // page links shown at bottom of page if TOC disabled + if (!$hasToc) { + $row->text .= $pageNav->getPagesLinks(); + } + + $row->text .= '

'; + } + + return true; +} + +function plgContentCreateTOC( &$row, &$matches, &$page ) +{ + + if (isset($row->pagebreaktitle)) {$heading = $row->pagebreaktitle;} else {$heading = $row->title;} + $limitstart = JRequest::getInt('limitstart', 0); + $showall = JRequest::getInt('showall', 0); + + // TOC Header + $row->toc = ' + + + + + '; + + // TOC First Page link + $class = ($limitstart === 0 && $showall === 0) ? 'toclink active' : 'toclink'; + $row->toc .= ' + + + + '; + + $i = 2; + + foreach ( $matches as $bot ) + { + $link = JRoute::_( '&showall=&limitstart='. ($i-1) ); + + + if ( @$bot[0] ) + { + $attrs2 = JUtility::parseAttributes($bot[0]); + + if ( @$attrs2['alt'] ) + { + $title = stripslashes( $attrs2['alt'] ); + } + elseif ( @$attrs2['title'] ) + { + $title = stripslashes( $attrs2['title'] ); + } + else + { + $title = JText::sprintf( 'Page #', $i ); + } + } + else + { + $title = JText::sprintf( 'Page #', $i ); + } + + $class = ($limitstart == $i-1) ? 'toclink active' : 'toclink'; + $row->toc .= ' + + + + '; + $i++; + } + + // Get Plugin info + $plugin =& JPluginHelper::getPlugin('content', 'pagebreak'); + + $params = new JParameter( $plugin->params ); + + if ($params->get('showall') ) + { + $link = JRoute::_( '&showall=1&limitstart='); + $class = ($showall == 1) ? 'toclink active' : 'toclink'; + $row->toc .= ' + + + + '; + } + $row->toc .= '
' + . JText::_( 'Article Index' ) . + '
+ ' + . $heading . + ' +
+ ' + . $title . + ' +
+ ' + . JText::_( 'All Pages' ) . + ' +
'; +} + +function plgContentCreateNavigation( &$row, $page, $n ) +{ + $pnSpace = ""; + if (JText::_( '<' ) || JText::_( '>' )) $pnSpace = " "; + + if ( $page < $n-1 ) + { + $page_next = $page + 1; + + $link_next = JRoute::_( '&limitstart='. ( $page_next ) ); + // Next >> + $next = '' . JText::_( 'Next' ) . $pnSpace . JText::_( '>' ) . JText::_( '>' ) .''; + } + else + { + $next = JText::_( 'Next' ); + } + + if ( $page > 0 ) + { + $page_prev = $page - 1 == 0 ? "" : $page - 1; + + $link_prev = JRoute::_( '&limitstart='. ( $page_prev) ); + // << Prev + $prev = ''. JText::_( '<' ) . JText::_( '<' ) . $pnSpace . JText::_( 'Prev' ) .''; + } + else + { + $prev = JText::_( 'Prev' ); + } + + $row->text .= '
' . $prev . ' - ' . $next .'
'; +} diff --git a/oss/joomla/trunk/plugins/content/pagebreak.xml b/oss/joomla/trunk/plugins/content/pagebreak.xml index 282517cf..86679c17 100644 --- a/oss/joomla/trunk/plugins/content/pagebreak.xml +++ b/oss/joomla/trunk/plugins/content/pagebreak.xml @@ -3,7 +3,7 @@ Content - Pagebreak Joomla! Project November 2005 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/content/pagenavigation.php b/oss/joomla/trunk/plugins/content/pagenavigation.php index 71d2f778..083247bb 100644 --- a/oss/joomla/trunk/plugins/content/pagenavigation.php +++ b/oss/joomla/trunk/plugins/content/pagenavigation.php @@ -1,220 +1,220 @@ -registerEvent( 'onBeforeDisplayContent', 'plgContentNavigation' ); - -function plgContentNavigation( &$row, &$params, $page=0 ) -{ - $view = JRequest::getCmd('view'); - - // Get Plugin info - $plugin =& JPluginHelper::getPlugin('content', 'pagenavigation'); - - if ($params->get('show_item_navigation') && ($view == 'article')) - { - - $html = ''; - $db = & JFactory::getDBO(); - $user = & JFactory::getUser(); - $nullDate = $db->getNullDate(); - - $date =& JFactory::getDate(); - $config = & JFactory::getConfig(); - $now = $date->toMySQL(); - - $uid = $row->id; - $option = 'com_content'; - $canPublish = $user->authorize('com_content', 'publish', 'content', 'all'); - - // the following is needed as different menu items types utilise a different param to control ordering - // for Blogs the `orderby_sec` param is the order controlling param - // for Table and List views it is the `orderby` param - $params_list = $params->toArray(); - if (array_key_exists('orderby_sec', $params_list)) { - $order_method = $params->get('orderby_sec', ''); - } else { - $order_method = $params->get('orderby', ''); - } - // additional check for invalid sort ordering - if ( $order_method == 'front' ) { - $order_method = ''; - } - - // Determine sort order - switch ($order_method) - { - case 'date' : - $orderby = 'a.created'; - break; - - case 'rdate' : - $orderby = 'a.created DESC'; - break; - - case 'alpha' : - $orderby = 'a.title'; - break; - - case 'ralpha' : - $orderby = 'a.title DESC'; - break; - - case 'hits' : - $orderby = 'a.hits'; - break; - - case 'rhits' : - $orderby = 'a.hits DESC'; - break; - - case 'order' : - $orderby = 'a.ordering'; - break; - - case 'author' : - $orderby = 'a.created_by_alias, u.name'; - break; - - case 'rauthor' : - $orderby = 'a.created_by_alias DESC, u.name DESC'; - break; - - case 'front' : - $orderby = 'f.ordering'; - break; - - default : - $orderby = 'a.ordering'; - break; - } - - $xwhere = ' AND ( a.state = 1 OR a.state = -1 )' . - ' AND ( publish_up = '.$db->Quote($nullDate).' OR publish_up <= '.$db->Quote($now).' )' . - ' AND ( publish_down = '.$db->Quote($nullDate).' OR publish_down >= '.$db->Quote($now).' )'; - - // array of articles in same category correctly ordered - $query = 'SELECT a.id,' - . ' CASE WHEN CHAR_LENGTH(a.alias) THEN CONCAT_WS(":", a.id, a.alias) ELSE a.id END as slug,' - . ' CASE WHEN CHAR_LENGTH(cc.alias) THEN CONCAT_WS(":", cc.id, cc.alias) ELSE cc.id END as catslug' - . ' FROM #__content AS a' - . ' LEFT JOIN #__categories AS cc ON cc.id = a.catid' - . ' WHERE a.catid = ' . (int) $row->catid - . ' AND a.state = '. (int) $row->state - . ($canPublish ? '' : ' AND a.access <= ' .(int) $user->get('aid', 0)) - . $xwhere - . ' ORDER BY '. $orderby; - $db->setQuery($query); - $list = $db->loadObjectList('id'); - - // this check needed if incorrect Itemid is given resulting in an incorrect result - if ( !is_array($list) ) { - $list = array(); - } - - reset($list); - - // location of current content item in array list - $location = array_search($uid, array_keys($list)); - - $rows = array_values($list); - - $row->prev = null; - $row->next = null; - - if ($location -1 >= 0) { - // the previous content item cannot be in the array position -1 - $row->prev = $rows[$location -1]; - } - - if (($location +1) < count($rows)) { - // the next content item cannot be in an array position greater than the number of array postions - $row->next = $rows[$location +1]; - } - - $pnSpace = ""; - if (JText::_('<') || JText::_('>')) { - $pnSpace = " "; - } - - if ($row->prev) { - $row->prev = JRoute::_(ContentHelperRoute::getArticleRoute($row->prev->slug, $row->prev->catslug)); - } else { - $row->prev = ''; - } - - if ($row->next) { - $row->next = JRoute::_(ContentHelperRoute::getArticleRoute($row->next->slug, $row->next->catslug)); - } else { - $row->next = ''; - } - - - // output - if ($row->prev || $row->next) - { - $html = ' - - ' - ; - if ($row->prev) - { - $html .= ' - ' - ; - } - - if ($row->prev && $row->next) - { - $html .= ' - ' - ; - } - - if ($row->next) - { - $html .= ' - ' - ; - } - $html .= ' - -
- ' - . JText::_( '<' ) . $pnSpace . JText::_( 'Prev' ) . ' - -   - - ' - . JText::_( 'Next' ) . $pnSpace . JText::_( '>' ) .' -
' - ; - - // Get the plugin parameters - $pluginParams = new JParameter( $plugin->params ); - $position = $pluginParams->get('position', 1); - - if ($position) { - // display after content - $row->text .= $html; - } else { - // display before content - $row->text = $html . $row->text; - } - } - } - - return ; -} +registerEvent( 'onBeforeDisplayContent', 'plgContentNavigation' ); + +function plgContentNavigation( &$row, &$params, $page=0 ) +{ + $view = JRequest::getCmd('view'); + + // Get Plugin info + $plugin =& JPluginHelper::getPlugin('content', 'pagenavigation'); + + if ($params->get('show_item_navigation') && ($view == 'article')) + { + + $html = ''; + $db = & JFactory::getDBO(); + $user = & JFactory::getUser(); + $nullDate = $db->getNullDate(); + + $date =& JFactory::getDate(); + $config = & JFactory::getConfig(); + $now = $date->toMySQL(); + + $uid = $row->id; + $option = 'com_content'; + $canPublish = $user->authorize('com_content', 'publish', 'content', 'all'); + + // the following is needed as different menu items types utilise a different param to control ordering + // for Blogs the `orderby_sec` param is the order controlling param + // for Table and List views it is the `orderby` param + $params_list = $params->toArray(); + if (array_key_exists('orderby_sec', $params_list)) { + $order_method = $params->get('orderby_sec', ''); + } else { + $order_method = $params->get('orderby', ''); + } + // additional check for invalid sort ordering + if ( $order_method == 'front' ) { + $order_method = ''; + } + + // Determine sort order + switch ($order_method) + { + case 'date' : + $orderby = 'a.created'; + break; + + case 'rdate' : + $orderby = 'a.created DESC'; + break; + + case 'alpha' : + $orderby = 'a.title'; + break; + + case 'ralpha' : + $orderby = 'a.title DESC'; + break; + + case 'hits' : + $orderby = 'a.hits'; + break; + + case 'rhits' : + $orderby = 'a.hits DESC'; + break; + + case 'order' : + $orderby = 'a.ordering'; + break; + + case 'author' : + $orderby = 'a.created_by_alias, u.name'; + break; + + case 'rauthor' : + $orderby = 'a.created_by_alias DESC, u.name DESC'; + break; + + case 'front' : + $orderby = 'f.ordering'; + break; + + default : + $orderby = 'a.ordering'; + break; + } + + $xwhere = ' AND ( a.state = 1 OR a.state = -1 )' . + ' AND ( publish_up = '.$db->Quote($nullDate).' OR publish_up <= '.$db->Quote($now).' )' . + ' AND ( publish_down = '.$db->Quote($nullDate).' OR publish_down >= '.$db->Quote($now).' )'; + + // array of articles in same category correctly ordered + $query = 'SELECT a.id,' + . ' CASE WHEN CHAR_LENGTH(a.alias) THEN CONCAT_WS(":", a.id, a.alias) ELSE a.id END as slug,' + . ' CASE WHEN CHAR_LENGTH(cc.alias) THEN CONCAT_WS(":", cc.id, cc.alias) ELSE cc.id END as catslug' + . ' FROM #__content AS a' + . ' LEFT JOIN #__categories AS cc ON cc.id = a.catid' + . ' WHERE a.catid = ' . (int) $row->catid + . ' AND a.state = '. (int) $row->state + . ($canPublish ? '' : ' AND a.access <= ' .(int) $user->get('aid', 0)) + . $xwhere + . ' ORDER BY '. $orderby; + $db->setQuery($query); + $list = $db->loadObjectList('id'); + + // this check needed if incorrect Itemid is given resulting in an incorrect result + if ( !is_array($list) ) { + $list = array(); + } + + reset($list); + + // location of current content item in array list + $location = array_search($uid, array_keys($list)); + + $rows = array_values($list); + + $row->prev = null; + $row->next = null; + + if ($location -1 >= 0) { + // the previous content item cannot be in the array position -1 + $row->prev = $rows[$location -1]; + } + + if (($location +1) < count($rows)) { + // the next content item cannot be in an array position greater than the number of array postions + $row->next = $rows[$location +1]; + } + + $pnSpace = ""; + if (JText::_('<') || JText::_('>')) { + $pnSpace = " "; + } + + if ($row->prev) { + $row->prev = JRoute::_(ContentHelperRoute::getArticleRoute($row->prev->slug, $row->prev->catslug)); + } else { + $row->prev = ''; + } + + if ($row->next) { + $row->next = JRoute::_(ContentHelperRoute::getArticleRoute($row->next->slug, $row->next->catslug)); + } else { + $row->next = ''; + } + + + // output + if ($row->prev || $row->next) + { + $html = ' + + ' + ; + if ($row->prev) + { + $html .= ' + ' + ; + } + + if ($row->prev && $row->next) + { + $html .= ' + ' + ; + } + + if ($row->next) + { + $html .= ' + ' + ; + } + $html .= ' + +
+ ' + . JText::_( '<' ) . $pnSpace . JText::_( 'Prev' ) . ' + +   + + ' + . JText::_( 'Next' ) . $pnSpace . JText::_( '>' ) .' +
' + ; + + // Get the plugin parameters + $pluginParams = new JParameter( $plugin->params ); + $position = $pluginParams->get('position', 1); + + if ($position) { + // display after content + $row->text .= $html; + } else { + // display before content + $row->text = $html . $row->text; + } + } + } + + return ; +} diff --git a/oss/joomla/trunk/plugins/content/pagenavigation.xml b/oss/joomla/trunk/plugins/content/pagenavigation.xml index dcd1545b..7ffae9ca 100644 --- a/oss/joomla/trunk/plugins/content/pagenavigation.xml +++ b/oss/joomla/trunk/plugins/content/pagenavigation.xml @@ -3,7 +3,7 @@ Content - Page Navigation Joomla! Project January 2006 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/content/vote.php b/oss/joomla/trunk/plugins/content/vote.php index d2354429..98322188 100644 --- a/oss/joomla/trunk/plugins/content/vote.php +++ b/oss/joomla/trunk/plugins/content/vote.php @@ -1,67 +1,67 @@ -registerEvent( 'onBeforeDisplayContent', 'plgContentVote' ); - -function plgContentVote( &$row, &$params, $page=0 ) -{ - $uri = & JFactory::getURI(); - - $id = $row->id; - $html = ''; - - if (isset($row->rating_count) && $params->get( 'show_vote' ) && !$params->get( 'popup' )) - { - JPlugin::loadLanguage( 'plg_content_vote' ); - $html .= '
'; - $img = ''; - - // look for images in template if available - $starImageOn = JHTML::_('image.site', 'rating_star.png', '/images/M_images/' ); - $starImageOff = JHTML::_('image.site', 'rating_star_blank.png', '/images/M_images/' ); - - for ($i=0; $i < $row->rating; $i++) { - $img .= $starImageOn; - } - for ($i=$row->rating; $i < 5; $i++) { - $img .= $starImageOff; - } - $html .= ''; - $html .= JText::_( 'User Rating' ) .':'. $img .' / '; - $html .= intval( $row->rating_count ); - $html .= "\n
\n"; - - if (!$params->get( 'intro_only' )) - { - $html .= ''; - $html .= JText::_( 'Poor' ); - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= JText::_( 'Best' ); - $html .= ' '; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - } - $html .= '
'; - } - return $html; +registerEvent( 'onBeforeDisplayContent', 'plgContentVote' ); + +function plgContentVote( &$row, &$params, $page=0 ) +{ + $uri = & JFactory::getURI(); + + $id = $row->id; + $html = ''; + + if (isset($row->rating_count) && $params->get( 'show_vote' ) && !$params->get( 'popup' )) + { + JPlugin::loadLanguage( 'plg_content_vote' ); + $html .= '
'; + $img = ''; + + // look for images in template if available + $starImageOn = JHTML::_('image.site', 'rating_star.png', '/images/M_images/' ); + $starImageOff = JHTML::_('image.site', 'rating_star_blank.png', '/images/M_images/' ); + + for ($i=0; $i < $row->rating; $i++) { + $img .= $starImageOn; + } + for ($i=$row->rating; $i < 5; $i++) { + $img .= $starImageOff; + } + $html .= ''; + $html .= JText::_( 'User Rating' ) .':'. $img .' / '; + $html .= intval( $row->rating_count ); + $html .= "\n
\n"; + + if (!$params->get( 'intro_only' )) + { + $html .= ''; + $html .= JText::_( 'Poor' ); + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= JText::_( 'Best' ); + $html .= ' '; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + } + $html .= '
'; + } + return $html; } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/content/vote.xml b/oss/joomla/trunk/plugins/content/vote.xml index 1d86c973..46f7da96 100644 --- a/oss/joomla/trunk/plugins/content/vote.xml +++ b/oss/joomla/trunk/plugins/content/vote.xml @@ -3,7 +3,7 @@ Content - Vote Joomla! Project November 2005 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/editors-xtd/image.php b/oss/joomla/trunk/plugins/editors-xtd/image.php index 878f84f0..9940c24d 100644 --- a/oss/joomla/trunk/plugins/editors-xtd/image.php +++ b/oss/joomla/trunk/plugins/editors-xtd/image.php @@ -1,97 +1,97 @@ -get('allowed_media_usergroup')) - { - case '1': - $acl->addACL( 'com_media', 'upload', 'users', 'publisher' ); - break; - case '2': - $acl->addACL( 'com_media', 'upload', 'users', 'publisher' ); - $acl->addACL( 'com_media', 'upload', 'users', 'editor' ); - break; - case '3': - $acl->addACL( 'com_media', 'upload', 'users', 'publisher' ); - $acl->addACL( 'com_media', 'upload', 'users', 'editor' ); - $acl->addACL( 'com_media', 'upload', 'users', 'author' ); - break; - case '4': - $acl->addACL( 'com_media', 'upload', 'users', 'publisher' ); - $acl->addACL( 'com_media', 'upload', 'users', 'editor' ); - $acl->addACL( 'com_media', 'upload', 'users', 'author' ); - $acl->addACL( 'com_media', 'upload', 'users', 'registered' ); - break; - } - - //Make sure the user is authorized to view this page - $user = & JFactory::getUser(); - if (!$user->authorize( 'com_media', 'popup' )) { - return; - } - $doc =& JFactory::getDocument(); - $template = $mainframe->getTemplate(); - - $link = 'index.php?option=com_media&view=images&tmpl=component&e_name='.$name; - - JHTML::_('behavior.modal'); - - $button = new JObject(); - $button->set('modal', true); - $button->set('link', $link); - $button->set('text', JText::_('Image')); - $button->set('name', 'image'); - $button->set('options', "{handler: 'iframe', size: {x: 570, y: 400}}"); - - return $button; - } -} +get('allowed_media_usergroup')) + { + case '1': + $acl->addACL( 'com_media', 'upload', 'users', 'publisher' ); + break; + case '2': + $acl->addACL( 'com_media', 'upload', 'users', 'publisher' ); + $acl->addACL( 'com_media', 'upload', 'users', 'editor' ); + break; + case '3': + $acl->addACL( 'com_media', 'upload', 'users', 'publisher' ); + $acl->addACL( 'com_media', 'upload', 'users', 'editor' ); + $acl->addACL( 'com_media', 'upload', 'users', 'author' ); + break; + case '4': + $acl->addACL( 'com_media', 'upload', 'users', 'publisher' ); + $acl->addACL( 'com_media', 'upload', 'users', 'editor' ); + $acl->addACL( 'com_media', 'upload', 'users', 'author' ); + $acl->addACL( 'com_media', 'upload', 'users', 'registered' ); + break; + } + + //Make sure the user is authorized to view this page + $user = & JFactory::getUser(); + if (!$user->authorize( 'com_media', 'popup' )) { + return; + } + $doc =& JFactory::getDocument(); + $template = $mainframe->getTemplate(); + + $link = 'index.php?option=com_media&view=images&tmpl=component&e_name='.$name; + + JHTML::_('behavior.modal'); + + $button = new JObject(); + $button->set('modal', true); + $button->set('link', $link); + $button->set('text', JText::_('Image')); + $button->set('name', 'image'); + $button->set('options', "{handler: 'iframe', size: {x: 570, y: 400}}"); + + return $button; + } +} diff --git a/oss/joomla/trunk/plugins/editors-xtd/image.xml b/oss/joomla/trunk/plugins/editors-xtd/image.xml index 15083621..4b5a0145 100644 --- a/oss/joomla/trunk/plugins/editors-xtd/image.xml +++ b/oss/joomla/trunk/plugins/editors-xtd/image.xml @@ -3,7 +3,7 @@ Button - Image Joomla! Project August 2004 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/editors-xtd/pagebreak.php b/oss/joomla/trunk/plugins/editors-xtd/pagebreak.php index db7aa7af..130b94ca 100644 --- a/oss/joomla/trunk/plugins/editors-xtd/pagebreak.php +++ b/oss/joomla/trunk/plugins/editors-xtd/pagebreak.php @@ -1,68 +1,68 @@ -getTemplate(); - - $link = 'index.php?option=com_content&task=ins_pagebreak&tmpl=component&e_name='.$name; - - JHTML::_('behavior.modal'); - - $button = new JObject(); - $button->set('modal', true); - $button->set('link', $link); - $button->set('text', JText::_('Pagebreak')); - $button->set('name', 'pagebreak'); - $button->set('options', "{handler: 'iframe', size: {x: 400, y: 85}}"); - - return $button; - } +getTemplate(); + + $link = 'index.php?option=com_content&task=ins_pagebreak&tmpl=component&e_name='.$name; + + JHTML::_('behavior.modal'); + + $button = new JObject(); + $button->set('modal', true); + $button->set('link', $link); + $button->set('text', JText::_('Pagebreak')); + $button->set('name', 'pagebreak'); + $button->set('options', "{handler: 'iframe', size: {x: 400, y: 85}}"); + + return $button; + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/editors-xtd/pagebreak.xml b/oss/joomla/trunk/plugins/editors-xtd/pagebreak.xml index 7981f147..b7e28be5 100644 --- a/oss/joomla/trunk/plugins/editors-xtd/pagebreak.xml +++ b/oss/joomla/trunk/plugins/editors-xtd/pagebreak.xml @@ -3,7 +3,7 @@ Button - Pagebreak Joomla! Project August 2004 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/editors-xtd/readmore.php b/oss/joomla/trunk/plugins/editors-xtd/readmore.php index 4c4936dc..f76bac4a 100644 --- a/oss/joomla/trunk/plugins/editors-xtd/readmore.php +++ b/oss/joomla/trunk/plugins/editors-xtd/readmore.php @@ -1,83 +1,83 @@ -getTemplate(); - - // button is not active in specific content components - - $getContent = $this->_subject->getContent($name); - $present = JText::_('ALREADY EXISTS', true) ; - $js = " - function insertReadmore(editor) { - var content = $getContent - if (content.match(//i)) { - alert('$present'); - return false; - } else { - jInsertEditorText('
', editor); - } - } - "; - - $doc->addScriptDeclaration($js); - - $button = new JObject(); - $button->set('modal', false); - $button->set('onclick', 'insertReadmore(\''.$name.'\');return false;'); - $button->set('text', JText::_('Readmore')); - $button->set('name', 'readmore'); - // TODO: The button writer needs to take into account the javascript directive - //$button->set('link', 'javascript:void(0)'); - $button->set('link', '#'); - - return $button; - } +getTemplate(); + + // button is not active in specific content components + + $getContent = $this->_subject->getContent($name); + $present = JText::_('ALREADY EXISTS', true) ; + $js = " + function insertReadmore(editor) { + var content = $getContent + if (content.match(//i)) { + alert('$present'); + return false; + } else { + jInsertEditorText('
', editor); + } + } + "; + + $doc->addScriptDeclaration($js); + + $button = new JObject(); + $button->set('modal', false); + $button->set('onclick', 'insertReadmore(\''.$name.'\');return false;'); + $button->set('text', JText::_('Readmore')); + $button->set('name', 'readmore'); + // TODO: The button writer needs to take into account the javascript directive + //$button->set('link', 'javascript:void(0)'); + $button->set('link', '#'); + + return $button; + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/editors-xtd/readmore.xml b/oss/joomla/trunk/plugins/editors-xtd/readmore.xml index 25f405c4..0eebf1cd 100644 --- a/oss/joomla/trunk/plugins/editors-xtd/readmore.xml +++ b/oss/joomla/trunk/plugins/editors-xtd/readmore.xml @@ -3,7 +3,7 @@ Button - Readmore Joomla! Project March 2006 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/editors/none.php b/oss/joomla/trunk/plugins/editors/none.php index cc5e3a13..e3a523e8 100644 --- a/oss/joomla/trunk/plugins/editors/none.php +++ b/oss/joomla/trunk/plugins/editors/none.php @@ -1,183 +1,183 @@ - - function insertAtCursor(myField, myValue) { - if (document.selection) { - // IE support - myField.focus(); - sel = document.selection.createRange(); - sel.text = myValue; - } else if (myField.selectionStart || myField.selectionStart == '0') { - // MOZILLA/NETSCAPE support - var startPos = myField.selectionStart; - var endPos = myField.selectionEnd; - myField.value = myField.value.substring(0, startPos) - + myValue - + myField.value.substring(endPos, myField.value.length); - } else { - myField.value += myValue; - } - } - "; - return $txt; - } - - /** - * No WYSIWYG Editor - copy editor content to form field - * - * @param string The name of the editor - */ - function onSave( $editor ) { - return; - } - - /** - * No WYSIWYG Editor - get the editor content - * - * @param string The name of the editor - */ - function onGetContent( $editor ) { - return "document.getElementById( '$editor' ).value;\n"; - } - - /** - * No WYSIWYG Editor - set the editor content - * - * @param string The name of the editor - */ - function onSetContent( $editor, $html ) { - return "document.getElementById( '$editor' ).value = $html;\n"; - } - - /** - * No WYSIWYG Editor - display the editor - * - * @param string The name of the editor area - * @param string The content of the field - * @param string The name of the form field - * @param string The width of the editor area - * @param string The height of the editor area - * @param int The number of columns for the editor area - * @param int The number of rows for the editor area - */ - function onDisplay( $name, $content, $width, $height, $col, $row, $buttons = true ) - { - // Only add "px" to width and height if they are not given as a percentage - if (is_numeric( $width )) { - $width .= 'px'; - } - if (is_numeric( $height )) { - $height .= 'px'; - } - - $buttons = $this->_displayButtons($name, $buttons); - $editor = "" . $buttons; - - return $editor; - } - - function onGetInsertMethod($name) - { - $doc = & JFactory::getDocument(); - - $js= "\tfunction jInsertEditorText( text, editor ) { - insertAtCursor( document.getElementById(editor), text ); - }"; - $doc->addScriptDeclaration($js); - - return true; - } - - function _displayButtons($name, $buttons) - { - // Load modal popup behavior - JHTML::_('behavior.modal', 'a.modal-button'); - - $args['name'] = $name; - $args['event'] = 'onGetInsertMethod'; - - $return = ''; - $results[] = $this->update($args); - foreach ($results as $result) { - if (is_string($result) && trim($result)) { - $return .= $result; - } - } - - if(!empty($buttons)) - { - $results = $this->_subject->getButtons($name, $buttons); - - /* - * This will allow plugins to attach buttons or change the behavior on the fly using AJAX - */ - $return .= "\n
\n"; - foreach ($results as $button) - { - /* - * Results should be an object - */ - if ( $button->get('name') ) - { - $modal = ($button->get('modal')) ? 'class="modal-button"' : null; - $href = ($button->get('link')) ? 'href="'.$button->get('link').'"' : null; - $onclick = ($button->get('onclick')) ? 'onclick="'.$button->get('onclick').'"' : null; - $return .= "
get('name')."\">get('text')."\" ".$href." ".$onclick." rel=\"".$button->get('options')."\">".$button->get('text')."
\n"; - } - } - $return .= "
\n"; - } - - return $return; - } + + function insertAtCursor(myField, myValue) { + if (document.selection) { + // IE support + myField.focus(); + sel = document.selection.createRange(); + sel.text = myValue; + } else if (myField.selectionStart || myField.selectionStart == '0') { + // MOZILLA/NETSCAPE support + var startPos = myField.selectionStart; + var endPos = myField.selectionEnd; + myField.value = myField.value.substring(0, startPos) + + myValue + + myField.value.substring(endPos, myField.value.length); + } else { + myField.value += myValue; + } + } + "; + return $txt; + } + + /** + * No WYSIWYG Editor - copy editor content to form field + * + * @param string The name of the editor + */ + function onSave( $editor ) { + return; + } + + /** + * No WYSIWYG Editor - get the editor content + * + * @param string The name of the editor + */ + function onGetContent( $editor ) { + return "document.getElementById( '$editor' ).value;\n"; + } + + /** + * No WYSIWYG Editor - set the editor content + * + * @param string The name of the editor + */ + function onSetContent( $editor, $html ) { + return "document.getElementById( '$editor' ).value = $html;\n"; + } + + /** + * No WYSIWYG Editor - display the editor + * + * @param string The name of the editor area + * @param string The content of the field + * @param string The name of the form field + * @param string The width of the editor area + * @param string The height of the editor area + * @param int The number of columns for the editor area + * @param int The number of rows for the editor area + */ + function onDisplay( $name, $content, $width, $height, $col, $row, $buttons = true ) + { + // Only add "px" to width and height if they are not given as a percentage + if (is_numeric( $width )) { + $width .= 'px'; + } + if (is_numeric( $height )) { + $height .= 'px'; + } + + $buttons = $this->_displayButtons($name, $buttons); + $editor = "" . $buttons; + + return $editor; + } + + function onGetInsertMethod($name) + { + $doc = & JFactory::getDocument(); + + $js= "\tfunction jInsertEditorText( text, editor ) { + insertAtCursor( document.getElementById(editor), text ); + }"; + $doc->addScriptDeclaration($js); + + return true; + } + + function _displayButtons($name, $buttons) + { + // Load modal popup behavior + JHTML::_('behavior.modal', 'a.modal-button'); + + $args['name'] = $name; + $args['event'] = 'onGetInsertMethod'; + + $return = ''; + $results[] = $this->update($args); + foreach ($results as $result) { + if (is_string($result) && trim($result)) { + $return .= $result; + } + } + + if(!empty($buttons)) + { + $results = $this->_subject->getButtons($name, $buttons); + + /* + * This will allow plugins to attach buttons or change the behavior on the fly using AJAX + */ + $return .= "\n
\n"; + foreach ($results as $button) + { + /* + * Results should be an object + */ + if ( $button->get('name') ) + { + $modal = ($button->get('modal')) ? 'class="modal-button"' : null; + $href = ($button->get('link')) ? 'href="'.$button->get('link').'"' : null; + $onclick = ($button->get('onclick')) ? 'onclick="'.$button->get('onclick').'"' : null; + $return .= "
get('name')."\">get('text')."\" ".$href." ".$onclick." rel=\"".$button->get('options')."\">".$button->get('text')."
\n"; + } + } + $return .= "
\n"; + } + + return $return; + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/editors/none.xml b/oss/joomla/trunk/plugins/editors/none.xml index 0f05f9d0..b2778974 100644 --- a/oss/joomla/trunk/plugins/editors/none.xml +++ b/oss/joomla/trunk/plugins/editors/none.xml @@ -6,8 +6,8 @@ N/A - http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL - LGPL + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. + http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL This loads a basic text entry field none.php diff --git a/oss/joomla/trunk/plugins/editors/tinymce.php b/oss/joomla/trunk/plugins/editors/tinymce.php index 340dd41b..6a11196d 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce.php +++ b/oss/joomla/trunk/plugins/editors/tinymce.php @@ -1,652 +1,717 @@ -params->get('mode','advanced'); - $theme = array('simple' => 'simple','advanced' => 'advanced','extended' => 'advanced'); - $skin = $this->params->get( 'skin', '0' ); - switch ($skin) - { - case '3': - $skin = "skin : \"o2k7\", skin_variant : \"black\","; - break; - case '2': - $skin = "skin : \"o2k7\", skin_variant : \"silver\","; - break; - case '1': - $skin = "skin : \"o2k7\","; - break; - case '0': - default: - $skin = "skin : \"default\","; - } - $compressed = $this->params->def( 'compressed', 0 ); - - $cleanup_startup = $this->params->def( 'cleanup_startup', 0 ); - $cleanup_save = $this->params->def( 'cleanup_save', 2 ); - $entity_encoding = $this->params->def( 'entity_encoding', 'raw' ); - if ( $cleanup_startup ) { - $cleanup_startup = 'true'; - } else { - $cleanup_startup = 'false'; - } - switch ( $cleanup_save ) { - case '0': /* Never clean up on save */ - $cleanup = 'false'; - break; - case '1': /* Clean up front end edits only */ - if ($mainframe->isadmin()) - $cleanup = 'false'; - else - $cleanup = 'true'; - break; - default: /* Always clean up on save */ - $cleanup = 'true'; - break; - } - - $langMode = $this->params->def( 'lang_mode', 0 ); - $langPrefix = $this->params->def( 'lang_code', 'en' ); - if ($langMode) { - $langPrefix = substr( $language->getTag(), 0, strpos( $language->getTag(), '-' ) ); - } - if ($language->isRTL()) { - $text_direction = 'rtl'; - } else { - $text_direction = 'ltr'; - } - - $content_css = $this->params->def( 'content_css', 1 ); - $content_css_custom = $this->params->def( 'content_css_custom', '' ); - // loading of css file for `styles` dropdown - if ( $content_css_custom ) { - $content_css = 'content_css : "'. $content_css_custom .'", '; - } - else { - /* - * Lets get the default template for the site application - */ - $db =& JFactory::getDBO(); - $query = 'SELECT template' - . ' FROM #__templates_menu' - . ' WHERE client_id = 0' - . ' AND menuid = 0' - ; - $db->setQuery( $query ); - $template = $db->loadResult(); - - if($content_css) - { - $file_path = JPATH_SITE .'/templates/'. $template .'/css/'; - // Try for site css - $file_name = "template"; - - if ($language->isRTL()) { - $file_name .= "_rtl.css"; - } else { - $file_name .= ".css"; - } - - if ( file_exists( $file_path .DS. $file_name ) ) { - $content_css = 'content_css : "' . JURI::root() .'templates/'. $template . '/css/'.$file_name.', ' . JURI::root() .'templates/system/css/editor.css"'; - } else { - $content_css = 'content_css : "' . JURI::root() .'templates/system/css/editor.css"'; - } - } else { - $content_css = ''; - } - } - - $relative_urls = $this->params->def( 'relative_urls', '1' ); - if ( $relative_urls ) { // relative - $relative_urls = "true"; - } else { // absolute - $relative_urls = "false"; - } - - $newlines = $this->params->def( 'newlines', 0 ); - if ( $newlines ) { // br - $forcenewline = "force_br_newlines : \"true\", force_p_newlines : \"false\", forced_root_block : '',"; - } else { // p - $forcenewline = "force_br_newlines : \"false\", force_p_newlines : \"true\", forced_root_block : 'p',"; - } - $invalid_elements = $this->params->def( 'invalid_elements', 'script,applet,iframe' ); - $extended_elements = $this->params->def( 'extended_elements', '' ); - - - // theme_advanced_* settings - $toolbar = $this->params->def( 'toolbar', 'top' ); - $toolbar_align = $this->params->def( 'toolbar_align', 'left' ); - $html_height = $this->params->def( 'html_height', '550' ); - $html_width = $this->params->def( 'html_width', '750' ); - $element_path = ''; - if ($this->params->get('element_path', 1)) { - $element_path = "theme_advanced_statusbar_location : \"bottom\", theme_advanced_path : true"; - } else { - $element_path = "theme_advanced_statusbar_location : \"none\", theme_advanced_path : false"; - } - - $buttons1_add_before = $buttons1_add = array(); - $buttons2_add_before = $buttons2_add = array(); - $buttons3_add_before = $buttons3_add = array(); - $buttons4 = array(); - $plugins = array(); - if( $extended_elements != "" ) $elements = explode( ',', $extended_elements ); - - //Initial values for buttons - array_push($buttons2_add_before,'cut','copy','paste'); - array_push($buttons2_add,'|'); - - // Plugins - - // fonts - $fonts = $this->params->def( 'fonts', 1 ); - if ( $fonts ) { - $buttons1_add[] = 'fontselect,fontsizeselect'; - } - - // paste - $paste = $this->params->def( 'paste', 1 ); - if ( $paste ) { - $plugins[] = 'paste'; - $buttons2_add_before[] = 'pastetext,pasteword,selectall'; - } - - // search & replace - $searchreplace = $this->params->def( 'searchreplace', 1 ); - if ( $searchreplace ) { - $plugins[] = 'searchreplace'; - $buttons2_add_before[] = '|,search,replace,|'; - } - - // insert date and/or time plugin - $insertdate = $this->params->def( 'insertdate', 1 ); - $format_date = $this->params->def( 'format_date', '%Y-%m-%d' ); - $inserttime = $this->params->def( 'inserttime', 1 ); - $format_time = $this->params->def( 'format_time', '%H:%M:%S' ); - if ( $insertdate or $inserttime ) { - $plugins[] = 'insertdatetime'; - if ( $insertdate ) { - $buttons2_add[] = 'insertdate'; - } - if ( $inserttime ) { - $buttons2_add[] = 'inserttime'; - } - } - - // colors - $colors = $this->params->def( 'colors', 1 ); - if ( $colors ) { - $buttons2_add[] = 'forecolor,backcolor'; - } - - // table - $table = $this->params->def( 'table', 1 ); - if ( $table ) { - $plugins[] = 'table'; - $buttons3_add_before[] = 'tablecontrols'; - } - - // emotions - $smilies = $this->params->def( 'smilies', 1 ); - if ( $smilies ) { - $plugins[] = 'emotions'; - $buttons3_add[] = 'emotions'; - } - - //media plugin - $media = $this->params->def( 'media', 1 ); - if ( $media ) { - $plugins[] = 'media'; - $buttons3_add[] = 'media'; - } - - // horizontal line - $hr = $this->params->def( 'hr', 1 ); - if ( $hr ) { - $plugins[] = 'advhr'; - $elements[] = 'hr[id|title|alt|class|width|size|noshade]'; - $buttons3_add[] = 'advhr'; - } else { - $elements[] = 'hr[id|class|title|alt]'; - } - - // rtl/ltr buttons - $directionality = $this->params->def( 'directionality', 1 ); - if ( $directionality ) { - $plugins[] = 'directionality'; - $buttons3_add[] = 'ltr,rtl'; - } - - // fullscreen - $fullscreen = $this->params->def( 'fullscreen', 1 ); - if ( $fullscreen ) { - $plugins[] = 'fullscreen'; - $buttons3_add[] = 'fullscreen'; - } - - // layer - $layer = $this->params->def( 'layer', 1 ); - if ( $layer ) { - $plugins[] = 'layer'; - $buttons4[] = 'insertlayer'; - $buttons4[] = 'moveforward'; - $buttons4[] = 'movebackward'; - $buttons4[] = 'absolute'; - } - - // style - $style = $this->params->def( 'style', 1 ); - if ( $style ) { - $plugins[] = 'style'; - $buttons4[] = 'styleprops'; - } - - // XHTMLxtras - $xhtmlxtras = $this->params->def( 'xhtmlxtras', 1 ); - if ( $xhtmlxtras ) { - $plugins[] = 'xhtmlxtras'; - $buttons4[] = 'cite,abbr,acronym,ins,del,attribs'; - } - - // visualchars - $visualchars = $this->params->def( 'visualchars', 1 ); - if ( $template ) { - $plugins[] = 'visualchars'; - $buttons4[] = 'visualchars'; - } - - // visualchars - $nonbreaking = $this->params->def( 'nonbreaking', 1 ); - if ( $template ) { - $plugins[] = 'nonbreaking'; - $buttons4[] = 'nonbreaking'; - } - - // template - $template = $this->params->def( 'template', 1 ); - if ( $template ) { - $plugins[] = 'template'; - $buttons4[] = 'template'; - } - - // advimage - $advimage = $this->params->def( 'advimage', 1 ); - if ( $advimage ) { - $plugins[] = 'advimage'; - $elements[] = 'img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name]'; - } - - // advlink - $advlink = $this->params->def( 'advlink', 1 ); - if ( $advlink ) { - $plugins[] = 'advlink'; - $elements[] = 'a[class|name|href|target|title|onclick|rel]'; - } - - // autosave - $autosave = $this->params->def( 'autosave', 1 ); - if ( $autosave ) { - $plugins[] = 'autosave'; - } - - // context menu - $contextmenu = $this->params->def( 'contextmenu', 1 ); - if ( $contextmenu ) { - $plugins[] = 'contextmenu'; - } - - // inline popups - $inlinepopups = $this->params->def( 'inlinepopups', 1 ); - if ( $inlinepopups ) { - $plugins[] = 'inlinepopups'; - $dialog_type = "dialog_type : \"modal\","; - } else { - $dialog_type = ""; - } - - // Safari compatibility - $safari = $this->params->def( 'safari', 0 ); - if ( $safari ) { - $plugins[] = 'safari'; - } - - $custom_plugin = $this->params->def( 'custom_plugin', '' ); - if ($custom_plugin != "") { - $plugins[] = $custom_plugin; - } - - $custom_button = $this->params->def( 'custom_button', '' ); - if ($custom_button != "") { - $buttons4[] = $custom_button; - } - - // Prepare config variables - $buttons1_add_before = implode( ',', $buttons1_add_before ); - $buttons2_add_before = implode( ',', $buttons2_add_before ); - $buttons3_add_before = implode( ',', $buttons3_add_before ); - $buttons1_add = implode( ',', $buttons1_add ); - $buttons2_add = implode( ',', $buttons2_add ); - $buttons3_add = implode( ',', $buttons3_add ); - $buttons4 = implode( ',', $buttons4 ); - $plugins = implode( ',', $plugins ); - $elements = implode( ',', $elements ); - - switch($mode) { - case 'simple': /* Simple mode*/ - if ($compressed) { - $load = "\t\n"; - $load .= "\t"; - } else { - $load = "\t\n"; - } - $return = $load . - "\t"; - break; - - case 'advanced': /* Advanced mode*/ - if ($compressed) { - $load = "\t\n"; - $load .= "\t"; - } else { - $load = "\t\n"; - } - $return = $load . - "\t"; - break; - - case 'extended': /* Extended mode*/ - if ($compressed) { - $load = "\t\n"; - $load .= "\t"; - } else { - $load = "\t\n"; - } - $return = $load . - "\t"; - break; - } - - return $return; - } - - /** - * TinyMCE WYSIWYG Editor - get the editor content - * - * @param string The name of the editor - */ - function onGetContent( $editor ) { - return "tinyMCE.activeEditor.getContent();"; - } - - /** - * TinyMCE WYSIWYG Editor - set the editor content - * - * @param string The name of the editor - */ - function onSetContent( $editor, $html ) { - return "tinyMCE.activeEditor.setContent(".$html.");"; - } - - /** - * TinyMCE WYSIWYG Editor - copy editor content to form field - * - * @param string The name of the editor - */ - function onSave( $editor ) { - return "tinyMCE.triggerSave();"; - } - - /** - * TinyMCE WYSIWYG Editor - display the editor - * - * @param string The name of the editor area - * @param string The content of the field - * @param string The width of the editor area - * @param string The height of the editor area - * @param int The number of columns for the editor area - * @param int The number of rows for the editor area - * @param mixed Can be boolean or array. - */ - function onDisplay( $name, $content, $width, $height, $col, $row, $buttons = true) - { - // Only add "px" to width and height if they are not given as a percentage - if (is_numeric( $width )) { - $width .= 'px'; - } - if (is_numeric( $height )) { - $height .= 'px'; - } - - $editor = "\n" . - $this->_displayButtons($name, $buttons) . - $this->_toogleButton($name); - - return $editor; - } - - function onGetInsertMethod($name) - { - $doc = & JFactory::getDocument(); - - $js= "function jInsertEditorText( text, editor ) { - tinyMCE.execInstanceCommand(editor, 'mceInsertContent',false,text); - }"; - $doc->addScriptDeclaration($js); - - return true; - } - - function _displayButtons($name, $buttons) - { - // Load modal popup behavior - JHTML::_('behavior.modal', 'a.modal-button'); - - $args['name'] = $name; - $args['event'] = 'onGetInsertMethod'; - - $return = ''; - $results[] = $this->update($args); - foreach ($results as $result) { - if (is_string($result) && trim($result)) { - $return .= $result; - } - } - - if(!empty($buttons)) - { - $results = $this->_subject->getButtons($name, $buttons); - - /* - * This will allow plugins to attach buttons or change the behavior on the fly using AJAX - */ - $return .= "\n
\n"; - foreach ($results as $button) - { - /* - * Results should be an object - */ - if ( $button->get('name') ) - { - $modal = ($button->get('modal')) ? 'class="modal-button"' : null; - $href = ($button->get('link')) ? 'href="'.JURI::base().$button->get('link').'"' : null; - $onclick = ($button->get('onclick')) ? 'onclick="'.$button->get('onclick').'"' : null; - $return .= "
get('name')."\">get('text')."\" ".$href." ".$onclick." rel=\"".$button->get('options')."\">".$button->get('text')."
\n"; - } - } - $return .= "
\n"; - } - - return $return; - } - - function _toogleButton($name) - { - $return = ''; - $return .= "\n
\n"; - $return .= "
".JText::_('Toggle editor')."
"; - $return .= "
\n"; - return $return; - } -} +params->get('mode','advanced'); + $theme = array('simple' => 'simple','advanced' => 'advanced','extended' => 'advanced'); + $skin = $this->params->get( 'skin', '0' ); + switch ($skin) + { + case '3': + $skin = "skin : \"o2k7\", skin_variant : \"black\","; + break; + case '2': + $skin = "skin : \"o2k7\", skin_variant : \"silver\","; + break; + case '1': + $skin = "skin : \"o2k7\","; + break; + case '0': + default: + $skin = "skin : \"default\","; + } + $compressed = $this->params->def('compressed', 0); + $cleanup_startup = $this->params->def('cleanup_startup', 0); + $cleanup_save = $this->params->def('cleanup_save', 2); + $entity_encoding = $this->params->def('entity_encoding', 'raw'); + + if ($cleanup_startup) { + $cleanup_startup = 'true'; + } else { + $cleanup_startup = 'false'; + } + switch ($cleanup_save) { + case '0': /* Never clean up on save */ + $cleanup = 'false'; + break; + case '1': /* Clean up front end edits only */ + if ($mainframe->isadmin()) + $cleanup = 'false'; + else + $cleanup = 'true'; + break; + default: /* Always clean up on save */ + $cleanup = 'true'; + break; + } + + $langMode = $this->params->def('lang_mode', 0); + $langPrefix = $this->params->def('lang_code', 'en'); + if ($langMode) { + $langPrefix = substr($language->getTag(), 0, strpos( $language->getTag(), '-' )); + } + if ($language->isRTL()) { + $text_direction = 'rtl'; + } else { + $text_direction = 'ltr'; + } + + $use_content_css = $this->params->def('content_css', 1); + $content_css_custom = $this->params->def('content_css_custom', ''); + + /* + * Lets get the default template for the site application + */ + $db =& JFactory::getDBO(); + $query = 'SELECT template' + . ' FROM #__templates_menu' + . ' WHERE client_id = 0' + . ' AND menuid = 0' + ; + $db->setQuery( $query ); + $template = $db->loadResult(); + + $content_css = ''; + + $templates_path = JPATH_SITE.DS.'templates'; + // loading of css file for 'styles' dropdown + if ( $content_css_custom ) + { + // If URL, just pass it to $content_css + if (strpos( $content_css_custom, 'http' ) !==false) { + $content_css = 'content_css : "'. $content_css_custom .'",'; + // If it is not a URL, assume it is a file name in the current template folder + } else { + $content_css = 'content_css : "'. JURI::root() .'templates/'. $template . '/css/'. $content_css_custom .'",'; + + // Issue warning notice if the file is not found (but pass name to $content_css anyway to avoid TinyMCE error + if (!file_exists($templates_path.DS.$template.DS.'css'.DS.$content_css_custom)) { + $msg = sprintf (JText::_('CUSTOMCSSFILENOTPRESENT'), $content_css_custom); + JError::raiseNotice('SOME_ERROR_CODE', $msg); + } + } + } + else + { + // process when use_content_css is Yes and no custom file given + if($use_content_css) { + + // first check templates folder for default template + // if no editor.css file in templates folder, check system template folder + if (!file_exists($templates_path.DS.$template.DS.'css'.DS.'editor.css')) { + $template = 'system'; + + // if no editor.css file in system folder, show alert + if (!file_exists($templates_path.DS.'system'.DS.'css'.DS.'editor.css')) + { + JError::raiseNotice('SOME_ERROR_CODE', JText::_('TEMPLATECSSFILENOTPRESENT')); + } else { + $content_css = 'content_css : "' . JURI::root() .'templates/system/css/editor.css",'; + } + } else { + $content_css = 'content_css : "' . JURI::root() .'templates/'. $template . '/css/editor.css",'; + } + } + } + + $relative_urls = $this->params->def('relative_urls', '1'); + if ( $relative_urls ) { // relative + $relative_urls = "true"; + } else { // absolute + $relative_urls = "false"; + } + + $newlines = $this->params->def('newlines', 0); + if ($newlines) { // br + $forcenewline = "force_br_newlines : true, force_p_newlines : false, forced_root_block : '',"; + } else { // p + $forcenewline = "force_br_newlines : false, force_p_newlines : true, forced_root_block : 'p',"; + } + $invalid_elements = $this->params->def('invalid_elements', 'script,applet,iframe'); + $extended_elements = $this->params->def('extended_elements', ''); + + // theme_advanced_* settings + $toolbar = $this->params->def('toolbar', 'top'); + $toolbar_align = $this->params->def('toolbar_align', 'left'); + $html_height = $this->params->def('html_height', '550'); + $html_width = $this->params->def('html_width', '750'); + $element_path = ''; + if ($this->params->get('element_path', 1)) { + $element_path = 'theme_advanced_statusbar_location : "bottom", theme_advanced_path : true'; + } else { + $element_path = 'theme_advanced_statusbar_location : "none", theme_advanced_path : false'; + } + + $buttons1_add_before = $buttons1_add = array(); + $buttons2_add_before = $buttons2_add = array(); + $buttons3_add_before = $buttons3_add = array(); + $buttons4 = array(); + $plugins = array(); + if($extended_elements != "") $elements = explode(',', $extended_elements); + + //Initial values for buttons + array_push($buttons4,'cut','copy','paste'); + //array_push($buttons4,'|'); + + // Plugins + + // fonts + $fonts = $this->params->def( 'fonts', 1 ); + if ($fonts) { + $buttons1_add[] = 'fontselect,fontsizeselect'; + } + + // paste + $paste = $this->params->def('paste', 1); + if ($paste) { + $plugins[] = 'paste'; + $buttons4[] = 'pastetext'; + $buttons4[] = 'pasteword'; + $buttons4[] = 'selectall,|'; + } + + // search & replace + $searchreplace = $this->params->def('searchreplace', 1); + if ($searchreplace) { + $plugins[] = 'searchreplace'; + $buttons2_add_before[] = 'search,replace,|'; + } + + // insert date and/or time plugin + $insertdate = $this->params->def('insertdate', 1); + $format_date = $this->params->def('format_date', '%Y-%m-%d'); + $inserttime = $this->params->def('inserttime', 1); + $format_time = $this->params->def('format_time', '%H:%M:%S'); + if ($insertdate or $inserttime) { + $plugins[] = 'insertdatetime'; + if ($insertdate) { + $buttons2_add[] = 'insertdate'; + } + if ($inserttime) { + $buttons2_add[] = 'inserttime'; + } + } + + // colors + $colors = $this->params->def('colors', 1); + if ($colors) { + $buttons2_add[] = 'forecolor,backcolor'; + } + + // table + $table = $this->params->def('table', 1); + if ($table) { + $plugins[] = 'table'; + $buttons3_add_before[] = 'tablecontrols'; + } + + // emotions + $smilies = $this->params->def('smilies', 1); + if ($smilies) { + $plugins[] = 'emotions'; + $buttons3_add[] = 'emotions'; + } + + //media plugin + $media = $this->params->def('media', 1); + if ($media) { + $plugins[] = 'media'; + $buttons3_add[] = 'media'; + } + + // horizontal line + $hr = $this->params->def('hr', 1); + if ($hr) { + $plugins[] = 'advhr'; + $elements[] = 'hr[id|title|alt|class|width|size|noshade|style]'; + $buttons3_add[] = 'advhr'; + } else { + $elements[] = 'hr[id|class|title|alt]'; + } + + // rtl/ltr buttons + $directionality = $this->params->def('directionality', 1); + if ($directionality) { + $plugins[] = 'directionality'; + $buttons3_add[] = 'ltr,rtl'; + } + + // fullscreen + $fullscreen = $this->params->def('fullscreen', 1); + if ($fullscreen) { + $plugins[] = 'fullscreen'; + $buttons2_add[] = 'fullscreen'; + } + + // layer + $layer = $this->params->def('layer', 1); + if ($layer) { + $plugins[] = 'layer'; + $buttons4[] = 'insertlayer'; + $buttons4[] = 'moveforward'; + $buttons4[] = 'movebackward'; + $buttons4[] = 'absolute'; + } + + // style + $style = $this->params->def('style', 1); + if ($style) { + $plugins[] = 'style'; + $buttons4[] = 'styleprops'; + } + + // XHTMLxtras + $xhtmlxtras = $this->params->def('xhtmlxtras', 1); + if ($xhtmlxtras) { + $plugins[] = 'xhtmlxtras'; + $buttons4[] = 'cite,abbr,acronym,ins,del,attribs'; + } + + // visualchars + $visualchars = $this->params->def('visualchars', 1); + if ($visualchars) { + $plugins[] = 'visualchars'; + $buttons4[] = 'visualchars'; + } + + // non-breaking + $nonbreaking = $this->params->def('nonbreaking', 1); + if ($nonbreaking) { + $plugins[] = 'nonbreaking'; + $buttons4[] = 'nonbreaking'; + } + + // blockquote + $blockquote = $this->params->def( 'blockquote', 1 ); + if ( $blockquote ) { + $plugins[] = 'blockquote'; + $buttons4[] = 'blockquote'; + } + + // template + $template = $this->params->def('template', 1); + if ($template) { + $plugins[] = 'template'; + $buttons4[] = 'template'; + } + + // advimage + $advimage = $this->params->def('advimage', 1); + if ($advimage) { + $plugins[] = 'advimage'; + $elements[] = 'img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|style]'; + } + + // advlink + $advlink = $this->params->def('advlink', 1); + if ($advlink) { + $plugins[] = 'advlink'; + $elements[] = 'a[id|class|name|href|target|title|onclick|rel|style]'; + } + + // autosave + $autosave = $this->params->def('autosave', 1); + if ($autosave) { + $plugins[] = 'autosave'; + } + + // context menu + $contextmenu = $this->params->def('contextmenu', 1); + if ($contextmenu) { + $plugins[] = 'contextmenu'; + } + + // inline popups + $inlinepopups = $this->params->def('inlinepopups', 1); + if ($inlinepopups) { + $plugins[] = 'inlinepopups'; + $dialog_type = "dialog_type : \"modal\","; + } else { + $dialog_type = ""; + } + + // Safari compatibility + $safari = $this->params->def('safari', 0); + if ($safari) { + $plugins[] = 'safari'; + } + + $custom_plugin = $this->params->def('custom_plugin', ''); + if ($custom_plugin != "") { + $plugins[] = $custom_plugin; + } + + $custom_button = $this->params->def('custom_button', ''); + if ($custom_button != "") { + $buttons4[] = $custom_button; + } + + // Prepare config variables + $buttons1_add_before = implode(',', $buttons1_add_before); + $buttons2_add_before = implode(',', $buttons2_add_before); + $buttons3_add_before = implode(',', $buttons3_add_before); + $buttons1_add = implode(',', $buttons1_add); + $buttons2_add = implode(',', $buttons2_add); + $buttons3_add = implode(',', $buttons3_add); + $buttons4 = implode(',', $buttons4); + $plugins = implode(',', $plugins); + $elements = implode(',', $elements); + + switch($mode) { + case 'simple': /* Simple mode*/ + if ($compressed) { + $load = "\t\n"; + $load .= "\t"; + } else { + $load = "\t\n"; + } + $return = $load . + "\t"; + break; + + case 'advanced': /* Advanced mode*/ + if ($compressed) { + $load = "\t\n"; + $load .= "\t"; + } else { + $load = "\t\n"; + } + $return = $load . + "\t"; + break; + + case 'extended': /* Extended mode*/ + if ($compressed) { + $load = "\t\n"; + $load .= "\t"; + } else { + $load = "\t\n"; + } + $return = $load . + "\t"; + break; + } + + return $return; + } + + /** + * TinyMCE WYSIWYG Editor - get the editor content + * + * @param string The name of the editor + */ + function onGetContent( $editor ) { + return 'tinyMCE.get(\''.$editor.'\').getContent();'; + } + + /** + * TinyMCE WYSIWYG Editor - set the editor content + * + * @param string The name of the editor + */ + function onSetContent($editor, $html) { + return 'tinyMCE.get(\''.$editor.'\').setContent('.$html.');'; + } + + /** + * TinyMCE WYSIWYG Editor - copy editor content to form field + * + * @param string The name of the editor + */ + function onSave($editor) { + return 'if (tinyMCE.get("'.$editor.'").isHidden()) {tinyMCE.get("'.$editor.'").show()}; tinyMCE.get("'.$editor.'").save();'; + } + + /** + * TinyMCE WYSIWYG Editor - display the editor + * + * @param string The name of the editor area + * @param string The content of the field + * @param string The width of the editor area + * @param string The height of the editor area + * @param int The number of columns for the editor area + * @param int The number of rows for the editor area + * @param mixed Can be boolean or array. + */ + function onDisplay($name, $content, $width, $height, $col, $row, $buttons = true) + { + // Only add "px" to width and height if they are not given as a percentage + if (is_numeric( $width )) { + $width .= 'px'; + } + if (is_numeric( $height )) { + $height .= 'px'; + } + + $editor = "\n" . + $this->_displayButtons($name, $buttons) . + $this->_toogleButton($name); + + return $editor; + } + + function onGetInsertMethod($name) + { + $doc =& JFactory::getDocument(); + + $js= " + function isBrowserIE() { + return navigator.appName==\"Microsoft Internet Explorer\"; + } + + function jInsertEditorText( text, editor ) { + if (isBrowserIE()) { + if (window.parent.tinyMCE) { + window.parent.tinyMCE.selectedInstance.selection.moveToBookmark(window.parent.global_ie_bookmark); + } + } + tinyMCE.execInstanceCommand(editor, 'mceInsertContent',false,text); + } + + var global_ie_bookmark = false; + + function IeCursorFix() { + if (isBrowserIE()) { + tinyMCE.execCommand('mceInsertContent', false, ''); + global_ie_bookmark = tinyMCE.activeEditor.selection.getBookmark(false); + } + return true; + }"; + + $doc->addScriptDeclaration($js); + + return true; + } + + function _displayButtons($name, $buttons) + { + // Load modal popup behavior + JHTML::_('behavior.modal', 'a.modal-button'); + + $args['name'] = $name; + $args['event'] = 'onGetInsertMethod'; + + $return = ''; + $results[] = $this->update($args); + foreach ($results as $result) { + if (is_string($result) && trim($result)) { + $return .= $result; + } + } + + if(!empty($buttons)) + { + $results = $this->_subject->getButtons($name, $buttons); + + /* + * This will allow plugins to attach buttons or change the behavior on the fly using AJAX + */ + $return .= "\n
\n"; + foreach ($results as $button) + { + /* + * Results should be an object + */ + if ( $button->get('name') ) + { + $modal = ($button->get('modal')) ? 'class="modal-button"' : null; + $href = ($button->get('link')) ? 'href="'.JURI::base().$button->get('link').'"' : null; + $onclick = ($button->get('onclick')) ? 'onclick="'.$button->get('onclick').'"' : 'onclick="IeCursorFix(); return false;"'; + $return .= "
get('name')."\">get('text')."\" ".$href." ".$onclick." rel=\"".$button->get('options')."\">".$button->get('text')."
\n"; + } + } + $return .= "
\n"; + } + + return $return; + } + + function _toogleButton($name) + { + $return = ''; + $return .= "\n
\n"; + $return .= "
".JText::_('Toggle editor')."
"; + $return .= "
\n"; + return $return; + } +} diff --git a/oss/joomla/trunk/plugins/editors/tinymce.xml b/oss/joomla/trunk/plugins/editors/tinymce.xml index c2c6c474..53afb467 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce.xml +++ b/oss/joomla/trunk/plugins/editors/tinymce.xml @@ -1,198 +1,202 @@ - - - Editor - TinyMCE 3 - 3.2.4.1 - 2005-2009 - Moxiecode Systems AB - N/A - tinymce.moxiecode.com/ - Moxiecode Systems AB - LGPL - DESCTINYMCE - - tinymce3.php - tinymce3 - - - en-GB.plg_editors_tinymce3.ini - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Editor - TinyMCE 3 + 3.2.6 + 2005-2009 + Moxiecode Systems AB + N/A + tinymce.moxiecode.com/ + Moxiecode Systems AB + LGPL + DESCTINYMCE + + tinymce.php + tinymce + + + en-GB.plg_editors_tinymce.ini + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/_template/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/_template/langs/en.js index 2c340769..1d010058 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/_template/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/_template/langs/en.js @@ -1,8 +1 @@ -// UK lang variables - -/* Remember to namespace the language parameters lang__ */ - -tinyMCE.addToLang('',{ -template_title : 'This is just a template popup', -template_desc : 'This is just a template button' -}); +// UK lang variables/* Remember to namespace the language parameters lang__ *//r//Older tiny2 lang file. Can be deleted diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en.js index 5a01d0eb..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en.js @@ -1,8 +1 @@ -// UK lang variables - -tinyMCE.addToLang('',{ -insert_advhr_desc : 'Horizontal rule', -insert_advhr_width : 'Width', -insert_advhr_size : 'Height', -insert_advhr_noshade : 'No shadow' -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en.js index ffd7e30c..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en.js @@ -1,27 +1 @@ -// UK lang variables - -tinyMCE.addToLang('advimage',{ -tab_general : 'General', -tab_appearance : 'Appearance', -tab_advanced : 'Advanced', -general : 'General', -title : 'Title', -preview : 'Preview', -constrain_proportions : 'Constrain proportions', -langdir : 'Language direction', -langcode : 'Language code', -long_desc : 'Long description link', -style : 'Style', -classes : 'Classes', -ltr : 'Left to right', -rtl : 'Right to left', -id : 'Id', -image_map : 'Image map', -swap_image : 'Swap image', -alt_image : 'Alternative image', -mouseover : 'for mouse over', -mouseout : 'for mouse out', -misc : 'Miscellaneous', -example_img : 'Appearance preview image', -missing_alt : 'Are you sure you want to continue without including an Image Description? Without it the image may not be accessible to some users with disabilities, or to those using a text browser, or browsing the Web with images turned off.' -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en.js index 1d50e4e8..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en.js @@ -1,46 +1 @@ -// UK lang variables - -tinyMCE.addToLang('advlink',{ -general_tab : 'General', -popup_tab : 'Popup', -events_tab : 'Events', -advanced_tab : 'Advanced', -general_props : 'General properties', -popup_props : 'Popup properties', -event_props : 'Events', -advanced_props : 'Advanced properties', -popup_opts : 'Options', -anchor_names : 'Anchors', -target_same : 'Open in this window / frame', -target_parent : 'Open in parent window / frame', -target_top : 'Open in top frame (replaces all frames)', -target_blank : 'Open in new window', -popup : 'Javascript popup', -popup_url : 'Popup URL', -popup_name : 'Window name', -popup_return : 'Insert \'return false\'', -popup_scrollbars : 'Show scrollbars', -popup_statusbar : 'Show status bar', -popup_toolbar : 'Show toolbars', -popup_menubar : 'Show menu bar', -popup_location : 'Show location bar', -popup_resizable : 'Make window resizable', -popup_dependent : 'Dependent (Mozilla/Firefox only)', -popup_size : 'Size', -popup_position : 'Position (X/Y)', -id : 'Id', -style: 'Style', -classes : 'Classes', -target_name : 'Target name', -langdir : 'Language direction', -target_langcode : 'Target language', -langcode : 'Language code', -encoding : 'Target character encoding', -mime : 'Target MIME type', -rel : 'Relationship page to target', -rev : 'Relationship target to page', -tabindex : 'Tabindex', -accesskey : 'Accesskey', -ltr : 'Left to right', -rtl : 'Right to left' -}); \ No newline at end of file +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/autosave/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/autosave/langs/en.js index 01951332..d56c7268 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/autosave/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/autosave/langs/en.js @@ -1,5 +1 @@ -// EN lang variables - -tinyMCE.addToLang('',{ -autosave_unload_msg : 'The changes you made will be lost if you navigate away from this page.' -}); +// EN lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/devkit/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/devkit/langs/en.js index 44356cf0..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/devkit/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/devkit/langs/en.js @@ -1,23 +1 @@ -// UK lang variables - -tinyMCE.addToLang('devkit',{ -title : 'TinyMCE Development Kit', -info_tab : 'Info', -settings_tab : 'Settings', -log_tab : 'Log', -content_tab : 'Content', -command_states_tab : 'Commands', -undo_redo_tab : 'Undo/Redo', -misc_tab : 'Misc', -filter : 'Filter:', -clear_log : 'Clear log', -refresh : 'Refresh', -info_help : 'Press Refresh to view info.', -settings_help : 'Press Refresh to display the settings array for each TinyMCE_Control instance.', -content_help : 'Press Refresh to display the raw and cleaned HTML content for each TinyMCE_Control instance.', -command_states_help : 'Press Refresh to display the current command states from inst.queryCommandState. This list will also mark unsupported commands.', -undo_redo_help : 'Press Refresh to display the global and instance undo/redo levels.', -misc_help : 'Here are various tools for debugging and development purposes.', -debug_events : 'Debug events', -undo_diff : 'Diff undo levels' -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/directionality/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/directionality/langs/en.js index a1db2978..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/directionality/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/directionality/langs/en.js @@ -1,6 +1 @@ -// UK lang variables - -tinyMCE.addToLang('',{ -directionality_ltr_desc : 'Direction left to right', -directionality_rtl_desc : 'Direction right to left' -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en.js index 3cdd6751..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en.js @@ -1,22 +1 @@ -// UK lang variables - -tinyMCE.addToLang('emotions',{ -title : 'Insert emotion', -desc : 'Emotions', -cool : 'Cool', -cry : 'Cry', -embarassed : 'Embarassed', -foot_in_mouth : 'Foot in mouth', -frown : 'Frown', -innocent : 'Innocent', -kiss : 'Kiss', -laughing : 'Laughing', -money_mouth : 'Money mouth', -sealed : 'Sealed', -smile : 'Smile', -surprised : 'Surprised', -tongue_out : 'Tongue out', -undecided : 'Undecided', -wink : 'Wink', -yell : 'Yell' -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/flash/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/flash/langs/en.js index 67272bc9..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/flash/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/flash/langs/en.js @@ -1,11 +1 @@ -// UK lang variables - -tinyMCE.addToLang('flash',{ -title : 'Insert / edit Flash Movie', -desc : 'Insert / edit Flash Movie', -file : 'Flash-File (.swf)', -size : 'Size', -list : 'Flash files', -props : 'Flash properties', -general : 'General' -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js index 89059ef6..dd3a29cf 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js @@ -123,7 +123,7 @@ function init() { // Parse xml and doctype xmlVer = getReItem(/<\?\s*?xml.*?version\s*?=\s*?"(.*?)".*?\?>/gi, h, 1); xmlEnc = getReItem(/<\?\s*?xml.*?encoding\s*?=\s*?"(.*?)".*?\?>/gi, h, 1); - docType = getReItem(/<\!DOCTYPE.*?>/gi, h, 0); + docType = getReItem(/<\!DOCTYPE.*?>/gi, h.replace(/\n/g, ''), 0).replace(/ +/g, ' '); f.langcode.value = getReItem(/lang="(.*?)"/gi, h, 1); // Parse title diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en.js index 1864d3d5..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en.js @@ -1,92 +1 @@ -// UK lang variables - -tinyMCE.addToLang('fullpage',{ - title : 'Document properties', - desc : 'Document properties', - meta_tab : 'General', - appearance_tab : 'Appearance', - advanced_tab : 'Advanced', - meta_props : 'Meta information', - langprops : 'Language and encoding', - meta_title : 'Title', - meta_keywords : 'Keywords', - meta_description : 'Description', - meta_robots : 'Robots', - doctypes : 'Doctype', - langcode : 'Language code', - langdir : 'Language direction', - ltr : 'Left to right', - rtl : 'Right to left', - xml_pi : 'XML declaration', - encoding : 'Character encoding', - appearance_bgprops : 'Background properties', - appearance_marginprops : 'Body margins', - appearance_linkprops : 'Link colors', - appearance_textprops : 'Text properties', - bgcolor : 'Background color', - bgimage : 'Background image', - left_margin : 'Left margin', - right_margin : 'Right margin', - top_margin : 'Top margin', - bottom_margin : 'Bottom margin', - text_color : 'Text color', - font_size : 'Font size', - font_face : 'Font face', - link_color : 'Link color', - hover_color : 'Hover color', - visited_color : 'Visited color', - active_color : 'Active color', - textcolor : 'Color', - fontsize : 'Font size', - fontface : 'Font family', - meta_index_follow : 'Index and follow the links', - meta_index_nofollow : 'Index and don\'t follow the links', - meta_noindex_follow : 'Do not index but follow the links', - meta_noindex_nofollow : 'Do not index and don\'t follow the links', - appearance_style : 'Stylesheet and style properties', - stylesheet : 'Stylesheet', - style : 'Style', - author : 'Author', - copyright : 'Copyright', - add : 'Add new element', - remove : 'Remove selected element', - moveup : 'Move selected element up', - movedown : 'Move selected element down', - head_elements : 'Head elements', - info : 'Information', - info_text : '', - add_title : 'Title element', - add_meta : 'Meta element', - add_script : 'Script element', - add_style : 'Style element', - add_link : 'Link element', - add_base : 'Base element', - add_comment : 'Comment node', - title_element : 'Title element', - script_element : 'Script element', - style_element : 'Style element', - base_element : 'Base element', - link_element : 'Link element', - meta_element : 'Meta element', - comment_element : 'Comment', - src : 'Src', - language : 'Language', - href : 'Href', - target : 'Target', - rel : 'Rel', - type : 'Type', - charset : 'Charset', - defer : 'Defer', - media : 'Media', - properties : 'Properties', - name : 'Name', - value : 'Value', - content : 'Content', - rel : 'Rel', - rev : 'Rev', - hreflang : 'Href lang', - general_props : 'General', - advanced_props : 'Advanced', - delta_width : 0, - delta_height : 0 -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/fullscreen/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/fullscreen/langs/en.js index c5ad4ca9..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/fullscreen/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/fullscreen/langs/en.js @@ -1,5 +1 @@ -// UK lang variables - -tinyMCE.addToLang('',{ -fullscreen_desc : 'Toggle fullscreen mode' -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/iespell/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/iespell/langs/en.js index c3688e94..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/iespell/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/iespell/langs/en.js @@ -1,7 +1 @@ -// UK lang variables - -tinyMCE.addToLang('',{ -iespell_desc : 'Run spell checking', -iespell_download : "ieSpell not detected. Click OK to go to download page." -}); - +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js index 4affad45..07ea477b 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js @@ -1 +1 @@ -(function(){var d=tinymce.DOM,b=tinymce.dom.Element,a=tinymce.dom.Event,e=tinymce.each,c=tinymce.is;tinymce.create("tinymce.plugins.InlinePopups",{init:function(f,g){f.onBeforeRenderUI.add(function(){f.windowManager=new tinymce.InlineWindowManager(f);d.loadCSS(g+"/skins/"+(f.settings.inlinepopups_skin||"clearlooks2")+"/window.css")})},getInfo:function(){return{longname:"InlinePopups",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.create("tinymce.InlineWindowManager:tinymce.WindowManager",{InlineWindowManager:function(f){var g=this;g.parent(f);g.zIndex=300000;g.count=0;g.windows={}},open:function(r,j){var y=this,i,k="",q=y.editor,g=0,s=0,h,m,n,o,l,v,x;r=r||{};j=j||{};if(!r.inline){return y.parent(r,j)}if(!r.type){y.bookmark=q.selection.getBookmark("simple")}i=d.uniqueId();h=d.getViewPort();r.width=parseInt(r.width||320);r.height=parseInt(r.height||240)+(tinymce.isIE?8:0);r.min_width=parseInt(r.min_width||150);r.min_height=parseInt(r.min_height||100);r.max_width=parseInt(r.max_width||2000);r.max_height=parseInt(r.max_height||2000);r.left=r.left||Math.round(Math.max(h.x,h.x+(h.w/2)-(r.width/2)));r.top=r.top||Math.round(Math.max(h.y,h.y+(h.h/2)-(r.height/2)));r.movable=r.resizable=true;j.mce_width=r.width;j.mce_height=r.height;j.mce_inline=true;j.mce_window_id=i;j.mce_auto_focus=r.auto_focus;y.features=r;y.params=j;y.onOpen.dispatch(y,r,j);if(r.type){k+=" mceModal";if(r.type){k+=" mce"+r.type.substring(0,1).toUpperCase()+r.type.substring(1)}r.resizable=false}if(r.statusbar){k+=" mceStatusbar"}if(r.resizable){k+=" mceResizable"}if(r.minimizable){k+=" mceMinimizable"}if(r.maximizable){k+=" mceMaximizable"}if(r.movable){k+=" mceMovable"}y._addAll(d.doc.body,["div",{id:i,"class":q.settings.inlinepopups_skin||"clearlooks2",style:"width:100px;height:100px"},["div",{id:i+"_wrapper","class":"mceWrapper"+k},["div",{id:i+"_top","class":"mceTop"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_title"},r.title||""]],["div",{id:i+"_middle","class":"mceMiddle"},["div",{id:i+"_left","class":"mceLeft"}],["span",{id:i+"_content"}],["div",{id:i+"_right","class":"mceRight"}]],["div",{id:i+"_bottom","class":"mceBottom"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_status"},"Content"]],["a",{"class":"mceMove",tabindex:"-1",href:"javascript:;"}],["a",{"class":"mceMin",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMax",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMed",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceClose",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{id:i+"_resize_n","class":"mceResize mceResizeN",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_s","class":"mceResize mceResizeS",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_w","class":"mceResize mceResizeW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_e","class":"mceResize mceResizeE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_nw","class":"mceResize mceResizeNW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_ne","class":"mceResize mceResizeNE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_sw","class":"mceResize mceResizeSW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_se","class":"mceResize mceResizeSE",tabindex:"-1",href:"javascript:;"}]]]);d.setStyles(i,{top:-10000,left:-10000});if(tinymce.isGecko){d.setStyle(i,"overflow","auto")}if(!r.type){g+=d.get(i+"_left").clientWidth;g+=d.get(i+"_right").clientWidth;s+=d.get(i+"_top").clientHeight;s+=d.get(i+"_bottom").clientHeight}d.setStyles(i,{top:r.top,left:r.left,width:r.width+g,height:r.height+s});x=r.url||r.file;if(x){if(tinymce.relaxedDomain){x+=(x.indexOf("?")==-1?"?":"&")+"mce_rdomain="+tinymce.relaxedDomain}x=tinymce._addVer(x)}if(!r.type){d.add(i+"_content","iframe",{id:i+"_ifr",src:'javascript:""',frameBorder:0,style:"border:0;width:10px;height:10px"});d.setStyles(i+"_ifr",{width:r.width,height:r.height});d.setAttrib(i+"_ifr","src",x)}else{d.add(i+"_wrapper","a",{id:i+"_ok","class":"mceButton mceOk",href:"javascript:;",onmousedown:"return false;"},"Ok");if(r.type=="confirm"){d.add(i+"_wrapper","a",{"class":"mceButton mceCancel",href:"javascript:;",onmousedown:"return false;"},"Cancel")}d.add(i+"_middle","div",{"class":"mceIcon"});d.setHTML(i+"_content",r.content.replace("\n","
"))}n=a.add(i,"mousedown",function(t){var u=t.target,f,p;f=y.windows[i];y.focus(i);if(u.nodeName=="A"||u.nodeName=="a"){if(u.className=="mceMax"){f.oldPos=f.element.getXY();f.oldSize=f.element.getSize();p=d.getViewPort();p.w-=2;p.h-=2;f.element.moveTo(p.x,p.y);f.element.resizeTo(p.w,p.h);d.setStyles(i+"_ifr",{width:p.w-f.deltaWidth,height:p.h-f.deltaHeight});d.addClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMed"){f.element.moveTo(f.oldPos.x,f.oldPos.y);f.element.resizeTo(f.oldSize.w,f.oldSize.h);f.iframeElement.resizeTo(f.oldSize.w-f.deltaWidth,f.oldSize.h-f.deltaHeight);d.removeClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMove"){return y._startDrag(i,t,u.className)}else{if(d.hasClass(u,"mceResize")){return y._startDrag(i,t,u.className.substring(13))}}}}}});o=a.add(i,"click",function(f){var p=f.target;y.focus(i);if(p.nodeName=="A"||p.nodeName=="a"){switch(p.className){case"mceClose":y.close(null,i);return a.cancel(f);case"mceButton mceOk":case"mceButton mceCancel":r.button_func(p.className=="mceButton mceOk");return a.cancel(f)}}});v=y.windows[i]={id:i,mousedown_func:n,click_func:o,element:new b(i,{blocker:1,container:q.getContainer()}),iframeElement:new b(i+"_ifr"),features:r,deltaWidth:g,deltaHeight:s};v.iframeElement.on("focus",function(){y.focus(i)});if(y.count==0&&y.editor.getParam("dialog_type","modal")=="modal"){d.add(d.doc.body,"div",{id:"mceModalBlocker","class":(y.editor.settings.inlinepopups_skin||"clearlooks2")+"_modalBlocker",style:{zIndex:y.zIndex-1}});d.show("mceModalBlocker")}else{d.setStyle("mceModalBlocker","z-index",y.zIndex-1)}if(tinymce.isIE6||/Firefox\/2\./.test(navigator.userAgent)||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceModalBlocker",{position:"absolute",left:h.x,top:h.y,width:h.w-2,height:h.h-2})}y.focus(i);y._fixIELayout(i,1);if(d.get(i+"_ok")){d.get(i+"_ok").focus()}y.count++;return v},focus:function(h){var g=this,f;if(f=g.windows[h]){f.zIndex=this.zIndex++;f.element.setStyle("zIndex",f.zIndex);f.element.update();h=h+"_wrapper";d.removeClass(g.lastId,"mceFocus");d.addClass(h,"mceFocus");g.lastId=h}},_addAll:function(k,h){var g,l,f=this,j=tinymce.DOM;if(c(h,"string")){k.appendChild(j.doc.createTextNode(h))}else{if(h.length){k=k.appendChild(j.create(h[0],h[1]));for(g=2;gf){i=m;f=m.zIndex}});if(i){h.focus(i.id)}}},setTitle:function(f,g){var h;f=this._findId(f);if(h=d.get(f+"_title")){h.innerHTML=d.encode(g)}},alert:function(g,f,j){var i=this,h;h=i.open({title:i,type:"alert",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},confirm:function(g,f,j){var i=this,h;h=i.open({title:i,type:"confirm",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},_findId:function(f){var g=this;if(typeof(f)=="string"){return f}e(g.windows,function(h){var i=d.get(h.id+"_ifr");if(i&&f==i.contentWindow){f=h.id;return false}});return f},_fixIELayout:function(i,h){var f,g;if(!tinymce.isIE6){return}e(["n","s","w","e","nw","ne","sw","se"],function(j){var k=d.get(i+"_resize_"+j);d.setStyles(k,{width:h?k.clientWidth:"",height:h?k.clientHeight:"",cursor:d.getStyle(k,"cursor",1)});d.setStyle(i+"_bottom","bottom","-1px");k=0});if(f=this.windows[i]){f.element.hide();f.element.show();e(d.select("div,a",i),function(k,j){if(k.currentStyle.backgroundImage!="none"){g=new Image();g.src=k.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,"$1")}});d.get(i).style.filter=""}}});tinymce.PluginManager.add("inlinepopups",tinymce.plugins.InlinePopups)})(); \ No newline at end of file +(function(){var d=tinymce.DOM,b=tinymce.dom.Element,a=tinymce.dom.Event,e=tinymce.each,c=tinymce.is;tinymce.create("tinymce.plugins.InlinePopups",{init:function(f,g){f.onBeforeRenderUI.add(function(){f.windowManager=new tinymce.InlineWindowManager(f);d.loadCSS(g+"/skins/"+(f.settings.inlinepopups_skin||"clearlooks2")+"/window.css")})},getInfo:function(){return{longname:"InlinePopups",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.create("tinymce.InlineWindowManager:tinymce.WindowManager",{InlineWindowManager:function(f){var g=this;g.parent(f);g.zIndex=300000;g.count=0;g.windows={}},open:function(r,j){var y=this,i,k="",q=y.editor,g=0,s=0,h,m,n,o,l,v,x;r=r||{};j=j||{};if(!r.inline){return y.parent(r,j)}if(!r.type){y.bookmark=q.selection.getBookmark(1)}i=d.uniqueId();h=d.getViewPort();r.width=parseInt(r.width||320);r.height=parseInt(r.height||240)+(tinymce.isIE?8:0);r.min_width=parseInt(r.min_width||150);r.min_height=parseInt(r.min_height||100);r.max_width=parseInt(r.max_width||2000);r.max_height=parseInt(r.max_height||2000);r.left=r.left||Math.round(Math.max(h.x,h.x+(h.w/2)-(r.width/2)));r.top=r.top||Math.round(Math.max(h.y,h.y+(h.h/2)-(r.height/2)));r.movable=r.resizable=true;j.mce_width=r.width;j.mce_height=r.height;j.mce_inline=true;j.mce_window_id=i;j.mce_auto_focus=r.auto_focus;y.features=r;y.params=j;y.onOpen.dispatch(y,r,j);if(r.type){k+=" mceModal";if(r.type){k+=" mce"+r.type.substring(0,1).toUpperCase()+r.type.substring(1)}r.resizable=false}if(r.statusbar){k+=" mceStatusbar"}if(r.resizable){k+=" mceResizable"}if(r.minimizable){k+=" mceMinimizable"}if(r.maximizable){k+=" mceMaximizable"}if(r.movable){k+=" mceMovable"}y._addAll(d.doc.body,["div",{id:i,"class":q.settings.inlinepopups_skin||"clearlooks2",style:"width:100px;height:100px"},["div",{id:i+"_wrapper","class":"mceWrapper"+k},["div",{id:i+"_top","class":"mceTop"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_title"},r.title||""]],["div",{id:i+"_middle","class":"mceMiddle"},["div",{id:i+"_left","class":"mceLeft"}],["span",{id:i+"_content"}],["div",{id:i+"_right","class":"mceRight"}]],["div",{id:i+"_bottom","class":"mceBottom"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_status"},"Content"]],["a",{"class":"mceMove",tabindex:"-1",href:"javascript:;"}],["a",{"class":"mceMin",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMax",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMed",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceClose",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{id:i+"_resize_n","class":"mceResize mceResizeN",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_s","class":"mceResize mceResizeS",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_w","class":"mceResize mceResizeW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_e","class":"mceResize mceResizeE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_nw","class":"mceResize mceResizeNW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_ne","class":"mceResize mceResizeNE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_sw","class":"mceResize mceResizeSW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_se","class":"mceResize mceResizeSE",tabindex:"-1",href:"javascript:;"}]]]);d.setStyles(i,{top:-10000,left:-10000});if(tinymce.isGecko){d.setStyle(i,"overflow","auto")}if(!r.type){g+=d.get(i+"_left").clientWidth;g+=d.get(i+"_right").clientWidth;s+=d.get(i+"_top").clientHeight;s+=d.get(i+"_bottom").clientHeight}d.setStyles(i,{top:r.top,left:r.left,width:r.width+g,height:r.height+s});x=r.url||r.file;if(x){if(tinymce.relaxedDomain){x+=(x.indexOf("?")==-1?"?":"&")+"mce_rdomain="+tinymce.relaxedDomain}x=tinymce._addVer(x)}if(!r.type){d.add(i+"_content","iframe",{id:i+"_ifr",src:'javascript:""',frameBorder:0,style:"border:0;width:10px;height:10px"});d.setStyles(i+"_ifr",{width:r.width,height:r.height});d.setAttrib(i+"_ifr","src",x)}else{d.add(i+"_wrapper","a",{id:i+"_ok","class":"mceButton mceOk",href:"javascript:;",onmousedown:"return false;"},"Ok");if(r.type=="confirm"){d.add(i+"_wrapper","a",{"class":"mceButton mceCancel",href:"javascript:;",onmousedown:"return false;"},"Cancel")}d.add(i+"_middle","div",{"class":"mceIcon"});d.setHTML(i+"_content",r.content.replace("\n","
"))}n=a.add(i,"mousedown",function(t){var u=t.target,f,p;f=y.windows[i];y.focus(i);if(u.nodeName=="A"||u.nodeName=="a"){if(u.className=="mceMax"){f.oldPos=f.element.getXY();f.oldSize=f.element.getSize();p=d.getViewPort();p.w-=2;p.h-=2;f.element.moveTo(p.x,p.y);f.element.resizeTo(p.w,p.h);d.setStyles(i+"_ifr",{width:p.w-f.deltaWidth,height:p.h-f.deltaHeight});d.addClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMed"){f.element.moveTo(f.oldPos.x,f.oldPos.y);f.element.resizeTo(f.oldSize.w,f.oldSize.h);f.iframeElement.resizeTo(f.oldSize.w-f.deltaWidth,f.oldSize.h-f.deltaHeight);d.removeClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMove"){return y._startDrag(i,t,u.className)}else{if(d.hasClass(u,"mceResize")){return y._startDrag(i,t,u.className.substring(13))}}}}}});o=a.add(i,"click",function(f){var p=f.target;y.focus(i);if(p.nodeName=="A"||p.nodeName=="a"){switch(p.className){case"mceClose":y.close(null,i);return a.cancel(f);case"mceButton mceOk":case"mceButton mceCancel":r.button_func(p.className=="mceButton mceOk");return a.cancel(f)}}});v=y.windows[i]={id:i,mousedown_func:n,click_func:o,element:new b(i,{blocker:1,container:q.getContainer()}),iframeElement:new b(i+"_ifr"),features:r,deltaWidth:g,deltaHeight:s};v.iframeElement.on("focus",function(){y.focus(i)});if(y.count==0&&y.editor.getParam("dialog_type","modal")=="modal"){d.add(d.doc.body,"div",{id:"mceModalBlocker","class":(y.editor.settings.inlinepopups_skin||"clearlooks2")+"_modalBlocker",style:{zIndex:y.zIndex-1}});d.show("mceModalBlocker")}else{d.setStyle("mceModalBlocker","z-index",y.zIndex-1)}if(tinymce.isIE6||/Firefox\/2\./.test(navigator.userAgent)||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceModalBlocker",{position:"absolute",left:h.x,top:h.y,width:h.w-2,height:h.h-2})}y.focus(i);y._fixIELayout(i,1);if(d.get(i+"_ok")){d.get(i+"_ok").focus()}y.count++;return v},focus:function(h){var g=this,f;if(f=g.windows[h]){f.zIndex=this.zIndex++;f.element.setStyle("zIndex",f.zIndex);f.element.update();h=h+"_wrapper";d.removeClass(g.lastId,"mceFocus");d.addClass(h,"mceFocus");g.lastId=h}},_addAll:function(k,h){var g,l,f=this,j=tinymce.DOM;if(c(h,"string")){k.appendChild(j.doc.createTextNode(h))}else{if(h.length){k=k.appendChild(j.create(h[0],h[1]));for(g=2;gf){i=m;f=m.zIndex}});if(i){h.focus(i.id)}}},setTitle:function(f,g){var h;f=this._findId(f);if(h=d.get(f+"_title")){h.innerHTML=d.encode(g)}},alert:function(g,f,j){var i=this,h;h=i.open({title:i,type:"alert",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},confirm:function(g,f,j){var i=this,h;h=i.open({title:i,type:"confirm",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},_findId:function(f){var g=this;if(typeof(f)=="string"){return f}e(g.windows,function(h){var i=d.get(h.id+"_ifr");if(i&&f==i.contentWindow){f=h.id;return false}});return f},_fixIELayout:function(i,h){var f,g;if(!tinymce.isIE6){return}e(["n","s","w","e","nw","ne","sw","se"],function(j){var k=d.get(i+"_resize_"+j);d.setStyles(k,{width:h?k.clientWidth:"",height:h?k.clientHeight:"",cursor:d.getStyle(k,"cursor",1)});d.setStyle(i+"_bottom","bottom","-1px");k=0});if(f=this.windows[i]){f.element.hide();f.element.show();e(d.select("div,a",i),function(k,j){if(k.currentStyle.backgroundImage!="none"){g=new Image();g.src=k.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,"$1")}});d.get(i).style.filter=""}}});tinymce.PluginManager.add("inlinepopups",tinymce.plugins.InlinePopups)})(); \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js index a002bc51..fffca5ab 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js @@ -1,5 +1,5 @@ /** - * $Id: editor_plugin_src.js 999 2009-02-10 17:42:58Z spocke $ + * $Id: editor_plugin_src.js 1150 2009-06-01 11:50:46Z spocke $ * * @author Moxiecode * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved. @@ -50,7 +50,7 @@ // Only store selection if the type is a normal window if (!f.type) - t.bookmark = ed.selection.getBookmark('simple'); + t.bookmark = ed.selection.getBookmark(1); id = DOM.uniqueId(); vp = DOM.getViewPort(); diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/insertdatetime/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/insertdatetime/langs/en.js index c3ec02bf..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/insertdatetime/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/insertdatetime/langs/en.js @@ -1,12 +1 @@ -// UK lang variables - -tinyMCE.addToLang('',{ -insertdate_def_fmt : '%Y-%m-%d', -inserttime_def_fmt : '%H:%M:%S', -insertdate_desc : 'Insert date', -inserttime_desc : 'Insert time', -inserttime_months_long : new Array("January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"), -inserttime_months_short : new Array("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"), -inserttime_day_long : new Array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"), -inserttime_day_short : new Array("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun") -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/layer/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/layer/langs/en.js index cdd8c22b..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/layer/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/layer/langs/en.js @@ -1,9 +1 @@ -// UK lang variables - -tinyMCE.addToLang('layer',{ -insertlayer_desc : 'Insert new layer', -forward_desc : 'Move forward', -backward_desc : 'Move backward', -absolute_desc : 'Toggle absolute positioning', -content : 'New layer...' -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/media/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/media/langs/en.js index ced19672..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/media/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/media/langs/en.js @@ -1,94 +1 @@ -// UK lang variables - -tinyMCE.addToLang('media',{ -title : 'Insert / edit embedded media', -desc : 'Insert / edit embedded media', -general : 'General', -advanced : 'Advanced', -file : 'File/URL', -list : 'List', -size : 'Dimensions', -preview : 'Preview', -constrain_proportions : 'Constrain proportions', -type : 'Type', -id : 'Id', -name : 'Name', -class_name : 'Class', -vspace : 'V-Space', -hspace : 'H-Space', -play : 'Auto play', -loop : 'Loop', -menu : 'Show menu', -quality : 'Quality', -scale : 'Scale', -align : 'Align', -salign : 'SAlign', -wmode : 'WMode', -bgcolor : 'Background', -base : 'Base', -flashvars : 'Flashvars', -liveconnect : 'SWLiveConnect', -autohref : 'AutoHREF', -cache : 'Cache', -hidden : 'Hidden', -controller : 'Controller', -kioskmode : 'Kiosk mode', -playeveryframe : 'Play every frame', -targetcache : 'Target cache', -correction : 'No correction', -enablejavascript : 'Enable JavaScript', -starttime : 'Start time', -endtime : 'End time', -href : 'Href', -qtsrcchokespeed : 'Choke speed', -target : 'Target', -volume : 'Volume', -autostart : 'Auto start', -enabled : 'Enabled', -fullscreen : 'Fullscreen', -invokeurls : 'Invoke URLs', -mute : 'Mute', -stretchtofit : 'Stretch to fit', -windowlessvideo : 'Windowless video', -balance : 'Balance', -baseurl : 'Base URL', -captioningid : 'Captioning id', -currentmarker : 'Current marker', -currentposition : 'Current position', -defaultframe : 'Default frame', -playcount : 'Play count', -rate : 'Rate', -uimode : 'UI Mode', -flash_options : 'Flash options', -qt_options : 'Quicktime options', -wmp_options : 'Windows media player options', -rmp_options : 'Real media player options', -shockwave_options : 'Shockwave options', -autogotourl : 'Auto goto URL', -center : 'Center', -imagestatus : 'Image status', -maintainaspect : 'Maintain aspect', -nojava : 'No java', -prefetch : 'Prefetch', -shuffle : 'Shuffle', -console : 'Console', -numloop : 'Num loops', -controls : 'Controls', -scriptcallbacks : 'Script callbacks', -swstretchstyle : 'Stretch style', -swstretchhalign : 'Stretch H-Align', -swstretchvalign : 'Stretch V-Align', -sound : 'Sound', -progress : 'Progress', -qtsrc : 'QT Src', -qt_stream_warn : 'Streamed rtsp resources should be added to the QT Src field under the advanced tab.\nYou should also add a non streamed version to the Src field..', -align_top : 'Top', -align_right : 'Right', -align_bottom : 'Bottom', -align_left : 'Left', -align_center : 'Center', -align_top_left : 'Top left', -align_top_right : 'Top right', -align_bottom_left : 'Bottom left', -align_bottom_right : 'Bottom right' -}); \ No newline at end of file +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/nonbreaking/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/nonbreaking/langs/en.js index fd49a646..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/nonbreaking/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/nonbreaking/langs/en.js @@ -1,5 +1 @@ -// UK lang variables - -tinyMCE.addToLang('nonbreaking',{ -desc : 'Insert non-breaking space character' -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js index e0e51b5b..473bb854 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js @@ -1 +1 @@ -(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.PastePlugin",{init:function(c,d){var e=this,b;e.editor=c;e.url=d;e.onPreProcess=new tinymce.util.Dispatcher(e);e.onPostProcess=new tinymce.util.Dispatcher(e);e.onPreProcess.add(e._preProcess);e.onPostProcess.add(e._postProcess);e.onPreProcess.add(function(h,i){c.execCallback("paste_preprocess",h,i)});e.onPostProcess.add(function(h,i){c.execCallback("paste_postprocess",h,i)});function g(i){var k=c.dom,j={content:i};e.onPreProcess.dispatch(e,j);j.node=k.create("div",0,j.content);e.onPostProcess.dispatch(e,j);j.content=c.serializer.serialize(j.node,{getInner:1});if(/<(p|h[1-6]|ul|ol)/.test(j.content)){e._insertBlockContent(c,k,j.content)}else{e._insert(j.content)}}c.addCommand("mceInsertClipboardContent",function(i,h){g(h)});function f(l){var p,k,i,j=c.selection,o=c.dom,h=c.getBody(),m;if(o.get("_mcePaste")){return}p=o.add(h,"div",{id:"_mcePaste"}," ");if(h!=c.getDoc().body){m=o.getPos(c.selection.getStart(),h).y}else{m=h.scrollTop}o.setStyles(p,{position:"absolute",left:-10000,top:m,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){i=o.doc.body.createTextRange();i.moveToElementText(p);i.execCommand("Paste");o.remove(p);g(p.innerHTML);return tinymce.dom.Event.cancel(l)}else{k=c.selection.getRng();p=p.firstChild;i=c.getDoc().createRange();i.setStart(p,0);i.setEnd(p,1);j.setRng(i);window.setTimeout(function(){var r=o.get("_mcePaste"),q;r.id="_mceRemoved";o.remove(r);r=o.get("_mcePaste")||r;q=(o.select("> span.Apple-style-span div",r)[0]||o.select("> span.Apple-style-span",r)[0]||r).innerHTML;o.remove(r);if(k){j.setRng(k)}g(q)},0)}}if(c.getParam("paste_auto_cleanup_on_paste",true)){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){c.onKeyDown.add(function(h,i){if(((tinymce.isMac?i.metaKey:i.ctrlKey)&&i.keyCode==86)||(i.shiftKey&&i.keyCode==45)){f(i)}})}else{c.onPaste.addToTop(function(h,i){return f(i)})}}if(c.getParam("paste_block_drop")){c.onInit.add(function(){c.dom.bind(c.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(h){h.preventDefault();h.stopPropagation();return false})})}e._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(d,g){var b=this.editor,c=g.content,f,e;function f(h){a(h,function(i){if(i.constructor==RegExp){c=c.replace(i,"")}else{c=c.replace(i[0],i[1])}})}f([/^\s*( )+/g,/( |]*>)+\s*$/g]);if(/(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/.test(c)){g.wordContent=true;if(b.getParam("paste_convert_middot_lists",true)){f([[//gi,"$&__MCE_ITEM__"],[/(]+:\s*symbol[^>]+>)/gi,"$1__MCE_ITEM__"],[/(]+mso-list:[^>]+>)/gi,"$1__MCE_ITEM__"]])}f([//gi,/<\/?(img|font|meta|link|style|div|v:\w+)[^>]*>/gi,/<\\?\?xml[^>]*>/gi,/<\/?o:[^>]*>/gi,/ (id|name|language|type|on\w+|v:\w+)=\"([^\"]*)\"/gi,/ (id|name|language|type|on\w+|v:\w+)=(\w+)/gi,[/<(\/?)s>/gi,"<$1strike>"],/]+>[\s\S]*?<\/script>/gi,[/ /g,"\u00a0"]]);if(!b.getParam("paste_retain_style_properties")){f([/<\/?(span)[^>]*>/gi])}}e=b.getParam("paste_strip_class_attributes","all");if(e!="none"){if(e=="all"){f([/ class=\"([^\"]*)\"/gi,/ class=(\w+)/gi])}else{f([/ class=\"(mso[^\"]*)\"/gi,/ class=(mso\w+)/gi])}}if(b.getParam("paste_remove_spans")){f([/<\/?(span)[^>]*>/gi])}g.content=c},_postProcess:function(e,g){var d=this,c=d.editor,f=c.dom,b;if(g.wordContent){a(f.select("a",g.node),function(h){if(!h.href||h.href.indexOf("#_Toc")!=-1){f.remove(h,1)}});if(d.editor.getParam("paste_convert_middot_lists",true)){d._convertLists(e,g)}b=c.getParam("paste_retain_style_properties");if(tinymce.is(b,"string")){b=tinymce.explode(b)}a(f.select("*",g.node),function(l){var m={},j=0,k,n,h;if(b){for(k=0;k0){f.setStyles(l,m)}else{if(l.nodeName=="SPAN"&&!l.className){f.remove(l,true)}}})}if(c.getParam("paste_remove_styles")||(c.getParam("paste_remove_styles_if_webkit")&&tinymce.isWebKit)){a(f.select("*[style]",g.node),function(h){h.removeAttribute("style");h.removeAttribute("mce_style")})}else{if(tinymce.isWebKit){a(f.select("*",g.node),function(h){h.removeAttribute("mce_style")})}}},_convertLists:function(e,c){var g=e.editor.dom,f,j,b=-1,d,k=[],i,h;a(g.select("p",c.node),function(r){var n,s="",q,o,l,m;for(n=r.firstChild;n&&n.nodeType==3;n=n.nextSibling){s+=n.nodeValue}s=r.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/ /g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o]\s*\u00a0*/.test(s)){q="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0{2,}/.test(s)){q="ol"}if(q){d=parseFloat(r.style.marginLeft||0);if(d>b){k.push(d)}if(!f||q!=i){f=g.create(q);g.insertAfter(f,r)}else{if(d>b){f=j.appendChild(g.create(q))}else{if(d]*>/gi,"");if(q=="ul"&&/^[\u2022\u00b7\u00a7\u00d8o]/.test(p)){g.remove(t)}else{if(/^[\s\S]*\w+\.( |\u00a0)*\s*/.test(p)){g.remove(t)}}});o=r.innerHTML;if(q=="ul"){o=r.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o]\s*( |\u00a0)+\s*/,"")}else{o=r.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*\w+\.( |\u00a0)+\s*/,"")}j=f.appendChild(g.create("li",0,o));g.remove(r);b=d;i=q}else{f=b=0}});h=c.node.innerHTML;if(h.indexOf("__MCE_ITEM__")!=-1){c.node.innerHTML=h.replace(/__MCE_ITEM__/g,"")}},_insertBlockContent:function(h,e,i){var c,g,d=h.selection,m,j,b,k,f;function l(p){var o;if(tinymce.isIE){o=h.getDoc().body.createTextRange();o.moveToElementText(p);o.collapse(false);o.select()}else{d.select(p,1);d.collapse(false)}}this._insert(' ',1);g=e.get("_marker");c=e.getParent(g,"p,h1,h2,h3,h4,h5,h6,ul,ol");if(c){g=e.split(c,g);a(e.create("div",0,i).childNodes,function(o){m=g.parentNode.insertBefore(o.cloneNode(true),g)});l(m)}else{e.setOuterHTML(g,i);d.select(h.getBody(),1);d.collapse(0)}e.remove("_marker");j=d.getStart();b=e.getViewPort(h.getWin());k=h.dom.getPos(j).y;f=j.clientHeight;if(kb.y+b.h){h.getDoc().body.scrollTop=k span.Apple-style-span div",q)[0]||o.select("> span.Apple-style-span",q)[0]||q).innerHTML;o.remove(q)});if(k){j.setRng(k)}g({content:n})},0)}}if(c.getParam("paste_auto_cleanup_on_paste",true)){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){c.onKeyDown.add(function(h,i){if(((tinymce.isMac?i.metaKey:i.ctrlKey)&&i.keyCode==86)||(i.shiftKey&&i.keyCode==45)){f(i)}})}else{c.onPaste.addToTop(function(h,i){return f(i)})}}if(c.getParam("paste_block_drop")){c.onInit.add(function(){c.dom.bind(c.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(h){h.preventDefault();h.stopPropagation();return false})})}e._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(d,g){var b=this.editor,c=g.content,f,e;function f(h){a(h,function(i){if(i.constructor==RegExp){c=c.replace(i,"")}else{c=c.replace(i[0],i[1])}})}if(/(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/.test(c)||g.wordContent){g.wordContent=true;f([/^\s*( )+/g,/( |]*>)+\s*$/g]);if(b.getParam("paste_convert_middot_lists",true)){f([[//gi,"$&__MCE_ITEM__"],[/(]+:\s*symbol[^>]+>)/gi,"$1__MCE_ITEM__"],[/(]+mso-list:[^>]+>)/gi,"$1__MCE_ITEM__"]])}f([//gi,/<\/?(img|font|meta|link|style|div|v:\w+)[^>]*>/gi,/<\\?\?xml[^>]*>/gi,/<\/?o:[^>]*>/gi,/ (id|name|language|type|on\w+|v:\w+)=\"([^\"]*)\"/gi,/ (id|name|language|type|on\w+|v:\w+)=(\w+)/gi,[/<(\/?)s>/gi,"<$1strike>"],/]+>[\s\S]*?<\/script>/gi,[/ /g,"\u00a0"]]);if(!b.getParam("paste_retain_style_properties")){f([/<\/?(span)[^>]*>/gi])}}e=b.getParam("paste_strip_class_attributes","all");if(e!="none"){if(e=="all"){f([/ class=\"([^\"]*)\"/gi,/ class=(\w+)/gi])}else{f([/ class=\"(mso[^\"]*)\"/gi,/ class=(mso\w+)/gi])}}if(b.getParam("paste_remove_spans")){f([/<\/?(span)[^>]*>/gi])}g.content=c},_postProcess:function(e,g){var d=this,c=d.editor,f=c.dom,b;if(g.wordContent){a(f.select("a",g.node),function(h){if(!h.href||h.href.indexOf("#_Toc")!=-1){f.remove(h,1)}});if(d.editor.getParam("paste_convert_middot_lists",true)){d._convertLists(e,g)}b=c.getParam("paste_retain_style_properties");if(tinymce.is(b,"string")){b=tinymce.explode(b)}a(f.select("*",g.node),function(l){var m={},j=0,k,n,h;if(b){for(k=0;k0){f.setStyles(l,m)}else{if(l.nodeName=="SPAN"&&!l.className){f.remove(l,true)}}})}if(c.getParam("paste_remove_styles")||(c.getParam("paste_remove_styles_if_webkit")&&tinymce.isWebKit)){a(f.select("*[style]",g.node),function(h){h.removeAttribute("style");h.removeAttribute("mce_style")})}else{if(tinymce.isWebKit){a(f.select("*",g.node),function(h){h.removeAttribute("mce_style")})}}},_convertLists:function(e,c){var g=e.editor.dom,f,j,b=-1,d,k=[],i,h;a(g.select("p",c.node),function(r){var n,s="",q,o,l,m;for(n=r.firstChild;n&&n.nodeType==3;n=n.nextSibling){s+=n.nodeValue}s=r.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/ /g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o]\s*\u00a0*/.test(s)){q="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0{2,}/.test(s)){q="ol"}if(q){d=parseFloat(r.style.marginLeft||0);if(d>b){k.push(d)}if(!f||q!=i){f=g.create(q);g.insertAfter(f,r)}else{if(d>b){f=j.appendChild(g.create(q))}else{if(d]*>/gi,"");if(q=="ul"&&/^[\u2022\u00b7\u00a7\u00d8o]/.test(p)){g.remove(t)}else{if(/^[\s\S]*\w+\.( |\u00a0)*\s*/.test(p)){g.remove(t)}}});o=r.innerHTML;if(q=="ul"){o=r.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o]\s*( |\u00a0)+\s*/,"")}else{o=r.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*\w+\.( |\u00a0)+\s*/,"")}j=f.appendChild(g.create("li",0,o));g.remove(r);b=d;i=q}else{f=b=0}});h=c.node.innerHTML;if(h.indexOf("__MCE_ITEM__")!=-1){c.node.innerHTML=h.replace(/__MCE_ITEM__/g,"")}},_insertBlockContent:function(h,e,i){var c,g,d=h.selection,m,j,b,k,f;function l(p){var o;if(tinymce.isIE){o=h.getDoc().body.createTextRange();o.moveToElementText(p);o.collapse(false);o.select()}else{d.select(p,1);d.collapse(false)}}this._insert(' ',1);g=e.get("_marker");c=e.getParent(g,"p,h1,h2,h3,h4,h5,h6,ul,ol,th,td");if(c&&!/TD|TH/.test(c.nodeName)){g=e.split(c,g);a(e.create("div",0,i).childNodes,function(o){m=g.parentNode.insertBefore(o.cloneNode(true),g)});l(m)}else{e.setOuterHTML(g,i);d.select(h.getBody(),1);d.collapse(0)}e.remove("_marker");j=d.getStart();b=e.getViewPort(h.getWin());k=h.dom.getPos(j).y;f=j.clientHeight;if(kb.y+b.h){h.getDoc().body.scrollTop=k span.Apple-style-span div', n)[0] || dom.select('> span.Apple-style-span', n)[0] || n).innerHTML; - - // Remove hidden div and restore selection - dom.remove(n); + // WebKit will split the div into multiple ones so this will loop through then all and join them to get the whole HTML string + each(dom.select('div[id=_mcePaste]').reverse(), function(n) { + h += (dom.select('> span.Apple-style-span div', n)[0] || dom.select('> span.Apple-style-span', n)[0] || n).innerHTML; + dom.remove(n); + }); // Restore the old selection if (or) sel.setRng(or); - process(h); + process({content : h}); }, 0); } }; @@ -195,17 +194,17 @@ }); }; - // Process away some basic content - process([ - /^\s*( )+/g, // nbsp entities at the start of contents - /( |]*>)+\s*$/g // nbsp entities at the end of contents - ]); - // Detect Word content and process it more aggressive - if (/(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/.test(h)) { + if (/(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/.test(h) || o.wordContent) { o.wordContent = true; // Mark the pasted contents as word specific content //console.log('Word contents detected.'); + // Process away some basic content + process([ + /^\s*( )+/g, // nbsp entities at the start of contents + /( |]*>)+\s*$/g // nbsp entities at the end of contents + ]); + if (ed.getParam('paste_convert_middot_lists', true)) { process([ [//gi, '$&__MCE_ITEM__'], // Convert supportLists to a list item marker @@ -436,9 +435,10 @@ // Insert a marker for the caret position this._insert(' ', 1); marker = dom.get('_marker'); - parentBlock = dom.getParent(marker, 'p,h1,h2,h3,h4,h5,h6,ul,ol'); + parentBlock = dom.getParent(marker, 'p,h1,h2,h3,h4,h5,h6,ul,ol,th,td'); - if (parentBlock) { + // If it's a parent block but not a table cell + if (parentBlock && !/TD|TH/.test(parentBlock.nodeName)) { // Split parent block marker = dom.split(parentBlock, marker); diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js index 303439b3..c524f9eb 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js @@ -19,7 +19,7 @@ var PasteTextDialog = { } } - tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, h); + tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, {content : h}); tinyMCEPopup.close(); }, diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js index 1aecdc1b..a52731c3 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js @@ -13,7 +13,7 @@ var PasteWordDialog = { css = [ed.baseURI.toAbsolute("themes/" + ed.settings.theme + "/skins/" + ed.settings.skin + "/content.css")]; css = css.concat(tinymce.explode(ed.settings.content_css) || []); tinymce.each(css, function(u) { - cssHTML += ''; + cssHTML += ''; }); // Write content into iframe @@ -32,7 +32,7 @@ var PasteWordDialog = { insert : function() { var h = document.getElementById('iframe').contentWindow.document.body.innerHTML; - tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, h); + tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, {content : h, wordContent : true}); tinyMCEPopup.close(); }, diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/langs/en.js index b125d511..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/langs/en.js @@ -1,10 +1 @@ -// UK lang variables - -tinyMCE.addToLang('',{ -paste_text_desc : 'Paste as Plain Text', -paste_text_title : 'Use CTRL+V on your keyboard to paste the text into the window.', -paste_text_linebreaks : 'Keep linebreaks', -paste_word_desc : 'Paste from Word', -paste_word_title : 'Use CTRL+V on your keyboard to paste the text into the window.', -selectall_desc : 'Select All' -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/preview/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/preview/langs/en.js index b68b6751..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/preview/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/preview/langs/en.js @@ -1,5 +1 @@ -// UK lang variables - -tinyMCE.addToLang('',{ -preview_desc : 'Preview' -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/print/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/print/langs/en.js index 6407cdb8..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/print/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/print/langs/en.js @@ -1,5 +1 @@ -// UK lang variables - -tinyMCE.addToLang('',{ -print_desc : 'Print' -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/save/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/save/langs/en.js index 77930887..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/save/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/save/langs/en.js @@ -1,6 +1 @@ -// UK lang variables - -tinyMCE.addToLang('',{ -save_desc : 'Save', -cancel_desc : 'Cancel all changes' -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en.js index 32af8282..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en.js @@ -1,21 +1 @@ -// UK lang variables - -tinyMCE.addToLang('',{ -searchreplace_search_desc : 'Find', -searchreplace_searchnext_desc : 'Find again', -searchreplace_replace_desc : 'Find/Replace', -searchreplace_notfound : 'The search has been completed. The search string could not be found.', -searchreplace_search_title : 'Find', -searchreplace_replace_title : 'Find/Replace', -searchreplace_allreplaced : 'All occurrences of the search string were replaced.', -searchreplace_findwhat : 'Find what', -searchreplace_replacewith : 'Replace with', -searchreplace_direction : 'Direction', -searchreplace_up : 'Up', -searchreplace_down : 'Down', -searchreplace_case : 'Match case', -searchreplace_findnext : 'Find next', -searchreplace_replace : 'Replace', -searchreplace_replaceall : 'Replace all', -searchreplace_cancel : 'Cancel' -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/style/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/style/langs/en.js index 6bed70f7..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/style/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/style/langs/en.js @@ -1,66 +1 @@ -// UK lang variables - -tinyMCE.addToLang('style',{ -title : 'Edit CSS Style', -styleinfo_desc : 'Edit CSS Style', -apply : 'Apply', -text_tab : 'Text', -background_tab : 'Background', -block_tab : 'Block', -box_tab : 'Box', -border_tab : 'Border', -list_tab : 'List', -positioning_tab : 'Positioning', -text_props : 'Text', -text_font : 'Font', -text_size : 'Size', -text_weight : 'Weight', -text_style : 'Style', -text_variant : 'Variant', -text_lineheight : 'Line height', -text_case : 'Case', -text_color : 'Color', -text_decoration : 'Decoration', -text_overline : 'overline', -text_underline : 'underline', -text_striketrough : 'strikethrough', -text_blink : 'blink', -text_none : 'none', -background_color : 'Background color', -background_image : 'Background image', -background_repeat : 'Repeat', -background_attachment : 'Attachment', -background_hpos : 'Horizontal position', -background_vpos : 'Vertical position', -block_wordspacing : 'Word spacing', -block_letterspacing : 'Letter spacing', -block_vertical_alignment : 'Vertical alignment', -block_text_align : 'Text align', -block_text_indent : 'Text indent', -block_whitespace : 'Whitespace', -block_display : 'Display', -box_width : 'Width', -box_height : 'Height', -box_float : 'Float', -box_clear : 'Clear', -padding : 'Padding', -same : 'Same for all', -top : 'Top', -right : 'Right', -bottom : 'Bottom', -left : 'Left', -margin : 'Margin', -style : 'Style', -width : 'Width', -height : 'Height', -color : 'Color', -list_type : 'Type', -bullet_image : 'Bullet image', -position : 'Position', -positioning_type : 'Type', -visibility : 'Visibility', -zindex : 'Z-index', -overflow : 'Overflow', -placement : 'Placement', -clip : 'Clip' -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js index 95d599e9..ab105382 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js @@ -1 +1 @@ -(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.TablePlugin",{init:function(b,c){var d=this;d.editor=b;d.url=c;a([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(e){b.addButton(e[0],{title:e[1],cmd:e[2],ui:e[3]})});if(b.getParam("inline_styles")){b.onPreProcess.add(function(e,g){var f=e.dom;a(f.select("table",g.node),function(i){var h;if(h=f.getAttrib(i,"width")){f.setStyle(i,"width",h);f.setAttrib(i,"width")}if(h=f.getAttrib(i,"height")){f.setStyle(i,"height",h);f.setAttrib(i,"height")}})})}b.onInit.add(function(){if(b&&b.plugins.contextmenu){b.plugins.contextmenu.onContextMenu.add(function(h,f,j){var k,i=b.selection,g=i.getNode()||b.getBody();if(b.dom.getParent(j,"td")||b.dom.getParent(j,"th")){f.removeAll();if(g.nodeName=="A"&&!b.dom.getAttrib(g,"name")){f.add({title:"advanced.link_desc",icon:"link",cmd:b.plugins.advlink?"mceAdvLink":"mceLink",ui:true});f.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});f.addSeparator()}if(g.nodeName=="IMG"&&g.className.indexOf("mceItem")==-1){f.add({title:"advanced.image_desc",icon:"image",cmd:b.plugins.advimage?"mceAdvImage":"mceImage",ui:true});f.addSeparator()}f.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",ui:true,value:{action:"insert"}});f.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable",ui:true});f.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete",ui:true});f.addSeparator();k=f.addMenu({title:"table.cell"});k.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps",ui:true});k.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells",ui:true});k.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells",ui:true});k=f.addMenu({title:"table.row"});k.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps",ui:true});k.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});k.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});k.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});k.addSeparator();k.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});k.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});k.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"});k.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"});k=f.addMenu({title:"table.col"});k.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});k.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});k.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{f.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",ui:true})}})}});b.onKeyDown.add(function(f,g){if(g.keyCode==9&&f.dom.getParent(f.selection.getNode(),"TABLE")){if(!tinymce.isGecko&&!tinymce.isOpera){tinyMCE.execInstanceCommand(f.editorId,"mceTableMoveToNextRow",true);return tinymce.dom.Event.cancel(g)}f.undoManager.add()}});if(!tinymce.isIE){if(b.getParam("table_selection",true)){b.onClick.add(function(f,g){g=g.target;if(g.nodeName==="TABLE"){f.selection.select(g)}})}}b.onNodeChange.add(function(f,e,h){var g=f.dom.getParent(h,"td,th,caption");e.setActive("table",h.nodeName==="TABLE"||!!g);if(g&&g.nodeName==="CAPTION"){g=null}e.setDisabled("delete_table",!g);e.setDisabled("delete_col",!g);e.setDisabled("delete_table",!g);e.setDisabled("delete_row",!g);e.setDisabled("col_after",!g);e.setDisabled("col_before",!g);e.setDisabled("row_after",!g);e.setDisabled("row_before",!g);e.setDisabled("row_props",!g);e.setDisabled("cell_props",!g);e.setDisabled("split_cells",!g||(parseInt(f.dom.getAttrib(g,"colspan","1"))<2&&parseInt(f.dom.getAttrib(g,"rowspan","1"))<2));e.setDisabled("merge_cells",!g)});if(!tinymce.isIE){b.onBeforeSetContent.add(function(e,f){if(f.initial){f.content=f.content.replace(/<(td|th)([^>]+|)>\s*<\/(td|th)>/g,tinymce.isOpera?"<$1$2> ":'<$1$2>
')}})}},execCommand:function(f,e,g){var d=this.editor,c;switch(f){case"mceTableMoveToNextRow":case"mceInsertTable":case"mceTableRowProps":case"mceTableCellProps":case"mceTableSplitCells":case"mceTableMergeCells":case"mceTableInsertRowBefore":case"mceTableInsertRowAfter":case"mceTableDeleteRow":case"mceTableInsertColBefore":case"mceTableInsertColAfter":case"mceTableDeleteCol":case"mceTableCutRow":case"mceTableCopyRow":case"mceTablePasteRowBefore":case"mceTablePasteRowAfter":case"mceTableDelete":d.execCommand("mceBeginUndoLevel");this._doExecCommand(f,e,g);d.execCommand("mceEndUndoLevel");return true}return false},getInfo:function(){return{longname:"Tables",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_doExecCommand:function(r,Z,ae){var V=this.editor,au=V,g=this.url;var n=V.selection.getNode();var W=V.dom.getParent(n,"tr");var aq=V.dom.getParent(n,"td,th");var F=V.dom.getParent(n,"table");var k=V.contentWindow.document;var av=F?F.getAttribute("border"):"";if(W&&aq==null){aq=W.cells[0]}function ap(y,x){for(var ax=0;ax0&&ap(y[ax],x)){return true}if(y[ax]==x){return true}}return false}function aj(x,i){var y;ad=e(F);x=x||0;i=i||0;x=Math.max(o.cellindex+x,0);i=Math.max(o.rowindex+i,0);V.execCommand("mceRepaint");y=d(ad,i,x);if(y){V.selection.select(y.firstChild||y);V.selection.collapse(1)}}function ah(){var i=k.createElement("td");if(!tinymce.isIE){i.innerHTML='
'}}function j(y){var x=V.dom.getAttrib(y,"colspan");var i=V.dom.getAttrib(y,"rowspan");x=x==""?1:parseInt(x);i=i==""?1:parseInt(i);return{colspan:x,rowspan:i}}function al(ax,az){var i,ay;for(ay=0;ay1){for(var az=aE;az1){ay.rowSpan=aB.rowspan+1}aC=ay}B(F)}}function O(x,i){while((x=x.previousSibling)!=null){if(x.nodeName==i){return x}}return null}function af(ax,ay){var x=ay.split(",");while((ax=ax.nextSibling)!=null){for(var y=0;y1){do{var i=af(ay,"TD,TH");if(ay._delete){ay.parentNode.removeChild(ay)}}while((ay=i)!=null)}}while((y=x)!=null)}function p(ax,aA,az){ax.rowSpan=1;var x=af(aA,"TR");for(var ay=1;ay'}if(tinymce.isIE){x.insertBefore(y,x.cells(ax.cellIndex))}else{x.insertBefore(y,x.cells[ax.cellIndex])}x=af(x,"TR")}}function S(aF,aH,aB){var y=e(aH);var ax=aB.cloneNode(false);var aG=al(y,aB.cells[0]);var aC=null;var aA=V.dom.getAttrib(aH,"border");var az=null;for(var aE=0;az=d(y,aG.rowindex,aE);aE++){var aD=null;if(aC!=az){for(var ay=0;ay'}}aD.colSpan=1;aD.rowSpan=1;ax.appendChild(aD);aC=az}return ax}switch(r){case"mceTableMoveToNextRow":var L=A(F,aq);if(!L){V.execCommand("mceTableInsertRowAfter",aq);L=A(F,aq)}V.selection.select(L);V.selection.collapse(true);return true;case"mceTableRowProps":if(W==null){return true}if(Z){V.windowManager.open({url:g+"/row.htm",width:400+parseInt(V.getLang("table.rowprops_delta_width",0)),height:295+parseInt(V.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:g})}return true;case"mceTableCellProps":if(aq==null){return true}if(Z){V.windowManager.open({url:g+"/cell.htm",width:400+parseInt(V.getLang("table.cellprops_delta_width",0)),height:295+parseInt(V.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:g})}return true;case"mceInsertTable":if(Z){V.windowManager.open({url:g+"/table.htm",width:400+parseInt(V.getLang("table.table_delta_width",0)),height:320+parseInt(V.getLang("table.table_delta_height",0)),inline:1},{plugin_url:g,action:ae?ae.action:0})}return true;case"mceTableDelete":var G=V.dom.getParent(V.selection.getNode(),"table");if(G){G.parentNode.removeChild(G);V.execCommand("mceRepaint")}return true;case"mceTableSplitCells":case"mceTableMergeCells":case"mceTableInsertRowBefore":case"mceTableInsertRowAfter":case"mceTableDeleteRow":case"mceTableInsertColBefore":case"mceTableInsertColAfter":case"mceTableDeleteCol":case"mceTableCutRow":case"mceTableCopyRow":case"mceTablePasteRowBefore":case"mceTablePasteRowAfter":if(!F){return true}if(W&&F!=W.parentNode){F=W.parentNode}if(F&&W){switch(r){case"mceTableCutRow":if(!W||!aq){return true}V.tableRowClipboard=S(k,F,W);V.execCommand("mceTableDeleteRow");break;case"mceTableCopyRow":if(!W||!aq){return true}V.tableRowClipboard=S(k,F,W);break;case"mceTablePasteRowBefore":if(!W||!aq){return true}var v=V.tableRowClipboard.cloneNode(true);var h=O(W,"TR");if(h!=null){m(F,h,h.cells[0],v)}W.parentNode.insertBefore(v,W);break;case"mceTablePasteRowAfter":if(!W||!aq){return true}var X=af(W,"TR");var v=V.tableRowClipboard.cloneNode(true);m(F,W,aq,v);if(X==null){W.parentNode.appendChild(v)}else{X.parentNode.insertBefore(v,X)}break;case"mceTableInsertRowBefore":if(!W||!aq){return true}var ad=e(F);var o=al(ad,aq);var v=k.createElement("tr");var u=null;o.rowindex--;if(o.rowindex<0){o.rowindex=0}for(var ac=0;aq=d(ad,o.rowindex,ac);ac++){if(aq!=u){var E=j(aq);if(E.rowspan==1){var J=k.createElement("td");if(!tinymce.isIE){J.innerHTML='
'}J.colSpan=aq.colSpan;v.appendChild(J)}else{aq.rowSpan=E.rowspan+1}u=aq}}W.parentNode.insertBefore(v,W);aj(0,1);break;case"mceTableInsertRowAfter":if(!W||!aq){return true}var ad=e(F);var o=al(ad,aq);var v=k.createElement("tr");var u=null;for(var ac=0;aq=d(ad,o.rowindex,ac);ac++){if(aq!=u){var E=j(aq);if(E.rowspan==1){var J=k.createElement("td");if(!tinymce.isIE){J.innerHTML='
'}J.colSpan=aq.colSpan;v.appendChild(J)}else{aq.rowSpan=E.rowspan+1}u=aq}}if(v.hasChildNodes()){var X=af(W,"TR");if(X){X.parentNode.insertBefore(v,X)}else{F.appendChild(v)}}aj(0,1);break;case"mceTableDeleteRow":if(!W||!aq){return true}var ad=e(F);var o=al(ad,aq);if(ad.length==1&&F.nodeName=="TBODY"){V.dom.remove(V.dom.getParent(F,"table"));return true}var D=W.cells;var X=af(W,"TR");for(var ac=0;ac1){var J=D[ac].cloneNode(true);var E=j(D[ac]);J.rowSpan=E.rowspan-1;var ak=X.cells[ac];if(ak==null){X.appendChild(J)}else{X.insertBefore(J,ak)}}}var u=null;for(var ac=0;aq=d(ad,o.rowindex,ac);ac++){if(aq!=u){var E=j(aq);if(E.rowspan>1){aq.rowSpan=E.rowspan-1}else{W=aq.parentNode;if(W.parentNode){W._delete=true}}u=aq}}B(F);aj(0,-1);break;case"mceTableInsertColBefore":if(!W||!aq){return true}var ad=e(V.dom.getParent(F,"table"));var o=al(ad,aq);var u=null;for(var aa=0;aq=d(ad,aa,o.cellindex);aa++){if(aq!=u){var E=j(aq);if(E.colspan==1){var J=k.createElement(aq.nodeName);if(!tinymce.isIE){J.innerHTML='
'}J.rowSpan=aq.rowSpan;aq.parentNode.insertBefore(J,aq)}else{aq.colSpan++}u=aq}}aj();break;case"mceTableInsertColAfter":if(!W||!aq){return true}var ad=e(V.dom.getParent(F,"table"));var o=al(ad,aq);var u=null;for(var aa=0;aq=d(ad,aa,o.cellindex);aa++){if(aq!=u){var E=j(aq);if(E.colspan==1){var J=k.createElement(aq.nodeName);if(!tinymce.isIE){J.innerHTML='
'}J.rowSpan=aq.rowSpan;var ak=af(aq,"TD,TH");if(ak==null){aq.parentNode.appendChild(J)}else{ak.parentNode.insertBefore(J,ak)}}else{aq.colSpan++}u=aq}}aj(1);break;case"mceTableDeleteCol":if(!W||!aq){return true}var ad=e(F);var o=al(ad,aq);var u=null;if((ad.length>1&&ad[0].length<=1)&&F.nodeName=="TBODY"){V.dom.remove(V.dom.getParent(F,"table"));return true}for(var aa=0;aq=d(ad,aa,o.cellindex);aa++){if(aq!=u){var E=j(aq);if(E.colspan>1){aq.colSpan=E.colspan-1}else{if(aq.parentNode){aq.parentNode.removeChild(aq)}}u=aq}}aj(-1);break;case"mceTableSplitCells":if(!W||!aq){return true}var l=j(aq);var C=l.colspan;var H=l.rowspan;if(C>1||H>1){aq.colSpan=1;for(var am=1;am'}W.insertBefore(J,af(aq,"TD,TH"));if(H>1){p(J,W,H)}}p(aq,W,H)}F=V.dom.getParent(V.selection.getNode(),"table");break;case"mceTableMergeCells":var ao=[];var R=V.selection.getSel();var ad=e(F);if(tinymce.isIE||R.rangeCount==1){if(Z){var t=j(aq);V.windowManager.open({url:g+"/merge_cells.htm",width:240+parseInt(V.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(V.getLang("table.merge_cells_delta_height",0)),inline:1},{action:"update",numcols:t.colspan,numrows:t.rowspan,plugin_url:g});return true}else{var U=parseInt(ae.numrows);var c=parseInt(ae.numcols);var o=al(ad,aq);if((""+U)=="NaN"){U=1}if((""+c)=="NaN"){c=1}var b=F.rows;for(var aa=o.rowindex;aa0){ao[ao.length]=ag}var f=d(ad,o.rowindex,o.cellindex);a(au.dom.select("br",f),function(y,x){if(x>0&&au.dom.getAttrib("mce_bogus")){au.dom.remove(y)}})}}}else{var D=[];var R=V.selection.getSel();var Y=null;var an=null;var z=-1,aw=-1,w,at;if(R.rangeCount<2){return true}for(var am=0;am0){ao[ao.length]=ag}}var an=[];var Y=null;for(var aa=0;aaq){q=I}T=-1}var Q=-1;for(var ac=0;acs){s=M}Q=-1}aq=ao[0][0];aq.rowSpan=s;aq.colSpan=q;for(var aa=0;aa0)){aq.innerHTML+=P}if(ao[aa][ac]!=aq&&!ao[aa][ac]._deleted){var o=al(ad,ao[aa][ac]);var ar=ao[aa][ac].parentNode;ar.removeChild(ao[aa][ac]);ao[aa][ac]._deleted=true;if(!ar.hasChildNodes()){ar.parentNode.removeChild(ar);var ab=null;for(var ac=0;cellElm=d(ad,o.rowindex,ac);ac++){if(cellElm!=ab&&cellElm.rowSpan>1){cellElm.rowSpan--}ab=cellElm}if(aq.rowSpan>1){aq.rowSpan--}}}}}a(au.dom.select("br",aq),function(y,x){if(x>0&&au.dom.getAttrib(y,"mce_bogus")){au.dom.remove(y)}});break}F=V.dom.getParent(V.selection.getNode(),"table");V.addVisual(F);V.nodeChanged()}return true}return false}});tinymce.PluginManager.add("table",tinymce.plugins.TablePlugin)})(); \ No newline at end of file +(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.TablePlugin",{init:function(b,c){var d=this;d.editor=b;d.url=c;a([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(e){b.addButton(e[0],{title:e[1],cmd:e[2],ui:e[3]})});if(b.getParam("inline_styles")){b.onPreProcess.add(function(e,g){var f=e.dom;a(f.select("table",g.node),function(i){var h;if(h=f.getAttrib(i,"width")){f.setStyle(i,"width",h);f.setAttrib(i,"width")}if(h=f.getAttrib(i,"height")){f.setStyle(i,"height",h);f.setAttrib(i,"height")}})})}b.onInit.add(function(){if(!tinymce.isIE&&b.getParam("forced_root_block")){function e(){var f=b.getBody().lastChild;if(f&&f.nodeName=="TABLE"){b.dom.add(b.getBody(),"p",null,'
')}}b.onKeyUp.add(e);b.onSetContent.add(e);b.onVisualAid.add(e);b.onPreProcess.add(function(f,h){var g=h.node.lastChild;if(g&&g.childNodes.length==1&&g.firstChild.nodeName=="BR"){f.dom.remove(g)}});e()}if(b&&b.plugins.contextmenu){b.plugins.contextmenu.onContextMenu.add(function(h,f,j){var k,i=b.selection,g=i.getNode()||b.getBody();if(b.dom.getParent(j,"td")||b.dom.getParent(j,"th")){f.removeAll();if(g.nodeName=="A"&&!b.dom.getAttrib(g,"name")){f.add({title:"advanced.link_desc",icon:"link",cmd:b.plugins.advlink?"mceAdvLink":"mceLink",ui:true});f.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});f.addSeparator()}if(g.nodeName=="IMG"&&g.className.indexOf("mceItem")==-1){f.add({title:"advanced.image_desc",icon:"image",cmd:b.plugins.advimage?"mceAdvImage":"mceImage",ui:true});f.addSeparator()}f.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",ui:true,value:{action:"insert"}});f.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable",ui:true});f.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete",ui:true});f.addSeparator();k=f.addMenu({title:"table.cell"});k.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps",ui:true});k.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells",ui:true});k.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells",ui:true});k=f.addMenu({title:"table.row"});k.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps",ui:true});k.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});k.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});k.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});k.addSeparator();k.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});k.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});k.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"});k.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"});k=f.addMenu({title:"table.col"});k.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});k.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});k.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{f.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",ui:true})}})}});b.onKeyDown.add(function(f,g){if(g.keyCode==9&&f.dom.getParent(f.selection.getNode(),"TABLE")){if(!tinymce.isGecko&&!tinymce.isOpera){tinyMCE.execInstanceCommand(f.editorId,"mceTableMoveToNextRow",true);return tinymce.dom.Event.cancel(g)}f.undoManager.add()}});if(!tinymce.isIE){if(b.getParam("table_selection",true)){b.onClick.add(function(f,g){g=g.target;if(g.nodeName==="TABLE"){f.selection.select(g)}})}}b.onNodeChange.add(function(f,e,h){var g=f.dom.getParent(h,"td,th,caption");e.setActive("table",h.nodeName==="TABLE"||!!g);if(g&&g.nodeName==="CAPTION"){g=null}e.setDisabled("delete_table",!g);e.setDisabled("delete_col",!g);e.setDisabled("delete_table",!g);e.setDisabled("delete_row",!g);e.setDisabled("col_after",!g);e.setDisabled("col_before",!g);e.setDisabled("row_after",!g);e.setDisabled("row_before",!g);e.setDisabled("row_props",!g);e.setDisabled("cell_props",!g);e.setDisabled("split_cells",!g||(parseInt(f.dom.getAttrib(g,"colspan","1"))<2&&parseInt(f.dom.getAttrib(g,"rowspan","1"))<2));e.setDisabled("merge_cells",!g)});if(!tinymce.isIE){b.onBeforeSetContent.add(function(e,f){if(f.initial){f.content=f.content.replace(/<(td|th)([^>]+|)>\s*<\/(td|th)>/g,tinymce.isOpera?"<$1$2> ":'<$1$2>
')}})}},execCommand:function(f,e,g){var d=this.editor,c;switch(f){case"mceTableMoveToNextRow":case"mceInsertTable":case"mceTableRowProps":case"mceTableCellProps":case"mceTableSplitCells":case"mceTableMergeCells":case"mceTableInsertRowBefore":case"mceTableInsertRowAfter":case"mceTableDeleteRow":case"mceTableInsertColBefore":case"mceTableInsertColAfter":case"mceTableDeleteCol":case"mceTableCutRow":case"mceTableCopyRow":case"mceTablePasteRowBefore":case"mceTablePasteRowAfter":case"mceTableDelete":d.execCommand("mceBeginUndoLevel");this._doExecCommand(f,e,g);d.execCommand("mceEndUndoLevel");return true}return false},getInfo:function(){return{longname:"Tables",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_doExecCommand:function(r,Z,ae){var V=this.editor,au=V,g=this.url;var n=V.selection.getNode();var W=V.dom.getParent(n,"tr");var aq=V.dom.getParent(n,"td,th");var F=V.dom.getParent(n,"table");var k=V.contentWindow.document;var av=F?F.getAttribute("border"):"";if(W&&aq==null){aq=W.cells[0]}function ap(y,x){for(var ax=0;ax0&&ap(y[ax],x)){return true}if(y[ax]==x){return true}}return false}function aj(x,i){var y;ad=e(F);x=x||0;i=i||0;x=Math.max(o.cellindex+x,0);i=Math.max(o.rowindex+i,0);V.execCommand("mceRepaint");y=d(ad,i,x);if(y){V.selection.select(y.firstChild||y);V.selection.collapse(1)}}function ah(){var i=k.createElement("td");if(!tinymce.isIE){i.innerHTML='
'}}function j(y){var x=V.dom.getAttrib(y,"colspan");var i=V.dom.getAttrib(y,"rowspan");x=x==""?1:parseInt(x);i=i==""?1:parseInt(i);return{colspan:x,rowspan:i}}function al(ax,az){var i,ay;for(ay=0;ay1){for(var az=aE;az1){ay.rowSpan=aB.rowspan+1}aC=ay}B(F)}}function O(x,i){while((x=x.previousSibling)!=null){if(x.nodeName==i){return x}}return null}function af(ax,ay){var x=ay.split(",");while((ax=ax.nextSibling)!=null){for(var y=0;y1){do{var i=af(ay,"TD,TH");if(ay._delete){ay.parentNode.removeChild(ay)}}while((ay=i)!=null)}}while((y=x)!=null)}function p(ax,aA,az){ax.rowSpan=1;var x=af(aA,"TR");for(var ay=1;ay'}if(tinymce.isIE){x.insertBefore(y,x.cells(ax.cellIndex))}else{x.insertBefore(y,x.cells[ax.cellIndex])}x=af(x,"TR")}}function S(aF,aH,aB){var y=e(aH);var ax=aB.cloneNode(false);var aG=al(y,aB.cells[0]);var aC=null;var aA=V.dom.getAttrib(aH,"border");var az=null;for(var aE=0;az=d(y,aG.rowindex,aE);aE++){var aD=null;if(aC!=az){for(var ay=0;ay'}}aD.colSpan=1;aD.rowSpan=1;ax.appendChild(aD);aC=az}return ax}switch(r){case"mceTableMoveToNextRow":var L=A(F,aq);if(!L){V.execCommand("mceTableInsertRowAfter",aq);L=A(F,aq)}V.selection.select(L);V.selection.collapse(true);return true;case"mceTableRowProps":if(W==null){return true}if(Z){V.windowManager.open({url:g+"/row.htm",width:400+parseInt(V.getLang("table.rowprops_delta_width",0)),height:295+parseInt(V.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:g})}return true;case"mceTableCellProps":if(aq==null){return true}if(Z){V.windowManager.open({url:g+"/cell.htm",width:400+parseInt(V.getLang("table.cellprops_delta_width",0)),height:295+parseInt(V.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:g})}return true;case"mceInsertTable":if(Z){V.windowManager.open({url:g+"/table.htm",width:400+parseInt(V.getLang("table.table_delta_width",0)),height:320+parseInt(V.getLang("table.table_delta_height",0)),inline:1},{plugin_url:g,action:ae?ae.action:0})}return true;case"mceTableDelete":var G=V.dom.getParent(V.selection.getNode(),"table");if(G){G.parentNode.removeChild(G);V.execCommand("mceRepaint")}return true;case"mceTableSplitCells":case"mceTableMergeCells":case"mceTableInsertRowBefore":case"mceTableInsertRowAfter":case"mceTableDeleteRow":case"mceTableInsertColBefore":case"mceTableInsertColAfter":case"mceTableDeleteCol":case"mceTableCutRow":case"mceTableCopyRow":case"mceTablePasteRowBefore":case"mceTablePasteRowAfter":if(!F){return true}if(W&&F!=W.parentNode){F=W.parentNode}if(F&&W){switch(r){case"mceTableCutRow":if(!W||!aq){return true}V.tableRowClipboard=S(k,F,W);V.execCommand("mceTableDeleteRow");break;case"mceTableCopyRow":if(!W||!aq){return true}V.tableRowClipboard=S(k,F,W);break;case"mceTablePasteRowBefore":if(!W||!aq){return true}var v=V.tableRowClipboard.cloneNode(true);var h=O(W,"TR");if(h!=null){m(F,h,h.cells[0],v)}W.parentNode.insertBefore(v,W);break;case"mceTablePasteRowAfter":if(!W||!aq){return true}var X=af(W,"TR");var v=V.tableRowClipboard.cloneNode(true);m(F,W,aq,v);if(X==null){W.parentNode.appendChild(v)}else{X.parentNode.insertBefore(v,X)}break;case"mceTableInsertRowBefore":if(!W||!aq){return true}var ad=e(F);var o=al(ad,aq);var v=k.createElement("tr");var u=null;o.rowindex--;if(o.rowindex<0){o.rowindex=0}for(var ac=0;aq=d(ad,o.rowindex,ac);ac++){if(aq!=u){var E=j(aq);if(E.rowspan==1){var J=k.createElement("td");if(!tinymce.isIE){J.innerHTML='
'}J.colSpan=aq.colSpan;v.appendChild(J)}else{aq.rowSpan=E.rowspan+1}u=aq}}W.parentNode.insertBefore(v,W);aj(0,1);break;case"mceTableInsertRowAfter":if(!W||!aq){return true}var ad=e(F);var o=al(ad,aq);var v=k.createElement("tr");var u=null;for(var ac=0;aq=d(ad,o.rowindex,ac);ac++){if(aq!=u){var E=j(aq);if(E.rowspan==1){var J=k.createElement("td");if(!tinymce.isIE){J.innerHTML='
'}J.colSpan=aq.colSpan;v.appendChild(J)}else{aq.rowSpan=E.rowspan+1}u=aq}}if(v.hasChildNodes()){var X=af(W,"TR");if(X){X.parentNode.insertBefore(v,X)}else{F.appendChild(v)}}aj(0,1);break;case"mceTableDeleteRow":if(!W||!aq){return true}var ad=e(F);var o=al(ad,aq);if(ad.length==1&&F.nodeName=="TBODY"){V.dom.remove(V.dom.getParent(F,"table"));return true}var D=W.cells;var X=af(W,"TR");for(var ac=0;ac1){var J=D[ac].cloneNode(true);var E=j(D[ac]);J.rowSpan=E.rowspan-1;var ak=X.cells[ac];if(ak==null){X.appendChild(J)}else{X.insertBefore(J,ak)}}}var u=null;for(var ac=0;aq=d(ad,o.rowindex,ac);ac++){if(aq!=u){var E=j(aq);if(E.rowspan>1){aq.rowSpan=E.rowspan-1}else{W=aq.parentNode;if(W.parentNode){W._delete=true}}u=aq}}B(F);aj(0,-1);break;case"mceTableInsertColBefore":if(!W||!aq){return true}var ad=e(V.dom.getParent(F,"table"));var o=al(ad,aq);var u=null;for(var aa=0;aq=d(ad,aa,o.cellindex);aa++){if(aq!=u){var E=j(aq);if(E.colspan==1){var J=k.createElement(aq.nodeName);if(!tinymce.isIE){J.innerHTML='
'}J.rowSpan=aq.rowSpan;aq.parentNode.insertBefore(J,aq)}else{aq.colSpan++}u=aq}}aj();break;case"mceTableInsertColAfter":if(!W||!aq){return true}var ad=e(V.dom.getParent(F,"table"));var o=al(ad,aq);var u=null;for(var aa=0;aq=d(ad,aa,o.cellindex);aa++){if(aq!=u){var E=j(aq);if(E.colspan==1){var J=k.createElement(aq.nodeName);if(!tinymce.isIE){J.innerHTML='
'}J.rowSpan=aq.rowSpan;var ak=af(aq,"TD,TH");if(ak==null){aq.parentNode.appendChild(J)}else{ak.parentNode.insertBefore(J,ak)}}else{aq.colSpan++}u=aq}}aj(1);break;case"mceTableDeleteCol":if(!W||!aq){return true}var ad=e(F);var o=al(ad,aq);var u=null;if((ad.length>1&&ad[0].length<=1)&&F.nodeName=="TBODY"){V.dom.remove(V.dom.getParent(F,"table"));return true}for(var aa=0;aq=d(ad,aa,o.cellindex);aa++){if(aq!=u){var E=j(aq);if(E.colspan>1){aq.colSpan=E.colspan-1}else{if(aq.parentNode){aq.parentNode.removeChild(aq)}}u=aq}}aj(-1);break;case"mceTableSplitCells":if(!W||!aq){return true}var l=j(aq);var C=l.colspan;var H=l.rowspan;if(C>1||H>1){aq.colSpan=1;for(var am=1;am'}W.insertBefore(J,af(aq,"TD,TH"));if(H>1){p(J,W,H)}}p(aq,W,H)}F=V.dom.getParent(V.selection.getNode(),"table");break;case"mceTableMergeCells":var ao=[];var R=V.selection.getSel();var ad=e(F);if(tinymce.isIE||R.rangeCount==1){if(Z){var t=j(aq);V.windowManager.open({url:g+"/merge_cells.htm",width:240+parseInt(V.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(V.getLang("table.merge_cells_delta_height",0)),inline:1},{action:"update",numcols:t.colspan,numrows:t.rowspan,plugin_url:g});return true}else{var U=parseInt(ae.numrows);var c=parseInt(ae.numcols);var o=al(ad,aq);if((""+U)=="NaN"){U=1}if((""+c)=="NaN"){c=1}var b=F.rows;for(var aa=o.rowindex;aa0){ao[ao.length]=ag}var f=d(ad,o.rowindex,o.cellindex);a(au.dom.select("br",f),function(y,x){if(x>0&&au.dom.getAttrib("mce_bogus")){au.dom.remove(y)}})}}}else{var D=[];var R=V.selection.getSel();var Y=null;var an=null;var z=-1,aw=-1,w,at;if(R.rangeCount<2){return true}for(var am=0;am0){ao[ao.length]=ag}}var an=[];var Y=null;for(var aa=0;aaq){q=I}T=-1}var Q=-1;for(var ac=0;acs){s=M}Q=-1}aq=ao[0][0];aq.rowSpan=s;aq.colSpan=q;for(var aa=0;aa0)){aq.innerHTML+=P}if(ao[aa][ac]!=aq&&!ao[aa][ac]._deleted){var o=al(ad,ao[aa][ac]);var ar=ao[aa][ac].parentNode;ar.removeChild(ao[aa][ac]);ao[aa][ac]._deleted=true;if(!ar.hasChildNodes()){ar.parentNode.removeChild(ar);var ab=null;for(var ac=0;cellElm=d(ad,o.rowindex,ac);ac++){if(cellElm!=ab&&cellElm.rowSpan>1){cellElm.rowSpan--}ab=cellElm}if(aq.rowSpan>1){aq.rowSpan--}}}}}a(au.dom.select("br",aq),function(y,x){if(x>0&&au.dom.getAttrib(y,"mce_bogus")){au.dom.remove(y)}});break}F=V.dom.getParent(V.selection.getNode(),"table");V.addVisual(F);V.nodeChanged()}return true}return false}});tinymce.PluginManager.add("table",tinymce.plugins.TablePlugin)})(); \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js index 80cf748a..5e64998d 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js @@ -1,5 +1,5 @@ /** - * $Id: editor_plugin_src.js 953 2008-11-04 10:16:50Z spocke $ + * $Id: editor_plugin_src.js 1206 2009-08-19 12:30:52Z spocke $ * * @author Moxiecode * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved. @@ -55,6 +55,30 @@ } ed.onInit.add(function() { + // Fixes an issue on Gecko where it's impossible to place the caret behind a table + // This fix will force a paragraph element after the table but only when the forced_root_block setting is enabled + if (!tinymce.isIE && ed.getParam('forced_root_block')) { + function fixTableCaretPos() { + var last = ed.getBody().lastChild; + + if (last && last.nodeName == 'TABLE') + ed.dom.add(ed.getBody(), 'p', null, '
'); + }; + + ed.onKeyUp.add(fixTableCaretPos); + ed.onSetContent.add(fixTableCaretPos); + ed.onVisualAid.add(fixTableCaretPos); + + ed.onPreProcess.add(function(ed, o) { + var last = o.node.lastChild; + + if (last && last.childNodes.length == 1 && last.firstChild.nodeName == 'BR') + ed.dom.remove(last); + }); + + fixTableCaretPos(); + } + if (ed && ed.plugins.contextmenu) { ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) { var sm, se = ed.selection, el = se.getNode() || ed.getBody(); diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/js/table.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/js/table.js index a6d235cd..182589d6 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/js/table.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/js/table.js @@ -24,14 +24,14 @@ function insertTable() { border = formObj.elements['border'].value != "" ? formObj.elements['border'].value : 0; cellpadding = formObj.elements['cellpadding'].value != "" ? formObj.elements['cellpadding'].value : ""; cellspacing = formObj.elements['cellspacing'].value != "" ? formObj.elements['cellspacing'].value : ""; - align = formObj.elements['align'].options[formObj.elements['align'].selectedIndex].value; - frame = formObj.elements['frame'].options[formObj.elements['frame'].selectedIndex].value; - rules = formObj.elements['rules'].options[formObj.elements['rules'].selectedIndex].value; + align = getSelectValue(formObj, "align"); + frame = getSelectValue(formObj, "tframe"); + rules = getSelectValue(formObj, "rules"); width = formObj.elements['width'].value; height = formObj.elements['height'].value; bordercolor = formObj.elements['bordercolor'].value; bgcolor = formObj.elements['bgcolor'].value; - className = formObj.elements['class'].options[formObj.elements['class'].selectedIndex].value; + className = getSelectValue(formObj, "class"); id = formObj.elements['id'].value; summary = formObj.elements['summary'].value; style = formObj.elements['style'].value; @@ -322,7 +322,7 @@ function init() { // Update form selectByValue(formObj, 'align', align); - selectByValue(formObj, 'frame', frame); + selectByValue(formObj, 'tframe', frame); selectByValue(formObj, 'rules', rules); selectByValue(formObj, 'class', className, true, true); formObj.cols.value = cols; diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/langs/en.js index e2fbba2e..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/langs/en.js @@ -1,79 +1 @@ -// UK lang variables - -tinyMCE.addToLang('table',{ -general_tab : 'General', -advanced_tab : 'Advanced', -general_props : 'General properties', -advanced_props : 'Advanced properties', -desc : 'Inserts a new table', -row_before_desc : 'Insert row before', -row_after_desc : 'Insert row after', -delete_row_desc : 'Delete row', -col_before_desc : 'Insert column before', -col_after_desc : 'Insert column after', -delete_col_desc : 'Remove column', -rowtype : 'Row in table part', -title : 'Insert/Modify table', -width : 'Width', -height : 'Height', -cols : 'Columns', -rows : 'Rows', -cellspacing : 'Cellspacing', -cellpadding : 'Cellpadding', -border : 'Border', -align : 'Alignment', -align_default : 'Default', -align_left : 'Left', -align_right : 'Right', -align_middle : 'Center', -row_title : 'Table row properties', -cell_title : 'Table cell properties', -cell_type : 'Cell type', -row_desc : 'Table row properties', -cell_desc : 'Table cell properties', -valign : 'Vertical alignment', -align_top : 'Top', -align_bottom : 'Bottom', -props_desc : 'Table properties', -bordercolor : 'Border color', -bgcolor : 'Background color', -merge_cells_title : 'Merge table cells', -split_cells_desc : 'Split merged table cells', -merge_cells_desc : 'Merge table cells', -cut_row_desc : 'Cut table row', -copy_row_desc : 'Copy table row', -paste_row_before_desc : 'Paste table row before', -paste_row_after_desc : 'Paste table row after', -id : 'Id', -style: 'Style', -langdir : 'Language direction', -langcode : 'Language code', -mime : 'Target MIME type', -ltr : 'Left to right', -rtl : 'Right to left', -bgimage : 'Background image', -summary : 'Summary', -td : "Data", -th : "Header", -cell_cell : 'Update current cell', -cell_row : 'Update all cells in row', -cell_all : 'Update all cells in table', -row_row : 'Update current row', -row_odd : 'Update odd rows in table', -row_even : 'Update even rows in table', -row_all : 'Update all rows in table', -thead : 'Table Head', -tbody : 'Table Body', -tfoot : 'Table Foot', -del : 'Delete table', -scope : 'Scope', -row : 'Row', -col : 'Col', -rowgroup : 'Row Group', -colgroup : 'Col Group', -col_limit : 'You\'ve exceeded the maximum number of columns of {$cols}.', -row_limit : 'You\'ve exceeded the maximum number of rows of {$rows}.', -cell_limit : 'You\'ve exceeded the maximum number of cells of {$cells}.', -missing_scope: 'Are you sure you want to continue without specifying a scope for this table header cell. Without it, it may be difficult for some users with disabilities to understand the content or data displayed of the table.', -caption : 'Table caption' -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/table.htm b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/table.htm index 2a138513..37e61597 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/table.htm +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/table.htm @@ -108,9 +108,9 @@ - + - diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/template/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/template/langs/en.js index bdbf3ffb..93e20c71 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/template/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/template/langs/en.js @@ -1,16 +1,2 @@ -// UK lang variables - -tinyMCE.addToLang('template',{ -title : 'Templates', -label : 'Template', -desc_label : 'Description', -desc : 'Insert predefined template content', -select : 'Select a template', -preview : 'Preview', -warning : 'Warning: Updating a template with a different one may cause data loss.', -def_date_format : '%Y-%m-%d %H:%M:%S', -months_long : new Array("January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"), -months_short : new Array("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"), -day_long : new Array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"), -day_short : new Array("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun") -}); +// UK lang variables +//Older tiny2 lang file. Can be deleted \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/visualchars/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/visualchars/langs/en.js index a82a4ee5..d56c7268 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/visualchars/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/visualchars/langs/en.js @@ -1,5 +1 @@ -// EN lang variables - -tinyMCE.addToLang('visualchars',{ -desc : 'Visual control characters on/off.' -}); +// EN lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en.js index 50d244c0..49bb0b93 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en.js @@ -1,42 +1 @@ -// UK lang variables - -tinyMCE.addToLang('xhtmlxtras',{ -cite_desc : 'Citation', -abbr_desc : 'Abbreviation', -acronym_desc : 'Acronym', -del_desc : 'Deletion', -ins_desc : 'Insertion', -attribute_label_title : 'Title', -attribute_label_id : 'ID', -attribute_label_class : 'Class', -attribute_label_style : 'Style', -attribute_label_cite : 'Cite', -attribute_label_datetime : 'Date/Time', -attribute_label_langdir : 'Text Direction', -attribute_option_ltr : 'Left to right', -attribute_option_rtl : 'Right to left', -attribute_label_langcode : 'Language', -attribute_label_tabindex : 'TabIndex', -attribute_label_accesskey : 'AccessKey', -attribute_label_cite : 'Cite', -attribute_events_tab : 'Events', -attribute_attrib_tab : 'Attributes', -general_tab : 'General', -attrib_tab : 'Attributes', -events_tab : 'Events', -fieldset_general_tab : 'General Settings', -fieldset_attrib_tab : 'Element Attributes', -fieldset_events_tab : 'Element Events', -title_ins_element : 'Insertion Element', -title_del_element : 'Deletion Element', -title_acronym_element : 'Acronym Element', -title_abbr_element : 'Abbreviation Element', -title_cite_element : 'Citation Element', -remove : 'Remove', -not_set : '--not set--', -insert_date : 'Insert current date/time', -option_ltr : 'Left to right', -option_rtl : 'Right to left', -attribs_desc : 'Insert/Edit Attributes', -attribs_title : 'Insert/Edit Attributes' -}); +// UK lang variables diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm index 90eb4c2e..cbd6b88d 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm @@ -21,7 +21,7 @@
{#advanced_dlg.colorpicker_picker_title}
- +
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js index 21aae6cb..f67a5bc8 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js @@ -63,8 +63,8 @@ var LinkDialog = { ed.dom.setAttribs(e, { href : f.href.value, title : f.linktitle.value, - target : f.target_list ? f.target_list.options[f.target_list.selectedIndex].value : null, - 'class' : f.class_list ? f.class_list.options[f.class_list.selectedIndex].value : null + target : f.target_list ? getSelectValue(f, "target_list") : null, + 'class' : f.class_list ? getSelectValue(f, "class_list") : null }); } }); @@ -72,8 +72,8 @@ var LinkDialog = { ed.dom.setAttribs(e, { href : f.href.value, title : f.linktitle.value, - target : f.target_list ? f.target_list.options[f.target_list.selectedIndex].value : null, - 'class' : f.class_list ? f.class_list.options[f.class_list.selectedIndex].value : null + target : f.target_list ? getSelectValue(f, "target_list") : null, + 'class' : f.class_list ? getSelectValue(f, "class_list") : null }); } diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/tiny_mce.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/tiny_mce.js index ae2b0964..885be2f6 100644 --- a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/tiny_mce.js +++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/tiny_mce.js @@ -1 +1 @@ -var tinymce={majorVersion:"3",minorVersion:"2.4.1",releaseDate:"2009-05-25",_init:function(){var o=this,k=document,l=window,j=navigator,b=j.userAgent,h,a,g,f,e,m;o.isOpera=l.opera&&opera.buildNumber;o.isWebKit=/WebKit/.test(b);o.isIE=!o.isWebKit&&!o.isOpera&&(/MSIE/gi).test(b)&&(/Explorer/gi).test(j.appName);o.isIE6=o.isIE&&/MSIE [56]/.test(b);o.isGecko=!o.isWebKit&&/Gecko/.test(b);o.isMac=b.indexOf("Mac")!=-1;o.isAir=/adobeair/i.test(b);if(l.tinyMCEPreInit){o.suffix=tinyMCEPreInit.suffix;o.baseURL=tinyMCEPreInit.base;o.query=tinyMCEPreInit.query;return}o.suffix="";a=k.getElementsByTagName("base");for(h=0;h=c.length){for(e=0,b=g.length;e=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length=g.length||g[e]!=c[e]){f=e+1;break}}}if(f==1){return h}for(e=0,b=g.length-(f-1);e=0;c--){if(f[c].length==0||f[c]=="."){continue}if(f[c]==".."){b++;continue}if(b>0){b--;continue}g.push(f[c])}c=e.length-b;if(c<=0){return"/"+g.reverse().join("/")+d}return"/"+e.slice(0,c).join("/")+"/"+g.reverse().join("/")+d},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!=0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(e,b){var c=new Date();c.setTime(c.getTime()-1000);this.set(e,"",c,b,c)}})})();tinymce.create("static tinymce.util.JSON",{serialize:function(e){var c,a,d=tinymce.util.JSON.serialize,b;if(e==null){return"null"}b=typeof e;if(b=="string"){a="\bb\tt\nn\ff\rr\"\"''\\\\";return'"'+e.replace(/([\u0080-\uFFFF\x00-\x1f\"])/g,function(g,f){c=a.indexOf(f);if(c+1){return"\\"+a.charAt(c+1)}g=f.charCodeAt().toString(16);return"\\u"+"0000".substring(g.length)+g})+'"'}if(b=="object"){if(e.hasOwnProperty&&e instanceof Array){for(c=0,a="[";c0?",":"")+d(e[c])}return a+"]"}a="{";for(c in e){a+=typeof e[c]!="function"?(a.length>1?',"':'"')+c+'":'+d(e[c]):""}return a+"}"}return""+e},parse:function(s){try{return eval("("+s+")")}catch(ex){}}});tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.send(g.data);function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){e.call(f.error_scope||f.scope,h,g)};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(c){var e=c.each,b=c.is;var d=c.isWebKit,a=c.isIE;c.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,props:{"for":"htmlFor","class":"className",className:"className",checked:"checked",disabled:"disabled",maxlength:"maxLength",readonly:"readOnly",selected:"selected",value:"value",id:"id",name:"name",type:"type"},DOMUtils:function(i,g){var f=this;f.doc=i;f.win=window;f.files={};f.cssFlicker=false;f.counter=0;f.boxModel=!c.isIE||i.compatMode=="CSS1Compat";f.stdMode=i.documentMode===8;f.settings=g=c.extend({keep_values:false,hex_colors:1,process_html:1},g);if(c.isIE6){try{i.execCommand("BackgroundImageCache",false,true)}catch(h){f.cssFlicker=true}}c.addUnload(f.destroy,f)},getRoot:function(){var f=this,g=f.settings;return(g&&f.get(g.root_element))||f.doc.body},getViewPort:function(g){var h,f;g=!g?this.win:g;h=g.document;f=this.boxModel?h.documentElement:h.body;return{x:g.pageXOffset||f.scrollLeft,y:g.pageYOffset||f.scrollTop,w:g.innerWidth||f.clientWidth,h:g.innerHeight||f.clientHeight}},getRect:function(i){var h,f=this,g;i=f.get(i);h=f.getPos(i);g=f.getSize(i);return{x:h.x,y:h.y,w:g.w,h:g.h}},getSize:function(j){var g=this,f,i;j=g.get(j);f=g.getStyle(j,"width");i=g.getStyle(j,"height");if(f.indexOf("px")===-1){f=0}if(i.indexOf("px")===-1){i=0}return{w:parseInt(f)||j.offsetWidth||j.clientWidth,h:parseInt(i)||j.offsetHeight||j.clientHeight}},is:function(g,f){return c.dom.Sizzle.matches(f,g.nodeType?[g]:g).length>0},getParent:function(i,h,g){return this.getParents(i,h,g,false)},getParents:function(p,k,i,m){var h=this,g,j=h.settings,l=[];p=h.get(p);m=m===undefined;if(j.strict_root){i=i||h.getRoot()}if(b(k,"string")){g=k;if(k==="*"){k=function(f){return f.nodeType==1}}else{k=function(f){return h.is(f,g)}}}while(p){if(p==i||!p.nodeType||p.nodeType===9){break}if(!k||k(p)){if(m){l.push(p)}else{return p}}p=p.parentNode}return m?l:null},get:function(f){var g;if(f&&this.doc&&typeof(f)=="string"){g=f;f=this.doc.getElementById(f);if(f&&f.id!==g){return this.doc.getElementsByName(g)[1]}}return f},select:function(h,g){var f=this;return c.dom.Sizzle(h,f.get(g)||f.get(f.settings.root_element)||f.doc,[])},add:function(j,l,f,i,k){var g=this;return this.run(j,function(n){var m,h;m=b(l,"string")?g.doc.createElement(l):l;g.setAttribs(m,f);if(i){if(i.nodeType){m.appendChild(i)}else{g.setHTML(m,i)}}return !k?n.appendChild(m):m})},create:function(i,f,g){return this.add(this.doc.createElement(i),i,f,g,1)},createHTML:function(m,f,j){var l="",i=this,g;l+="<"+m;for(g in f){if(f.hasOwnProperty(g)){l+=" "+g+'="'+i.encode(f[g])+'"'}}if(c.is(j)){return l+">"+j+""}return l+" />"},remove:function(h,f){var g=this;return this.run(h,function(m){var l,k,j;l=m.parentNode;if(!l){return null}if(f){for(j=m.childNodes.length-1;j>=0;j--){g.insertAfter(m.childNodes[j],m)}}if(g.fixPsuedoLeaks){l=m.cloneNode(true);f="IELeakGarbageBin";k=g.get(f)||g.add(g.doc.body,"div",{id:f,style:"display:none"});k.appendChild(m);k.innerHTML="";return l}return l.removeChild(m)})},setStyle:function(i,f,g){var h=this;return h.run(i,function(l){var k,j;k=l.style;f=f.replace(/-(\D)/g,function(n,m){return m.toUpperCase()});if(h.pixelStyles.test(f)&&(c.is(g,"number")||/^[\-0-9\.]+$/.test(g))){g+="px"}switch(f){case"opacity":if(a){k.filter=g===""?"":"alpha(opacity="+(g*100)+")";if(!i.currentStyle||!i.currentStyle.hasLayout){k.display="inline-block"}}k[f]=k["-moz-opacity"]=k["-khtml-opacity"]=g||"";break;case"float":a?k.styleFloat=g:k.cssFloat=g;break;default:k[f]=g||""}if(h.settings.update_styles){h.setAttrib(l,"mce_style")}})},getStyle:function(i,f,h){i=this.get(i);if(!i){return false}if(this.doc.defaultView&&h){f=f.replace(/[A-Z]/g,function(j){return"-"+j});try{return this.doc.defaultView.getComputedStyle(i,null).getPropertyValue(f)}catch(g){return null}}f=f.replace(/-(\D)/g,function(k,j){return j.toUpperCase()});if(f=="float"){f=a?"styleFloat":"cssFloat"}if(i.currentStyle&&h){return i.currentStyle[f]}return i.style[f]},setStyles:function(i,j){var g=this,h=g.settings,f;f=h.update_styles;h.update_styles=0;e(j,function(k,l){g.setStyle(i,l,k)});h.update_styles=f;if(h.update_styles){g.setAttrib(i,h.cssText)}},setAttrib:function(h,i,f){var g=this;if(!h||!i){return}if(g.settings.strict){i=i.toLowerCase()}return this.run(h,function(k){var j=g.settings;switch(i){case"style":if(!b(f,"string")){e(f,function(l,m){g.setStyle(k,m,l)});return}if(j.keep_values){if(f&&!g._isRes(f)){k.setAttribute("mce_style",f,2)}else{k.removeAttribute("mce_style",2)}}k.style.cssText=f;break;case"class":k.className=f||"";break;case"src":case"href":if(j.keep_values){if(j.url_converter){f=j.url_converter.call(j.url_converter_scope||g,f,i,k)}g.setAttrib(k,"mce_"+i,f,2)}break;case"shape":k.setAttribute("mce_style",f);break}if(b(f)&&f!==null&&f.length!==0){k.setAttribute(i,""+f,2)}else{k.removeAttribute(i,2)}})},setAttribs:function(g,h){var f=this;return this.run(g,function(i){e(h,function(j,k){f.setAttrib(i,k,j)})})},getAttrib:function(i,j,h){var f,g=this;i=g.get(i);if(!i||i.nodeType!==1){return false}if(!b(h)){h=""}if(/^(src|href|style|coords|shape)$/.test(j)){f=i.getAttribute("mce_"+j);if(f){return f}}if(a&&g.props[j]){f=i[g.props[j]];f=f&&f.nodeValue?f.nodeValue:f}if(!f){f=i.getAttribute(j,2)}if(j==="style"){f=f||i.style.cssText;if(f){f=g.serializeStyle(g.parseStyle(f));if(g.settings.keep_values&&!g._isRes(f)){i.setAttribute("mce_style",f)}}}if(d&&j==="class"&&f){f=f.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(a){switch(j){case"rowspan":case"colspan":if(f===1){f=""}break;case"size":if(f==="+0"||f===20||f===0){f=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(f===0){f=""}break;case"hspace":if(f===-1){f=""}break;case"maxlength":case"tabindex":if(f===32768||f===2147483647||f==="32768"){f=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(f===65535){return j}return h;case"shape":f=f.toLowerCase();break;default:if(j.indexOf("on")===0&&f){f=(""+f).replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1")}}}return(f!==undefined&&f!==null&&f!=="")?""+f:h},getPos:function(m,i){var g=this,f=0,l=0,j,k=g.doc,h;m=g.get(m);i=i||k.body;if(m){if(a&&!g.stdMode){m=m.getBoundingClientRect();j=g.boxModel?k.documentElement:k.body;f=g.getStyle(g.select("html")[0],"borderWidth");f=(f=="medium"||g.boxModel&&!g.isIE6)&&2||f;m.top+=g.win.self!=g.win.top?2:0;return{x:m.left+j.scrollLeft-f,y:m.top+j.scrollTop-f}}h=m;while(h&&h!=i&&h.nodeType){f+=h.offsetLeft||0;l+=h.offsetTop||0;h=h.offsetParent}h=m.parentNode;while(h&&h!=i&&h.nodeType){f-=h.scrollLeft||0;l-=h.scrollTop||0;h=h.parentNode}}return{x:f,y:l}},parseStyle:function(h){var i=this,j=i.settings,k={};if(!h){return k}function f(w,q,v){var o,u,m,n;o=k[w+"-top"+q];if(!o){return}u=k[w+"-right"+q];if(o!=u){return}m=k[w+"-bottom"+q];if(u!=m){return}n=k[w+"-left"+q];if(m!=n){return}k[v]=n;delete k[w+"-top"+q];delete k[w+"-right"+q];delete k[w+"-bottom"+q];delete k[w+"-left"+q]}function g(n,m,l,p){var o;o=k[m];if(!o){return}o=k[l];if(!o){return}o=k[p];if(!o){return}k[n]=k[m]+" "+k[l]+" "+k[p];delete k[m];delete k[l];delete k[p]}h=h.replace(/&(#?[a-z0-9]+);/g,"&$1_MCE_SEMI_");e(h.split(";"),function(m){var l,n=[];if(m){m=m.replace(/_MCE_SEMI_/g,";");m=m.replace(/url\([^\)]+\)/g,function(o){n.push(o);return"url("+n.length+")"});m=m.split(":");l=c.trim(m[1]);l=l.replace(/url\(([^\)]+)\)/g,function(p,o){return n[parseInt(o)-1]});l=l.replace(/rgb\([^\)]+\)/g,function(o){return i.toHex(o)});if(j.url_converter){l=l.replace(/url\([\'\"]?([^\)\'\"]+)[\'\"]?\)/g,function(o,p){return"url("+j.url_converter.call(j.url_converter_scope||i,i.decode(p),"style",null)+")"})}k[c.trim(m[0]).toLowerCase()]=l}});f("border","","border");f("border","-width","border-width");f("border","-color","border-color");f("border","-style","border-style");f("padding","","padding");f("margin","","margin");g("border","border-width","border-style","border-color");if(a){if(k.border=="medium none"){k.border=""}}return k},serializeStyle:function(g){var f="";e(g,function(i,h){if(h&&i){if(c.isGecko&&h.indexOf("-moz-")===0){return}switch(h){case"color":case"background-color":i=i.toLowerCase();break}f+=(f?" ":"")+h+": "+i+";"}});return f},loadCSS:function(f){var h=this,i=h.doc,g;if(!f){f=""}g=h.select("head")[0];e(f.split(","),function(j){var k;if(h.files[j]){return}h.files[j]=true;k=h.create("link",{rel:"stylesheet",href:c._addVer(j)});if(a&&i.documentMode){k.onload=function(){i.recalc();k.onload=null}}g.appendChild(k)})},addClass:function(f,g){return this.run(f,function(h){var i;if(!g){return 0}if(this.hasClass(h,g)){return h.className}i=this.removeClass(h,g);return h.className=(i!=""?(i+" "):"")+g})},removeClass:function(h,i){var f=this,g;return f.run(h,function(k){var j;if(f.hasClass(k,i)){if(!g){g=new RegExp("(^|\\s+)"+i+"(\\s+|$)","g")}j=k.className.replace(g," ");return k.className=c.trim(j!=" "?j:"")}return k.className})},hasClass:function(g,f){g=this.get(g);if(!g||!f){return false}return(" "+g.className+" ").indexOf(" "+f+" ")!==-1},show:function(f){return this.setStyle(f,"display","block")},hide:function(f){return this.setStyle(f,"display","none")},isHidden:function(f){f=this.get(f);return !f||f.style.display=="none"||this.getStyle(f,"display")=="none"},uniqueId:function(f){return(!f?"mce_":f)+(this.counter++)},setHTML:function(i,g){var f=this;return this.run(i,function(m){var h,k,j,q,l,h;g=f.processHTML(g);if(a){function o(){try{m.innerHTML="
"+g;m.removeChild(m.firstChild)}catch(n){while(m.firstChild){m.firstChild.removeNode()}h=f.create("div");h.innerHTML="
"+g;e(h.childNodes,function(r,p){if(p){m.appendChild(r)}})}}if(f.settings.fix_ie_paragraphs){g=g.replace(/

<\/p>|]+)><\/p>|/gi,' 

')}o();if(f.settings.fix_ie_paragraphs){j=m.getElementsByTagName("p");for(k=j.length-1,h=0;k>=0;k--){q=j[k];if(!q.hasChildNodes()){if(!q.mce_keep){h=1;break}q.removeAttribute("mce_keep")}}}if(h){g=g.replace(/

]+)>|

/g,'

');g=g.replace(/<\/p>/g,"
");o();if(f.settings.fix_ie_paragraphs){j=m.getElementsByTagName("DIV");for(k=j.length-1;k>=0;k--){q=j[k];if(q.mce_tmp){l=f.doc.createElement("p");q.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi,function(p,n){var r;if(n!=="mce_tmp"){r=q.getAttribute(n);if(!r&&n==="class"){r=q.className}l.setAttribute(n,r)}});for(h=0;h|]+)>/gi,"<$1b$2>");j=j.replace(/<(\/?)em>|]+)>/gi,"<$1i$2>")}else{if(a){j=j.replace(/'/g,"'");j=j.replace(/\s+(disabled|checked|readonly|selected)\s*=\s*[\"\']?(false|0)[\"\']?/gi,"")}}j=j.replace(/]+)\/>|/gi,"");if(i.keep_values){if(/)/g,"\n");h=h.replace(/^[\r\n]*|[\r\n]*$/g,"");h=h.replace(/^\s*(\/\/\s*|\]\]>|-->|\]\]-->)\s*$/g,"");return h}j=j.replace(/]+|)>([\s\S]*?)<\/script>/g,function(h,l,k){if(!l){l=' type="text/javascript"'}l=l.replace(/(type|language)=\"?/,"$&mce-");l=l.replace(/src=\"([^\"]+)\"?/,function(m,n){if(i.url_converter){n=g.encode(i.url_converter.call(i.url_converter_scope||g,g.decode(n),"src","script"))}return'mce_src="'+n+'"'});if(c.trim(k)){k=""}return""+k+""});j=j.replace(/]+|)>([\s\S]*?)<\/style>/g,function(h,l,k){if(k){k=""}return""+k+""})}j=j.replace(//g,"");j=j.replace(/<([\w:]+) [^>]*(src|href|style|shape|coords)[^>]*>/gi,function(h,l){function k(o,n,q){var p=q;if(h.indexOf("mce_"+n)!=-1){return o}if(n=="style"){if(g._isRes(q)){return o}if(i.hex_colors){p=p.replace(/rgb\([^\)]+\)/g,function(m){return g.toHex(m)})}if(i.url_converter){p=p.replace(/url\([\'\"]?([^\)\'\"]+)\)/g,function(m,r){return"url("+g.encode(i.url_converter.call(i.url_converter_scope||g,g.decode(r),n,l))+")"})}}else{if(n!="coords"&&n!="shape"){if(i.url_converter){p=g.encode(i.url_converter.call(i.url_converter_scope||g,g.decode(q),n,l))}}}return" "+n+'="'+q+'" mce_'+n+'="'+p+'"'}h=h.replace(/ (src|href|style|coords|shape)=[\"]([^\"]+)[\"]/gi,k);h=h.replace(/ (src|href|style|coords|shape)=[\']([^\']+)[\']/gi,k);return h.replace(/ (src|href|style|coords|shape)=([^\s\"\'>]+)/gi,k)})}return j},getOuterHTML:function(f){var g;f=this.get(f);if(!f){return null}if(f.outerHTML!==undefined){return f.outerHTML}g=(f.ownerDocument||this.doc).createElement("body");g.appendChild(f.cloneNode(true));return g.innerHTML},setOuterHTML:function(i,g,j){var f=this;return this.run(i,function(h){var l,k;h=f.get(h);j=j||h.ownerDocument||f.doc;if(a&&h.nodeType==1){h.outerHTML=g}else{k=j.createElement("body");k.innerHTML=g;l=k.lastChild;while(l){f.insertAfter(l.cloneNode(true),h);l=l.previousSibling}f.remove(h)}})},decode:function(g){var h,i,f;if(/&[^;]+;/.test(g)){h=this.doc.createElement("div");h.innerHTML=g;i=h.firstChild;f="";if(i){do{f+=i.nodeValue}while(i.nextSibling)}return f||g}return g},encode:function(f){return f?(""+f).replace(/[<>&\"]/g,function(h,g){switch(h){case"&":return"&";case'"':return""";case"<":return"<";case">":return">"}return h}):f},insertAfter:function(h,g){var f=this;g=f.get(g);return this.run(h,function(k){var j,i;j=g.parentNode;i=g.nextSibling;if(i){j.insertBefore(k,i)}else{j.appendChild(k)}return k})},isBlock:function(f){if(f.nodeType&&f.nodeType!==1){return false}f=f.nodeName||f;return/^(H[1-6]|HR|P|DIV|ADDRESS|PRE|FORM|TABLE|LI|OL|UL|TR|TD|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|NOFRAMES|MENU|ISINDEX|SAMP)$/.test(f)},replace:function(i,h,f){var g=this;if(b(h,"array")){i=i.cloneNode(true)}return g.run(h,function(j){if(f){e(j.childNodes,function(k){i.appendChild(k.cloneNode(true))})}if(g.fixPsuedoLeaks&&j.nodeType===1){j.parentNode.insertBefore(i,j);g.remove(j);return i}return j.parentNode.replaceChild(i,j)})},findCommonAncestor:function(h,f){var i=h,g;while(i){g=f;while(g&&i!=g){g=g.parentNode}if(i==g){break}i=i.parentNode}if(!i&&h.ownerDocument){return h.ownerDocument.documentElement}return i},toHex:function(f){var h=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(f);function g(i){i=parseInt(i).toString(16);return i.length>1?i:"0"+i}if(h){f="#"+g(h[1])+g(h[2])+g(h[3]);return f}return f},getClasses:function(){var l=this,g=[],k,m={},n=l.settings.class_filter,j;if(l.classes){return l.classes}function o(f){e(f.imports,function(i){o(i)});e(f.cssRules||f.rules,function(i){switch(i.type||1){case 1:if(i.selectorText){e(i.selectorText.split(","),function(p){p=p.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(p)||!/\.[\w\-]+$/.test(p)){return}j=p;p=p.replace(/.*\.([a-z0-9_\-]+).*/i,"$1");if(n&&!(p=n(p,j))){return}if(!m[p]){g.push({"class":p});m[p]=1}})}break;case 3:o(i.styleSheet);break}})}try{e(l.doc.styleSheets,o)}catch(h){}if(g.length>0){l.classes=g}return g},run:function(j,i,h){var g=this,k;if(g.doc&&typeof(j)==="string"){j=g.get(j)}if(!j){return false}h=h||this;if(!j.nodeType&&(j.length||j.length===0)){k=[];e(j,function(l,f){if(l){if(typeof(l)=="string"){l=g.doc.getElementById(l)}k.push(i.call(h,l,f))}});return k}return i.call(h,j)},getAttribs:function(g){var f;g=this.get(g);if(!g){return[]}if(a){f=[];if(g.nodeName=="OBJECT"){return g.attributes}g.cloneNode(false).outerHTML.replace(/([a-z0-9\:\-_]+)=/gi,function(i,h){f.push({specified:1,nodeName:h})});return f}return g.attributes},destroy:function(g){var f=this;if(f.events){f.events.destroy()}f.win=f.doc=f.root=f.events=null;if(!g){c.removeUnload(f.destroy)}},createRng:function(){var f=this.doc;return f.createRange?f.createRange():new c.dom.Range(this)},split:function(l,k,o){var p=this,f=p.createRng(),m,j,n;function g(r,q){r=r[q];if(r&&r[q]&&r[q].nodeType==1&&i(r[q])){p.remove(r[q])}}function i(q){q=p.getOuterHTML(q);q=q.replace(/<(img|hr|table)/gi,"-");q=q.replace(/<[^>]+>/g,"");return q.replace(/[ \t\r\n]+| | /g,"")==""}function h(r){var q=0;while(r.previousSibling){q++;r=r.previousSibling}return q}if(l&&k){f.setStart(l.parentNode,h(l));f.setEnd(k.parentNode,h(k));m=f.extractContents();f=p.createRng();f.setStart(k.parentNode,h(k)+1);f.setEnd(l.parentNode,h(l)+1);j=f.extractContents();n=l.parentNode;g(m,"lastChild");if(!i(m)){n.insertBefore(m,l)}if(o){n.replaceChild(o,k)}else{n.insertBefore(k,l)}g(j,"firstChild");if(!i(j)){n.insertBefore(j,l)}p.remove(l);return o||k}},bind:function(j,f,i,h){var g=this;if(!g.events){g.events=new c.dom.EventUtils()}return g.events.add(j,f,i,h||this)},unbind:function(i,f,h){var g=this;if(!g.events){g.events=new c.dom.EventUtils()}return g.events.remove(i,f,h)},_isRes:function(f){return/^(top|left|bottom|right|width|height)/i.test(f)||/;\s*(top|left|bottom|right|width|height)/i.test(f)}});c.DOM=new c.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(f){var h=0,c=1,e=2,d=tinymce.extend;function g(m,k){var j,l;if(m.parentNode!=k){return -1}for(l=k.firstChild,j=0;l!=m;l=l.nextSibling){j++}return j}function b(k){var j=0;while(k.previousSibling){j++;k=k.previousSibling}return j}function i(j,k){var l;if(j.nodeType==3){return j}if(k<0){return j}l=j.firstChild;while(l!=null&&k>0){--k;l=l.nextSibling}if(l!=null){return l}return j}function a(k){var j=k.doc;d(this,{dom:k,startContainer:j,startOffset:0,endContainer:j,endOffset:0,collapsed:true,commonAncestorContainer:j,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3})}d(a.prototype,{setStart:function(k,j){this._setEndPoint(true,k,j)},setEnd:function(k,j){this._setEndPoint(false,k,j)},setStartBefore:function(j){this.setStart(j.parentNode,b(j))},setStartAfter:function(j){this.setStart(j.parentNode,b(j)+1)},setEndBefore:function(j){this.setEnd(j.parentNode,b(j))},setEndAfter:function(j){this.setEnd(j.parentNode,b(j)+1)},collapse:function(k){var j=this;if(k){j.endContainer=j.startContainer;j.endOffset=j.startOffset}else{j.startContainer=j.endContainer;j.startOffset=j.endOffset}j.collapsed=true},selectNode:function(j){this.setStartBefore(j);this.setEndAfter(j)},selectNodeContents:function(j){this.setStart(j,0);this.setEnd(j,j.nodeType===1?j.childNodes.length:j.nodeValue.length)},compareBoundaryPoints:function(m,n){var l=this,p=l.startContainer,o=l.startOffset,k=l.endContainer,j=l.endOffset;if(m===0){return l._compareBoundaryPoints(p,o,p,o)}if(m===1){return l._compareBoundaryPoints(p,o,k,j)}if(m===2){return l._compareBoundaryPoints(k,j,k,j)}if(m===3){return l._compareBoundaryPoints(k,j,p,o)}},deleteContents:function(){this._traverse(e)},extractContents:function(){return this._traverse(h)},cloneContents:function(){return this._traverse(c)},insertNode:function(m){var j=this,l,k;if(m.nodeType===3||m.nodeType===4){l=j.startContainer.splitText(j.startOffset);j.startContainer.parentNode.insertBefore(m,l)}else{if(j.startContainer.childNodes.length>0){k=j.startContainer.childNodes[j.startOffset]}j.startContainer.insertBefore(m,k)}},surroundContents:function(l){var j=this,k=j.extractContents();j.insertNode(l);l.appendChild(k);j.selectNode(l)},cloneRange:function(){var j=this;return d(new a(j.dom),{startContainer:j.startContainer,startOffset:j.startOffset,endContainer:j.endContainer,endOffset:j.endOffset,collapsed:j.collapsed,commonAncestorContainer:j.commonAncestorContainer})},_isCollapsed:function(){return(this.startContainer==this.endContainer&&this.startOffset==this.endOffset)},_compareBoundaryPoints:function(m,p,k,o){var q,l,j,r,t,s;if(m==k){if(p==o){return 0}else{if(p0){l.collapse(k)}}l.collapsed=l._isCollapsed();l.commonAncestorContainer=l.dom.findCommonAncestor(l.startContainer,l.endContainer)},_traverse:function(r){var s=this,q,m=0,v=0,k,o,l,n,j,u;if(s.startContainer==s.endContainer){return s._traverseSameContainer(r)}for(q=s.endContainer,k=q.parentNode;k!=null;q=k,k=k.parentNode){if(k==s.startContainer){return s._traverseCommonStartContainer(q,r)}++m}for(q=s.startContainer,k=q.parentNode;k!=null;q=k,k=k.parentNode){if(k==s.endContainer){return s._traverseCommonEndContainer(q,r)}++v}o=v-m;l=s.startContainer;while(o>0){l=l.parentNode;o--}n=s.endContainer;while(o<0){n=n.parentNode;o++}for(j=l.parentNode,u=n.parentNode;j!=u;j=j.parentNode,u=u.parentNode){l=j;n=u}return s._traverseCommonAncestors(l,n,r)},_traverseSameContainer:function(o){var r=this,q,u,j,k,l,p,m;if(o!=e){q=r.dom.doc.createDocumentFragment()}if(r.startOffset==r.endOffset){return q}if(r.startContainer.nodeType==3){u=r.startContainer.nodeValue;j=u.substring(r.startOffset,r.endOffset);if(o!=c){r.startContainer.deleteData(r.startOffset,r.endOffset-r.startOffset);r.collapse(true)}if(o==e){return null}q.appendChild(r.dom.doc.createTextNode(j));return q}k=i(r.startContainer,r.startOffset);l=r.endOffset-r.startOffset;while(l>0){p=k.nextSibling;m=r._traverseFullySelected(k,o);if(q){q.appendChild(m)}--l;k=p}if(o!=c){r.collapse(true)}return q},_traverseCommonStartContainer:function(j,p){var s=this,r,k,l,m,q,o;if(p!=e){r=s.dom.doc.createDocumentFragment()}k=s._traverseRightBoundary(j,p);if(r){r.appendChild(k)}l=g(j,s.startContainer);m=l-s.startOffset;if(m<=0){if(p!=c){s.setEndBefore(j);s.collapse(false)}return r}k=j.previousSibling;while(m>0){q=k.previousSibling;o=s._traverseFullySelected(k,p);if(r){r.insertBefore(o,r.firstChild)}--m;k=q}if(p!=c){s.setEndBefore(j);s.collapse(false)}return r},_traverseCommonEndContainer:function(m,p){var s=this,r,o,j,k,q,l;if(p!=e){r=s.dom.doc.createDocumentFragment()}j=s._traverseLeftBoundary(m,p);if(r){r.appendChild(j)}o=g(m,s.endContainer);++o;k=s.endOffset-o;j=m.nextSibling;while(k>0){q=j.nextSibling;l=s._traverseFullySelected(j,p);if(r){r.appendChild(l)}--k;j=q}if(p!=c){s.setStartAfter(m);s.collapse(true)}return r},_traverseCommonAncestors:function(p,j,s){var w=this,l,v,o,q,r,k,u,m;if(s!=e){v=w.dom.doc.createDocumentFragment()}l=w._traverseLeftBoundary(p,s);if(v){v.appendChild(l)}o=p.parentNode;q=g(p,o);r=g(j,o);++q;k=r-q;u=p.nextSibling;while(k>0){m=u.nextSibling;l=w._traverseFullySelected(u,s);if(v){v.appendChild(l)}u=m;--k}l=w._traverseRightBoundary(j,s);if(v){v.appendChild(l)}if(s!=c){w.setStartAfter(p);w.collapse(true)}return v},_traverseRightBoundary:function(p,q){var s=this,l=i(s.endContainer,s.endOffset-1),r,o,n,j,k;var m=l!=s.endContainer;if(l==p){return s._traverseNode(l,m,false,q)}r=l.parentNode;o=s._traverseNode(r,false,false,q);while(r!=null){while(l!=null){n=l.previousSibling;j=s._traverseNode(l,m,false,q);if(q!=e){o.insertBefore(j,o.firstChild)}m=true;l=n}if(r==p){return o}l=r.previousSibling;r=r.parentNode;k=s._traverseNode(r,false,false,q);if(q!=e){k.appendChild(o)}o=k}return null},_traverseLeftBoundary:function(p,q){var s=this,m=i(s.startContainer,s.startOffset);var n=m!=s.startContainer,r,o,l,j,k;if(m==p){return s._traverseNode(m,n,true,q)}r=m.parentNode;o=s._traverseNode(r,false,true,q);while(r!=null){while(m!=null){l=m.nextSibling;j=s._traverseNode(m,n,true,q);if(q!=e){o.appendChild(j)}n=true;m=l}if(r==p){return o}m=r.nextSibling;r=r.parentNode;k=s._traverseNode(r,false,true,q);if(q!=e){k.appendChild(o)}o=k}return null},_traverseNode:function(j,o,r,s){var u=this,m,l,p,k,q;if(o){return u._traverseFullySelected(j,s)}if(j.nodeType==3){m=j.nodeValue;if(r){k=u.startOffset;l=m.substring(k);p=m.substring(0,k)}else{k=u.endOffset;l=m.substring(0,k);p=m.substring(k)}if(s!=c){j.nodeValue=p}if(s==e){return null}q=j.cloneNode(false);q.nodeValue=l;return q}if(s==e){return null}return j.cloneNode(false)},_traverseFullySelected:function(l,k){var j=this;if(k!=e){return k==c?l.cloneNode(true):l}l.parentNode.removeChild(l);return null}});f.Range=a})(tinymce.dom);(function(){function a(e){var d=this,h="\uFEFF",b,g;function c(j,i){if(j&&i){if(j.item&&i.item&&j.item(0)===i.item(0)){return 1}if(j.isEqual&&i.isEqual&&i.isEqual(j)){return 1}}return 0}function f(){var m=e.dom,j=e.getRng(),s=m.createRng(),p,k,n,q,o,l;function i(v){var t=v.parentNode.childNodes,u;for(u=t.length-1;u>=0;u--){if(t[u]==v){return u}}return -1}function r(v){var t=j.duplicate(),B,y,u,w,x=0,z=0,A,C;t.collapse(v);B=t.parentElement();t.pasteHTML(h);u=B.childNodes;for(y=0;y0&&(w.nodeType!==3||u[y-1].nodeType!==3)){z++}if(w.nodeType===3){A=w.nodeValue.indexOf(h);if(A!==-1){x+=A;break}x+=w.nodeValue.length}else{x=0}}t.moveStart("character",-1);t.text="";return{index:z,offset:x,parent:B}}n=j.item?j.item(0):j.parentElement();if(n.ownerDocument!=m.doc){return s}if(j.item||!n.hasChildNodes()){s.setStart(n.parentNode,i(n));s.setEnd(s.startContainer,s.startOffset+1);return s}l=e.isCollapsed();p=r(true);k=r(false);p.parent.normalize();k.parent.normalize();q=p.parent.childNodes[Math.min(p.index,p.parent.childNodes.length-1)];if(q.nodeType!=3){s.setStart(p.parent,p.index)}else{s.setStart(p.parent.childNodes[p.index],p.offset)}o=k.parent.childNodes[Math.min(k.index,k.parent.childNodes.length-1)];if(o.nodeType!=3){if(!l){k.index++}s.setEnd(k.parent,k.index)}else{s.setEnd(k.parent.childNodes[k.index],k.offset)}if(!l){q=s.startContainer;if(q.nodeType==1){s.setStart(q,Math.min(s.startOffset,q.childNodes.length))}o=s.endContainer;if(o.nodeType==1){s.setEnd(o,Math.min(s.endOffset,o.childNodes.length))}}d.addRange(s);return s}this.addRange=function(j){var o,m=e.dom.doc.body,p,k,q,l,n,i;q=j.startContainer;l=j.startOffset;n=j.endContainer;i=j.endOffset;o=m.createTextRange();q=q.nodeType==1?q.childNodes[Math.min(l,q.childNodes.length-1)]:q;n=n.nodeType==1?n.childNodes[Math.min(l==i?i:i-1,n.childNodes.length-1)]:n;if(q==n&&q.nodeType==1){if(/^(IMG|TABLE)$/.test(q.nodeName)&&l!=i){o=m.createControlRange();o.addElement(q)}else{o=m.createTextRange();if(!q.hasChildNodes()&&q.canHaveHTML){q.innerHTML=h}o.moveToElementText(q);if(q.innerHTML==h){o.collapse(true);q.removeChild(q.firstChild)}}if(l==i){o.collapse(i<=j.endContainer.childNodes.length-1)}o.select();return}function r(t,v){var u,s,w;if(t.nodeType!=3){return -1}u=t.nodeValue;s=m.createTextRange();t.nodeValue=u.substring(0,v)+h+u.substring(v);s.moveToElementText(t.parentNode);s.findText(h);w=Math.abs(s.moveStart("character",-1048575));t.nodeValue=u;return w}if(j.collapsed){pos=r(q,l);o=m.createTextRange();o.move("character",pos);o.select();return}else{if(q==n&&q.nodeType==3){p=r(q,l);o.move("character",p);o.moveEnd("character",i-l);o.select();return}p=r(q,l);k=r(n,i);o=m.createTextRange();if(p==-1){o.moveToElementText(q);p=0}else{o.move("character",p)}tmpRng=m.createTextRange();if(k==-1){tmpRng.moveToElementText(n)}else{tmpRng.move("character",k)}o.setEndPoint("EndToEnd",tmpRng);o.select();return}};this.getRangeAt=function(){if(!b||!c(g,e.getRng())){b=f();g=e.getRng()}return b};this.destroy=function(){g=b=null}}tinymce.dom.TridentSelection=a})();(function(){var p=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,i=0,d=Object.prototype.toString,n=false;var b=function(D,t,A,v){A=A||[];var e=t=t||document;if(t.nodeType!==1&&t.nodeType!==9){return[]}if(!D||typeof D!=="string"){return A}var B=[],C,y,G,F,z,s,r=true,w=o(t);p.lastIndex=0;while((C=p.exec(D))!==null){B.push(C[1]);if(C[2]){s=RegExp.rightContext;break}}if(B.length>1&&j.exec(D)){if(B.length===2&&f.relative[B[0]]){y=g(B[0]+B[1],t)}else{y=f.relative[B[0]]?[t]:b(B.shift(),t);while(B.length){D=B.shift();if(f.relative[D]){D+=B.shift()}y=g(D,y)}}}else{if(!v&&B.length>1&&t.nodeType===9&&!w&&f.match.ID.test(B[0])&&!f.match.ID.test(B[B.length-1])){var H=b.find(B.shift(),t,w);t=H.expr?b.filter(H.expr,H.set)[0]:H.set[0]}if(t){var H=v?{expr:B.pop(),set:a(v)}:b.find(B.pop(),B.length===1&&(B[0]==="~"||B[0]==="+")&&t.parentNode?t.parentNode:t,w);y=H.expr?b.filter(H.expr,H.set):H.set;if(B.length>0){G=a(y)}else{r=false}while(B.length){var u=B.pop(),x=u;if(!f.relative[u]){u=""}else{x=B.pop()}if(x==null){x=t}f.relative[u](G,x,w)}}else{G=B=[]}}if(!G){G=y}if(!G){throw"Syntax error, unrecognized expression: "+(u||D)}if(d.call(G)==="[object Array]"){if(!r){A.push.apply(A,G)}else{if(t&&t.nodeType===1){for(var E=0;G[E]!=null;E++){if(G[E]&&(G[E]===true||G[E].nodeType===1&&h(t,G[E]))){A.push(y[E])}}}else{for(var E=0;G[E]!=null;E++){if(G[E]&&G[E].nodeType===1){A.push(y[E])}}}}}else{a(G,A)}if(s){b(s,e,A,v);b.uniqueSort(A)}return A};b.uniqueSort=function(r){if(c){n=false;r.sort(c);if(n){for(var e=1;e":function(w,r,x){var u=typeof r==="string";if(u&&!/\W/.test(r)){r=x?r:r.toUpperCase();for(var s=0,e=w.length;s=0)){if(!s){e.push(v)}}else{if(s){r[u]=false}}}}return false},ID:function(e){return e[1].replace(/\\/g,"")},TAG:function(r,e){for(var s=0;e[s]===false;s++){}return e[s]&&o(e[s])?r[1]:r[1].toUpperCase()},CHILD:function(e){if(e[1]=="nth"){var r=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(e[2]=="even"&&"2n"||e[2]=="odd"&&"2n+1"||!/\D/.test(e[2])&&"0n+"+e[2]||e[2]);e[2]=(r[1]+(r[2]||1))-0;e[3]=r[3]-0}e[0]=i++;return e},ATTR:function(u,r,s,e,v,w){var t=u[1].replace(/\\/g,"");if(!w&&f.attrMap[t]){u[1]=f.attrMap[t]}if(u[2]==="~="){u[4]=" "+u[4]+" "}return u},PSEUDO:function(u,r,s,e,v){if(u[1]==="not"){if(u[3].match(p).length>1||/^\w/.test(u[3])){u[3]=b(u[3],null,null,r)}else{var t=b.filter(u[3],r,s,true^v);if(!s){e.push.apply(e,t)}return false}}else{if(f.match.POS.test(u[0])||f.match.CHILD.test(u[0])){return true}}return u},POS:function(e){e.unshift(true);return e}},filters:{enabled:function(e){return e.disabled===false&&e.type!=="hidden"},disabled:function(e){return e.disabled===true},checked:function(e){return e.checked===true},selected:function(e){e.parentNode.selectedIndex;return e.selected===true},parent:function(e){return !!e.firstChild},empty:function(e){return !e.firstChild},has:function(s,r,e){return !!b(e[3],s).length},header:function(e){return/h\d/i.test(e.nodeName)},text:function(e){return"text"===e.type},radio:function(e){return"radio"===e.type},checkbox:function(e){return"checkbox"===e.type},file:function(e){return"file"===e.type},password:function(e){return"password"===e.type},submit:function(e){return"submit"===e.type},image:function(e){return"image"===e.type},reset:function(e){return"reset"===e.type},button:function(e){return"button"===e.type||e.nodeName.toUpperCase()==="BUTTON"},input:function(e){return/input|select|textarea|button/i.test(e.nodeName)}},setFilters:{first:function(r,e){return e===0},last:function(s,r,e,t){return r===t.length-1},even:function(r,e){return e%2===0},odd:function(r,e){return e%2===1},lt:function(s,r,e){return re[3]-0},nth:function(s,r,e){return e[3]-0==r},eq:function(s,r,e){return e[3]-0==r}},filter:{PSEUDO:function(w,s,t,x){var r=s[1],u=f.filters[r];if(u){return u(w,t,s,x)}else{if(r==="contains"){return(w.textContent||w.innerText||"").indexOf(s[3])>=0}else{if(r==="not"){var v=s[3];for(var t=0,e=v.length;t=0)}}},ID:function(r,e){return r.nodeType===1&&r.getAttribute("id")===e},TAG:function(r,e){return(e==="*"&&r.nodeType===1)||r.nodeName===e},CLASS:function(r,e){return(" "+(r.className||r.getAttribute("class"))+" ").indexOf(e)>-1},ATTR:function(v,t){var s=t[1],e=f.attrHandle[s]?f.attrHandle[s](v):v[s]!=null?v[s]:v.getAttribute(s),w=e+"",u=t[2],r=t[4];return e==null?u==="!=":u==="="?w===r:u==="*="?w.indexOf(r)>=0:u==="~="?(" "+w+" ").indexOf(r)>=0:!r?w&&e!==false:u==="!="?w!=r:u==="^="?w.indexOf(r)===0:u==="$="?w.substr(w.length-r.length)===r:u==="|="?w===r||w.substr(0,r.length+1)===r+"-":false},POS:function(u,r,s,v){var e=r[2],t=f.setFilters[e];if(t){return t(u,s,r,v)}}}};var j=f.match.POS;for(var l in f.match){f.match[l]=new RegExp(f.match[l].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var a=function(r,e){r=Array.prototype.slice.call(r);if(e){e.push.apply(e,r);return e}return r};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(k){a=function(u,t){var r=t||[];if(d.call(u)==="[object Array]"){Array.prototype.push.apply(r,u)}else{if(typeof u.length==="number"){for(var s=0,e=u.length;s";var e=document.documentElement;e.insertBefore(r,e.firstChild);if(!!document.getElementById(s)){f.find.ID=function(u,v,w){if(typeof v.getElementById!=="undefined"&&!w){var t=v.getElementById(u[1]);return t?t.id===u[1]||typeof t.getAttributeNode!=="undefined"&&t.getAttributeNode("id").nodeValue===u[1]?[t]:undefined:[]}};f.filter.ID=function(v,t){var u=typeof v.getAttributeNode!=="undefined"&&v.getAttributeNode("id");return v.nodeType===1&&u&&u.nodeValue===t}}e.removeChild(r)})();(function(){var e=document.createElement("div");e.appendChild(document.createComment(""));if(e.getElementsByTagName("*").length>0){f.find.TAG=function(r,v){var u=v.getElementsByTagName(r[1]);if(r[1]==="*"){var t=[];for(var s=0;u[s];s++){if(u[s].nodeType===1){t.push(u[s])}}u=t}return u}}e.innerHTML="";if(e.firstChild&&typeof e.firstChild.getAttribute!=="undefined"&&e.firstChild.getAttribute("href")!=="#"){f.attrHandle.href=function(r){return r.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var e=b,s=document.createElement("div");s.innerHTML="

";if(s.querySelectorAll&&s.querySelectorAll(".TEST").length===0){return}b=function(w,v,t,u){v=v||document;if(!u&&v.nodeType===9&&!o(v)){try{return a(v.querySelectorAll(w),t)}catch(x){}}return e(w,v,t,u)};for(var r in e){b[r]=e[r]}})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var e=document.createElement("div");e.innerHTML="
";if(e.getElementsByClassName("e").length===0){return}e.lastChild.className="e";if(e.getElementsByClassName("e").length===1){return}f.order.splice(1,0,"CLASS");f.find.CLASS=function(r,s,t){if(typeof s.getElementsByClassName!=="undefined"&&!t){return s.getElementsByClassName(r[1])}}})()}function m(r,w,v,A,x,z){var y=r=="previousSibling"&&!z;for(var t=0,s=A.length;t0){u=e;break}}}e=e[r]}A[t]=u}}}var h=document.compareDocumentPosition?function(r,e){return r.compareDocumentPosition(e)&16}:function(r,e){return r!==e&&(r.contains?r.contains(e):true)};var o=function(e){return e.nodeType===9&&e.documentElement.nodeName!=="HTML"||!!e.ownerDocument&&e.ownerDocument.documentElement.nodeName!=="HTML"};var g=function(e,x){var t=[],u="",v,s=x.nodeType?[x]:x;while((v=f.match.PSEUDO.exec(e))){u+=v[0];e=e.replace(f.match.PSEUDO,"")}e=f.relative[e]?e+"*":e;for(var w=0,r=s.length;w=0;h--){k=g[h];if(k.obj===l){j._remove(k.obj,k.name,k.cfunc);k.obj=k.cfunc=null;g.splice(h,1)}}}},cancel:function(g){if(!g){return false}this.stop(g);return this.prevent(g)},stop:function(g){if(g.stopPropagation){g.stopPropagation()}else{g.cancelBubble=true}return false},prevent:function(g){if(g.preventDefault){g.preventDefault()}else{g.returnValue=false}return false},destroy:function(){var g=this;f(g.events,function(j,h){g._remove(j.obj,j.name,j.cfunc);j.obj=j.cfunc=null});g.events=[];g=null},_add:function(h,i,g){if(h.attachEvent){h.attachEvent("on"+i,g)}else{if(h.addEventListener){h.addEventListener(i,g,false)}else{h["on"+i]=g}}},_remove:function(i,j,h){if(i){try{if(i.detachEvent){i.detachEvent("on"+j,h)}else{if(i.removeEventListener){i.removeEventListener(j,h,false)}else{i["on"+j]=null}}}catch(g){}}},_pageInit:function(h){var g=this;if(g.domLoaded){return}g.domLoaded=true;f(g.inits,function(i){i()});g.inits=[]},_wait:function(i){var g=this,h=i.document;if(i.tinyMCE_GZ&&tinyMCE_GZ.loaded){g.domLoaded=1;return}if(h.attachEvent){h.attachEvent("onreadystatechange",function(){if(h.readyState==="complete"){h.detachEvent("onreadystatechange",arguments.callee);g._pageInit(i)}});if(h.documentElement.doScroll&&i==i.top){(function(){if(g.domLoaded){return}try{h.documentElement.doScroll("left")}catch(j){setTimeout(arguments.callee,0);return}g._pageInit(i)})()}}else{if(h.addEventListener){g._add(i,"DOMContentLoaded",function(){g._pageInit(i)})}}g._add(i,"load",function(){g._pageInit(i)})}});a=d.dom.Event=new d.dom.EventUtils();a._wait(window);d.addUnload(function(){a.destroy()})})(tinymce);(function(a){var b=a.each;a.create("tinymce.dom.Element",{Element:function(g,e){var c=this,f,d;e=e||{};c.id=g;c.dom=f=e.dom||a.DOM;c.settings=e;if(!a.isIE){d=c.dom.get(c.id)}b(["getPos","getRect","getParent","add","setStyle","getStyle","setStyles","setAttrib","setAttribs","getAttrib","addClass","removeClass","hasClass","getOuterHTML","setOuterHTML","remove","show","hide","isHidden","setHTML","get"],function(h){c[h]=function(){var j=[g],k;for(k=0;k_';j.deleteContents();j.insertNode(f.getRng().createContextualFragment(i));l=f.dom.get("__caret");j=k.createRange();j.setStartBefore(l);j.setEndAfter(l);f.setRng(j);f.dom.remove("__caret")}else{if(j.item){k.execCommand("Delete",false,null);j=f.getRng()}j.pasteHTML(i)}f.onSetContent.dispatch(f,g)},getStart:function(){var f=this,g=f.getRng(),h;if(a){if(g.item){return g.item(0)}g=g.duplicate();g.collapse(1);h=g.parentElement();if(h&&h.nodeName=="BODY"){return h.firstChild}return h}else{h=g.startContainer;if(h.nodeName=="BODY"){return h.firstChild}return f.dom.getParent(h,"*")}},getEnd:function(){var f=this,g=f.getRng(),h;if(a){if(g.item){return g.item(0)}g=g.duplicate();g.collapse(0);h=g.parentElement();if(h&&h.nodeName=="BODY"){return h.lastChild}return h}else{h=g.endContainer;if(h.nodeName=="BODY"){return h.lastChild}return f.dom.getParent(h,"*")}},getBookmark:function(x){var j=this,m=j.getRng(),f,n,l,u=j.dom.getViewPort(j.win),v,p,z,o,w=-16777215,k,h=j.dom.getRoot(),g=0,i=0,y;n=u.x;l=u.y;if(x=="simple"){return{rng:m,scrollX:n,scrollY:l}}if(a){if(m.item){v=m.item(0);d(j.dom.select(v.nodeName),function(s,r){if(v==s){p=r;return false}});return{tag:v.nodeName,index:p,scrollX:n,scrollY:l}}f=j.dom.doc.body.createTextRange();f.moveToElementText(h);f.collapse(true);z=Math.abs(f.move("character",w));f=m.duplicate();f.collapse(true);p=Math.abs(f.move("character",w));f=m.duplicate();f.collapse(false);o=Math.abs(f.move("character",w))-p;return{start:p-z,length:o,scrollX:n,scrollY:l}}v=j.getNode();k=j.getSel();if(!k){return null}if(v&&v.nodeName=="IMG"){return{scrollX:n,scrollY:l}}function q(A,D,t){var s=j.dom.doc.createTreeWalker(A,NodeFilter.SHOW_TEXT,null,false),E,B=0,C={};while((E=s.nextNode())!=null){if(E==D){C.start=B}if(E==t){C.end=B;return C}B+=e(E.nodeValue||"").length}return null}if(k.anchorNode==k.focusNode&&k.anchorOffset==k.focusOffset){v=q(h,k.anchorNode,k.focusNode);if(!v){return{scrollX:n,scrollY:l}}e(k.anchorNode.nodeValue||"").replace(/^\s+/,function(r){g=r.length});return{start:Math.max(v.start+k.anchorOffset-g,0),end:Math.max(v.end+k.focusOffset-g,0),scrollX:n,scrollY:l,beg:k.anchorOffset-g==0}}else{v=q(h,m.startContainer,m.endContainer);if(!v){return{scrollX:n,scrollY:l}}return{start:Math.max(v.start+m.startOffset-g,0),end:Math.max(v.end+m.endOffset-i,0),scrollX:n,scrollY:l,beg:m.startOffset-g==0}}},moveToBookmark:function(n){var o=this,g=o.getRng(),p=o.getSel(),j=o.dom.getRoot(),m,h,k;function i(q,t,D){var B=o.dom.doc.createTreeWalker(q,NodeFilter.SHOW_TEXT,null,false),x,s=0,A={},u,C,z,y;while((x=B.nextNode())!=null){z=y=0;k=x.nodeValue||"";h=e(k).length;s+=h;if(s>=t&&!A.startNode){u=t-(s-h);if(n.beg&&u>=h){continue}A.startNode=x;A.startOffset=u+y}if(s>=D){A.endNode=x;A.endOffset=D-(s-h)+y;return A}}return null}if(!n){return false}o.win.scrollTo(n.scrollX,n.scrollY);if(a){if(g=n.rng){try{g.select()}catch(l){}return true}o.win.focus();if(n.tag){g=j.createControlRange();d(o.dom.select(n.tag),function(r,q){if(q==n.index){g.addElement(r)}})}else{try{if(n.start<0){return true}g=p.createRange();g.moveToElementText(j);g.collapse(true);g.moveStart("character",n.start);g.moveEnd("character",n.length)}catch(f){return true}}try{g.select()}catch(l){}return true}if(!p){return false}if(n.rng){p.removeAllRanges();p.addRange(n.rng)}else{if(b(n.start)&&b(n.end)){try{m=i(j,n.start,n.end);if(m){g=o.dom.doc.createRange();g.setStart(m.startNode,m.startOffset);g.setEnd(m.endNode,m.endOffset);p.removeAllRanges();p.addRange(g)}if(!c.isOpera){o.win.focus()}}catch(l){}}}},select:function(g,l){var p=this,f=p.getRng(),q=p.getSel(),o,m,k,j=p.win.document;function h(u,t){var s,r;if(u){s=j.createTreeWalker(u,NodeFilter.SHOW_TEXT,null,false);while(u=s.nextNode()){r=u;if(c.trim(u.nodeValue).length!=0){if(t){return u}else{r=u}}}}return r}if(a){try{o=j.body;if(/^(IMG|TABLE)$/.test(g.nodeName)){f=o.createControlRange();f.addElement(g)}else{f=o.createTextRange();f.moveToElementText(g)}f.select()}catch(i){}}else{if(l){m=h(g,1)||p.dom.select("br:first",g)[0];k=h(g,0)||p.dom.select("br:last",g)[0];if(m&&k){f=j.createRange();if(m.nodeName=="BR"){f.setStartBefore(m)}else{f.setStart(m,0)}if(k.nodeName=="BR"){f.setEndBefore(k)}else{f.setEnd(k,k.nodeValue.length)}}else{f.selectNode(g)}}else{f.selectNode(g)}p.setRng(f)}return g},isCollapsed:function(){var f=this,h=f.getRng(),g=f.getSel();if(!h||h.item){return false}return !g||h.boundingWidth==0||h.collapsed},collapse:function(f){var g=this,h=g.getRng(),i;if(h.item){i=h.item(0);h=this.win.document.body.createTextRange();h.moveToElementText(i)}h.collapse(!!f);g.setRng(h)},getSel:function(){var g=this,f=this.win;return f.getSelection?f.getSelection():f.document.selection},getRng:function(j){var g=this,h,i;if(j&&g.tridentSel){return g.tridentSel.getRangeAt(0)}try{if(h=g.getSel()){i=h.rangeCount>0?h.getRangeAt(0):(h.createRange?h.createRange():g.win.document.createRange())}}catch(f){}if(!i){i=a?g.win.document.body.createTextRange():g.win.document.createRange()}return i},setRng:function(i){var h,g=this;if(!g.tridentSel){h=g.getSel();if(h){h.removeAllRanges();h.addRange(i)}}else{if(i.cloneRange){g.tridentSel.addRange(i);return}try{i.select()}catch(f){}}},setNode:function(g){var f=this;f.setContent(f.dom.getOuterHTML(g));return g},getNode:function(){var f=this,h=f.getRng(),g=f.getSel(),i;if(!a){if(!h){return f.dom.getRoot()}i=h.commonAncestorContainer;if(!h.collapsed){if(c.isWebKit&&g.anchorNode&&g.anchorNode.nodeType==1){return g.anchorNode.childNodes[g.anchorOffset]}if(h.startContainer==h.endContainer){if(h.startOffset-h.endOffset<2){if(h.startContainer.hasChildNodes()){i=h.startContainer.childNodes[h.startOffset]}}}}return f.dom.getParent(i,"*")}return h.item?h.item(0):h.parentElement()},getSelectedBlocks:function(g,f){var i=this,j=i.dom,m,h,l,k=[];m=j.getParent(g||i.getStart(),j.isBlock);h=j.getParent(f||i.getEnd(),j.isBlock);if(m){k.push(m)}if(m&&h&&m!=h){l=m;while((l=l.nextSibling)&&l!=h){if(j.isBlock(l)){k.push(l)}}}if(h&&m!=h){k.push(h)}return k},destroy:function(g){var f=this;f.win=null;if(f.tridentSel){f.tridentSel.destroy()}if(!g){c.removeUnload(f.destroy)}}})})(tinymce);(function(a){a.create("tinymce.dom.XMLWriter",{node:null,XMLWriter:function(c){function b(){var e=document.implementation;if(!e||!e.createDocument){try{return new ActiveXObject("MSXML2.DOMDocument")}catch(d){}try{return new ActiveXObject("Microsoft.XmlDom")}catch(d){}}else{return e.createDocument("","",null)}}this.doc=b();this.valid=a.isOpera||a.isWebKit;this.reset()},reset:function(){var b=this,c=b.doc;if(c.firstChild){c.removeChild(c.firstChild)}b.node=c.appendChild(c.createElement("html"))},writeStartElement:function(c){var b=this;b.node=b.node.appendChild(b.doc.createElement(c))},writeAttribute:function(c,b){if(this.valid){b=b.replace(/>/g,"%MCGT%")}this.node.setAttribute(c,b)},writeEndElement:function(){this.node=this.node.parentNode},writeFullEndElement:function(){var b=this,c=b.node;c.appendChild(b.doc.createTextNode(""));b.node=c.parentNode},writeText:function(b){if(this.valid){b=b.replace(/>/g,"%MCGT%")}this.node.appendChild(this.doc.createTextNode(b))},writeCDATA:function(b){this.node.appendChild(this.doc.createCDATASection(b))},writeComment:function(b){if(a.isIE){b=b.replace(/^\-|\-$/g," ")}this.node.appendChild(this.doc.createComment(b.replace(/\-\-/g," ")))},getContent:function(){var b;b=this.doc.xml||new XMLSerializer().serializeToString(this.doc);b=b.replace(/<\?[^?]+\?>||<\/html>||]+>/g,"");b=b.replace(/ ?\/>/g," />");if(this.valid){b=b.replace(/\%MCGT%/g,">")}return b}})})(tinymce);(function(a){a.create("tinymce.dom.StringWriter",{str:null,tags:null,count:0,settings:null,indent:null,StringWriter:function(b){this.settings=a.extend({indent_char:" ",indentation:0},b);this.reset()},reset:function(){this.indent="";this.str="";this.tags=[];this.count=0},writeStartElement:function(b){this._writeAttributesEnd();this.writeRaw("<"+b);this.tags.push(b);this.inAttr=true;this.count++;this.elementCount=this.count},writeAttribute:function(d,b){var c=this;c.writeRaw(" "+c.encode(d)+'="'+c.encode(b)+'"')},writeEndElement:function(){var b;if(this.tags.length>0){b=this.tags.pop();if(this._writeAttributesEnd(1)){this.writeRaw("")}if(this.settings.indentation>0){this.writeRaw("\n")}}},writeFullEndElement:function(){if(this.tags.length>0){this._writeAttributesEnd();this.writeRaw("");if(this.settings.indentation>0){this.writeRaw("\n")}}},writeText:function(b){this._writeAttributesEnd();this.writeRaw(this.encode(b));this.count++},writeCDATA:function(b){this._writeAttributesEnd();this.writeRaw("");this.count++},writeComment:function(b){this._writeAttributesEnd();this.writeRaw("");this.count++},writeRaw:function(b){this.str+=b},encode:function(b){return b.replace(/[<>&"]/g,function(c){switch(c){case"<":return"<";case">":return">";case"&":return"&";case'"':return"""}return c})},getContent:function(){return this.str},_writeAttributesEnd:function(b){if(!this.inAttr){return}this.inAttr=false;if(b&&this.elementCount==this.count){this.writeRaw(" />");return false}this.writeRaw(">");return true}})})(tinymce);(function(e){var g=e.extend,f=e.each,b=e.util.Dispatcher,d=e.isIE,a=e.isGecko;function c(h){return h.replace(/([?+*])/g,".$1")}e.create("tinymce.dom.Serializer",{Serializer:function(j){var i=this;i.key=0;i.onPreProcess=new b(i);i.onPostProcess=new b(i);try{i.writer=new e.dom.XMLWriter()}catch(h){i.writer=new e.dom.StringWriter()}i.settings=j=g({dom:e.DOM,valid_nodes:0,node_filter:0,attr_filter:0,invalid_attrs:/^(mce_|_moz_)/,closed:/^(br|hr|input|meta|img|link|param|area)$/,entity_encoding:"named",entities:"160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro",bool_attrs:/(checked|disabled|readonly|selected|nowrap)/,valid_elements:"*[*]",extended_valid_elements:0,valid_child_elements:0,invalid_elements:0,fix_table_elements:1,fix_list_elements:true,fix_content_duplication:true,convert_fonts_to_spans:false,font_size_classes:0,font_size_style_values:0,apply_source_formatting:0,indent_mode:"simple",indent_char:"\t",indent_levels:1,remove_linebreaks:1,remove_redundant_brs:1,element_format:"xhtml"},j);i.dom=j.dom;if(j.remove_redundant_brs){i.onPostProcess.add(function(k,l){l.content=l.content.replace(/(
\s*)+<\/(p|h[1-6]|div|li)>/gi,function(n,m,o){if(/^
\s*<\//.test(n)){return""}return n})})}if(j.element_format=="html"){i.onPostProcess.add(function(k,l){l.content=l.content.replace(/<([^>]+) \/>/g,"<$1>")})}if(j.fix_list_elements){i.onPreProcess.add(function(v,s){var l,y,w=["ol","ul"],u,t,q,k=/^(OL|UL)$/,z;function m(r,x){var o=x.split(","),p;while((r=r.previousSibling)!=null){for(p=0;p1){f(q[1].split("|"),function(u){var p={},t;k=k||[];u=u.replace(/::/g,"~");u=/^([!\-])?([\w*.?~_\-]+|)([=:<])?(.+)?$/.exec(u);u[2]=u[2].replace(/~/g,":");if(u[1]=="!"){r=r||[];r.push(u[2])}if(u[1]=="-"){for(t=0;t]*>)(.*?)(<\/script>)/g},{pattern:/(]*>)(.*?)(<\/style>)/g},{pattern:/(]*>)(.*?)(<\/pre>)/g,encode:1},{pattern:/()/g}]});j=l.content;if(k.entity_encoding!=="raw"){j=i._encode(j)}if(!n.set){j=j.replace(/

\s+<\/p>|]+)>\s+<\/p>/g,k.entity_encoding=="numeric"?" 

":" 

");if(k.remove_linebreaks){j=j.replace(/\r?\n|\r/g," ");j=j.replace(/(<[^>]+>)\s+/g,"$1 ");j=j.replace(/\s+(<\/[^>]+>)/g," $1");j=j.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object) ([^>]+)>\s+/g,"<$1 $2>");j=j.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>\s+/g,"<$1>");j=j.replace(/\s+<\/(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>/g,"")}if(k.apply_source_formatting&&k.indent_mode=="simple"){j=j.replace(/<(\/?)(ul|hr|table|meta|link|tbody|tr|object|body|head|html|map)(|[^>]+)>\s*/g,"\n<$1$2$3>\n");j=j.replace(/\s*<(p|h[1-6]|blockquote|div|title|style|pre|script|td|li|area)(|[^>]+)>/g,"\n<$1$2>");j=j.replace(/<\/(p|h[1-6]|blockquote|div|title|style|pre|script|td|li)>\s*/g,"\n");j=j.replace(/\n\n/g,"\n")}}j=i._unprotect(j,l);j=j.replace(//g,"");j=j.replace(/(type|language)=\"mce-/g,'$1="');if(k.entity_encoding=="raw"){j=j.replace(/

 <\/p>|]+)> <\/p>/g,"\u00a0

")}}n.content=j},_serializeNode:function(D,o){var z=this,A=z.settings,x=z.writer,q,j,u,F,E,G,B,h,y,k,r,C,p,m;if(!A.node_filter||A.node_filter(D)){switch(D.nodeType){case 1:if(D.hasAttribute?D.hasAttribute("mce_bogus"):D.getAttribute("mce_bogus")){return}p=false;q=D.hasChildNodes();k=D.getAttribute("mce_name")||D.nodeName.toLowerCase();if(d){if(D.scopeName!=="HTML"&&D.scopeName!=="html"){k=D.scopeName+":"+k}}if(k.indexOf("mce:")===0){k=k.substring(4)}if(!z.validElementsRE||!z.validElementsRE.test(k)||(z.invalidElementsRE&&z.invalidElementsRE.test(k))||o){p=true;break}if(d){if(A.fix_content_duplication){if(D.mce_serialized==z.key){return}D.mce_serialized=z.key}if(k.charAt(0)=="/"){k=k.substring(1)}}else{if(a){if(D.nodeName==="BR"&&D.getAttribute("type")=="_moz"){return}}}if(z.childRules){if(z.parentElementsRE.test(z.elementName)){if(!z.childRules[z.elementName].test(k)){p=true;break}}z.elementName=k}r=z.findRule(k);k=r.name||k;m=A.closed.test(k);if((!q&&r.noEmpty)||(d&&!k)){p=true;break}if(r.requiredAttribs){G=r.requiredAttribs;for(F=G.length-1;F>=0;F--){if(this.dom.getAttrib(D,G[F])!==""){break}}if(F==-1){p=true;break}}x.writeStartElement(k);if(r.attribs){for(F=0,B=r.attribs,E=B.length;F-1;F--){h=B[F];if(h.specified){G=h.nodeName.toLowerCase();if(A.invalid_attrs.test(G)||!r.validAttribsRE.test(G)){continue}C=z.findAttribRule(r,G);y=z._getAttrib(D,C,G);if(y!==null){x.writeAttribute(G,y)}}}}if(k==="script"&&e.trim(D.innerHTML)){x.writeText("// ");x.writeCDATA(D.innerHTML.replace(/|<\[CDATA\[|\]\]>/g,""));q=false;break}if(r.padd){if(q&&(u=D.firstChild)&&u.nodeType===1&&D.childNodes.length===1){if(u.hasAttribute?u.hasAttribute("mce_bogus"):u.getAttribute("mce_bogus")){x.writeText("\u00a0")}}else{if(!q){x.writeText("\u00a0")}}}break;case 3:if(z.childRules&&z.parentElementsRE.test(z.elementName)){if(!z.childRules[z.elementName].test(D.nodeName)){return}}return x.writeText(D.nodeValue);case 4:return x.writeCDATA(D.nodeValue);case 8:return x.writeComment(D.nodeValue)}}else{if(D.nodeType==1){q=D.hasChildNodes()}}if(q&&!m){u=D.firstChild;while(u){z._serializeNode(u);z.elementName=k;u=u.nextSibling}}if(!p){if(!m){x.writeFullEndElement()}else{x.writeEndElement()}}},_protect:function(j){var i=this;j.items=j.items||[];function h(l){return l.replace(/[\r\n\\]/g,function(m){if(m==="\n"){return"\\n"}else{if(m==="\\"){return"\\\\"}}return"\\r"})}function k(l){return l.replace(/\\[\\rn]/g,function(m){if(m==="\\n"){return"\n"}else{if(m==="\\\\"){return"\\"}}return"\r"})}f(j.patterns,function(l){j.content=k(h(j.content).replace(l.pattern,function(n,o,m,p){m=k(m);if(l.encode){m=i._encode(m)}j.items.push(m);return o+""+p}))});return j},_unprotect:function(i,j){i=i.replace(/\"))}if(a&&j.ListBox){if(a.Button||a.SplitButton){e+=b.createHTML("td",{"class":"mceToolbarEnd"},b.createHTML("span",null,""))}}if(b.stdMode){e+=''+j.renderHTML()+""}else{e+=""+j.renderHTML()+""}if(f&&j.ListBox){if(f.Button||f.SplitButton){e+=b.createHTML("td",{"class":"mceToolbarStart"},b.createHTML("span",null,""))}}}g="mceToolbarEnd";if(j.Button){g+=" mceToolbarEndButton"}else{if(j.SplitButton){g+=" mceToolbarEndSplitButton"}else{if(j.ListBox){g+=" mceToolbarEndListBox"}}}e+=b.createHTML("td",{"class":g},b.createHTML("span",null,""));return b.createHTML("table",{id:l.id,"class":"mceToolbar"+(m["class"]?" "+m["class"]:""),cellpadding:"0",cellspacing:"0",align:l.settings.align||""},""+e+"")}});(function(b){var a=b.util.Dispatcher,c=b.each;b.create("tinymce.AddOnManager",{items:[],urls:{},lookup:{},onAdd:new a(this),get:function(d){return this.lookup[d]},requireLangPack:function(f){var d,e=b.EditorManager.settings;if(e&&e.language){d=this.urls[f]+"/langs/"+e.language+".js";if(!b.dom.Event.domLoaded&&!e.strict_mode){b.ScriptLoader.load(d)}else{b.ScriptLoader.add(d)}}},add:function(e,d){this.items.push(d);this.lookup[e]=d;this.onAdd.dispatch(this,e,d);return d},load:function(h,e,d,g){var f=this;if(f.urls[h]){return}if(e.indexOf("/")!=0&&e.indexOf("://")==-1){e=b.baseURL+"/"+e}f.urls[h]=e.substring(0,e.lastIndexOf("/"));b.ScriptLoader.add(e,d,g)}});b.PluginManager=new b.AddOnManager();b.ThemeManager=new b.AddOnManager()}(tinymce));(function(f){var g=f.each,h=f.extend,e=f.DOM,a=f.dom.Event,c=f.ThemeManager,b=f.PluginManager,d=f.explode;f.create("static tinymce.EditorManager",{editors:{},i18n:{},activeEditor:null,preInit:function(){var i=this,j=window.location;f.documentBaseURL=j.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,"");if(!/[\/\\]$/.test(f.documentBaseURL)){f.documentBaseURL+="/"}f.baseURL=new f.util.URI(f.documentBaseURL).toAbsolute(f.baseURL);f.EditorManager.baseURI=new f.util.URI(f.baseURL);if(document.domain&&j.hostname!=document.domain){f.relaxedDomain=document.domain}i.onBeforeUnload=new f.util.Dispatcher(i);a.add(window,"beforeunload",function(k){i.onBeforeUnload.dispatch(i,k)})},init:function(q){var p=this,l,k=f.ScriptLoader,o,n,i=[],m;function j(u,v,r){var t=u[v];if(!t){return}if(f.is(t,"string")){r=t.replace(/\.\w+$/,"");r=r?f.resolve(r):0;t=f.resolve(t)}return t.apply(r||this,Array.prototype.slice.call(arguments,2))}q=h({theme:"simple",language:"en",strict_loading_mode:document.contentType=="application/xhtml+xml"},q);p.settings=q;if(!a.domLoaded&&!q.strict_loading_mode){if(q.language){k.add(f.baseURL+"/langs/"+q.language+".js")}if(q.theme&&q.theme.charAt(0)!="-"&&!c.urls[q.theme]){c.load(q.theme,"themes/"+q.theme+"/editor_template"+f.suffix+".js")}if(q.plugins){l=d(q.plugins);if(f.inArray(l,"compat2x")!=-1){b.load("compat2x","plugins/compat2x/editor_plugin"+f.suffix+".js")}g(l,function(r){if(r&&r.charAt(0)!="-"&&!b.urls[r]){if(!f.isWebKit&&r=="safari"){return}b.load(r,"plugins/"+r+"/editor_plugin"+f.suffix+".js")}})}k.loadQueue()}a.add(document,"init",function(){var r,t;j(q,"onpageload");if(q.browsers){r=false;g(d(q.browsers),function(u){switch(u){case"ie":case"msie":if(f.isIE){r=true}break;case"gecko":if(f.isGecko){r=true}break;case"safari":case"webkit":if(f.isWebKit){r=true}break;case"opera":if(f.isOpera){r=true}break}});if(!r){return}}switch(q.mode){case"exact":r=q.elements||"";if(r.length>0){g(d(r),function(u){if(e.get(u)){m=new f.Editor(u,q);i.push(m);m.render(1)}else{o=0;g(document.forms,function(v){g(v.elements,function(w){if(w.name===u){u="mce_editor_"+o;e.setAttrib(w,"id",u);m=new f.Editor(u,q);i.push(m);m.render(1)}})})}})}break;case"textareas":case"specific_textareas":function s(v,u){return u.constructor===RegExp?u.test(v.className):e.hasClass(v,u)}g(e.select("textarea"),function(u){if(q.editor_deselector&&s(u,q.editor_deselector)){return}if(!q.editor_selector||s(u,q.editor_selector)){n=e.get(u.name);if(!u.id&&!n){u.id=u.name}if(!u.id||p.get(u.id)){u.id=e.uniqueId()}m=new f.Editor(u.id,q);i.push(m);m.render(1)}});break}if(q.oninit){r=t=0;g(i,function(u){t++;if(!u.initialized){u.onInit.add(function(){r++;if(r==t){j(q,"oninit")}})}else{r++}if(r==t){j(q,"oninit")}})}})},get:function(i){return this.editors[i]},getInstanceById:function(i){return this.get(i)},add:function(i){this.editors[i.id]=i;this._setActive(i);return i},remove:function(j){var i=this;if(!i.editors[j.id]){return null}delete i.editors[j.id];if(i.activeEditor==j){g(i.editors,function(k){i._setActive(k);return false})}j.destroy();return j},execCommand:function(o,m,l){var n=this,k=n.get(l),i;switch(o){case"mceFocus":k.focus();return true;case"mceAddEditor":case"mceAddControl":if(!n.get(l)){new f.Editor(l,n.settings).render()}return true;case"mceAddFrameControl":i=l.window;i.tinyMCE=tinyMCE;i.tinymce=f;f.DOM.doc=i.document;f.DOM.win=i;k=new f.Editor(l.element_id,l);k.render();if(f.isIE){function j(){k.destroy();i.detachEvent("onunload",j);i=i.tinyMCE=i.tinymce=null}i.attachEvent("onunload",j)}l.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(k){k.remove()}return true;case"mceToggleEditor":if(!k){n.execCommand("mceAddControl",0,l);return true}if(k.isHidden()){k.show()}else{k.hide()}return true}if(n.activeEditor){return n.activeEditor.execCommand(o,m,l)}return false},execInstanceCommand:function(m,l,k,j){var i=this.get(m);if(i){return i.execCommand(l,k,j)}return false},triggerSave:function(){g(this.editors,function(i){i.save()})},addI18n:function(k,l){var i,j=this.i18n;if(!f.is(k,"string")){g(k,function(n,m){g(n,function(q,p){g(q,function(s,r){if(p==="common"){j[m+"."+r]=s}else{j[m+"."+p+"."+r]=s}})})})}else{g(l,function(n,m){j[k+"."+m]=n})}},_setActive:function(i){this.selectedInstance=this.activeEditor=i}});f.EditorManager.preInit()})(tinymce);var tinyMCE=window.tinyMCE=tinymce.EditorManager;(function(n){var o=n.DOM,k=n.dom.Event,f=n.extend,l=n.util.Dispatcher;var j=n.each,a=n.isGecko,b=n.isIE,e=n.isWebKit;var d=n.is,h=n.ThemeManager,c=n.PluginManager,i=n.EditorManager;var p=n.inArray,m=n.grep,g=n.explode;n.create("tinymce.Editor",{Editor:function(u,r){var q=this;q.id=q.editorId=u;q.execCommands={};q.queryStateCommands={};q.queryValueCommands={};q.plugins={};j(["onPreInit","onBeforeRenderUI","onPostRender","onInit","onRemove","onActivate","onDeactivate","onClick","onEvent","onMouseUp","onMouseDown","onDblClick","onKeyDown","onKeyUp","onKeyPress","onContextMenu","onSubmit","onReset","onPaste","onPreProcess","onPostProcess","onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent","onLoadContent","onSaveContent","onNodeChange","onChange","onBeforeExecCommand","onExecCommand","onUndo","onRedo","onVisualAid","onSetProgressState"],function(s){q[s]=new l(q)});q.settings=r=f({id:u,language:"en",docs_language:"en",theme:"simple",skin:"default",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:n.documentBaseURL,add_form_submit_trigger:1,submit_patch:1,add_unload_trigger:1,convert_urls:1,relative_urls:1,remove_script_host:1,table_inline_editing:0,object_resizing:1,cleanup:1,accessibility_focus:1,custom_shortcuts:1,custom_undo_redo_keyboard_shortcuts:1,custom_undo_redo_restore_selection:1,custom_undo_redo:1,doctype:'',visual_table_class:"mceItemTable",visual:1,inline_styles:true,convert_fonts_to_spans:true,font_size_style_values:"xx-small,x-small,small,medium,large,x-large,xx-large",apply_source_formatting:1,directionality:"ltr",forced_root_block:"p",valid_elements:"@[id|class|style|title|dir';F.iframeHTML+='';if(n.relaxedDomain){F.iframeHTML+=' - getTag(), 0, strpos( $language->getTag(), '-' ) ); - - if ($language->isRTL()) { - $direction = 'rtl'; - } else { - $direction = 'ltr'; - } - - /* - * Lets get the default template for the site application - */ - $query = 'SELECT template' - . ' FROM #__templates_menu' - . ' WHERE client_id = 0' - . ' AND menuid = 0' - ; - $db->setQuery( $query ); - $template = $db->loadResult(); - - $file_path = JPATH_SITE .'/templates/'. $template .'/css/'; - if ( !file_exists( $file_path .DS. 'editor.css' ) ) { - $template = 'system'; - } - - $css = JURI::root() .'/templates/'. $template . '/css/editor.css'; - - $html = ''; - ob_start(); - ?> - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- _displayButtons($name, $buttons); - - return $html; - } - - function onGetInsertMethod($name) - { - $doc = & JFactory::getDocument(); - - $js= "function jInsertEditorText( text ) { - var editor = document.getElementById('xstandard'); - editor.InsertXML(text); - }"; - $doc->addScriptDeclaration($js); - - return true; - } - - function _getTemplateCss() - { - $db =& JFactory::getDBO(); - - /* - * Lets get the default template for the site application - */ - $query = 'SELECT template' - . ' FROM #__templates_menu' - . ' WHERE client_id = 0' - . ' AND menuid = 0' - ; - $db->setQuery( $query ); - $template = $db->loadResult(); - - $content_css = JURI::root() .'/templates/'. $template .'/css/'; - - $file_path = JPATH_SITE .'/templates/'. $template .'/css/'; - if ( file_exists( $file_path .DS. 'editor.css' ) ) { - $content_css = $content_css . 'editor.css' .'", '; - } else { - $content_css = $content_css . 'template_css.css", '; - } - - return $content_css; - } - - function _displayButtons($name, $buttons) - { - // Load modal popup behavior - JHTML::_('behavior.modal', 'a.modal-button'); - - $args['name'] = $name; - $args['event'] = 'onGetInsertMethod'; - - $return = ''; - $results[] = $this->update($args); - foreach ($results as $result) { - if (is_string($result) && trim($result)) { - $return .= $result; - } - } - - if(!empty($buttons)) - { - $results = $this->_subject->getButtons($name, $buttons); - - /* - * This will allow plugins to attach buttons or change the behavior on the fly using AJAX - */ - $return .= "\n
\n"; - foreach ($results as $button) - { - /* - * Results should be an object - */ - if ( $button->get('name') ) - { - $modal = ($button->get('modal')) ? 'class="modal-button"' : null; - $href = ($button->get('link')) ? 'href="'.$button->get('link').'"' : null; - $onclick = ($button->get('onclick')) ? 'onclick="'.$button->get('onclick').'"' : null; - $return .= "
get('name')."\">get('text')."\" ".$href." ".$onclick." rel=\"".$button->get('options')."\">".$button->get('text')."
\n"; - } - } - $return .= "
\n"; - } - - return $return; - } + + + getTag(), 0, strpos( $language->getTag(), '-' ) ); + + if ($language->isRTL()) { + $direction = 'rtl'; + } else { + $direction = 'ltr'; + } + + /* + * Lets get the default template for the site application + */ + $query = 'SELECT template' + . ' FROM #__templates_menu' + . ' WHERE client_id = 0' + . ' AND menuid = 0' + ; + $db->setQuery( $query ); + $template = $db->loadResult(); + + $file_path = JPATH_SITE .'/templates/'. $template .'/css/'; + if ( !file_exists( $file_path .DS. 'editor.css' ) ) { + $template = 'system'; + } + + $css = JURI::root() .'/templates/'. $template . '/css/editor.css'; + + $html = ''; + ob_start(); + ?> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ _displayButtons($name, $buttons); + + return $html; + } + + function onGetInsertMethod($name) + { + $doc = & JFactory::getDocument(); + + $js= "function jInsertEditorText( text ) { + var editor = document.getElementById('xstandard'); + editor.InsertXML(text); + }"; + $doc->addScriptDeclaration($js); + + return true; + } + + function _getTemplateCss() + { + $db =& JFactory::getDBO(); + + /* + * Lets get the default template for the site application + */ + $query = 'SELECT template' + . ' FROM #__templates_menu' + . ' WHERE client_id = 0' + . ' AND menuid = 0' + ; + $db->setQuery( $query ); + $template = $db->loadResult(); + + $content_css = JURI::root() .'/templates/'. $template .'/css/'; + + $file_path = JPATH_SITE .'/templates/'. $template .'/css/'; + if ( file_exists( $file_path .DS. 'editor.css' ) ) { + $content_css = $content_css . 'editor.css' .'", '; + } else { + $content_css = $content_css . 'template_css.css", '; + } + + return $content_css; + } + + function _displayButtons($name, $buttons) + { + // Load modal popup behavior + JHTML::_('behavior.modal', 'a.modal-button'); + + $args['name'] = $name; + $args['event'] = 'onGetInsertMethod'; + + $return = ''; + $results[] = $this->update($args); + foreach ($results as $result) { + if (is_string($result) && trim($result)) { + $return .= $result; + } + } + + if(!empty($buttons)) + { + $results = $this->_subject->getButtons($name, $buttons); + + /* + * This will allow plugins to attach buttons or change the behavior on the fly using AJAX + */ + $return .= "\n
\n"; + foreach ($results as $button) + { + /* + * Results should be an object + */ + if ( $button->get('name') ) + { + $modal = ($button->get('modal')) ? 'class="modal-button"' : null; + $href = ($button->get('link')) ? 'href="'.$button->get('link').'"' : null; + $onclick = ($button->get('onclick')) ? 'onclick="'.$button->get('onclick').'"' : null; + $return .= "
get('name')."\">get('text')."\" ".$href." ".$onclick." rel=\"".$button->get('options')."\">".$button->get('text')."
\n"; + } + } + $return .= "
\n"; + } + + return $return; + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/editors/xstandard.xml b/oss/joomla/trunk/plugins/editors/xstandard.xml index b3f72652..4771bb24 100644 --- a/oss/joomla/trunk/plugins/editors/xstandard.xml +++ b/oss/joomla/trunk/plugins/editors/xstandard.xml @@ -6,7 +6,7 @@ Joomla! Project admin@joomla.org www.joomla.org - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL DESCXSTANDARD diff --git a/oss/joomla/trunk/plugins/editors/xstandard/xstandard.js b/oss/joomla/trunk/plugins/editors/xstandard/xstandard.js index e90789ee..3a61967d 100644 --- a/oss/joomla/trunk/plugins/editors/xstandard/xstandard.js +++ b/oss/joomla/trunk/plugins/editors/xstandard/xstandard.js @@ -1,49 +1,49 @@ -/** - * @version $Id: xstandard.js 10714 2008-08-21 10:10:14Z eddieajau $ - * @package Joomla - * @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. - */ - -/** - * JXStandard javascript behavior - * - * @package Joomla - * @since 1.5 - * @version 1.0 - */ -var JXStandard = new Class({ - - instances : null, - - initialize: function() - { - this.instances = $ES('object[type=application/x-xstandard]'); - - var self = this; - document.adminForm.onsubmit = function() { - self.save(); - } - }, - - save: function() - { - this.instances.each(function(instance) - { - instance.EscapeUnicode = false; - var contents = instance.value; - $(instance.className).value = contents; - }); - } -}) - -document.xstandard = null -window.addEvent('domready', function(){ - var xstandard = new JXStandard(); - document.xstandard = xstandard; +/** + * @version $Id: xstandard.js 14401 2010-01-26 14:10:00Z louis $ + * @package Joomla + * @copyright Copyright (C) 2005 - 2010 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. + */ + +/** + * JXStandard javascript behavior + * + * @package Joomla + * @since 1.5 + * @version 1.0 + */ +var JXStandard = new Class({ + + instances : null, + + initialize: function() + { + this.instances = $ES('object[type=application/x-xstandard]'); + + var self = this; + document.adminForm.onsubmit = function() { + self.save(); + } + }, + + save: function() + { + this.instances.each(function(instance) + { + instance.EscapeUnicode = false; + var contents = instance.value; + $(instance.className).value = contents; + }); + } +}) + +document.xstandard = null +window.addEvent('domready', function(){ + var xstandard = new JXStandard(); + document.xstandard = xstandard; }); \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/search/categories.php b/oss/joomla/trunk/plugins/search/categories.php index 79b535e6..da722a9b 100644 --- a/oss/joomla/trunk/plugins/search/categories.php +++ b/oss/joomla/trunk/plugins/search/categories.php @@ -1,116 +1,116 @@ -registerEvent( 'onSearch', 'plgSearchCategories' ); -$mainframe->registerEvent( 'onSearchAreas', 'plgSearchCategoryAreas' ); - -JPlugin::loadLanguage( 'plg_search_categories' ); - -/** - * @return array An array of search areas - */ -function &plgSearchCategoryAreas() -{ - static $areas = array( - 'categories' => 'Categories' - ); - return $areas; -} - -/** - * Categories Search method - * - * The sql must return the following fields that are - * used in a common display routine: href, title, section, created, text, - * browsernav - * @param string Target search string - * @param string mathcing option, exact|any|all - * @param string ordering option, newest|oldest|popular|alpha|category - * @param mixed An array if restricted to areas, null if search all - */ -function plgSearchCategories( $text, $phrase='', $ordering='', $areas=null ) -{ - $db =& JFactory::getDBO(); - $user =& JFactory::getUser(); - $searchText = $text; - - require_once(JPATH_SITE.DS.'components'.DS.'com_content'.DS.'helpers'.DS.'route.php'); - - if (is_array( $areas )) { - if (!array_intersect( $areas, array_keys( plgSearchCategoryAreas() ) )) { - return array(); - } - } - - // load plugin params info - $plugin =& JPluginHelper::getPlugin('search', 'categories'); - $pluginParams = new JParameter( $plugin->params ); - - $limit = $pluginParams->def( 'search_limit', 50 ); - - $text = trim( $text ); - if ( $text == '' ) { - return array(); - } - - switch ( $ordering ) { - case 'alpha': - $order = 'a.name ASC'; - break; - - case 'category': - case 'popular': - case 'newest': - case 'oldest': - default: - $order = 'a.name DESC'; - } - - $text = $db->Quote( '%'.$db->getEscaped( $text, true ).'%', false ); - $query = 'SELECT a.title, a.description AS text, "" AS created, a.name,' - . ' "2" AS browsernav,' - . ' s.id AS secid, a.id AS catid,' - . ' CASE WHEN CHAR_LENGTH(a.alias) THEN CONCAT_WS(":", a.id, a.alias) ELSE a.id END as slug' - . ' FROM #__categories AS a' - . ' INNER JOIN #__sections AS s ON s.id = a.section' - . ' WHERE ( a.name LIKE '.$text - . ' OR a.title LIKE '.$text - . ' OR a.description LIKE '.$text.' )' - . ' AND a.published = 1' - . ' AND s.published = 1' - . ' AND a.access <= '.(int) $user->get('aid') - . ' AND s.access <= '.(int) $user->get('aid') - . ' GROUP BY a.id' - . ' ORDER BY '. $order - ; - $db->setQuery( $query, 0, $limit ); - $rows = $db->loadObjectList(); - - $count = count( $rows ); - for ( $i = 0; $i < $count; $i++ ) { - $rows[$i]->href = ContentHelperRoute::getCategoryRoute($rows[$i]->slug, $rows[$i]->secid); - $rows[$i]->section = JText::_( 'Category' ); - } - - $return = array(); - foreach($rows AS $key => $category) { - if(searchHelper::checkNoHTML($category, $searchText, array('name', 'title', 'text'))) { - $return[] = $category; - } - } - - return $return; -} +registerEvent( 'onSearch', 'plgSearchCategories' ); +$mainframe->registerEvent( 'onSearchAreas', 'plgSearchCategoryAreas' ); + +JPlugin::loadLanguage( 'plg_search_categories' ); + +/** + * @return array An array of search areas + */ +function &plgSearchCategoryAreas() +{ + static $areas = array( + 'categories' => 'Categories' + ); + return $areas; +} + +/** + * Categories Search method + * + * The sql must return the following fields that are + * used in a common display routine: href, title, section, created, text, + * browsernav + * @param string Target search string + * @param string mathcing option, exact|any|all + * @param string ordering option, newest|oldest|popular|alpha|category + * @param mixed An array if restricted to areas, null if search all + */ +function plgSearchCategories( $text, $phrase='', $ordering='', $areas=null ) +{ + $db =& JFactory::getDBO(); + $user =& JFactory::getUser(); + $searchText = $text; + + require_once(JPATH_SITE.DS.'components'.DS.'com_content'.DS.'helpers'.DS.'route.php'); + + if (is_array( $areas )) { + if (!array_intersect( $areas, array_keys( plgSearchCategoryAreas() ) )) { + return array(); + } + } + + // load plugin params info + $plugin =& JPluginHelper::getPlugin('search', 'categories'); + $pluginParams = new JParameter( $plugin->params ); + + $limit = $pluginParams->def( 'search_limit', 50 ); + + $text = trim( $text ); + if ( $text == '' ) { + return array(); + } + + switch ( $ordering ) { + case 'alpha': + $order = 'a.name ASC'; + break; + + case 'category': + case 'popular': + case 'newest': + case 'oldest': + default: + $order = 'a.name DESC'; + } + + $text = $db->Quote( '%'.$db->getEscaped( $text, true ).'%', false ); + $query = 'SELECT a.title, a.description AS text, "" AS created, a.name,' + . ' "2" AS browsernav,' + . ' s.id AS secid, a.id AS catid,' + . ' CASE WHEN CHAR_LENGTH(a.alias) THEN CONCAT_WS(":", a.id, a.alias) ELSE a.id END as slug' + . ' FROM #__categories AS a' + . ' INNER JOIN #__sections AS s ON s.id = a.section' + . ' WHERE ( a.name LIKE '.$text + . ' OR a.title LIKE '.$text + . ' OR a.description LIKE '.$text.' )' + . ' AND a.published = 1' + . ' AND s.published = 1' + . ' AND a.access <= '.(int) $user->get('aid') + . ' AND s.access <= '.(int) $user->get('aid') + . ' GROUP BY a.id' + . ' ORDER BY '. $order + ; + $db->setQuery( $query, 0, $limit ); + $rows = $db->loadObjectList(); + + $count = count( $rows ); + for ( $i = 0; $i < $count; $i++ ) { + $rows[$i]->href = ContentHelperRoute::getCategoryRoute($rows[$i]->slug, $rows[$i]->secid); + $rows[$i]->section = JText::_( 'Category' ); + } + + $return = array(); + foreach($rows AS $key => $category) { + if(searchHelper::checkNoHTML($category, $searchText, array('name', 'title', 'text'))) { + $return[] = $category; + } + } + + return $return; +} diff --git a/oss/joomla/trunk/plugins/search/categories.xml b/oss/joomla/trunk/plugins/search/categories.xml index 2d0f44dc..f9affb86 100644 --- a/oss/joomla/trunk/plugins/search/categories.xml +++ b/oss/joomla/trunk/plugins/search/categories.xml @@ -3,7 +3,7 @@ Search - Categories Joomla! Project November 2005 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/search/contacts.php b/oss/joomla/trunk/plugins/search/contacts.php index 9beb5623..198fbb9d 100644 --- a/oss/joomla/trunk/plugins/search/contacts.php +++ b/oss/joomla/trunk/plugins/search/contacts.php @@ -1,116 +1,116 @@ -registerEvent( 'onSearch', 'plgSearchContacts' ); -$mainframe->registerEvent( 'onSearchAreas', 'plgSearchContactAreas' ); - -JPlugin::loadLanguage( 'plg_search_contacts' ); - -/** - * @return array An array of search areas - */ -function &plgSearchContactAreas() -{ - static $areas = array( - 'contacts' => 'Contacts' - ); - return $areas; -} - -/** -* Contacts Search method -* -* The sql must return the following fields that are used in a common display -* routine: href, title, section, created, text, browsernav -* @param string Target search string -* @param string mathcing option, exact|any|all -* @param string ordering option, newest|oldest|popular|alpha|category -*/ -function plgSearchContacts( $text, $phrase='', $ordering='', $areas=null ) -{ - $db =& JFactory::getDBO(); - $user =& JFactory::getUser(); - - if (is_array( $areas )) { - if (!array_intersect( $areas, array_keys( plgSearchContactAreas() ) )) { - return array(); - } - } - - // load plugin params info - $plugin =& JPluginHelper::getPlugin('search', 'contacts'); - $pluginParams = new JParameter( $plugin->params ); - - $limit = $pluginParams->def( 'search_limit', 50 ); - - $text = trim( $text ); - if ($text == '') { - return array(); - } - - $section = JText::_( 'Contact' ); - - switch ( $ordering ) { - case 'alpha': - $order = 'a.name ASC'; - break; - - case 'category': - $order = 'b.title ASC, a.name ASC'; - break; - - case 'popular': - case 'newest': - case 'oldest': - default: - $order = 'a.name DESC'; - } - - $text = $db->Quote( '%'.$db->getEscaped( $text, true ).'%', false ); - $query = 'SELECT a.name AS title, "" AS created,' - . ' CASE WHEN CHAR_LENGTH(a.alias) THEN CONCAT_WS(\':\', a.id, a.alias) ELSE a.id END as slug, ' - . ' CASE WHEN CHAR_LENGTH(b.alias) THEN CONCAT_WS(\':\', b.id, b.alias) ELSE b.id END AS catslug, ' - . ' CONCAT_WS( ", ", a.name, a.con_position, a.misc ) AS text,' - . ' CONCAT_WS( " / ", '.$db->Quote($section).', b.title ) AS section,' - . ' "2" AS browsernav' - . ' FROM #__contact_details AS a' - . ' INNER JOIN #__categories AS b ON b.id = a.catid' - . ' WHERE ( a.name LIKE '.$text - . ' OR a.misc LIKE '.$text - . ' OR a.con_position LIKE '.$text - . ' OR a.address LIKE '.$text - . ' OR a.suburb LIKE '.$text - . ' OR a.state LIKE '.$text - . ' OR a.country LIKE '.$text - . ' OR a.postcode LIKE '.$text - . ' OR a.telephone LIKE '.$text - . ' OR a.fax LIKE '.$text.' )' - . ' AND a.published = 1' - . ' AND b.published = 1' - . ' AND a.access <= '.(int) $user->get( 'aid' ) - . ' AND b.access <= '.(int) $user->get( 'aid' ) - . ' GROUP BY a.id' - . ' ORDER BY '. $order - ; - $db->setQuery( $query, 0, $limit ); - $rows = $db->loadObjectList(); - - foreach($rows as $key => $row) { - $rows[$key]->href = 'index.php?option=com_contact&view=contact&id='.$row->slug.'&catid='.$row->catslug; - } - - return $rows; -} +registerEvent( 'onSearch', 'plgSearchContacts' ); +$mainframe->registerEvent( 'onSearchAreas', 'plgSearchContactAreas' ); + +JPlugin::loadLanguage( 'plg_search_contacts' ); + +/** + * @return array An array of search areas + */ +function &plgSearchContactAreas() +{ + static $areas = array( + 'contacts' => 'Contacts' + ); + return $areas; +} + +/** +* Contacts Search method +* +* The sql must return the following fields that are used in a common display +* routine: href, title, section, created, text, browsernav +* @param string Target search string +* @param string mathcing option, exact|any|all +* @param string ordering option, newest|oldest|popular|alpha|category +*/ +function plgSearchContacts( $text, $phrase='', $ordering='', $areas=null ) +{ + $db =& JFactory::getDBO(); + $user =& JFactory::getUser(); + + if (is_array( $areas )) { + if (!array_intersect( $areas, array_keys( plgSearchContactAreas() ) )) { + return array(); + } + } + + // load plugin params info + $plugin =& JPluginHelper::getPlugin('search', 'contacts'); + $pluginParams = new JParameter( $plugin->params ); + + $limit = $pluginParams->def( 'search_limit', 50 ); + + $text = trim( $text ); + if ($text == '') { + return array(); + } + + $section = JText::_( 'Contact' ); + + switch ( $ordering ) { + case 'alpha': + $order = 'a.name ASC'; + break; + + case 'category': + $order = 'b.title ASC, a.name ASC'; + break; + + case 'popular': + case 'newest': + case 'oldest': + default: + $order = 'a.name DESC'; + } + + $text = $db->Quote( '%'.$db->getEscaped( $text, true ).'%', false ); + $query = 'SELECT a.name AS title, "" AS created,' + . ' CASE WHEN CHAR_LENGTH(a.alias) THEN CONCAT_WS(\':\', a.id, a.alias) ELSE a.id END as slug, ' + . ' CASE WHEN CHAR_LENGTH(b.alias) THEN CONCAT_WS(\':\', b.id, b.alias) ELSE b.id END AS catslug, ' + . ' CONCAT_WS( ", ", a.name, a.con_position, a.misc ) AS text,' + . ' CONCAT_WS( " / ", '.$db->Quote($section).', b.title ) AS section,' + . ' "2" AS browsernav' + . ' FROM #__contact_details AS a' + . ' INNER JOIN #__categories AS b ON b.id = a.catid' + . ' WHERE ( a.name LIKE '.$text + . ' OR a.misc LIKE '.$text + . ' OR a.con_position LIKE '.$text + . ' OR a.address LIKE '.$text + . ' OR a.suburb LIKE '.$text + . ' OR a.state LIKE '.$text + . ' OR a.country LIKE '.$text + . ' OR a.postcode LIKE '.$text + . ' OR a.telephone LIKE '.$text + . ' OR a.fax LIKE '.$text.' )' + . ' AND a.published = 1' + . ' AND b.published = 1' + . ' AND a.access <= '.(int) $user->get( 'aid' ) + . ' AND b.access <= '.(int) $user->get( 'aid' ) + . ' GROUP BY a.id' + . ' ORDER BY '. $order + ; + $db->setQuery( $query, 0, $limit ); + $rows = $db->loadObjectList(); + + foreach($rows as $key => $row) { + $rows[$key]->href = 'index.php?option=com_contact&view=contact&id='.$row->slug.'&catid='.$row->catslug; + } + + return $rows; +} diff --git a/oss/joomla/trunk/plugins/search/contacts.xml b/oss/joomla/trunk/plugins/search/contacts.xml index ab5c2023..1c0738db 100644 --- a/oss/joomla/trunk/plugins/search/contacts.xml +++ b/oss/joomla/trunk/plugins/search/contacts.xml @@ -3,7 +3,7 @@ Search - Contacts Joomla! Project November 2005 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/search/content.php b/oss/joomla/trunk/plugins/search/content.php index d2721cab..f3bf268d 100644 --- a/oss/joomla/trunk/plugins/search/content.php +++ b/oss/joomla/trunk/plugins/search/content.php @@ -1,264 +1,264 @@ -registerEvent( 'onSearch', 'plgSearchContent' ); -$mainframe->registerEvent( 'onSearchAreas', 'plgSearchContentAreas' ); - -JPlugin::loadLanguage( 'plg_search_content' ); - -/** - * @return array An array of search areas - */ -function &plgSearchContentAreas() -{ - static $areas = array( - 'content' => 'Articles' - ); - return $areas; -} - -/** - * Content Search method - * The sql must return the following fields that are used in a common display - * routine: href, title, section, created, text, browsernav - * @param string Target search string - * @param string mathcing option, exact|any|all - * @param string ordering option, newest|oldest|popular|alpha|category - * @param mixed An array if the search it to be restricted to areas, null if search all - */ -function plgSearchContent( $text, $phrase='', $ordering='', $areas=null ) -{ - global $mainframe; - - $db =& JFactory::getDBO(); - $user =& JFactory::getUser(); - - require_once(JPATH_SITE.DS.'components'.DS.'com_content'.DS.'helpers'.DS.'route.php'); - require_once(JPATH_SITE.DS.'administrator'.DS.'components'.DS.'com_search'.DS.'helpers'.DS.'search.php'); - - $searchText = $text; - if (is_array( $areas )) { - if (!array_intersect( $areas, array_keys( plgSearchContentAreas() ) )) { - return array(); - } - } - - // load plugin params info - $plugin =& JPluginHelper::getPlugin('search', 'content'); - $pluginParams = new JParameter( $plugin->params ); - - $sContent = $pluginParams->get( 'search_content', 1 ); - $sUncategorised = $pluginParams->get( 'search_uncategorised', 1 ); - $sArchived = $pluginParams->get( 'search_archived', 1 ); - $limit = $pluginParams->def( 'search_limit', 50 ); - - $nullDate = $db->getNullDate(); - $date =& JFactory::getDate(); - $now = $date->toMySQL(); - - $text = trim( $text ); - if ($text == '') { - return array(); - } - - $wheres = array(); - switch ($phrase) { - case 'exact': - $text = $db->Quote( '%'.$db->getEscaped( $text, true ).'%', false ); - $wheres2 = array(); - $wheres2[] = 'a.title LIKE '.$text; - $wheres2[] = 'a.introtext LIKE '.$text; - $wheres2[] = 'a.fulltext LIKE '.$text; - $wheres2[] = 'a.metakey LIKE '.$text; - $wheres2[] = 'a.metadesc LIKE '.$text; - $where = '(' . implode( ') OR (', $wheres2 ) . ')'; - break; - - case 'all': - case 'any': - default: - $words = explode( ' ', $text ); - $wheres = array(); - foreach ($words as $word) { - $word = $db->Quote( '%'.$db->getEscaped( $word, true ).'%', false ); - $wheres2 = array(); - $wheres2[] = 'a.title LIKE '.$word; - $wheres2[] = 'a.introtext LIKE '.$word; - $wheres2[] = 'a.fulltext LIKE '.$word; - $wheres2[] = 'a.metakey LIKE '.$word; - $wheres2[] = 'a.metadesc LIKE '.$word; - $wheres[] = implode( ' OR ', $wheres2 ); - } - $where = '(' . implode( ($phrase == 'all' ? ') AND (' : ') OR ('), $wheres ) . ')'; - break; - } - - $morder = ''; - switch ($ordering) { - case 'oldest': - $order = 'a.created ASC'; - break; - - case 'popular': - $order = 'a.hits DESC'; - break; - - case 'alpha': - $order = 'a.title ASC'; - break; - - case 'category': - $order = 'b.title ASC, a.title ASC'; - $morder = 'a.title ASC'; - break; - - case 'newest': - default: - $order = 'a.created DESC'; - break; - } - - $rows = array(); - - // search articles - if ( $sContent && $limit > 0 ) - { - $query = 'SELECT a.title AS title, a.metadesc, a.metakey,' - . ' a.created AS created,' - . ' CONCAT(a.introtext, a.fulltext) AS text,' - . ' CONCAT_WS( "/", u.title, b.title ) AS section,' - . ' CASE WHEN CHAR_LENGTH(a.alias) THEN CONCAT_WS(":", a.id, a.alias) ELSE a.id END as slug,' - . ' CASE WHEN CHAR_LENGTH(b.alias) THEN CONCAT_WS(":", b.id, b.alias) ELSE b.id END as catslug,' - . ' u.id AS sectionid,' - . ' "2" AS browsernav' - . ' FROM #__content AS a' - . ' INNER JOIN #__categories AS b ON b.id=a.catid' - . ' INNER JOIN #__sections AS u ON u.id = a.sectionid' - . ' WHERE ( '.$where.' )' - . ' AND a.state = 1' - . ' AND u.published = 1' - . ' AND b.published = 1' - . ' AND a.access <= '.(int) $user->get( 'aid' ) - . ' AND b.access <= '.(int) $user->get( 'aid' ) - . ' AND u.access <= '.(int) $user->get( 'aid' ) - . ' AND ( a.publish_up = '.$db->Quote($nullDate).' OR a.publish_up <= '.$db->Quote($now).' )' - . ' AND ( a.publish_down = '.$db->Quote($nullDate).' OR a.publish_down >= '.$db->Quote($now).' )' - . ' GROUP BY a.id' - . ' ORDER BY '. $order - ; - $db->setQuery( $query, 0, $limit ); - $list = $db->loadObjectList(); - $limit -= count($list); - - if(isset($list)) - { - foreach($list as $key => $item) - { - $list[$key]->href = ContentHelperRoute::getArticleRoute($item->slug, $item->catslug, $item->sectionid); - } - } - $rows[] = $list; - } - - // search uncategorised content - if ( $sUncategorised && $limit > 0 ) - { - $query = 'SELECT id, a.title AS title, a.created AS created, a.metadesc, a.metakey, ' - . ' CONCAT(a.introtext, a.fulltext) AS text,' - . ' "2" as browsernav, "'. $db->Quote(JText::_('Uncategorised Content')) .'" AS section' - . ' FROM #__content AS a' - . ' WHERE ('.$where.')' - . ' AND a.state = 1' - . ' AND a.access <= '.(int) $user->get( 'aid' ) - . ' AND a.sectionid = 0' - . ' AND a.catid = 0' - . ' AND ( a.publish_up = '.$db->Quote($nullDate).' OR a.publish_up <= '.$db->Quote($now).' )' - . ' AND ( a.publish_down = '.$db->Quote($nullDate).' OR a.publish_down >= '.$db->Quote($now).' )' - . ' ORDER BY '. ($morder ? $morder : $order) - ; - $db->setQuery( $query, 0, $limit ); - $list2 = $db->loadObjectList(); - $limit -= count($list2); - - if(isset($list2)) - { - foreach($list2 as $key => $item) - { - $list2[$key]->href = ContentHelperRoute::getArticleRoute($item->id); - } - } - - $rows[] = $list2; - } - - // search archived content - if ( $sArchived && $limit > 0 ) - { - $searchArchived = JText::_( 'Archived' ); - - $query = 'SELECT a.title AS title, a.metadesc, a.metakey,' - . ' a.created AS created,' - . ' CONCAT(a.introtext, a.fulltext) AS text,' - . ' CASE WHEN CHAR_LENGTH(a.alias) THEN CONCAT_WS(":", a.id, a.alias) ELSE a.id END as slug,' - . ' CASE WHEN CHAR_LENGTH(b.alias) THEN CONCAT_WS(":", b.id, b.alias) ELSE b.id END as catslug,' - . ' u.id AS sectionid,' - . ' CONCAT_WS( "/", u.title, b.title ) AS section,' - . ' "2" AS browsernav' - . ' FROM #__content AS a' - . ' INNER JOIN #__categories AS b ON b.id=a.catid AND b.access <= ' .$user->get( 'gid' ) - . ' INNER JOIN #__sections AS u ON u.id = a.sectionid' - . ' WHERE ( '.$where.' )' - . ' AND a.state = -1' - . ' AND u.published = 1' - . ' AND b.published = 1' - . ' AND a.access <= '.(int) $user->get( 'aid' ) - . ' AND b.access <= '.(int) $user->get( 'aid' ) - . ' AND u.access <= '.(int) $user->get( 'aid' ) - . ' AND ( a.publish_up = '.$db->Quote($nullDate).' OR a.publish_up <= '.$db->Quote($now).' )' - . ' AND ( a.publish_down = '.$db->Quote($nullDate).' OR a.publish_down >= '.$db->Quote($now).' )' - . ' ORDER BY '. $order - ; - $db->setQuery( $query, 0, $limit ); - $list3 = $db->loadObjectList(); - - if(isset($list3)) - { - foreach($list3 as $key => $item) - { - $list3[$key]->href = ContentHelperRoute::getArticleRoute($item->slug, $item->catslug, $item->sectionid); - } - } - - $rows[] = $list3; - } - - $results = array(); - if(count($rows)) - { - foreach($rows as $row) - { - $new_row = array(); - foreach($row AS $key => $article) { - if(searchHelper::checkNoHTML($article, $searchText, array('text', 'title', 'metadesc', 'metakey'))) { - $new_row[] = $article; - } - } - $results = array_merge($results, (array) $new_row); - } - } - - return $results; -} +registerEvent( 'onSearch', 'plgSearchContent' ); +$mainframe->registerEvent( 'onSearchAreas', 'plgSearchContentAreas' ); + +JPlugin::loadLanguage( 'plg_search_content' ); + +/** + * @return array An array of search areas + */ +function &plgSearchContentAreas() +{ + static $areas = array( + 'content' => 'Articles' + ); + return $areas; +} + +/** + * Content Search method + * The sql must return the following fields that are used in a common display + * routine: href, title, section, created, text, browsernav + * @param string Target search string + * @param string mathcing option, exact|any|all + * @param string ordering option, newest|oldest|popular|alpha|category + * @param mixed An array if the search it to be restricted to areas, null if search all + */ +function plgSearchContent( $text, $phrase='', $ordering='', $areas=null ) +{ + global $mainframe; + + $db =& JFactory::getDBO(); + $user =& JFactory::getUser(); + + require_once(JPATH_SITE.DS.'components'.DS.'com_content'.DS.'helpers'.DS.'route.php'); + require_once(JPATH_SITE.DS.'administrator'.DS.'components'.DS.'com_search'.DS.'helpers'.DS.'search.php'); + + $searchText = $text; + if (is_array( $areas )) { + if (!array_intersect( $areas, array_keys( plgSearchContentAreas() ) )) { + return array(); + } + } + + // load plugin params info + $plugin =& JPluginHelper::getPlugin('search', 'content'); + $pluginParams = new JParameter( $plugin->params ); + + $sContent = $pluginParams->get( 'search_content', 1 ); + $sUncategorised = $pluginParams->get( 'search_uncategorised', 1 ); + $sArchived = $pluginParams->get( 'search_archived', 1 ); + $limit = $pluginParams->def( 'search_limit', 50 ); + + $nullDate = $db->getNullDate(); + $date =& JFactory::getDate(); + $now = $date->toMySQL(); + + $text = trim( $text ); + if ($text == '') { + return array(); + } + + $wheres = array(); + switch ($phrase) { + case 'exact': + $text = $db->Quote( '%'.$db->getEscaped( $text, true ).'%', false ); + $wheres2 = array(); + $wheres2[] = 'a.title LIKE '.$text; + $wheres2[] = 'a.introtext LIKE '.$text; + $wheres2[] = 'a.fulltext LIKE '.$text; + $wheres2[] = 'a.metakey LIKE '.$text; + $wheres2[] = 'a.metadesc LIKE '.$text; + $where = '(' . implode( ') OR (', $wheres2 ) . ')'; + break; + + case 'all': + case 'any': + default: + $words = explode( ' ', $text ); + $wheres = array(); + foreach ($words as $word) { + $word = $db->Quote( '%'.$db->getEscaped( $word, true ).'%', false ); + $wheres2 = array(); + $wheres2[] = 'a.title LIKE '.$word; + $wheres2[] = 'a.introtext LIKE '.$word; + $wheres2[] = 'a.fulltext LIKE '.$word; + $wheres2[] = 'a.metakey LIKE '.$word; + $wheres2[] = 'a.metadesc LIKE '.$word; + $wheres[] = implode( ' OR ', $wheres2 ); + } + $where = '(' . implode( ($phrase == 'all' ? ') AND (' : ') OR ('), $wheres ) . ')'; + break; + } + + $morder = ''; + switch ($ordering) { + case 'oldest': + $order = 'a.created ASC'; + break; + + case 'popular': + $order = 'a.hits DESC'; + break; + + case 'alpha': + $order = 'a.title ASC'; + break; + + case 'category': + $order = 'b.title ASC, a.title ASC'; + $morder = 'a.title ASC'; + break; + + case 'newest': + default: + $order = 'a.created DESC'; + break; + } + + $rows = array(); + + // search articles + if ( $sContent && $limit > 0 ) + { + $query = 'SELECT a.title AS title, a.metadesc, a.metakey,' + . ' a.created AS created,' + . ' CONCAT(a.introtext, a.fulltext) AS text,' + . ' CONCAT_WS( "/", u.title, b.title ) AS section,' + . ' CASE WHEN CHAR_LENGTH(a.alias) THEN CONCAT_WS(":", a.id, a.alias) ELSE a.id END as slug,' + . ' CASE WHEN CHAR_LENGTH(b.alias) THEN CONCAT_WS(":", b.id, b.alias) ELSE b.id END as catslug,' + . ' u.id AS sectionid,' + . ' "2" AS browsernav' + . ' FROM #__content AS a' + . ' INNER JOIN #__categories AS b ON b.id=a.catid' + . ' INNER JOIN #__sections AS u ON u.id = a.sectionid' + . ' WHERE ( '.$where.' )' + . ' AND a.state = 1' + . ' AND u.published = 1' + . ' AND b.published = 1' + . ' AND a.access <= '.(int) $user->get( 'aid' ) + . ' AND b.access <= '.(int) $user->get( 'aid' ) + . ' AND u.access <= '.(int) $user->get( 'aid' ) + . ' AND ( a.publish_up = '.$db->Quote($nullDate).' OR a.publish_up <= '.$db->Quote($now).' )' + . ' AND ( a.publish_down = '.$db->Quote($nullDate).' OR a.publish_down >= '.$db->Quote($now).' )' + . ' GROUP BY a.id' + . ' ORDER BY '. $order + ; + $db->setQuery( $query, 0, $limit ); + $list = $db->loadObjectList(); + $limit -= count($list); + + if(isset($list)) + { + foreach($list as $key => $item) + { + $list[$key]->href = ContentHelperRoute::getArticleRoute($item->slug, $item->catslug, $item->sectionid); + } + } + $rows[] = $list; + } + + // search uncategorised content + if ( $sUncategorised && $limit > 0 ) + { + $query = 'SELECT id, a.title AS title, a.created AS created, a.metadesc, a.metakey, ' + . ' CONCAT(a.introtext, a.fulltext) AS text,' + . ' "2" as browsernav, "'. $db->getEscaped(JText::_('Uncategorised Content')) .'" AS section' + . ' FROM #__content AS a' + . ' WHERE ('.$where.')' + . ' AND a.state = 1' + . ' AND a.access <= '.(int) $user->get( 'aid' ) + . ' AND a.sectionid = 0' + . ' AND a.catid = 0' + . ' AND ( a.publish_up = '.$db->Quote($nullDate).' OR a.publish_up <= '.$db->Quote($now).' )' + . ' AND ( a.publish_down = '.$db->Quote($nullDate).' OR a.publish_down >= '.$db->Quote($now).' )' + . ' ORDER BY '. ($morder ? $morder : $order) + ; + $db->setQuery( $query, 0, $limit ); + $list2 = $db->loadObjectList(); + $limit -= count($list2); + + if(isset($list2)) + { + foreach($list2 as $key => $item) + { + $list2[$key]->href = ContentHelperRoute::getArticleRoute($item->id); + } + } + + $rows[] = $list2; + } + + // search archived content + if ( $sArchived && $limit > 0 ) + { + $searchArchived = JText::_( 'Archived' ); + + $query = 'SELECT a.title AS title, a.metadesc, a.metakey,' + . ' a.created AS created,' + . ' CONCAT(a.introtext, a.fulltext) AS text,' + . ' CASE WHEN CHAR_LENGTH(a.alias) THEN CONCAT_WS(":", a.id, a.alias) ELSE a.id END as slug,' + . ' CASE WHEN CHAR_LENGTH(b.alias) THEN CONCAT_WS(":", b.id, b.alias) ELSE b.id END as catslug,' + . ' u.id AS sectionid,' + . ' CONCAT_WS( "/", u.title, b.title ) AS section,' + . ' "2" AS browsernav' + . ' FROM #__content AS a' + . ' INNER JOIN #__categories AS b ON b.id=a.catid AND b.access <= ' .$user->get( 'gid' ) + . ' INNER JOIN #__sections AS u ON u.id = a.sectionid' + . ' WHERE ( '.$where.' )' + . ' AND a.state = -1' + . ' AND u.published = 1' + . ' AND b.published = 1' + . ' AND a.access <= '.(int) $user->get( 'aid' ) + . ' AND b.access <= '.(int) $user->get( 'aid' ) + . ' AND u.access <= '.(int) $user->get( 'aid' ) + . ' AND ( a.publish_up = '.$db->Quote($nullDate).' OR a.publish_up <= '.$db->Quote($now).' )' + . ' AND ( a.publish_down = '.$db->Quote($nullDate).' OR a.publish_down >= '.$db->Quote($now).' )' + . ' ORDER BY '. $order + ; + $db->setQuery( $query, 0, $limit ); + $list3 = $db->loadObjectList(); + + if(isset($list3)) + { + foreach($list3 as $key => $item) + { + $list3[$key]->href = ContentHelperRoute::getArticleRoute($item->slug, $item->catslug, $item->sectionid); + } + } + + $rows[] = $list3; + } + + $results = array(); + if(count($rows)) + { + foreach($rows as $row) + { + $new_row = array(); + foreach($row AS $key => $article) { + if(searchHelper::checkNoHTML($article, $searchText, array('text', 'title', 'metadesc', 'metakey'))) { + $new_row[] = $article; + } + } + $results = array_merge($results, (array) $new_row); + } + } + + return $results; +} diff --git a/oss/joomla/trunk/plugins/search/content.xml b/oss/joomla/trunk/plugins/search/content.xml index a5e2df08..059ca092 100644 --- a/oss/joomla/trunk/plugins/search/content.xml +++ b/oss/joomla/trunk/plugins/search/content.xml @@ -3,7 +3,7 @@ Search - Content Joomla! Project November 2005 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/search/newsfeeds.php b/oss/joomla/trunk/plugins/search/newsfeeds.php index 57a9ffb5..d1029ff8 100644 --- a/oss/joomla/trunk/plugins/search/newsfeeds.php +++ b/oss/joomla/trunk/plugins/search/newsfeeds.php @@ -1,131 +1,131 @@ -registerEvent( 'onSearch', 'plgSearchNewsfeedslinks' ); -$mainframe->registerEvent( 'onSearchAreas', 'plgSearchNewsfeedAreas' ); - -JPlugin::loadLanguage( 'plg_search_newsfeeds' ); - -/** - * @return array An array of search areas - */ -function &plgSearchNewsfeedAreas() -{ - static $areas = array( - 'newsfeeds' => 'Newsfeeds' - ); - return $areas; -} - -/** -* Contacts Search method -* -* The sql must return the following fields that are used in a common display -* routine: href, title, section, created, text, browsernav -* @param string Target search string -* @param string mathcing option, exact|any|all -* @param string ordering option, newest|oldest|popular|alpha|category - * @param mixed An array if the search it to be restricted to areas, null if search all -*/ -function plgSearchNewsfeedslinks( $text, $phrase='', $ordering='', $areas=null ) -{ - $db =& JFactory::getDBO(); - $user =& JFactory::getUser(); - - if (is_array( $areas )) { - if (!array_intersect( $areas, array_keys( plgSearchNewsfeedAreas() ) )) { - return array(); - } - } - - // load plugin params info - $plugin =& JPluginHelper::getPlugin('search', 'newsfeeds'); - $pluginParams = new JParameter( $plugin->params ); - - $limit = $pluginParams->def( 'search_limit', 50 ); - - $text = trim( $text ); - if ($text == '') { - return array(); - } - - $wheres = array(); - switch ($phrase) { - case 'exact': - $text = $db->Quote( '%'.$db->getEscaped( $text, true ).'%', false ); - $wheres2 = array(); - $wheres2[] = 'a.name LIKE '.$text; - $wheres2[] = 'a.link LIKE '.$text; - $where = '(' . implode( ') OR (', $wheres2 ) . ')'; - break; - - case 'all': - case 'any': - default: - $words = explode( ' ', $text ); - $wheres = array(); - foreach ($words as $word) - { - $word = $db->Quote( '%'.$db->getEscaped( $word, true ).'%', false ); - $wheres2 = array(); - $wheres2[] = 'a.name LIKE '.$word; - $wheres2[] = 'a.link LIKE '.$word; - $wheres[] = implode( ' OR ', $wheres2 ); - } - $where = '(' . implode( ($phrase == 'all' ? ') AND (' : ') OR ('), $wheres ) . ')'; - break; - } - - switch ( $ordering ) { - case 'alpha': - $order = 'a.name ASC'; - break; - - case 'category': - $order = 'b.title ASC, a.name ASC'; - break; - - case 'oldest': - case 'popular': - case 'newest': - default: - $order = 'a.name ASC'; - } - - $searchNewsfeeds = JText::_( 'Newsfeeds' ); - - $query = 'SELECT a.name AS title, "" AS created, a.link AS text,' - . ' CASE WHEN CHAR_LENGTH(a.alias) THEN CONCAT_WS(\':\', a.id, a.alias) ELSE a.id END as slug, ' - . ' CASE WHEN CHAR_LENGTH(b.alias) THEN CONCAT_WS(\':\', b.id, b.alias) ELSE b.id END as catslug, ' - . ' CONCAT_WS( " / ", '. $db->Quote($searchNewsfeeds) .', b.title )AS section,' - . ' "1" AS browsernav' - . ' FROM #__newsfeeds AS a' - . ' INNER JOIN #__categories AS b ON b.id = a.catid' - . ' WHERE ( '. $where .' )' - . ' AND a.published = 1' - . ' AND b.published = 1' - . ' AND b.access <= '. (int) $user->get( 'aid' ) - . ' ORDER BY '. $order - ; - $db->setQuery( $query, 0, $limit ); - $rows = $db->loadObjectList(); - - foreach($rows as $key => $row) { - $rows[$key]->href = 'index.php?option=com_newsfeeds&view=newsfeed&catid='.$row->catslug.'&id='.$row->slug; - } - - return $rows; -} +registerEvent( 'onSearch', 'plgSearchNewsfeedslinks' ); +$mainframe->registerEvent( 'onSearchAreas', 'plgSearchNewsfeedAreas' ); + +JPlugin::loadLanguage( 'plg_search_newsfeeds' ); + +/** + * @return array An array of search areas + */ +function &plgSearchNewsfeedAreas() +{ + static $areas = array( + 'newsfeeds' => 'Newsfeeds' + ); + return $areas; +} + +/** +* Contacts Search method +* +* The sql must return the following fields that are used in a common display +* routine: href, title, section, created, text, browsernav +* @param string Target search string +* @param string mathcing option, exact|any|all +* @param string ordering option, newest|oldest|popular|alpha|category + * @param mixed An array if the search it to be restricted to areas, null if search all +*/ +function plgSearchNewsfeedslinks( $text, $phrase='', $ordering='', $areas=null ) +{ + $db =& JFactory::getDBO(); + $user =& JFactory::getUser(); + + if (is_array( $areas )) { + if (!array_intersect( $areas, array_keys( plgSearchNewsfeedAreas() ) )) { + return array(); + } + } + + // load plugin params info + $plugin =& JPluginHelper::getPlugin('search', 'newsfeeds'); + $pluginParams = new JParameter( $plugin->params ); + + $limit = $pluginParams->def( 'search_limit', 50 ); + + $text = trim( $text ); + if ($text == '') { + return array(); + } + + $wheres = array(); + switch ($phrase) { + case 'exact': + $text = $db->Quote( '%'.$db->getEscaped( $text, true ).'%', false ); + $wheres2 = array(); + $wheres2[] = 'a.name LIKE '.$text; + $wheres2[] = 'a.link LIKE '.$text; + $where = '(' . implode( ') OR (', $wheres2 ) . ')'; + break; + + case 'all': + case 'any': + default: + $words = explode( ' ', $text ); + $wheres = array(); + foreach ($words as $word) + { + $word = $db->Quote( '%'.$db->getEscaped( $word, true ).'%', false ); + $wheres2 = array(); + $wheres2[] = 'a.name LIKE '.$word; + $wheres2[] = 'a.link LIKE '.$word; + $wheres[] = implode( ' OR ', $wheres2 ); + } + $where = '(' . implode( ($phrase == 'all' ? ') AND (' : ') OR ('), $wheres ) . ')'; + break; + } + + switch ( $ordering ) { + case 'alpha': + $order = 'a.name ASC'; + break; + + case 'category': + $order = 'b.title ASC, a.name ASC'; + break; + + case 'oldest': + case 'popular': + case 'newest': + default: + $order = 'a.name ASC'; + } + + $searchNewsfeeds = JText::_( 'Newsfeeds' ); + + $query = 'SELECT a.name AS title, "" AS created, a.link AS text,' + . ' CASE WHEN CHAR_LENGTH(a.alias) THEN CONCAT_WS(\':\', a.id, a.alias) ELSE a.id END as slug, ' + . ' CASE WHEN CHAR_LENGTH(b.alias) THEN CONCAT_WS(\':\', b.id, b.alias) ELSE b.id END as catslug, ' + . ' CONCAT_WS( " / ", '. $db->Quote($searchNewsfeeds) .', b.title )AS section,' + . ' "1" AS browsernav' + . ' FROM #__newsfeeds AS a' + . ' INNER JOIN #__categories AS b ON b.id = a.catid' + . ' WHERE ( '. $where .' )' + . ' AND a.published = 1' + . ' AND b.published = 1' + . ' AND b.access <= '. (int) $user->get( 'aid' ) + . ' ORDER BY '. $order + ; + $db->setQuery( $query, 0, $limit ); + $rows = $db->loadObjectList(); + + foreach($rows as $key => $row) { + $rows[$key]->href = 'index.php?option=com_newsfeeds&view=newsfeed&catid='.$row->catslug.'&id='.$row->slug; + } + + return $rows; +} diff --git a/oss/joomla/trunk/plugins/search/newsfeeds.xml b/oss/joomla/trunk/plugins/search/newsfeeds.xml index 2b55e3f4..d2cb58f5 100644 --- a/oss/joomla/trunk/plugins/search/newsfeeds.xml +++ b/oss/joomla/trunk/plugins/search/newsfeeds.xml @@ -3,7 +3,7 @@ Search - Newsfeeds Joomla! Project November 2005 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/search/sections.php b/oss/joomla/trunk/plugins/search/sections.php index dd0fac0d..eefc6681 100644 --- a/oss/joomla/trunk/plugins/search/sections.php +++ b/oss/joomla/trunk/plugins/search/sections.php @@ -1,112 +1,112 @@ -registerEvent( 'onSearch', 'plgSearchSections' ); -$mainframe->registerEvent( 'onSearchAreas', 'plgSearchSectionAreas' ); - -JPlugin::loadLanguage( 'plg_search_sections' ); - -/** - * @return array An array of search areas - */ -function &plgSearchSectionAreas() { - static $areas = array( - 'sections' => 'Sections' - ); - return $areas; -} - -/** -* Sections Search method -* -* The sql must return the following fields that are used in a common display -* routine: href, title, section, created, text, browsernav -* @param string Target search string -* @param string mathcing option, exact|any|all -* @param string ordering option, newest|oldest|popular|alpha|category - * @param mixed An array if restricted to areas, null if search all -*/ -function plgSearchSections( $text, $phrase='', $ordering='', $areas=null ) -{ - $db =& JFactory::getDBO(); - $user =& JFactory::getUser(); - - $searchText = $text; - - require_once(JPATH_SITE.DS.'components'.DS.'com_content'.DS.'helpers'.DS.'route.php'); - - if (is_array( $areas )) { - if (!array_intersect( $areas, array_keys( plgSearchSectionAreas() ) )) { - return array(); - } - } - - // load plugin params info - $plugin =& JPluginHelper::getPlugin('search', 'sections'); - $pluginParams = new JParameter( $plugin->params ); - - $limit = $pluginParams->def( 'search_limit', 50 ); - - $text = trim( $text ); - if ($text == '') { - return array(); - } - - switch ( $ordering ) { - case 'alpha': - $order = 'a.name ASC'; - break; - - case 'category': - case 'popular': - case 'newest': - case 'oldest': - default: - $order = 'a.name DESC'; - } - - $text = $db->Quote( '%'.$db->getEscaped( $text, true ).'%', false ); - $query = 'SELECT a.title AS title, a.description AS text, a.name, ' - . ' "" AS created,' - . ' "2" AS browsernav,' - . ' a.id AS secid' - . ' FROM #__sections AS a' - . ' WHERE ( a.name LIKE '.$text - . ' OR a.title LIKE '.$text - . ' OR a.description LIKE '.$text.' )' - . ' AND a.published = 1' - . ' AND a.access <= '.(int) $user->get( 'aid' ) - . ' GROUP BY a.id' - . ' ORDER BY '. $order - ; - $db->setQuery( $query, 0, $limit ); - $rows = $db->loadObjectList(); - - $count = count( $rows ); - for ( $i = 0; $i < $count; $i++ ) - { - $rows[$i]->href = ContentHelperRoute::getSectionRoute($rows[$i]->secid); - $rows[$i]->section = JText::_( 'Section' ); - } - - $return = array(); - foreach($rows AS $key => $section) { - if(searchHelper::checkNoHTML($section, $searchText, array('name', 'title', 'text'))) { - $return[] = $section; - } - } - return $return; -} +registerEvent( 'onSearch', 'plgSearchSections' ); +$mainframe->registerEvent( 'onSearchAreas', 'plgSearchSectionAreas' ); + +JPlugin::loadLanguage( 'plg_search_sections' ); + +/** + * @return array An array of search areas + */ +function &plgSearchSectionAreas() { + static $areas = array( + 'sections' => 'Sections' + ); + return $areas; +} + +/** +* Sections Search method +* +* The sql must return the following fields that are used in a common display +* routine: href, title, section, created, text, browsernav +* @param string Target search string +* @param string mathcing option, exact|any|all +* @param string ordering option, newest|oldest|popular|alpha|category + * @param mixed An array if restricted to areas, null if search all +*/ +function plgSearchSections( $text, $phrase='', $ordering='', $areas=null ) +{ + $db =& JFactory::getDBO(); + $user =& JFactory::getUser(); + + $searchText = $text; + + require_once(JPATH_SITE.DS.'components'.DS.'com_content'.DS.'helpers'.DS.'route.php'); + + if (is_array( $areas )) { + if (!array_intersect( $areas, array_keys( plgSearchSectionAreas() ) )) { + return array(); + } + } + + // load plugin params info + $plugin =& JPluginHelper::getPlugin('search', 'sections'); + $pluginParams = new JParameter( $plugin->params ); + + $limit = $pluginParams->def( 'search_limit', 50 ); + + $text = trim( $text ); + if ($text == '') { + return array(); + } + + switch ( $ordering ) { + case 'alpha': + $order = 'a.name ASC'; + break; + + case 'category': + case 'popular': + case 'newest': + case 'oldest': + default: + $order = 'a.name DESC'; + } + + $text = $db->Quote( '%'.$db->getEscaped( $text, true ).'%', false ); + $query = 'SELECT a.title AS title, a.description AS text, a.name, ' + . ' "" AS created,' + . ' "2" AS browsernav,' + . ' a.id AS secid' + . ' FROM #__sections AS a' + . ' WHERE ( a.name LIKE '.$text + . ' OR a.title LIKE '.$text + . ' OR a.description LIKE '.$text.' )' + . ' AND a.published = 1' + . ' AND a.access <= '.(int) $user->get( 'aid' ) + . ' GROUP BY a.id' + . ' ORDER BY '. $order + ; + $db->setQuery( $query, 0, $limit ); + $rows = $db->loadObjectList(); + + $count = count( $rows ); + for ( $i = 0; $i < $count; $i++ ) + { + $rows[$i]->href = ContentHelperRoute::getSectionRoute($rows[$i]->secid); + $rows[$i]->section = JText::_( 'Section' ); + } + + $return = array(); + foreach($rows AS $key => $section) { + if(searchHelper::checkNoHTML($section, $searchText, array('name', 'title', 'text'))) { + $return[] = $section; + } + } + return $return; +} diff --git a/oss/joomla/trunk/plugins/search/sections.xml b/oss/joomla/trunk/plugins/search/sections.xml index e0fe90f7..3b35b228 100644 --- a/oss/joomla/trunk/plugins/search/sections.xml +++ b/oss/joomla/trunk/plugins/search/sections.xml @@ -3,7 +3,7 @@ Search - Sections Joomla! Project November 2005 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/search/weblinks.php b/oss/joomla/trunk/plugins/search/weblinks.php index 57aae739..d662a0ae 100644 --- a/oss/joomla/trunk/plugins/search/weblinks.php +++ b/oss/joomla/trunk/plugins/search/weblinks.php @@ -1,150 +1,150 @@ -registerEvent( 'onSearch', 'plgSearchWeblinks' ); -$mainframe->registerEvent( 'onSearchAreas', 'plgSearchWeblinksAreas' ); - -JPlugin::loadLanguage( 'plg_search_weblinks' ); - -/** - * @return array An array of search areas - */ -function &plgSearchWeblinksAreas() { - static $areas = array( - 'weblinks' => 'Weblinks' - ); - return $areas; -} - -/** -* Weblink Search method -* -* The sql must return the following fields that are used in a common display -* routine: href, title, section, created, text, browsernav -* @param string Target search string -* @param string mathcing option, exact|any|all -* @param string ordering option, newest|oldest|popular|alpha|category - * @param mixed An array if the search it to be restricted to areas, null if search all - */ -function plgSearchWeblinks( $text, $phrase='', $ordering='', $areas=null ) -{ - $db =& JFactory::getDBO(); - $user =& JFactory::getUser(); - - $searchText = $text; - - require_once(JPATH_SITE.DS.'components'.DS.'com_weblinks'.DS.'helpers'.DS.'route.php'); - - if (is_array( $areas )) { - if (!array_intersect( $areas, array_keys( plgSearchWeblinksAreas() ) )) { - return array(); - } - } - - // load plugin params info - $plugin =& JPluginHelper::getPlugin('search', 'weblinks'); - $pluginParams = new JParameter( $plugin->params ); - - $limit = $pluginParams->def( 'search_limit', 50 ); - - $text = trim( $text ); - if ($text == '') { - return array(); - } - $section = JText::_( 'Web Links' ); - - $wheres = array(); - switch ($phrase) - { - case 'exact': - $text = $db->Quote( '%'.$db->getEscaped( $text, true ).'%', false ); - $wheres2 = array(); - $wheres2[] = 'a.url LIKE '.$text; - $wheres2[] = 'a.description LIKE '.$text; - $wheres2[] = 'a.title LIKE '.$text; - $where = '(' . implode( ') OR (', $wheres2 ) . ')'; - break; - - case 'all': - case 'any': - default: - $words = explode( ' ', $text ); - $wheres = array(); - foreach ($words as $word) - { - $word = $db->Quote( '%'.$db->getEscaped( $word, true ).'%', false ); - $wheres2 = array(); - $wheres2[] = 'a.url LIKE '.$word; - $wheres2[] = 'a.description LIKE '.$word; - $wheres2[] = 'a.title LIKE '.$word; - $wheres[] = implode( ' OR ', $wheres2 ); - } - $where = '(' . implode( ($phrase == 'all' ? ') AND (' : ') OR ('), $wheres ) . ')'; - break; - } - - switch ( $ordering ) - { - case 'oldest': - $order = 'a.date ASC'; - break; - - case 'popular': - $order = 'a.hits DESC'; - break; - - case 'alpha': - $order = 'a.title ASC'; - break; - - case 'category': - $order = 'b.title ASC, a.title ASC'; - break; - - case 'newest': - default: - $order = 'a.date DESC'; - } - - $query = 'SELECT a.title AS title, a.description AS text, a.date AS created, a.url, ' - . ' CASE WHEN CHAR_LENGTH(a.alias) THEN CONCAT_WS(\':\', a.id, a.alias) ELSE a.id END as slug, ' - . ' CASE WHEN CHAR_LENGTH(b.alias) THEN CONCAT_WS(\':\', b.id, b.alias) ELSE b.id END as catslug, ' - . ' CONCAT_WS( " / ", '.$db->Quote($section).', b.title ) AS section,' - . ' "1" AS browsernav' - . ' FROM #__weblinks AS a' - . ' INNER JOIN #__categories AS b ON b.id = a.catid' - . ' WHERE ('. $where .')' - . ' AND a.published = 1' - . ' AND b.published = 1' - . ' AND b.access <= '.(int) $user->get( 'aid' ) - . ' ORDER BY '. $order - ; - $db->setQuery( $query, 0, $limit ); - $rows = $db->loadObjectList(); - - foreach($rows as $key => $row) { - $rows[$key]->href = WeblinksHelperRoute::getWeblinkRoute($row->slug, $row->catslug); - } - - $return = array(); - foreach($rows AS $key => $weblink) { - if(searchHelper::checkNoHTML($weblink, $searchText, array('url', 'text', 'title'))) { - $return[] = $weblink; - } - } - - return $return; -} +registerEvent( 'onSearch', 'plgSearchWeblinks' ); +$mainframe->registerEvent( 'onSearchAreas', 'plgSearchWeblinksAreas' ); + +JPlugin::loadLanguage( 'plg_search_weblinks' ); + +/** + * @return array An array of search areas + */ +function &plgSearchWeblinksAreas() { + static $areas = array( + 'weblinks' => 'Weblinks' + ); + return $areas; +} + +/** +* Weblink Search method +* +* The sql must return the following fields that are used in a common display +* routine: href, title, section, created, text, browsernav +* @param string Target search string +* @param string mathcing option, exact|any|all +* @param string ordering option, newest|oldest|popular|alpha|category + * @param mixed An array if the search it to be restricted to areas, null if search all + */ +function plgSearchWeblinks( $text, $phrase='', $ordering='', $areas=null ) +{ + $db =& JFactory::getDBO(); + $user =& JFactory::getUser(); + + $searchText = $text; + + require_once(JPATH_SITE.DS.'components'.DS.'com_weblinks'.DS.'helpers'.DS.'route.php'); + + if (is_array( $areas )) { + if (!array_intersect( $areas, array_keys( plgSearchWeblinksAreas() ) )) { + return array(); + } + } + + // load plugin params info + $plugin =& JPluginHelper::getPlugin('search', 'weblinks'); + $pluginParams = new JParameter( $plugin->params ); + + $limit = $pluginParams->def( 'search_limit', 50 ); + + $text = trim( $text ); + if ($text == '') { + return array(); + } + $section = JText::_( 'Web Links' ); + + $wheres = array(); + switch ($phrase) + { + case 'exact': + $text = $db->Quote( '%'.$db->getEscaped( $text, true ).'%', false ); + $wheres2 = array(); + $wheres2[] = 'a.url LIKE '.$text; + $wheres2[] = 'a.description LIKE '.$text; + $wheres2[] = 'a.title LIKE '.$text; + $where = '(' . implode( ') OR (', $wheres2 ) . ')'; + break; + + case 'all': + case 'any': + default: + $words = explode( ' ', $text ); + $wheres = array(); + foreach ($words as $word) + { + $word = $db->Quote( '%'.$db->getEscaped( $word, true ).'%', false ); + $wheres2 = array(); + $wheres2[] = 'a.url LIKE '.$word; + $wheres2[] = 'a.description LIKE '.$word; + $wheres2[] = 'a.title LIKE '.$word; + $wheres[] = implode( ' OR ', $wheres2 ); + } + $where = '(' . implode( ($phrase == 'all' ? ') AND (' : ') OR ('), $wheres ) . ')'; + break; + } + + switch ( $ordering ) + { + case 'oldest': + $order = 'a.date ASC'; + break; + + case 'popular': + $order = 'a.hits DESC'; + break; + + case 'alpha': + $order = 'a.title ASC'; + break; + + case 'category': + $order = 'b.title ASC, a.title ASC'; + break; + + case 'newest': + default: + $order = 'a.date DESC'; + } + + $query = 'SELECT a.title AS title, a.description AS text, a.date AS created, a.url, ' + . ' CASE WHEN CHAR_LENGTH(a.alias) THEN CONCAT_WS(\':\', a.id, a.alias) ELSE a.id END as slug, ' + . ' CASE WHEN CHAR_LENGTH(b.alias) THEN CONCAT_WS(\':\', b.id, b.alias) ELSE b.id END as catslug, ' + . ' CONCAT_WS( " / ", '.$db->Quote($section).', b.title ) AS section,' + . ' "1" AS browsernav' + . ' FROM #__weblinks AS a' + . ' INNER JOIN #__categories AS b ON b.id = a.catid' + . ' WHERE ('. $where .')' + . ' AND a.published = 1' + . ' AND b.published = 1' + . ' AND b.access <= '.(int) $user->get( 'aid' ) + . ' ORDER BY '. $order + ; + $db->setQuery( $query, 0, $limit ); + $rows = $db->loadObjectList(); + + foreach($rows as $key => $row) { + $rows[$key]->href = WeblinksHelperRoute::getWeblinkRoute($row->slug, $row->catslug); + } + + $return = array(); + foreach($rows AS $key => $weblink) { + if(searchHelper::checkNoHTML($weblink, $searchText, array('url', 'text', 'title'))) { + $return[] = $weblink; + } + } + + return $return; +} diff --git a/oss/joomla/trunk/plugins/search/weblinks.xml b/oss/joomla/trunk/plugins/search/weblinks.xml index 1678cb11..240fbb62 100644 --- a/oss/joomla/trunk/plugins/search/weblinks.xml +++ b/oss/joomla/trunk/plugins/search/weblinks.xml @@ -3,7 +3,7 @@ Search - Weblinks Joomla! Project November 2005 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/system/backlink.php b/oss/joomla/trunk/plugins/system/backlink.php index cceec708..b9a32e78 100644 --- a/oss/joomla/trunk/plugins/system/backlink.php +++ b/oss/joomla/trunk/plugins/system/backlink.php @@ -1,529 +1,529 @@ -_db = JFactory::getDBO(); - parent :: __construct($subject, $config); - } - - function onAfterInitialise() - { - global $mainframe; - if ($mainframe->isAdmin()) { - return; // Dont run in admin - } - - $sef = $this->params->get('sef', 1); - $url = $this->params->get('url', 1); - - $legacysef = $this->params->get('legacysef', 1); - if (!$sef && !$url && !$legacysef) - return; // None of the options enabled, bail! - - // Grab the system as early as possible, we're going to terminate it potentially - // Case 1: Query string match (shouldn't need this but its here anyway) - if ($url && isset ($_SERVER['QUERY_STRING']) && strlen($_SERVER['QUERY_STRING']) && strpos($_SERVER['QUERY_STRING'], '&')) { - $query_string = $_SERVER['QUERY_STRING']; - $this->_lookup($query_string); - } - - // Case 2: SEF or similar match - if ($sef && isset ($_SERVER['SCRIPT_NAME']) && isset ($_SERVER['REQUEST_URI'])) { - $part = str_replace('index.php', '', $_SERVER['SCRIPT_NAME']); - if($part != '/') { - $search = str_replace($part, '', $_SERVER['REQUEST_URI']); - } else { - $search = ltrim($_SERVER['REQUEST_URI'],'/'); - } - $this->_lookup($search); - } - // Case 3: Old school core sef; used to backlink - // Enable only if: - // 1: SEF is enabled - // 2: Legacy SEF Plugin Param is set - // 3: And there is no backlink - if ($mainframe->getCfg('sef') - && $legacysef - && !strstr($_SERVER['REQUEST_URI'],'nobacklink') - && !strlen($_SERVER['QUERY_STRING'])) { - $this->_legacysef(); - } - - } - - function _lookup($searchstring) - { - // return blank strings and just index.php on its own... - if (!strlen($searchstring) || $searchstring == trim('index.php',' ?')) { - return; - } - - $sef = $this->params->get('sef', 1); - $url = $this->params->get('url', 1); - - if (!$sef && !$url) { - return; // Neither option enabled, bail! - } - - $query = 'SELECT * FROM #__migration_backlinks WHERE '; - $where = Array (); - $search = $this->_db->Quote( $this->_db->getEscaped( $searchstring, true ).'%', false ); - - if ($url) { - $where[] = 'url LIKE ' . $search; - } - if ($sef) { - $where[] = 'sefurl LIKE ' . $search; - } - - $query .= implode(' OR ', $where); - $this->_db->setQuery($query); - $results = $this->_db->loadAssocList(); - - if (count($results)) { - // Get the first one... - $this->_redirect($results[0]['itemid'], $results[0]['name'], $results[0]['newurl']); - } - } - - function _redirect($Itemid, $name, $url = null) - { - global $mainframe; - if (!strlen($url)) - { - $menu = & JSite :: getMenu(); - $item = $menu->getItem($Itemid); - //$url = $item->link; - - switch ($item->type) - { - case 'url' : - if ((strpos($item->link, 'index.php?') !== false) && (strpos($item->link, 'Itemid=') === false)) { - $url = $item->link . '&Itemid=' . $item->id; - } else { - $url = $item->link; - } - break; - - default : - $url = 'index.php?Itemid=' . $item->id; - //$url = $item->link . '&Itemid='.$item->id; - break; - } - $url = JRoute :: _($url); - //$url = JURI :: base() . $url; // was $surl with third option of below being url and second being surl - $name = $item->name; - } - // Check we're not redirecting to ourselves - if(!stristr($url,$_SERVER['REQUEST_URI']) && !stristr($url,$_SERVER['SCRIPT_NAME'].'/'.$_SERVER['QUERY_STRING'])) { - return; - } - - $name = $name ? $name : "Unknown"; - - header('Location: ' . str_replace('&','&',$url), true, '301'); // redirect and kill of and & - jexit(JText :: sprintf('"%s" has moved to %s. Click the link if your browser does not redirect you automatically.', $name, $url, $url)); - } - - function _legacysef() - { - $mosConfig_absolute_path = JPATH_SITE; - $mosConfig_live_site = JURI :: base(); - $url_array = explode('/', $_SERVER['REQUEST_URI']); - - if (in_array('content', $url_array)) - { - /** - * Content - * http://www.domain.com/$option/$task/$sectionid/$id/$Itemid/$limit/$limitstart - */ - - $uri = explode('content/', $_SERVER['REQUEST_URI']); - $option = 'com_content'; - $_GET['option'] = $option; - $_REQUEST['option'] = $option; - $pos = array_search('content', $url_array); - - // language hook for content - $lang = ''; - foreach ($url_array as $key => $value) - { - if (!strcasecmp(substr($value, 0, 5), 'lang,')) - { - $temp = explode(',', $value); - if (isset ($temp[0]) && $temp[0] != '' && isset ($temp[1]) && $temp[1] != '') - { - $_GET['lang'] = $temp[1]; - $_REQUEST['lang'] = $temp[1]; - $lang = $temp[1]; - } - unset ($url_array[$key]); - } - } - - if (isset ($url_array[$pos +8]) && $url_array[$pos +8] != '' && in_array('category', $url_array) && (strpos($url_array[$pos +5], 'order,') !== false) && (strpos($url_array[$pos +6], 'filter,') !== false)) - { - // $option/$task/$sectionid/$id/$Itemid/$order/$filter/$limit/$limitstart - $task = $url_array[$pos +1]; - $sectionid = $url_array[$pos +2]; - $id = $url_array[$pos +3]; - $Itemid = $url_array[$pos +4]; - $order = str_replace('order,', '', $url_array[$pos +5]); - $filter = str_replace('filter,', '', $url_array[$pos +6]); - $limit = $url_array[$pos +7]; - $limitstart = $url_array[$pos +8]; - - // pass data onto global variables - $_GET['task'] = $task; - $_REQUEST['task'] = $task; - $_GET['sectionid'] = $sectionid; - $_REQUEST['sectionid'] = $sectionid; - $_GET['id'] = $id; - $_REQUEST['id'] = $id; - $_GET['Itemid'] = $Itemid; - $_REQUEST['Itemid'] = $Itemid; - $_GET['order'] = $order; - $_REQUEST['order'] = $order; - $_GET['filter'] = $filter; - $_REQUEST['filter'] = $filter; - $_GET['limit'] = $limit; - $_REQUEST['limit'] = $limit; - $_GET['limitstart'] = $limitstart; - $_REQUEST['limitstart'] = $limitstart; - - $QUERY_STRING = "option=com_content&task=$task§ionid=$sectionid&id=$id&Itemid=$Itemid&order=$order&filter=$filter&limit=$limit&limitstart=$limitstart"; - } - else if (isset ($url_array[$pos +7]) && $url_array[$pos +7] != '' && $url_array[$pos +5] > 1000 && (in_array('archivecategory', $url_array) || in_array('archivesection', $url_array))) - { - // $option/$task/$id/$limit/$limitstart/year/month/module - $task = $url_array[$pos +1]; - $id = $url_array[$pos +2]; - $limit = $url_array[$pos +3]; - $limitstart = $url_array[$pos +4]; - $year = $url_array[$pos +5]; - $month = $url_array[$pos +6]; - $module = $url_array[$pos +7]; - - // pass data onto global variables - $_GET['task'] = $task; - $_REQUEST['task'] = $task; - $_GET['id'] = $id; - $_REQUEST['id'] = $id; - $_GET['limit'] = $limit; - $_REQUEST['limit'] = $limit; - $_GET['limitstart'] = $limitstart; - $_REQUEST['limitstart'] = $limitstart; - $_GET['year'] = $year; - $_REQUEST['year'] = $year; - $_GET['month'] = $month; - $_REQUEST['month'] = $month; - $_GET['module'] = $module; - $_REQUEST['module'] = $module; - - $QUERY_STRING = "option=com_content&task=$task&id=$id&limit=$limit&limitstart=$limitstart&year=$year&month=$month&module=$module"; - } - else if (isset ($url_array[$pos +7]) && $url_array[$pos +7] != '' && $url_array[$pos +6] > 1000 && (in_array('archivecategory', $url_array) || in_array('archivesection', $url_array))) - { - // $option/$task/$id/$Itemid/$limit/$limitstart/year/month - $task = $url_array[$pos +1]; - $id = $url_array[$pos +2]; - $Itemid = $url_array[$pos +3]; - $limit = $url_array[$pos +4]; - $limitstart = $url_array[$pos +5]; - $year = $url_array[$pos +6]; - $month = $url_array[$pos +7]; - - // pass data onto global variables - $_GET['task'] = $task; - $_REQUEST['task'] = $task; - $_GET['id'] = $id; - $_REQUEST['id'] = $id; - $_GET['Itemid'] = $Itemid; - $_REQUEST['Itemid'] = $Itemid; - $_GET['limit'] = $limit; - $_REQUEST['limit'] = $limit; - $_GET['limitstart'] = $limitstart; - $_REQUEST['limitstart'] = $limitstart; - $_GET['year'] = $year; - $_REQUEST['year'] = $year; - $_GET['month'] = $month; - $_REQUEST['month'] = $month; - - $QUERY_STRING = "option=com_content&task=$task&id=$id&Itemid=$Itemid&limit=$limit&limitstart=$limitstart&year=$year&month=$month"; - } - else if (isset ($url_array[$pos +7]) && $url_array[$pos +7] != '' && in_array('category', $url_array) && (strpos($url_array[$pos +5], 'order,') !== false)) - { - // $option/$task/$sectionid/$id/$Itemid/$order/$limit/$limitstart - $task = $url_array[$pos +1]; - $sectionid = $url_array[$pos +2]; - $id = $url_array[$pos +3]; - $Itemid = $url_array[$pos +4]; - $order = str_replace('order,', '', $url_array[$pos +5]); - $limit = $url_array[$pos +6]; - $limitstart = $url_array[$pos +7]; - - // pass data onto global variables - $_GET['task'] = $task; - $_REQUEST['task'] = $task; - $_GET['sectionid'] = $sectionid; - $_REQUEST['sectionid'] = $sectionid; - $_GET['id'] = $id; - $_REQUEST['id'] = $id; - $_GET['Itemid'] = $Itemid; - $_REQUEST['Itemid'] = $Itemid; - $_GET['order'] = $order; - $_REQUEST['order'] = $order; - $_GET['limit'] = $limit; - $_REQUEST['limit'] = $limit; - $_GET['limitstart'] = $limitstart; - $_REQUEST['limitstart'] = $limitstart; - - $QUERY_STRING = "option=com_content&task=$task§ionid=$sectionid&id=$id&Itemid=$Itemid&order=$order&limit=$limit&limitstart=$limitstart"; - } - else if (isset ($url_array[$pos +6]) && $url_array[$pos +6] != '') - { - // $option/$task/$sectionid/$id/$Itemid/$limit/$limitstart - $task = $url_array[$pos +1]; - $sectionid = $url_array[$pos +2]; - $id = $url_array[$pos +3]; - $Itemid = $url_array[$pos +4]; - $limit = $url_array[$pos +5]; - $limitstart = $url_array[$pos +6]; - - // pass data onto global variables - $_GET['task'] = $task; - $_REQUEST['task'] = $task; - $_GET['sectionid'] = $sectionid; - $_REQUEST['sectionid'] = $sectionid; - $_GET['id'] = $id; - $_REQUEST['id'] = $id; - $_GET['Itemid'] = $Itemid; - $_REQUEST['Itemid'] = $Itemid; - $_GET['limit'] = $limit; - $_REQUEST['limit'] = $limit; - $_GET['limitstart'] = $limitstart; - $_REQUEST['limitstart'] = $limitstart; - - $QUERY_STRING = "option=com_content&task=$task§ionid=$sectionid&id=$id&Itemid=$Itemid&limit=$limit&limitstart=$limitstart"; - } - else if (isset ($url_array[$pos +5]) && $url_array[$pos +5] != '') - { - // $option/$task/$id/$Itemid/$limit/$limitstart - $task = $url_array[$pos +1]; - $id = $url_array[$pos +2]; - $Itemid = $url_array[$pos +3]; - $limit = $url_array[$pos +4]; - $limitstart = $url_array[$pos +5]; - - // pass data onto global variables - $_GET['task'] = $task; - $_REQUEST['task'] = $task; - $_GET['id'] = $id; - $_REQUEST['id'] = $id; - $_GET['Itemid'] = $Itemid; - $_REQUEST['Itemid'] = $Itemid; - $_GET['limit'] = $limit; - $_REQUEST['limit'] = $limit; - $_GET['limitstart'] = $limitstart; - $_REQUEST['limitstart'] = $limitstart; - - $QUERY_STRING = "option=com_content&task=$task&id=$id&Itemid=$Itemid&limit=$limit&limitstart=$limitstart"; - } - else if (isset ($url_array[$pos +4]) && $url_array[$pos +4] != '' && (in_array('archivecategory', $url_array) || in_array('archivesection', $url_array))) - { - // $option/$task/$year/$month/$module - $task = $url_array[$pos +1]; - $year = $url_array[$pos +2]; - $month = $url_array[$pos +3]; - $module = $url_array[$pos +4]; - - // pass data onto global variables - $_GET['task'] = $task; - $_REQUEST['task'] = $task; - $_GET['year'] = $year; - $_REQUEST['year'] = $year; - $_GET['month'] = $month; - $_REQUEST['month'] = $month; - $_GET['module'] = $module; - $_REQUEST['module'] = $module; - - $QUERY_STRING = "option=com_content&task=$task&year=$year&month=$month&module=$module"; - } - else if (!(isset ($url_array[$pos +5]) && $url_array[$pos +5] != '') && isset ($url_array[$pos +4]) && $url_array[$pos +4] != '') - { - // $option/$task/$sectionid/$id/$Itemid - $task = $url_array[$pos +1]; - $sectionid = $url_array[$pos +2]; - $id = $url_array[$pos +3]; - $Itemid = $url_array[$pos +4]; - - // pass data onto global variables - $_GET['task'] = $task; - $_REQUEST['task'] = $task; - $_GET['sectionid'] = $sectionid; - $_REQUEST['sectionid'] = $sectionid; - $_GET['id'] = $id; - $_REQUEST['id'] = $id; - $_GET['Itemid'] = $Itemid; - $_REQUEST['Itemid'] = $Itemid; - - $QUERY_STRING = "option=com_content&task=$task§ionid=$sectionid&id=$id&Itemid=$Itemid"; - } - else if (!(isset ($url_array[$pos +4]) && $url_array[$pos +4] != '') && (isset ($url_array[$pos +3]) && $url_array[$pos +3] != '')) - { - // $option/$task/$id/$Itemid - $task = $url_array[$pos +1]; - $id = $url_array[$pos +2]; - $Itemid = $url_array[$pos +3]; - - // pass data onto global variables - $_GET['task'] = $task; - $_REQUEST['task'] = $task; - $_GET['id'] = $id; - $_REQUEST['id'] = $id; - $_GET['Itemid'] = $Itemid; - $_REQUEST['Itemid'] = $Itemid; - - $QUERY_STRING = "option=com_content&task=$task&id=$id&Itemid=$Itemid"; - } - else if (!(isset ($url_array[$pos +3]) && $url_array[$pos +3] != '') && (isset ($url_array[$pos +2]) && $url_array[$pos +2] != '')) - { - // $option/$task/$id - $task = $url_array[$pos +1]; - $id = $url_array[$pos +2]; - - // pass data onto global variables - $_GET['task'] = $task; - $_REQUEST['task'] = $task; - $_GET['id'] = $id; - $_REQUEST['id'] = $id; - - $QUERY_STRING = "option=com_content&task=$task&id=$id"; - } - else if (!(isset ($url_array[$pos +2]) && $url_array[$pos +2] != '') && (isset ($url_array[$pos +1]) && $url_array[$pos +1] != '')) - { - // $option/$task - $task = $url_array[$pos +1]; - - $_GET['task'] = $task; - $_REQUEST['task'] = $task; - - $QUERY_STRING = 'option=com_content&task=' . $task; - } - - if ($lang != '') { - $QUERY_STRING .= '&lang=' . $lang; - } - - $_SERVER['QUERY_STRING'] = $QUERY_STRING; - $REQUEST_URI = $uri[0] . 'index.php?' . $QUERY_STRING; - $_SERVER['REQUEST_URI'] = $REQUEST_URI; - - } - else if (in_array('component', $url_array)) - { - $name = 'component'; - /* - Components - http://www.domain.com/component/$name,$value - */ - $uri = explode('component/', $_SERVER['REQUEST_URI']); - $uri_array = explode('/', $uri[1]); - $QUERY_STRING = ''; - - // needed for check if component exists - $path = $mosConfig_absolute_path . '/components'; - $dirlist = array (); - if (is_dir($path)) - { - $base = opendir($path); - while (false !== ($dir = readdir($base))) - { - if ($dir !== '.' && $dir !== '..' && is_dir($path . '/' . $dir) && strtolower($dir) !== 'cvs' && strtolower($dir) !== '.svn') { - $dirlist[] = $dir; - } - } - closedir($base); - } - - foreach ($uri_array as $value) - { - $temp = explode(',', $value); - if (isset ($temp[0]) && $temp[0] != '' && isset ($temp[1]) && $temp[1] != '') - { - $_GET[$temp[0]] = $temp[1]; - $_REQUEST[$temp[0]] = $temp[1]; - - // check to ensure component actually exists - if ($temp[0] == 'option') - { - $check = ''; - if (count($dirlist)) { - foreach ($dirlist as $dir) { - if ($temp[1] == $dir) { - $check = 1; - break; - } - } - } - // redirect to 404 page if no component found to match url - if (!$check) - { - header('HTTP/1.0 404 Not Found'); - require_once ($mosConfig_absolute_path . '/templates/404.php'); - exit (404); - } - } - - if ($QUERY_STRING == '') { - $QUERY_STRING .= "$temp[0]=$temp[1]"; - } else { - $QUERY_STRING .= "&$temp[0]=$temp[1]"; - } - } - } - - $_SERVER['QUERY_STRING'] = $QUERY_STRING; - $REQUEST_URI = $uri[0] . 'index.php?' . $QUERY_STRING; - $_SERVER['REQUEST_URI'] = $REQUEST_URI; - - } - // let this go through and the rest of the system should handle it properly - } - +_db = JFactory::getDBO(); + parent :: __construct($subject, $config); + } + + function onAfterInitialise() + { + global $mainframe; + if ($mainframe->isAdmin()) { + return; // Dont run in admin + } + + $sef = $this->params->get('sef', 1); + $url = $this->params->get('url', 1); + + $legacysef = $this->params->get('legacysef', 1); + if (!$sef && !$url && !$legacysef) + return; // None of the options enabled, bail! + + // Grab the system as early as possible, we're going to terminate it potentially + // Case 1: Query string match (shouldn't need this but its here anyway) + if ($url && isset ($_SERVER['QUERY_STRING']) && strlen($_SERVER['QUERY_STRING']) && strpos($_SERVER['QUERY_STRING'], '&')) { + $query_string = $_SERVER['QUERY_STRING']; + $this->_lookup($query_string); + } + + // Case 2: SEF or similar match + if ($sef && isset ($_SERVER['SCRIPT_NAME']) && isset ($_SERVER['REQUEST_URI'])) { + $part = str_replace('index.php', '', $_SERVER['SCRIPT_NAME']); + if($part != '/') { + $search = str_replace($part, '', $_SERVER['REQUEST_URI']); + } else { + $search = ltrim($_SERVER['REQUEST_URI'],'/'); + } + $this->_lookup($search); + } + // Case 3: Old school core sef; used to backlink + // Enable only if: + // 1: SEF is enabled + // 2: Legacy SEF Plugin Param is set + // 3: And there is no backlink + if ($mainframe->getCfg('sef') + && $legacysef + && !strstr($_SERVER['REQUEST_URI'],'nobacklink') + && !strlen($_SERVER['QUERY_STRING'])) { + $this->_legacysef(); + } + + } + + function _lookup($searchstring) + { + // return blank strings and just index.php on its own... + if (!strlen($searchstring) || $searchstring == trim('index.php',' ?')) { + return; + } + + $sef = $this->params->get('sef', 1); + $url = $this->params->get('url', 1); + + if (!$sef && !$url) { + return; // Neither option enabled, bail! + } + + $query = 'SELECT * FROM #__migration_backlinks WHERE '; + $where = Array (); + $search = $this->_db->Quote( $this->_db->getEscaped( $searchstring, true ).'%', false ); + + if ($url) { + $where[] = 'url LIKE ' . $search; + } + if ($sef) { + $where[] = 'sefurl LIKE ' . $search; + } + + $query .= implode(' OR ', $where); + $this->_db->setQuery($query); + $results = $this->_db->loadAssocList(); + + if (count($results)) { + // Get the first one... + $this->_redirect($results[0]['itemid'], $results[0]['name'], $results[0]['newurl']); + } + } + + function _redirect($Itemid, $name, $url = null) + { + global $mainframe; + if (!strlen($url)) + { + $menu = & JSite :: getMenu(); + $item = $menu->getItem($Itemid); + //$url = $item->link; + + switch ($item->type) + { + case 'url' : + if ((strpos($item->link, 'index.php?') !== false) && (strpos($item->link, 'Itemid=') === false)) { + $url = $item->link . '&Itemid=' . $item->id; + } else { + $url = $item->link; + } + break; + + default : + $url = 'index.php?Itemid=' . $item->id; + //$url = $item->link . '&Itemid='.$item->id; + break; + } + $url = JRoute :: _($url); + //$url = JURI :: base() . $url; // was $surl with third option of below being url and second being surl + $name = $item->name; + } + // Check we're not redirecting to ourselves + if(!stristr($url,$_SERVER['REQUEST_URI']) && !stristr($url,$_SERVER['SCRIPT_NAME'].'/'.$_SERVER['QUERY_STRING'])) { + return; + } + + $name = $name ? $name : "Unknown"; + + header('Location: ' . str_replace('&','&',$url), true, '301'); // redirect and kill of and & + jexit(JText :: sprintf('"%s" has moved to %s. Click the link if your browser does not redirect you automatically.', $name, $url, $url)); + } + + function _legacysef() + { + $mosConfig_absolute_path = JPATH_SITE; + $mosConfig_live_site = JURI :: base(); + $url_array = explode('/', $_SERVER['REQUEST_URI']); + + if (in_array('content', $url_array)) + { + /** + * Content + * http://www.domain.com/$option/$task/$sectionid/$id/$Itemid/$limit/$limitstart + */ + + $uri = explode('content/', $_SERVER['REQUEST_URI']); + $option = 'com_content'; + $_GET['option'] = $option; + $_REQUEST['option'] = $option; + $pos = array_search('content', $url_array); + + // language hook for content + $lang = ''; + foreach ($url_array as $key => $value) + { + if (!strcasecmp(substr($value, 0, 5), 'lang,')) + { + $temp = explode(',', $value); + if (isset ($temp[0]) && $temp[0] != '' && isset ($temp[1]) && $temp[1] != '') + { + $_GET['lang'] = $temp[1]; + $_REQUEST['lang'] = $temp[1]; + $lang = $temp[1]; + } + unset ($url_array[$key]); + } + } + + if (isset ($url_array[$pos +8]) && $url_array[$pos +8] != '' && in_array('category', $url_array) && (strpos($url_array[$pos +5], 'order,') !== false) && (strpos($url_array[$pos +6], 'filter,') !== false)) + { + // $option/$task/$sectionid/$id/$Itemid/$order/$filter/$limit/$limitstart + $task = $url_array[$pos +1]; + $sectionid = $url_array[$pos +2]; + $id = $url_array[$pos +3]; + $Itemid = $url_array[$pos +4]; + $order = str_replace('order,', '', $url_array[$pos +5]); + $filter = str_replace('filter,', '', $url_array[$pos +6]); + $limit = $url_array[$pos +7]; + $limitstart = $url_array[$pos +8]; + + // pass data onto global variables + $_GET['task'] = $task; + $_REQUEST['task'] = $task; + $_GET['sectionid'] = $sectionid; + $_REQUEST['sectionid'] = $sectionid; + $_GET['id'] = $id; + $_REQUEST['id'] = $id; + $_GET['Itemid'] = $Itemid; + $_REQUEST['Itemid'] = $Itemid; + $_GET['order'] = $order; + $_REQUEST['order'] = $order; + $_GET['filter'] = $filter; + $_REQUEST['filter'] = $filter; + $_GET['limit'] = $limit; + $_REQUEST['limit'] = $limit; + $_GET['limitstart'] = $limitstart; + $_REQUEST['limitstart'] = $limitstart; + + $QUERY_STRING = "option=com_content&task=$task§ionid=$sectionid&id=$id&Itemid=$Itemid&order=$order&filter=$filter&limit=$limit&limitstart=$limitstart"; + } + else if (isset ($url_array[$pos +7]) && $url_array[$pos +7] != '' && $url_array[$pos +5] > 1000 && (in_array('archivecategory', $url_array) || in_array('archivesection', $url_array))) + { + // $option/$task/$id/$limit/$limitstart/year/month/module + $task = $url_array[$pos +1]; + $id = $url_array[$pos +2]; + $limit = $url_array[$pos +3]; + $limitstart = $url_array[$pos +4]; + $year = $url_array[$pos +5]; + $month = $url_array[$pos +6]; + $module = $url_array[$pos +7]; + + // pass data onto global variables + $_GET['task'] = $task; + $_REQUEST['task'] = $task; + $_GET['id'] = $id; + $_REQUEST['id'] = $id; + $_GET['limit'] = $limit; + $_REQUEST['limit'] = $limit; + $_GET['limitstart'] = $limitstart; + $_REQUEST['limitstart'] = $limitstart; + $_GET['year'] = $year; + $_REQUEST['year'] = $year; + $_GET['month'] = $month; + $_REQUEST['month'] = $month; + $_GET['module'] = $module; + $_REQUEST['module'] = $module; + + $QUERY_STRING = "option=com_content&task=$task&id=$id&limit=$limit&limitstart=$limitstart&year=$year&month=$month&module=$module"; + } + else if (isset ($url_array[$pos +7]) && $url_array[$pos +7] != '' && $url_array[$pos +6] > 1000 && (in_array('archivecategory', $url_array) || in_array('archivesection', $url_array))) + { + // $option/$task/$id/$Itemid/$limit/$limitstart/year/month + $task = $url_array[$pos +1]; + $id = $url_array[$pos +2]; + $Itemid = $url_array[$pos +3]; + $limit = $url_array[$pos +4]; + $limitstart = $url_array[$pos +5]; + $year = $url_array[$pos +6]; + $month = $url_array[$pos +7]; + + // pass data onto global variables + $_GET['task'] = $task; + $_REQUEST['task'] = $task; + $_GET['id'] = $id; + $_REQUEST['id'] = $id; + $_GET['Itemid'] = $Itemid; + $_REQUEST['Itemid'] = $Itemid; + $_GET['limit'] = $limit; + $_REQUEST['limit'] = $limit; + $_GET['limitstart'] = $limitstart; + $_REQUEST['limitstart'] = $limitstart; + $_GET['year'] = $year; + $_REQUEST['year'] = $year; + $_GET['month'] = $month; + $_REQUEST['month'] = $month; + + $QUERY_STRING = "option=com_content&task=$task&id=$id&Itemid=$Itemid&limit=$limit&limitstart=$limitstart&year=$year&month=$month"; + } + else if (isset ($url_array[$pos +7]) && $url_array[$pos +7] != '' && in_array('category', $url_array) && (strpos($url_array[$pos +5], 'order,') !== false)) + { + // $option/$task/$sectionid/$id/$Itemid/$order/$limit/$limitstart + $task = $url_array[$pos +1]; + $sectionid = $url_array[$pos +2]; + $id = $url_array[$pos +3]; + $Itemid = $url_array[$pos +4]; + $order = str_replace('order,', '', $url_array[$pos +5]); + $limit = $url_array[$pos +6]; + $limitstart = $url_array[$pos +7]; + + // pass data onto global variables + $_GET['task'] = $task; + $_REQUEST['task'] = $task; + $_GET['sectionid'] = $sectionid; + $_REQUEST['sectionid'] = $sectionid; + $_GET['id'] = $id; + $_REQUEST['id'] = $id; + $_GET['Itemid'] = $Itemid; + $_REQUEST['Itemid'] = $Itemid; + $_GET['order'] = $order; + $_REQUEST['order'] = $order; + $_GET['limit'] = $limit; + $_REQUEST['limit'] = $limit; + $_GET['limitstart'] = $limitstart; + $_REQUEST['limitstart'] = $limitstart; + + $QUERY_STRING = "option=com_content&task=$task§ionid=$sectionid&id=$id&Itemid=$Itemid&order=$order&limit=$limit&limitstart=$limitstart"; + } + else if (isset ($url_array[$pos +6]) && $url_array[$pos +6] != '') + { + // $option/$task/$sectionid/$id/$Itemid/$limit/$limitstart + $task = $url_array[$pos +1]; + $sectionid = $url_array[$pos +2]; + $id = $url_array[$pos +3]; + $Itemid = $url_array[$pos +4]; + $limit = $url_array[$pos +5]; + $limitstart = $url_array[$pos +6]; + + // pass data onto global variables + $_GET['task'] = $task; + $_REQUEST['task'] = $task; + $_GET['sectionid'] = $sectionid; + $_REQUEST['sectionid'] = $sectionid; + $_GET['id'] = $id; + $_REQUEST['id'] = $id; + $_GET['Itemid'] = $Itemid; + $_REQUEST['Itemid'] = $Itemid; + $_GET['limit'] = $limit; + $_REQUEST['limit'] = $limit; + $_GET['limitstart'] = $limitstart; + $_REQUEST['limitstart'] = $limitstart; + + $QUERY_STRING = "option=com_content&task=$task§ionid=$sectionid&id=$id&Itemid=$Itemid&limit=$limit&limitstart=$limitstart"; + } + else if (isset ($url_array[$pos +5]) && $url_array[$pos +5] != '') + { + // $option/$task/$id/$Itemid/$limit/$limitstart + $task = $url_array[$pos +1]; + $id = $url_array[$pos +2]; + $Itemid = $url_array[$pos +3]; + $limit = $url_array[$pos +4]; + $limitstart = $url_array[$pos +5]; + + // pass data onto global variables + $_GET['task'] = $task; + $_REQUEST['task'] = $task; + $_GET['id'] = $id; + $_REQUEST['id'] = $id; + $_GET['Itemid'] = $Itemid; + $_REQUEST['Itemid'] = $Itemid; + $_GET['limit'] = $limit; + $_REQUEST['limit'] = $limit; + $_GET['limitstart'] = $limitstart; + $_REQUEST['limitstart'] = $limitstart; + + $QUERY_STRING = "option=com_content&task=$task&id=$id&Itemid=$Itemid&limit=$limit&limitstart=$limitstart"; + } + else if (isset ($url_array[$pos +4]) && $url_array[$pos +4] != '' && (in_array('archivecategory', $url_array) || in_array('archivesection', $url_array))) + { + // $option/$task/$year/$month/$module + $task = $url_array[$pos +1]; + $year = $url_array[$pos +2]; + $month = $url_array[$pos +3]; + $module = $url_array[$pos +4]; + + // pass data onto global variables + $_GET['task'] = $task; + $_REQUEST['task'] = $task; + $_GET['year'] = $year; + $_REQUEST['year'] = $year; + $_GET['month'] = $month; + $_REQUEST['month'] = $month; + $_GET['module'] = $module; + $_REQUEST['module'] = $module; + + $QUERY_STRING = "option=com_content&task=$task&year=$year&month=$month&module=$module"; + } + else if (!(isset ($url_array[$pos +5]) && $url_array[$pos +5] != '') && isset ($url_array[$pos +4]) && $url_array[$pos +4] != '') + { + // $option/$task/$sectionid/$id/$Itemid + $task = $url_array[$pos +1]; + $sectionid = $url_array[$pos +2]; + $id = $url_array[$pos +3]; + $Itemid = $url_array[$pos +4]; + + // pass data onto global variables + $_GET['task'] = $task; + $_REQUEST['task'] = $task; + $_GET['sectionid'] = $sectionid; + $_REQUEST['sectionid'] = $sectionid; + $_GET['id'] = $id; + $_REQUEST['id'] = $id; + $_GET['Itemid'] = $Itemid; + $_REQUEST['Itemid'] = $Itemid; + + $QUERY_STRING = "option=com_content&task=$task§ionid=$sectionid&id=$id&Itemid=$Itemid"; + } + else if (!(isset ($url_array[$pos +4]) && $url_array[$pos +4] != '') && (isset ($url_array[$pos +3]) && $url_array[$pos +3] != '')) + { + // $option/$task/$id/$Itemid + $task = $url_array[$pos +1]; + $id = $url_array[$pos +2]; + $Itemid = $url_array[$pos +3]; + + // pass data onto global variables + $_GET['task'] = $task; + $_REQUEST['task'] = $task; + $_GET['id'] = $id; + $_REQUEST['id'] = $id; + $_GET['Itemid'] = $Itemid; + $_REQUEST['Itemid'] = $Itemid; + + $QUERY_STRING = "option=com_content&task=$task&id=$id&Itemid=$Itemid"; + } + else if (!(isset ($url_array[$pos +3]) && $url_array[$pos +3] != '') && (isset ($url_array[$pos +2]) && $url_array[$pos +2] != '')) + { + // $option/$task/$id + $task = $url_array[$pos +1]; + $id = $url_array[$pos +2]; + + // pass data onto global variables + $_GET['task'] = $task; + $_REQUEST['task'] = $task; + $_GET['id'] = $id; + $_REQUEST['id'] = $id; + + $QUERY_STRING = "option=com_content&task=$task&id=$id"; + } + else if (!(isset ($url_array[$pos +2]) && $url_array[$pos +2] != '') && (isset ($url_array[$pos +1]) && $url_array[$pos +1] != '')) + { + // $option/$task + $task = $url_array[$pos +1]; + + $_GET['task'] = $task; + $_REQUEST['task'] = $task; + + $QUERY_STRING = 'option=com_content&task=' . $task; + } + + if ($lang != '') { + $QUERY_STRING .= '&lang=' . $lang; + } + + $_SERVER['QUERY_STRING'] = $QUERY_STRING; + $REQUEST_URI = $uri[0] . 'index.php?' . $QUERY_STRING; + $_SERVER['REQUEST_URI'] = $REQUEST_URI; + + } + else if (in_array('component', $url_array)) + { + $name = 'component'; + /* + Components + http://www.domain.com/component/$name,$value + */ + $uri = explode('component/', $_SERVER['REQUEST_URI']); + $uri_array = explode('/', $uri[1]); + $QUERY_STRING = ''; + + // needed for check if component exists + $path = $mosConfig_absolute_path . '/components'; + $dirlist = array (); + if (is_dir($path)) + { + $base = opendir($path); + while (false !== ($dir = readdir($base))) + { + if ($dir !== '.' && $dir !== '..' && is_dir($path . '/' . $dir) && strtolower($dir) !== 'cvs' && strtolower($dir) !== '.svn') { + $dirlist[] = $dir; + } + } + closedir($base); + } + + foreach ($uri_array as $value) + { + $temp = explode(',', $value); + if (isset ($temp[0]) && $temp[0] != '' && isset ($temp[1]) && $temp[1] != '') + { + $_GET[$temp[0]] = $temp[1]; + $_REQUEST[$temp[0]] = $temp[1]; + + // check to ensure component actually exists + if ($temp[0] == 'option') + { + $check = ''; + if (count($dirlist)) { + foreach ($dirlist as $dir) { + if ($temp[1] == $dir) { + $check = 1; + break; + } + } + } + // redirect to 404 page if no component found to match url + if (!$check) + { + header('HTTP/1.0 404 Not Found'); + require_once ($mosConfig_absolute_path . '/templates/404.php'); + exit (404); + } + } + + if ($QUERY_STRING == '') { + $QUERY_STRING .= "$temp[0]=$temp[1]"; + } else { + $QUERY_STRING .= "&$temp[0]=$temp[1]"; + } + } + } + + $_SERVER['QUERY_STRING'] = $QUERY_STRING; + $REQUEST_URI = $uri[0] . 'index.php?' . $QUERY_STRING; + $_SERVER['REQUEST_URI'] = $REQUEST_URI; + + } + // let this go through and the rest of the system should handle it properly + } + } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/backlink.xml b/oss/joomla/trunk/plugins/system/backlink.xml index 5c0902db..a08e7052 100644 --- a/oss/joomla/trunk/plugins/system/backlink.xml +++ b/oss/joomla/trunk/plugins/system/backlink.xml @@ -1,29 +1,29 @@ - - - System - Backlinks - Joomla! Project - September 2007 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. - http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL - admin@joomla.org - www.joomla.org - 1.5 - Provides backlink support - - backlink.php - - - - - - - - - - - - - - - + + + System - Backlinks + Joomla! Project + September 2007 + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. + http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL + admin@joomla.org + www.joomla.org + 1.5 + Provides backlink support + + backlink.php + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/cache.php b/oss/joomla/trunk/plugins/system/cache.php index d74dc9d3..d26313b0 100644 --- a/oss/joomla/trunk/plugins/system/cache.php +++ b/oss/joomla/trunk/plugins/system/cache.php @@ -1,117 +1,117 @@ - JPATH_BASE.DS.'cache', - 'defaultgroup' => 'page', - 'lifetime' => $this->params->get('cachetime', 15) * 60, - 'browsercache' => $this->params->get('browsercache', false), - 'caching' => false, - 'language' => $config->getValue('config.language', 'en-GB') - ); - - jimport('joomla.cache.cache'); - $this->_cache =& JCache::getInstance( 'page', $options ); - } - - /** - * Converting the site URL to fit to the HTTP request - * - */ - function onAfterInitialise() - { - global $mainframe, $_PROFILER; - $user = &JFactory::getUser(); - - if($mainframe->isAdmin() || JDEBUG) { - return; - } - - if (!$user->get('aid') && $_SERVER['REQUEST_METHOD'] == 'GET') { - $this->_cache->setCaching(true); - } - - $data = $this->_cache->get(); - - if($data !== false) - { - // the following code searches for a token in the cached page and replaces it with the - // proper token. - $token = JUtility::getToken(); - $search = '##'; - $replacement = ''; - $data = preg_replace( $search, $replacement, $data ); - - JResponse::setBody($data); - - echo JResponse::toString($mainframe->getCfg('gzip')); - - if(JDEBUG) - { - $_PROFILER->mark('afterCache'); - echo implode( '', $_PROFILER->getBuffer()); - } - - $mainframe->close(); - } - } - - function onAfterRender() - { - global $mainframe; - - if($mainframe->isAdmin() || JDEBUG) { - return; - } - - $user =& JFactory::getUser(); - if(!$user->get('aid')) { - //We need to check again here, because auto-login plugins have not been fired before the first aid check - $this->_cache->store(); - } - } -} + JPATH_BASE.DS.'cache', + 'defaultgroup' => 'page', + 'lifetime' => $this->params->get('cachetime', 15) * 60, + 'browsercache' => $this->params->get('browsercache', false), + 'caching' => false, + 'language' => $config->getValue('config.language', 'en-GB') + ); + + jimport('joomla.cache.cache'); + $this->_cache =& JCache::getInstance( 'page', $options ); + } + + /** + * Converting the site URL to fit to the HTTP request + * + */ + function onAfterInitialise() + { + global $mainframe, $_PROFILER; + $user = &JFactory::getUser(); + + if($mainframe->isAdmin() || JDEBUG) { + return; + } + + if (!$user->get('aid') && $_SERVER['REQUEST_METHOD'] == 'GET') { + $this->_cache->setCaching(true); + } + + $data = $this->_cache->get(); + + if($data !== false) + { + // the following code searches for a token in the cached page and replaces it with the + // proper token. + $token = JUtility::getToken(); + $search = '##'; + $replacement = ''; + $data = preg_replace( $search, $replacement, $data ); + + JResponse::setBody($data); + + echo JResponse::toString($mainframe->getCfg('gzip')); + + if(JDEBUG) + { + $_PROFILER->mark('afterCache'); + echo implode( '', $_PROFILER->getBuffer()); + } + + $mainframe->close(); + } + } + + function onAfterRender() + { + global $mainframe; + + if($mainframe->isAdmin() || JDEBUG) { + return; + } + + $user =& JFactory::getUser(); + if(!$user->get('aid')) { + //We need to check again here, because auto-login plugins have not been fired before the first aid check + $this->_cache->store(); + } + } +} diff --git a/oss/joomla/trunk/plugins/system/cache.xml b/oss/joomla/trunk/plugins/system/cache.xml index d99732fd..bd272e0b 100644 --- a/oss/joomla/trunk/plugins/system/cache.xml +++ b/oss/joomla/trunk/plugins/system/cache.xml @@ -3,7 +3,7 @@ System - Cache Joomla! Project February 2007 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/system/debug.php b/oss/joomla/trunk/plugins/system/debug.php index 9723e0da..3ca50380 100644 --- a/oss/joomla/trunk/plugins/system/debug.php +++ b/oss/joomla/trunk/plugins/system/debug.php @@ -1,207 +1,207 @@ -loadLanguage( ); - } - - /** - * Converting the site URL to fit to the HTTP request - * - */ - function onAfterRender() - { - global $_PROFILER, $mainframe, $database; - - // Do not render if debugging is not enabled - if(!JDEBUG) { return; } - - $document =& JFactory::getDocument(); - $doctype = $document->getType(); - - // Only render for HTML output - if ( $doctype !== 'html' ) { return; } - - $profiler =& $_PROFILER; - - ob_start(); - echo '
'; - if ($this->params->get('profile', 1)) { - echo '

'.JText::_( 'Profile Information' ).'

'; - foreach ( $profiler->getBuffer() as $mark ) { - echo '
'.$mark.'
'; - } - } - - if ($this->params->get('memory', 1)) { - echo '

'.JText::_( 'Memory Usage' ).'

'; - echo $profiler->getMemory(); - } - - if ($this->params->get('queries', 1)) - { - jimport('geshi.geshi'); - - $geshi = new GeSHi( '', 'sql' ); - $geshi->set_header_type(GESHI_HEADER_DIV); - //$geshi->enable_line_numbers( GESHI_FANCY_LINE_NONE ); - - $newlineKeywords = '/' - .'(FROM|LEFT|INNER|OUTER|WHERE|SET|VALUES|ORDER|GROUP|HAVING|LIMIT|ON|AND)' - .'<\\/span>/i' - ; - - $db =& JFactory::getDBO(); - - echo '

'.JText::sprintf( 'Queries logged', $db->getTicker() ).'

'; - - if ($log = $db->getLog()) - { - echo '
    '; - foreach ($log as $k=>$sql) - { - $geshi->set_source($sql); - $text = $geshi->parse_code(); - $text = preg_replace($newlineKeywords, '
      \\0', $text); - echo '
  1. '.$text.'
    2. '; - } - echo '
'; - } - - if(isset($database)) - { - echo '

'.JText::sprintf( 'Legacy Queries logged', $database->getTicker() ).'

'; - echo '
    '; - - foreach ($database->getLog() as $k=>$sql) - { - $geshi->set_source($sql); - $text = $geshi->parse_code(); - $text = preg_replace($newlineKeywords, '
      \\0', $text); - echo '
  1. '.$text.'
    2. '; - } - - echo '
'; - } - } - - $lang = &JFactory::getLanguage(); - if ($this->params->get('language_files', 1)) - { - echo '

'.JText::_( 'Language Files Loaded' ).'

'; - echo '
    '; - $extensions = $lang->getPaths(); - foreach ( $extensions as $extension => $files) - { - foreach ( $files as $file => $status ) - { - echo "
  • $file $status
    • "; - } - } - echo '
'; - } - - $langStrings = $this->params->get('language_strings', -1); - if ($langStrings < 0 OR $langStrings == 1) { - echo '

'.JText::_( 'Untranslated Strings Diagnostic' ).'

'; - echo '
';
-			$orphans = $lang->getOrphans();
-			if (count( $orphans ))
-			{
-				ksort( $orphans, SORT_STRING );
-				foreach ($orphans as $key => $occurance) {
-					foreach ( $occurance as $i => $info) {
-						$class	= @$info['class'];
-						$func	= @$info['function'];
-						$file	= @$info['file'];
-						$line	= @$info['line'];
-						echo strtoupper( $key )."\t$class::$func()\t[$file:$line]\n";
-					}
-				}
-			}
-			else {
-				echo JText::_( 'None' );
-			}
-			echo '
'; - } - if ($langStrings < 0 OR $langStrings == 2) { - echo '

'.JText::_( 'Untranslated Strings Designer' ).'

'; - echo '
';
-			$orphans = $lang->getOrphans();
-			if (count( $orphans ))
-			{
-				ksort( $orphans, SORT_STRING );
-				$guesses = array();
-				foreach ($orphans as $key => $occurance) {
-					if (is_array( $occurance ) AND isset( $occurance[0] )) {
-						$info = &$occurance[0];
-						$file = @$info['file'];
-						if (!isset( $guesses[$file] )) {
-							$guesses[$file] = array();
-						}
-
-						$guess = str_replace( '_', ' ', $info['string'] );
-						if ($strip = $this->params->get('language_prefix')) {
-							$guess = trim( preg_replace( chr(1).'^'.$strip.chr(1), '', $guess ) );
-						}
-						$guesses[$file][] = trim( strtoupper( $key ) ).'='.$guess;
-					}
-				}
-				foreach ($guesses as $file => $keys) {
-					echo "\n\n# ".($file ? $file : JText::_( 'Unknown file' ))."\n\n";
-					echo implode( "\n", $keys );
-				}
-			}
-			else {
-				echo JText::_( 'None' );
-			}
-			echo '
'; - } - echo '
'; - - $debug = ob_get_clean(); - - $body = JResponse::getBody(); - $body = str_replace('', $debug.'', $body); - JResponse::setBody($body); - } +loadLanguage( ); + } + + /** + * Converting the site URL to fit to the HTTP request + * + */ + function onAfterRender() + { + global $_PROFILER, $mainframe, $database; + + // Do not render if debugging is not enabled + if(!JDEBUG) { return; } + + $document =& JFactory::getDocument(); + $doctype = $document->getType(); + + // Only render for HTML output + if ( $doctype !== 'html' ) { return; } + + $profiler =& $_PROFILER; + + ob_start(); + echo '
'; + if ($this->params->get('profile', 1)) { + echo '

'.JText::_( 'Profile Information' ).'

'; + foreach ( $profiler->getBuffer() as $mark ) { + echo '
'.$mark.'
'; + } + } + + if ($this->params->get('memory', 1)) { + echo '

'.JText::_( 'Memory Usage' ).'

'; + echo $profiler->getMemory(); + } + + if ($this->params->get('queries', 1)) + { + jimport('geshi.geshi'); + + $geshi = new GeSHi( '', 'sql' ); + $geshi->set_header_type(GESHI_HEADER_DIV); + //$geshi->enable_line_numbers( GESHI_FANCY_LINE_NONE ); + + $newlineKeywords = '/' + .'(FROM|LEFT|INNER|OUTER|WHERE|SET|VALUES|ORDER|GROUP|HAVING|LIMIT|ON|AND)' + .'<\\/span>/i' + ; + + $db =& JFactory::getDBO(); + + echo '

'.JText::sprintf( 'Queries logged', $db->getTicker() ).'

'; + + if ($log = $db->getLog()) + { + echo '
    '; + foreach ($log as $k=>$sql) + { + $geshi->set_source($sql); + $text = $geshi->parse_code(); + $text = preg_replace($newlineKeywords, '
      \\0', $text); + echo '
  1. '.$text.'
    2. '; + } + echo '
'; + } + + if(isset($database)) + { + echo '

'.JText::sprintf( 'Legacy Queries logged', $database->getTicker() ).'

'; + echo '
    '; + + foreach ($database->getLog() as $k=>$sql) + { + $geshi->set_source($sql); + $text = $geshi->parse_code(); + $text = preg_replace($newlineKeywords, '
      \\0', $text); + echo '
  1. '.$text.'
    2. '; + } + + echo '
'; + } + } + + $lang = &JFactory::getLanguage(); + if ($this->params->get('language_files', 1)) + { + echo '

'.JText::_( 'Language Files Loaded' ).'

'; + echo '
    '; + $extensions = $lang->getPaths(); + foreach ( $extensions as $extension => $files) + { + foreach ( $files as $file => $status ) + { + echo "
  • $file $status
    • "; + } + } + echo '
'; + } + + $langStrings = $this->params->get('language_strings', -1); + if ($langStrings < 0 OR $langStrings == 1) { + echo '

'.JText::_( 'Untranslated Strings Diagnostic' ).'

'; + echo '
';
+			$orphans = $lang->getOrphans();
+			if (count( $orphans ))
+			{
+				ksort( $orphans, SORT_STRING );
+				foreach ($orphans as $key => $occurance) {
+					foreach ( $occurance as $i => $info) {
+						$class	= @$info['class'];
+						$func	= @$info['function'];
+						$file	= @$info['file'];
+						$line	= @$info['line'];
+						echo strtoupper( $key )."\t$class::$func()\t[$file:$line]\n";
+					}
+				}
+			}
+			else {
+				echo JText::_( 'None' );
+			}
+			echo '
'; + } + if ($langStrings < 0 OR $langStrings == 2) { + echo '

'.JText::_( 'Untranslated Strings Designer' ).'

'; + echo '
';
+			$orphans = $lang->getOrphans();
+			if (count( $orphans ))
+			{
+				ksort( $orphans, SORT_STRING );
+				$guesses = array();
+				foreach ($orphans as $key => $occurance) {
+					if (is_array( $occurance ) AND isset( $occurance[0] )) {
+						$info = &$occurance[0];
+						$file = @$info['file'];
+						if (!isset( $guesses[$file] )) {
+							$guesses[$file] = array();
+						}
+
+						$guess = str_replace( '_', ' ', $info['string'] );
+						if ($strip = $this->params->get('language_prefix')) {
+							$guess = trim( preg_replace( chr(1).'^'.$strip.chr(1), '', $guess ) );
+						}
+						$guesses[$file][] = trim( strtoupper( $key ) ).'='.$guess;
+					}
+				}
+				foreach ($guesses as $file => $keys) {
+					echo "\n\n# ".($file ? $file : JText::_( 'Unknown file' ))."\n\n";
+					echo implode( "\n", $keys );
+				}
+			}
+			else {
+				echo JText::_( 'None' );
+			}
+			echo '
'; + } + echo '
'; + + $debug = ob_get_clean(); + + $body = JResponse::getBody(); + $body = str_replace('', $debug.'', $body); + JResponse::setBody($body); + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/debug.xml b/oss/joomla/trunk/plugins/system/debug.xml index 789f0357..f3ecb9bb 100644 --- a/oss/joomla/trunk/plugins/system/debug.xml +++ b/oss/joomla/trunk/plugins/system/debug.xml @@ -1,40 +1,40 @@ - - - System - Debug - Joomla! Project - December 2006 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. - http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL - admin@joomla.org - www.joomla.org - 1.5 - Provides debug information - - debug.php - - - - - - - - - - - - - - - - - - - - - - - - - - + + + System - Debug + Joomla! Project + December 2006 + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. + http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL + admin@joomla.org + www.joomla.org + 1.5 + Provides debug information + + debug.php + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy.php b/oss/joomla/trunk/plugins/system/legacy.php index 62f0567f..6cfaac33 100644 --- a/oss/joomla/trunk/plugins/system/legacy.php +++ b/oss/joomla/trunk/plugins/system/legacy.php @@ -1,403 +1,403 @@ -setValue('config.legacy', 1); - - // Import library dependencies - require_once(dirname(__FILE__).DS.'legacy'.DS.'classes.php'); - require_once(dirname(__FILE__).DS.'legacy'.DS.'functions.php'); - - // Register legacy classes for autoloading - JLoader::register('mosAdminMenus' , dirname(__FILE__).DS.'legacy'.DS.'adminmenus.php'); - JLoader::register('mosCache' , dirname(__FILE__).DS.'legacy'.DS.'cache.php'); - JLoader::register('mosCategory' , dirname(__FILE__).DS.'legacy'.DS.'category.php'); - JLoader::register('mosCommonHTML' , dirname(__FILE__).DS.'legacy'.DS.'commonhtml.php'); - JLoader::register('mosComponent' , dirname(__FILE__).DS.'legacy'.DS.'component.php'); - JLoader::register('mosContent' , dirname(__FILE__).DS.'legacy'.DS.'content.php'); - JLoader::register('mosDBTable' , dirname(__FILE__).DS.'legacy'.DS.'dbtable.php'); - JLoader::register('mosHTML' , dirname(__FILE__).DS.'legacy'.DS.'html.php'); - JLoader::register('mosInstaller' , dirname(__FILE__).DS.'legacy'.DS.'installer.php'); - JLoader::register('mosMainFrame' , dirname(__FILE__).DS.'legacy'.DS.'mainframe.php'); - JLoader::register('mosMambot' , dirname(__FILE__).DS.'legacy'.DS.'mambot.php'); - JLoader::register('mosMambotHandler', dirname(__FILE__).DS.'legacy'.DS.'mambothandler.php'); - JLoader::register('mosMenu' , dirname(__FILE__).DS.'legacy'.DS.'menu.php'); - JLoader::register('mosMenuBar' , dirname(__FILE__).DS.'legacy'.DS.'menubar.php'); - JLoader::register('mosModule' , dirname(__FILE__).DS.'legacy'.DS.'module.php'); - //JLoader::register('mosPageNav' , dirname(__FILE__).DS.'legacy'.DS.'pagination.php'); - JLoader::register('mosParameters' , dirname(__FILE__).DS.'legacy'.DS.'parameters.php'); - JLoader::register('patFactory' , dirname(__FILE__).DS.'legacy'.DS.'patfactory.php'); - JLoader::register('mosProfiler' , dirname(__FILE__).DS.'legacy'.DS.'profiler.php'); - JLoader::register('mosSection' , dirname(__FILE__).DS.'legacy'.DS.'section.php'); - JLoader::register('mosSession' , dirname(__FILE__).DS.'legacy'.DS.'session.php'); - JLoader::register('mosToolbar' , dirname(__FILE__).DS.'legacy'.DS.'toolbar.php'); - JLoader::register('mosUser' , dirname(__FILE__).DS.'legacy'.DS.'user.php'); - - // Register class for the database, depends on which db type has been selected for use - $dbtype = $config->getValue('config.dbtype', 'mysql'); - JLoader::register('database' , dirname(__FILE__).DS.'legacy'.DS.$dbtype.'.php'); - - /** - * Legacy define, _ISO define not used anymore. All output is forced as utf-8. - * @deprecated As of version 1.5 - */ - define('_ISO','charset=utf-8'); - - /** - * Legacy constant, use _JEXEC instead - * @deprecated As of version 1.5 - */ - define( '_VALID_MOS', 1 ); - - /** - * Legacy constant, use _JEXEC instead - * @deprecated As of version 1.5 - */ - define( '_MOS_MAMBO_INCLUDED', 1 ); - - /** - * Legacy constant, use DATE_FORMAT_LC instead - * @deprecated As of version 1.5 - */ - DEFINE('_DATE_FORMAT_LC', JText::_('DATE_FORMAT_LC1') ); //Uses PHP's strftime Command Format - - /** - * Legacy constant, use DATE_FORMAT_LC2 instead - * @deprecated As of version 1.5 - */ - DEFINE('_DATE_FORMAT_LC2', JText::_('DATE_FORMAT_LC2')); - - /** - * Legacy constant, use JFilterInput instead - * @deprecated As of version 1.5 - */ - DEFINE( "_MOS_NOTRIM", 0x0001 ); - - /** - * Legacy constant, use JFilterInput instead - * @deprecated As of version 1.5 - */ - DEFINE( "_MOS_ALLOWHTML", 0x0002 ); - - /** - * Legacy constant, use JFilterInput instead - * @deprecated As of version 1.5 - */ - DEFINE( "_MOS_ALLOWRAW", 0x0004 ); - - /** - * Legacy global, use JVersion->getLongVersion() instead - * @name $_VERSION - * @deprecated As of version 1.5 - */ - $GLOBALS['_VERSION'] = new JVersion(); - $version = $GLOBALS['_VERSION']->getLongVersion(); - - /** - * Legacy global, use JFactory::getDBO() instead - * @name $database - * @deprecated As of version 1.5 - */ - $conf =& JFactory::getConfig(); - $GLOBALS['database'] = new database($conf->getValue('config.host'), $conf->getValue('config.user'), $conf->getValue('config.password'), $conf->getValue('config.db'), $conf->getValue('config.dbprefix')); - $GLOBALS['database']->debug($conf->getValue('config.debug')); - - /** - * Legacy global, use JFactory::getUser() [JUser object] instead - * @name $my - * @deprecated As of version 1.5 - */ - $user =& JFactory::getUser(); - - $GLOBALS['my'] = (object)$user->getProperties(); - $GLOBALS['my']->gid = $user->get('aid', 0); - - /** - * Insert configuration values into global scope (for backwards compatibility) - * @deprecated As of version 1.5 - */ - - $temp = new JConfig; - foreach (get_object_vars($temp) as $k => $v) { - $name = 'mosConfig_'.$k; - $GLOBALS[$name] = $v; - } - - $GLOBALS['mosConfig_live_site'] = substr_replace(JURI::root(), '', -1, 1); - $GLOBALS['mosConfig_absolute_path'] = JPATH_SITE; - $GLOBALS['mosConfig_cachepath'] = JPATH_BASE.DS.'cache'; - - $GLOBALS['mosConfig_offset_user'] = 0; - - $lang =& JFactory::getLanguage(); - $GLOBALS['mosConfig_lang'] = $lang->getBackwardLang(); - - $config->setValue('config.live_site', $GLOBALS['mosConfig_live_site']); - $config->setValue('config.absolute_path', $GLOBALS['mosConfig_absolute_path']); - $config->setValue('config.lang', $GLOBALS['mosConfig_lang']); - - /** - * Legacy global, use JFactory::getUser() instead - * @name $acl - * @deprecated As of version 1.5 - */ - $acl =& JFactory::getACL(); - - // Legacy ACL's for backward compat - $acl->addACL( 'administration', 'edit', 'users', 'super administrator', 'components', 'all' ); - $acl->addACL( 'administration', 'edit', 'users', 'administrator', 'components', 'all' ); - $acl->addACL( 'administration', 'edit', 'users', 'super administrator', 'user properties', 'block_user' ); - $acl->addACL( 'administration', 'manage', 'users', 'super administrator', 'components', 'com_users' ); - $acl->addACL( 'administration', 'manage', 'users', 'administrator', 'components', 'com_users' ); - $acl->addACL( 'administration', 'config', 'users', 'super administrator' ); - //$acl->addACL( 'administration', 'config', 'users', 'administrator' ); - - $acl->addACL( 'action', 'add', 'users', 'author', 'content', 'all' ); - $acl->addACL( 'action', 'add', 'users', 'editor', 'content', 'all' ); - $acl->addACL( 'action', 'add', 'users', 'publisher', 'content', 'all' ); - $acl->addACL( 'action', 'edit', 'users', 'author', 'content', 'own' ); - $acl->addACL( 'action', 'edit', 'users', 'editor', 'content', 'all' ); - $acl->addACL( 'action', 'edit', 'users', 'publisher', 'content', 'all' ); - $acl->addACL( 'action', 'publish', 'users', 'publisher', 'content', 'all' ); - - $acl->addACL( 'action', 'add', 'users', 'manager', 'content', 'all' ); - $acl->addACL( 'action', 'edit', 'users', 'manager', 'content', 'all' ); - $acl->addACL( 'action', 'publish', 'users', 'manager', 'content', 'all' ); - - $acl->addACL( 'action', 'add', 'users', 'administrator', 'content', 'all' ); - $acl->addACL( 'action', 'edit', 'users', 'administrator', 'content', 'all' ); - $acl->addACL( 'action', 'publish', 'users', 'administrator', 'content', 'all' ); - - $acl->addACL( 'action', 'add', 'users', 'super administrator', 'content', 'all' ); - $acl->addACL( 'action', 'edit', 'users', 'super administrator', 'content', 'all' ); - $acl->addACL( 'action', 'publish', 'users', 'super administrator', 'content', 'all' ); - - $acl->addACL( 'com_syndicate', 'manage', 'users', 'super administrator' ); - $acl->addACL( 'com_syndicate', 'manage', 'users', 'administrator' ); - $acl->addACL( 'com_syndicate', 'manage', 'users', 'manager' ); - - $GLOBALS['acl'] =& $acl; - - /** - * Legacy global - * @name $task - * @deprecated As of version 1.5 - */ - $GLOBALS['task'] = JRequest::getString('task'); - - /** - * Load the site language file (the old way - to be deprecated) - * @deprecated As of version 1.5 - */ - global $mosConfig_lang; - $mosConfig_lang = JFilterInput::clean($mosConfig_lang, 'cmd'); - $file = JPATH_SITE.DS.'language'.DS.$mosConfig_lang.'.php'; - if (file_exists( $file )) { - require_once( $file); - } else { - $file = JPATH_SITE.DS.'language'.DS.'english.php'; - if (file_exists( $file )) { - require_once( $file ); - } - } - - /** - * Legacy global - * use JApplicaiton->registerEvent and JApplication->triggerEvent for event handling - * use JPlugingHelper::importPlugin to load bot code - * @deprecated As of version 1.5 - */ - $GLOBALS['_MAMBOTS'] = new mosMambotHandler(); - - $mosmsg = JRequest::getVar( 'mosmsg' ); - $mainframe->enqueueMessage( $mosmsg ); - } - - /** - * Fixes the $my global if the user was restored by the remember me plugin - */ - function onAfterInitialise() - { - $user =& JFactory::getUser(); - if ($user->id) { - if ($GLOBALS['my']->id === 0) { - $GLOBALS['my'] = (object)$user->getProperties(); - $GLOBALS['my']->gid = $user->get('aid', 0); - } - } - - return true; - } - - - - function onAfterRoute() - { - global $mainframe; - if ($mainframe->isAdmin()) { - return; - } - - switch(JRequest::getCmd('option')) - { - case 'com_content' : - $this->routeContent(); - break; - case 'com_newsfeeds' : - $this->routeNewsfeeds(); - break; - case 'com_weblinks' : - $this->routeWeblinks(); - break; - case 'com_frontpage' : - JRequest::setVar('option', 'com_content'); - JRequest::setVar('view', 'frontpage'); - break; - case 'com_login' : - JRequest::setVar('option', 'com_user'); - JRequest::setVar('view', 'login'); - break; - case 'com_registration' : - JRequest::setVar('option', 'com_user'); - JRequest::setVar('view', 'register'); - break; - } - - /** - * Legacy global, use JApplication::getTemplate() instead - * @name $cur_template - * @deprecated As of version 1.5 - */ - $GLOBALS['cur_template'] = $mainframe->getTemplate(); - } - - function routeContent() - { - $viewName = JRequest::getCmd( 'view', 'article' ); - $layout = JRequest::getCmd( 'layout', 'default' ); - - // interceptors to support legacy urls - switch( JRequest::getCmd('task')) - { - //index.php?option=com_content&task=x&id=x&Itemid=x - case 'blogsection': - $viewName = 'section'; - $layout = 'blog'; - break; - case 'section': - $viewName = 'section'; - break; - case 'category': - $viewName = 'category'; - break; - case 'blogcategory': - $viewName = 'category'; - $layout = 'blog'; - break; - case 'archivesection': - case 'archivecategory': - $viewName = 'archive'; - break; - case 'frontpage' : - $viewName = 'frontpage'; - break; - case 'view': - $viewName = 'article'; - break; - } - - JRequest::setVar('layout', $layout); - JRequest::setVar('view', $viewName); - } - - function routeNewsfeeds() - { - $viewName = JRequest::getCmd( 'view', 'categories' ); - - // interceptors to support legacy urls - switch( JRequest::getCmd('task')) - { - //index.php?option=com_newsfeeds&task=x&catid=xid=x&Itemid=x - case 'view': - $viewName = 'newsfeed'; - break; - - default: - { - if(JRequest::getInt('catid') && !JRequest::getCmd('view')) { - $viewName = 'category'; - } - } - } - - JRequest::setVar('view', $viewName); - } - - function routeWeblinks() - { - $viewName = JRequest::getCmd( 'view', 'categories' ); - - // interceptors to support legacy urls - switch( JRequest::getCmd('task')) - { - //index.php?option=com_weblinks&task=x&catid=xid=x - case 'view': - $viewName = 'weblink'; - break; - - default: - { - if(($catid = JRequest::getInt('catid')) && !JRequest::getCmd('view')) { - $viewName = 'category'; - JRequest::setVar('id', $catid); - } - } - } - - JRequest::setVar('view', $viewName); - } -} +setValue('config.legacy', 1); + + // Import library dependencies + require_once(dirname(__FILE__).DS.'legacy'.DS.'classes.php'); + require_once(dirname(__FILE__).DS.'legacy'.DS.'functions.php'); + + // Register legacy classes for autoloading + JLoader::register('mosAdminMenus' , dirname(__FILE__).DS.'legacy'.DS.'adminmenus.php'); + JLoader::register('mosCache' , dirname(__FILE__).DS.'legacy'.DS.'cache.php'); + JLoader::register('mosCategory' , dirname(__FILE__).DS.'legacy'.DS.'category.php'); + JLoader::register('mosCommonHTML' , dirname(__FILE__).DS.'legacy'.DS.'commonhtml.php'); + JLoader::register('mosComponent' , dirname(__FILE__).DS.'legacy'.DS.'component.php'); + JLoader::register('mosContent' , dirname(__FILE__).DS.'legacy'.DS.'content.php'); + JLoader::register('mosDBTable' , dirname(__FILE__).DS.'legacy'.DS.'dbtable.php'); + JLoader::register('mosHTML' , dirname(__FILE__).DS.'legacy'.DS.'html.php'); + JLoader::register('mosInstaller' , dirname(__FILE__).DS.'legacy'.DS.'installer.php'); + JLoader::register('mosMainFrame' , dirname(__FILE__).DS.'legacy'.DS.'mainframe.php'); + JLoader::register('mosMambot' , dirname(__FILE__).DS.'legacy'.DS.'mambot.php'); + JLoader::register('mosMambotHandler', dirname(__FILE__).DS.'legacy'.DS.'mambothandler.php'); + JLoader::register('mosMenu' , dirname(__FILE__).DS.'legacy'.DS.'menu.php'); + JLoader::register('mosMenuBar' , dirname(__FILE__).DS.'legacy'.DS.'menubar.php'); + JLoader::register('mosModule' , dirname(__FILE__).DS.'legacy'.DS.'module.php'); + //JLoader::register('mosPageNav' , dirname(__FILE__).DS.'legacy'.DS.'pagination.php'); + JLoader::register('mosParameters' , dirname(__FILE__).DS.'legacy'.DS.'parameters.php'); + JLoader::register('patFactory' , dirname(__FILE__).DS.'legacy'.DS.'patfactory.php'); + JLoader::register('mosProfiler' , dirname(__FILE__).DS.'legacy'.DS.'profiler.php'); + JLoader::register('mosSection' , dirname(__FILE__).DS.'legacy'.DS.'section.php'); + JLoader::register('mosSession' , dirname(__FILE__).DS.'legacy'.DS.'session.php'); + JLoader::register('mosToolbar' , dirname(__FILE__).DS.'legacy'.DS.'toolbar.php'); + JLoader::register('mosUser' , dirname(__FILE__).DS.'legacy'.DS.'user.php'); + + // Register class for the database, depends on which db type has been selected for use + $dbtype = $config->getValue('config.dbtype', 'mysql'); + JLoader::register('database' , dirname(__FILE__).DS.'legacy'.DS.$dbtype.'.php'); + + /** + * Legacy define, _ISO define not used anymore. All output is forced as utf-8. + * @deprecated As of version 1.5 + */ + define('_ISO','charset=utf-8'); + + /** + * Legacy constant, use _JEXEC instead + * @deprecated As of version 1.5 + */ + define( '_VALID_MOS', 1 ); + + /** + * Legacy constant, use _JEXEC instead + * @deprecated As of version 1.5 + */ + define( '_MOS_MAMBO_INCLUDED', 1 ); + + /** + * Legacy constant, use DATE_FORMAT_LC instead + * @deprecated As of version 1.5 + */ + DEFINE('_DATE_FORMAT_LC', JText::_('DATE_FORMAT_LC1') ); //Uses PHP's strftime Command Format + + /** + * Legacy constant, use DATE_FORMAT_LC2 instead + * @deprecated As of version 1.5 + */ + DEFINE('_DATE_FORMAT_LC2', JText::_('DATE_FORMAT_LC2')); + + /** + * Legacy constant, use JFilterInput instead + * @deprecated As of version 1.5 + */ + DEFINE( "_MOS_NOTRIM", 0x0001 ); + + /** + * Legacy constant, use JFilterInput instead + * @deprecated As of version 1.5 + */ + DEFINE( "_MOS_ALLOWHTML", 0x0002 ); + + /** + * Legacy constant, use JFilterInput instead + * @deprecated As of version 1.5 + */ + DEFINE( "_MOS_ALLOWRAW", 0x0004 ); + + /** + * Legacy global, use JVersion->getLongVersion() instead + * @name $_VERSION + * @deprecated As of version 1.5 + */ + $GLOBALS['_VERSION'] = new JVersion(); + $version = $GLOBALS['_VERSION']->getLongVersion(); + + /** + * Legacy global, use JFactory::getDBO() instead + * @name $database + * @deprecated As of version 1.5 + */ + $conf =& JFactory::getConfig(); + $GLOBALS['database'] = new database($conf->getValue('config.host'), $conf->getValue('config.user'), $conf->getValue('config.password'), $conf->getValue('config.db'), $conf->getValue('config.dbprefix')); + $GLOBALS['database']->debug($conf->getValue('config.debug')); + + /** + * Legacy global, use JFactory::getUser() [JUser object] instead + * @name $my + * @deprecated As of version 1.5 + */ + $user =& JFactory::getUser(); + + $GLOBALS['my'] = (object)$user->getProperties(); + $GLOBALS['my']->gid = $user->get('aid', 0); + + /** + * Insert configuration values into global scope (for backwards compatibility) + * @deprecated As of version 1.5 + */ + + $temp = new JConfig; + foreach (get_object_vars($temp) as $k => $v) { + $name = 'mosConfig_'.$k; + $GLOBALS[$name] = $v; + } + + $GLOBALS['mosConfig_live_site'] = substr_replace(JURI::root(), '', -1, 1); + $GLOBALS['mosConfig_absolute_path'] = JPATH_SITE; + $GLOBALS['mosConfig_cachepath'] = JPATH_BASE.DS.'cache'; + + $GLOBALS['mosConfig_offset_user'] = 0; + + $lang =& JFactory::getLanguage(); + $GLOBALS['mosConfig_lang'] = $lang->getBackwardLang(); + + $config->setValue('config.live_site', $GLOBALS['mosConfig_live_site']); + $config->setValue('config.absolute_path', $GLOBALS['mosConfig_absolute_path']); + $config->setValue('config.lang', $GLOBALS['mosConfig_lang']); + + /** + * Legacy global, use JFactory::getUser() instead + * @name $acl + * @deprecated As of version 1.5 + */ + $acl =& JFactory::getACL(); + + // Legacy ACL's for backward compat + $acl->addACL( 'administration', 'edit', 'users', 'super administrator', 'components', 'all' ); + $acl->addACL( 'administration', 'edit', 'users', 'administrator', 'components', 'all' ); + $acl->addACL( 'administration', 'edit', 'users', 'super administrator', 'user properties', 'block_user' ); + $acl->addACL( 'administration', 'manage', 'users', 'super administrator', 'components', 'com_users' ); + $acl->addACL( 'administration', 'manage', 'users', 'administrator', 'components', 'com_users' ); + $acl->addACL( 'administration', 'config', 'users', 'super administrator' ); + //$acl->addACL( 'administration', 'config', 'users', 'administrator' ); + + $acl->addACL( 'action', 'add', 'users', 'author', 'content', 'all' ); + $acl->addACL( 'action', 'add', 'users', 'editor', 'content', 'all' ); + $acl->addACL( 'action', 'add', 'users', 'publisher', 'content', 'all' ); + $acl->addACL( 'action', 'edit', 'users', 'author', 'content', 'own' ); + $acl->addACL( 'action', 'edit', 'users', 'editor', 'content', 'all' ); + $acl->addACL( 'action', 'edit', 'users', 'publisher', 'content', 'all' ); + $acl->addACL( 'action', 'publish', 'users', 'publisher', 'content', 'all' ); + + $acl->addACL( 'action', 'add', 'users', 'manager', 'content', 'all' ); + $acl->addACL( 'action', 'edit', 'users', 'manager', 'content', 'all' ); + $acl->addACL( 'action', 'publish', 'users', 'manager', 'content', 'all' ); + + $acl->addACL( 'action', 'add', 'users', 'administrator', 'content', 'all' ); + $acl->addACL( 'action', 'edit', 'users', 'administrator', 'content', 'all' ); + $acl->addACL( 'action', 'publish', 'users', 'administrator', 'content', 'all' ); + + $acl->addACL( 'action', 'add', 'users', 'super administrator', 'content', 'all' ); + $acl->addACL( 'action', 'edit', 'users', 'super administrator', 'content', 'all' ); + $acl->addACL( 'action', 'publish', 'users', 'super administrator', 'content', 'all' ); + + $acl->addACL( 'com_syndicate', 'manage', 'users', 'super administrator' ); + $acl->addACL( 'com_syndicate', 'manage', 'users', 'administrator' ); + $acl->addACL( 'com_syndicate', 'manage', 'users', 'manager' ); + + $GLOBALS['acl'] =& $acl; + + /** + * Legacy global + * @name $task + * @deprecated As of version 1.5 + */ + $GLOBALS['task'] = JRequest::getString('task'); + + /** + * Load the site language file (the old way - to be deprecated) + * @deprecated As of version 1.5 + */ + global $mosConfig_lang; + $mosConfig_lang = JFilterInput::clean($mosConfig_lang, 'cmd'); + $file = JPATH_SITE.DS.'language'.DS.$mosConfig_lang.'.php'; + if (file_exists( $file )) { + require_once( $file); + } else { + $file = JPATH_SITE.DS.'language'.DS.'english.php'; + if (file_exists( $file )) { + require_once( $file ); + } + } + + /** + * Legacy global + * use JApplicaiton->registerEvent and JApplication->triggerEvent for event handling + * use JPlugingHelper::importPlugin to load bot code + * @deprecated As of version 1.5 + */ + $GLOBALS['_MAMBOTS'] = new mosMambotHandler(); + + $mosmsg = JRequest::getVar( 'mosmsg' ); + $mainframe->enqueueMessage( $mosmsg ); + } + + /** + * Fixes the $my global if the user was restored by the remember me plugin + */ + function onAfterInitialise() + { + $user =& JFactory::getUser(); + if ($user->id) { + if ($GLOBALS['my']->id === 0) { + $GLOBALS['my'] = (object)$user->getProperties(); + $GLOBALS['my']->gid = $user->get('aid', 0); + } + } + + return true; + } + + + + function onAfterRoute() + { + global $mainframe; + if ($mainframe->isAdmin()) { + return; + } + + switch(JRequest::getCmd('option')) + { + case 'com_content' : + $this->routeContent(); + break; + case 'com_newsfeeds' : + $this->routeNewsfeeds(); + break; + case 'com_weblinks' : + $this->routeWeblinks(); + break; + case 'com_frontpage' : + JRequest::setVar('option', 'com_content'); + JRequest::setVar('view', 'frontpage'); + break; + case 'com_login' : + JRequest::setVar('option', 'com_user'); + JRequest::setVar('view', 'login'); + break; + case 'com_registration' : + JRequest::setVar('option', 'com_user'); + JRequest::setVar('view', 'register'); + break; + } + + /** + * Legacy global, use JApplication::getTemplate() instead + * @name $cur_template + * @deprecated As of version 1.5 + */ + $GLOBALS['cur_template'] = $mainframe->getTemplate(); + } + + function routeContent() + { + $viewName = JRequest::getCmd( 'view', 'article' ); + $layout = JRequest::getCmd( 'layout', 'default' ); + + // interceptors to support legacy urls + switch( JRequest::getCmd('task')) + { + //index.php?option=com_content&task=x&id=x&Itemid=x + case 'blogsection': + $viewName = 'section'; + $layout = 'blog'; + break; + case 'section': + $viewName = 'section'; + break; + case 'category': + $viewName = 'category'; + break; + case 'blogcategory': + $viewName = 'category'; + $layout = 'blog'; + break; + case 'archivesection': + case 'archivecategory': + $viewName = 'archive'; + break; + case 'frontpage' : + $viewName = 'frontpage'; + break; + case 'view': + $viewName = 'article'; + break; + } + + JRequest::setVar('layout', $layout); + JRequest::setVar('view', $viewName); + } + + function routeNewsfeeds() + { + $viewName = JRequest::getCmd( 'view', 'categories' ); + + // interceptors to support legacy urls + switch( JRequest::getCmd('task')) + { + //index.php?option=com_newsfeeds&task=x&catid=xid=x&Itemid=x + case 'view': + $viewName = 'newsfeed'; + break; + + default: + { + if(JRequest::getInt('catid') && !JRequest::getCmd('view')) { + $viewName = 'category'; + } + } + } + + JRequest::setVar('view', $viewName); + } + + function routeWeblinks() + { + $viewName = JRequest::getCmd( 'view', 'categories' ); + + // interceptors to support legacy urls + switch( JRequest::getCmd('task')) + { + //index.php?option=com_weblinks&task=x&catid=xid=x + case 'view': + $viewName = 'weblink'; + break; + + default: + { + if(($catid = JRequest::getInt('catid')) && !JRequest::getCmd('view')) { + $viewName = 'category'; + JRequest::setVar('id', $catid); + } + } + } + + JRequest::setVar('view', $viewName); + } +} diff --git a/oss/joomla/trunk/plugins/system/legacy.xml b/oss/joomla/trunk/plugins/system/legacy.xml index 39741db1..334dbb5d 100644 --- a/oss/joomla/trunk/plugins/system/legacy.xml +++ b/oss/joomla/trunk/plugins/system/legacy.xml @@ -3,7 +3,7 @@ System - Legacy Joomla! Project January 2007 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/system/legacy/adminmenus.php b/oss/joomla/trunk/plugins/system/legacy/adminmenus.php index 9183bf16..174a60b0 100644 --- a/oss/joomla/trunk/plugins/system/legacy/adminmenus.php +++ b/oss/joomla/trunk/plugins/system/legacy/adminmenus.php @@ -1,416 +1,416 @@ -published ); - return $published; - } - - /** - * Legacy function, use {@link JAdminMenus::MenuLinks()} instead - * - * @deprecated As of version 1.5 - */ - function MenuLinks( &$lookup, $all=NULL, $none=NULL, $unassigned=1 ) - { - $options = JHTML::_('menu.linkoptions', $lookup, $all, $none|$unassigned); - if (empty( $lookup )) { - $lookup = array( JHTML::_('select.option', -1 ) ); - } - $pages = JHTML::_('select.genericlist', $options, 'selections[]', 'class="inputbox" size="15" multiple="multiple"', 'value', 'text', $lookup, 'selections' ); - return $pages; - } - - /** - * Legacy function, deprecated - * - * @deprecated As of version 1.5 - */ - function Category( &$menu, $id, $javascript='' ) - { - $db =& JFactory::getDBO(); - - $query = 'SELECT c.id AS `value`, c.section AS `id`, CONCAT_WS( " / ", s.title, c.title) AS `text`' - . ' FROM #__sections AS s' - . ' INNER JOIN #__categories AS c ON c.section = s.id' - . ' WHERE s.scope = "content"' - . ' ORDER BY s.name, c.name' - ; - $db->setQuery( $query ); - $rows = $db->loadObjectList(); - $category = ''; - - $category .= JHTML::_('select.genericlist', $rows, 'componentid', 'class="inputbox" size="10"'. $javascript, 'value', 'text', $menu->componentid ); - $category .= ''; - - return $category; - } - - /** - * Legacy function, deprecated - * - * @deprecated As of version 1.5 - */ - function Section( &$menu, $id, $all=0 ) - { - $db =& JFactory::getDBO(); - - $query = 'SELECT s.id AS `value`, s.id AS `id`, s.title AS `text`' - . ' FROM #__sections AS s' - . ' WHERE s.scope = "content"' - . ' ORDER BY s.name' - ; - $db->setQuery( $query ); - if ( $all ) { - $rows[] = JHTML::_('select.option', 0, '- '. JText::_( 'All Sections' ) .' -' ); - $rows = array_merge( $rows, $db->loadObjectList() ); - } else { - $rows = $db->loadObjectList(); - } - - $section = JHTML::_('select.genericlist', $rows, 'componentid', 'class="inputbox" size="10"', 'value', 'text', $menu->componentid ); - $section .= ''; - - return $section; - } - - /** - * Legacy function, deprecated - * - * @deprecated As of version 1.5 - */ - function Component( &$menu, $id ) - { - $db =& JFactory::getDBO(); - - $query = 'SELECT c.id AS value, c.name AS text, c.link' - . ' FROM #__components AS c' - . ' WHERE c.link <> ""' - . ' ORDER BY c.name' - ; - $db->setQuery( $query ); - $rows = $db->loadObjectList( ); - - $component = JHTML::_('select.genericlist', $rows, 'componentid', 'class="inputbox" size="10"', 'value', 'text', $menu->componentid, '', 1 ); - - return $component; - } - - - /** - * Legacy function, deprecated - * - * @deprecated As of version 1.5 - */ - function ComponentName( &$menu, $id ) - { - $db =& JFactory::getDBO(); - - $query = 'SELECT c.id AS value, c.name AS text, c.link' - . ' FROM #__components AS c' - . ' WHERE c.link <> ""' - . ' ORDER BY c.name' - ; - $db->setQuery( $query ); - $rows = $db->loadObjectList( ); - - $component = 'Component'; - foreach ( $rows as $row ) { - if ( $row->value == $menu->componentid ) { - $component = JText::_( $row->text ); - } - } - - return $component; - } - - - /** - * Legacy function, use {@link JHTML::_('list.images', )} instead - * - * @deprecated As of version 1.5 - */ - function Images( $name, &$active, $javascript=NULL, $directory=NULL ) - { - return JHTML::_('list.images', $name, $active, $javascript, $directory); - } - - /** - * Legacy function, use {@link JHTML::_('list.specificordering', )} instead - * - * @deprecated As of version 1.5 - */ - function SpecificOrdering( &$row, $id, $query, $neworder=0 ) - { - return JHTML::_('list.specificordering', $row, $id, $query, $neworder); - } - - /** - * Legacy function, use {@link JHTML::_('list.users', )} instead - * - * @deprecated As of version 1.5 - */ - function UserSelect( $name, $active, $nouser=0, $javascript=NULL, $order='name', $reg=1 ) - { - return JHTML::_('list.users', $name, $active, $nouser, $javascript, $order, $reg); - } - - /** - * Legacy function, use {@link JHTML::_('list.positions', )} instead - * - * @deprecated As of version 1.5 - */ - function Positions( $name, $active=NULL, $javascript=NULL, $none=1, $center=1, $left=1, $right=1, $id=false ) - { - return JHTML::_('list.positions', $name, $active, $javascript, $none, $center, $left, $right, $id); - } - - /** - * Legacy function, use {@link JHTML::_('list.category', )} instead - * - * @deprecated As of version 1.5 - */ - function ComponentCategory( $name, $section, $active=NULL, $javascript=NULL, $order='ordering', $size=1, $sel_cat=1 ) - { - return JHTML::_('list.category', $name, $section, $active, $javascript, $order, $size, $sel_cat); - } - - /** - * Legacy function, use {@link JHTML::_('list.section', )} instead - * - * @deprecated As of version 1.5 - */ - function SelectSection( $name, $active=NULL, $javascript=NULL, $order='ordering' ) - { - return JHTML::_('list.section', $name, $active, $javascript, $order); - } - - /** - * Legacy function, deprecated - * - * @deprecated As of version 1.5 - */ - function Links2Menu( $type, $and ) - { - $db =& JFactory::getDBO(); - - $query = 'SELECT * ' - . ' FROM #__menu ' - . ' WHERE type = '.$db->Quote($type) - . ' AND published = 1' - . $and - ; - $db->setQuery( $query ); - $menus = $db->loadObjectList(); - - return $menus; - } - - /** - * Legacy function, deprecated - * - * @deprecated As of version 1.5 - */ - function MenuSelect( $name='menuselect', $javascript=NULL ) - { - $db =& JFactory::getDBO(); - - $query = 'SELECT params' - . ' FROM #__modules' - . ' WHERE module = "mod_mainmenu"' - ; - $db->setQuery( $query ); - $menus = $db->loadObjectList(); - $total = count( $menus ); - $menuselect = array(); - for( $i = 0; $i < $total; $i++ ) - { - $registry = new JRegistry(); - $registry->loadINI($menus[$i]->params); - $params = $registry->toObject( ); - - $menuselect[$i]->value = $params->menutype; - $menuselect[$i]->text = $params->menutype; - } - // sort array of objects - JArrayHelper::sortObjects( $menuselect, 'text', 1 ); - - $menus = JHTML::_('select.genericlist', $menuselect, $name, 'class="inputbox" size="10" '. $javascript, 'value', 'text' ); - - return $menus; - } - - /** - * Legacy function, deprecated - * - * @deprecated As of version 1.5 - */ - function ReadImages( $imagePath, $folderPath, &$folders, &$images ) - { - jimport( 'joomla.filesystem.folder' ); - $imgFiles = JFolder::files( $imagePath ); - - foreach ($imgFiles as $file) - { - $ff_ = $folderPath.DS.$file; - $ff = $folderPath.DS.$file; - $i_f = $imagePath .'/'. $file; - - if ( is_dir( $i_f ) && $file <> 'CVS' && $file <> '.svn') { - $folders[] = JHTML::_('select.option', $ff_ ); - mosAdminMenus::ReadImages( $i_f, $ff_, $folders, $images ); - } else if ( eregi( "bmp|gif|jpg|png", $file ) && is_file( $i_f ) ) { - // leading / we don't need - $imageFile = substr( $ff, 1 ); - $images[$folderPath][] = JHTML::_('select.option', $imageFile, $file ); - } - } - } - - /** - * Legacy function, deprecated - * - * @deprecated As of version 1.5 - */ - function GetImageFolders( &$folders, $path ) - { - $javascript = "onchange=\"changeDynaList( 'imagefiles', folderimages, document.adminForm.folders.options[document.adminForm.folders.selectedIndex].value, 0, 0); previewImage( 'imagefiles', 'view_imagefiles', '$path/' );\""; - $getfolders = JHTML::_('select.genericlist', $folders, 'folders', 'class="inputbox" size="1" '. $javascript, 'value', 'text', '/' ); - return $getfolders; - } - - /** - * Legacy function, deprecated - * - * @deprecated As of version 1.5 - */ - function GetImages( &$images, $path ) - { - if ( !isset($images['/'] ) ) { - $images['/'][] = JHTML::_('select.option', '' ); - } - - //$javascript = "onchange=\"previewImage( 'imagefiles', 'view_imagefiles', '$path/' )\" onfocus=\"previewImage( 'imagefiles', 'view_imagefiles', '$path/' )\""; - $javascript = "onchange=\"previewImage( 'imagefiles', 'view_imagefiles', '$path/' )\""; - $getimages = JHTML::_('select.genericlist', $images['/'], 'imagefiles', 'class="inputbox" size="10" multiple="multiple" '. $javascript , 'value', 'text', null ); - - return $getimages; - } - - /** - * Legacy function, deprecated - * - * @deprecated As of version 1.5 - */ - function GetSavedImages( &$row, $path ) - { - $images2 = array(); - foreach( $row->images as $file ) { - $temp = explode( '|', $file ); - if( strrchr($temp[0], '/') ) { - $filename = substr( strrchr($temp[0], '/' ), 1 ); - } else { - $filename = $temp[0]; - } - $images2[] = JHTML::_('select.option', $file, $filename ); - } - //$javascript = "onchange=\"previewImage( 'imagelist', 'view_imagelist', '$path/' ); showImageProps( '$path/' ); \" onfocus=\"previewImage( 'imagelist', 'view_imagelist', '$path/' )\""; - $javascript = "onchange=\"previewImage( 'imagelist', 'view_imagelist', '$path/' ); showImageProps( '$path/' ); \""; - $imagelist = JHTML::_('select.genericlist', $images2, 'imagelist', 'class="inputbox" size="10" '. $javascript, 'value', 'text' ); - - return $imagelist; - } - - /** - * Legacy function, use {@link JHTML::_('image.site')} instead - * - * @deprecated As of version 1.5 - */ - function ImageCheck( $file, $directory='/images/M_images/', $param=NULL, $param_directory='/images/M_images/', $alt=NULL, $name='image', $type=1, $align='top' ) - { - $attribs = array('align' => $align); - return JHTML::_('image.site', $file, $directory, $param, $param_directory, $alt, $attribs, $type); - } - - /** - * Legacy function, use {@link JHTML::_('image.administrator')} instead - * - * @deprecated As of version 1.5 - */ - function ImageCheckAdmin( $file, $directory='/images/', $param=NULL, $param_directory='/images/', $alt=NULL, $name=NULL, $type=1, $align='middle' ) - { - $attribs = array('align' => $align); - return JHTML::_('image.administrator', $file, $directory, $param, $param_directory, $alt, $attribs, $type); - } - - /** - * Legacy function, use {@link MenusHelper::getMenuTypes()} instead - * - * @deprecated As of version 1.5 - */ - function menutypes() - { - JError::raiseNotice( 0, 'mosAdminMenus::menutypes method deprecated' ); - } - - /** - * Legacy function, use {@link MenusHelper::menuItem()} instead - * - * @deprecated As of version 1.5 - */ - function menuItem( $item ) - { - JError::raiseNotice( 0, 'mosAdminMenus::menuItem method deprecated' ); - } -} \ No newline at end of file +published ); + return $published; + } + + /** + * Legacy function, use {@link JAdminMenus::MenuLinks()} instead + * + * @deprecated As of version 1.5 + */ + function MenuLinks( &$lookup, $all=NULL, $none=NULL, $unassigned=1 ) + { + $options = JHTML::_('menu.linkoptions', $lookup, $all, $none|$unassigned); + if (empty( $lookup )) { + $lookup = array( JHTML::_('select.option', -1 ) ); + } + $pages = JHTML::_('select.genericlist', $options, 'selections[]', 'class="inputbox" size="15" multiple="multiple"', 'value', 'text', $lookup, 'selections' ); + return $pages; + } + + /** + * Legacy function, deprecated + * + * @deprecated As of version 1.5 + */ + function Category( &$menu, $id, $javascript='' ) + { + $db =& JFactory::getDBO(); + + $query = 'SELECT c.id AS `value`, c.section AS `id`, CONCAT_WS( " / ", s.title, c.title) AS `text`' + . ' FROM #__sections AS s' + . ' INNER JOIN #__categories AS c ON c.section = s.id' + . ' WHERE s.scope = "content"' + . ' ORDER BY s.name, c.name' + ; + $db->setQuery( $query ); + $rows = $db->loadObjectList(); + $category = ''; + + $category .= JHTML::_('select.genericlist', $rows, 'componentid', 'class="inputbox" size="10"'. $javascript, 'value', 'text', $menu->componentid ); + $category .= ''; + + return $category; + } + + /** + * Legacy function, deprecated + * + * @deprecated As of version 1.5 + */ + function Section( &$menu, $id, $all=0 ) + { + $db =& JFactory::getDBO(); + + $query = 'SELECT s.id AS `value`, s.id AS `id`, s.title AS `text`' + . ' FROM #__sections AS s' + . ' WHERE s.scope = "content"' + . ' ORDER BY s.name' + ; + $db->setQuery( $query ); + if ( $all ) { + $rows[] = JHTML::_('select.option', 0, '- '. JText::_( 'All Sections' ) .' -' ); + $rows = array_merge( $rows, $db->loadObjectList() ); + } else { + $rows = $db->loadObjectList(); + } + + $section = JHTML::_('select.genericlist', $rows, 'componentid', 'class="inputbox" size="10"', 'value', 'text', $menu->componentid ); + $section .= ''; + + return $section; + } + + /** + * Legacy function, deprecated + * + * @deprecated As of version 1.5 + */ + function Component( &$menu, $id ) + { + $db =& JFactory::getDBO(); + + $query = 'SELECT c.id AS value, c.name AS text, c.link' + . ' FROM #__components AS c' + . ' WHERE c.link <> ""' + . ' ORDER BY c.name' + ; + $db->setQuery( $query ); + $rows = $db->loadObjectList( ); + + $component = JHTML::_('select.genericlist', $rows, 'componentid', 'class="inputbox" size="10"', 'value', 'text', $menu->componentid, '', 1 ); + + return $component; + } + + + /** + * Legacy function, deprecated + * + * @deprecated As of version 1.5 + */ + function ComponentName( &$menu, $id ) + { + $db =& JFactory::getDBO(); + + $query = 'SELECT c.id AS value, c.name AS text, c.link' + . ' FROM #__components AS c' + . ' WHERE c.link <> ""' + . ' ORDER BY c.name' + ; + $db->setQuery( $query ); + $rows = $db->loadObjectList( ); + + $component = 'Component'; + foreach ( $rows as $row ) { + if ( $row->value == $menu->componentid ) { + $component = JText::_( $row->text ); + } + } + + return $component; + } + + + /** + * Legacy function, use {@link JHTML::_('list.images', )} instead + * + * @deprecated As of version 1.5 + */ + function Images( $name, &$active, $javascript=NULL, $directory=NULL ) + { + return JHTML::_('list.images', $name, $active, $javascript, $directory); + } + + /** + * Legacy function, use {@link JHTML::_('list.specificordering', )} instead + * + * @deprecated As of version 1.5 + */ + function SpecificOrdering( &$row, $id, $query, $neworder=0 ) + { + return JHTML::_('list.specificordering', $row, $id, $query, $neworder); + } + + /** + * Legacy function, use {@link JHTML::_('list.users', )} instead + * + * @deprecated As of version 1.5 + */ + function UserSelect( $name, $active, $nouser=0, $javascript=NULL, $order='name', $reg=1 ) + { + return JHTML::_('list.users', $name, $active, $nouser, $javascript, $order, $reg); + } + + /** + * Legacy function, use {@link JHTML::_('list.positions', )} instead + * + * @deprecated As of version 1.5 + */ + function Positions( $name, $active=NULL, $javascript=NULL, $none=1, $center=1, $left=1, $right=1, $id=false ) + { + return JHTML::_('list.positions', $name, $active, $javascript, $none, $center, $left, $right, $id); + } + + /** + * Legacy function, use {@link JHTML::_('list.category', )} instead + * + * @deprecated As of version 1.5 + */ + function ComponentCategory( $name, $section, $active=NULL, $javascript=NULL, $order='ordering', $size=1, $sel_cat=1 ) + { + return JHTML::_('list.category', $name, $section, $active, $javascript, $order, $size, $sel_cat); + } + + /** + * Legacy function, use {@link JHTML::_('list.section', )} instead + * + * @deprecated As of version 1.5 + */ + function SelectSection( $name, $active=NULL, $javascript=NULL, $order='ordering' ) + { + return JHTML::_('list.section', $name, $active, $javascript, $order); + } + + /** + * Legacy function, deprecated + * + * @deprecated As of version 1.5 + */ + function Links2Menu( $type, $and ) + { + $db =& JFactory::getDBO(); + + $query = 'SELECT * ' + . ' FROM #__menu ' + . ' WHERE type = '.$db->Quote($type) + . ' AND published = 1' + . $and + ; + $db->setQuery( $query ); + $menus = $db->loadObjectList(); + + return $menus; + } + + /** + * Legacy function, deprecated + * + * @deprecated As of version 1.5 + */ + function MenuSelect( $name='menuselect', $javascript=NULL ) + { + $db =& JFactory::getDBO(); + + $query = 'SELECT params' + . ' FROM #__modules' + . ' WHERE module = "mod_mainmenu"' + ; + $db->setQuery( $query ); + $menus = $db->loadObjectList(); + $total = count( $menus ); + $menuselect = array(); + for( $i = 0; $i < $total; $i++ ) + { + $registry = new JRegistry(); + $registry->loadINI($menus[$i]->params); + $params = $registry->toObject( ); + + $menuselect[$i]->value = $params->menutype; + $menuselect[$i]->text = $params->menutype; + } + // sort array of objects + JArrayHelper::sortObjects( $menuselect, 'text', 1 ); + + $menus = JHTML::_('select.genericlist', $menuselect, $name, 'class="inputbox" size="10" '. $javascript, 'value', 'text' ); + + return $menus; + } + + /** + * Legacy function, deprecated + * + * @deprecated As of version 1.5 + */ + function ReadImages( $imagePath, $folderPath, &$folders, &$images ) + { + jimport( 'joomla.filesystem.folder' ); + $imgFiles = JFolder::files( $imagePath ); + + foreach ($imgFiles as $file) + { + $ff_ = $folderPath.DS.$file; + $ff = $folderPath.DS.$file; + $i_f = $imagePath .'/'. $file; + + if ( is_dir( $i_f ) && $file <> 'CVS' && $file <> '.svn') { + $folders[] = JHTML::_('select.option', $ff_ ); + mosAdminMenus::ReadImages( $i_f, $ff_, $folders, $images ); + } else if ( preg_match( "#bmp|gif|jpg|png#i", $file ) && is_file( $i_f ) ) { + // leading / we don't need + $imageFile = substr( $ff, 1 ); + $images[$folderPath][] = JHTML::_('select.option', $imageFile, $file ); + } + } + } + + /** + * Legacy function, deprecated + * + * @deprecated As of version 1.5 + */ + function GetImageFolders( &$folders, $path ) + { + $javascript = "onchange=\"changeDynaList( 'imagefiles', folderimages, document.adminForm.folders.options[document.adminForm.folders.selectedIndex].value, 0, 0); previewImage( 'imagefiles', 'view_imagefiles', '$path/' );\""; + $getfolders = JHTML::_('select.genericlist', $folders, 'folders', 'class="inputbox" size="1" '. $javascript, 'value', 'text', '/' ); + return $getfolders; + } + + /** + * Legacy function, deprecated + * + * @deprecated As of version 1.5 + */ + function GetImages( &$images, $path ) + { + if ( !isset($images['/'] ) ) { + $images['/'][] = JHTML::_('select.option', '' ); + } + + //$javascript = "onchange=\"previewImage( 'imagefiles', 'view_imagefiles', '$path/' )\" onfocus=\"previewImage( 'imagefiles', 'view_imagefiles', '$path/' )\""; + $javascript = "onchange=\"previewImage( 'imagefiles', 'view_imagefiles', '$path/' )\""; + $getimages = JHTML::_('select.genericlist', $images['/'], 'imagefiles', 'class="inputbox" size="10" multiple="multiple" '. $javascript , 'value', 'text', null ); + + return $getimages; + } + + /** + * Legacy function, deprecated + * + * @deprecated As of version 1.5 + */ + function GetSavedImages( &$row, $path ) + { + $images2 = array(); + foreach( $row->images as $file ) { + $temp = explode( '|', $file ); + if( strrchr($temp[0], '/') ) { + $filename = substr( strrchr($temp[0], '/' ), 1 ); + } else { + $filename = $temp[0]; + } + $images2[] = JHTML::_('select.option', $file, $filename ); + } + //$javascript = "onchange=\"previewImage( 'imagelist', 'view_imagelist', '$path/' ); showImageProps( '$path/' ); \" onfocus=\"previewImage( 'imagelist', 'view_imagelist', '$path/' )\""; + $javascript = "onchange=\"previewImage( 'imagelist', 'view_imagelist', '$path/' ); showImageProps( '$path/' ); \""; + $imagelist = JHTML::_('select.genericlist', $images2, 'imagelist', 'class="inputbox" size="10" '. $javascript, 'value', 'text' ); + + return $imagelist; + } + + /** + * Legacy function, use {@link JHTML::_('image.site')} instead + * + * @deprecated As of version 1.5 + */ + function ImageCheck( $file, $directory='/images/M_images/', $param=NULL, $param_directory='/images/M_images/', $alt=NULL, $name='image', $type=1, $align='top' ) + { + $attribs = array('align' => $align); + return JHTML::_('image.site', $file, $directory, $param, $param_directory, $alt, $attribs, $type); + } + + /** + * Legacy function, use {@link JHTML::_('image.administrator')} instead + * + * @deprecated As of version 1.5 + */ + function ImageCheckAdmin( $file, $directory='/images/', $param=NULL, $param_directory='/images/', $alt=NULL, $name=NULL, $type=1, $align='middle' ) + { + $attribs = array('align' => $align); + return JHTML::_('image.administrator', $file, $directory, $param, $param_directory, $alt, $attribs, $type); + } + + /** + * Legacy function, use {@link MenusHelper::getMenuTypes()} instead + * + * @deprecated As of version 1.5 + */ + function menutypes() + { + JError::raiseNotice( 0, 'mosAdminMenus::menutypes method deprecated' ); + } + + /** + * Legacy function, use {@link MenusHelper::menuItem()} instead + * + * @deprecated As of version 1.5 + */ + function menuItem( $item ) + { + JError::raiseNotice( 0, 'mosAdminMenus::menuItem method deprecated' ); + } +} diff --git a/oss/joomla/trunk/plugins/system/legacy/cache.php b/oss/joomla/trunk/plugins/system/legacy/cache.php index d85fe94f..7944eab0 100644 --- a/oss/joomla/trunk/plugins/system/legacy/cache.php +++ b/oss/joomla/trunk/plugins/system/legacy/cache.php @@ -1,42 +1,42 @@ -clean($group); - } +clean($group); + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy/category.php b/oss/joomla/trunk/plugins/system/legacy/category.php index 3bd5f261..6f0e30f1 100644 --- a/oss/joomla/trunk/plugins/system/legacy/category.php +++ b/oss/joomla/trunk/plugins/system/legacy/category.php @@ -1,60 +1,60 @@ -reorder( $where ); - } - - /** - * Legacy Method, use {@link JTable::publish()} instead - * @deprecated As of 1.0.3 - */ - function publish_array( $cid=null, $publish=1, $user_id=0 ) - { - $this->publish( $cid, $publish, $user_id ); - } +reorder( $where ); + } + + /** + * Legacy Method, use {@link JTable::publish()} instead + * @deprecated As of 1.0.3 + */ + function publish_array( $cid=null, $publish=1, $user_id=0 ) + { + $this->publish( $cid, $publish, $user_id ); + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy/classes.php b/oss/joomla/trunk/plugins/system/legacy/classes.php index 4da9ecf7..0da0f2e9 100644 --- a/oss/joomla/trunk/plugins/system/legacy/classes.php +++ b/oss/joomla/trunk/plugins/system/legacy/classes.php @@ -1,106 +1,106 @@ - $useCookies) ); - } - - function startTab( $tabText, $paneid ) { - echo $this->startPanel( $tabText, $paneid); - } - - function endTab() { - echo $this->endPanel(); - } - - function startPane( $tabText ){ - echo parent::startPane( $tabText ); - } - - function endPane(){ - echo parent::endPane(); - } + $useCookies) ); + } + + function startTab( $tabText, $paneid ) { + echo $this->startPanel( $tabText, $paneid); + } + + function endTab() { + echo $this->endPanel(); + } + + function startPane( $tabText ){ + echo parent::startPane( $tabText ); + } + + function endPane(){ + echo parent::endPane(); + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy/commonhtml.php b/oss/joomla/trunk/plugins/system/legacy/commonhtml.php index e59909ec..893b8f0f 100644 --- a/oss/joomla/trunk/plugins/system/legacy/commonhtml.php +++ b/oss/joomla/trunk/plugins/system/legacy/commonhtml.php @@ -1,270 +1,270 @@ - - - -
- - - - - - - - - menutype; ?> - - - - - - - - - - name; ?> - - - - - - - - - published ) { - case -2: - echo ''. JText::_( 'Trashed' ) .''; - break; - case 0: - echo JText::_( 'UnPublished' ); - break; - case 1: - default: - echo ''. JText::_( 'Published' ) .''; - break; - } - ?> - - - - - - - - - - -
- . - - - - - - - - - - - - - - - - - - -
- - - - menutype; ?> -
- - - type; ?> -
- - - - - name; ?> - -
- - - published ) { - case -2: - echo ''. JText::_( 'Trashed' ) .''; - break; - case 0: - echo JText::_( 'UnPublished' ); - break; - case 1: - default: - echo ''. JText::_( 'Published' ) .''; - break; - } - ?> -
-
- - - - + + +
+ + + + + + + + + menutype; ?> + + + + + + + + + + name; ?> + + + + + + + + + published ) { + case -2: + echo ''. JText::_( 'Trashed' ) .''; + break; + case 0: + echo JText::_( 'UnPublished' ); + break; + case 1: + default: + echo ''. JText::_( 'Published' ) .''; + break; + } + ?> + + + + + + + + + + +
+ . + + + + + + + + + + + + + + + + + + +
+ + + + menutype; ?> +
+ + + type; ?> +
+ + + + + name; ?> + +
+ + + published ) { + case -2: + echo ''. JText::_( 'Trashed' ) .''; + break; + case 0: + echo JText::_( 'UnPublished' ); + break; + case 1: + default: + echo ''. JText::_( 'Published' ) .''; + break; + } + ?> +
+
+ + + + reorder( $where ); - } - - /** - * Legacy Method, use {@link JTable::publish()} instead - * @deprecated As of 1.0.3 - */ - function publish_array( $cid=null, $publish=1, $user_id=0 ) - { - $this->publish( $cid, $publish, $user_id ); - } +reorder( $where ); + } + + /** + * Legacy Method, use {@link JTable::publish()} instead + * @deprecated As of 1.0.3 + */ + function publish_array( $cid=null, $publish=1, $user_id=0 ) + { + $this->publish( $cid, $publish, $user_id ); + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy/content.php b/oss/joomla/trunk/plugins/system/legacy/content.php index ddfb883e..99b5bbf3 100644 --- a/oss/joomla/trunk/plugins/system/legacy/content.php +++ b/oss/joomla/trunk/plugins/system/legacy/content.php @@ -1,60 +1,60 @@ -reorder( $where ); - } - - /** - * Legacy Method, use {@link JTable::publish()} instead - * @deprecated As of 1.0.3 - */ - function publish_array( $cid=null, $publish=1, $user_id=0 ) - { - $this->publish( $cid, $publish, $user_id ); - } +reorder( $where ); + } + + /** + * Legacy Method, use {@link JTable::publish()} instead + * @deprecated As of 1.0.3 + */ + function publish_array( $cid=null, $publish=1, $user_id=0 ) + { + $this->publish( $cid, $publish, $user_id ); + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy/dbtable.php b/oss/joomla/trunk/plugins/system/legacy/dbtable.php index 5035c9d4..d49208cf 100644 --- a/oss/joomla/trunk/plugins/system/legacy/dbtable.php +++ b/oss/joomla/trunk/plugins/system/legacy/dbtable.php @@ -1,131 +1,131 @@ -reorder( $where ); - } - - /** - * Legacy Method, use {@link JTable::publish()} instead - * @deprecated As of 1.0.3 - */ - function publish_array( $cid=null, $publish=1, $user_id=0 ) - { - $this->publish( $cid, $publish, $user_id ); - } - - /** - * Legacy Method, make sure you use {@link JRequest::get()} or {@link JRequest::getVar()} instead - * @deprecated As of 1.5 - */ - function filter( $ignoreList=null ) - { - $ignore = is_array( $ignoreList ); - - $filter = & JFilterInput::getInstance(); - foreach ($this->getProperties() as $k => $v) - { - if ($ignore && in_array( $k, $ignoreList ) ) { - continue; - } - $this->$k = $filter->clean( $this->$k ); - } - } - - /** - * Legacy Method, use {@link JObject::getProperties()} instead - * @deprecated As of 1.5 - */ - function getPublicProperties() - { - $properties = $this->getProperties(); - return array_keys($properties); - } - - /** - * Legacy Method, use {@link JObject::getError()} instead - * @deprecated As of 1.5 - */ - function getError($i = null, $toString = true ) - { - return $this->_error; - } - - /** - * Legacy Method, use {@link JObject::setError()} instead - * @deprecated As of 1.5 - */ - function setErrorNum( $value ) - { - $this->_errorNum = $value; - } - - /** - * Legacy Method, use {@link JObject::getError()} instead - * @deprecated As of 1.5 - */ - function getErrorNum() - { - return $this->_errorNum; - } +reorder( $where ); + } + + /** + * Legacy Method, use {@link JTable::publish()} instead + * @deprecated As of 1.0.3 + */ + function publish_array( $cid=null, $publish=1, $user_id=0 ) + { + $this->publish( $cid, $publish, $user_id ); + } + + /** + * Legacy Method, make sure you use {@link JRequest::get()} or {@link JRequest::getVar()} instead + * @deprecated As of 1.5 + */ + function filter( $ignoreList=null ) + { + $ignore = is_array( $ignoreList ); + + $filter = & JFilterInput::getInstance(); + foreach ($this->getProperties() as $k => $v) + { + if ($ignore && in_array( $k, $ignoreList ) ) { + continue; + } + $this->$k = $filter->clean( $this->$k ); + } + } + + /** + * Legacy Method, use {@link JObject::getProperties()} instead + * @deprecated As of 1.5 + */ + function getPublicProperties() + { + $properties = $this->getProperties(); + return array_keys($properties); + } + + /** + * Legacy Method, use {@link JObject::getError()} instead + * @deprecated As of 1.5 + */ + function getError($i = null, $toString = true ) + { + return $this->_error; + } + + /** + * Legacy Method, use {@link JObject::setError()} instead + * @deprecated As of 1.5 + */ + function setErrorNum( $value ) + { + $this->_errorNum = $value; + } + + /** + * Legacy Method, use {@link JObject::getError()} instead + * @deprecated As of 1.5 + */ + function getErrorNum() + { + return $this->_errorNum; + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy/functions.php b/oss/joomla/trunk/plugins/system/legacy/functions.php index e288cb34..2b20096a 100644 --- a/oss/joomla/trunk/plugins/system/legacy/functions.php +++ b/oss/joomla/trunk/plugins/system/legacy/functions.php @@ -1,910 +1,910 @@ - instead - * - * @deprecated As of version 1.5 - */ -function mosCountModules( $position='left' ) { - jimport('joomla.application.module.helper'); - return count(JModuleHelper::getModules($position)); -} - -/** - * Legacy function, use instead - * - * @deprecated As of version 1.5 - */ -function mosMainBody() { - ?> instead - * - * @deprecated As of version 1.5 - */ -function mosLoadModules( $position='left', $style=0 ) -{ - // Select the module chrome function - if (is_numeric($style)) - { - switch ( $style ) - { - case -3: - $style = 'rounded'; - break; - - case -2: - $style = 'xhtml'; - break; - - case -1: - $style = 'raw'; - break; - - case 0 : - default : - $style = 'table'; - break; - } - } - ?> instead - * - * @deprecated As of version 1.5 - */ -function mosLoadModule( $name, $style=-1 ) { - ?> instead - * - * @deprecated As of version 1.5 - */ -function mosShowHead() { - ?> instead - * - * @deprecated As of version 1.5 - */ -function mosCountAdminModules( $position='left' ) { - $document =& JFactory::getDocument(); - return count($document->getModules($position)); -} - -/** - * Legacy function, using instead - * - * @deprecated As of version 1.5 - */ -function mosMainBody_Admin() { - ?> instead - * - * @deprecated As of version 1.5 - */ - -function mosLoadAdminModules( $position='left', $style=0 ) { - - // Select the module chrome function - if (is_numeric($style)) - { - switch ( $style ) - { - case 2: - $style = 'xhtml'; - break; - - case 0 : - default : - $style = 'raw'; - break; - } - } - ?> instead - * - * @deprecated As of version 1.5 - */ -function mosLoadAdminModule( $name, $style=0 ) { - ?> instead - * - * @deprecated As of version 1.5 - */ -function mosShowHead_Admin() { - ?> $val) { - $ret[$key] = mosStripslashes( $val ); - } - } else { - $ret = $value; - } - } - return $ret; -} - -/** - * Legacy function, use {@link JArrayHelper JArrayHelper->toObject()} instead - * - * @deprecated As of version 1.5 - */ -function mosBindArrayToObject( $array, &$obj, $ignore='', $prefix=NULL, $checkSlashes=true ) -{ - if (!is_array( $array ) || !is_object( $obj )) { - return (false); - } - - foreach (get_object_vars($obj) as $k => $v) - { - if( substr( $k, 0, 1 ) != '_' ) - { - // internal attributes of an object are ignored - if (strpos( $ignore, $k) === false) - { - if ($prefix) { - $ak = $prefix . $k; - } else { - $ak = $k; - } - if (isset($array[$ak])) { - $obj->$k = ($checkSlashes && get_magic_quotes_gpc()) ? mosStripslashes( $array[$ak] ) : $array[$ak]; - } - } - } - } - - return true; -} - -/** - * Legacy function, use {@link JUtility::getHash()} instead - * - * @deprecated As of version 1.5 - */ -function mosHash( $seed ) { - return JUtility::getHash( $seed ); -} - -/** -* Legacy function - * - * @deprecated As of version 1.5 -*/ -function mosNotAuth() -{ - $user =& JFactory::getUser(); - echo JText::_('ALERTNOTAUTH'); - if ($user->get('id') < 1) { - echo "
" . JText::_( 'You need to login.' ); - } -} - -/** - * Legacy function, use (@link JError} or {@link JApplication::redirect()} instead. - * - * @deprecated As of version 1.5 - */ -function mosErrorAlert( $text, $action='window.history.go(-1);', $mode=1 ) -{ - global $mainframe; - - $text = nl2br( $text ); - $text = addslashes( $text ); - $text = strip_tags( $text ); - - switch ( $mode ) { - case 2: - echo " \n"; - break; - - case 1: - default: - echo " \n"; - echo ''; - break; - } - - $mainframe->close(); -} - -/** - * Legacy function, use {@link JPath::clean()} instead - * - * @deprecated As of version 1.5 - */ -function mosPathName($p_path, $p_addtrailingslash = true) -{ - jimport('joomla.filesystem.path'); - $path = JPath::clean($p_path); - if ($p_addtrailingslash) { - $path = rtrim($path, DS) . DS; - } - return $path; -} - -/** - * Legacy function, use {@link JFolder::files()} or {@link JFolder::folders()} instead - * - * @deprecated As of version 1.5 - */ -function mosReadDirectory( $path, $filter='.', $recurse=false, $fullpath=false ) -{ - $arr = array(null); - - // Get the files and folders - jimport('joomla.filesystem.folder'); - $files = JFolder::files($path, $filter, $recurse, $fullpath); - $folders = JFolder::folders($path, $filter, $recurse, $fullpath); - // Merge files and folders into one array - $arr = array_merge($files, $folders); - // Sort them all - asort($arr); - return $arr; -} - -/** - * Legacy function, use {@link JFactory::getMailer()} instead - * - * @deprecated As of version 1.5 - */ -function mosCreateMail( $from='', $fromname='', $subject, $body ) { - - $mail =& JFactory::getMailer(); - - $mail->From = $from ? $from : $mail->From; - $mail->FromName = $fromname ? $fromname : $mail->FromName; - $mail->Subject = $subject; - $mail->Body = $body; - - return $mail; -} - -/** - * Legacy function, use {@link JUtility::sendMail()} instead - * - * @deprecated As of version 1.5 - */ -function mosMail($from, $fromname, $recipient, $subject, $body, $mode=0, $cc=NULL, $bcc=NULL, $attachment=NULL, $replyto=NULL, $replytoname=NULL ) { - return JUTility::sendMail($from, $fromname, $recipient, $subject, $body, $mode, $cc, $bcc, $attachment, $replyto, $replytoname ); -} - -/** - * Legacy function, use {@link JUtility::sendAdminMail()} instead - * - * @deprecated As of version 1.5 - */ -function mosSendAdminMail( $adminName, $adminEmail, $email, $type, $title, $author ) { - JUtility::sendAdminMail( $adminName, $adminEmail, $email, $type, $title, $author ); -} - -/** - * Legacy function, use {@link JUserHelper::genRandomPassword()} instead - * - * @deprecated As of version 1.5 - */ -function mosMakePassword() { - jimport('joomla.user.helper'); - return JUserHelper::genRandomPassword(); -} - -/** - * Legacy function, use {@link JApplication::redirect() JApplication->redirect()} instead - * - * @deprecated As of version 1.5 - */ -function mosRedirect( $url, $msg='' ) { - global $mainframe; - $mainframe->redirect( $url, $msg ); -} - -/** - * Legacy function, use {@link JFolder::create()} - * - * @deprecated As of version 1.5 - */ -function mosMakePath($base, $path='', $mode = NULL) { - - if ($mode===null) { - $mode = 0755; - } - - jimport('joomla.filesystem.folder'); - return JFolder::create($base.$path, $mode); -} - -/** - * Legacy function, use {@link JArrayHelper::toInteger()} instead - * - * @deprecated As of version 1.5 - */ -function mosArrayToInts( &$array, $default=null ) { - return JArrayHelper::toInteger( $array, $default ); -} - -/** - * Legacy function, use {@link JException::getTrace() JException->getTrace()} instead - * - * @deprecated As of version 1.5 - */ -function mosBackTrace( $message='' ) { - if (function_exists( 'debug_backtrace' )) { - echo '
'; - if ($message) { - echo '

' . $message . '

'; - } - foreach( debug_backtrace() as $back) { - if (@$back['file']) { - echo '
' . str_replace( JPATH_ROOT, '', $back['file'] ) . ':' . $back['line']; - } - } - echo '
'; - } -} - -/** - * Legacy function, use {@link JPath::setPermissions()} instead - * - * @deprecated As of version 1.5 - */ -function mosChmod( $path ) { - jimport('joomla.filesystem.path'); - return JPath::setPermissions( $path ); -} - -/** - * Legacy function, use {@link JPath::setPermissions()} instead - * - * @deprecated As of version 1.5 - */ -function mosChmodRecursive( $path, $filemode=NULL, $dirmode=NULL ) { - jimport('joomla.filesystem.path'); - return JPath::setPermissions( $path, $filemode, $dirmode ); -} - -/** - * Legacy function, use {@link JPath::canChmod()} instead - * - * @deprecated As of version 1.5 - */ -function mosIsChmodable( $file ) { - jimport('joomla.filesystem.path'); - return JPath::canChmod( $file ); -} - -/** - * Legacy function, replaced by geshi bot - * - * @deprecated As of version 1.5 - */ -function mosShowSource( $filename, $withLineNums=false ) { - - ini_set('highlight.html', '000000'); - ini_set('highlight.default', '#800000'); - ini_set('highlight.keyword','#0000ff'); - ini_set('highlight.string', '#ff00ff'); - ini_set('highlight.comment','#008000'); - - if (!($source = @highlight_file( $filename, true ))) { - return JText::_( 'Operation Failed' ); - } - $source = explode("
", $source); - - $ln = 1; - - $txt = ''; - foreach( $source as $line ) { - $txt .= ""; - if ($withLineNums) { - $txt .= ""; - $txt .= str_replace( ' ', ' ', sprintf( "%4d:", $ln ) ); - $txt .= ""; - } - $txt .= "$line
"; - $ln++; - } - return $txt; -} - -/** - * Legacy function, use mosLoadModule( 'breadcrumb', -1 ); instead - * - * @deprecated As of version 1.5 - */ -function mosPathWay() { - mosLoadModule('breadcrumb', -1); -} - -/** - * Legacy function, use {@link JBrowser::getInstance()} instead - * - * @deprecated As of version 1.5 - */ -function mosGetBrowser( $agent ) { - jimport('joomla.environment.browser'); - $instance =& JBrowser::getInstance(); - return $instance; -} - -/** - * Legacy function, use {@link JApplication::getBrowser()} instead - * - * @deprecated As of version 1.5 - */ -function mosGetOS( $agent ) { - jimport('joomla.environment.browser'); - $instance =& JBrowser::getInstance(); - return $instance->getPlatform(); -} - -/** - * Legacy function, use {@link JArrayHelper::getValue()} instead - * - * @deprecated As of version 1.5 - */ -function mosGetParam( &$arr, $name, $def=null, $mask=0 ) -{ - // Static input filters for specific settings - static $noHtmlFilter = null; - static $safeHtmlFilter = null; - - $var = JArrayHelper::getValue( $arr, $name, $def, '' ); - - // If the no trim flag is not set, trim the variable - if (!($mask & 1) && is_string($var)) { - $var = trim($var); - } - - // Now we handle input filtering - if ($mask & 2) { - // If the allow html flag is set, apply a safe html filter to the variable - if (is_null($safeHtmlFilter)) { - $safeHtmlFilter = & JFilterInput::getInstance(null, null, 1, 1); - } - $var = $safeHtmlFilter->clean($var, 'none'); - } elseif ($mask & 4) { - // If the allow raw flag is set, do not modify the variable - $var = $var; - } else { - // Since no allow flags were set, we will apply the most strict filter to the variable - if (is_null($noHtmlFilter)) { - $noHtmlFilter = & JFilterInput::getInstance(/* $tags, $attr, $tag_method, $attr_method, $xss_auto */); - } - $var = $noHtmlFilter->clean($var, 'none'); - } - return $var; -} - -/** - * Legacy function, use {@link JHTML::_('list.genericordering', )} instead - * - * @deprecated As of version 1.5 - */ -function mosGetOrderingList( $sql, $chop='30' ) -{ - return JHTML::_('list.genericordering', $sql, $chop); -} - -/** - * Legacy function, use {@link JRegistry} instead - * - * @deprecated As of version 1.5 - */ -function mosParseParams( $txt ) { - - $registry = new JRegistry(); - $registry->loadINI($txt); - return $registry->toObject( ); -} - -/** - * Legacy function, removed - * - * @deprecated As of version 1.5 - */ -function mosLoadComponent( $name ) -{ - // set up some global variables for use by the frontend component - global $mainframe, $database; - $name = JFilterInput::clean($name, 'cmd'); - $path = JPATH_SITE.DS.'components'.DS.'com_'.$name.DS.$name.'.php'; - if (file_exists($path)) { - include $path; - } -} - -/** - * Legacy function, use {@link JEditor::init()} instead - * - * @deprecated As of version 1.5 - */ -function initEditor() -{ - $editor =& JFactory::getEditor(); - echo $editor->initialise(); -} - -/** - * Legacy function, use {@link JEditor::save()} or {@link JEditor::getContent()} instead - * - * @deprecated As of version 1.5 - */ -function getEditorContents($editorArea, $hiddenField) -{ - jimport( 'joomla.html.editor' ); - $editor =& JFactory::getEditor(); - echo $editor->save( $hiddenField ); -} - -/** - * Legacy function, use {@link JEditor::display()} instead - * - * @deprecated As of version 1.5 - */ -function editorArea($name, $content, $hiddenField, $width, $height, $col, $row) -{ - jimport( 'joomla.html.editor' ); - $editor =& JFactory::getEditor(); - echo $editor->display($hiddenField, $content, $width, $height, $col, $row); -} - -/** - * Legacy function, use {@link JMenu::authorize()} instead - * - * @deprecated As of version 1.5 - */ -function mosMenuCheck( $Itemid, $menu_option, $task, $gid ) -{ - $user =& JFactory::getUser(); - $menus =& JSite::getMenu(); - return $menus->authorize($Itemid, $user->get('aid')); -} - -/** - * Legacy function, use {@link JArrayHelper::fromObject()} instead - * - * @deprecated As of version 1.5 - */ -function mosObjectToArray( $p_obj, $recurse = true, $regex = null ) -{ - $result = JArrayHelper::fromObject( $p_obj, $recurse, $regex ); - return $result; -} - -/** - * Legacy function, use {@link JHTML::_('date', )} instead - * - * @deprecated As of version 1.5 - */ -function mosFormatDate( $date = 'now', $format = null, $offset = null ) { - - if ( ! $format ) - { - $format = JText::_('DATE_FORMAT_LC1'); - } - - return JHTML::_('date', $date, $format, $offset); -} - -/** - * Legacy function, use {@link JHTML::_('date', )} instead - * - * @deprecated As of version 1.5 - */ -function mosCurrentDate( $format="" ) -{ - if ($format=="") { - $format = JText::_( 'DATE_FORMAT_LC1' ); - } - - return JHTML::_('date', 'now', $format); -} - -/** - * Legacy function, use {@link JFilterOutput::objectHTMLSafe()} instead - * - * @deprecated As of version 1.5 - */ -function mosMakeHtmlSafe( &$mixed, $quote_style=ENT_QUOTES, $exclude_keys='' ) { - JFilterOutput::objectHTMLSafe( $mixed, $quote_style, $exclude_keys ); -} - -/** - * Legacy function, handled by {@link JDocument} Zlib outputfilter - * - * @deprecated As of version 1.5 - */ -function initGzip() -{ - global $mainframe, $do_gzip_compress; - - - // attempt to disable session.use_trans_sid - ini_set('session.use_trans_sid', false); - - $do_gzip_compress = FALSE; - if ($mainframe->getCfg('gzip') == 1) { - $phpver = phpversion(); - $useragent = mosGetParam( $_SERVER, 'HTTP_USER_AGENT', '' ); - $canZip = mosGetParam( $_SERVER, 'HTTP_ACCEPT_ENCODING', '' ); - - if ( $phpver >= '4.0.4pl1' && - ( strpos($useragent,'compatible') !== false || - strpos($useragent,'Gecko') !== false - ) - ) { - // Check for gzip header or northon internet securities - if ( isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) { - $encodings = explode(',', strtolower($_SERVER['HTTP_ACCEPT_ENCODING'])); - } - if ( (in_array('gzip', $encodings) || isset( $_SERVER['---------------']) ) && extension_loaded('zlib') && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression') && !ini_get('session.use_trans_sid') ) { - // You cannot specify additional output handlers if - // zlib.output_compression is activated here - ob_start( 'ob_gzhandler' ); - return; - } - } else if ( $phpver > '4.0' ) { - if ( strpos($canZip,'gzip') !== false ) { - if (extension_loaded( 'zlib' )) { - $do_gzip_compress = TRUE; - ob_start(); - ob_implicit_flush(0); - - header( 'Content-Encoding: gzip' ); - return; - } - } - } - } - ob_start(); -} - -/** - * Legacy function, use JFolder::delete($path) - * - * @deprecated As of version 1.5 - */ -function deldir( $dir ) -{ - $current_dir = opendir( $dir ); - $old_umask = umask(0); - while ($entryname = readdir( $current_dir )) { - if ($entryname != '.' and $entryname != '..') { - if (is_dir( $dir . $entryname )) { - deldir( mosPathName( $dir . $entryname ) ); - } else { - @chmod($dir . $entryname, 0777); - unlink( $dir . $entryname ); - } - } - } - umask($old_umask); - closedir( $current_dir ); - return rmdir( $dir ); -} - -/** - * Legacy function, handled by {@link JDocument} Zlib outputfilter - * - * @deprecated As of version 1.5 - */ -function doGzip() -{ - global $do_gzip_compress; - if ( $do_gzip_compress ) - { - $gzip_contents = ob_get_contents(); - ob_end_clean(); - - $gzip_size = strlen($gzip_contents); - $gzip_crc = crc32($gzip_contents); - - $gzip_contents = gzcompress($gzip_contents, 9); - $gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4); - - echo "\x1f\x8b\x08\x00\x00\x00\x00\x00"; - echo $gzip_contents; - echo pack('V', $gzip_crc); - echo pack('V', $gzip_size); - } else { - ob_end_flush(); - } -} - -/** - * Legacy function, use {@link JArrayHelper::sortObjects()} instead - * - * @deprecated As of version 1.5 - */ -function SortArrayObjects( &$a, $k, $sort_direction=1 ) -{ - JArrayHelper::sortObjects($a, $k, $sort_direction); -} - -/** - * Legacy function, {@link JRequest::getVar()} - * - * @deprecated As of version 1.5 - */ -function josGetArrayInts( $name, $type=NULL ) { - - $array = JRequest::getVar($name, array(), 'default', 'array' ); - - return $array; -} - -/** - * Legacy function, {@link JSession} transparently checks for spoofing attacks - * - * @deprecated As of version 1.5 - */ -function josSpoofCheck( $header=false, $alternate=null ) -{ - // Lets make sure they saw the html form - $check = true; - $hash = josSpoofValue($alternate); - $valid = JRequest::getBool( $hash, 0, 'post' ); - if (!$valid) { - $check = false; - } - - // Make sure request came from a client with a user agent string. - if (!isset( $_SERVER['HTTP_USER_AGENT'] )) { - $check = false; - } - - // Check to make sure that the request was posted as well. - $requestMethod = JArrayHelper::getValue( $_SERVER, 'REQUEST_METHOD' ); - if ($requestMethod != 'POST') { - $check = false; - } - - if (!$check) - { - header( 'HTTP/1.0 403 Forbidden' ); - jexit( JText::_('E_SESSION_TIMEOUT') ); - } -} - -/** - * Legacy function, use {@link JUtility::getToken()} instead - * - * @deprecated As of version 1.5 - */ -function josSpoofValue($alt = NULL) -{ - global $mainframe; - - if ($alt) { - if ( $alt == 1 ) { - $random = date( 'Ymd' ); - } else { - $random = $alt . date( 'Ymd' ); - } - } else { - $random = date( 'dmY' ); - } - // the prefix ensures that the hash is non-numeric - // otherwise it will be intercepted by globals.php - $validate = 'j' . mosHash( $mainframe->getCfg( 'db' ) . $random ); - - return $validate; -} - -/** - * Legacy function to load the tooltip library. - * - * @deprecated As of version 1.5 - */ -function loadOverlib() { - JHTML::_('behavior.tooltip'); -} - -/** -* Legacy utility function to provide ToolTips -* -* @deprecated As of version 1.5 -*/ -function mosToolTip( $tooltip, $title='', $width='', $image='tooltip.png', $text='', $href='', $link=1 ) -{ - // Initialize the toolips if required - static $init; - if ( ! $init ) - { - JHTML::_('behavior.tooltip'); - $init = true; - } - - return JHTML::_('tooltip', $tooltip, $title, $image, $text, $href, $link); -} - -/** - * Legacy function to convert an internal Joomla URL to a humanly readible URL. - * - * @deprecated As of version 1.5 - */ -function sefRelToAbs($value) -{ - // Replace all & with & as the router doesn't understand & - $url = str_replace('&', '&', $value); - if(substr(strtolower($url),0,9) != "index.php") return $url; - $uri = JURI::getInstance(); - $prefix = $uri->toString(array('scheme', 'host', 'port')); - return $prefix.JRoute::_($url); -} - - -/** - * Legacy function to replaces & with & for xhtml compliance - * - * @deprecated As of version 1.5 - */ -function ampReplace( $text ) { - return JFilterOutput::ampReplace($text); -} - -/** - * Legacy function to replaces & with & for xhtml compliance - * - * @deprecated As of version 1.5 - */ -function mosTreeRecurse( $id, $indent, $list, &$children, $maxlevel=9999, $level=0, $type=1 ) -{ - jimport('joomla.html.html'); - return JHTML::_('menu.treerecurse', $id, $indent, $list, $children, $maxlevel, $level, $type); -} - -/** - * Legacy function, use {@link JHTML::tooltip()} instead - * - * @deprecated As of version 1.5 - */ -function mosWarning($warning, $title='Joomla! Warning') { - return JHTML::tooltip($warning, $title, 'warning.png', null, null, null); -} + instead + * + * @deprecated As of version 1.5 + */ +function mosCountModules( $position='left' ) { + jimport('joomla.application.module.helper'); + return count(JModuleHelper::getModules($position)); +} + +/** + * Legacy function, use instead + * + * @deprecated As of version 1.5 + */ +function mosMainBody() { + ?> instead + * + * @deprecated As of version 1.5 + */ +function mosLoadModules( $position='left', $style=0 ) +{ + // Select the module chrome function + if (is_numeric($style)) + { + switch ( $style ) + { + case -3: + $style = 'rounded'; + break; + + case -2: + $style = 'xhtml'; + break; + + case -1: + $style = 'raw'; + break; + + case 0 : + default : + $style = 'table'; + break; + } + } + ?> instead + * + * @deprecated As of version 1.5 + */ +function mosLoadModule( $name, $style=-1 ) { + ?> instead + * + * @deprecated As of version 1.5 + */ +function mosShowHead() { + ?> instead + * + * @deprecated As of version 1.5 + */ +function mosCountAdminModules( $position='left' ) { + $document =& JFactory::getDocument(); + return count($document->getModules($position)); +} + +/** + * Legacy function, using instead + * + * @deprecated As of version 1.5 + */ +function mosMainBody_Admin() { + ?> instead + * + * @deprecated As of version 1.5 + */ + +function mosLoadAdminModules( $position='left', $style=0 ) { + + // Select the module chrome function + if (is_numeric($style)) + { + switch ( $style ) + { + case 2: + $style = 'xhtml'; + break; + + case 0 : + default : + $style = 'raw'; + break; + } + } + ?> instead + * + * @deprecated As of version 1.5 + */ +function mosLoadAdminModule( $name, $style=0 ) { + ?> instead + * + * @deprecated As of version 1.5 + */ +function mosShowHead_Admin() { + ?> $val) { + $ret[$key] = mosStripslashes( $val ); + } + } else { + $ret = $value; + } + } + return $ret; +} + +/** + * Legacy function, use {@link JArrayHelper JArrayHelper->toObject()} instead + * + * @deprecated As of version 1.5 + */ +function mosBindArrayToObject( $array, &$obj, $ignore='', $prefix=NULL, $checkSlashes=true ) +{ + if (!is_array( $array ) || !is_object( $obj )) { + return (false); + } + + foreach (get_object_vars($obj) as $k => $v) + { + if( substr( $k, 0, 1 ) != '_' ) + { + // internal attributes of an object are ignored + if (strpos( $ignore, $k) === false) + { + if ($prefix) { + $ak = $prefix . $k; + } else { + $ak = $k; + } + if (isset($array[$ak])) { + $obj->$k = ($checkSlashes && get_magic_quotes_gpc()) ? mosStripslashes( $array[$ak] ) : $array[$ak]; + } + } + } + } + + return true; +} + +/** + * Legacy function, use {@link JUtility::getHash()} instead + * + * @deprecated As of version 1.5 + */ +function mosHash( $seed ) { + return JUtility::getHash( $seed ); +} + +/** +* Legacy function + * + * @deprecated As of version 1.5 +*/ +function mosNotAuth() +{ + $user =& JFactory::getUser(); + echo JText::_('ALERTNOTAUTH'); + if ($user->get('id') < 1) { + echo "
" . JText::_( 'You need to login.' ); + } +} + +/** + * Legacy function, use (@link JError} or {@link JApplication::redirect()} instead. + * + * @deprecated As of version 1.5 + */ +function mosErrorAlert( $text, $action='window.history.go(-1);', $mode=1 ) +{ + global $mainframe; + + $text = nl2br( $text ); + $text = addslashes( $text ); + $text = strip_tags( $text ); + + switch ( $mode ) { + case 2: + echo " \n"; + break; + + case 1: + default: + echo " \n"; + echo ''; + break; + } + + $mainframe->close(); +} + +/** + * Legacy function, use {@link JPath::clean()} instead + * + * @deprecated As of version 1.5 + */ +function mosPathName($p_path, $p_addtrailingslash = true) +{ + jimport('joomla.filesystem.path'); + $path = JPath::clean($p_path); + if ($p_addtrailingslash) { + $path = rtrim($path, DS) . DS; + } + return $path; +} + +/** + * Legacy function, use {@link JFolder::files()} or {@link JFolder::folders()} instead + * + * @deprecated As of version 1.5 + */ +function mosReadDirectory( $path, $filter='.', $recurse=false, $fullpath=false ) +{ + $arr = array(null); + + // Get the files and folders + jimport('joomla.filesystem.folder'); + $files = JFolder::files($path, $filter, $recurse, $fullpath); + $folders = JFolder::folders($path, $filter, $recurse, $fullpath); + // Merge files and folders into one array + $arr = array_merge($files, $folders); + // Sort them all + asort($arr); + return $arr; +} + +/** + * Legacy function, use {@link JFactory::getMailer()} instead + * + * @deprecated As of version 1.5 + */ +function mosCreateMail( $from='', $fromname='', $subject, $body ) { + + $mail =& JFactory::getMailer(); + + $mail->From = $from ? $from : $mail->From; + $mail->FromName = $fromname ? $fromname : $mail->FromName; + $mail->Subject = $subject; + $mail->Body = $body; + + return $mail; +} + +/** + * Legacy function, use {@link JUtility::sendMail()} instead + * + * @deprecated As of version 1.5 + */ +function mosMail($from, $fromname, $recipient, $subject, $body, $mode=0, $cc=NULL, $bcc=NULL, $attachment=NULL, $replyto=NULL, $replytoname=NULL ) { + return JUTility::sendMail($from, $fromname, $recipient, $subject, $body, $mode, $cc, $bcc, $attachment, $replyto, $replytoname ); +} + +/** + * Legacy function, use {@link JUtility::sendAdminMail()} instead + * + * @deprecated As of version 1.5 + */ +function mosSendAdminMail( $adminName, $adminEmail, $email, $type, $title, $author ) { + JUtility::sendAdminMail( $adminName, $adminEmail, $email, $type, $title, $author ); +} + +/** + * Legacy function, use {@link JUserHelper::genRandomPassword()} instead + * + * @deprecated As of version 1.5 + */ +function mosMakePassword() { + jimport('joomla.user.helper'); + return JUserHelper::genRandomPassword(); +} + +/** + * Legacy function, use {@link JApplication::redirect() JApplication->redirect()} instead + * + * @deprecated As of version 1.5 + */ +function mosRedirect( $url, $msg='' ) { + global $mainframe; + $mainframe->redirect( $url, $msg ); +} + +/** + * Legacy function, use {@link JFolder::create()} + * + * @deprecated As of version 1.5 + */ +function mosMakePath($base, $path='', $mode = NULL) { + + if ($mode===null) { + $mode = 0755; + } + + jimport('joomla.filesystem.folder'); + return JFolder::create($base.$path, $mode); +} + +/** + * Legacy function, use {@link JArrayHelper::toInteger()} instead + * + * @deprecated As of version 1.5 + */ +function mosArrayToInts( &$array, $default=null ) { + return JArrayHelper::toInteger( $array, $default ); +} + +/** + * Legacy function, use {@link JException::getTrace() JException->getTrace()} instead + * + * @deprecated As of version 1.5 + */ +function mosBackTrace( $message='' ) { + if (function_exists( 'debug_backtrace' )) { + echo '
'; + if ($message) { + echo '

' . $message . '

'; + } + foreach( debug_backtrace() as $back) { + if (@$back['file']) { + echo '
' . str_replace( JPATH_ROOT, '', $back['file'] ) . ':' . $back['line']; + } + } + echo '
'; + } +} + +/** + * Legacy function, use {@link JPath::setPermissions()} instead + * + * @deprecated As of version 1.5 + */ +function mosChmod( $path ) { + jimport('joomla.filesystem.path'); + return JPath::setPermissions( $path ); +} + +/** + * Legacy function, use {@link JPath::setPermissions()} instead + * + * @deprecated As of version 1.5 + */ +function mosChmodRecursive( $path, $filemode=NULL, $dirmode=NULL ) { + jimport('joomla.filesystem.path'); + return JPath::setPermissions( $path, $filemode, $dirmode ); +} + +/** + * Legacy function, use {@link JPath::canChmod()} instead + * + * @deprecated As of version 1.5 + */ +function mosIsChmodable( $file ) { + jimport('joomla.filesystem.path'); + return JPath::canChmod( $file ); +} + +/** + * Legacy function, replaced by geshi bot + * + * @deprecated As of version 1.5 + */ +function mosShowSource( $filename, $withLineNums=false ) { + + ini_set('highlight.html', '000000'); + ini_set('highlight.default', '#800000'); + ini_set('highlight.keyword','#0000ff'); + ini_set('highlight.string', '#ff00ff'); + ini_set('highlight.comment','#008000'); + + if (!($source = @highlight_file( $filename, true ))) { + return JText::_( 'Operation Failed' ); + } + $source = explode("
", $source); + + $ln = 1; + + $txt = ''; + foreach( $source as $line ) { + $txt .= ""; + if ($withLineNums) { + $txt .= ""; + $txt .= str_replace( ' ', ' ', sprintf( "%4d:", $ln ) ); + $txt .= ""; + } + $txt .= "$line
"; + $ln++; + } + return $txt; +} + +/** + * Legacy function, use mosLoadModule( 'breadcrumb', -1 ); instead + * + * @deprecated As of version 1.5 + */ +function mosPathWay() { + mosLoadModule('breadcrumb', -1); +} + +/** + * Legacy function, use {@link JBrowser::getInstance()} instead + * + * @deprecated As of version 1.5 + */ +function mosGetBrowser( $agent ) { + jimport('joomla.environment.browser'); + $instance =& JBrowser::getInstance(); + return $instance; +} + +/** + * Legacy function, use {@link JApplication::getBrowser()} instead + * + * @deprecated As of version 1.5 + */ +function mosGetOS( $agent ) { + jimport('joomla.environment.browser'); + $instance =& JBrowser::getInstance(); + return $instance->getPlatform(); +} + +/** + * Legacy function, use {@link JArrayHelper::getValue()} instead + * + * @deprecated As of version 1.5 + */ +function mosGetParam( &$arr, $name, $def=null, $mask=0 ) +{ + // Static input filters for specific settings + static $noHtmlFilter = null; + static $safeHtmlFilter = null; + + $var = JArrayHelper::getValue( $arr, $name, $def, '' ); + + // If the no trim flag is not set, trim the variable + if (!($mask & 1) && is_string($var)) { + $var = trim($var); + } + + // Now we handle input filtering + if ($mask & 2) { + // If the allow html flag is set, apply a safe html filter to the variable + if (is_null($safeHtmlFilter)) { + $safeHtmlFilter = & JFilterInput::getInstance(null, null, 1, 1); + } + $var = $safeHtmlFilter->clean($var, 'none'); + } elseif ($mask & 4) { + // If the allow raw flag is set, do not modify the variable + $var = $var; + } else { + // Since no allow flags were set, we will apply the most strict filter to the variable + if (is_null($noHtmlFilter)) { + $noHtmlFilter = & JFilterInput::getInstance(/* $tags, $attr, $tag_method, $attr_method, $xss_auto */); + } + $var = $noHtmlFilter->clean($var, 'none'); + } + return $var; +} + +/** + * Legacy function, use {@link JHTML::_('list.genericordering', )} instead + * + * @deprecated As of version 1.5 + */ +function mosGetOrderingList( $sql, $chop='30' ) +{ + return JHTML::_('list.genericordering', $sql, $chop); +} + +/** + * Legacy function, use {@link JRegistry} instead + * + * @deprecated As of version 1.5 + */ +function mosParseParams( $txt ) { + + $registry = new JRegistry(); + $registry->loadINI($txt); + return $registry->toObject( ); +} + +/** + * Legacy function, removed + * + * @deprecated As of version 1.5 + */ +function mosLoadComponent( $name ) +{ + // set up some global variables for use by the frontend component + global $mainframe, $database; + $name = JFilterInput::clean($name, 'cmd'); + $path = JPATH_SITE.DS.'components'.DS.'com_'.$name.DS.$name.'.php'; + if (file_exists($path)) { + include $path; + } +} + +/** + * Legacy function, use {@link JEditor::init()} instead + * + * @deprecated As of version 1.5 + */ +function initEditor() +{ + $editor =& JFactory::getEditor(); + echo $editor->initialise(); +} + +/** + * Legacy function, use {@link JEditor::save()} or {@link JEditor::getContent()} instead + * + * @deprecated As of version 1.5 + */ +function getEditorContents($editorArea, $hiddenField) +{ + jimport( 'joomla.html.editor' ); + $editor =& JFactory::getEditor(); + echo $editor->save( $hiddenField ); +} + +/** + * Legacy function, use {@link JEditor::display()} instead + * + * @deprecated As of version 1.5 + */ +function editorArea($name, $content, $hiddenField, $width, $height, $col, $row) +{ + jimport( 'joomla.html.editor' ); + $editor =& JFactory::getEditor(); + echo $editor->display($hiddenField, $content, $width, $height, $col, $row); +} + +/** + * Legacy function, use {@link JMenu::authorize()} instead + * + * @deprecated As of version 1.5 + */ +function mosMenuCheck( $Itemid, $menu_option, $task, $gid ) +{ + $user =& JFactory::getUser(); + $menus =& JSite::getMenu(); + return $menus->authorize($Itemid, $user->get('aid')); +} + +/** + * Legacy function, use {@link JArrayHelper::fromObject()} instead + * + * @deprecated As of version 1.5 + */ +function mosObjectToArray( $p_obj, $recurse = true, $regex = null ) +{ + $result = JArrayHelper::fromObject( $p_obj, $recurse, $regex ); + return $result; +} + +/** + * Legacy function, use {@link JHTML::_('date', )} instead + * + * @deprecated As of version 1.5 + */ +function mosFormatDate( $date = 'now', $format = null, $offset = null ) { + + if ( ! $format ) + { + $format = JText::_('DATE_FORMAT_LC1'); + } + + return JHTML::_('date', $date, $format, $offset); +} + +/** + * Legacy function, use {@link JHTML::_('date', )} instead + * + * @deprecated As of version 1.5 + */ +function mosCurrentDate( $format="" ) +{ + if ($format=="") { + $format = JText::_( 'DATE_FORMAT_LC1' ); + } + + return JHTML::_('date', 'now', $format); +} + +/** + * Legacy function, use {@link JFilterOutput::objectHTMLSafe()} instead + * + * @deprecated As of version 1.5 + */ +function mosMakeHtmlSafe( &$mixed, $quote_style=ENT_QUOTES, $exclude_keys='' ) { + JFilterOutput::objectHTMLSafe( $mixed, $quote_style, $exclude_keys ); +} + +/** + * Legacy function, handled by {@link JDocument} Zlib outputfilter + * + * @deprecated As of version 1.5 + */ +function initGzip() +{ + global $mainframe, $do_gzip_compress; + + + // attempt to disable session.use_trans_sid + ini_set('session.use_trans_sid', false); + + $do_gzip_compress = FALSE; + if ($mainframe->getCfg('gzip') == 1) { + $phpver = phpversion(); + $useragent = mosGetParam( $_SERVER, 'HTTP_USER_AGENT', '' ); + $canZip = mosGetParam( $_SERVER, 'HTTP_ACCEPT_ENCODING', '' ); + + if ( $phpver >= '4.0.4pl1' && + ( strpos($useragent,'compatible') !== false || + strpos($useragent,'Gecko') !== false + ) + ) { + // Check for gzip header or northon internet securities + if ( isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) { + $encodings = explode(',', strtolower($_SERVER['HTTP_ACCEPT_ENCODING'])); + } + if ( (in_array('gzip', $encodings) || isset( $_SERVER['---------------']) ) && extension_loaded('zlib') && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression') && !ini_get('session.use_trans_sid') ) { + // You cannot specify additional output handlers if + // zlib.output_compression is activated here + ob_start( 'ob_gzhandler' ); + return; + } + } else if ( $phpver > '4.0' ) { + if ( strpos($canZip,'gzip') !== false ) { + if (extension_loaded( 'zlib' )) { + $do_gzip_compress = TRUE; + ob_start(); + ob_implicit_flush(0); + + header( 'Content-Encoding: gzip' ); + return; + } + } + } + } + ob_start(); +} + +/** + * Legacy function, use JFolder::delete($path) + * + * @deprecated As of version 1.5 + */ +function deldir( $dir ) +{ + $current_dir = opendir( $dir ); + $old_umask = umask(0); + while ($entryname = readdir( $current_dir )) { + if ($entryname != '.' and $entryname != '..') { + if (is_dir( $dir . $entryname )) { + deldir( mosPathName( $dir . $entryname ) ); + } else { + @chmod($dir . $entryname, 0777); + unlink( $dir . $entryname ); + } + } + } + umask($old_umask); + closedir( $current_dir ); + return rmdir( $dir ); +} + +/** + * Legacy function, handled by {@link JDocument} Zlib outputfilter + * + * @deprecated As of version 1.5 + */ +function doGzip() +{ + global $do_gzip_compress; + if ( $do_gzip_compress ) + { + $gzip_contents = ob_get_contents(); + ob_end_clean(); + + $gzip_size = strlen($gzip_contents); + $gzip_crc = crc32($gzip_contents); + + $gzip_contents = gzcompress($gzip_contents, 9); + $gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4); + + echo "\x1f\x8b\x08\x00\x00\x00\x00\x00"; + echo $gzip_contents; + echo pack('V', $gzip_crc); + echo pack('V', $gzip_size); + } else { + ob_end_flush(); + } +} + +/** + * Legacy function, use {@link JArrayHelper::sortObjects()} instead + * + * @deprecated As of version 1.5 + */ +function SortArrayObjects( &$a, $k, $sort_direction=1 ) +{ + JArrayHelper::sortObjects($a, $k, $sort_direction); +} + +/** + * Legacy function, {@link JRequest::getVar()} + * + * @deprecated As of version 1.5 + */ +function josGetArrayInts( $name, $type=NULL ) { + + $array = JRequest::getVar($name, array(), 'default', 'array' ); + + return $array; +} + +/** + * Legacy function, {@link JSession} transparently checks for spoofing attacks + * + * @deprecated As of version 1.5 + */ +function josSpoofCheck( $header=false, $alternate=null ) +{ + // Lets make sure they saw the html form + $check = true; + $hash = josSpoofValue($alternate); + $valid = JRequest::getBool( $hash, 0, 'post' ); + if (!$valid) { + $check = false; + } + + // Make sure request came from a client with a user agent string. + if (!isset( $_SERVER['HTTP_USER_AGENT'] )) { + $check = false; + } + + // Check to make sure that the request was posted as well. + $requestMethod = JArrayHelper::getValue( $_SERVER, 'REQUEST_METHOD' ); + if ($requestMethod != 'POST') { + $check = false; + } + + if (!$check) + { + header( 'HTTP/1.0 403 Forbidden' ); + jexit( JText::_('E_SESSION_TIMEOUT') ); + } +} + +/** + * Legacy function, use {@link JUtility::getToken()} instead + * + * @deprecated As of version 1.5 + */ +function josSpoofValue($alt = NULL) +{ + global $mainframe; + + if ($alt) { + if ( $alt == 1 ) { + $random = date( 'Ymd' ); + } else { + $random = $alt . date( 'Ymd' ); + } + } else { + $random = date( 'dmY' ); + } + // the prefix ensures that the hash is non-numeric + // otherwise it will be intercepted by globals.php + $validate = 'j' . mosHash( $mainframe->getCfg( 'db' ) . $random ); + + return $validate; +} + +/** + * Legacy function to load the tooltip library. + * + * @deprecated As of version 1.5 + */ +function loadOverlib() { + JHTML::_('behavior.tooltip'); +} + +/** +* Legacy utility function to provide ToolTips +* +* @deprecated As of version 1.5 +*/ +function mosToolTip( $tooltip, $title='', $width='', $image='tooltip.png', $text='', $href='', $link=1 ) +{ + // Initialize the toolips if required + static $init; + if ( ! $init ) + { + JHTML::_('behavior.tooltip'); + $init = true; + } + + return JHTML::_('tooltip', $tooltip, $title, $image, $text, $href, $link); +} + +/** + * Legacy function to convert an internal Joomla URL to a humanly readible URL. + * + * @deprecated As of version 1.5 + */ +function sefRelToAbs($value) +{ + // Replace all & with & as the router doesn't understand & + $url = str_replace('&', '&', $value); + if(substr(strtolower($url),0,9) != "index.php") return $url; + $uri = JURI::getInstance(); + $prefix = $uri->toString(array('scheme', 'host', 'port')); + return $prefix.JRoute::_($url); +} + + +/** + * Legacy function to replaces & with & for xhtml compliance + * + * @deprecated As of version 1.5 + */ +function ampReplace( $text ) { + return JFilterOutput::ampReplace($text); +} + +/** + * Legacy function to replaces & with & for xhtml compliance + * + * @deprecated As of version 1.5 + */ +function mosTreeRecurse( $id, $indent, $list, &$children, $maxlevel=9999, $level=0, $type=1 ) +{ + jimport('joomla.html.html'); + return JHTML::_('menu.treerecurse', $id, $indent, $list, $children, $maxlevel, $level, $type); +} + +/** + * Legacy function, use {@link JHTML::tooltip()} instead + * + * @deprecated As of version 1.5 + */ +function mosWarning($warning, $title='Joomla! Warning') { + return JHTML::tooltip($warning, $title, 'warning.png', null, null, null); +} diff --git a/oss/joomla/trunk/plugins/system/legacy/html.php b/oss/joomla/trunk/plugins/system/legacy/html.php index 464a7c39..f943fa96 100644 --- a/oss/joomla/trunk/plugins/system/legacy/html.php +++ b/oss/joomla/trunk/plugins/system/legacy/html.php @@ -1,346 +1,346 @@ -'. JText::_( 'Writable' ) .''; - $unwriteable = ''. JText::_( 'Unwritable' ) .''; - - echo ''; - echo ''; - echo $text; - if ( $visible ) { - echo $folder . '/'; - } - echo ''; - echo ''; - if ( $relative ) { - echo is_writable( "../$folder" ) ? $writeable : $unwriteable; - } else { - echo is_writable( "$folder" ) ? $writeable : $unwriteable; - } - echo ''; - echo ''; - } - - /** - * Legacy function, deprecated - * - * @deprecated As of version 1.5 - */ - function monthSelectList( $tag_name, $tag_attribs, $selected ) - { - $arr = array( - mosHTML::makeOption( '01', JText::_( 'JANUARY_SHORT' ) ), - mosHTML::makeOption( '02', JText::_( 'FEBRUARY_SHORT' ) ), - mosHTML::makeOption( '03', JText::_( 'MARCH_SHORT' ) ), - mosHTML::makeOption( '04', JText::_( 'APRIL_SHORT' ) ), - mosHTML::makeOption( '05', JText::_( 'MAY_SHORT' ) ), - mosHTML::makeOption( '06', JText::_( 'JUNE_SHORT' ) ), - mosHTML::makeOption( '07', JText::_( 'JULY_SHORT' ) ), - mosHTML::makeOption( '08', JText::_( 'AUGUST_SHORT' ) ), - mosHTML::makeOption( '09', JText::_( 'SEPTEMBER_SHORT' ) ), - mosHTML::makeOption( '10', JText::_( 'OCTOBER_SHORT' ) ), - mosHTML::makeOption( '11', JText::_( 'NOVEMBER_SHORT' ) ), - mosHTML::makeOption( '12', JText::_( 'DECEMBER_SHORT' ) ) - ); - - return mosHTML::selectList( $arr, $tag_name, $tag_attribs, 'value', 'text', $selected ); - } - - /** - * Legacy function, deprecated - * - * @deprecated As of version 1.5 - */ - function treeSelectList( &$src_list, $src_id, $tgt_list, $tag_name, $tag_attribs, $key, $text, $selected ) - { - - // establish the hierarchy of the menu - $children = array(); - // first pass - collect children - foreach ($src_list as $v ) { - $pt = $v->parent; - $list = @$children[$pt] ? $children[$pt] : array(); - array_push( $list, $v ); - $children[$pt] = $list; - } - // second pass - get an indent list of the items - $ilist = JHTML::_('menu.treerecurse', 0, '', array(), $children ); - - // assemble menu items to the array - $this_treename = ''; - foreach ($ilist as $item) { - if ($this_treename) { - if ($item->id != $src_id && strpos( $item->treename, $this_treename ) === false) { - $tgt_list[] = mosHTML::makeOption( $item->id, $item->treename ); - } - } else { - if ($item->id != $src_id) { - $tgt_list[] = mosHTML::makeOption( $item->id, $item->treename ); - } else { - $this_treename = "$item->treename/"; - } - } - } - // build the html select list - return mosHTML::selectList( $tgt_list, $tag_name, $tag_attribs, $key, $text, $selected ); - } - - /** - * Legacy function, deprecated - * - * @deprecated As of version 1.5 - */ - function yesnoSelectList( $tag_name, $tag_attribs, $selected, $yes='yes', $no='no' ) - { - $arr = array( - mosHTML::makeOption( 0, JText::_( $no ) ), - mosHTML::makeOption( 1, JText::_( $yes ) ), - ); - - return mosHTML::selectList( $arr, $tag_name, $tag_attribs, 'value', 'text', (int) $selected ); - } - - /** - * Legacy function, use {@link JHTML::_('grid.id')} instead - * - * @deprecated As of version 1.5 - */ - function idBox( $rowNum, $recId, $checkedOut=false, $name='cid' ) - { - return JHTML::_('grid.id', $rowNum, $recId, $checkedOut, $name); - } - - /** - * Legacy function, deprecated - * - * @deprecated As of version 1.5 - */ - function sortIcon( $text, $base_href, $field, $state='none' ) - { - $alts = array( - 'none' => JText::_( 'No Sorting' ), - 'asc' => JText::_( 'Sort Ascending' ), - 'desc' => JText::_( 'Sort Descending' ), - ); - - $next_state = 'asc'; - if ($state == 'asc') { - $next_state = 'desc'; - } else if ($state == 'desc') { - $next_state = 'none'; - } - - if ($state == 'none') { - $img = ''; - } else { - $img = "\"{$alts[$next_state]}\""; - } - - $html = "" - . JText::_( $text ) - . '  ' - . $img - . ""; - - return $html; - } - - /** - * Legacy function, deprecated - * - * @deprecated As of version 1.5 - */ - function CloseButton ( &$params, $hide_js=NULL ) - { - - // displays close button in Pop-up window - if ( $params->get( 'popup' ) && !$hide_js ) { - ?> -
- - '; - echo '', "'"), '', $_SERVER['HTTP_REFERER']) .'">'. JText::_( 'BACK' ) .''; - echo ''; - } - ?> -
- get( 'back_button' ) && !$params->get( 'popup' ) && !$hide_js) { - ?> -
- - -
- get( 'print' ) && !$hide_js ) { - // use default settings if none declared - if ( !$status ) { - $status = 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no'; - } - - // checks template image directory for image, if non found default are loaded - if ( $params->get( 'icons' ) ) { - $image = mosAdminMenus::ImageCheck( 'printButton.png', '/images/M_images/', NULL, NULL, JText::_( 'Print' ), JText::_( 'Print' ) ); - } else { - $image = JText::_( 'ICON_SEP' ) .' '. JText::_( 'Print' ) .' '. JText::_( 'ICON_SEP' ); - } - - if ( $params->get( 'popup' ) && !$hide_js ) { - // Print Preview button - used when viewing page - ?> - - - - - - - '. JText::_( 'Writable' ) .''; + $unwriteable = ''. JText::_( 'Unwritable' ) .''; + + echo ''; + echo ''; + echo $text; + if ( $visible ) { + echo $folder . '/'; + } + echo ''; + echo ''; + if ( $relative ) { + echo is_writable( "../$folder" ) ? $writeable : $unwriteable; + } else { + echo is_writable( "$folder" ) ? $writeable : $unwriteable; + } + echo ''; + echo ''; + } + + /** + * Legacy function, deprecated + * + * @deprecated As of version 1.5 + */ + function monthSelectList( $tag_name, $tag_attribs, $selected ) + { + $arr = array( + mosHTML::makeOption( '01', JText::_( 'JANUARY_SHORT' ) ), + mosHTML::makeOption( '02', JText::_( 'FEBRUARY_SHORT' ) ), + mosHTML::makeOption( '03', JText::_( 'MARCH_SHORT' ) ), + mosHTML::makeOption( '04', JText::_( 'APRIL_SHORT' ) ), + mosHTML::makeOption( '05', JText::_( 'MAY_SHORT' ) ), + mosHTML::makeOption( '06', JText::_( 'JUNE_SHORT' ) ), + mosHTML::makeOption( '07', JText::_( 'JULY_SHORT' ) ), + mosHTML::makeOption( '08', JText::_( 'AUGUST_SHORT' ) ), + mosHTML::makeOption( '09', JText::_( 'SEPTEMBER_SHORT' ) ), + mosHTML::makeOption( '10', JText::_( 'OCTOBER_SHORT' ) ), + mosHTML::makeOption( '11', JText::_( 'NOVEMBER_SHORT' ) ), + mosHTML::makeOption( '12', JText::_( 'DECEMBER_SHORT' ) ) + ); + + return mosHTML::selectList( $arr, $tag_name, $tag_attribs, 'value', 'text', $selected ); + } + + /** + * Legacy function, deprecated + * + * @deprecated As of version 1.5 + */ + function treeSelectList( &$src_list, $src_id, $tgt_list, $tag_name, $tag_attribs, $key, $text, $selected ) + { + + // establish the hierarchy of the menu + $children = array(); + // first pass - collect children + foreach ($src_list as $v ) { + $pt = $v->parent; + $list = @$children[$pt] ? $children[$pt] : array(); + array_push( $list, $v ); + $children[$pt] = $list; + } + // second pass - get an indent list of the items + $ilist = JHTML::_('menu.treerecurse', 0, '', array(), $children ); + + // assemble menu items to the array + $this_treename = ''; + foreach ($ilist as $item) { + if ($this_treename) { + if ($item->id != $src_id && strpos( $item->treename, $this_treename ) === false) { + $tgt_list[] = mosHTML::makeOption( $item->id, $item->treename ); + } + } else { + if ($item->id != $src_id) { + $tgt_list[] = mosHTML::makeOption( $item->id, $item->treename ); + } else { + $this_treename = "$item->treename/"; + } + } + } + // build the html select list + return mosHTML::selectList( $tgt_list, $tag_name, $tag_attribs, $key, $text, $selected ); + } + + /** + * Legacy function, deprecated + * + * @deprecated As of version 1.5 + */ + function yesnoSelectList( $tag_name, $tag_attribs, $selected, $yes='yes', $no='no' ) + { + $arr = array( + mosHTML::makeOption( 0, JText::_( $no ) ), + mosHTML::makeOption( 1, JText::_( $yes ) ), + ); + + return mosHTML::selectList( $arr, $tag_name, $tag_attribs, 'value', 'text', (int) $selected ); + } + + /** + * Legacy function, use {@link JHTML::_('grid.id')} instead + * + * @deprecated As of version 1.5 + */ + function idBox( $rowNum, $recId, $checkedOut=false, $name='cid' ) + { + return JHTML::_('grid.id', $rowNum, $recId, $checkedOut, $name); + } + + /** + * Legacy function, deprecated + * + * @deprecated As of version 1.5 + */ + function sortIcon( $text, $base_href, $field, $state='none' ) + { + $alts = array( + 'none' => JText::_( 'No Sorting' ), + 'asc' => JText::_( 'Sort Ascending' ), + 'desc' => JText::_( 'Sort Descending' ), + ); + + $next_state = 'asc'; + if ($state == 'asc') { + $next_state = 'desc'; + } else if ($state == 'desc') { + $next_state = 'none'; + } + + if ($state == 'none') { + $img = ''; + } else { + $img = "\"{$alts[$next_state]}\""; + } + + $html = "" + . JText::_( $text ) + . '  ' + . $img + . ""; + + return $html; + } + + /** + * Legacy function, deprecated + * + * @deprecated As of version 1.5 + */ + function CloseButton ( &$params, $hide_js=NULL ) + { + + // displays close button in Pop-up window + if ( $params->get( 'popup' ) && !$hide_js ) { + ?> +
+ + '; + echo '', "'"), '', $_SERVER['HTTP_REFERER']) .'">'. JText::_( 'BACK' ) .''; + echo ''; + } + ?> +
+ get( 'back_button' ) && !$params->get( 'popup' ) && !$hide_js) { + ?> +
+ + +
+ get( 'print' ) && !$hide_js ) { + // use default settings if none declared + if ( !$status ) { + $status = 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no'; + } + + // checks template image directory for image, if non found default are loaded + if ( $params->get( 'icons' ) ) { + $image = mosAdminMenus::ImageCheck( 'printButton.png', '/images/M_images/', NULL, NULL, JText::_( 'Print' ), JText::_( 'Print' ) ); + } else { + $image = JText::_( 'ICON_SEP' ) .' '. JText::_( 'Print' ) .' '. JText::_( 'ICON_SEP' ); + } + + if ( $params->get( 'popup' ) && !$hide_js ) { + // Print Preview button - used when viewing page + ?> + + + + + + + setTitle()} instead or override in your application class - * - * @since 1.5 - * @deprecated As of version 1.5 - */ - function setPageTitle( $title=null ) - { - $document=& JFactory::getDocument(); - $document->setTitle($title); - } - - /** - * Deprecated, use {@link JDocument::getTitle() JDocument->getTitle()} instead or override in your application class - * @since 1.5 - * @deprecated As of version 1.5 - */ - function getPageTitle() - { - $document=& JFactory::getDocument(); - return $document->getTitle(); - } +setTitle()} instead or override in your application class + * + * @since 1.5 + * @deprecated As of version 1.5 + */ + function setPageTitle( $title=null ) + { + $document=& JFactory::getDocument(); + $document->setTitle($title); + } + + /** + * Deprecated, use {@link JDocument::getTitle() JDocument->getTitle()} instead or override in your application class + * @since 1.5 + * @deprecated As of version 1.5 + */ + function getPageTitle() + { + $document=& JFactory::getDocument(); + return $document->getTitle(); + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy/mambot.php b/oss/joomla/trunk/plugins/system/legacy/mambot.php index 35d8ad26..36c7b7d4 100644 --- a/oss/joomla/trunk/plugins/system/legacy/mambot.php +++ b/oss/joomla/trunk/plugins/system/legacy/mambot.php @@ -1,60 +1,60 @@ -reorder( $where ); - } - - /** - * Legacy Method, use {@link JTable::publish()} instead - * @deprecated As of 1.0.3 - */ - function publish_array( $cid=null, $publish=1, $user_id=0 ) - { - $this->publish( $cid, $publish, $user_id ); - } +reorder( $where ); + } + + /** + * Legacy Method, use {@link JTable::publish()} instead + * @deprecated As of 1.0.3 + */ + function publish_array( $cid=null, $publish=1, $user_id=0 ) + { + $this->publish( $cid, $publish, $user_id ); + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy/mambothandler.php b/oss/joomla/trunk/plugins/system/legacy/mambothandler.php index 74f28a60..57db6d53 100644 --- a/oss/joomla/trunk/plugins/system/legacy/mambothandler.php +++ b/oss/joomla/trunk/plugins/system/legacy/mambothandler.php @@ -1,82 +1,82 @@ -trigger()} instead and handle return values - * in your code - * - * @param string The event name - * @since 1.5 - * @deprecated As of 1.5 - */ - function call($event) - { - $args = & func_get_args(); - array_shift($args); - - $retArray = $this->trigger( $event, $args ); - return $retArray[0]; - } +trigger()} instead and handle return values + * in your code + * + * @param string The event name + * @since 1.5 + * @deprecated As of 1.5 + */ + function call($event) + { + $args = & func_get_args(); + array_shift($args); + + $retArray = $this->trigger( $event, $args ); + return $retArray[0]; + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy/menu.php b/oss/joomla/trunk/plugins/system/legacy/menu.php index e50fae4f..9bf78010 100644 --- a/oss/joomla/trunk/plugins/system/legacy/menu.php +++ b/oss/joomla/trunk/plugins/system/legacy/menu.php @@ -1,60 +1,60 @@ -reorder( $where ); - } - - /** - * Legacy Method, use {@link JTable::publish()} instead - * @deprecated As of 1.0.3 - */ - function publish_array( $cid=null, $publish=1, $user_id=0 ) - { - $this->publish( $cid, $publish, $user_id ); - } +reorder( $where ); + } + + /** + * Legacy Method, use {@link JTable::publish()} instead + * @deprecated As of 1.0.3 + */ + function publish_array( $cid=null, $publish=1, $user_id=0 ) + { + $this->publish( $cid, $publish, $user_id ); + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy/menubar.php b/oss/joomla/trunk/plugins/system/legacy/menubar.php index 49924640..3d30cf2b 100644 --- a/oss/joomla/trunk/plugins/system/legacy/menubar.php +++ b/oss/joomla/trunk/plugins/system/legacy/menubar.php @@ -1,76 +1,76 @@ -reorder( $where ); - } - - /** - * Legacy Method, use {@link JTable::publish()} instead - * @deprecated As of 1.0.3 - */ - function publish_array( $cid=null, $publish=1, $user_id=0 ) - { - $this->publish( $cid, $publish, $user_id ); - } +reorder( $where ); + } + + /** + * Legacy Method, use {@link JTable::publish()} instead + * @deprecated As of 1.0.3 + */ + function publish_array( $cid=null, $publish=1, $user_id=0 ) + { + $this->publish( $cid, $publish, $user_id ); + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy/mysql.php b/oss/joomla/trunk/plugins/system/legacy/mysql.php index 86e83181..6c69a435 100644 --- a/oss/joomla/trunk/plugins/system/legacy/mysql.php +++ b/oss/joomla/trunk/plugins/system/legacy/mysql.php @@ -1,80 +1,80 @@ - $host, 'user' => $user, 'password' => $password, 'database' => $database, 'prefix' => $prefix ); - parent::__construct( $options ); - } - - /** - * This global function loads the first row of a query into an object - * - * If an object is passed to this function, the returned row is bound to the existing elements of object. - * If object has a value of null, then all of the returned query fields returned in the object. - * - * @param object The address of variable - */ - function loadObject( &$object ) - { - if ($object != null) - { - if (!($cur = $this->query())) { - return false; - } - - if ($array = mysql_fetch_assoc( $cur )) - { - mysql_free_result( $cur ); - mosBindArrayToObject( $array, $object, null, null, false ); - return true; - } else { - return false; - } - - } - else - { - $object = parent::loadObject(); - return $object; - } - } - - /** - * Execute a batch query - * - * @abstract - * @access public - * @return mixed A database resource if successful, FALSE if not. - */ - function query_batch( $abort_on_error=true, $p_transaction_safe = false) - { - return parent::queryBatch( $abort_on_error, $p_transaction_safe); - } + $host, 'user' => $user, 'password' => $password, 'database' => $database, 'prefix' => $prefix ); + parent::__construct( $options ); + } + + /** + * This global function loads the first row of a query into an object + * + * If an object is passed to this function, the returned row is bound to the existing elements of object. + * If object has a value of null, then all of the returned query fields returned in the object. + * + * @param object The address of variable + */ + function loadObject( &$object ) + { + if ($object != null) + { + if (!($cur = $this->query())) { + return false; + } + + if ($array = mysql_fetch_assoc( $cur )) + { + mysql_free_result( $cur ); + mosBindArrayToObject( $array, $object, null, null, false ); + return true; + } else { + return false; + } + + } + else + { + $object = parent::loadObject(); + return $object; + } + } + + /** + * Execute a batch query + * + * @abstract + * @access public + * @return mixed A database resource if successful, FALSE if not. + */ + function query_batch( $abort_on_error=true, $p_transaction_safe = false) + { + return parent::queryBatch( $abort_on_error, $p_transaction_safe); + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy/mysqli.php b/oss/joomla/trunk/plugins/system/legacy/mysqli.php index d245588f..2fb74081 100644 --- a/oss/joomla/trunk/plugins/system/legacy/mysqli.php +++ b/oss/joomla/trunk/plugins/system/legacy/mysqli.php @@ -1,80 +1,80 @@ - $host, 'user' => $user, 'password' => $password, 'database' => $database, 'prefix' => $prefix ); - parent::__construct( $options ); - } - - /** - * This global function loads the first row of a query into an object - * - * If an object is passed to this function, the returned row is bound to the existing elements of object. - * If object has a value of null, then all of the returned query fields returned in the object. - * - * @param object The address of variable - */ - function loadObject( &$object ) - { - if ($object != null) - { - if (!($cur = $this->query())) { - return false; - } - - if ($array = mysqli_fetch_assoc( $cur )) - { - mysqli_free_result( $cur ); - mosBindArrayToObject( $array, $object, null, null, false ); - return true; - } else { - return false; - } - - } - else - { - $object = parent::loadObject(); - return $object; - } - } - - /** - * Execute a batch query - * - * @abstract - * @access public - * @return mixed A database resource if successful, FALSE if not. - */ - function query_batch( $abort_on_error=true, $p_transaction_safe = false) - { - return parent::queryBatch( $abort_on_error, $p_transaction_safe); - } + $host, 'user' => $user, 'password' => $password, 'database' => $database, 'prefix' => $prefix ); + parent::__construct( $options ); + } + + /** + * This global function loads the first row of a query into an object + * + * If an object is passed to this function, the returned row is bound to the existing elements of object. + * If object has a value of null, then all of the returned query fields returned in the object. + * + * @param object The address of variable + */ + function loadObject( &$object ) + { + if ($object != null) + { + if (!($cur = $this->query())) { + return false; + } + + if ($array = mysqli_fetch_assoc( $cur )) + { + mysqli_free_result( $cur ); + mosBindArrayToObject( $array, $object, null, null, false ); + return true; + } else { + return false; + } + + } + else + { + $object = parent::loadObject(); + return $object; + } + } + + /** + * Execute a batch query + * + * @abstract + * @access public + * @return mixed A database resource if successful, FALSE if not. + */ + function query_batch( $abort_on_error=true, $p_transaction_safe = false) + { + return parent::queryBatch( $abort_on_error, $p_transaction_safe); + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy/pagination.php b/oss/joomla/trunk/plugins/system/legacy/pagination.php index e8bc7202..a9067b78 100644 --- a/oss/joomla/trunk/plugins/system/legacy/pagination.php +++ b/oss/joomla/trunk/plugins/system/legacy/pagination.php @@ -1,137 +1,137 @@ -getLimitBox(); - * - * @deprecated as of 1.5 - */ - function writeLimitBox($link = null) { - echo $this->getLimitBox(); - } - - /** - * Writes the counter string - * Use: print $pagination->getLimitBox(); - * - * @deprecated as of 1.5 - */ - function writePagesCounter() { - return $this->getPagesCounter(); - } - - /** - * Writes the page list string - * Use: print $pagination->getPagesLinks(); - * - * @deprecated as of 1.5 - */ - function writePagesLinks($link = null) { - return $this->getPagesLinks(); - } - - /** - * Writes the html for the leafs counter, eg, Page 1 of x - * Use: print $pagination->getPagesCounter(); - * - * @deprecated as of 1.5 - */ - function writeLeafsCounter() { - return $this->getPagesCounter(); - } - - /** - * Returns the pagination offset at an index - * Use: $pagination->getRowOffset($index); instead - * - * @deprecated as of 1.5 - */ - function rowNumber($index) { - return $index +1 + $this->limitstart; - } - - /** - * Return the icon to move an item UP - * - * @deprecated as of 1.5 - */ - function orderUpIcon2($id, $order, $condition = true, $task = 'orderup', $alt = '#') - { - // handling of default value - if ($alt = '#') { - $alt = JText::_('Move Up'); - } - - if ($order == 0) { - $img = 'uparrow0.png'; - } else { - if ($order < 0) { - $img = 'uparrow-1.png'; - } else { - $img = 'uparrow.png'; - } - } - $output = ''; - $output .= ''.$alt.''; - - return $output; - } - - /** - * Return the icon to move an item DOWN - * - * @deprecated as of 1.5 - */ - function orderDownIcon2($id, $order, $condition = true, $task = 'orderdown', $alt = '#') - { - // handling of default value - if ($alt = '#') { - $alt = JText::_('Move Down'); - } - - if ($order == 0) { - $img = 'downarrow0.png'; - } else { - if ($order < 0) { - $img = 'downarrow-1.png'; - } else { - $img = 'downarrow.png'; - } - } - $output = ''; - $output .= ''.$alt.''; - - return $output; - } -} +getLimitBox(); + * + * @deprecated as of 1.5 + */ + function writeLimitBox($link = null) { + echo $this->getLimitBox(); + } + + /** + * Writes the counter string + * Use: print $pagination->getLimitBox(); + * + * @deprecated as of 1.5 + */ + function writePagesCounter() { + return $this->getPagesCounter(); + } + + /** + * Writes the page list string + * Use: print $pagination->getPagesLinks(); + * + * @deprecated as of 1.5 + */ + function writePagesLinks($link = null) { + return $this->getPagesLinks(); + } + + /** + * Writes the html for the leafs counter, eg, Page 1 of x + * Use: print $pagination->getPagesCounter(); + * + * @deprecated as of 1.5 + */ + function writeLeafsCounter() { + return $this->getPagesCounter(); + } + + /** + * Returns the pagination offset at an index + * Use: $pagination->getRowOffset($index); instead + * + * @deprecated as of 1.5 + */ + function rowNumber($index) { + return $index +1 + $this->limitstart; + } + + /** + * Return the icon to move an item UP + * + * @deprecated as of 1.5 + */ + function orderUpIcon2($id, $order, $condition = true, $task = 'orderup', $alt = '#') + { + // handling of default value + if ($alt = '#') { + $alt = JText::_('Move Up'); + } + + if ($order == 0) { + $img = 'uparrow0.png'; + } else { + if ($order < 0) { + $img = 'uparrow-1.png'; + } else { + $img = 'uparrow.png'; + } + } + $output = ''; + $output .= ''.$alt.''; + + return $output; + } + + /** + * Return the icon to move an item DOWN + * + * @deprecated as of 1.5 + */ + function orderDownIcon2($id, $order, $condition = true, $task = 'orderdown', $alt = '#') + { + // handling of default value + if ($alt = '#') { + $alt = JText::_('Move Down'); + } + + if ($order == 0) { + $img = 'downarrow0.png'; + } else { + if ($order < 0) { + $img = 'downarrow-1.png'; + } else { + $img = 'downarrow.png'; + } + } + $output = ''; + $output .= ''.$alt.''; + + return $output; + } +} ?> \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy/parameters.php b/oss/joomla/trunk/plugins/system/legacy/parameters.php index 4d98716a..e610cec7 100644 --- a/oss/joomla/trunk/plugins/system/legacy/parameters.php +++ b/oss/joomla/trunk/plugins/system/legacy/parameters.php @@ -1,94 +1,94 @@ -toObject()} instead - * - * @deprecated As of version 1.5 - */ - function toObject() - { - parent::toObject(); - } - - /** - * Legacy function, use {@link JParameter::toArray() JParameter->toArray()} instead - * - * @deprecated As of version 1.5 - */ - function toArray() - { - parent::toArray(); - } - - /** - * Parse an .ini string, based on phpDocumentor phpDocumentor_parse_ini_file function - * - * @access public - * @param mixed The ini string or array of lines - * @param boolean add an associative index for each section [in brackets] - * @return object - */ - function parse($txt, $process_sections = false, $asArray = false) - { - $this->loadINI($txt); - - if($asArray) { - return $this->toArray(); - } - - return $this->toObject( ); - } - - /** - * Special handling for textarea param - */ - function textareaHandling( &$txt ) - { - $total = count( $txt ); - for( $i=0; $i < $total; $i++ ) { - if ( strstr( $txt[$i], "\n" ) ) { - $txt[$i] = str_replace( "\n", '
', $txt[$i] ); - } - } - $txt = implode( "\n", $txt ); - - return $txt; - } +toObject()} instead + * + * @deprecated As of version 1.5 + */ + function toObject() + { + parent::toObject(); + } + + /** + * Legacy function, use {@link JParameter::toArray() JParameter->toArray()} instead + * + * @deprecated As of version 1.5 + */ + function toArray() + { + parent::toArray(); + } + + /** + * Parse an .ini string, based on phpDocumentor phpDocumentor_parse_ini_file function + * + * @access public + * @param mixed The ini string or array of lines + * @param boolean add an associative index for each section [in brackets] + * @return object + */ + function parse($txt, $process_sections = false, $asArray = false) + { + $this->loadINI($txt); + + if($asArray) { + return $this->toArray(); + } + + return $this->toObject( ); + } + + /** + * Special handling for textarea param + */ + function textareaHandling( &$txt ) + { + $total = count( $txt ); + for( $i=0; $i < $total; $i++ ) { + if ( strstr( $txt[$i], "\n" ) ) { + $txt[$i] = str_replace( "\n", '
', $txt[$i] ); + } + } + $txt = implode( "\n", $txt ); + + return $txt; + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy/patfactory.php b/oss/joomla/trunk/plugins/system/legacy/patfactory.php index c4275d33..8aefcf62 100644 --- a/oss/joomla/trunk/plugins/system/legacy/patfactory.php +++ b/oss/joomla/trunk/plugins/system/legacy/patfactory.php @@ -1,61 +1,61 @@ -readTemplatesFromFile( 'page.html' ); - $tmpl->applyInputFilter('ShortModifiers'); - - // load the stock templates - if (is_array( $files )) { - foreach ($files as $file) - { - $tmpl->readTemplatesFromInput( $file ); - } - } - - // TODO: Do the protocol better - $tmpl->addVar( 'form', 'formAction', basename(str_replace(array('"', '<', '>', "'"), '', $_SERVER["PHP_SELF"])) ); - $tmpl->addVar( 'form', 'formName', 'adminForm' ); - - $tmpl->setRoot( dirname( __FILE__ ) . '/tmpl'); - $tmpl->setNamespace( 'mos' ); - - if ($bodyHtml) { - $tmpl->setAttribute( 'body', 'src', $bodyHtml ); - } - return $tmpl; - } -} +readTemplatesFromFile( 'page.html' ); + $tmpl->applyInputFilter('ShortModifiers'); + + // load the stock templates + if (is_array( $files )) { + foreach ($files as $file) + { + $tmpl->readTemplatesFromInput( $file ); + } + } + + // TODO: Do the protocol better + $tmpl->addVar( 'form', 'formAction', basename(str_replace(array('"', '<', '>', "'"), '', $_SERVER["PHP_SELF"])) ); + $tmpl->addVar( 'form', 'formName', 'adminForm' ); + + $tmpl->setRoot( dirname( __FILE__ ) . '/tmpl'); + $tmpl->setNamespace( 'mos' ); + + if ($bodyHtml) { + $tmpl->setAttribute( 'body', 'src', $bodyHtml ); + } + return $tmpl; + } +} diff --git a/oss/joomla/trunk/plugins/system/legacy/profiler.php b/oss/joomla/trunk/plugins/system/legacy/profiler.php index c75e1e6d..273d2adf 100644 --- a/oss/joomla/trunk/plugins/system/legacy/profiler.php +++ b/oss/joomla/trunk/plugins/system/legacy/profiler.php @@ -1,38 +1,38 @@ -reorder( $where ); - } - - /** - * Legacy Method, use {@link JTable::publish()} instead - * @deprecated As of 1.0.3 - */ - function publish_array( $cid=null, $publish=1, $user_id=0 ) - { - $this->publish( $cid, $publish, $user_id ); - } +reorder( $where ); + } + + /** + * Legacy Method, use {@link JTable::publish()} instead + * @deprecated As of 1.0.3 + */ + function publish_array( $cid=null, $publish=1, $user_id=0 ) + { + $this->publish( $cid, $publish, $user_id ); + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy/session.php b/oss/joomla/trunk/plugins/system/legacy/session.php index d0149b3f..9a7a7d78 100644 --- a/oss/joomla/trunk/plugins/system/legacy/session.php +++ b/oss/joomla/trunk/plugins/system/legacy/session.php @@ -1,105 +1,105 @@ -getCfg('secret') . $value . $_SERVER['REMOTE_ADDR'] ); - } - - /** - * Set the information to allow a session to persist - */ - function persist() - { - global $mainframe; - - $usercookie = mosGetParam( $_COOKIE, 'usercookie', null ); - if ($usercookie) { - // Remember me cookie exists. Login with usercookie info. - $mainframe->login( $usercookie['username'], $usercookie['password'] ); - } - } - - /** - * Legacy Method, use {@link JTable::reorder()} instead - * @deprecated As of 1.5 - */ - function updateOrder( $where='' ) - { - return $this->reorder( $where ); - } - - /** - * Legacy Method, use {@link JTable::publish()} instead - * @deprecated As of 1.0.3 - */ - function publish_array( $cid=null, $publish=1, $user_id=0 ) - { - $this->publish( $cid, $publish, $user_id ); - } - - /** - * Legacy Method, use {@link JTable::publish()} instead - * @deprecated As of 1.5 - */ - function setFromRequest( $key, $varName, $default=null ) - { - if (isset( $_REQUEST[$varName] )) { - return $_SESSION[$key] = $_REQUEST[$varName]; - } else if (isset( $_SESSION[$key] )) { - return $_SESSION[$key]; - } else { - return $_SESSION[$key] = $default; - } - } +getCfg('secret') . $value . $_SERVER['REMOTE_ADDR'] ); + } + + /** + * Set the information to allow a session to persist + */ + function persist() + { + global $mainframe; + + $usercookie = mosGetParam( $_COOKIE, 'usercookie', null ); + if ($usercookie) { + // Remember me cookie exists. Login with usercookie info. + $mainframe->login( $usercookie['username'], $usercookie['password'] ); + } + } + + /** + * Legacy Method, use {@link JTable::reorder()} instead + * @deprecated As of 1.5 + */ + function updateOrder( $where='' ) + { + return $this->reorder( $where ); + } + + /** + * Legacy Method, use {@link JTable::publish()} instead + * @deprecated As of 1.0.3 + */ + function publish_array( $cid=null, $publish=1, $user_id=0 ) + { + $this->publish( $cid, $publish, $user_id ); + } + + /** + * Legacy Method, use {@link JTable::publish()} instead + * @deprecated As of 1.5 + */ + function setFromRequest( $key, $varName, $default=null ) + { + if (isset( $_REQUEST[$varName] )) { + return $_SESSION[$key] = $_REQUEST[$varName]; + } else if (isset( $_SESSION[$key] )) { + return $_SESSION[$key]; + } else { + return $_SESSION[$key] = $default; + } + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/legacy/toolbar.php b/oss/joomla/trunk/plugins/system/legacy/toolbar.php index 5eeee217..2297b239 100644 --- a/oss/joomla/trunk/plugins/system/legacy/toolbar.php +++ b/oss/joomla/trunk/plugins/system/legacy/toolbar.php @@ -1,318 +1,318 @@ -addStyleSheet( 'templates/system/css/toolbar.css' ); - ?> - - - - - setQuery( $sql ); - $cur_template = $db->loadResult(); - - $alt = JText::_( 'Preview' ); - $image = JHTML::_('image.site', 'preview_f2.png', 'images/', NULL, NULL, $alt ); - ?> - - - - - - - - - - - - - -
- - - - - - - - - - - - - -   
- +addStyleSheet( 'templates/system/css/toolbar.css' ); + ?> + + + + + setQuery( $sql ); + $cur_template = $db->loadResult(); + + $alt = JText::_( 'Preview' ); + $image = JHTML::_('image.site', 'preview_f2.png', 'images/', NULL, NULL, $alt ); + ?> + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +   
+ diff --git a/oss/joomla/trunk/plugins/system/legacy/user.php b/oss/joomla/trunk/plugins/system/legacy/user.php index 6588610b..c1d1d394 100644 --- a/oss/joomla/trunk/plugins/system/legacy/user.php +++ b/oss/joomla/trunk/plugins/system/legacy/user.php @@ -1,108 +1,108 @@ -reorder( $where ); - } - - /** - * Legacy Method, use {@link JTable::publish()} instead - * @deprecated As of 1.0.3 - */ - function publish_array( $cid=null, $publish=1, $user_id=0 ) - { - $this->publish( $cid, $publish, $user_id ); - } - - /** - * Returns a complete user list - * - * @return array - * @deprecated As of 1.5 - */ - function getUserList() - { - $this->_db->setQuery("SELECT username FROM #__users"); - return $this->_db->loadAssocList(); - } - - /** - * Gets the users from a group - * - * @param string The value for the group - * @param string The name for the group - * @param string If RECURSE, will drill into child groups - * @param string Ordering for the list - * @return array - * @deprecated As of 1.5 - */ - function getUserListFromGroup( $value, $name, $recurse='NO_RECURSE', $order='name' ) - { - $acl =& JFactory::getACL(); - - // Change back in - $group_id = $acl->get_group_id( $value, $name, 'ARO'); - $objects = $acl->get_group_objects( $group_id, 'ARO', 'RECURSE'); - - if (isset( $objects['users'] )) - { - $gWhere = '(id =' . implode( ' OR id =', $objects['users'] ) . ')'; - - $query = 'SELECT id AS value, name AS text' - . ' FROM #__users' - . ' WHERE block = "0"' - . ' AND ' . $gWhere - . ' ORDER BY '. $order - ; - $this->_db->setQuery( $query ); - $options = $this->_db->loadObjectList(); - return $options; - } else { - return array(); - } - } +reorder( $where ); + } + + /** + * Legacy Method, use {@link JTable::publish()} instead + * @deprecated As of 1.0.3 + */ + function publish_array( $cid=null, $publish=1, $user_id=0 ) + { + $this->publish( $cid, $publish, $user_id ); + } + + /** + * Returns a complete user list + * + * @return array + * @deprecated As of 1.5 + */ + function getUserList() + { + $this->_db->setQuery("SELECT username FROM #__users"); + return $this->_db->loadAssocList(); + } + + /** + * Gets the users from a group + * + * @param string The value for the group + * @param string The name for the group + * @param string If RECURSE, will drill into child groups + * @param string Ordering for the list + * @return array + * @deprecated As of 1.5 + */ + function getUserListFromGroup( $value, $name, $recurse='NO_RECURSE', $order='name' ) + { + $acl =& JFactory::getACL(); + + // Change back in + $group_id = $acl->get_group_id( $value, $name, 'ARO'); + $objects = $acl->get_group_objects( $group_id, 'ARO', 'RECURSE'); + + if (isset( $objects['users'] )) + { + $gWhere = '(id =' . implode( ' OR id =', $objects['users'] ) . ')'; + + $query = 'SELECT id AS value, name AS text' + . ' FROM #__users' + . ' WHERE block = "0"' + . ' AND ' . $gWhere + . ' ORDER BY '. $order + ; + $this->_db->setQuery( $query ); + $options = $this->_db->loadObjectList(); + return $options; + } else { + return array(); + } + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/log.php b/oss/joomla/trunk/plugins/system/log.php index 86491770..0ba53cb5 100644 --- a/oss/joomla/trunk/plugins/system/log.php +++ b/oss/joomla/trunk/plugins/system/log.php @@ -1,74 +1,74 @@ -addEntry($errorlog); - } break; - - case JAUTHENTICATE_STATUS_FAILURE : - { - $errorlog['status'] = $response['type'] . " FAILURE: "; - $errorlog['comment'] = $response['error_message']; - $log->addEntry($errorlog); - } break; - - default : - { - $errorlog['status'] = $response['type'] . " UNKNOWN ERROR: "; - $errorlog['comment'] = $response['error_message']; - $log->addEntry($errorlog); - } break; - } - } +addEntry($errorlog); + } break; + + case JAUTHENTICATE_STATUS_FAILURE : + { + $errorlog['status'] = $response['type'] . " FAILURE: "; + $errorlog['comment'] = $response['error_message']; + $log->addEntry($errorlog); + } break; + + default : + { + $errorlog['status'] = $response['type'] . " UNKNOWN ERROR: "; + $errorlog['comment'] = $response['error_message']; + $log->addEntry($errorlog); + } break; + } + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/log.xml b/oss/joomla/trunk/plugins/system/log.xml index 139dbf56..b01c073b 100644 --- a/oss/joomla/trunk/plugins/system/log.xml +++ b/oss/joomla/trunk/plugins/system/log.xml @@ -3,7 +3,7 @@ System - Log Joomla! Project April 2007 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/system/remember.php b/oss/joomla/trunk/plugins/system/remember.php index a29da61c..e94659d7 100644 --- a/oss/joomla/trunk/plugins/system/remember.php +++ b/oss/joomla/trunk/plugins/system/remember.php @@ -1,77 +1,77 @@ -isAdmin()) { - return; - } - - $user = &JFactory::getUser(); - if (!$user->get('gid')) - { - jimport('joomla.utilities.utility'); - $hash = JUtility::getHash('JLOGIN_REMEMBER'); - - if ($str = JRequest::getString($hash, '', 'cookie', JREQUEST_ALLOWRAW | JREQUEST_NOTRIM)) - { - jimport('joomla.utilities.simplecrypt'); - - //Create the encryption key, apply extra hardening using the user agent string - $key = JUtility::getHash(@$_SERVER['HTTP_USER_AGENT']); - - $crypt = new JSimpleCrypt($key); - $str = $crypt->decrypt($str); - - $options = array(); - $options['silent'] = true; - if (!$mainframe->login(@unserialize($str), $options)) { - // Clear the remember me cookie - setcookie( JUtility::getHash('JLOGIN_REMEMBER'), false, time() - 86400, '/' ); - } - } - } - } +isAdmin()) { + return; + } + + $user = &JFactory::getUser(); + if (!$user->get('gid')) + { + jimport('joomla.utilities.utility'); + $hash = JUtility::getHash('JLOGIN_REMEMBER'); + + if ($str = JRequest::getString($hash, '', 'cookie', JREQUEST_ALLOWRAW | JREQUEST_NOTRIM)) + { + jimport('joomla.utilities.simplecrypt'); + + //Create the encryption key, apply extra hardening using the user agent string + $key = JUtility::getHash(@$_SERVER['HTTP_USER_AGENT']); + + $crypt = new JSimpleCrypt($key); + $str = $crypt->decrypt($str); + + $options = array(); + $options['silent'] = true; + if (!$mainframe->login(@unserialize($str), $options)) { + // Clear the remember me cookie + setcookie( JUtility::getHash('JLOGIN_REMEMBER'), false, time() - 86400, '/' ); + } + } + } + } } \ No newline at end of file diff --git a/oss/joomla/trunk/plugins/system/remember.xml b/oss/joomla/trunk/plugins/system/remember.xml index 3a2e01da..22fbb7be 100644 --- a/oss/joomla/trunk/plugins/system/remember.xml +++ b/oss/joomla/trunk/plugins/system/remember.xml @@ -3,7 +3,7 @@ System - Remember Me Joomla! Project April 2007 - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org diff --git a/oss/joomla/trunk/plugins/system/sef.php b/oss/joomla/trunk/plugins/system/sef.php index 3fe9d914..bbf78a82 100644 --- a/oss/joomla/trunk/plugins/system/sef.php +++ b/oss/joomla/trunk/plugins/system/sef.php @@ -1,106 +1,124 @@ -getName() != 'site') { - return true; - } - - //Replace src links - $base = JURI::base(true).'/'; - $buffer = JResponse::getBody(); - - $regex = '#href="index.php\?([^"]*)#m'; - $buffer = preg_replace_callback( $regex, array('plgSystemSEF', 'route'), $buffer ); - - $protocols = '[a-zA-Z0-9]+:'; //To check for all unknown protocals (a protocol must contain at least one alpahnumeric fillowed by : - $regex = '#(src|href)="(?!/|'.$protocols.'|\#|\')([^"]*)"#m'; - $buffer = preg_replace($regex, "$1=\"$base\$2\"", $buffer); - $regex = '#(onclick="window.open\(\')(?!/|'.$protocols.'|\#)([^/]+[^\']*?\')#m'; - $buffer = preg_replace($regex, '$1'.$base.'$2', $buffer); - - // ONMOUSEOVER / ONMOUSEOUT - $regex = '#(onmouseover|onmouseout)="this.src=([\']+)(?!/|'.$protocols.'|\#|\')([^"]+)"#m'; - $buffer = preg_replace($regex, '$1="this.src=$2'. $base .'$3$4"', $buffer); - - // Background image - $regex = '#style\s*=\s*[\'\"](.*):\s*url\s*\([\'\"]?(?!/|'.$protocols.'|\#)([^\)\'\"]+)[\'\"]?\)#m'; - $buffer = preg_replace($regex, 'style="$1: url(\''. $base .'$2$3\')', $buffer); - - // OBJECT -- fix it only inside the tag - $regex = '#(]\s*value\s*=\s*"(?!/|'.$protocols.'|\#|\')([^"]*)"#m'; - $buffer = preg_replace($regex, '$1name="$2" value="' . $base . '$3"', $buffer); - - // OBJECT -- fix it only inside the tag - $regex = '#(]*)value\s*=\s*"(?!/|'.$protocols.'|\#|\')([^"]*)"\s*name\s*=\s*"(movie|src|url)"#m'; - $buffer = preg_replace($regex, ' -- fix it only inside the tag + $regex = '#(]\s*value\s*=\s*"(?!/|'.$protocols.'|\#|\')([^"]*)"#m'; + $buffer = preg_replace($regex, '$1name="$2" value="' . $base . '$3"', $buffer); + + // OBJECT -- fix it only inside the tag + $regex = '#(]*)value\s*=\s*"(?!/|'.$protocols.'|\#|\')([^"]*)"\s*name\s*=\s*"(movie|src|url)"#m'; + $buffer = preg_replace($regex, 'authorize('com_content', 'edit', 'content', 'all')) { - $xwhere = ''; - } else { - $xwhere = ' AND a.published = 1 AND b.published = 1'; - } - $gid = $user->get('aid', 0); - $access_check = ' AND a.access <= '.(int) $gid . - ' AND b.access <= '.(int) $gid; - // Query of categories within section - $query = 'SELECT a.id, a.title, a.section, ' . - ' CONCAT_WS(\'/\', a.title, b.title) AS catName' . - ' FROM #__categories AS a' . - ' LEFT JOIN #__sections AS b ON a.section = b.id' . - $xwhere. - $access_check; - $db = &JFactory::getDBO(); - $db->setQuery( $query ); - $categories = $db->loadObjectList(); - $structarray = array(); - - foreach( $categories AS $category ) { - if (intval($category->section) > 0) { - $blog = new xmlrpcval(array( - 'url' => new xmlrpcval(JURI::base(), $xmlrpcString), - 'blogid' => new xmlrpcval($category->id, $xmlrpcString), - 'blogName' => new xmlrpcval($category->catName, $xmlrpcString) - ), 'struct'); - array_push($structarray, $blog); - } - } - return new xmlrpcresp(new xmlrpcval( $structarray , $xmlrpcArray)); - } - - function getUserInfo($appkey, $username, $password) - { - global $xmlrpcerruser, $xmlrpcStruct; - - if(!plgXMLRPCBloggerHelper::authenticateUser($username, $password)) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_("Login Failed")); - } - - $user =& JFactory::getUser($username); - plgXMLRPCBloggerHelper::getUserAid( $user ); - - $struct = new xmlrpcval( - array( - 'nickname' => new xmlrpcval($user->get('username')), - 'userid' => new xmlrpcval($user->get('id')), - 'url' => new xmlrpcval(''), - 'email' => new xmlrpcval($user->get('email')), - 'lastname' => new xmlrpcval($user->get('name')), - 'firstname' => new xmlrpcval($user->get('name')) - ), $xmlrpcStruct); - - return new xmlrpcresp($struct); - } - - function getPost($appkey, $postid, $username, $password) - { - global $xmlrpcerruser, $xmlrpcI4, $xmlrpcInt, $xmlrpcBoolean, $xmlrpcDouble, $xmlrpcString, $xmlrpcDateTime, $xmlrpcBase64, $xmlrpcArray, $xmlrpcStruct, $xmlrpcValue; - - if(!plgXMLRPCBloggerHelper::authenticateUser($username, $password)) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_("Login Failed")); - } - - $user =& JFactory::getUser($username); - plgXMLRPCBloggerHelper::getUserAid( $user ); - - $db = &JFactory::getDBO(); - - $where = 'a.id = ' . (int) $postid; - - $canReadUnpublished = $user->authorize('com_content', 'edit', 'content', 'all'); - if ($canReadUnpublished) { - $publishedWhere = ''; - } else { - $publishedWhere = ' AND u.published = 1 AND b.published = 1'; - } - - $nullDate = $db->getNullDate(); - $date =& JFactory::getDate(); - $now = $date->toMySQL(); - - $query = 'SELECT a.title AS title,' - . ' a.created AS created,' - . ' a.introtext AS introtext,' - . ' a.fulltext AS ftext,' - . ' a.id AS id,' - . ' a.created_by AS created_by' - . ' FROM #__content AS a' - . ' INNER JOIN #__categories AS b ON b.id=a.catid' - . ' INNER JOIN #__sections AS u ON u.id = a.sectionid' - . ' WHERE '.$where - . $publishedWhere - . ' AND a.access <= '.(int) $user->get( 'aid' ) - . ' AND b.access <= '.(int) $user->get( 'aid' ) - . ' AND u.access <= '.(int) $user->get( 'aid' ) - . ' AND ( a.publish_up = '.$db->Quote($nullDate).' OR a.publish_up <= '.$db->Quote($now).' )' - . ' AND ( a.publish_down = '.$db->Quote($nullDate).' OR a.publish_down >= '.$db->Quote($now).' )' - ; - - $db->setQuery( $query ); - $item = $db->loadObject(); - - if ($item === null) { - return new xmlrpcresp(0, $xmlrpcerruser+2, JText::_("Access Denied")); - } - - $content = ''.$item->title.''; - $content .= $item->introtext.''.$item->ftext.''; - - $struct = new xmlrpcval( - array( - 'userid' => new xmlrpcval($item->created_by), - 'dateCreated' => new xmlrpcval($item->created), - 'content' => new xmlrpcval($content), - 'postid' => new xmlrpcval($item->id) - ), $xmlrpcStruct); - - return new xmlrpcresp($struct); - } - - function newPost($appkey, $blogid, $username, $password, $content, $publish) - { - global $xmlrpcerruser, $xmlrpcI4, $xmlrpcInt, $xmlrpcBoolean, $xmlrpcDouble, $xmlrpcString, $xmlrpcDateTime, $xmlrpcBase64, $xmlrpcArray, $xmlrpcStruct, $xmlrpcValue; - - if(!plgXMLRPCBloggerHelper::authenticateUser($username, $password)) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_("Login Failed")); - } - - $user =& JFactory::getUser($username); - plgXMLRPCBloggerHelper::getUserAid( $user ); - - if ($user->get('gid') < 19) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('ALERTNOTAUTH')); - } - - // Create a user access object for the user - $access = new stdClass(); - $access->canEdit = $user->authorize('com_content', 'edit', 'content', 'all'); - $access->canEditOwn = $user->authorize('com_content', 'edit', 'content', 'own'); - $access->canPublish = $user->authorize('com_content', 'publish', 'content', 'all'); - - if (!($access->canEdit || $access->canEditOwn)) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('ALERTNOTAUTH')); - } - - $db =& JFactory::getDBO(); - - // load plugin params info - $plugin =& JPluginHelper::getPlugin('xmlrpc','blogger'); - $params = new JParameter( $plugin->params ); - - $blogid = (int) $blogid; - - // load the category - $cat =& JTable::getInstance('category'); - $cat->load($blogid); - - // create a new content item - $item =& JTable::getInstance('content'); - - $item->title = plgXMLRPCBloggerHelper::getPostTitle($content); - $item->introtext = plgXMLRPCBloggerHelper::getPostIntroText($content); - $item->fulltext = plgXMLRPCBloggerHelper::getPostFullText($content); - - $item->catid = $blogid; - $item->sectionid = $cat->section; - - $date =& JFactory::getDate(); - - $item->created = $date->toMySQL(); - $item->created_by = $user->get('id'); - - $item->publish_up = $date->toMySQL(); - $item->publish_down = $db->getNullDate(); - - $item->state = ($publish && $access->canPublish) ? 1 : 0; - - if (!$item->check()) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Post check failed') ); - } - - $item->version++; - - if (!$item->store()) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Post store failed') ); - } - - return new xmlrpcresp(new xmlrpcval($item->id, $xmlrpcString)); - } - - function editPost($appkey, $postid, $username, $password, $content, $publish) - { - global $xmlrpcerruser, $xmlrpcI4, $xmlrpcInt, $xmlrpcBoolean, $xmlrpcDouble, $xmlrpcString, $xmlrpcDateTime, $xmlrpcBase64, $xmlrpcArray, $xmlrpcStruct, $xmlrpcValue; - - if(!plgXMLRPCBloggerHelper::authenticateUser($username, $password)) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_("Login Failed")); - } - - $user =& JFactory::getUser($username); - plgXMLRPCBloggerHelper::getUserAid( $user ); - - // Create a user access object for the user - $access = new stdClass(); - $access->canEdit = $user->authorize('com_content', 'edit', 'content', 'all'); - $access->canEditOwn = $user->authorize('com_content', 'edit', 'content', 'own'); - $access->canPublish = $user->authorize('com_content', 'publish', 'content', 'all'); - - if (!($access->canEdit || $access->canEditOwn)) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('ALERTNOTAUTH')); - } - - // load the row from the db table - $item =& JTable::getInstance('content'); - if(!$item->load( $postid )) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Sorry, no such post') ); - } - - if($item->isCheckedOut($user->get('id'))) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Sorry, post is already being edited') ); - } - - //lock the item - $item->checkout($user->id); - - $item->title = plgXMLRPCBloggerHelper::getPostTitle($content); - $item->introtext = plgXMLRPCBloggerHelper::getPostIntroText($content); - $item->fulltext = plgXMLRPCBloggerHelper::getPostFullText($content); - - if (!$item->check()) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Post check failed') ); - } - - $item->version++; - - if (!$item->store()) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Post store failed') ); - } - - $item->state = ($publish && $access->canPublish) ? 1 : 0; - - //lock the item - $item->checkout(); - - return new xmlrpcresp(new xmlrpcval('true', $xmlrpcBoolean)); - } - - function deletePost($appkey, $postid, $username, $password, $publish) - { - global $xmlrpcerruser, $xmlrpcI4, $xmlrpcInt, $xmlrpcBoolean, $xmlrpcDouble, $xmlrpcString, $xmlrpcDateTime, $xmlrpcBase64, $xmlrpcArray, $xmlrpcStruct, $xmlrpcValue; - - if(!plgXMLRPCBloggerHelper::authenticateUser($username, $password)) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_("Login Failed")); - } - - $user =& JFactory::getUser($username); - plgXMLRPCBloggerHelper::getUserAid( $user ); - - if ($user->get('gid') < 23) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('ALERTNOTAUTH')); - } - - // load the row from the db table - $item =& JTable::getInstance('content'); - if(!$item->load( $postid )) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Sorry, no such post') ); - } - - if($item->isCheckedOut($user->get('id'))) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Sorry, post is already being edited') ); - } - - //lock the item - $item->checkout(); - - $item->state = -2; - $item->ordering = 0; - - if (!$item->store()) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Post delete failed') ); - } - - return new xmlrpcresp(new xmlrpcval('true', $xmlrpcBoolean)); - } - - - /** - * Blogger API - blogger.getRecentPosts - * - * @param xmlrpcmessage XML-RPC message passed to the method - * @return xmlrpcresp XML-RPC response - */ - function getRecentPosts($appkey, $blogid, $username, $password, $numposts) - { - global $xmlrpcerruser, $xmlrpcI4, $xmlrpcInt, $xmlrpcBoolean, $xmlrpcDouble, $xmlrpcString, $xmlrpcDateTime, $xmlrpcBase64, $xmlrpcArray, $xmlrpcStruct, $xmlrpcValue; - - if(!plgXMLRPCBloggerHelper::authenticateUser($username, $password)) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_("Login Failed")); - } - - $user =& JFactory::getUser($username); - plgXMLRPCBloggerHelper::getUserAid( $user ); - - // load plugin params info - $plugin =& JPluginHelper::getPlugin('xmlrpc','blogger'); - $params = new JParameter( $plugin->params ); - - $db =& JFactory::getDBO(); - - $nullDate = $db->getNullDate(); - $date =& JFactory::getDate(); - $now = $date->toMySQL(); - - $blogid = (int) $blogid; - - $canReadUnpublished = $user->authorize('com_content', 'edit', 'content', 'all'); - if ($canReadUnpublished) { - $publishedWhere = ''; - $publishTimeWhere = ''; - } else { - $publishedWhere = ' AND u.published = 1 AND b.published = 1'; - $publishTimeWhere = ' AND ( a.publish_up = '.$db->Quote($nullDate).' OR a.publish_up <= '.$db->Quote($now).' )' - . ' AND ( a.publish_down = '.$db->Quote($nullDate).' OR a.publish_down >= '.$db->Quote($now).' )'; - } - - $query = 'SELECT a.title AS title,' - . ' a.created AS created,' - . ' a.introtext AS introtext,' - . ' a.fulltext AS ftext,' - . ' a.id AS id,' - . ' a.created_by AS created_by' - . ' FROM #__content AS a' - . ' INNER JOIN #__categories AS b ON b.id=a.catid' - . ' INNER JOIN #__sections AS u ON u.id = a.sectionid' - . ' WHERE a.catid = '. $blogid - . $publishedWhere - . ' AND a.access <= '.(int) $user->get( 'aid' ) - . ' AND b.access <= '.(int) $user->get( 'aid' ) - . ' AND u.access <= '.(int) $user->get( 'aid' ) - . $publishTimeWhere - ; - - $db->setQuery($query, 0, $numposts); - $items = $db->loadObjectList(); - - if ($items === null) { - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('No posts available, or an error has occured.') ); - } - - $structArray = array(); - foreach ($items as $item) - { - $content = ''.$item->title.''; - $content .= $item->introtext.''.$item->ftext.''; - - $structArray[] = new xmlrpcval(array( - 'userid' => new xmlrpcval($item->created_by), - 'dateCreated' => new xmlrpcval($item->created), - 'content' => new xmlrpcval($content), - 'postid' => new xmlrpcval($item->id) - ), 'struct'); - } - - return new xmlrpcresp(new xmlrpcval( $structArray , $xmlrpcArray)); - } - - function getTemplate($appkey, $blogid, $username, $password, $templateType) - { - global $xmlrpcerruser; - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Method not implemented') ); - } - - function setTemplate($appkey, $blogid, $username, $password, $template, $templateType) - { - global $xmlrpcerruser; - return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Method not implemented') ); - } -} - -class plgXMLRPCBloggerHelper -{ - function getUserAid( &$user ) { - - $acl = &JFactory::getACL(); - - //Get the user group from the ACL - $grp = $acl->getAroGroup($user->get('id')); - - // Mark the user as logged in - $user->set('guest', 0); - $user->set('aid', 1); - - // Fudge Authors, Editors, Publishers and Super Administrators into the special access group - if ($acl->is_group_child_of($grp->name, 'Registered') || - $acl->is_group_child_of($grp->name, 'Public Backend')) { - $user->set('aid', 2); - } - } - - function authenticateUser($username, $password) - { - // Get the global JAuthentication object - jimport( 'joomla.user.authentication'); - $auth = & JAuthentication::getInstance(); - $credentials = array( 'username' => $username, 'password' => $password ); - $options = array(); - $response = $auth->authenticate($credentials, $options); - return $response->status === JAUTHENTICATE_STATUS_SUCCESS; - } - - function getPostTitle($content) - { - $title = ''; - if ( preg_match('/(.+?)<\/title>/is', $content, $matchtitle) ) - { - $title = $matchtitle[0]; - $title = preg_replace('/<title>/si', '', $title); - $title = preg_replace('/<\/title>/si', '', $title); - } - if (empty( $title )) { - $title = substr( $content, 0, 20 ); - } - return $title; - } - - function getPostCategory($content) - { - $category = 0; - - $match = array(); - if ( preg_match('/<category>(.+?)<\/category>/is', $content, $match) ) - { - $category = trim($match[1], ','); - $category = explode(',', $category); - } - - return $category; - } - - function getPostIntroText($content) - { - return plgXMLRPCBloggerHelper::removePostData($content); //substr($string, 0, strpos($string, '<more_text>')); - } - - function getPostFullText($content) - { - $match = array(); - if ( preg_match('/<more_text>(.+?)<\/more_text>/is', $content, $match) ) - { - $fulltext = $match[0]; - $fulltext = preg_replace('/<more_text>/si', '', $fulltext); - $fulltext = preg_replace('/<\/more_text>/si', '', $fulltext); - } - - return $fulltext; - } - - function removePostData($content) - { - $content = preg_replace('/<title>(.+?)<\/title>/si', '', $content); - $content = preg_replace('/<category>(.+?)<\/category>/si', '', $content); - $content = preg_replace('/<more_text>(.+?)<\/more_text>/si', '', $content); - $content = trim($content); - return $content; - } -} +<?php +/** + * @version $Id: blogger.php 14401 2010-01-26 14:10:00Z louis $ + * @package Joomla + * @copyright Copyright (C) 2005 - 2010 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( 'Restricted access' ); + +jimport( 'joomla.plugin.plugin' ); + +class plgXMLRPCBlogger extends JPlugin +{ + function plgXMLRPCBlogger(&$subject, $config) + { + parent::__construct($subject, $config); + $this->loadLanguage( '', JPATH_ADMINISTRATOR ); + } + + /** + * @return array An array of associative arrays defining the available methods + */ + function onGetWebServices() + { + global $xmlrpcI4, $xmlrpcInt, $xmlrpcBoolean, $xmlrpcDouble, $xmlrpcString, $xmlrpcDateTime, $xmlrpcBase64, $xmlrpcArray, $xmlrpcStruct, $xmlrpcValue; + + return array + ( + 'blogger.getUsersBlogs' => array( + 'function' => 'plgXMLRPCBloggerServices::getUserBlogs', + 'docstring' => JText::_('Returns a list of weblogs to which an author has posting privileges.'), + 'signature' => array(array($xmlrpcArray, $xmlrpcString, $xmlrpcString, $xmlrpcString )) + ), + 'blogger.getUserInfo' => array( + 'function' => 'plgXMLRPCBloggerServices::getUserInfo', + 'docstring' => JText::_('Returns information about an author in the system.'), + 'signature' => array(array($xmlrpcStruct, $xmlrpcString, $xmlrpcString, $xmlrpcString)) + ), + 'blogger.getPost' => array( + 'function' => 'plgXMLRPCBloggerServices::getPost', + 'docstring' => JText::_('Returns information about a specific post.'), + 'signature' => array(array($xmlrpcStruct, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)) + ), + 'blogger.getRecentPosts' => array( + 'function' => 'plgXMLRPCBloggerServices::getRecentPosts', + 'docstring' => JText::_('Returns a list of the most recent posts in the system.'), + 'signature' => array(array($xmlrpcArray, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcInt)) + ), + 'blogger.getTemplate' => array( + 'function' => 'plgXMLRPCBloggerServices::getTemplate', + 'docstring' => '', + 'signature' => array(array($xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)) + ), + 'blogger.setTemplate' => array( + 'function' => 'plgXMLRPCBloggerServices::setTemplate', + 'docstring' => '', + 'signature' => array(array($xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)) + ), + 'blogger.newPost' => array( + 'function' => 'plgXMLRPCBloggerServices::newPost', + 'docstring' => JText::_('Creates a new post, and optionally publishes it.'), + 'signature' => array(array($xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcBoolean)) + ), + 'blogger.deletePost' => array( + 'function' => 'plgXMLRPCBloggerServices::deletePost', + 'docstring' => JText::_('Deletes a post.'), + 'signature' => array(array($xmlrpcBoolean, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcBoolean)) + ), + 'blogger.editPost' => array( + 'function' => 'plgXMLRPCBloggerServices::editPost', + 'docstring' => JText::_('Updates the information about an existing post.'), + 'signature' => array(array($xmlrpcBoolean, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcBoolean)) + ) + ); + } +} + +class plgXMLRPCBloggerServices +{ + /* + * Note : blogger.getUsersBlogs will make more sense once we support multiple blogs + */ + function getUserBlogs($appkey, $username, $password) + { + global $mainframe, $xmlrpcerruser, $xmlrpcI4, $xmlrpcInt, $xmlrpcBoolean, $xmlrpcDouble, $xmlrpcString, $xmlrpcDateTime, $xmlrpcBase64, $xmlrpcArray, $xmlrpcStruct, $xmlrpcValue; + + if(!plgXMLRPCBloggerHelper::authenticateUser($username, $password)) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_("Login Failed")); + } + + $user =& JFactory::getUser($username); + plgXMLRPCBloggerHelper::getUserAid( $user ); + + // Handle the access permissions part of the main database query + if ($user->authorize('com_content', 'edit', 'content', 'all')) { + $xwhere = ''; + } else { + $xwhere = ' AND a.published = 1 AND b.published = 1'; + } + $gid = $user->get('aid', 0); + $access_check = ' AND a.access <= '.(int) $gid . + ' AND b.access <= '.(int) $gid; + // Query of categories within section + $query = 'SELECT a.id, a.title, a.section, ' . + ' CONCAT_WS(\'/\', a.title, b.title) AS catName' . + ' FROM #__categories AS a' . + ' LEFT JOIN #__sections AS b ON a.section = b.id' . + $xwhere. + $access_check; + $db = &JFactory::getDBO(); + $db->setQuery( $query ); + $categories = $db->loadObjectList(); + $structarray = array(); + + foreach( $categories AS $category ) { + if (intval($category->section) > 0) { + $blog = new xmlrpcval(array( + 'url' => new xmlrpcval(JURI::base(), $xmlrpcString), + 'blogid' => new xmlrpcval($category->id, $xmlrpcString), + 'blogName' => new xmlrpcval($category->catName, $xmlrpcString) + ), 'struct'); + array_push($structarray, $blog); + } + } + return new xmlrpcresp(new xmlrpcval( $structarray , $xmlrpcArray)); + } + + function getUserInfo($appkey, $username, $password) + { + global $xmlrpcerruser, $xmlrpcStruct; + + if(!plgXMLRPCBloggerHelper::authenticateUser($username, $password)) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_("Login Failed")); + } + + $user =& JFactory::getUser($username); + plgXMLRPCBloggerHelper::getUserAid( $user ); + + $struct = new xmlrpcval( + array( + 'nickname' => new xmlrpcval($user->get('username')), + 'userid' => new xmlrpcval($user->get('id')), + 'url' => new xmlrpcval(''), + 'email' => new xmlrpcval($user->get('email')), + 'lastname' => new xmlrpcval($user->get('name')), + 'firstname' => new xmlrpcval($user->get('name')) + ), $xmlrpcStruct); + + return new xmlrpcresp($struct); + } + + function getPost($appkey, $postid, $username, $password) + { + global $xmlrpcerruser, $xmlrpcI4, $xmlrpcInt, $xmlrpcBoolean, $xmlrpcDouble, $xmlrpcString, $xmlrpcDateTime, $xmlrpcBase64, $xmlrpcArray, $xmlrpcStruct, $xmlrpcValue; + + if(!plgXMLRPCBloggerHelper::authenticateUser($username, $password)) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_("Login Failed")); + } + + $user =& JFactory::getUser($username); + plgXMLRPCBloggerHelper::getUserAid( $user ); + + $db = &JFactory::getDBO(); + + $where = 'a.id = ' . (int) $postid; + + $canReadUnpublished = $user->authorize('com_content', 'edit', 'content', 'all'); + if ($canReadUnpublished) { + $publishedWhere = ''; + } else { + $publishedWhere = ' AND u.published = 1 AND b.published = 1'; + } + + $nullDate = $db->getNullDate(); + $date =& JFactory::getDate(); + $now = $date->toMySQL(); + + $query = 'SELECT a.title AS title,' + . ' a.created AS created,' + . ' a.introtext AS introtext,' + . ' a.fulltext AS ftext,' + . ' a.id AS id,' + . ' a.created_by AS created_by' + . ' FROM #__content AS a' + . ' INNER JOIN #__categories AS b ON b.id=a.catid' + . ' INNER JOIN #__sections AS u ON u.id = a.sectionid' + . ' WHERE '.$where + . $publishedWhere + . ' AND a.access <= '.(int) $user->get( 'aid' ) + . ' AND b.access <= '.(int) $user->get( 'aid' ) + . ' AND u.access <= '.(int) $user->get( 'aid' ) + . ' AND ( a.publish_up = '.$db->Quote($nullDate).' OR a.publish_up <= '.$db->Quote($now).' )' + . ' AND ( a.publish_down = '.$db->Quote($nullDate).' OR a.publish_down >= '.$db->Quote($now).' )' + ; + + $db->setQuery( $query ); + $item = $db->loadObject(); + + if ($item === null) { + return new xmlrpcresp(0, $xmlrpcerruser+2, JText::_("Access Denied")); + } + + $content = '<title>'.$item->title.''; + $content .= $item->introtext.''.$item->ftext.''; + + $struct = new xmlrpcval( + array( + 'userid' => new xmlrpcval($item->created_by), + 'dateCreated' => new xmlrpcval($item->created), + 'content' => new xmlrpcval($content), + 'postid' => new xmlrpcval($item->id) + ), $xmlrpcStruct); + + return new xmlrpcresp($struct); + } + + function newPost($appkey, $blogid, $username, $password, $content, $publish) + { + global $xmlrpcerruser, $xmlrpcI4, $xmlrpcInt, $xmlrpcBoolean, $xmlrpcDouble, $xmlrpcString, $xmlrpcDateTime, $xmlrpcBase64, $xmlrpcArray, $xmlrpcStruct, $xmlrpcValue; + + if(!plgXMLRPCBloggerHelper::authenticateUser($username, $password)) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_("Login Failed")); + } + + $user =& JFactory::getUser($username); + plgXMLRPCBloggerHelper::getUserAid( $user ); + + if ($user->get('gid') < 19) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('ALERTNOTAUTH')); + } + + // Create a user access object for the user + $access = new stdClass(); + $access->canEdit = $user->authorize('com_content', 'edit', 'content', 'all'); + $access->canEditOwn = $user->authorize('com_content', 'edit', 'content', 'own'); + $access->canPublish = $user->authorize('com_content', 'publish', 'content', 'all'); + + if (!($access->canEdit || $access->canEditOwn)) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('ALERTNOTAUTH')); + } + + $db =& JFactory::getDBO(); + + // load plugin params info + $plugin =& JPluginHelper::getPlugin('xmlrpc','blogger'); + $params = new JParameter( $plugin->params ); + + $blogid = (int) $blogid; + + // load the category + $cat =& JTable::getInstance('category'); + $cat->load($blogid); + + // create a new content item + $item =& JTable::getInstance('content'); + + $item->title = plgXMLRPCBloggerHelper::getPostTitle($content); + $item->introtext = plgXMLRPCBloggerHelper::getPostIntroText($content); + $item->fulltext = plgXMLRPCBloggerHelper::getPostFullText($content); + + $item->catid = $blogid; + $item->sectionid = $cat->section; + + $date =& JFactory::getDate(); + + $item->created = $date->toMySQL(); + $item->created_by = $user->get('id'); + + $item->publish_up = $date->toMySQL(); + $item->publish_down = $db->getNullDate(); + + $item->state = ($publish && $access->canPublish) ? 1 : 0; + + if (!$item->check()) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Post check failed') ); + } + + $item->version++; + + if (!$item->store()) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Post store failed') ); + } + + return new xmlrpcresp(new xmlrpcval($item->id, $xmlrpcString)); + } + + function editPost($appkey, $postid, $username, $password, $content, $publish) + { + global $xmlrpcerruser, $xmlrpcI4, $xmlrpcInt, $xmlrpcBoolean, $xmlrpcDouble, $xmlrpcString, $xmlrpcDateTime, $xmlrpcBase64, $xmlrpcArray, $xmlrpcStruct, $xmlrpcValue; + + if(!plgXMLRPCBloggerHelper::authenticateUser($username, $password)) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_("Login Failed")); + } + + $user =& JFactory::getUser($username); + plgXMLRPCBloggerHelper::getUserAid( $user ); + + // Create a user access object for the user + $access = new stdClass(); + $access->canEdit = $user->authorize('com_content', 'edit', 'content', 'all'); + $access->canEditOwn = $user->authorize('com_content', 'edit', 'content', 'own'); + $access->canPublish = $user->authorize('com_content', 'publish', 'content', 'all'); + + if (!($access->canEdit || $access->canEditOwn)) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('ALERTNOTAUTH')); + } + + // load the row from the db table + $item =& JTable::getInstance('content'); + if(!$item->load( $postid )) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Sorry, no such post') ); + } + + if($item->isCheckedOut($user->get('id'))) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Sorry, post is already being edited') ); + } + + //lock the item + $item->checkout($user->id); + + $item->title = plgXMLRPCBloggerHelper::getPostTitle($content); + $item->introtext = plgXMLRPCBloggerHelper::getPostIntroText($content); + $item->fulltext = plgXMLRPCBloggerHelper::getPostFullText($content); + + if (!$item->check()) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Post check failed') ); + } + + $item->version++; + + if (!$item->store()) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Post store failed') ); + } + + $item->state = ($publish && $access->canPublish) ? 1 : 0; + + //lock the item + $item->checkout(); + + return new xmlrpcresp(new xmlrpcval('true', $xmlrpcBoolean)); + } + + function deletePost($appkey, $postid, $username, $password, $publish) + { + global $xmlrpcerruser, $xmlrpcI4, $xmlrpcInt, $xmlrpcBoolean, $xmlrpcDouble, $xmlrpcString, $xmlrpcDateTime, $xmlrpcBase64, $xmlrpcArray, $xmlrpcStruct, $xmlrpcValue; + + if(!plgXMLRPCBloggerHelper::authenticateUser($username, $password)) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_("Login Failed")); + } + + $user =& JFactory::getUser($username); + plgXMLRPCBloggerHelper::getUserAid( $user ); + + if ($user->get('gid') < 23) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('ALERTNOTAUTH')); + } + + // load the row from the db table + $item =& JTable::getInstance('content'); + if(!$item->load( $postid )) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Sorry, no such post') ); + } + + if($item->isCheckedOut($user->get('id'))) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Sorry, post is already being edited') ); + } + + //lock the item + $item->checkout(); + + $item->state = -2; + $item->ordering = 0; + + if (!$item->store()) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Post delete failed') ); + } + + return new xmlrpcresp(new xmlrpcval('true', $xmlrpcBoolean)); + } + + + /** + * Blogger API - blogger.getRecentPosts + * + * @param xmlrpcmessage XML-RPC message passed to the method + * @return xmlrpcresp XML-RPC response + */ + function getRecentPosts($appkey, $blogid, $username, $password, $numposts) + { + global $xmlrpcerruser, $xmlrpcI4, $xmlrpcInt, $xmlrpcBoolean, $xmlrpcDouble, $xmlrpcString, $xmlrpcDateTime, $xmlrpcBase64, $xmlrpcArray, $xmlrpcStruct, $xmlrpcValue; + + if(!plgXMLRPCBloggerHelper::authenticateUser($username, $password)) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_("Login Failed")); + } + + $user =& JFactory::getUser($username); + plgXMLRPCBloggerHelper::getUserAid( $user ); + + // load plugin params info + $plugin =& JPluginHelper::getPlugin('xmlrpc','blogger'); + $params = new JParameter( $plugin->params ); + + $db =& JFactory::getDBO(); + + $nullDate = $db->getNullDate(); + $date =& JFactory::getDate(); + $now = $date->toMySQL(); + + $blogid = (int) $blogid; + + $canReadUnpublished = $user->authorize('com_content', 'edit', 'content', 'all'); + if ($canReadUnpublished) { + $publishedWhere = ''; + $publishTimeWhere = ''; + } else { + $publishedWhere = ' AND u.published = 1 AND b.published = 1'; + $publishTimeWhere = ' AND ( a.publish_up = '.$db->Quote($nullDate).' OR a.publish_up <= '.$db->Quote($now).' )' + . ' AND ( a.publish_down = '.$db->Quote($nullDate).' OR a.publish_down >= '.$db->Quote($now).' )'; + } + + $query = 'SELECT a.title AS title,' + . ' a.created AS created,' + . ' a.introtext AS introtext,' + . ' a.fulltext AS ftext,' + . ' a.id AS id,' + . ' a.created_by AS created_by' + . ' FROM #__content AS a' + . ' INNER JOIN #__categories AS b ON b.id=a.catid' + . ' INNER JOIN #__sections AS u ON u.id = a.sectionid' + . ' WHERE a.catid = '. $blogid + . $publishedWhere + . ' AND a.access <= '.(int) $user->get( 'aid' ) + . ' AND b.access <= '.(int) $user->get( 'aid' ) + . ' AND u.access <= '.(int) $user->get( 'aid' ) + . $publishTimeWhere + ; + + $db->setQuery($query, 0, $numposts); + $items = $db->loadObjectList(); + + if ($items === null) { + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('No posts available, or an error has occured.') ); + } + + $structArray = array(); + foreach ($items as $item) + { + $content = ''.$item->title.''; + $content .= $item->introtext.''.$item->ftext.''; + + $structArray[] = new xmlrpcval(array( + 'userid' => new xmlrpcval($item->created_by), + 'dateCreated' => new xmlrpcval($item->created), + 'content' => new xmlrpcval($content), + 'postid' => new xmlrpcval($item->id) + ), 'struct'); + } + + return new xmlrpcresp(new xmlrpcval( $structArray , $xmlrpcArray)); + } + + function getTemplate($appkey, $blogid, $username, $password, $templateType) + { + global $xmlrpcerruser; + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Method not implemented') ); + } + + function setTemplate($appkey, $blogid, $username, $password, $template, $templateType) + { + global $xmlrpcerruser; + return new xmlrpcresp(0, $xmlrpcerruser+1, JText::_('Method not implemented') ); + } +} + +class plgXMLRPCBloggerHelper +{ + function getUserAid( &$user ) { + + $acl = &JFactory::getACL(); + + //Get the user group from the ACL + $grp = $acl->getAroGroup($user->get('id')); + + // Mark the user as logged in + $user->set('guest', 0); + $user->set('aid', 1); + + // Fudge Authors, Editors, Publishers and Super Administrators into the special access group + if ($acl->is_group_child_of($grp->name, 'Registered') || + $acl->is_group_child_of($grp->name, 'Public Backend')) { + $user->set('aid', 2); + } + } + + function authenticateUser($username, $password) + { + // Get the global JAuthentication object + jimport( 'joomla.user.authentication'); + $auth = & JAuthentication::getInstance(); + $credentials = array( 'username' => $username, 'password' => $password ); + $options = array(); + $response = $auth->authenticate($credentials, $options); + return $response->status === JAUTHENTICATE_STATUS_SUCCESS; + } + + function getPostTitle($content) + { + $title = ''; + if ( preg_match('/(.+?)<\/title>/is', $content, $matchtitle) ) + { + $title = $matchtitle[0]; + $title = preg_replace('/<title>/si', '', $title); + $title = preg_replace('/<\/title>/si', '', $title); + } + if (empty( $title )) { + $title = substr( $content, 0, 20 ); + } + return $title; + } + + function getPostCategory($content) + { + $category = 0; + + $match = array(); + if ( preg_match('/<category>(.+?)<\/category>/is', $content, $match) ) + { + $category = trim($match[1], ','); + $category = explode(',', $category); + } + + return $category; + } + + function getPostIntroText($content) + { + return plgXMLRPCBloggerHelper::removePostData($content); //substr($string, 0, strpos($string, '<more_text>')); + } + + function getPostFullText($content) + { + $match = array(); + if ( preg_match('/<more_text>(.+?)<\/more_text>/is', $content, $match) ) + { + $fulltext = $match[0]; + $fulltext = preg_replace('/<more_text>/si', '', $fulltext); + $fulltext = preg_replace('/<\/more_text>/si', '', $fulltext); + } + + return $fulltext; + } + + function removePostData($content) + { + $content = preg_replace('/<title>(.+?)<\/title>/si', '', $content); + $content = preg_replace('/<category>(.+?)<\/category>/si', '', $content); + $content = preg_replace('/<more_text>(.+?)<\/more_text>/si', '', $content); + $content = trim($content); + return $content; + } +} diff --git a/oss/joomla/trunk/plugins/xmlrpc/blogger.xml b/oss/joomla/trunk/plugins/xmlrpc/blogger.xml index 7537ced7..29baf560 100644 --- a/oss/joomla/trunk/plugins/xmlrpc/blogger.xml +++ b/oss/joomla/trunk/plugins/xmlrpc/blogger.xml @@ -4,7 +4,7 @@ <author>Joomla! Project</author> <creationDate>February 2006</creationDate> <copyright> - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. </copyright> <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license> <authorEmail>admin@joomla.org</authorEmail> diff --git a/oss/joomla/trunk/plugins/xmlrpc/joomla.php b/oss/joomla/trunk/plugins/xmlrpc/joomla.php index 3c49424a..3c248f76 100644 --- a/oss/joomla/trunk/plugins/xmlrpc/joomla.php +++ b/oss/joomla/trunk/plugins/xmlrpc/joomla.php @@ -1,111 +1,111 @@ -<?php -/** -* @version $Id: joomla.php 10381 2008-06-01 03:35:53Z pasamio $ -* @package Joomla -* @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( 'Restricted access' ); - -jimport('joomla.plugin.plugin'); - -/** - * Joomla! Base XML-RPC Plugin - * - * @package XML-RPC - * @since 1.5 - */ -class plgXMLRPCJoomla extends JPlugin -{ - - /** - * Constructor - * - * For php4 compatability we must not use the __constructor as a constructor for plugins - * because func_get_args ( void ) returns a copy of all passed arguments NOT references. - * This causes problems with cross-referencing necessary for the observer design pattern. - * - * @param object $subject The object to observe - * @param object $params The object that holds the plugin parameters - * @since 1.5 - */ - function plgXMLRPCJoomla(& $subject, $config) - { - parent::__construct($subject, $config); - } - - /** - * Get available web services for this plugin - * - * @access public - * @return array Array of web service descriptors - * @since 1.5 - */ - function onGetWebServices() - { - global $xmlrpcString; - - // Initialize variables - $services = array(); - - // Site search service - $services['joomla.searchSite'] = array( - 'function' => 'plgXMLRPCJoomlaServices::searchSite', - 'docstring' => 'Searches a remote site.', - 'signature' => array(array($xmlrpcString, $xmlrpcString, $xmlrpcString)) - ); - - return $services; - } -} - -class plgXMLRPCJoomlaServices -{ - /** - * Remote Search method - * - * The sql must return the following fields that are used in a common display - * routine: href, title, section, created, text, browsernav - * - * @param string Target search string - * @param string mathcing option, exact|any|all - * @param string ordering option, newest|oldest|popular|alpha|category - * @return array Search Results - * @since 1.5 - */ - function searchSite($searchword, $phrase='', $order='') - { - global $mainframe; - - // Initialize variables - $db =& JFactory::getDBO(); - - // Prepare arguments - $searchword = $db->getEscaped( trim( $searchword ) ); - $phrase = ''; - $ordering = ''; - - // Load search plugins and fire the onSearch event - JPluginHelper::importPlugin( 'search' ); - $results = $mainframe->triggerEvent( 'onSearch', array( $searchword, $phrase, $ordering ) ); - - // Iterate through results building the return array - require_once(JPATH_ADMINISTRATOR.DS.'components'.DS.'com_search'.DS.'helpers'.DS.'search.php'); - - foreach ($results as $i=>$rows) - { - foreach ($rows as $j=>$row) { - $results[$i][$j]->href = eregi('^(http|https)://', $row->href) ? $row->href : JURI::root().'/'.$row->href; - $results[$i][$j]->text = SearchHelper::prepareSearchContent( $row->text, 200, $searchword); - } - } - return $results; - } -} \ No newline at end of file +<?php +/** +* @version $Id: joomla.php 14401 2010-01-26 14:10:00Z louis $ +* @package Joomla +* @copyright Copyright (C) 2005 - 2010 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( 'Restricted access' ); + +jimport('joomla.plugin.plugin'); + +/** + * Joomla! Base XML-RPC Plugin + * + * @package XML-RPC + * @since 1.5 + */ +class plgXMLRPCJoomla extends JPlugin +{ + + /** + * Constructor + * + * For php4 compatability we must not use the __constructor as a constructor for plugins + * because func_get_args ( void ) returns a copy of all passed arguments NOT references. + * This causes problems with cross-referencing necessary for the observer design pattern. + * + * @param object $subject The object to observe + * @param object $params The object that holds the plugin parameters + * @since 1.5 + */ + function plgXMLRPCJoomla(& $subject, $config) + { + parent::__construct($subject, $config); + } + + /** + * Get available web services for this plugin + * + * @access public + * @return array Array of web service descriptors + * @since 1.5 + */ + function onGetWebServices() + { + global $xmlrpcString; + + // Initialize variables + $services = array(); + + // Site search service + $services['joomla.searchSite'] = array( + 'function' => 'plgXMLRPCJoomlaServices::searchSite', + 'docstring' => 'Searches a remote site.', + 'signature' => array(array($xmlrpcString, $xmlrpcString, $xmlrpcString)) + ); + + return $services; + } +} + +class plgXMLRPCJoomlaServices +{ + /** + * Remote Search method + * + * The sql must return the following fields that are used in a common display + * routine: href, title, section, created, text, browsernav + * + * @param string Target search string + * @param string mathcing option, exact|any|all + * @param string ordering option, newest|oldest|popular|alpha|category + * @return array Search Results + * @since 1.5 + */ + function searchSite($searchword, $phrase='', $order='') + { + global $mainframe; + + // Initialize variables + $db =& JFactory::getDBO(); + + // Prepare arguments + $searchword = $db->getEscaped( trim( $searchword ) ); + $phrase = ''; + $ordering = ''; + + // Load search plugins and fire the onSearch event + JPluginHelper::importPlugin( 'search' ); + $results = $mainframe->triggerEvent( 'onSearch', array( $searchword, $phrase, $ordering ) ); + + // Iterate through results building the return array + require_once(JPATH_ADMINISTRATOR.DS.'components'.DS.'com_search'.DS.'helpers'.DS.'search.php'); + + foreach ($results as $i=>$rows) + { + foreach ($rows as $j=>$row) { + $results[$i][$j]->href = preg_match('#^(http|https)://#i', $row->href) ? $row->href : JURI::root().'/'.$row->href; + $results[$i][$j]->text = SearchHelper::prepareSearchContent( $row->text, 200, $searchword); + } + } + return $results; + } +} diff --git a/oss/joomla/trunk/plugins/xmlrpc/joomla.xml b/oss/joomla/trunk/plugins/xmlrpc/joomla.xml index 57410662..e10ed56c 100644 --- a/oss/joomla/trunk/plugins/xmlrpc/joomla.xml +++ b/oss/joomla/trunk/plugins/xmlrpc/joomla.xml @@ -4,7 +4,7 @@ <author>Joomla! Project</author> <creationDate>November 2005</creationDate> <copyright> - Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. </copyright> <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license> <authorEmail>admin@joomla.org</authorEmail> diff --git a/oss/joomla/trunk/templates/beez/component.php b/oss/joomla/trunk/templates/beez/component.php new file mode 100644 index 00000000..78567a32 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/component.php @@ -0,0 +1,29 @@ +<?php +/** + * @copyright Copyright (C) 2005 - 2010 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( 'Restricted access' ); +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>"> +<head> + <jdoc:include type="head" /> + <link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/beez/css/template.css" type="text/css" /> + +<?php if($this->direction == 'rtl') : ?> + <link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/beez/css/template_rtl.css" type="text/css" /> +<?php endif; ?> +</head> +<body class="contentpane"> + <jdoc:include type="message" /> + <jdoc:include type="component" /> +</body> +</html> diff --git a/oss/joomla/trunk/templates/beez/css/general.css b/oss/joomla/trunk/templates/beez/css/general.css new file mode 100644 index 00000000..e2628bf7 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/css/general.css @@ -0,0 +1,206 @@ +/* -- form validation */ +.invalid { border-color: #ff0000; } +label.invalid { color: #ff0000; } + +/* -- buttons */ +#editor-xtd-buttons { + padding: 5px; +} + +.button2-left, +.button2-right, +.button2-left div, +.button2-right div { + float: left; +} + +.button2-left a, +.button2-right a, +.button2-left span, +.button2-right span { + display: block; + height: 22px; + float: left; + line-height: 22px; + font-size: 11px; + color: #666; + cursor: pointer; +} + +.button2-left span, +.button2-right span { + cursor: default; + color: #999; +} + +.button2-left .page a, +.button2-right .page a, +.button2-left .page span, +.button2-right .page span { + padding: 0 6px; +} + +.page span { + color: #000; + font-weight: bold; +} + +.button2-left a:hover, +.button2-right a:hover { + text-decoration: none; + color: #0B55C4; +} + +.button2-left a, +.button2-left span { + padding: 0 24px 0 6px; +} + +.button2-right a, +.button2-right span { + padding: 0 6px 0 24px; +} + +.button2-left { + background: url(../images_general/j_button2_left.png) no-repeat; + float: left; + margin-left: 5px; +} + +.button2-right { + background: url(../images_general/j_button2_right.png) 100% 0 no-repeat; + float: left; + margin-left: 5px; +} + +.button2-left .image { + background: url(../images_general/j_button2_image.png) 100% 0 no-repeat; +} + +.button2-left .readmore { + background: url(../images_general/j_button2_readmore.png) 100% 0 no-repeat; +} + +.button2-left .pagebreak { + background: url(../images_general/j_button2_pagebreak.png) 100% 0 no-repeat; +} + +/* Tooltips */ +div.tooltip { + float: left; + background: #ffc; + border: 1px solid #D4D5AA; + padding: 5px; + max-width: 200px; +} + +div.tooltip h4 { + padding: 0; + margin: 0; + font-size: 95%; + font-weight: bold; + margin-top: -15px; + padding-top: 15px; + padding-bottom: 5px; + background: url(../images_general/selector-arrow.png) no-repeat; +} + +div.tooltip p { + font-size: 90%; + margin: 0; +} + +/* Caption fixes */ +.img_caption.left { + float: left; + margin-right: 1em; +} + +.img_caption.right { + float: right; + margin-left: 1em; +} + +.img_caption.left p { + clear: left; + text-align: center; +} + +.img_caption.right p { + clear: right; + text-align: center; +} + +.img_caption.none { + margin-left:auto; + margin-right:auto; +} + +.img_caption { + text-align: center!important; +} + +.caption.left { + float: left; + margin-right: 1em; +} + +.caption.right { + float: right; + margin-left: 1em; +} + +.caption.left p { + clear: left; + text-align: center; +} + +.caption.right p { + clear: right; + text-align: center; +} + +.caption.none { + margin-left:auto; + margin-right:auto; +} + +.caption { + text-align: center!important; +} +/* Calendar */ +a img.calendar { + width: 16px; + height: 16px; + margin-left: 3px; + background: url(../images_general/calendar.png) no-repeat; + cursor: pointer; + vertical-align: middle; +} + +/* System Messages */ +#system-message +{ +margin:10px 0 20px 0; +padding: 0 !important; +background:#fff; +border:solid 0px; +} +#system-message dt { font-weight: bold; } +#system-message dd { margin: 0; font-weight: bold; text-indent: 0px;background:#fff;padding:0 } +#system-message dd ul { color: #93246F; margin-bottom: 10px; list-style: none; padding: 0px; border-top: 3px solid #93246F; border-bottom: 3px solid #93246F;} + +/* System Standard Messages */ +#system-message dt.message { display: none; } +#system-message dd.message { } +#system-message dd.message ul { background: #F2E3ED} + +/* System Error Messages */ +#system-message dt.error { display: none; } +#system-message dd.error { } +#system-message dd.error ul { color: #93246F; background: #F2E3ED ; border-top: 3px solid #93246F; border-bottom: 3px solid #93246F;margin:0} + +/* System Notice Messages */ +#system-message dt.notice { display: none; } +#system-message dd.notice { } +#system-message dd.notice ul { color: #93246F; background: #F2E3ED; border-top: 3px solid #93246F; border-bottom: 3px solid #93246F;} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/css/ie7only.css b/oss/joomla/trunk/templates/beez/css/ie7only.css new file mode 100644 index 00000000..c4b24fdf --- /dev/null +++ b/oss/joomla/trunk/templates/beez/css/ie7only.css @@ -0,0 +1,32 @@ +/** + * @version $Id: ie7only.css 14401 2010-01-26 14:10:00Z louis $ + * @author Design & Accessible Team ( Angie Radtke / Robert Deutz ) + * @package Joomla + * @subpackage Accessible-Template-Beez + * @copyright Copyright (C) 2005 - 2010 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. + */ + +.contentdescription {height:1%} + +#right form.poll +{ + /* nur fuer IE-Win; + * definierte groe�e (height or witdh) + * fuer automatisches einbeziehen + * der Float-Container (auto-clearing); + * + * verbergen IE-Mac \*/ + height: 1%; + /* ende verbergen IE-Mac */ +} + +form.login input +{ + margin:0 0 0 -10px +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/css/ieonly.css b/oss/joomla/trunk/templates/beez/css/ieonly.css new file mode 100644 index 00000000..7bcf6fbe --- /dev/null +++ b/oss/joomla/trunk/templates/beez/css/ieonly.css @@ -0,0 +1,102 @@ +/** + * @version $Id: ieonly.css 14401 2010-01-26 14:10:00Z louis $ + * @author Design & Accessible Team ( Angie Radtke / Robert Deutz ) + * @package Joomla + * @subpackage Accessible-Template-Beez + * @copyright Copyright (C) 2005 - 2010 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. + */ + + +#contentarea,#contentarea2 { width: expression(document . body . clientWidth > 980 ? "980px" : "auto"); } +#all { width: expression(document . body . clientWidth > 980 ? "980px" : "auto"); } +.leading ,#contentarea2, #main { zoom: 1; } +#all { padding: 0; } +#wrapper +{border:solid 0px; width:100%} +#main2 {height:550px; width:68%} +#main +{ + position: relative; + width: 98%; + margin: 0 0 0 22%; +} + +.article_row { zoom: 1; } + +.cols1 +{ + display: block !important; + width: 100%; +} + +#header +{ + width: auto; + border: solid 3px #fff; + height: 1%; +} + +#header form +{ + background: #CC3399; + width: 250px; + float: right; + height: 65px; + position: relative; + margin: 0 0px 0 -10px; +} + +#breadcrumbs +{ + background: #93246F; + height: 65px; + text-align: left; + padding-top: 5px; + margin: 0; +} + +.article_column { position: relative; } + +.cols2 +{ + width: 49%; + overflow: hidden; +} + +.blog_more ul { zoom: 1; } +form.search_result, form.registration, form.lost_password { zoom: 1; } +#right form.poll fieldset +{ margin: 0; } + +#right form.poll +{ + /* nur fuer IE-Win; + * definierte groe�e (height or witdh) + * fuer automatisches einbeziehen + * der Float-Container (auto-clearing); + * + * verbergen IE-Mac \*/ + height: 1%; + /* ende verbergen IE-Mac */ +} + +#right form.poll a , +#right form.poll .button { margin-top: 10px; } +.contentdescription { height: 1%; } +.contact form , .login_form , #page { zoom: 1; } +form.login input +{ + margin:0 0 0 -10px +} + +table.contenttoc +{font-size:1em !important;} + +table.contenttoc td , table.contenttoc th +{padding:3px !important } diff --git a/oss/joomla/trunk/templates/beez/css/index.html b/oss/joomla/trunk/templates/beez/css/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/css/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/css/layout.css b/oss/joomla/trunk/templates/beez/css/layout.css new file mode 100644 index 00000000..11e6aade --- /dev/null +++ b/oss/joomla/trunk/templates/beez/css/layout.css @@ -0,0 +1,1473 @@ +/** + * @version $Id: layout.css 14401 2010-01-26 14:10:00Z louis $ + * @author Design & Accessible Team ( Angie Radtke ) + * @package Joomla + * @subpackage Accessible-Template-Beez + * @copyright Copyright (C) 2005 - 2010 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. + */ +a:link,a:visited +{ + color:#000; +} + +a:hover,a:active,a:focus +{ + background:#000; + color:#FFF; +} + +h3 { + font-size:1.1em; + font-weight:bold; + margin:10px 0; +} + +h4 { + border:solid 0; + color:#000; + font-size:1em; +} + +input:focus { + border:solid 2px; +} + +fieldset { + border:0; +} + +ol.list { + list-style-position:inside; + margin:20px 0; + padding:0; +} + +ol.list li { + border-bottom:solid 1px #EFDEEA; + margin:10px 0; + padding:10px; + background:#FBF7FA; +} + +ol.list li h4 { + border-bottom:solid 0 #CCC; + color:#099; + display:inline; + margin:0 0 10px; +} + +p { + line-height:1.4em; + margin:5px 0; +} + +ul li a.u2:focus,p a.u2:active +{ + padding:0.5em; + background-color:#000; + color:#FFF; + display:inline; + height:2.5em; + left:0; + margin-top:0; + padding-left:15px; + position:absolute; + top:0; + width:13.8em; +} + +p.counter { + background:#EEE; + color:#000; + font-weight:bold; + margin:10px 0; + padding:5px; +} + +p.buttonheading { + text-align:right; +} + +.buttonheading img +{ + border:0; +} + +p.buttonheading a:link,p.buttonheading a:visited +{ + border:solid 2px #fff; +} + +.leading p.buttonheading a:link,.leading p.buttonheading a:visited +{ + border:solid 2px #EFDEEA; +} + +p.buttonheading a:hover +{ + background:none !important; + color:#000 !important; +} + +p.buttonheading a:active,p.buttonheading a:focus +{ + border:solid 2px; + color:#000; +} + +em +{ + font-weight:bold; +} + +/* ########### header content ############# */ +#header h1 +{ + font-size:1.5em; + font-weight:normal; + text-transform:uppercase; +} + +#logo +{ + font-size:1em !important; + font-weight:bold !important; + position:relative; + text-align:left; + text-transform:none !important; + z-index:0; + margin-top:1em; +} + +#logo img +{ + display:block; +} + +#logo span +{ + display:block; + margin:0 0 2px 100px !important; + border-bottom:solid 1px #666; +} + +/* Search box */ +#header form +{ + background:#C39; + border:solid 0 #000; + float:right; + height:5em; + min-width:240px; + text-align:left; + padding:0 0 0 20px; +} + +* html #header form +{ + height:65px; +} + +#header form fieldset +{ + border:0 solid #000; + display:inline; + float:left; + padding:19px; + text-align:left; + width:6em; +} + +#header form label +{ + color:#000; + position:absolute; + left:-3000px; + top:-200px; + width:auto; +} + +#header form .button +{ + background:url(../images/pfeil.gif) #000 no-repeat; + border:0; + color:#fff; + font-weight:bold; + margin:20px 10px 0 0; + padding:0px 5px 0px 30px; + cursor:pointer; +} + +#header form .inputbox +{ + background:#fff; + border:solid 2px #93246F; + font-weight:bold; + padding:0 0 0 2px; + margin:20px 10px 0 0 !important; + width:6em; +} + +#header form .inputbox:focus +{ + border:solid 2px #000; +} + +/* header Top-nav */ +#header #active_menu-nav +{ + background:#000; + color:#fff; +} + +#header ul +{ + background:#fff; + display:block; + margin:-7px 0 -2px; + padding:5px 0; + text-align:right; +} + +#header ul li +{ + background:#000; + color:#fff; + display:inline; + text-align:center; +} + +#header ul li a:link,#header ul li a:visited +{ + background:#fff; + color:#000; + font-weight:bold; + text-decoration:none; + border-right:solid 1px #666; + padding:5px 10px; + line-height:1.5em; +} + +#header ul li a:hover,#header ul li a:active,#header ul li a:focus +{ + background:#000; + color:#fff; + font-weight:bold; +} + +/* fontsize */ +#fontsize +{ + z-index:100; + position:absolute; + top:0; + right:0; + background:#fff; + color:#000; +} + +#fontsize h3,#fontsize p +{ + border:0; + display:inline; + font-size:1em; +} + +#fontsize p +{ + margin:0 0 0 5px; +} + +#fontsize p a +{ + font-weight:bold; + margin:0 5px; + display:inline; + padding:2px 0 2px 24px; +} + +/* background-images */ +#fontsize p a.larger { +background:#fff url(../images/lupe_larger.gif) no-repeat; +} + +#fontsize p a.smaller { +background:#fff url(../images/lupe_smaller.gif) no-repeat; +} + +#fontsize p a.reset { +background:#fff url(../images/lupe_reset.gif) no-repeat; +} + +#fontsize p a.larger:hover,#fontsize p a.larger:active,#fontsize p a.larger:focus { +background:#000 url(../images/lupe_larger_black.gif) no-repeat; +color:#fff; +} + +#fontsize p a.smaller:hover,#fontsize p a.smaller:active,#fontsize p a.smaller:focus { +background:#000 url(../images/lupe_smaller_black.gif) no-repeat; +color:#fff; +} + +#fontsize p a.reset:hover,#fontsize p a.reset:active,#fontsize p a.reset:focus { +background:#000 url(../images/lupe_reset_black.gif) no-repeat; +color:#fff; +} + +/* ################# breadcrumbs ################ */ +#breadcrumbs { +background:#93246F; +min-height:5em; +padding-top:0; +text-align:left; +color:#fff; +} + +#breadcrumbs p { +padding:5px; +display:inline; +} + +* html #breadcrumbs { +height:65px; +} + +#breadcrumbs a { +text-transform:none; +} + +#breadcrumbs a:link,#breadcrumbs a:visited { +background:#93246F; +color:#fff; +} + +#breadcrumbs span { +color:#fff; +font-size:0.9em; +padding:7px; +} + +#breadcrumbs span a:hover,#breadcrumbs span a:active,#breadcrumbs span a:focus { +background:#000; +color:#fff; +text-decoration:none; +} + +/* ################ left ######################## */ +#left form { +background:#EFDEEA; +color:#000; +font-size:0.9em; +margin:5px 0 20px 10px; +padding:20px 10px; +} + +#left h3,#right h3 { +color:#000; +font-family:trebuchet MS, sans-serif; +font-size:1.2em; +margin:0 0 0 5px; +padding:7px 5px 7px 10px; +border:solid 0; +} + +#left ul { +list-style-type:none; +margin:0 0 20px 10px; +} + + +#left ul li { +border:solid 1px #fff; +margin:0 0 2px; +} + +#left ul li a { +display:block; +padding:3px 4px 3px 10px; +text-decoration:none; +} + +#left ul li a:link,#left ul li a:visited { +background:#F2E3ED; +border-bottom:solid 1px #E0C1E0; +color:#000; +font-weight:normal; +} + +#left ul li a:hover,#left ul li a:active,#left ul li a:focus { +background:#333 !important; +color:#fff !important; +} + +/* ################## Main Menue ################## */ + +#left ul li ul { +background:#fff; +border:solid 1px #E0C1E0; +border-bottom:solid 0 #93246F; +border-left:solid 4px #93246F; +border-top:0; +margin:0; +} + +#left ul li ul li { +border:solid 1px #fff; +} + +#left ul li ul li { +margin:0; +} + +#left ul li ul li a:hover,#left ul li ul li a:active,#left ul li ul li a:focus { +background:#93246F; +color:#fff; +} + +#left ul li ul li ul { +border:solid 0 #E0C1E0; +padding:10px 0 10px 5px; +} + +#left ul li.active a:link,#left ul li.active a:visited { +background:#93246F; +border-left:solid 4px #BE7CA9; +color:#fff; +border-bottom:solid 1px #93246F; +padding:3px 0 3px 6px; +} + +#left ul li.active ul li a:link,#left ul li.active ul li a:visited { +background:#fff; +border-bottom:solid 1px #E0C1E0; +border-left:solid 0 #DD75BB; +color:#000; +font-weight:normal; +padding:3px 4px 3px 20px; +} + +#left ul li.active ul li ul li a:link,#left ul li.active ul li ul li a:visited { +background:#fff; +border-bottom:solid 1px #E0C1E0; +color:#000; +font-weight:normal; +margin:0 0 0 10px; +} + +#left ul li.active ul li.active a:link,#left ul li.active ul li.active a:visited { +background:#fff; +border-left:solid 0 #DD75BB; +color:#000; +font-weight:bold; +} + +#left ul li.active ul li.active ul li a:link,#left ul li.active ul li.active ul li a:visited { +background:url(../images/arrow.gif) #fff no-repeat top left; +color:#000; +font-weight:normal; +margin:0 0 0 15px; +padding:3px 0 3px 15px; +} + +#left ul li.active ul li.active ul li.active span.active_link { +background:url(../images/arrow.gif) #fff no-repeat top left; +border-bottom:solid 1px #E0C1E0; +color:#000; +font-weight:bold; +margin:0 0 0 15px; +padding:3px 0 3px 15px; +} + +#left form a:hover,#left form a:active,#left form a:focus { +color:#fff; +} + +/* ############### main * ########################### */ +/* position */ +.leading_separator { +border-bottom:solid 0 #333; +display:block; +height:10px; +margin:0; +} + +#main .leading h2,#main2 .leading h2 { +background:#EFDEEA; +border-bottom:solid 0 #333; +color:#93246F; +font-family:trebuchet MS, sans-serif; +font-size:1.4em; +font-weight:normal; +margin:0 0 10px; +text-transform:uppercase; +} + +#main h2 a,#main2 h2 a { +text-decoration:none; +} + +#main .leading .readon,#main2 .leading .readon { +background:url(../images/pfeil.gif) #93246F no-repeat; +border:solid 0; +bottom:0; +color:#FFF !important; +display:block !important; +margin-top:20px !important; +position:absolute; +right:0; +text-decoration:none; +padding:2px 2px 0 30px; +} + +#main .leading .small,#main .leading .modifydate,#main2 .leading .small,#main2 .leading .modifydate { +background:#EFDEEA; +color:#93246F; +} + +.article_column h2 { +background:#fff; +color:#000 !important; +font-family:trebuchet MS; +font-size:1.2em !important; +font-weight:bold !important; +padding:0; +} + +.article_row .column1 h2,.article_row .column2 h2 { +background:#fff; +border-bottom:solid 1px #D4A7C5; +color:#000; +margin:0 0 10px; +padding:5px 5px 5px 0; +} + +.article_row p.iteminfo { +background:#fff; +line-height:1em; +margin:0 -10px 5px; +padding:10px; +} + +#main h3,#main2 h3 { +margin:20px 0 10px; +} + +#main .blog_more h2,#main2 .blog_more h2 { +background:#fff; +color:#93246F; +font-family:trebuchet MS, sans-serif; +font-size:1.3em; +font-weight:normal; +margin:0; +} + +#main .blog_more li a,#main2 .blog_more li a { +display:inline; +margin:0; +padding:0; +} + +#main .blog_more li,#main2 .blog_more li { +padding:4px; +} + +#main .blog_more ul li a,#main2 .blog_more ul li a { +background:url(../images/pfeil.gif) no-repeat; +font-weight:bold; +padding:2px 0 4px 30px; +} + +#main .blog_more ul li a:hover,#main2 .blog_more ul li a:hover { +background:url(../images/pfeil.gif) #939 no-repeat !important; +color:#fff; +font-weight:bold; +padding:2px 0 2px 30px; +} + +#main .blog_more ul li a:active,#main2 .blog_more ul li a:active,#main .blog_more ul li a:focus,#main2 .blog_more ul li a:focus { +background:url(../images/pfeil.gif) #939 no-repeat !important; +color:#fff; +font-weight:bold; +padding:2px 0 2px 30px; +} + +#main .blog_more ul,#main2 .blog_more ul { +background:#eee; +border:solid 1px #ccc; +color:#000; +line-height:1.3em; +list-style-type:none; +margin:0; +padding:10px 10px 30px; +} + +#main .blog_more,#main2 .blog_more { +padding-top:10px; +} + +/* main generell */ +#main a.readon,#main2 a.readon { +background:url(../images/pfeil.gif) no-repeat; +font-weight:bold; +padding:2px 2px 0 30px; +display:inline-block; +} + +#main a.readon:hover,#main2 a.readon:hover,#main a.readon:active,#main2 a.readon:active,#main a.readon:focus,#main2 a.readon:focus { +background:url(../images/pfeil.gif) #000 no-repeat; +color:#fff; +padding:2px 2px 0 30px; +text-decoration:none; +} + +#main a:link,#main2 a:link,#main a:visited,#main2 a:visited { +color:#000; +} + +#main a:hover,#main2 a:hover,#main a:active,#main2 a:active,#main a:focus,#main2 a:focus { +background:#93246F; +color:#fff; +} + +#main h1,#main2 h1 { +color:#000; +font-family:trebuchet MS, sans-serif; +font-size:1.6em; +font-weight:normal; +margin:0; +} + +#main h2,#main2 h2 { +color:#93246F; +font-family:trebuchet MS, sans-serif; +font-size:1.6em; +font-weight:normal; +} + +#main ul li,#main2 ul li { +padding:0 0 0 10px; +line-height:1.4em; +margin:10px 0; +} + +#main ul,#main2 ul { +list-style-position:outside; +list-style-type:square; +padding:0 0 0 10px; +margin:0 0 0 20px; +} + +#main ul,#main ol { +list-style-position:inside; +margin:10px 0 10px 20px; +padding:0 0 0 10px; +} + +.small { +border:solid 0; +color:#932467; +font-size:0.85em; +margin:0 0 20px; +} + +.contentdescription { +padding:10px 0; +overflow:hidden; +} + +.image_left { +float:left; +border:solid 0 #ccc; +margin:0 10px 10px 0; +} + +.image_right { +float:right; +border:solid 1px #ccc; +margin:0 0 10px 10px; +} + +.wrap_image { +clear:left; +} + +.createdate { +color:#932467; +display:block; +font-size:0.85em; +} + +.createdby { +color:#932467; +display:block; +font-size:0.85em; +padding:0 0 0 2px; +} + +.modifydate { +color:#932467; +display:block; +font-size:0.85em; +padding:0; +} + +span.content_rating,.leading span.content_rating { +margin:10px 0 0; +display:block; +} + +.content_vote { +margin:0 0 10px; +display:block; +} + +.content_vote input { +margin:0 5px; +} + +.content_vote .button { +background:url(../images/pfeil.gif) #000 no-repeat; +border:0; +color:#fff; +font-weight:bold; +margin:20px 10px 0 0; +padding:0 0 0 30px; +cursor:pointer; +} + +/* ############# pagination ###################### */ +#main2 .pagination,#main .pagination { +border-top:solid 1px #CCC; +margin:10px 0 0; +padding:10px 0; +} + +ul.pagination { +list-style-type:none; +margin:0; +padding:0; +text-align:left; +} + +ul.pagination li { +display:inline; +padding:2px 5px 0; +text-align:left; +} + +ul.pagination li a { +padding:2px; +} + +/* ############### right ################# */ +#right .moduletable { +background:#fff; +color:#000; +margin:10px 0; +padding:10px; +} + +#right h3 { +background:#fff; +border-bottom:solid 1px #D4A7C5; +color:#333; +margin:0 0 3px; +padding:0 5px 0 0; +} + +#right h4 { +color:#000; +font-size:1em; +padding:10px 5px 0 0; +margin:0; +border:solid 0; +} + +#right ul { +border:solid 0 #ccc; +color:#000; +line-height:1.4em; +list-style-type:none; +margin:0; +padding:10px 10px 10px 0; +position:relative; +} + +#right ul li { +margin-bottom:4px; +} + +#right ul li a { +color:#000; +font-weight:normal; +padding:2px; +} + +#right ul li a:link,#right ul li a:visited { +color:#000; +} + +#right ul li a:hover,#right ul li a:active,#right ul li a:focus { +background:#93246F; +color:#fff; +} + +#right form.poll { +padding:10px 0 0; +} + +#right form.poll fieldset { +line-height:1.6em; +} + +#right form.poll fieldset label { +padding:0 0 0 4px; +} + +#right form.poll .button { +border:outset 1px #C39; +background:#F2E3ED; +cursor:pointer; +float:left; +width:auto; +line-height:0.9em; +display:inline; +height:1.55em; +font-size:1em; +overflow:visible; +margin:0 10px 0 0; +padding:0 2px !important; +} + +#right form.poll .button:focus { +border:outset 1px #C39; +} + +#right form.poll a { +text-decoration:none; +color:#000 !important; +padding:1px 2px !important; +border:outset 1px #C39; +background:#F2E3ED; +cursor:pointer; +float:left; +} + +#right form.poll a:hover,#right form.poll a:active,#right form.poll a:focus,#right form.poll .button:hover,#right form.poll .button:active,#right form.poll .button:focus { +border:2px outset #C39; +} + +#right form.poll:after { +/* Inhalt pseudo-Element :after; + * somit [clear] moeglich + */ +content:"."; +/* [content] verbergen; + */ +visibility:hidden; +height:0; +/* Block-Level fuer [clear]; + */ +display:block; +/* [float] clearing; + * einbeziehen der Float-Container; + */ +clear:both; +} + +dl.poll { +} + +dl.poll dt { +border-bottom:solid 1px #ccc; +} + +dl.poll dd { +padding:6px 0; +font-weight:bold; +} + +.polls_color_1 { +background:#000; +} + +.polls_color_2 { +background:#999; +} + +.polls_color_3 { +background:#93246F; +} + +.polls_color_4 { +background:#000; +} + +.polls_color_5 { +background:#ccc; +} + +.polls_color_6 { +background:#93246F; +} + +/* #################### Formulare ##################### */ +form.limit { +} + +form.login { +background:#93246F; +color:#000; +font-size:0.9em; +margin:5px 0 20px; +padding:10px 10px 20px 15px; +text-align:left; +} + +form.login .inputbox:focus { +border:solid 2px #000; +} + +form.login p { +clear:both; +border:solid 0 #000; +font-size:1em; +} + +form.login .button { +background:url(../images/pfeil.gif) #C39 no-repeat; +clear:left; +color:#fff; +display:block; +font-weight:bold; +margin:0 0 10px !important; +padding:0 0 0 30px !important; +cursor:pointer; +border:solid 0; +} + +form.login fieldset { +border:solid 0 #000; +margin:0; +padding:0; +text-align:left; +} + +form.login input { +background:#fff; +border:solid 2px #C39; +color:#000; +padding:2px 2px 0; +width:90%; +} + +form.login input.checkbox { +background:none; +border:solid 0 #000; +float:left; +margin:11px 0 0; +padding:5px; +width:20px; +} + +form.login label { +color:#000; +display:block; +font-weight:bold; +margin:5px 0 0; +padding:2px 2px 0; +} + +form.login label.remember { +float:left; +margin:5px 0 20px; +padding:5px 0 0; +width:11em; +} + +form.login p { +color:#000; +} + +form.login p a { +color:#000; +} + +form.login p a:hover,form.login p a:active,form.login p a:focus { +color:#000; +text-decoration:none; +} + +form.lost_password .button,.login_form .button { +background:url(../images/pfeil.gif) #000 no-repeat; +border:0; +color:#fff; +font-weight:bold; +margin:0; +padding:0 0 0 30px; +cursor:pointer; +} + +/* ################# poll ################ */ +.poll { +padding:20px 20px 20px 0; +} + +form.poll fieldset { +border:0 solid #000; +margin:0 0 10px; +padding:0; +} + +form.registration input,form.lost_password input,.login_form input { +border:solid 2px #93246F; +} + +form.registration label,form.lost_password label,.login_form label { +display:block; +float:left; +font-weight:normal; +width:12em; +} + +/* ##################### form.registration ################ */ +form.search_result,form.registration,form.lost_password,.login_form { +background:#fff; +border:solid 0 #93246F; +margin:15px 10px 0; +padding:0; +position:relative; +} + +.search_result .button,form.registration .button { +background:url(../images/pfeil.gif) #000 no-repeat; +border:0; +color:#fff; +font-weight:bold; +margin:10px 0 0; +padding:0 5px 0 30px; +cursor:pointer; +} + +.registration fieldset p { +margin:10px 0; +} + +.registration div,.login_form div,.lost_password div { +margin:5px 0; +} + +/* ########################## search ############################ */ +.searchintro { +font-weight:normal; +margin:0 0 20px; +} + +.searchintro img { +display:inline; border:0px +} + +.display { +margin:20px 0 0; +text-align:right; +} + +.filter { +margin:10px 0 0; +} + +.inputbox:focus { +border:solid 2px #000; +} + +.highlight { +font-weight:bold; +} + +fieldset.word,fieldset.only { +border:solid 1px #ccc; +} + +.only { +border:solid 0; +margin:10px 0 0 10px; +padding:5px 10px; +line-height:1.3em; +} + +.word { +background:#fff; +padding:10px 10px 10px 0; +border:solid 0 !important; +} + +.word input { +background:#fff; +border:solid 2px #999; +color:#93246F; +font-weight:bold; +margin:0 0 0 10px; +padding:2px; +} + +.phrase { +color:#000; +margin:10px 10px 10px 0; +padding:10px; +width:60%; +border:solid 1px #ccc; +float:left; +} + +/*Selects*/ +.phrase .inputbox { +background:#fff; +color:#000; +display:block; +height:1.5em; +margin-top:10px; +width:12em; +} + +.phrase .inputbox option { +background:#EFDEEA; +border-bottom:solid 1px #333; +padding:2px; +} + +.phrase .inputbox option a:hover { +background:#C00; +border-color:#CFD0D6; +color:#fff; +} + +.search_result legend { +border-bottom:solid 0 #000; +background:#fff; +} + +/* ########################### contacts ########################### */ +div.contact { +margin:10px 0; +} + +address { +font-style:normal; +margin:10px 0; +} + +address p { +line-height:1em; +} + +.contact label { +float:left; +font-weight:bold; +width:14em; +margin:10px 0 0; +} + +span.marker { +margin:0 10px 0 0; +} + +.contact_email_checkbox label { +float:none !important; +} + +.contact label.copy { +width:90%; +padding:0 0 0 10px; +} + +.contact form { +background:#EFDEEA; +color:#000; +padding:20px; +margin:10px 0; +} + +.contact input { +background:#fff; +border:solid 2px #C39; +color:#000; +padding:2px 2px 0; +margin:10px 0 0; +} + +.contact .button { +background:url(../images/pfeil.gif) #000 no-repeat; +border:0; +color:#fff; +font-weight:bold; +margin:20px 10px 0 0; +padding:0 0 0 30px; +cursor:pointer; +} + +label.textarea { +float:none !important; +margin:10px 0; +display:block; +width:100%; +} + +#contact_text { +width:80%; +height:150px; +} + +.contact input.invalid,.contact textarea.invalid { +border:solid 2px red; +} + +.contact label.invalid { +color:red; +} + +/*#################### tabellen ############################ */ +table.newsfeed { +border:solid 1px; +} + +table.newsfeeds td,table.weblinks td,table.category td { +border-right:solid 1px #EEE; +padding:5px; +} + +table.newsfeeds th,table.weblinks th,table.category th { +background:#EEE; +padding:5px; +} + +table.newsfeeds,table.weblinks,table.category { +border:solid 1px #eee; +font-size:1em; +margin:20px 0; +} + +/* category table */ +#count { +width:10%; +} + +#tableOrdering { +width:70%; +} + +#author { +width:20%; +} + +/* polls */ +poll .polls_color_1,.poll .polls_color_2,.poll .polls_color_3,.poll .polls_color_4,.poll .polls_color_5 { +border:solid 1px; +position:relative; +} + +.poll h3 { +color:#932467; +border:solid 0; +margin:20px 0; +} + +.poll .td_2 { +width:100px; +} + +.poll .td_3 { +width:300px; +} + +.poll form { +margin:20px 0; +} + +.poll table { +font-size:1em; +width:auto; +border:solid 0; +position:relative; +} + +.poll table .td_1 { +width:30px; +} + +.poll table caption { +color:#93246F; +font-size:1em; +font-weight:bold; +margin:10px 0; +text-align:left; +} + +.poll td { +border:solid 1px #ddd; +padding:2px; +} + +.poll td.line { +width:300px; +} + +.poll th { +background:#EEE; +border:solid 1px #ccc; +} + +.question { +font-weight:bold; +} + +#footer { +background:#93246F; +color:#fff; +padding:5px; +text-align:right; +border-top:solid 4px #ccc; +} + +p.syndicate { +float:left; +display:block; +text-align:left; +} + +#footer a { +color:#fff; +} + +/* Error Message contact form */ +p.error { +color:#93246F; +background:#F2E3ED; +border-top:3px solid #93246F; +border-bottom:3px solid #93246F; +padding:10px; +} + +body.contentpane { +background:#fff; +width:auto; +margin:10px; +line-height:1.4em; +text-align:left; +} + +.tool-tip { +font-size:0.8em; +} + +.tool-title { +font-weight:bold; +} + +/* form validation */ +.invalid { +border-color:red !important; +} + +label.invalid { +color:red; +} + +/* editor */ +.contentpaneopen_edit{ + float: left; +} + +.contentpaneopen_edit img +{ border:0 +} + +form.editor legend { +font-size:1.2em; +font-weight:bold; +padding:2px; +} + +form.editor fieldset { +border:solid 1px #ccc; +padding:20px; +margin:10px 0; +} + +form.editor .publishing label { +float:left; +width:14em; +font-weight:bold; +} + +form.editor .publishing div { +margin:5px 0; +} + +form.editor .publishing .radio label { +float:none; +width:14em; +} + +form.editor .publishing .radio label span { +float:left; +width:14em; +} + +form.editor fieldset.metadata label { +float:none !important; +display:block; +font-weight:bold; +} + +.save { +text-align:right; +padding:10px 0; +} + +/* user */ +form.user { +margin:10px 0; +} + +form.user label { +width:40%; +float:left; +} + +/* article index */ +table.contenttoc { +border:solid 1px #ccc; +padding:10px; +margin:10px; +} + +.pagenavcounter { +font-weight:bold; +} + + + +/* Advertisement */ + +.moduletable_text +{margin:10px} + +.banneritem_text +{ +margin: 10px 0 10px 0; +background:#f5f5f5; +padding:5px; +border:solid 1px #eee +} + +/* image link default alignment */ + +a img { +vertical-align: bottom; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/css/position.css b/oss/joomla/trunk/templates/beez/css/position.css new file mode 100644 index 00000000..4c90f2d4 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/css/position.css @@ -0,0 +1,226 @@ +/** + * @version $Id: position.css 14401 2010-01-26 14:10:00Z louis $ + * @author Design & Accessible Team ( Angie Radtke / Robert Deutz ) + * @package Joomla + * @subpackage Accessible-Template-Beez + * @copyright Copyright (C) 2005 - 2010 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. + */ + +* +{ + margin: 0; + padding: 0; +} + +body +{ + background: #F2E3ED; + color: #000000; + font-family: arial, helvetica, sans-serif; + font-size: 100.1%; + padding: 0px; + text-align: center; +} + +/* ################ Position ################ */ +#all +{ + background: #FFFFFF; + border: solid 1px #DBB0CD; + color: #000000; + font-size: 0.8em; + margin: 0 auto; + max-width: 1000px; + padding: 0 3px 3px 3px; + text-align: left; +} + +#page { } + +#header +{ + background: #fff; + color: #000000; + margin: 0; + position: relative; + text-align: right; + border-bottom: solid 4px #ccc; +} + +#contentarea,#contentarea2 +{ + border: solid 0px #000; + margin: 0; + padding: 0px 0px 0px 0px; + position: relative; + overflow: hidden; +} +#wrapper { margin: 0 0 0 21%} +#left +{ + background: #FFFFFF; + border-right: solid 0px #EEEEEE; + float: left; + margin: 20px 0 0 0; + width: 21%; +} + +#right +{ + color: #000; + float:left; + width: 28%; + padding-top:10px + +} + +#main2 +{ + background: #fff; + width:64%; + padding: 25px 20px 20px 20px; + position: relative; + min-height:520px; + float:left; + + +} + +#main +{ + background: #fff; + margin: 0 0px 0 0; + padding: 25px 20px 20px 20px; + position: relative; +} + +/* ###################### generell ###################### */ +.unsichtbar,.u2,.invisible , .unseen +{ + display: inline; + height: 0px; + left: -3000px; + position: absolute; + top: -2000px; + width: 0px; + z-index: 200; +} + +.wrap +{ + border: 0; + clear: both; + float: none; + font-size: 1px; + height: 0; + line-height: 1px; + margin: 0; + padding: 0; + visibility: hidden; +} + +#logo +{ + font-size: 1em !important; + font-weight: bold !important; + position: relative; + text-align: left; + text-transform: none !important; + z-index: 0; + margin-top: 1em; +} + +#logo img { display: block; } + +#logo span +{ + display: block; + margin: 0px 0 0 100px !important; + border-bottom: solid 1px #666; +} + +/* ############### main * ########################### */ +/* position */ +.leading +{ + background: #EFDEEA url(../images/biene.gif) no-repeat top left; + border: solid 1px #CCCCCC; + color: #000000; + margin: 30px 0px 10px 0px; + padding: 20px 20px 40px 120px; + position: relative; +} + +.leading_separator +{ + border-bottom: solid 0px #333333; + display: block; + height: 10px; + margin: 0 0 0px 0; +} + +.article_separator +{ + border: solid 1px #333333; + display: none; + margin: 0px 0 0px 0; +} + +.blog { padding: 0; } + +.cols1 +{ + display: block; + float: none !important; + margin: 0 !important; +} + +.cols2 { width: 45%; } +.cols3 { width: 30%; } + +.column1 , .column2 +{ + border: solid 0px #D4A7C5; + margin: 0 5px 0 0; + position: relative; +} + +.column2 , .column1 +{ + float: left; + margin: 0; +} + +.column2 +{ + float: right; + margin: 0; + width: 45%; +} + +.article_row +{ + margin: 0px 0 0px 0; + padding: 0; + overflow: hidden; +} + +.article_column +{ + border: solid 0px #ccc; + padding: 10px 10px 10px 0; +} + +.row_separator2 +{ + display: block; + clear: both; + margin: 0; + border: solid 0px; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/css/print.css b/oss/joomla/trunk/templates/beez/css/print.css new file mode 100644 index 00000000..3629d119 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/css/print.css @@ -0,0 +1,89 @@ +/** + * @version $Id: print.css 14401 2010-01-26 14:10:00Z louis $ + * @author Design & Accessible Team ( Angie Radtke / Robert Deutz ) + * @package Joomla + * @subpackage Accessible-Template-Beez + * @copyright Copyright (C) 2005 - 2010 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. + */ + + +h1 +{ + font-size: 16pt; + font-weight: bold; + color: #000; + background: inherit; + margin: 0.4em 0 0.5em 0; +} + +h2 +{ + font-size: 14pt; + font-weight: bold; + color: #333; + background: inherit; + margin: 0.2em 0 0.5em 0; + padding: 0.3em 0.3em 0.3em 0; +} + +h3 +{ + font-size: 12pt; + font-weight: bold; + margin: 0.4em 0 0.3em 0; +} + +/* Vermeidung von Seitenumbr�chen direkt nach einer �berschrift */ +h1,h2,h3 { page-break-after: avoid; } + +a +{ + color: #93246F; + font-weight: bold; +} + +.unsichtbar , p .u2 { display: none; } +#header { width: auto; } +.buttonheading {display:none} +#header form ,.pagination , #footer , p.counter , .unseen +{ display: none; +} +#header ul, #right form { display: none; } +#breadcrumbs , #left , #fontsize { display: none; } +#main2 { margin: 0%; } +#all {text-align:left} +#right +{ + display: block; + position: static !important; +} + +#main2:before +{ + content: " content "; + color: #888; + display: block; + background-color: inherit; + font-weight: bold; + font-size: 1.5em; + border-bottom: 1px #000 solid; + margin-bottom: 1em; +} + +#right:before +{ + content: " additional information "; + color: #888; + display: block; + background-color: inherit; + font-weight: bold; + font-size: 1.5em; + border-bottom: 1px #000 solid; + margin-bottom: 1em; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/css/template.css b/oss/joomla/trunk/templates/beez/css/template.css new file mode 100644 index 00000000..59dab9d9 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/css/template.css @@ -0,0 +1,68 @@ +/** + * @version $Id: template.css 14401 2010-01-26 14:10:00Z louis $ + * @author Design & Accessible Team ( Angie Radtke / Robert Deutz ) + * @package Joomla + * @subpackage Accessible-Template-Beez + * @copyright Copyright (C) 2005 - 2010 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. + */ + + + + + +body +{ + background: #fff; + color: #000000; + font-family: arial, helvetica, sans-serif; + font-size: 100.1%; + padding: 0px; + text-align: center; +} + + + +body.contentpane { + +width : auto; +margin : 10px; +line-height : 1.4em; +text-align: left; +} + +/* TOC */ +table.contenttoc{ + float: right; +} + +/* Tooltips */ +.tool-tip { + float: left; + background: #ffc; + border: 1px solid #D4D5AA; + padding: 5px; + max-width: 200px; + text-align:left; +} + +.tool-title { + padding: 0; + margin: 0; + font-size: 100%; + font-weight: bold; + margin-top: -15px; + padding-top: 15px; + padding-bottom: 5px; + background: url(../../system/images/selector-arrow.png) no-repeat; +} + +.tool-text { + font-size: 100%; + margin: 0; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/css/template_rtl.css b/oss/joomla/trunk/templates/beez/css/template_rtl.css new file mode 100644 index 00000000..b397dfab --- /dev/null +++ b/oss/joomla/trunk/templates/beez/css/template_rtl.css @@ -0,0 +1,363 @@ +/** + * @version $Id: template_rtl.css 14401 2010-01-26 14:10:00Z louis $ + * @package Joomla + * @subpackage Accessible-Template-Beez + * @copyright Copyright (C) 2005 - 2010 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. + */ + + /** + * Joomla! 1.5 Beez template RTL css file + * + * @author Mati Kochen /Angie Radtke + * @package Joomla + * @since 1.5 + * @version 1.0 + */ + +body{ + direction: rtl; +} + +p{ + text-align: right; +} + +/* Font Size */ +#fontsize { + right: auto; + left: 0; + padding: 4px 0; +} + +#fontsize h3 { + margin: 0; + padding: 0; +} + +#fontsize p { + margin: 0 5px 0 0; + padding: 0; +} + +#fontsize p a { + display: -moz-inline-box; + padding: 0 24px 0 0; + zoom: 1; +} + +/* Font Size Background Images */ +#fontsize p a.larger { background: #fff url(../images/lupe_larger.gif) right no-repeat; } +#fontsize p a.smaller { background: #fff url(../images/lupe_smaller.gif) right no-repeat; } +#fontsize p a.reset { background: #fff url(../images/lupe_reset.gif) right no-repeat; } +#fontsize p a.reset:hover, #fontsize p a.reset:active, #fontsize p a.reset:focus, +#fontsize p a.smaller:hover, #fontsize p a.smaller:active, #fontsize p a.smaller:focus, +#fontsize p a.larger:hover, #fontsize p a.larger:active, #fontsize p a.larger:focus { background-position:right; } + +#logo {text-align:right} +#logo span{ + margin: 0 100px 2px 0 !important; + text-align: right; +} + +#header {overflow:hidden } + +#header ul{ + text-align: left; +} + +#header ul li{ + background: none; +} + +#header ul li a:link, +#header ul li a:visited +{ + border-right: solid 1px #666 !important; + display: -moz-inline-box; + zoom:1 +} + +body #header ul { + padding-top: 3px; + margin-bottom: -5px; +} + +#header form{ + float: left !important; + text-align: right; + margin: 0 -10px 0 0 !important; +} + +#header form .inputbox { + padding:0 2px 0 0; + margin-right: 20px !important; +} + +#header form .button{ + margin:20px 0 0 10px; + padding:0 30px 0 5px; + background: #000000 url(../images/pfeil_rtl.gif) no-repeat scroll 100% +} + +#breadcrumbs{ + text-align: right !important; + margin:0 0 0 -10px !important; +} + +#wrapper { + margin:0 21% 0 0; +} + +#main2{ + float: right; +} + +#left{ + float: right; +} + +#right{ + right: auto; + left: 0; + float: right; +} + +#left h3{ + margin:0 5px 0 0; + padding:7px 10px 7px 5px; +} + +#right h3{ + padding: 0 0 0 5px; +} + +#all{ + text-align: right; +} + +p.buttonheading{ + text-align: left; +} + +.leading{ + padding: 20px 120px 40px 20px; + background: #EFDEEA url(../images/biene_rtl.gif) no-repeat scroll right top; +} + +.leading div{ + text-align: right; +} + +form.login fieldset{ + text-align: right; +} + +form.login label.remember, form.login input.checkbox{ + float: right; +} + +form.login .button{ + clear: right; + background: #CC3399 url(../images/pfeil_rtl.gif) no-repeat scroll right; + padding: 0 30px 0 0 !important; +} + +#main ul li, #main2 ul li { + padding:0 20px 0 0; + text-align: right !important; +} + +/* ie7 fix for list elements with count of articles */ +#main ul li a , +#main2 ul li a +{ + display:inline-block; +} +/* end fix */ + + +#main ul, #main2 ul { + margin:0 20px 0 0; + padding:0 10px 0 0; +} + +#main ul, #main ol { + margin:10px 20px 10px 0; + padding:0 10px 0 0; +} + +#main .leading .readon, #main2 .leading .readon{ + background: #93246F url(../images/pfeil_rtl.gif) no-repeat scroll right; + padding: 2px 30px 0 2px; + right: auto; + left: 0px !important; + position: absolute; + text-align: right; +} + +#main a.readon:hover, #main2 a.readon:hover, #main a.readon:active, #main2 a.readon:active, #main a.readon:focus, #main2 a.readon:focus { + background:#000000 url(../images/pfeil_rtl.gif) no-repeat scroll right; + padding:2px 30px 0 2px; +} + +#main a.readon, #main2 a.readon { + background:transparent url(../images/pfeil_rtl.gif) no-repeat scroll right; + padding:2px 30px 0 2px; + display: table-cell; +} + +#right form.poll fieldset label{ + padding: 0 4px 0 0; +} + +#right form.poll fieldset input{ + float:right; +} + +#right ul{ + padding: 10px 0 10px 10px; + zoom:1 +} + +#left ul{ + margin: 0 10px 20px 0; +} + +#left ul li.active a:link, #left ul li.active a:visited { + border-left: none; + border-right:4px solid #BE7CA9; + padding:3px 6px 3px 0; +} + + + +#left ul li ul { + border-width:0 4px 0 1px; +} + +#left ul li.active ul li a:link, #left ul li.active ul li a:visited{ + border-left: none; + border-right: 0 solid #DD75BB; + padding: 3px 20px 3px 4px; +} + +#left ul li ul li ul{ + padding: 10px 5px 10px 0; +} + +#left ul li.active ul li.active ul li a:link, +#left ul li.active ul li.active ul li a:visited{ + background: #FFFFFF url(../images/arrow_rtl.gif) no-repeat scroll right top; + margin: 0 15px 0 0; + padding:3px 15px 3px 0; +} + +ul.pagination{ + overflow:hidden; +} + +ul.pagination li { + padding: 2px 5px 2px 5px; + float:right ; + font-size:1em; + width:auto +} + +ul.pagination a +{ + display:inline !important; + margin:0 !important; + padding:0px !important; +} + +#footer p{ + float: left; +} + +#footer p.syndicate{ + float: right; +} + +form.user label{ + float: right; +} + +/* edit button */ +.contentpaneopen_edit{ + float: right; +} + +form.editor .publishing .radio label span , +form.editor .publishing label{ + float: right; +} + +table.contenttoc{ + float: left; +} + +#main .blog_more ul, #main2 .blog_more ul{ + padding: 10px 0 30px 10px; +} + +#main .blog_more ul li a, #main2 .blog_more ul li a { + background:transparent url(../images/pfeil_rtl.gif) no-repeat scroll right center; + padding:2px 30px 4px 30px !important; + display: table-cell; +} + +#main .blog_more ul li a:active, #main2 .blog_more ul li a:active, #main .blog_more ul li a:focus, #main2 .blog_more ul li a:focus { + background:#993399 url(../images/pfeil_rtl.gif) no-repeat scroll right !important; + padding:2px 30px 2px 0; +} + +#main .blog_more ul li a:hover,#main2 .blog_more ul li a:hover { + background:#939 url(../images/pfeil_rtl.gif) no-repeat right !important; + padding:2px 30px 2px 0; +} + +form.search_result, form.registration, form.lost_password, .login_form{ + margin: 15px 0 0 10px; +} + +.search_result .button, form.registration .button { + background:#000000 url(../images/pfeil_rtl.gif) no-repeat scroll 100%; + padding:0 30px 0 5px; +} + +.phrase{ + float: right; + margin: 10px 0 10px 10px; +} + +.only { + float: right; + margin:10px 10px 0 0; +} + +.only input{ + float: right; + margin:0 0 0 10px; +} + +form.registration label, form.lost_password label, .login_form label{ + float: right; +} + +.column2, .column1{ + float: right; +} + +.column2{ + float: left; +} + +.article_column{ + padding: 10px 0 10px 10px; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/favicon.ico b/oss/joomla/trunk/templates/beez/favicon.ico new file mode 100644 index 00000000..b5e79cb6 Binary files /dev/null and b/oss/joomla/trunk/templates/beez/favicon.ico differ diff --git a/oss/joomla/trunk/templates/beez/html/com_contact/category/default.php b/oss/joomla/trunk/templates/beez/html/com_contact/category/default.php new file mode 100644 index 00000000..96920841 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_contact/category/default.php @@ -0,0 +1,106 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +$cparams = JComponentHelper::getParams ('com_media'); +?> + +<?php if ($this->params->get('show_page_title',1)) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<?php if ($this->category->image || $this->category->description) : ?> +<div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php if ($this->params->get('image') != -1 && $this->params->get('image') != '') : ?> + <img src="<?php echo $this->baseurl .'/'. 'images/stories' . '/'. $this->params->get('image'); ?>" class="image_<?php echo $this->params->get('image_align'); ?>" alt="<?php echo JText::_( 'Contacts' ); ?>" /> + <?php elseif($this->category->image): ?> + <img src="<?php echo $this->baseurl .'/'. 'images/stories' . '/'. $this->category->image; ?>" class="image_<?php echo $this->category->image_position; ?>" alt="<?php echo JText::_( 'Contacts' ); ?>" /> + <?php endif; ?> + + <?php echo $this->category->description; ?> + + <?php if (($this->params->get('image') != -1 && $this->params->get('image') != '') || $this->category->image) : ?> + <div class="wrap_image"> </div> + <?php endif; ?> + +</div> +<?php endif; ?> + +<script language="javascript" type="text/javascript"> +function tableOrdering( order, dir, task ) +{ + var form = document.adminForm; + + form.filter_order.value = order; + form.filter_order_Dir.value = dir; + document.adminForm.submit( task ); +} +</script> + +<form action="<?php echo $this->action; ?>" method="post" name="adminForm"> + + <?php if ($this->params->get('display')) : ?> + <div class="display"> + <?php echo JText::_('Display Num'); ?>  + </div> + <?php endif; ?> + + <input type="hidden" name="catid" value="<?php echo (int)$this->category->id; ?>" /> + <input type="hidden" name="filter_order" value="<?php echo $this->lists['order']; ?>" /> + <input type="hidden" name="filter_order_Dir" value="" /> + +</form> + +<table class="category<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php if ($this->params->get('show_headings')) : ?> + <tr> + <th id="Count" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo JText::_('Num'); ?> + </th> + + <?php if ($this->params->get('show_position')) : ?> + <th id="Position" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo JHTML::_('grid.sort', 'Position', 'cd.con_position', $this->lists['order_Dir'], $this->lists['order'] ); ?> + </th> + <?php endif; ?> + + <th id="Name" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo JHTML::_('grid.sort', 'Name', 'cd.name', $this->lists['order_Dir'], $this->lists['order'] ); ?> + </th> + + <?php if ($this->params->get('show_email')) : ?> + <th id="Mail" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo JText::_('Email'); ?> + </th> + <?php endif; ?> + + <?php if ( $this->params->get('show_telephone')) : ?> + <th id="Phone" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo JText::_('Phone'); ?> + </th> + <?php endif; ?> + + <?php if ($this->params->get('show_mobile')) : ?> + <th id="mobile" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo JText::_('Mobile'); ?> + </th> + <?php endif; ?> + + <?php if ( $this->params->get('show_fax')) : ?> + <th id="Fax" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo JText::_('Fax'); ?> + </th> + <?php endif; ?> + </tr> + <?php endif; ?> + + <?php echo $this->loadTemplate('items'); ?> +</table> + +<p class="counter"> + <?php echo $this->pagination->getPagesCounter(); ?> +</p> + +<?php echo $this->pagination->getPagesLinks(); ?> diff --git a/oss/joomla/trunk/templates/beez/html/com_contact/category/default_items.php b/oss/joomla/trunk/templates/beez/html/com_contact/category/default_items.php new file mode 100644 index 00000000..20e39e11 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_contact/category/default_items.php @@ -0,0 +1,46 @@ +<?php // @version $Id: default_items.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php foreach ($this->items as $item) : ?> +<tr> + <td class="sectiontableentry" headers="Count"> + <?php echo (int)$item->count + 1; ?> + </td> + + <?php if ($this->params->get('show_position')) : ?> + <td headers="Position" class="sectiontableentry<?php echo $item->odd; ?>"> + <?php echo $this->escape($item->con_position); ?> + </td> + <?php endif; ?> + + <td height="20" class="sectiontableentry" headers="Name"> + <a href="<?php echo $item->link; ?>" class="category<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($item->name); ?></a> + </td> + + <?php if ($this->params->get('show_email')) : ?> + <td headers="Mail" class="sectiontableentry<?php echo $item->odd; ?>"> + <?php echo $item->email_to; ?> + </td> + <?php endif; ?> + + <?php if ($this->params->get('show_telephone')) : ?> + <td headers="Phone" class="sectiontableentry"> + <?php echo $this->escape($item->telephone); ?> + </td> + <?php endif; ?> + + <?php if ($this->params->get('show_mobile')) : ?> + <td headers="Mobile" class="sectiontableentry<?php echo $item->odd; ?>"> + <?php echo $this->escape($item->mobile); ?> + </td> + <?php endif; ?> + + <?php if ($this->params->get('show_fax')) : ?> + <td headers="Fax" class="sectiontableentry"> + <?php echo $this->escape($item->fax); ?> + </td> + <?php endif; ?> +</tr> +<?php endforeach; ?> diff --git a/oss/joomla/trunk/templates/beez/html/com_contact/category/index.html b/oss/joomla/trunk/templates/beez/html/com_contact/category/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_contact/category/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_contact/contact/default.php b/oss/joomla/trunk/templates/beez/html/com_contact/contact/default.php new file mode 100644 index 00000000..9c4ea8c0 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_contact/contact/default.php @@ -0,0 +1,53 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +$cparams = JComponentHelper::getParams ('com_media'); +?> + +<?php if ($this->params->get('show_page_title',1) && $this->params->get('page_title') != $this->contact->name) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<div class="contact<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php if ($this->params->get('show_contact_list') && count($this->contacts) > 1) : ?> + <form method="post" name="selectForm" id="selectForm"> + <?php echo JText::_('Select Contact'); ?> + <br /> + <?php echo JHTML::_('select.genericlist', $this->contacts, 'contact_id', 'class="inputbox" onchange="this.form.submit()"', 'id', 'name', $this->contact->id); ?> + <input type="hidden" name="option" value="com_contact" /> + </form> + <?php endif; ?> + + <?php if ($this->contact->name && $this->contact->params->get('show_name')) : ?> + <p> + <?php echo $this->escape($this->contact->name); ?> + </p> + <?php endif; ?> + + <?php if ($this->contact->con_position && $this->contact->params->get('show_position')) : ?> + <p> + <?php echo $this->escape($this->contact->con_position); ?> + </p> + <?php endif; ?> + + <?php if ($this->contact->image && $this->contact->params->get('show_image')) : ?> + <div style="float: right;"> + <?php echo JHTML::_('image', 'images/stories' . '/'.$this->escape($this->contact->image), JText::_( 'Contact' ), array('align' => 'middle')); ?> + </div> + <?php endif; ?> + + <?php echo $this->loadTemplate('address'); ?> + + <?php if ( $this->contact->params->get('allow_vcard')) : ?> + <p> + <?php echo JText::_('Download information as a'); ?> + <a href="index.php?option=com_contact&task=vcard&contact_id=<?php echo (int)$this->contact->id; ?>&format=raw"> + <?php echo JText::_('VCard'); ?></a> + </p> + <?php endif; ?> + + <?php if ($this->contact->params->get('show_email_form')) : + echo $this->loadTemplate('form'); + endif; ?> +</div> diff --git a/oss/joomla/trunk/templates/beez/html/com_contact/contact/default_address.php b/oss/joomla/trunk/templates/beez/html/com_contact/contact/default_address.php new file mode 100644 index 00000000..d11f4585 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_contact/contact/default_address.php @@ -0,0 +1,95 @@ +<?php // @version $Id: default_address.php 12387 2009-06-30 01:17:44Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<div class="contact_address"> + <!--open contact_address div --> +<?php + +$show_address = (($this->contact->params->get('address_check') > 0) && + ($this->contact->address || $this->contact->suburb || $this->contact->state || $this->contact->country || $this->contact->postcode)) || + (($this->contact->email_to && $this->contact->params->get('show_email')) || $this->contact->telephone || $this->contact->fax ); + +if ($show_address): + echo '<address>'; +endif; + +if (($this->contact->params->get('address_check') > 0) && ($this->contact->address || $this->contact->suburb || $this->contact->state || $this->contact->country || $this->contact->postcode)) : + if ( $this->contact->params->get('address_check') > 0) : + if (( $this->contact->params->get('contact_icons') ==0) || ($this->contact->params->get('contact_icons') ==1)): + echo '<span class="marker">'.$this->contact->params->get('marker_address').'</span> <br />'; + endif; + endif; + + if ($this->contact->address && $this->contact->params->get('show_street_address')) : + echo nl2br($this->escape($this->contact->address)).'<br />'; + endif; + + if ($this->contact->suburb && $this->contact->params->get('show_suburb')) : + echo $this->escape($this->contact->suburb).'<br />'; + endif; + + if ($this->contact->state && $this->contact->params->get('show_state')) : + echo $this->escape($this->contact->state).'<br />'; + endif; + + if ($this->contact->country && $this->contact->params->get('show_country')) : + echo $this->escape($this->contact->country).'<br />'; + endif; + + if ($this->contact->postcode && $this->contact->params->get('show_postcode')) : + echo $this->escape($this->contact->postcode).'<br />'; + endif; + +endif; + +if (($this->contact->email_to && $this->contact->params->get('show_email')) || $this->contact->telephone || $this->contact->fax ) : + if ($this->contact->email_to && $this->contact->params->get('show_email')) : + if (( $this->contact->params->get('contact_icons') ==0) || ( $this->contact->params->get('contact_icons') ==1)): + echo '<span class="marker">'.$this->contact->params->get('marker_email').'</span>'; + endif; + + echo $this->contact->email_to.'<br />'; + endif; + + if ($this->contact->telephone && $this->contact->params->get('show_telephone')) : + if (( $this->contact->params->get('contact_icons') ==0) || ( $this->contact->params->get('contact_icons') ==1)): + echo '<span class="marker">'.$this->contact->params->get('marker_telephone').'</span>'; + endif; + echo nl2br($this->escape($this->contact->telephone)).'<br />'; + endif; + + if ($this->contact->fax && $this->contact->params->get('show_fax')) : + if (( $this->contact->params->get('contact_icons') ==0) || ( $this->contact->params->get('contact_icons') ==1)): + echo '<span class="marker">'.$this->contact->params->get('marker_fax').'</span>'; + endif; + echo nl2br($this->escape($this->contact->fax)).'<br />'; + endif; + + if ( $this->contact->mobile && $this->contact->params->get( 'show_mobile' ) ) : + if (( $this->contact->params->get('contact_icons') ==0) || ( $this->contact->params->get('contact_icons') ==1)): + echo '<span class="marker">'.$this->contact->params->get( 'marker_mobile' ).'</span>'; + endif; + echo nl2br($this->escape($this->contact->mobile)).'<br />'; + endif; + + if ($this->contact->webpage && $this->contact->params->get('show_webpage')) : + echo '<a href="'.$this->escape($this->contact->webpage).'" target="_blank"> '.$this->escape($this->contact->webpage).'</a><br />'; + echo '</address>'; + endif; +endif; + +if ($show_address): + echo '</address>'; +endif; ?> + +</div> +<!--close contact_address div --> +<?php if ($this->contact->misc && $this->contact->params->get('show_misc')) : ?> +<p> + <?php if (( $this->contact->params->get('contact_icons') ==0) || ( $this->contact->params->get('contact_icons') ==1)): ?> + <span class="marker"><?php echo $this->contact->params->get('marker_misc'); ?></span> <?php echo nl2br($this->contact->misc); ?> + <?php endif; ?> +</p> +<?php endif; ?> + diff --git a/oss/joomla/trunk/templates/beez/html/com_contact/contact/default_form.php b/oss/joomla/trunk/templates/beez/html/com_contact/contact/default_form.php new file mode 100644 index 00000000..e7936d04 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_contact/contact/default_form.php @@ -0,0 +1,53 @@ +<?php // @version $Id: default_form.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<script type="text/javascript"> + function validateForm( frm ) { + var valid = document.formvalidator.isValid(frm); + if (valid == false) { + // do field validation + if (frm.email.invalid) { + alert( "<?php echo JText::_( 'Please enter a valid e-mail address.', true );?>" ); + } else if (frm.text.invalid) { + alert( "<?php echo JText::_( 'CONTACT_FORM_NC', true ); ?>" ); + } + return false; + } else { + frm.submit(); + } + } +</script> + +<form action="<?php echo JRoute::_('index.php'); ?>" class="form-validate" method="post" name="emailForm" id="emailForm"> + <div class="contact_email<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>"> + <label for="contact_name"> + <?php echo JText::_( 'Enter your name' ); ?>:</label> + <input type="text" name="name" id="contact_name" size="30" class="inputbox" value="" /> + </div> + <div class="contact_email<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>"><label id="contact_emailmsg" for="contact_email"> + <?php echo JText::_( 'Email address' ); ?>*:</label> + <input type="text" id="contact_email" name="email" size="30" value="" class="inputbox required validate-email" maxlength="100" /> + </div> + <div class="contact_email<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>"><label for="contact_subject"> + <?php echo JText::_( 'Message subject' ); ?>:</label> + <input type="text" name="subject" id="contact_subject" size="30" class="inputbox" value="" /> + </div> + <div class="contact_email<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>"><label id="contact_textmsg" for="contact_text" class="textarea"> + <?php echo JText::_( 'Enter your message' ); ?>*:</label> + <textarea name="text" id="contact_text" class="inputbox required" rows="10" cols="40"></textarea> + </div> + <?php if ($this->contact->params->get( 'show_email_copy' )): ?> + <div class="contact_email_checkbox<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>"> + <input type="checkbox" name="email_copy" id="contact_email_copy" value="1" /> + <label for="contact_email_copy" class="copy"> + <?php echo JText::_( 'EMAIL_A_COPY' ); ?> + </label> + </div> + <?php endif; ?> + <button class="button validate" type="submit"><?php echo JText::_('Send'); ?></button> + <input type="hidden" name="view" value="contact" /> + <input type="hidden" name="id" value="<?php echo (int)$this->contact->id; ?>" /> + <input type="hidden" name="task" value="submit" /> + <?php echo JHTML::_( 'form.token' ); ?> +</form> diff --git a/oss/joomla/trunk/templates/beez/html/com_contact/contact/index.html b/oss/joomla/trunk/templates/beez/html/com_contact/contact/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_contact/contact/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_contact/index.html b/oss/joomla/trunk/templates/beez/html/com_contact/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_contact/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_content/article/default.php b/oss/joomla/trunk/templates/beez/html/com_content/article/default.php new file mode 100644 index 00000000..3295bcb5 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/article/default.php @@ -0,0 +1,120 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<div id="page"> + +<?php if (($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) && !($this->print)) : ?> +<div class="contentpaneopen_edit<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo JHTML::_('icon.edit', $this->article, $this->params, $this->access); ?> +</div> +<?php endif; ?> + +<?php if ($this->params->get('show_page_title',1) && $this->params->get('page_title') != $this->article->title) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<?php if ($this->params->get('show_title')) : ?> +<h2 class="contentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php if ($this->params->get('link_titles') && $this->article->readmore_link != '') : ?> + <a href="<?php echo $this->article->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->article->title); ?></a> + <?php else : + echo $this->escape($this->article->title); + endif; ?> +</h2> +<?php endif; ?> + +<?php if ((intval($this->article->modified) !=0 && $this->params->get('show_modify_date')) || ($this->params->get('show_author') && ($this->article->author != "")) || ($this->params->get('show_create_date'))) : ?> +<p class="articleinfo"> + <?php if (intval($this->article->modified) !=0 && $this->params->get('show_modify_date')) : ?> + <span class="modifydate"> + <?php echo JText::sprintf('LAST_UPDATED2', JHTML::_('date', $this->article->modified, JText::_('DATE_FORMAT_LC2'))); ?> + </span> + <?php endif; ?> + + <?php if (($this->params->get('show_author')) && ($this->article->author != "")) : ?> + <span class="createdby"> + <?php JText::printf('Written by', ($this->article->created_by_alias ? $this->escape($this->article->created_by_alias) : $this->escape($this->article->author))); ?> + </span> + <?php endif; ?> + + <?php if ($this->params->get('show_create_date')) : ?> + <span class="createdate"> + <?php echo JHTML::_('date', $this->article->created, JText::_('DATE_FORMAT_LC2')); ?> + </span> + <?php endif; ?> +</p> +<?php endif; ?> + +<?php if (!$this->params->get('show_intro')) : + echo $this->article->event->afterDisplayTitle; +endif; ?> + +<p class="buttonheading"> + <?php if ($this->print) : + echo JHTML::_('icon.print_screen', $this->article, $this->params, $this->access); + elseif ($this->params->get('show_pdf_icon') || $this->params->get('show_print_icon') || $this->params->get('show_email_icon')) : ?> + <img src="<?php echo $this->baseurl ?>/templates/<?php echo $mainframe->getTemplate(); ?>/images/trans.gif" alt="<?php echo JText::_('attention open in a new window'); ?>" /> + <?php if ($this->params->get('show_pdf_icon')) : + echo JHTML::_('icon.pdf', $this->article, $this->params, $this->access); + endif; + if ($this->params->get('show_print_icon')) : + echo JHTML::_('icon.print_popup', $this->article, $this->params, $this->access); + endif; + if ($this->params->get('show_email_icon')) : + echo JHTML::_('icon.email', $this->article, $this->params, $this->access); + endif; + endif; ?> +</p> + +<?php if (($this->params->get('show_section') && $this->article->sectionid) || ($this->params->get('show_category') && $this->article->catid)) : ?> +<p class="iteminfo"> + <?php if ($this->params->get('show_section') && $this->article->sectionid) : ?> + <span> + <?php if ($this->params->get('link_section')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->article->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->article->section); ?> + <?php if ($this->params->get('link_section')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + <?php if ($this->params->get('show_category')) : ?> + <?php echo ' - '; ?> + <?php endif; ?> + </span> + <?php endif; ?> + <?php if ($this->params->get('show_category') && $this->article->catid) : ?> + <span> + <?php if ($this->params->get('link_category')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->article->catslug, $this->article->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->article->category); ?> + <?php if ($this->params->get('link_category')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + </span> + <?php endif; ?> +</p> +<?php endif; ?> + +<?php echo $this->article->event->beforeDisplayContent; ?> + +<?php if ($this->params->get('show_url') && $this->article->urls) : ?> +<span class="small"> + <a href="<?php echo $this->escape($this->article->urls); ?>" target="_blank"> + <?php echo $this->escape($this->article->urls); ?></a> +</span> +<?php endif; ?> + +<?php if (isset ($this->article->toc)) : + echo $this->article->toc; +endif; ?> + +<?php echo JFilterOutput::ampReplace($this->article->text); ?> + +<?php echo $this->article->event->afterDisplayContent; ?> + +</div> diff --git a/oss/joomla/trunk/templates/beez/html/com_content/article/form.php b/oss/joomla/trunk/templates/beez/html/com_content/article/form.php new file mode 100644 index 00000000..4d9e3e4a --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/article/form.php @@ -0,0 +1,202 @@ +<?php // @version: $Id: form.php 12389 2009-07-01 00:34:45Z ian $ +defined('_JEXEC') or die('Restricted access'); +$config =& JFactory::getConfig(); +$publish_up =& JFactory::getDate($this->article->publish_up); +$publish_up->setOffset($config->getValue('config.offset')); +$publish_up = $publish_up->toFormat(); + +if (! isset($this->article->publish_down) || $this->article->publish_down == 'Never') { + $publish_down = JText::_('Never'); +} else { + $publish_down =& JFactory::getDate($this->article->publish_down); + $publish_down->setOffset($config->getValue('config.offset')); + $publish_down = $publish_down->toFormat(); +} +?> +<script language="javascript" type="text/javascript"> +<!-- +function setgood() { + // TODO: Put setGood back + return true; +} + +var sectioncategories = new Array; +<?php +$i = 0; +foreach ($this->lists['sectioncategories'] as $k=>$items) { + foreach ($items as $v) { + echo "sectioncategories[".$i++."] = new Array( '$k','".addslashes( $v->id )."','".addslashes( $v->title )."' );\n\t\t"; + } +} +?> + + +function submitbutton(pressbutton) { + var form = document.adminForm; + if (pressbutton == 'cancel') { + submitform( pressbutton ); + return; + } + try { + form.onsubmit(); + } catch(e) { + alert(e); + } + + // do field validation + var text = <?php echo $this->editor->getContent( 'text' ); ?> + if (form.title.value == '') { + return alert ( "<?php echo JText::_( 'Article must have a title', true ); ?>" ); + } else if (text == '') { + return alert ( "<?php echo JText::_( 'Article must have some text', true ); ?>"); + } else if (parseInt('<?php echo $this->article->sectionid;?>')) { + // for articles + if (form.catid && getSelectedValue('adminForm','catid') < 1) { + return alert ( "<?php echo JText::_( 'Please select a category', true ); ?>" ); + } + } + <?php echo $this->editor->save( 'text' ); ?> + submitform(pressbutton); +} +//--> +</script> +<?php if ($this->params->get('show_page_title', 1)) : ?> +<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"><?php echo $this->escape($this->params->get('page_title')); ?></div> +<?php endif; ?> +<form action="<?php echo $this->action ?>" method="post" name="adminForm" onSubmit="setgood();" class="editor"> +<fieldset> +<legend><?php echo JText::_('Editor'); ?></legend> + + <div> + <label for="title"> + <?php echo JText::_( 'Title' ); ?>: + </label> + <input class="inputbox" type="text" id="title" name="title" size="50" maxlength="100" value="<?php echo $this->escape($this->article->title); ?>" /> + </div> + <div class="save"> + <button type="button" onclick="submitbutton('save')"> + <?php echo JText::_('Save') ?> + </button> + <button type="button" onclick="submitbutton('cancel')" /> + <?php echo JText::_('Cancel') ?> + </button> + </div> + <div class="wrap"> </div> + +<?php +echo $this->editor->display('text', $this->article->text, '100%', '400', '70', '15'); +?> +</fieldset> +<fieldset class="publishing"> +<legend><?php echo JText::_('Publishing'); ?></legend> + + <div> + <label for="sectionid"> + <?php echo JText::_( 'Section' ); ?>: + </label> + + <?php echo $this->lists['sectionid']; ?> + </div> + <div class="wrap"> </div> + + <div> + <label for="catid"> + <?php echo JText::_( 'Category' ); ?>: + </label> + + <?php echo $this->lists['catid']; ?> + </div> + <div class="wrap"> </div> + +<?php if ($this->user->authorize('com_content', 'publish', 'content', 'all')) : ?> + + <div class="radio"> + <label for="state" > + <span><?php echo JText::_( 'Published' ); ?>:</span> + </label> + + <?php echo $this->lists['state']; ?> + </div> + + +<?php endif; ?> + + <div class="radio"> + <label for="frontpage"> + <span><?php echo JText::_( 'Show on Front Page' ); ?>:</span> + </label> + + <?php echo $this->lists['frontpage']; ?> + </div> + <div class="wrap"> </div> + + <div> + <label for="created_by_alias"> + <?php echo JText::_( 'Author Alias' ); ?>: + </label> + + <input type="text" id="created_by_alias" name="created_by_alias" size="50" maxlength="100" value="<?php echo $this->escape($this->article->created_by_alias); ?>" class="inputbox" /> + + </div> + <div class="wrap"> </div> + <div> + <label for="publish_up"> + <?php echo JText::_( 'Start Publishing' ); ?>: + </label> + <?php echo JHTML::_('calendar', $publish_up, 'publish_up', 'publish_up', '%Y-%m-%d %H:%M:%S', array('class'=>'inputbox', 'size'=>'25', 'maxlength'=>'19')); ?> + </div> + <div class="wrap"> </div> + <div> + <label for="publish_down"> + <?php echo JText::_( 'Finish Publishing' ); ?>: + </label> + <?php echo JHTML::_('calendar', $publish_down, 'publish_down', 'publish_down', '%Y-%m-%d %H:%M:%S', array('class'=>'inputbox', 'size'=>'25', 'maxlength'=>'19')); ?> + </div> + <div class="wrap"> </div> + <div> + <label for="access"> + <?php echo JText::_( 'Access Level' ); ?>: + </label> + + <?php echo $this->lists['access']; ?> + </div> + <div class="wrap"> </div> + <div> + <label for="ordering"> + <?php echo JText::_( 'Ordering' ); ?>: + </label> + + <?php echo $this->lists['ordering']; ?> + </div> + <div class="wrap"> </div> + +</fieldset> + +<fieldset class="metadata"> +<legend><?php echo JText::_('Metadata'); ?></legend> + + + <label for="metadesc"> + <?php echo JText::_( 'Description' ); ?>: + </label> + + <textarea rows="5" cols="50" style="width:500px; height:120px" class="inputbox" id="metadesc" name="metadesc"><?php echo str_replace('&','&',$this->article->metadesc); ?></textarea> + + <label for="metakey"> + <?php echo JText::_( 'Keywords' ); ?>: + </label> + + <textarea rows="5" cols="50" style="width:500px; height:50px" class="inputbox" id="metakey" name="metakey"><?php echo str_replace('&','&',$this->article->metakey); ?></textarea> + +</fieldset> + + <input type="hidden" name="option" value="com_content" /> + <input type="hidden" name="Returnid" value="<?php echo $this->returnid; ?>" /> + <input type="hidden" name="id" value="<?php echo $this->article->id; ?>" /> + <input type="hidden" name="version" value="<?php echo $this->article->version; ?>" /> + <input type="hidden" name="created_by" value="<?php echo $this->article->created_by; ?>" /> + <input type="hidden" name="referer" value="<?php echo str_replace(array('"', '<', '>', "'"), '', @$_SERVER['HTTP_REFERER']); ?>" /> + <input type="hidden" name="task" value="" /> + <?php echo JHTML::_( 'form.token' ); ?> +</form> +<?php echo JHTML::_('behavior.keepalive'); ?> diff --git a/oss/joomla/trunk/templates/beez/html/com_content/article/index.html b/oss/joomla/trunk/templates/beez/html/com_content/article/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/article/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_content/category/blog.php b/oss/joomla/trunk/templates/beez/html/com_content/category/blog.php new file mode 100644 index 00000000..bca41ece --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/category/blog.php @@ -0,0 +1,83 @@ +<?php // @version $Id: blog.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +$cparams = JComponentHelper::getParams ('com_media'); +?> + +<?php if ($this->params->get('show_page_title')) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<div class="blog<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php if ($this->params->def('show_description', 1) || $this->params->def('show_description_image', 1)) : ?> + <div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php if ($this->params->get('show_description_image') && $this->category->image) : ?> + <img src="<?php echo $this->baseurl . $cparams->get('image_path') . '/' . $this->category->image; ?>" class="image_<?php echo $this->category->image_position; ?>" /> + <?php endif; ?> + + <?php if ($this->params->get('show_description') && $this->category->description) : + echo $this->category->description; + endif; ?> + + <?php if ($this->params->get('show_description_image') && $this->category->image) : ?> + <div class="wrap_image"> </div> + <?php endif; ?> + + </div> + <?php endif; ?> + + <?php $i = $this->pagination->limitstart; + $rowcount = $this->params->def('num_leading_articles', 1); + for ($y = 0; $y < $rowcount && $i < $this->total; $y++, $i++) : ?> + <div class="leading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php $this->item =& $this->getItem($i, $this->params); + echo $this->loadTemplate('item'); ?> + </div> + <span class="leading_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> </span> + <?php endfor; ?> + + <?php $introcount = $this->params->def('num_intro_articles', 4); + if ($introcount) : + $colcount = (int)$this->params->def('num_columns', 2); + if ($colcount == 0) : + $colcount = 1; + endif; + $rowcount = (int) $introcount / $colcount; + $ii = 0; + for ($y = 0; $y < $rowcount && $i < $this->total; $y++) : ?> + <div class="article_row<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php for ($z = 0; $z < $colcount && $ii < $introcount && $i < $this->total; $z++, $i++, $ii++) : ?> + <div class="article_column column<?php echo $z + 1; ?> cols<?php echo $colcount; ?>" > + <?php $this->item =& $this->getItem($i, $this->params); + echo $this->loadTemplate('item'); ?> + </div> + <span class="article_separator"> </span> + <?php endfor; ?> + <span class="row_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> </span> + </div> + <?php endfor; + endif; ?> + + <?php $numlinks = $this->params->def('num_links', 4); + if ($numlinks && $i < $this->total) : ?> + <div class="blog_more<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php $this->links = array_slice($this->items, $i - $this->pagination->limitstart, $i - $this->pagination->limitstart + $numlinks); + echo $this->loadTemplate('links'); ?> + </div> + <?php endif; ?> + + <?php if ($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2 && $this->pagination->get('pages.total') > 1)) : ?> + <?php if( $this->pagination->get('pages.total') > 1 ) : ?> + <p class="counter"> + <?php echo $this->pagination->getPagesCounter(); ?> + </p> + <?php endif; ?> + <?php if ($this->params->def('show_pagination_results', 1)) : ?> + <?php echo $this->pagination->getPagesLinks(); ?> + <?php endif; ?> + <?php endif; ?> + +</div> diff --git a/oss/joomla/trunk/templates/beez/html/com_content/category/blog_item.php b/oss/joomla/trunk/templates/beez/html/com_content/category/blog_item.php new file mode 100644 index 00000000..e1296788 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/category/blog_item.php @@ -0,0 +1,121 @@ +<?php // @version $Id: blog_item.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php if ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) : ?> +<div class="contentpaneopen_edit<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?> +</div> +<?php endif; ?> + +<?php if ($this->item->params->get('show_title')) : ?> +<h2 class="contentheading<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?> + <a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->item->title); ?></a> + <?php else : + echo $this->escape($this->item->title); + endif; ?> +</h2> +<?php endif; ?> + +<?php if (!$this->item->params->get('show_intro')) : + echo $this->item->event->afterDisplayTitle; +endif; ?> + +<?php if ($this->item->params->get('show_pdf_icon') || $this->item->params->get('show_print_icon') || $this->item->params->get('show_email_icon')) : ?> +<p class="buttonheading"> + <img src="<?php echo $this->baseurl ?>/templates/<?php echo $mainframe->getTemplate(); ?>/images/trans.gif" alt="<?php echo JText::_('attention open in a new window'); ?>" /> + <?php if ($this->item->params->get('show_pdf_icon')) : + echo JHTML::_('icon.pdf', $this->item, $this->item->params, $this->access); + endif; + if ($this->item->params->get('show_print_icon')) : + echo JHTML::_('icon.print_popup', $this->item, $this->item->params, $this->access); + endif; + if ($this->item->params->get('show_email_icon')) : + echo JHTML::_('icon.email', $this->item, $this->item->params, $this->access); + endif; ?> +</p> +<?php endif; ?> + +<?php if (($this->item->params->get('show_section') && $this->item->sectionid) || ($this->item->params->get('show_category') && $this->item->catid)) : ?> +<p class="pageinfo"> + <?php if ($this->item->params->get('show_section') && $this->item->sectionid && isset($this->item->section)) : ?> + <span> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->item->section); ?> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + <?php if ($this->item->params->get('show_category')) : ?> + <?php echo ' - '; ?> + <?php endif; ?> + </span> + <?php endif; ?> + <?php if ($this->item->params->get('show_category') && $this->item->catid) : ?> + <span> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->item->category); ?> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + </span> + <?php endif; ?> +</p> +<?php endif; ?> + +<?php if ((intval($this->item->modified) !=0 && $this->item->params->get('show_modify_date')) || ($this->item->params->get('show_author') && ($this->item->author != "")) || ($this->item->params->get('show_create_date'))) : ?> +<p class="iteminfo"> + <?php if (intval($this->item->modified) !=0 && $this->item->params->get('show_modify_date')) : ?> + <span class="modifydate"> + <?php echo JText::sprintf('LAST_UPDATED2', JHTML::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC2'))); ?> + </span> + <?php endif; ?> + + <?php if (($this->item->params->get('show_author')) && ($this->item->author != "")) : ?> + <span class="createdby"> + <?php JText::printf('Written by', ($this->escape($this->item->created_by_alias) ? $this->escape($this->item->created_by_alias) : $this->escape($this->item->author))); ?> + </span> + <?php endif; ?> + + <?php if ($this->item->params->get('show_create_date')) : ?> + <span class="createdate"> + <?php echo JHTML::_('date', $this->item->created, JText::_('DATE_FORMAT_LC2')); ?> + </span> + <?php endif; ?> +</p> +<?php endif; ?> + +<?php echo $this->item->event->beforeDisplayContent; ?> + +<?php if ($this->item->params->get('show_url') && $this->item->urls) : ?> +<span class="small"> + <a href="<?php echo $this->item->urls; ?>" target="_blank"> + <?php echo $this->escape($this->item->urls); ?></a> +</span> +<?php endif; ?> + +<?php if (isset ($this->item->toc)) : + echo $this->item->toc; +endif; ?> + +<?php echo JFilterOutput::ampReplace($this->item->text); ?> + +<?php if ($this->item->params->get('show_readmore') && $this->item->readmore) : ?> +<p> + <a href="<?php echo $this->item->readmore_link; ?>" class="readon<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php if ($this->item->readmore_register) : + echo JText::_('Register to read more...'); + elseif ($readmore = $this->item->params->get('readmore')) : + echo $readmore; + else : + echo JText::sprintf('Read more', $this->escape($this->item->title)); + endif; ?></a> +</p> +<?php endif; ?> + +<?php echo $this->item->event->afterDisplayContent; diff --git a/oss/joomla/trunk/templates/beez/html/com_content/category/blog_links.php b/oss/joomla/trunk/templates/beez/html/com_content/category/blog_links.php new file mode 100644 index 00000000..71836274 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/category/blog_links.php @@ -0,0 +1,16 @@ +<?php // @version $Id: blog_links.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<h2> + <?php echo JText::_('More Articles...'); ?> +</h2> + +<ul> + <?php foreach ($this->links as $link) : ?> + <li> + <a class="blogsection" href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($link->slug, $link->catslug, $link->sectionid)); ?>"> + <?php echo $this->escape($link->title); ?></a> + </li> + <?php endforeach; ?> +</ul> diff --git a/oss/joomla/trunk/templates/beez/html/com_content/category/default.php b/oss/joomla/trunk/templates/beez/html/com_content/category/default.php new file mode 100644 index 00000000..78c4ad74 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/category/default.php @@ -0,0 +1,33 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +$cparams = JComponentHelper::getParams ('com_media'); +?> + +<?php if ($this->params->get('show_page_title',1)) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<?php if ($this->params->def('show_description', 1) || $this->params->def('show_description_image', 1)) : ?> +<div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php if ($this->params->get('show_description_image') && $this->category->image) : ?> + <img src="<?php echo $this->baseurl . $cparams->get('image_path').'/'.$this->category->image; ?>" class="image_<?php echo $this->category->image_position; ?>" /> + <?php endif; ?> + + <?php if ($this->params->get('show_description') && $this->category->description) : + echo $this->category->description; + endif; ?> + + <?php if ($this->params->get('show_description_image') && $this->category->image) : ?> + <div class="wrap_image"> </div> + <?php endif; ?> +</div> +<?php endif; ?> + +<?php $this->items =& $this->getItems(); +echo $this->loadTemplate('items'); ?> + +<?php if ($this->access->canEdit || $this->access->canEditOwn) : + echo JHTML::_('icon.create', $this->category, $this->params, $this->access); +endif; diff --git a/oss/joomla/trunk/templates/beez/html/com_content/category/default_items.php b/oss/joomla/trunk/templates/beez/html/com_content/category/default_items.php new file mode 100644 index 00000000..43e18ce8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/category/default_items.php @@ -0,0 +1,126 @@ +<?php // @version: $Id: default_items.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<script language="javascript" type="text/javascript"> +<!-- +function tableOrdering( order, dir, task ) +{ +var form = document.adminForm; + +form.filter_order.value = order; +form.filter_order_Dir.value = dir; +document.adminForm.submit( task ); +} +// --> +</script> + +<form action="<?php echo $this->action; ?>" method="post" name="adminForm"> + +<?php if ($this->params->get('filter')) : ?> +<div class="filter"> + <p> + <?php echo JText::_($this->escape($this->params->get('filter_type')) . ' ' . 'Filter').' '; ?> + <input type="text" name="filter" value="<?php echo $this->escape($this->lists['filter']); ?>" class="inputbox" onchange="document.adminForm.submit();" /> + </p> +</div> +<?php endif; ?> + +<?php if ($this->params->get('show_pagination_limit')) : ?> +<div class="display"> + <?php echo JText::_('Display Num'); ?>  + <?php echo $this->pagination->getLimitBox(); ?> +</div> +<?php endif; ?> + +<table class="category"> + + <?php if ($this->params->get('show_headings')) : ?> + <tr> + <th class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" id="count"> + <?php echo JText::_('Num'); ?> + </th> + + <?php if ($this->params->get('show_title')) : ?> + <th class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" id="tableOrdering"> + <?php echo JHTML::_('grid.sort', 'Item Title', 'a.title', $this->lists['order_Dir'], $this->lists['order']); ?> + </th> + <?php endif; ?> + + <?php if ($this->params->get('show_date')) : ?> + <th class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" id="tableOrdering2"> + <?php echo JHTML::_('grid.sort', 'Date', 'a.created', $this->lists['order_Dir'], $this->lists['order']); ?> + </th> + <?php endif; ?> + + <?php if ($this->params->get('show_author')) : ?> + <th class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" id="author"> + <?php echo JHTML::_('grid.sort', 'Author', 'author', $this->lists['order_Dir'], $this->lists['order']); ?> + </th> + <?php endif; ?> + + <?php if ($this->params->get('show_hits')) : ?> + <th align="center" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" width="5%" nowrap="nowrap" id="hits"> + <?php echo JHTML::_('grid.sort', 'Hits', 'a.hits', $this->lists['order_Dir'], $this->lists['order']); ?> + </th> + <?php endif; ?> + </tr> + <?php endif; ?> + + <?php foreach ($this->items as $item) : ?> + <tr class="sectiontableentry<?php echo ($item->odd + 1) . $this->escape($this->params->get('pageclass_sfx')); ?>"> + <td headers="count"> + <?php echo $this->pagination->getRowOffset((int)$item->count); ?> + </td> + + <?php if ($this->params->get('show_title')) : ?> + <td headers="tableOrdering"> + <?php if ($item->access <= $this->user->get('aid', 0)) : ?> + <a href="<?php echo $item->link; ?>"> + <?php echo $this->escape($item->title); ?></a> + <?php echo JHTML::_('icon.edit', $item, $this->params, $this->access); + else : + echo $item->title; ?> : + <a href="<?php echo JRoute::_('index.php?option=com_user&task=register'); ?>"> + <?php echo JText::_('Register to read more...'); ?></a> + <?php endif; ?> + </td> + <?php endif; ?> + + <?php if ($this->params->get('show_date')) : ?> + <td headers="tableOrdering2"> + <?php echo $this->escape($item->created); ?> + </td> + <?php endif; ?> + + <?php if ($this->params->get('show_author')) : ?> + <td headers="author"> + <?php echo $item->created_by_alias ? $this->escape($item->created_by_alias) : $this->escape($item->author); ?> + </td> + <?php endif; ?> + + <?php if ($this->params->get('show_hits')) : ?> + <td headers="hits"> + <?php echo $item->hits ? (int)$item->hits : '-'; ?> + </td> + <?php endif; ?> + + </tr> + <?php endforeach; ?> + +</table> + +<?php if ($this->params->get('show_pagination')) : ?> +<p class="counter"> + <?php echo $this->pagination->getPagesCounter(); ?> +</p> +<?php echo $this->pagination->getPagesLinks(); +endif; ?> + +<input type="hidden" name="id" value="<?php echo (int)$this->category->id; ?>" /> +<input type="hidden" name="sectionid" value="<?php echo (int)$this->category->sectionid; ?>" /> +<input type="hidden" name="task" value="<?php echo $this->lists['task']; ?>" /> +<input type="hidden" name="filter_order" value="" /> +<input type="hidden" name="filter_order_Dir" value="" /> +<input type="hidden" name="limitstart" value="0" /> +</form> diff --git a/oss/joomla/trunk/templates/beez/html/com_content/category/index.html b/oss/joomla/trunk/templates/beez/html/com_content/category/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/category/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_content/frontpage/default.php b/oss/joomla/trunk/templates/beez/html/com_content/frontpage/default.php new file mode 100644 index 00000000..cb4bcb2d --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/frontpage/default.php @@ -0,0 +1,63 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php if ($this->params->get('show_page_title',1)) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<div class="blog<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php $i = $this->pagination->limitstart; + $rowcount = $this->params->def('num_leading_articles', 1); + for ($y = 0; $y < $rowcount && $i < $this->total; $y++, $i++) : ?> + <div class="leading<?php echo $this->params->get('pageclass_sfx'); ?>"> + <?php $this->item =& $this->getItem($i, $this->params); + echo $this->loadTemplate('item'); ?> + </div> + <span class="leading_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> </span> + <?php endfor; ?> + + <?php $introcount = $this->params->def('num_intro_articles', 4); + if ($introcount) : + $colcount = $this->params->def('num_columns', 2); + if ($colcount == 0) : + $colcount = 1; + endif; + $rowcount = (int) $introcount / $colcount; + $ii = 0; + for ($y = 0; $y < $rowcount && $i < $this->total; $y++) : ?> + <div class="article_row<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php for ($z = 0; $z < $colcount && $ii < $introcount && $i < $this->total; $z++, $i++, $ii++) : ?> + <div class="article_column column<?php echo $z + 1; ?> cols<?php echo $colcount; ?>" > + <?php $this->item =& $this->getItem($i, $this->params); + echo $this->loadTemplate('item'); ?> + </div> + <span class="article_separator"> </span> + <?php endfor; ?> + <span class="row_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> </span> + </div> + <?php endfor; + endif; ?> + + <?php $numlinks = $this->params->def('num_links', 4); + if ($numlinks && $i < $this->total) : ?> + <div class="blog_more<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php $this->links = array_slice($this->items, $i - $this->pagination->limitstart, $i - $this->pagination->limitstart + $numlinks); + echo $this->loadTemplate('links'); ?> + </div> + <?php endif; ?> + + <?php if ($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2 && $this->pagination->get('pages.total') > 1)) : ?> + <?php if( $this->pagination->get('pages.total') > 1 ) : ?> + <p class="counter"> + <?php echo $this->pagination->getPagesCounter(); ?> + </p> + <?php endif; ?> + <?php if ($this->params->def('show_pagination_results', 1)) : ?> + <?php echo $this->pagination->getPagesLinks(); ?> + <?php endif; ?> + <?php endif; ?> +</div> diff --git a/oss/joomla/trunk/templates/beez/html/com_content/frontpage/default_item.php b/oss/joomla/trunk/templates/beez/html/com_content/frontpage/default_item.php new file mode 100644 index 00000000..5d472db4 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/frontpage/default_item.php @@ -0,0 +1,121 @@ +<?php // @version $Id: default_item.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php if ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) : ?> +<div class="contentpaneopen_edit<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?> +</div> +<?php endif; ?> + +<?php if ($this->item->params->get('show_title')) : ?> +<h2 class="contentheading<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?> + <a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->item->title); ?></a> + <?php else : + echo $this->escape($this->item->title); + endif; ?> +</h2> +<?php endif; ?> + +<?php if (!$this->item->params->get('show_intro')) : + echo $this->item->event->afterDisplayTitle; +endif; ?> + +<?php if ($this->item->params->get('show_pdf_icon') || $this->item->params->get('show_print_icon') || $this->item->params->get('show_email_icon')) : ?> +<p class="buttonheading"> + <img src="<?php echo $this->baseurl ?>/templates/<?php echo $mainframe->getTemplate(); ?>/images/trans.gif" alt="<?php echo JText::_('attention open in a new window'); ?>" /> + <?php if ($this->item->params->get('show_pdf_icon')) : + echo JHTML::_('icon.pdf', $this->item, $this->item->params, $this->access); + endif; + if ($this->item->params->get('show_print_icon')) : + echo JHTML::_('icon.print_popup', $this->item, $this->item->params, $this->access); + endif; + if ($this->item->params->get('show_email_icon')) : + echo JHTML::_('icon.email', $this->item, $this->item->params, $this->access); + endif; ?> +</p> +<?php endif; ?> + +<?php if (($this->item->params->get('show_section') && $this->item->sectionid) || ($this->item->params->get('show_category') && $this->item->catid)) : ?> +<p class="pageinfo"> + <?php if ($this->item->params->get('show_section') && $this->item->sectionid && isset($this->item->section)) : ?> + <span> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->item->section); ?> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + <?php if ($this->item->params->get('show_category')) : ?> + <?php echo ' - '; ?> + <?php endif; ?> + </span> + <?php endif; ?> + <?php if ($this->item->params->get('show_category') && $this->item->catid) : ?> + <span> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->item->category); ?> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + </span> + <?php endif; ?> +</p> +<?php endif; ?> + +<?php if ((intval($this->item->modified) !=0 && $this->item->params->get('show_modify_date')) || ($this->item->params->get('show_author') && ($this->item->author != "")) || ($this->item->params->get('show_create_date'))) : ?> +<p class="iteminfo"> + <?php if (intval($this->item->modified) !=0 && $this->item->params->get('show_modify_date')) : ?> + <span class="modifydate"> + <?php echo JText::sprintf('LAST_UPDATED2', JHTML::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC2'))); ?> + </span> + <?php endif; ?> + + <?php if (($this->item->params->get('show_author')) && ($this->item->author != "")) : ?> + <span class="createdby"> + <?php JText::printf('Written by', ($this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author)); ?> + </span> + <?php endif; ?> + + <?php if ($this->item->params->get('show_create_date')) : ?> + <span class="createdate"> + <?php echo JHTML::_('date', $this->item->created, JText::_('DATE_FORMAT_LC2')); ?> + </span> + <?php endif; ?> +</p> +<?php endif; ?> + +<?php echo $this->item->event->beforeDisplayContent; ?> + +<?php if ($this->item->params->get('show_url') && $this->item->urls) : ?> +<span class="small"> + <a href="<?php echo $this->escape($this->item->urls); ?>" target="_blank"> + <?php echo $this->escape($this->item->urls); ?></a> +</span> +<?php endif; ?> + +<?php if (isset ($this->item->toc)) : + echo $this->item->toc; +endif; ?> + +<?php echo JFilterOutput::ampReplace($this->item->text); ?> + +<?php if ($this->item->params->get('show_readmore') && $this->item->readmore) : ?> +<p> + <a href="<?php echo $this->item->readmore_link; ?>" class="readon<?php echo $this->item->params->get('pageclass_sfx'); ?>"> + <?php if ($this->item->readmore_register) : + echo JText::_('Register to read more...'); + elseif ($readmore = $this->item->params->get('readmore')) : + echo $readmore; + else : + echo JText::sprintf('Read more', $this->escape($this->item->title)); + endif; ?></a> +</p> +<?php endif; ?> + +<?php echo $this->item->event->afterDisplayContent; diff --git a/oss/joomla/trunk/templates/beez/html/com_content/frontpage/default_links.php b/oss/joomla/trunk/templates/beez/html/com_content/frontpage/default_links.php new file mode 100644 index 00000000..ef44a3ce --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/frontpage/default_links.php @@ -0,0 +1,16 @@ +<?php // @version $Id: default_links.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<h2> + <?php echo JText::_('More Articles...'); ?> +</h2> + +<ul> + <?php foreach ($this->links as $link) : ?> + <li> + <a class="blogsection" href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($link->slug, $link->catslug, $link->sectionid)); ?>"> + <?php echo $this->escape($link->title); ?></a> + </li> + <?php endforeach; ?> +</ul> diff --git a/oss/joomla/trunk/templates/beez/html/com_content/frontpage/index.html b/oss/joomla/trunk/templates/beez/html/com_content/frontpage/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/frontpage/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_content/index.html b/oss/joomla/trunk/templates/beez/html/com_content/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_content/section/blog.php b/oss/joomla/trunk/templates/beez/html/com_content/section/blog.php new file mode 100644 index 00000000..7f1e937f --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/section/blog.php @@ -0,0 +1,83 @@ +<?php // @version $Id: blog.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +$cparams = JComponentHelper::getParams ('com_media'); +?> + +<?php if ($this->params->get('show_page_title')) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<div class="blog<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php if ($this->params->def('show_description', 1) || $this->params->def('show_description_image', 1)) : ?> + <div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php if ($this->params->get('show_description_image') && $this->section->image) : ?> + <img src="<?php echo $this->baseurl . $cparams->get('image_path').'/'.$this->escape($this->section->image); ?>" class="image_<?php echo $this->escape($this->section->image_position); ?>" /> + <?php endif; ?> + + <?php if ($this->params->get('show_description') && $this->section->description) : + echo $this->section->description; + endif; ?> + + <?php if ($this->params->get('show_description_image') && $this->section->image) : ?> + <div class="wrap_image"> </div> + <?php endif; ?> + + </div> + <?php endif; ?> + + <?php $i = $this->pagination->limitstart; + $rowcount = $this->params->def('num_leading_articles', 1); + for ($y = 0; $y < $rowcount && $i < $this->total; $y++, $i++) : ?> + <div class="leading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php $this->item =& $this->getItem($i, $this->params); + echo $this->loadTemplate('item'); ?> + </div> + <span class="leading_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> </span> + <?php endfor; ?> + + <?php $introcount = (int)$this->params->def('num_intro_articles', 4); + if ($introcount) : + $colcount = (int)$this->params->def('num_columns', 2); + if ($colcount == 0) : + $colcount = 1; + endif; + $rowcount = (int) $introcount / $colcount; + $ii = 0; + for ($y = 0; $y < $rowcount && $i < $this->total; $y++) : ?> + <div class="article_row<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php for ($z = 0; $z < $colcount && $ii < $introcount && $i < $this->total; $z++, $i++, $ii++) : ?> + <div class="article_column column<?php echo $z + 1; ?> cols<?php echo $colcount; ?>" > + <?php $this->item =& $this->getItem($i, $this->params); + echo $this->loadTemplate('item'); ?> + </div> + <span class="article_separator"> </span> + <?php endfor; ?> + <span class="row_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> </span> + </div> + <?php endfor; + endif; ?> + + <?php $numlinks = (int)$this->params->def('num_links', 4); + if ($numlinks && $i < $this->total) : ?> + <div class="blog_more<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php $this->links = array_slice($this->items, $i - $this->pagination->limitstart, $i - $this->pagination->limitstart + $numlinks); + echo $this->loadTemplate('links'); ?> + </div> + <?php endif; ?> + + <?php if ($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2 && $this->pagination->get('pages.total') > 1)) : ?> + <?php if( $this->pagination->get('pages.total') > 1 ) : ?> + <p class="counter"> + <?php echo $this->pagination->getPagesCounter(); ?> + </p> + <?php endif; ?> + <?php if ($this->params->def('show_pagination_results', 1)) : ?> + <?php echo $this->pagination->getPagesLinks(); ?> + <?php endif; ?> + <?php endif; ?> + +</div> diff --git a/oss/joomla/trunk/templates/beez/html/com_content/section/blog_item.php b/oss/joomla/trunk/templates/beez/html/com_content/section/blog_item.php new file mode 100644 index 00000000..ee8897d1 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/section/blog_item.php @@ -0,0 +1,121 @@ +<?php // @version $Id: blog_item.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php if ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) : ?> +<div class="contentpaneopen_edit<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?> +</div> +<?php endif; ?> + +<?php if ($this->item->params->get('show_title')) : ?> +<h2 class="contentheading<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?> + <a href="<?php echo $this->escape($this->item->readmore_link); ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->item->title); ?></a> + <?php else : + echo $this->escape($this->item->title); + endif; ?> +</h2> +<?php endif; ?> + +<?php if (!$this->item->params->get('show_intro')) : + echo $this->item->event->afterDisplayTitle; +endif; ?> + +<?php if ($this->item->params->get('show_pdf_icon') || $this->item->params->get('show_print_icon') || $this->item->params->get('show_email_icon')) : ?> +<p class="buttonheading"> + <img src="<?php echo $this->baseurl ?>/templates/<?php echo $mainframe->getTemplate(); ?>/images/trans.gif" alt="<?php echo JText::_('attention open in a new window'); ?>" /> + <?php if ($this->item->params->get('show_pdf_icon')) : + echo JHTML::_('icon.pdf', $this->item, $this->item->params, $this->access); + endif; + if ($this->item->params->get('show_print_icon')) : + echo JHTML::_('icon.print_popup', $this->item, $this->item->params, $this->access); + endif; + if ($this->item->params->get('show_email_icon')) : + echo JHTML::_('icon.email', $this->item, $this->item->params, $this->access); + endif; ?> +</p> +<?php endif; ?> + +<?php if (($this->item->params->get('show_section') && $this->item->sectionid) || ($this->item->params->get('show_category') && $this->item->catid)) : ?> +<p class="pageinfo"> + <?php if ($this->item->params->get('show_section') && $this->item->sectionid && isset($this->section->title)) : ?> + <span> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->section->title); ?> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + <?php if ($this->item->params->get('show_category')) : ?> + <?php echo ' - '; ?> + <?php endif; ?> + </span> + <?php endif; ?> + <?php if ($this->item->params->get('show_category') && $this->item->catid) : ?> + <span> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->item->category); ?> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + </span> + <?php endif; ?> +</p> +<?php endif; ?> + +<?php if ((intval($this->item->modified) !=0 && $this->item->params->get('show_modify_date')) || ($this->item->params->get('show_author') && ($this->item->author != "")) || ($this->item->params->get('show_create_date'))) : ?> +<p class="iteminfo"> + <?php if ( intval($this->item->modified) != 0 && $this->item->params->get('show_modify_date')) : ?> + <span class="modifydate"> + <?php echo JText::sprintf('LAST_UPDATED2', JHTML::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC2'))); ?> + </span> + <?php endif; ?> + + <?php if (($this->item->params->get('show_author')) && ($this->item->author != "")) : ?> + <span class="createdby"> + <?php JText::printf('Written by', ($this->item->created_by_alias ? $this->escape($this->item->created_by_alias) : $this->escape($this->item->author))); ?> + </span> + <?php endif; ?> + + <?php if ($this->item->params->get('show_create_date')) : ?> + <span class="createdate"> + <?php echo JHTML::_('date', $this->item->created, JText::_('DATE_FORMAT_LC2')); ?> + </span> + <?php endif; ?> +</p> +<?php endif; ?> + +<?php echo $this->item->event->beforeDisplayContent; ?> + +<?php if ($this->item->params->get('show_url') && $this->item->urls) : ?> +<span class="small"> + <a href="<?php echo $this->escape($this->item->urls); ?>" target="_blank"> + <?php echo $this->escape($this->item->urls); ?></a> +</span> +<?php endif; ?> + +<?php if (isset ($this->item->toc)) : + echo $this->item->toc; +endif; ?> + +<?php echo JFilterOutput::ampReplace($this->item->text); ?> + +<?php if ($this->item->params->get('show_readmore') && $this->item->readmore) : ?> +<p> + <a href="<?php echo $this->item->readmore_link; ?>" class="readon<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php if ($this->item->readmore_register) : + echo JText::_('Register to read more...'); + elseif ($readmore = $this->item->params->get('readmore')) : + echo $readmore; + else : + echo JText::sprintf('Read more', $this->escape($this->item->title)); + endif; ?></a> +</p> +<?php endif; ?> + +<?php echo $this->item->event->afterDisplayContent; diff --git a/oss/joomla/trunk/templates/beez/html/com_content/section/blog_links.php b/oss/joomla/trunk/templates/beez/html/com_content/section/blog_links.php new file mode 100644 index 00000000..71836274 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/section/blog_links.php @@ -0,0 +1,16 @@ +<?php // @version $Id: blog_links.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<h2> + <?php echo JText::_('More Articles...'); ?> +</h2> + +<ul> + <?php foreach ($this->links as $link) : ?> + <li> + <a class="blogsection" href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($link->slug, $link->catslug, $link->sectionid)); ?>"> + <?php echo $this->escape($link->title); ?></a> + </li> + <?php endforeach; ?> +</ul> diff --git a/oss/joomla/trunk/templates/beez/html/com_content/section/default.php b/oss/joomla/trunk/templates/beez/html/com_content/section/default.php new file mode 100644 index 00000000..b4558f05 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/section/default.php @@ -0,0 +1,53 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +$cparams = JComponentHelper::getParams ('com_media'); +?> + +<?php if ($this->params->get('show_page_title',1)) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<?php if ($this->params->def('show_description', 1) || $this->params->def('show_description_image', 1)) : ?> +<div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php if ($this->params->get('show_description_image') && $this->section->image) : ?> + <img src="<?php echo $this->baseurl . '/' . $this->escape($cparams->get('image_path')).'/'.$this->escape($this->section->image); ?>" class="image_<?php echo $this->escape($this->section->image_position); ?>" /> + <?php endif; ?> + + <?php if ($this->params->get('show_description') && $this->section->description) : + echo $this->section->description; + endif; ?> + + <?php if ($this->params->get('show_description_image') && $this->section->image) : ?> + <div class="wrap_image"> </div> + <?php endif; ?> +</div> +<?php endif; ?> + +<?php if ($this->params->def('show_categories', 1) && count($this->categories)) : ?> +<ul> + <?php foreach ($this->categories as $category) : + if (!$this->params->get('show_empty_categories') && !$category->numitems) : + continue; + endif; ?> + <li> + <a href="<?php echo $category->link; ?>" class="category"><?php echo $this->escape($category->title); ?></a> + + <?php if ($this->params->get('show_cat_num_articles')) : ?> + <span class="small"> + ( <?php if ($category->numitems==1) { + echo $category->numitems ." ". JText::_( 'item' ); } + else { + echo $category->numitems ." ". JText::_( 'items' );} ?> ) + </span> + <?php endif; ?> + + <?php if ($this->params->def('show_category_description', 1) && $category->description) : ?> + <br /> + <?php echo $category->description; ?> + <?php endif; ?> + </li> + <?php endforeach; ?> +</ul> +<?php endif; diff --git a/oss/joomla/trunk/templates/beez/html/com_content/section/index.html b/oss/joomla/trunk/templates/beez/html/com_content/section/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_content/section/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_newsfeeds/categories/default.php b/oss/joomla/trunk/templates/beez/html/com_newsfeeds/categories/default.php new file mode 100644 index 00000000..3ca492a7 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_newsfeeds/categories/default.php @@ -0,0 +1,44 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +$cparams = JComponentHelper::getParams ('com_media'); +?> + +<?php if ($this->params->get('show_page_title',1)) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<?php if ($this->params->def( 'show_comp_description', 1 ) || $this->params->get( 'image', -1 ) != -1) : ?> +<div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php if ($this->params->get( 'image', -1 ) != -1) : ?> + <img src="<?php echo $this->baseurl . '/' . $this->escape($cparams->get('image_path')).'/'.$this->escape($this->params->get('image')); ?>" class="image_<?php echo $this->escape($this->params->get( 'image_align' )); ?>" /> + <?php endif; ?> + + <?php echo $this->params->get( 'comp_description' ); ?> + + <?php if ($this->params->get( 'image', -1 ) != -1) : ?> + <div class="wrap_image"> </div> + <?php endif; ?> + +</div> +<?php endif; ?> + +<?php if ( count( $this->categories ) ) : ?> +<ul> + <?php foreach ( $this->categories as $category ) : ?> + <li> + <a href="<?php echo $category->link; ?>" class="category"> + <?php echo $this->escape($category->title); ?></a> + <?php if ( $this->params->get( 'show_cat_items' ) ) : ?> +  <span class="small">(<?php echo (int)$category->numlinks . ' ' . JText::_( 'items' ); ?>)</span> + <?php endif; ?> + <?php if ( $this->params->def( 'show_cat_description', 1 ) && $category->description) : ?> + <br /> + <?php echo $category->description; ?> + <?php endif; ?> + </li> + <?php endforeach; ?> +</ul> +<?php endif; diff --git a/oss/joomla/trunk/templates/beez/html/com_newsfeeds/categories/index.html b/oss/joomla/trunk/templates/beez/html/com_newsfeeds/categories/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_newsfeeds/categories/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_newsfeeds/category/default.php b/oss/joomla/trunk/templates/beez/html/com_newsfeeds/category/default.php new file mode 100644 index 00000000..4217c620 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_newsfeeds/category/default.php @@ -0,0 +1,32 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +$cparams = JComponentHelper::getParams ('com_media'); +?> + +<?php if ( $this->params->get( 'show_page_title',1)): ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<div class="newsfeed<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>"> + <?php if ( $this->category->image || $this->category->description ) : ?> + <div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php if ( $this->category->image ) : ?> + <img src="<?php echo $this->baseurl . '/' . $cparams->get('image_path').'/'.$this->category->image; ?>" class="image_<?php echo $this->category->image_position; ?>" /> + <?php endif; ?> + + <?php if ( $this->params->get( 'description' ) ) : + echo $this->category->description; + endif; ?> + + <?php if ( $this->category->image ) : ?> + <div class="wrap_image"> </div> + <?php endif; ?> + + </div> + <?php endif; ?> + + <?php echo $this->loadTemplate('items'); ?> +</div> diff --git a/oss/joomla/trunk/templates/beez/html/com_newsfeeds/category/default_items.php b/oss/joomla/trunk/templates/beez/html/com_newsfeeds/category/default_items.php new file mode 100644 index 00000000..2238ffbe --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_newsfeeds/category/default_items.php @@ -0,0 +1,63 @@ +<?php // @version $Id: default_items.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php if ( $this->params->get( 'show_limit' ) ) : ?> +<div class="display"> + <form action="index.php" method="post" name="adminForm"> + <label for="limit"><?php echo JText::_( 'Display Num' ); ?> </label> + <?php echo $this->pagination->getLimitBox(); ?> + </form> +</div> +<?php endif; ?> + + +<table class="newsfeeds"> + + <?php if ( $this->params->get( 'show_headings' ) ) : ?> + <tr> + + <th class="sectiontableheader<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>" width="5" id="num"> + <?php echo JText::_( 'Num' ); ?> + </th> + + <?php if ( $this->params->get( 'show_name' ) ) : ?> + <th width="90%" class="sectiontableheader<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>" id="name"> + <?php echo JText::_( 'Feed Name' ); ?> + </th> + <?php endif; ?> + + <?php if ( $this->params->get( 'show_articles' ) ) : ?> + <th width="10%" class="sectiontableheader<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>" nowrap="nowrap" id="num_a"> + <?php echo JText::_('Num Articles'); ?> + </th> + <?php endif; ?> + + </tr> + <?php endif; ?> + + <?php foreach ( $this->items as $item ) : ?> + <tr class="sectiontableentry<?php echo $item->odd + 1; ?>"> + + <td align="center" width="5" headers="num"> + <?php echo $item->count + 1; ?> + </td> + + <td width="90%" headers="name"> + <a href="<?php echo $item->link; ?>" class="category<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>"> + <?php echo $this->escape($item->name); ?></a> + </td> + + <?php if ( $this->params->get( 'show_articles' ) ) : ?> + <td width="10%" headers="num_a"><?php echo $item->numarticles; ?></td> + <?php endif; ?> + + </tr> + <?php endforeach; ?> + +</table> + +<p class="counter"> + <?php echo $this->pagination->getPagesCounter(); ?> +</p> +<?php echo $this->pagination->getPagesLinks(); ?> diff --git a/oss/joomla/trunk/templates/beez/html/com_newsfeeds/category/index.html b/oss/joomla/trunk/templates/beez/html/com_newsfeeds/category/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_newsfeeds/category/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_newsfeeds/index.html b/oss/joomla/trunk/templates/beez/html/com_newsfeeds/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_newsfeeds/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_newsfeeds/newsfeed/default.php b/oss/joomla/trunk/templates/beez/html/com_newsfeeds/newsfeed/default.php new file mode 100644 index 00000000..2a18c09c --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_newsfeeds/newsfeed/default.php @@ -0,0 +1,75 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php + $lang = &JFactory::getLanguage(); + $myrtl =$this->newsfeed->rtl; + if ($lang->isRTL() && $myrtl==0){ + $direction= "direction:rtl !important;"; + $align= "text-align:right !important;"; + } + else if ($lang->isRTL() && $myrtl==1){ + $direction= "direction:ltr !important;"; + $align= "text-align:left !important;"; + } + else if ($lang->isRTL() && $myrtl==2){ + $direction= "direction:rtl !important;"; + $align= "text-align:right !important;"; + } + else if ($myrtl==0) { + $direction= "direction:ltr !important;"; + $align= "text-align:left !important;"; + } + else if ($myrtl==1) { + $direction= "direction:ltr !important;"; + $align= "text-align:left !important;"; + } + else if ($myrtl==2) { + $direction= "direction:rtl !important;"; + $align= "text-align:right !important;"; + } +?> +<?php if ( $this->params->get( 'show_page_title', 1 ) ) : ?> +<h1 style="<?php echo $direction; ?><?php echo $align; ?>" class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<h2 style="<?php echo $direction; ?><?php echo $align; ?>" class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <a href="<?php echo $this->newsfeed->channel['link']; ?>" target="_blank"> + <?php echo str_replace(''', "'", $this->escape($this->newsfeed->channel['title'])); ?></a> +</h2> + +<?php if ( $this->params->get( 'show_feed_description' ) ) : ?> +<div style="<?php echo $direction; ?><?php echo $align; ?>" class="feed_description"> + <?php echo str_replace(''', "'", $this->newsfeed->channel['description']); ?> +</div> +<?php endif; ?> + +<?php if ( isset( $this->newsfeed->image['url'] ) && isset( $this->newsfeed->image['title'] ) && $this->params->get( 'show_feed_image' ) ) : ?> +<p style="<?php echo $direction; ?><?php echo $align; ?>"> +<img src="<?php echo $this->escape($this->newsfeed->image['url']); ?>" alt="<?php echo $this->escape($this->newsfeed->image['title']); ?>" /> +</p> +<?php endif; ?> + +<?php if ( count( $this->newsfeed->items ) ) : ?> +<div style="<?php echo $direction; ?><?php echo $align; ?>"> +<ul style="<?php echo $direction; ?><?php echo $align; ?>"> + <?php foreach ( $this->newsfeed->items as $item ) : ?> + <li style="<?php echo $direction; ?><?php echo $align; ?>"> + <?php if ( !is_null( $item->get_link() ) ) : ?> + <a href="<?php echo $this->escape($item->get_link()); ?>" target="_blank"> + <?php echo $this->escape($item->get_title()); ?></a> + <?php endif; ?> + <?php if ( $this->params->get( 'show_item_description' ) && $item->get_description() ) : ?> + <br /> + <?php $text = $this->limitText( $item->get_description(), $this->params->get( 'feed_word_count' ) ); + echo str_replace(''', "'", $text); ?> + <br /><br /> + <?php endif; ?> + </li> + <?php endforeach; ?> +</ul> +</div> +<?php endif; diff --git a/oss/joomla/trunk/templates/beez/html/com_newsfeeds/newsfeed/index.html b/oss/joomla/trunk/templates/beez/html/com_newsfeeds/newsfeed/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_newsfeeds/newsfeed/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_poll/index.html b/oss/joomla/trunk/templates/beez/html/com_poll/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_poll/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_poll/poll/default.php b/oss/joomla/trunk/templates/beez/html/com_poll/poll/default.php new file mode 100644 index 00000000..ca82d42c --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_poll/poll/default.php @@ -0,0 +1,22 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php JHTML::_('stylesheet', 'poll_bars.css', 'components/com_poll/assets/'); ?> + +<?php if ($this->params->get('show_page_title',1)) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<div class="poll<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>"> + <form action="index.php" method="post" name="poll" id="poll"> + <label for="id"> + <?php echo JText::_( 'Select Poll' ); ?> <?php echo $this->lists['polls']; ?> + </label> + </form> + <?php if (count($this->votes)) : + echo $this->loadTemplate( 'graph' ); + endif; ?> +</div> diff --git a/oss/joomla/trunk/templates/beez/html/com_poll/poll/default_graph.php b/oss/joomla/trunk/templates/beez/html/com_poll/poll/default_graph.php new file mode 100644 index 00000000..097f1ad7 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_poll/poll/default_graph.php @@ -0,0 +1,44 @@ +<?php // @version $Id: default_graph.php 12230 2009-06-21 02:07:34Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<dl class="poll"> + <dt><?php echo JText::_( 'Number of Voters' ); ?></dt> + <dd><?php echo $this->votes[0]->voters; ?></dd> + <dt><?php echo JText::_( 'First Vote' ); ?></dt> + <dd><?php echo $this->first_vote; ?></dd> + <dt><?php echo JText::_( 'Last Vote' ); ?></dt> + <dd><?php echo $this->last_vote; ?></dd> +</dl> + +<h3> + <?php echo $this->escape($this->poll->title); ?> +</h3> + +<table class="pollstableborder"><?php JPlugin::loadLanguage( 'tpl_beez' ); ?> + <tr> + <th id="itema" class="td_1"><?php echo JText::_( 'Hits' ); ?></th> + <th id="itemb" class="td_2"><?php echo JText::_( 'Percent' ); ?></th> + <th id="itemc" class="td_3"><?php echo JText::_( 'Graph' ); ?></th> + </tr> + <?php for ( $row = 0; $row < count( $this->votes ); $row++ ) : + $vote = $this->votes[$row]; + ?> + <tr> + <td colspan="3" id="question<?php echo $row; ?>" class="question"> + <?php echo $vote->text; ?> + </td> + </tr> + <tr class="sectiontableentry<?php echo $vote->odd; ?>"> + <td headers="itema question<?php echo $row; ?>" class="td_1"> + <?php echo $vote->hits; ?> + </td> + <td headers="itemb question<?php echo $row; ?>" class="td_2"> + <?php echo $vote->percent.'%' ?> + </td> + <td headers="itemc question<?php echo $row; ?>" class="td_3"> + <div class="<?php echo $vote->class; ?>" style="height:<?php echo $vote->barheight; ?>px;width:<?php echo $vote->percent; ?>% !important"></div> + </td> + </tr> + <?php endfor; ?> +</table> diff --git a/oss/joomla/trunk/templates/beez/html/com_poll/poll/index.html b/oss/joomla/trunk/templates/beez/html/com_poll/poll/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_poll/poll/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_search/index.html b/oss/joomla/trunk/templates/beez/html/com_search/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_search/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_search/search/default.php b/oss/joomla/trunk/templates/beez/html/com_search/search/default.php new file mode 100644 index 00000000..b6c29eb7 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_search/search/default.php @@ -0,0 +1,20 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php if($this->params->get('show_page_title',1)) : ?> +<h2 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>"> + <?php echo $this->escape($this->params->get('page_title')) ?> +</h2> +<?php endif; ?> + +<div id="page"> + +<?php if (!$this->error) : + echo $this->loadTemplate('results'); +else : + echo $this->loadTemplate('error'); +endif; ?> + +<?php echo $this->loadTemplate('form'); ?> +</div> diff --git a/oss/joomla/trunk/templates/beez/html/com_search/search/default_error.php b/oss/joomla/trunk/templates/beez/html/com_search/search/default_error.php new file mode 100644 index 00000000..48681e13 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_search/search/default_error.php @@ -0,0 +1,10 @@ +<?php // @version $Id: default_error.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<h2 class="error<?php $this->escape($this->params->get( 'pageclass_sfx' )) ?>"> + <?php echo JText::_('Error') ?> +</h2> +<div class="error<?php echo $this->escape($this->params->get( 'pageclass_sfx' )) ?>"> + <p><?php echo $this->escape($this->error); ?></p> +</div> diff --git a/oss/joomla/trunk/templates/beez/html/com_search/search/default_form.php b/oss/joomla/trunk/templates/beez/html/com_search/search/default_form.php new file mode 100644 index 00000000..605e9ec2 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_search/search/default_form.php @@ -0,0 +1,48 @@ +<?php // @version $Id: default_form.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<form action="<?php echo JRoute::_( 'index.php?option=com_search#content' ) ?>" method="post" class="search_result<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>"> +<a name="form1"></a> +<h3><?php echo JText::_('search_again'); ?></h3> +<fieldset class="word"> +<label for="search_searchword"><?php echo JText::_('Search Keyword') ?> </label> +<input type="text" name="searchword" id="search_searchword" maxlength="20" value="<?php echo $this->escape($this->searchword) ?>" class="inputbox" /> +</fieldset> + +<fieldset class="phrase"> +<legend><?php echo JText::_('Search Parameters') ?></legend> +<?php echo $this->lists['searchphrase']; ?> +<br /><br /> +<label for="ordering" class="ordering"><?php echo JText::_('Ordering') ?>:</label> +<?php echo $this->lists['ordering']; ?> +</fieldset> + +<?php if ($this->params->get('search_areas', 1)) : ?> +<fieldset class="only"><legend><?php echo JText::_('Search Only') ?>:</legend> + <?php foreach ($this->searchareas['search'] as $val => $txt) : ?> + <?php $checked = is_array($this->searchareas['active']) && in_array($val, $this->searchareas['active']) ? 'checked="true"' : ''; ?> + <input type="checkbox" name="areas[]" value="<?php echo $val ?>" id="area_<?php echo $val ?>" <?php echo $checked ?> /> + <label for="area_<?php echo $val ?>"> + <?php echo JText::_($txt); ?> + </label><br /> + <?php endforeach; ?> +</fieldset> +<?php endif; ?> +<p> + <button name="Search" onclick="this.form.submit()" class="button"><?php echo JText::_( 'Search' );?></button> +</p> + + +<?php if (count($this->results)) : ?> +<div class="display"> +<label for="limit"><?php echo JText :: _('Display Num') ?></label> + <?php echo $this->pagination->getLimitBox(); ?> + <p> + <?php echo $this->pagination->getPagesCounter(); ?> + </p> +</div> +<?php endif; ?> + +<input type="hidden" name="task" value="search" /> +</form> diff --git a/oss/joomla/trunk/templates/beez/html/com_search/search/default_results.php b/oss/joomla/trunk/templates/beez/html/com_search/search/default_results.php new file mode 100644 index 00000000..74b7d44b --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_search/search/default_results.php @@ -0,0 +1,47 @@ + <?php // @version $Id: default_results.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php if (!empty($this->searchword)) : ?> +<div class="searchintro<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>"> + <p> + <?php echo JText::_('Search Keyword') ?> <strong><?php echo $this->escape($this->searchword) ?></strong> + <?php echo $this->result ?> + </p> + <p> + <a href="#form1" onclick="document.getElementById('search_searchword').focus();return false" onkeypress="document.getElementById('search_searchword').focus();return false" ><?php echo JText::_('Search_again') ?></a> + </p> +</div> +<?php endif; ?> + +<?php if (count($this->results)) : ?> +<div class="results"> + <h3><?php echo JText :: _('Search_result'); ?></h3> + <?php $start = $this->pagination->limitstart + 1; ?> + <ol class="list<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>" start="<?php echo (int)$start ?>"> + <?php foreach ($this->results as $result) : ?> + <li> + <?php if ($result->href) : ?> + <h4> + <a href="<?php echo JRoute :: _($result->href) ?>" <?php echo ($result->browsernav == 1) ? 'target="_blank"' : ''; ?> > + <?php echo $this->escape($result->title); ?></a> + </h4> + <?php endif; ?> + <?php if ($result->section) : ?> + <p><?php echo JText::_('Category') ?>: + <span class="small<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>"> + <?php echo $this->escape($result->section); ?> + </span> + </p> + <?php endif; ?> + + <?php echo $result->text; ?> + <span class="small<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>"> + <?php echo $this->escape($result->created); ?> + </span> + </li> + <?php endforeach; ?> + </ol> + <?php echo $this->pagination->getPagesLinks(); ?> +</div> +<?php endif; ?> diff --git a/oss/joomla/trunk/templates/beez/html/com_search/search/index.html b/oss/joomla/trunk/templates/beez/html/com_search/search/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_search/search/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_user/index.html b/oss/joomla/trunk/templates/beez/html/com_user/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_user/login/default.php b/oss/joomla/trunk/templates/beez/html/com_user/login/default.php new file mode 100644 index 00000000..51657c49 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/login/default.php @@ -0,0 +1,10 @@ +<?php // @version $Id: default.php 12352 2009-06-24 13:52:57Z ian $ +defined( '_JEXEC' ) or die( 'Restricted access' ); + ?> +<?php if($this->params->get('show_page_title',1)) : ?> +<h2 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>"> + <?php echo $this->params->get('page_title') ?> +</h2> +<?php endif; ?> + +<?php echo $this->loadTemplate( $this->type ); ?> diff --git a/oss/joomla/trunk/templates/beez/html/com_user/login/default_login.php b/oss/joomla/trunk/templates/beez/html/com_user/login/default_login.php new file mode 100644 index 00000000..84183a78 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/login/default_login.php @@ -0,0 +1,56 @@ +<?php // @version $Id: default_login.php 12352 2009-06-24 13:52:57Z ian $ +defined( '_JEXEC' ) or die( 'Restricted access' ); +?> +<form action="<?php echo JRoute::_( 'index.php', true, $this->params->get('usesecure')); ?>" method="post" name="login" id="login" class="login_form<?php echo $this->params->get( 'pageclass_sfx' ); ?>"> + <?php if ( $this->params->get( 'show_login_title' ) ) : ?> + <h1 class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>"> + <?php echo $this->params->get( 'header_login' ); ?> + </h1> + <?php endif; ?> + + <?php if ( $this->params->get( 'description_login' ) || isset( $this->image ) ) : ?> + <div class="contentdescription<?php echo $this->params->get( 'pageclass_sfx' );?>"> + <?php if (isset ($this->image)) : + echo $this->image; + endif; + if ($this->params->get('description_login')) : ?> + <p> + <?php echo $this->params->get('description_login_text'); ?> + </p> + <?php endif; + if (isset ($this->image)) : ?> + <div class="wrap_image"> </div> + <?php endif; ?> + </div> + <?php endif; ?> + <fieldset> + <div class="name"> + <label for="user" ><?php echo JText::_( 'Username' ); ?></label> + <input name="username" type="text" class="inputbox" size="20" id="user" /> + </div> + <div class="pass"> + <label for="pass" ><?php echo JText::_( 'Password' ); ?></label> + <input name="passwd" type="password" class="inputbox" size="20" id="pass" /> + </div> + <div class="remember"> + <label for="rem"><?php echo JText::_( 'Remember me' ); ?></label> + <input type="checkbox" name="remember" class="inputbox" value="yes" id="rem" /> + </div> + </fieldset> + <p> + <a href="<?php echo JRoute::_( 'index.php?option=com_user&view=reset#content' ); ?>"> + <?php JPlugin::loadLanguage( 'tpl_beez' ); echo JText::_('Lost Password?'); ?></a> + <?php if ( $this->params->get( 'registration' ) ) : ?> + <?php echo JText::_('No account yet?'); ?> + <a href="<?php echo JRoute::_( 'index.php?option=com_user&view=register#content' ); ?>"> + <?php echo JText::_( 'Register' ); ?></a> + <?php endif; ?> + </p> + + <input type="submit" name="submit" class="button" value="<?php echo JText::_( 'Login' ); ?>" /> + <noscript><?php echo JText::_( 'WARNJAVASCRIPT' ); ?></noscript> + <input type="hidden" name="option" value="com_user" /> + <input type="hidden" name="task" value="login" /> + <input type="hidden" name="return" value="<?php echo $this->return; ?>" /> + <?php echo JHTML::_( 'form.token' ); ?> +</form> diff --git a/oss/joomla/trunk/templates/beez/html/com_user/login/default_logout.php b/oss/joomla/trunk/templates/beez/html/com_user/login/default_logout.php new file mode 100644 index 00000000..851b4284 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/login/default_logout.php @@ -0,0 +1,32 @@ +<?php // @version $Id: default_logout.php 12352 2009-06-24 13:52:57Z ian $ +defined( '_JEXEC' ) or die( 'Restricted access' ); +?> + +<form action="<?php echo JRoute::_( 'index.php' ); ?>" method="post" name="login" id="login" class="logout_form<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>"> + <?php if ( $this->params->get( 'show_logout_title' ) ) : ?> + <h1 class="componentheading<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>"> + <?php echo $this->params->get( 'header_logout' ); ?> + </h1> + <?php endif; ?> + + <?php if ( $this->params->get( 'description_logout' ) || isset( $this->image ) ) : ?> + <div class="contentdescription<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>"> + <?php if (isset ($this->image)) : + echo $this->image; + endif; + if ( $this->params->get( 'description_logout' ) ) : ?> + <p> + <?php echo $this->params->get('description_logout_text'); ?> + </p> + <?php endif; + if (isset ($this->image)) : ?> + <div class="wrap_image"> </div> + <?php endif; ?> + </div> + <?php endif; ?> + + <p><input type="submit" name="Submit" class="button" value="<?php echo JText::_( 'Logout' ); ?>" /></p> + <input type="hidden" name="option" value="com_user" /> + <input type="hidden" name="task" value="logout" /> + <input type="hidden" name="return" value="<?php echo $this->return; ?>" /> +</form> diff --git a/oss/joomla/trunk/templates/beez/html/com_user/login/index.html b/oss/joomla/trunk/templates/beez/html/com_user/login/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/login/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_user/register/default.php b/oss/joomla/trunk/templates/beez/html/com_user/register/default.php new file mode 100644 index 00000000..4b8495e3 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/register/default.php @@ -0,0 +1,50 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined( '_JEXEC' ) or die( 'Restricted access' ); +?> +<?php if($this->params->get('show_page_title',1)) : ?> +<h2 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>"> + <?php echo $this->escape($this->params->get('page_title')) ?> +</h2> +<?php endif; ?> + +<script type="text/javascript"> + Window.onDomReady(function(){ + document.formvalidator.setHandler('passverify', function (value) { return ($('password').value == value); } ); + }); +</script> + +<form action="<?php echo JRoute::_('index.php?option=com_user#content'); ?>" method="post" id="josForm" name="josForm" class="form-validate user"> + <?php if(isset($this->message)) : + $this->display('message'); + endif; ?> + <fieldset> + <p><?php echo JText::_('REGISTER_REQUIRED'); ?></p> + <div class="name"> + <label id="namemsg" for="name"><?php echo JText::_('Name'); ?>: *</label> + <input type="text" name="name" id="name" value="<?php echo $this->escape($this->user->get('name')); ?>" class="inputbox validate required none namemsg" maxlength="50" /> + </div> + <div class="user"> + <label id="usernamemsg" for="username"><?php echo JText::_('Username'); ?>: *</label> + <input type="text" id="username" name="username" value="<?php echo $this->escape($this->user->get('username')); ?>" class="inputbox validate required username usernamemsg" maxlength="25" /> + </div> + <div class="email"> + <label id="emailmsg" for="email"><?php echo JText::_('Email'); ?>: *</label> + <input type="text" id="email" name="email" value="<?php echo $this->escape($this->user->get('email')); ?>" class="inputbox validate required email emailmsg" maxlength="100" /> + </div> + </fieldset> + <fieldset> + <div class="pass"> + <label id="pwmsg" for="password"><?php echo JText::_('Password'); ?>: *</label> + <input type="password" id="password" name="password" value="" class="inputbox required validate-password" /> + </div> + <div class="verify_pass"> + <label id="pw2msg" for="password2"><?php echo JText::_('Verify Password'); ?>: *</label> + <input type="password" id="password2" name="password2" value="" class="inputbox required validate-passverify" /> + </div> + </fieldset> + <button class="button validate" type="submit"><?php echo JText::_('Register'); ?></button> + <input type="hidden" name="task" value="register_save" /> + <input type="hidden" name="id" value="0" /> + <input type="hidden" name="gid" value="0" /> + <?php echo JHTML::_( 'form.token' ); ?> +</form> diff --git a/oss/joomla/trunk/templates/beez/html/com_user/register/default_message.php b/oss/joomla/trunk/templates/beez/html/com_user/register/default_message.php new file mode 100644 index 00000000..ce05137b --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/register/default_message.php @@ -0,0 +1,11 @@ +<?php // @version $Id: default_message.php 11917 2009-05-29 19:37:05Z ian $ +defined( '_JEXEC' ) or die( 'Restricted access' ); +?> + +<h3> + <?php echo $this->escape($this->message->title); ?> +</h3> + +<p class="message"> + <?php echo $this->escape($this->message->text); ?> +</p> diff --git a/oss/joomla/trunk/templates/beez/html/com_user/register/index.html b/oss/joomla/trunk/templates/beez/html/com_user/register/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/register/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_user/remind/default.php b/oss/joomla/trunk/templates/beez/html/com_user/remind/default.php new file mode 100644 index 00000000..a96bd181 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/remind/default.php @@ -0,0 +1,18 @@ +<?php // @version $Id: default.php$ +defined('_JEXEC') or die('Restricted access'); +?> +<?php if($this->params->get('show_page_title',1)) : ?> +<h2 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>"> + <?php echo $this->escape($this->params->get('page_title')) ?> +</h2> +<?php endif; ?> + +<form action="<?php echo JRoute::_( 'index.php?option=com_user&task=remindusername' ); ?>" method="post" class="josForm form-validate"> + <p><?php echo JText::_('REMIND_USERNAME_DESCRIPTION'); ?></p> + + <label for="email" class="hasTip" title="<?php echo JText::_('REMIND_USERNAME_EMAIL_TIP_TITLE'); ?>::<?php echo JText::_('REMIND_USERNAME_EMAIL_TIP_TEXT'); ?>"><?php echo JText::_('Email Address'); ?>:</label> + <input id="email" name="email" type="text" class="required validate-email" /> + + <button type="submit" class="validate"><?php echo JText::_('Submit'); ?></button> + <?php echo JHTML::_( 'form.token' ); ?> +</form> diff --git a/oss/joomla/trunk/templates/beez/html/com_user/remind/default_message.php b/oss/joomla/trunk/templates/beez/html/com_user/remind/default_message.php new file mode 100644 index 00000000..365f9d36 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/remind/default_message.php @@ -0,0 +1,11 @@ +<?php // @version $Id: default_message.php$ +defined('_JEXEC') or die('Restricted access'); +?> + +<div class="componentheading"> + <?php echo $this->escape($this->message->title); ?> +</div> + +<div class="message"> + <?php echo $this->escape($this->message->text); ?> +</div> diff --git a/oss/joomla/trunk/templates/beez/html/com_user/remind/index.html b/oss/joomla/trunk/templates/beez/html/com_user/remind/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/remind/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_user/reset/complete.php b/oss/joomla/trunk/templates/beez/html/com_user/reset/complete.php new file mode 100644 index 00000000..0b1d12f0 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/reset/complete.php @@ -0,0 +1,36 @@ +<?php // @version $Id: complete.php 11786 2009-04-24 17:48:08Z kdevine $ +defined('_JEXEC') or die('Restricted access'); +?> + +<div class="componentheading"> + <?php echo JText::_('Reset your Password'); ?> +</div> + +<form action="<?php echo JRoute::_( 'index.php?option=com_user&task=completereset' ); ?>" method="post" class="josForm form-validate"> + <table cellpadding="0" cellspacing="0" border="0" width="100%" class="contentpane"> + <tr> + <td colspan="2" height="40"> + <p><?php echo JText::_('RESET_PASSWORD_COMPLETE_DESCRIPTION'); ?></p> + </td> + </tr> + <tr> + <td height="40"> + <label for="password1" class="hasTip" title="<?php echo JText::_('RESET_PASSWORD_PASSWORD1_TIP_TITLE'); ?>::<?php echo JText::_('RESET_PASSWORD_PASSWORD1_TIP_TEXT'); ?>"><?php echo JText::_('Password'); ?>:</label> + </td> + <td> + <input id="password1" name="password1" type="password" class="required validate-password" /> + </td> + </tr> + <tr> + <td height="40"> + <label for="password2" class="hasTip" title="<?php echo JText::_('RESET_PASSWORD_PASSWORD2_TIP_TITLE'); ?>::<?php echo JText::_('RESET_PASSWORD_PASSWORD2_TIP_TEXT'); ?>"><?php echo JText::_('Verify Password'); ?>:</label> + </td> + <td> + <input id="password2" name="password2" type="password" class="required validate-password" /> + </td> + </tr> + </table> + + <button type="submit" class="validate"><?php echo JText::_('Submit'); ?></button> + <?php echo JHTML::_( 'form.token' ); ?> +</form> diff --git a/oss/joomla/trunk/templates/beez/html/com_user/reset/confirm.php b/oss/joomla/trunk/templates/beez/html/com_user/reset/confirm.php new file mode 100644 index 00000000..cfed47f3 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/reset/confirm.php @@ -0,0 +1,36 @@ +<?php // @version $Id: confirm.php 16385 2010-04-23 10:44:15Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<div class="componentheading"> + <?php echo JText::_('Confirm your Account'); ?> +</div> + +<form action="<?php echo JRoute::_( 'index.php?option=com_user&task=confirmreset' ); ?>" method="post" class="josForm form-validate"> + <table cellpadding="0" cellspacing="0" border="0" width="100%" class="contentpane"> + <tr> + <td colspan="2" height="40"> + <p><?php echo JText::_('RESET_PASSWORD_CONFIRM_DESCRIPTION'); ?></p> + </td> + </tr> + <tr> + <td height="40"> + <label for="username" class="hasTip" title="<?php echo JText::_('RESET_PASSWORD_USERNAME_TIP_TITLE'); ?>::<?php echo JText::_('RESET_PASSWORD_USERNAME_TIP_TEXT'); ?>"><?php echo JText::_('User Name'); ?>:</label> + </td> + <td> + <input id="username" name="username" type="text" class="required" size="36" /> + </td> + </tr> + <tr> + <td height="40"> + <label for="token" class="hasTip" title="<?php echo JText::_('RESET_PASSWORD_TOKEN_TIP_TITLE'); ?>::<?php echo JText::_('RESET_PASSWORD_TOKEN_TIP_TEXT'); ?>"><?php echo JText::_('Token'); ?>:</label> + </td> + <td> + <input id="token" name="token" type="text" class="required" size="36" /> + </td> + </tr> + </table> + + <button type="submit" class="validate"><?php echo JText::_('Submit'); ?></button> + <?php echo JHTML::_( 'form.token' ); ?> +</form> diff --git a/oss/joomla/trunk/templates/beez/html/com_user/reset/default.php b/oss/joomla/trunk/templates/beez/html/com_user/reset/default.php new file mode 100644 index 00000000..af885054 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/reset/default.php @@ -0,0 +1,18 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> +<?php if($this->params->get('show_page_title',1)) : ?> +<h2 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>"> + <?php echo $this->escape($this->params->get('page_title')) ?> +</h2> +<?php endif; ?> + +<form action="<?php echo JRoute::_( 'index.php?option=com_user&task=requestreset' ); ?>" method="post" class="josForm form-validate"> + <p><?php echo JText::_('RESET_PASSWORD_REQUEST_DESCRIPTION'); ?></p> + + <label for="email" class="hasTip" title="<?php echo JText::_('RESET_PASSWORD_EMAIL_TIP_TITLE'); ?>::<?php echo JText::_('RESET_PASSWORD_EMAIL_TIP_TEXT'); ?>"><?php echo JText::_('Email Address'); ?>:</label> + <input id="email" name="email" type="text" class="required validate-email" /> + + <button type="submit" class="validate"><?php echo JText::_('Submit'); ?></button> + <?php echo JHTML::_( 'form.token' ); ?> +</form> diff --git a/oss/joomla/trunk/templates/beez/html/com_user/reset/index.html b/oss/joomla/trunk/templates/beez/html/com_user/reset/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/reset/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_user/user/default.php b/oss/joomla/trunk/templates/beez/html/com_user/user/default.php new file mode 100644 index 00000000..238b8787 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/user/default.php @@ -0,0 +1,15 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> +<?php if($this->params->get('show_page_title',1)) : ?> +<h2 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>"> + <?php echo $this->escape($this->params->get('page_title')) ?> +</h2> +<?php endif; ?> +<h1 class="componentheading"> + <?php echo JText::_('Welcome!'); ?> +</h1> + +<div class="contentdescription"> + <?php echo $this->params->get('welcome_desc', JText::_( 'WELCOME_DESC' ));; ?> +</div> diff --git a/oss/joomla/trunk/templates/beez/html/com_user/user/form.php b/oss/joomla/trunk/templates/beez/html/com_user/user/form.php new file mode 100644 index 00000000..1a012094 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/user/form.php @@ -0,0 +1,58 @@ +<?php // @version $Id: form.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> +<?php if($this->params->get('show_page_title',1)) : ?> +<h2 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>"> + <?php echo $this->escape($this->params->get('page_title')) ?> +</h2> +<?php endif; ?> +<script type="text/javascript"> +<!-- + Window.onDomReady(function(){ + document.formvalidator.setHandler('passverify', function (value) { return ($('password').value == value); } ); + }); +// --> +</script> + +<form action="<?php echo JRoute::_( 'index.php' ); ?>" method="post" name="userform" autocomplete="off" class="user"> + + <div class="user_name"> + <label for="username"><?php echo JText::_( 'User Name' ); ?>: </label> + <span><?php echo $this->escape($this->user->get('username')); ?></span> + </div> + + <div class="name"> + <label for="name"><?php echo JText::_( 'Your Name' ); ?>: </label> + <input class="inputbox" type="text" id="name" name="name" value="<?php echo $this->escape($this->user->get('name')); ?>" size="40" /> + </div> + + <div class="email"> + <label for="email"><?php echo JText::_( 'email' ); ?>: </label> + <input class="inputbox required validate-email" type="text" id="email" name="email" value="<?php echo $this->escape($this->user->get('email'));?>" size="40" /> + </div> + + <?php if($this->user->get('password')) : ?> + <div class="pass"> + <label for="password"><?php echo JText::_( 'Password' ); ?>: </label> + <input class="inputbox validate-password" type="password" id="password" name="password" value="" size="40" /> + </div> + + <div class="verify_pass"> + <label for="verifyPass"><?php echo JText::_( 'Verify Password' ); ?>: </label> + <input class="inputbox validate-passverify" type="password" id="password2" name="password2" size="40" /> + </div> + <?php endif; ?> + <?php if(isset($this->params)) : + echo $this->params->render( 'params' ); + endif; ?> + + <button class="button validate" type="submit" onclick="submitbutton( this.form );return false;"><?php echo JText::_( 'Save' ); ?></button> + + <input type="hidden" name="username" value="<?php echo $this->escape($this->user->get('username'));?>" /> + <input type="hidden" name="id" value="<?php echo (int)$this->user->get('id');?>" /> + <input type="hidden" name="gid" value="<?php echo (int)$this->user->get('gid');?>" /> + <input type="hidden" name="option" value="com_user" /> + <input type="hidden" name="task" value="save" /> + <?php echo JHTML::_( 'form.token' ); ?> + +</form> diff --git a/oss/joomla/trunk/templates/beez/html/com_user/user/index.html b/oss/joomla/trunk/templates/beez/html/com_user/user/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_user/user/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_weblinks/categories/default.php b/oss/joomla/trunk/templates/beez/html/com_weblinks/categories/default.php new file mode 100644 index 00000000..036b1baa --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_weblinks/categories/default.php @@ -0,0 +1,46 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +$cparams = JComponentHelper::getParams ('com_media'); +?> + +<?php if ($this->params->get('show_page_title',1)) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + + +<div class="weblinks<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php if ($this->params->def('show_comp_description', 1) || $this->params->def('image', -1) != -1) : ?> + <div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php if ($this->params->def('image', -1) != -1) : ?> + <img src="<?php echo $this->baseurl . $this->escape($cparams->get('image_path')).'/'.$this->escape($this->params->get('image')); ?>" alt="" class="image_<?php echo $this->escape($this->params->get('image_align')); ?>" /> + <?php endif; ?> + + <?php if ($this->params->get('show_comp_description')) : + echo $this->params->get('comp_description'); + endif; ?> + + <?php if ($this->params->def('image', -1) != -1) : ?> + <div class="wrap_image"> </div> + <?php endif; ?> + + </div> + <?php endif; ?> + +</div> + + +<?php if (count($this->categories)) : ?> +<ul> + <?php foreach ($this->categories as $category) : ?> + <li> + <a href="<?php echo $category->link; ?>" class="category<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($category->title); ?></a> +  <span class="small">(<?php echo (int)$category->numlinks ?>)</span> + </li> + <?php endforeach; ?> +</ul> +<?php endif; diff --git a/oss/joomla/trunk/templates/beez/html/com_weblinks/categories/index.html b/oss/joomla/trunk/templates/beez/html/com_weblinks/categories/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_weblinks/categories/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_weblinks/category/default.php b/oss/joomla/trunk/templates/beez/html/com_weblinks/category/default.php new file mode 100644 index 00000000..ce9be258 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_weblinks/category/default.php @@ -0,0 +1,32 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php if ($this->params->get('show_page_title', 1)) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + + +<div class="weblinks<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php if ( $this->category->image || $this->category->description) : ?> + <div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php if ($this->category->image) : + echo $this->category->image; + endif; ?> + + <?php echo $this->category->description; ?> + + <?php if ($this->category->image) : ?> + <div class="wrap_image"> </div> + <?php endif; ?> + + </div> + <?php endif; ?> + + <?php echo $this->loadTemplate('items'); ?> + +</div> diff --git a/oss/joomla/trunk/templates/beez/html/com_weblinks/category/default_items.php b/oss/joomla/trunk/templates/beez/html/com_weblinks/category/default_items.php new file mode 100644 index 00000000..d9bd82ba --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_weblinks/category/default_items.php @@ -0,0 +1,80 @@ +<?php // @version $Id: default_items.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<script type="text/javascript"> + function tableOrdering(order, dir, task) { + var form = document.adminForm; + + form.filter_order.value = order; + form.filter_order_Dir.value = dir; + document.adminForm.submit(task); + } +</script> + +<div class="display"> + <form action="<?php echo $this->escape($this->action); ?>" method="post" name="adminForm"> + <?php echo JText :: _('Display Num'); ?>  + <?php echo $this->pagination->getLimitBox(); ?> + <input type="hidden" name="filter_order" value="<?php echo $this->lists['order'] ?>" /> + <input type="hidden" name="filter_order_Dir" value="" /> + </form> +</div> + + +<table class="weblinks"> + + <?php if ($this->params->def('show_headings', 1)) : ?> + <tr> + + <th class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" width="5" id="num"> + <?php echo JText::_('Num'); ?> + </th> + + <th width="90%" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" id="title"> + <?php echo JHTML::_('grid.sort', 'Web Link', 'title', $this->lists['order_Dir'], $this->lists['order']); ?> + </th> + + <?php if ($this->params->get('show_link_hits')) : ?> + <th width="10%" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" nowrap="nowrap" id="hits"> + <?php echo JHTML::_('grid.sort', 'Hits', 'hits', $this->lists['order_Dir'], $this->lists['order']); ?> + </th> + <?php endif; ?> + + </tr> + <?php endif; ?> + + <?php foreach ($this->items as $item) : ?> + <tr class="sectiontableentry<?php echo $item->odd + 1; ?>"> + + <td align="center" headers="num"> + <?php echo $this->pagination->getRowOffset($item->count); ?> + </td> + + <td headers="title"> + <?php if ($item->image) : + echo $item->image; + endif; + echo $item->link; + if ($this->params->get('show_link_description')) : ?> + <br /> + <?php echo nl2br($item->description); + endif; ?> + </td> + + <?php if ($this->params->get('show_link_hits')) : ?> + <td headers="hits"> + <?php echo (int)$item->hits; ?> + </td> + <?php endif; ?> + + </tr> + <?php endforeach; ?> + +</table> + + +<p class="counter"> + <?php echo $this->pagination->getPagesCounter(); ?> +</p> +<?php echo $this->pagination->getPagesLinks(); diff --git a/oss/joomla/trunk/templates/beez/html/com_weblinks/category/index.html b/oss/joomla/trunk/templates/beez/html/com_weblinks/category/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_weblinks/category/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_weblinks/index.html b/oss/joomla/trunk/templates/beez/html/com_weblinks/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_weblinks/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/com_weblinks/weblink/form.php b/oss/joomla/trunk/templates/beez/html/com_weblinks/weblink/form.php new file mode 100644 index 00000000..85b97ae6 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_weblinks/weblink/form.php @@ -0,0 +1,88 @@ +<?php // @version $Id: form.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> +<?php if($this->params->get('show_page_title',1)) : ?> +<h2 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>"> + <?php echo $this->escape($this->params->get('page_title')) ?> +</h2> +<?php endif; ?> +<script type="text/javascript"> + //<![CDATA[ +function submitbutton(pressbutton) +{ + var form = document.adminForm; + if (pressbutton == 'cancel') { + submitform( pressbutton ); + return; + } + + // do field validation + if (document.getElementById('jformtitle').value == ""){ + alert( "<?php echo JText::_( 'Weblink item must have a title', true ); ?>" ); + } else if (document.getElementById('jformcatid').value < 1) { + alert( "<?php echo JText::_( 'You must select a category.', true ); ?>" ); + } else if (document.getElementById('jformurl').value == ""){ + alert( "<?php echo JText::_( 'You must have a url.', true ); ?>" ); + } else { + submitform( pressbutton ); + } +} + //]]> +</script> + +<form action="<?php echo $this->action ?>" method="post" name="adminForm" class="editor" id="adminForm"> +<fieldset class="publishing"> +<legend><?php echo JText::_( 'Submit A Web Link' );?></legend> + <div> + <label for="jformtitle"><?php echo JText::_( 'Name' ); ?>:</label> + <input class="inputbox" type="text" id="jformtitle" name="jform[title]" size="50" maxlength="250" value="<?php echo $this->escape($this->weblink->title);?>" /> + </div> + + <div> + <label for="jformcatid"><?php echo JText::_( 'Category' ); ?>:</label> + <?php echo $this->lists['catid']; ?> + </div> + <div> + <label for="jformurl"><?php echo JText::_( 'URL' ); ?>:</label> + <input class="inputbox" type="text" id="jformurl" name="jform[url]" value="<?php echo $this->escape($this->weblink->url); ?>" size="50" maxlength="250" /> + </div> + + <div> + <label for="jformdescription"><?php echo JText::_( 'Description' ); ?>:</label> + <textarea class="inputbox" cols="30" rows="6" id="jformdescription" name="jform[description]" style="width:300px"><?php echo htmlspecialchars( $this->weblink->description, ENT_QUOTES );?></textarea> + </div> +</fieldset> + +<fieldset> +<legend><?php echo JText::_( 'Published' );?></legend> +<div> + <label for="jformpublished"> + <?php echo JText::_( 'Published' ); ?>: + </label> + <?php echo $this->lists['published']; ?> +</div> +<div><label for="jformordering"> + <?php echo JText::_( 'Ordering' ); ?>: + </label> + <?php echo $this->lists['ordering']; ?> +</div> +</fieldset> + + +<div> + <button type="button" onclick="submitbutton('save')"> + <?php echo JText::_('Save') ?> + </button> + <button type="button" onclick="submitbutton('cancel')" > + <?php echo JText::_('Cancel') ?> + </button> +</div> + + <input type="hidden" name="jform[id]" value="<?php echo (int)$this->weblink->id; ?>" /> + <input type="hidden" name="jform[ordering]" value="<?php echo (int)$this->weblink->ordering; ?>" /> + <input type="hidden" name="jform[approved]" value="<?php echo $this->weblink->approved; ?>" /> + <input type="hidden" name="option" value="com_weblinks" /> + <input type="hidden" name="controller" value="weblink" /> + <input type="hidden" name="task" value="" /> + <?php echo JHTML::_( 'form.token' ); ?> +</form> diff --git a/oss/joomla/trunk/templates/beez/html/com_weblinks/weblink/index.html b/oss/joomla/trunk/templates/beez/html/com_weblinks/weblink/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/com_weblinks/weblink/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/editor_content.css b/oss/joomla/trunk/templates/beez/html/editor_content.css new file mode 100644 index 00000000..626168a3 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/editor_content.css @@ -0,0 +1,50 @@ +body { + background: #000; + font-family: Arial,sans-serif; + line-height: 1.3em; + font-size: 96%; + color: #333; +} + +h1 { + font-family:Helvetica ,Arial,sans-serif; + font-size: 16px; + font-weight: bold; + color: #ff0000; +} + +h2 { + font-family: Arial, Helvetica,sans-serif; + font-size: 14px;; + font-weight: normal; + color: #333; +} + +h3 { + font-weight: bold; + font-family: Helvetica,Arial,sans-serif; + font-size: 19px; + color: #135cae; +} + +h4 { + font-weight: bold; + font-family: Arial, Helvetica, sans-serif; + color: #333; +} + +a:link, a:visited { + color: #1B57B1; text-decoration: none; + font-weight: normal; +} + +a:hover { + color: #00c; text-decoration: underline; + font-weight: normal; +} + +div.caption { padding: 0 10px 0 10px; } +div.caption img { border: 1px solid #CCC; } +div.caption p { font-size: .90em; color: #666; text-align: center; } + +div.teaser { background:#ccc; } \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/index.html b/oss/joomla/trunk/templates/beez/html/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/mod_latestnews/default.php b/oss/joomla/trunk/templates/beez/html/mod_latestnews/default.php new file mode 100644 index 00000000..103f3a1a --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/mod_latestnews/default.php @@ -0,0 +1,14 @@ +<?php // @version $Id: default.php 10381 2008-06-01 03:35:53Z pasamio $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php if (count($list)) : ?> +<ul class="latestnews<?php echo $params->get('pageclass_sfx'); ?>"> + <?php foreach ($list as $item) : ?> + <li class="latestnews<?php echo $params->get('pageclass_sfx'); ?>"> + <a href="<?php echo $item->link; ?>" class="latestnews<?php echo $params->get('pageclass_sfx'); ?>"> + <?php echo $item->text; ?></a> + </li> + <?php endforeach; ?> +</ul> +<?php endif; diff --git a/oss/joomla/trunk/templates/beez/html/mod_latestnews/index.html b/oss/joomla/trunk/templates/beez/html/mod_latestnews/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/mod_latestnews/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/mod_login/default.php b/oss/joomla/trunk/templates/beez/html/mod_login/default.php new file mode 100644 index 00000000..0a6c8fe7 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/mod_login/default.php @@ -0,0 +1,70 @@ +<?php // @version $Id: default.php 11796 2009-05-06 02:03:15Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php +$return = base64_encode(base64_decode($return).'#content'); + +if ($type == 'logout') : ?> +<form action="index.php" method="post" name="login" class="log"> + <?php if ($params->get('greeting')) : ?> + <p> + <?php if ($params->get('name')) : { + echo JText::sprintf( 'HINAME', $user->get('name') ); + } else : { + echo JText::sprintf( 'HINAME', $user->get('username') ); + } endif; ?> + </p> + <?php endif; ?> + <p> + <input type="submit" name="Submit" class="button" value="<?php echo JText::_('BUTTON_LOGOUT'); ?>" /> + </p> + <input type="hidden" name="option" value="com_user" /> + <input type="hidden" name="task" value="logout" /> + <input type="hidden" name="return" value="<?php echo $return; ?>" /> +</form> +<?php else : ?> +<form action="<?php echo JRoute::_( 'index.php', true, $params->get('usesecure')); ?>" method="post" name="login" class="form-login"> + <?php if ($params->get('pretext')) : ?> + <p> + <?php echo $params->get('pretext'); ?> + </p> + <?php endif; ?> + <fieldset> + <label for="mod_login_username"> + <?php echo JText::_('Username'); ?> + </label> + <input name="username" id="mod_login_username" type="text" class="inputbox" alt="<?php echo JText::_('Username'); ?>" /> + <label for="mod_login_password"> + <?php echo JText::_('Password'); ?> + </label> + <input type="password" id="mod_login_password" name="passwd" class="inputbox" alt="<?php echo JText::_('Password'); ?>" /> + </fieldset> + <label for="mod_login_remember" class="remember"> + <?php echo JText::_('Remember me'); ?> + </label> + <input type="checkbox" name="remember" id="mod_login_remember" class="checkbox" value="yes" alt="<?php echo JText::_('Remember me'); ?>" /> + <input type="submit" name="Submit" class="button" value="<?php echo JText::_('BUTTON_LOGIN'); ?>" /> + <p> + <a href="<?php echo JRoute::_('index.php?option=com_user&view=reset#content'); ?>"> + <?php echo JText::_('FORGOT_YOUR_PASSWORD'); ?></a> + </p> + <p> + <a href="<?php echo JRoute::_('index.php?option=com_user&view=remind#content'); ?>"> + <?php echo JText::_('FORGOT_YOUR_USERNAME'); ?></a> + </p> + <?php $usersConfig =& JComponentHelper::getParams('com_users'); + if ($usersConfig->get('allowUserRegistration')) : ?> + <p> + <?php echo JText::_('No account yet?'); ?> + <a href="<?php echo JRoute::_('index.php?option=com_user&view=register#content'); ?>"> + <?php echo JText::_('Register'); ?></a> + </p> + <?php endif; + echo $params->get('posttext'); ?> + <input type="hidden" name="option" value="com_user" /> + <input type="hidden" name="task" value="login" /> + <input type="hidden" name="return" value="<?php echo $return; ?>" /> + <?php echo JHTML::_( 'form.token' ); ?> +</form> +<?php endif; diff --git a/oss/joomla/trunk/templates/beez/html/mod_login/index.html b/oss/joomla/trunk/templates/beez/html/mod_login/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/mod_login/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/mod_newsflash/_item.php b/oss/joomla/trunk/templates/beez/html/mod_newsflash/_item.php new file mode 100644 index 00000000..ca49d6b9 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/mod_newsflash/_item.php @@ -0,0 +1,29 @@ +<?php // @version $Id: _item.php 12349 2009-06-24 13:37:19Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php if ($params->get('item_title')) : ?> +<h4> + <?php if ($params->get('link_titles') && (isset($item->linkOn))) : ?> + <a href="<?php echo JRoute::_($item->linkOn); ?>" class="contentpagetitle<?php echo $params->get('moduleclass_sfx'); ?>"> + <?php echo $item->title; ?></a> + <?php else : + echo $item->title; + endif; ?> +</h4> +<?php endif; ?> + +<?php if (!$params->get('intro_only')) : + echo $item->afterDisplayTitle; +endif; ?> + +<?php echo $item->beforeDisplayContent; +echo JFilterOutput::ampReplace($item->text); + +$itemparams=new JParameter($item->attribs); +$readmoretxt=$itemparams->get('readmore',JText::_('Read more text')); +if (isset($item->linkOn) && $item->readmore && $params->get('readmore')) : ?> +<a href="<?php echo $item->linkOn; ?>" class="readon"> + <?php echo $readmoretxt.' ' . $item->title; ?></a> +<?php endif; ?> +<span class="article_separator"> </span> diff --git a/oss/joomla/trunk/templates/beez/html/mod_newsflash/default.php b/oss/joomla/trunk/templates/beez/html/mod_newsflash/default.php new file mode 100644 index 00000000..1adb2d74 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/mod_newsflash/default.php @@ -0,0 +1,10 @@ +<?php // @version $Id: default.php 10381 2008-06-01 03:35:53Z pasamio $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php +srand((double) microtime() * 1000000); +$flashnum = rand(0, $items - 1); +$item = $list[$flashnum]; +modNewsFlashHelper::renderItem($item, $params, $access); +?> diff --git a/oss/joomla/trunk/templates/beez/html/mod_newsflash/horiz.php b/oss/joomla/trunk/templates/beez/html/mod_newsflash/horiz.php new file mode 100644 index 00000000..f4360ebb --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/mod_newsflash/horiz.php @@ -0,0 +1,16 @@ +<?php // @version $Id: horiz.php 10381 2008-06-01 03:35:53Z pasamio $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php if (count($list) == 1) : + $item = $list[0]; + modNewsFlashHelper::renderItem($item, $params, $access); +elseif (count($list) > 1) : ?> +<ul class="horiz<?php echo $params->get('moduleclass_sfx'); ?>"> + <?php foreach ($list as $item) : ?> + <li> + <?php modNewsFlashHelper::renderItem($item, $params, $access); ?> + </li> + <?php endforeach; ?> +</ul> +<?php endif; diff --git a/oss/joomla/trunk/templates/beez/html/mod_newsflash/index.html b/oss/joomla/trunk/templates/beez/html/mod_newsflash/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/mod_newsflash/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/mod_newsflash/vert.php b/oss/joomla/trunk/templates/beez/html/mod_newsflash/vert.php new file mode 100644 index 00000000..3d6d6949 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/mod_newsflash/vert.php @@ -0,0 +1,16 @@ +<?php // @version $Id: vert.php 10381 2008-06-01 03:35:53Z pasamio $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php if (count($list) == 1) : + $item = $list[0]; + modNewsFlashHelper::renderItem($item, $params, $access); +elseif (count($list) > 1) : ?> +<ul class="vert<?php echo $params->get('moduleclass_sfx'); ?>"> + <?php foreach ($list as $item) : ?> + <li> + <?php modNewsFlashHelper::renderItem($item, $params, $access); ?> + </li> + <?php endforeach; ?> +</ul> +<?php endif; diff --git a/oss/joomla/trunk/templates/beez/html/mod_poll/default.php b/oss/joomla/trunk/templates/beez/html/mod_poll/default.php new file mode 100644 index 00000000..7a45bd80 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/mod_poll/default.php @@ -0,0 +1,26 @@ +<?php +// @version $Id: default.php 10381 2008-06-01 03:35:53Z pasamio $ +defined('_JEXEC') or die('Restricted access'); +?> + +<h4><?php echo $poll->title; ?></h4> +<form name="form2" method="post" action="index.php" class="poll"> + <fieldset> + <?php for ($i = 0, $n = count($options); $i < $n; $i++) : ?> + <input type="radio" name="voteid" id="voteid<?php echo $options[$i]->id; ?>" value="<?php echo $options[$i]->id; ?>" alt="<?php echo $options[$i]->id; ?>" /> + <label for="voteid<?php echo $options[$i]->id; ?>"> + <?php echo $options[$i]->text; ?> + </label> + <br /> + <?php endfor; ?> + </fieldset> + + <input type="submit" name="task_button" class="button" value="<?php echo JText::_('Vote'); ?>" /> + <a href="<?php echo JRoute::_('index.php?option=com_poll&id='.$poll->slug.$itemid.'#content'); ?>"> + <?php echo JText::_('Results'); ?></a> + + <input type="hidden" name="option" value="com_poll" /> + <input type="hidden" name="id" value="<?php echo $poll->id; ?>" /> + <input type="hidden" name="task" value="vote" /> + <?php echo JHTML::_( 'form.token' ); ?> +</form> diff --git a/oss/joomla/trunk/templates/beez/html/mod_poll/index.html b/oss/joomla/trunk/templates/beez/html/mod_poll/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/mod_poll/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/mod_search/default.php b/oss/joomla/trunk/templates/beez/html/mod_search/default.php new file mode 100644 index 00000000..54fc71e5 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/mod_search/default.php @@ -0,0 +1,47 @@ +<?php +// @version $Id: default.php 15183 2010-03-04 23:15:59Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<form action="index.php" method="post" class="search<?php echo $params->get('moduleclass_sfx'); ?>"> + <label for="mod_search_searchword"> + <?php echo JText::_('search') ?> + </label> + <?php + $output = '<input name="searchword" id="mod_search_searchword" maxlength="20" class="inputbox'.$moduleclass_sfx.'" type="text" size="'.$width.'" value="'.$text.'" onblur="if(this.value==\'\') this.value=\''.$text.'\';" onfocus="if(this.value==\''.$text.'\') this.value=\'\';" />'; + + if ($button) : + if ($imagebutton) : + $button = '<input type="image" value="'.$button_text.'" class="button'.$moduleclass_sfx.'" src="'.$img.'"/>'; + else : + $button = '<input type="submit" value="'.$button_text.'" class="button'.$moduleclass_sfx.'"/>'; + endif; + endif; + + switch ($button_pos) : + case 'top' : + $button = $button.'<br />'; + $output = $button.$output; + break; + + case 'bottom' : + $button = '<br />'.$button; + $output = $output.$button; + break; + + case 'right' : + $output = $output.$button; + break; + + case 'left' : + default : + $output = $button.$output; + break; + endswitch; + + echo $output; + ?> + <input type="hidden" name="option" value="com_search" /> + <input type="hidden" name="task" value="search" /> + <input type="hidden" name="Itemid" value="<?php echo $mitemid; ?>" /> +</form> diff --git a/oss/joomla/trunk/templates/beez/html/mod_search/index.html b/oss/joomla/trunk/templates/beez/html/mod_search/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/mod_search/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/html/modules.php b/oss/joomla/trunk/templates/beez/html/modules.php new file mode 100644 index 00000000..8a79ef36 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/modules.php @@ -0,0 +1,35 @@ +<?php +defined('_JEXEC') or die('Restricted access'); + +/** + * This is a file to add template specific chrome to module rendering. To use it you would + * set the style attribute for the given module(s) include in your template to use the style + * for each given modChrome function. + * + * eg. To render a module mod_test in the sliders style, you would use the following include: + * <jdoc:include type="module" name="test" style="slider" /> + * + * This gives template designers ultimate control over how modules are rendered. + * + * NOTICE: All chrome wrapping methods should be named: modChrome_{STYLE} and take the same + * three arguments. + */ + + +/** + * Custom module chrome, echos the whole module in a <div> and the header in <h{x}>. The level of + * the header can be configured through a 'headerLevel' attribute of the <jdoc:include /> tag. + * Defaults to <h3> if none given + */ +function modChrome_beezDivision($module, &$params, &$attribs) +{ + $headerLevel = isset($attribs['headerLevel']) ? (int) $attribs['headerLevel'] : 3; + if (!empty ($module->content)) : ?> + <div class="moduletable<?php echo $params->get('moduleclass_sfx'); ?>"> + <?php if ($module->showtitle) : ?> + <h<?php echo $headerLevel; ?>><?php echo $module->title; ?></h<?php echo $headerLevel; ?>> + <?php endif; ?> + <?php echo $module->content; ?> + </div> + <?php endif; +} diff --git a/oss/joomla/trunk/templates/beez/html/pagination.php b/oss/joomla/trunk/templates/beez/html/pagination.php new file mode 100644 index 00000000..83fef3e2 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/html/pagination.php @@ -0,0 +1,120 @@ +<?php +/** + * @version $Id: pagination.php 14401 2010-01-26 14:10:00Z louis $ + * @package Joomla + * @copyright Copyright (C) 2005 - 2010 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('Restricted access'); + +/** + * This is a file to add template specific chrome to pagination rendering. + * + * pagination_list_footer + * Input variable $list is an array with offsets: + * $list[limit] : int + * $list[limitstart] : int + * $list[total] : int + * $list[limitfield] : string + * $list[pagescounter] : string + * $list[pageslinks] : string + * + * pagination_list_render + * Input variable $list is an array with offsets: + * $list[all] + * [data] : string + * [active] : boolean + * $list[start] + * [data] : string + * [active] : boolean + * $list[previous] + * [data] : string + * [active] : boolean + * $list[next] + * [data] : string + * [active] : boolean + * $list[end] + * [data] : string + * [active] : boolean + * $list[pages] + * [{PAGE}][data] : string + * [{PAGE}][active] : boolean + * + * pagination_item_active + * Input variable $item is an object with fields: + * $item->base : integer + * $item->link : string + * $item->text : string + * + * pagination_item_inactive + * Input variable $item is an object with fields: + * $item->base : integer + * $item->link : string + * $item->text : string + * + * This gives template designers ultimate control over how pagination is rendered. + * + * NOTE: If you override pagination_item_active OR pagination_item_inactive you MUST override them both + */ + +function pagination_list_footer($list) +{ + // Initialize variables + $lang =& JFactory::getLanguage(); + $html = "<div class=\"list-footer\">\n"; + + $html .= "\n<div class=\"limit\">".JText::_('Display Num').$list['limitfield']."</div>"; + $html .= $list['pageslinks']; + $html .= "\n<div class=\"counter\">".$list['pagescounter']."</div>"; + + $html .= "\n<input type=\"hidden\" name=\"limitstart\" value=\"".$list['limitstart']."\" />"; + $html .= "\n</div>"; + + return $html; +} + +function pagination_list_render($list) +{ + // Initialize variables + $lang =& JFactory::getLanguage(); + $html = "<ul class=\"pagination\">"; + + $html .= $list['start']['data']; + $html .= $list['previous']['data']; + + foreach( $list['pages'] as $page ) + { + if($page['data']['active']) { + // $html .= '<strong>'; + } + + $html .= $page['data']; + + if($page['data']['active']) { + // $html .= '</strong>'; + } + } + + $html .= $list['next']['data']; + $html .= $list['end']['data']; + // $html .= '«'; + + $html .= "</ul>"; + return $html; +} + +function pagination_item_active(&$item) { + return "<li><strong><a href=\"".$item->link."\" title=\"".$item->text."\">".$item->text."</a></strong></li>"; +} + +function pagination_item_inactive(&$item) { + return "<li>".$item->text."</li>"; +} +?> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/images/arrow.gif b/oss/joomla/trunk/templates/beez/images/arrow.gif new file mode 100644 index 00000000..375d206e Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images/arrow.gif differ diff --git a/oss/joomla/trunk/templates/beez/images/arrow.png b/oss/joomla/trunk/templates/beez/images/arrow.png new file mode 100644 index 00000000..78e0fb51 Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images/arrow.png differ diff --git a/oss/joomla/trunk/templates/beez/images/arrow_rtl.png b/oss/joomla/trunk/templates/beez/images/arrow_rtl.png new file mode 100644 index 00000000..27cc182c Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images/arrow_rtl.png differ diff --git a/oss/joomla/trunk/templates/beez/images/biene.gif b/oss/joomla/trunk/templates/beez/images/biene.gif new file mode 100644 index 00000000..0012e4a1 Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images/biene.gif differ diff --git a/oss/joomla/trunk/templates/beez/images/biene_rtl.gif b/oss/joomla/trunk/templates/beez/images/biene_rtl.gif new file mode 100644 index 00000000..48a69d53 Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images/biene_rtl.gif differ diff --git a/oss/joomla/trunk/templates/beez/images/con_address.png b/oss/joomla/trunk/templates/beez/images/con_address.png new file mode 100644 index 00000000..08179e2f Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images/con_address.png differ diff --git a/oss/joomla/trunk/templates/beez/images/index.html b/oss/joomla/trunk/templates/beez/images/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/images/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/images/logo.gif b/oss/joomla/trunk/templates/beez/images/logo.gif new file mode 100644 index 00000000..c1a40fb6 Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images/logo.gif differ diff --git a/oss/joomla/trunk/templates/beez/images/lupe_larger.gif b/oss/joomla/trunk/templates/beez/images/lupe_larger.gif new file mode 100644 index 00000000..6b092136 Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images/lupe_larger.gif differ diff --git a/oss/joomla/trunk/templates/beez/images/lupe_larger_black.gif b/oss/joomla/trunk/templates/beez/images/lupe_larger_black.gif new file mode 100644 index 00000000..9edbd0f7 Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images/lupe_larger_black.gif differ diff --git a/oss/joomla/trunk/templates/beez/images/lupe_reset.gif b/oss/joomla/trunk/templates/beez/images/lupe_reset.gif new file mode 100644 index 00000000..25658384 Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images/lupe_reset.gif differ diff --git a/oss/joomla/trunk/templates/beez/images/lupe_reset_black.gif b/oss/joomla/trunk/templates/beez/images/lupe_reset_black.gif new file mode 100644 index 00000000..7dd12f13 Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images/lupe_reset_black.gif differ diff --git a/oss/joomla/trunk/templates/beez/images/lupe_smaller.gif b/oss/joomla/trunk/templates/beez/images/lupe_smaller.gif new file mode 100644 index 00000000..4060ff7e Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images/lupe_smaller.gif differ diff --git a/oss/joomla/trunk/templates/beez/images/lupe_smaller_black.gif b/oss/joomla/trunk/templates/beez/images/lupe_smaller_black.gif new file mode 100644 index 00000000..f444e960 Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images/lupe_smaller_black.gif differ diff --git a/oss/joomla/trunk/templates/beez/images/pfeil.gif b/oss/joomla/trunk/templates/beez/images/pfeil.gif new file mode 100644 index 00000000..e527a0e8 Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images/pfeil.gif differ diff --git a/oss/joomla/trunk/templates/beez/images/pfeil_rtl.gif b/oss/joomla/trunk/templates/beez/images/pfeil_rtl.gif new file mode 100644 index 00000000..bcce203a Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images/pfeil_rtl.gif differ diff --git a/oss/joomla/trunk/templates/beez/images/trans.gif b/oss/joomla/trunk/templates/beez/images/trans.gif new file mode 100644 index 00000000..c7bee69b Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images/trans.gif differ diff --git a/oss/joomla/trunk/templates/beez/images_general/calendar.png b/oss/joomla/trunk/templates/beez/images_general/calendar.png new file mode 100644 index 00000000..65891385 Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images_general/calendar.png differ diff --git a/oss/joomla/trunk/templates/beez/images_general/index.html b/oss/joomla/trunk/templates/beez/images_general/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/images_general/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/images_general/j_button2_blank.png b/oss/joomla/trunk/templates/beez/images_general/j_button2_blank.png new file mode 100644 index 00000000..a8c2e300 Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images_general/j_button2_blank.png differ diff --git a/oss/joomla/trunk/templates/beez/images_general/j_button2_image.png b/oss/joomla/trunk/templates/beez/images_general/j_button2_image.png new file mode 100644 index 00000000..c1fc2e4d Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images_general/j_button2_image.png differ diff --git a/oss/joomla/trunk/templates/beez/images_general/j_button2_left.png b/oss/joomla/trunk/templates/beez/images_general/j_button2_left.png new file mode 100644 index 00000000..c364b745 Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images_general/j_button2_left.png differ diff --git a/oss/joomla/trunk/templates/beez/images_general/j_button2_pagebreak.png b/oss/joomla/trunk/templates/beez/images_general/j_button2_pagebreak.png new file mode 100644 index 00000000..aa619b49 Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images_general/j_button2_pagebreak.png differ diff --git a/oss/joomla/trunk/templates/beez/images_general/j_button2_readmore.png b/oss/joomla/trunk/templates/beez/images_general/j_button2_readmore.png new file mode 100644 index 00000000..8cf01ccd Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images_general/j_button2_readmore.png differ diff --git a/oss/joomla/trunk/templates/beez/images_general/selector-arrow.png b/oss/joomla/trunk/templates/beez/images_general/selector-arrow.png new file mode 100644 index 00000000..1c74b082 Binary files /dev/null and b/oss/joomla/trunk/templates/beez/images_general/selector-arrow.png differ diff --git a/oss/joomla/trunk/templates/beez/index.html b/oss/joomla/trunk/templates/beez/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/index.php b/oss/joomla/trunk/templates/beez/index.php new file mode 100644 index 00000000..66b18aec --- /dev/null +++ b/oss/joomla/trunk/templates/beez/index.php @@ -0,0 +1,139 @@ +<?php +/** + * @copyright Copyright (C) 2005 - 2010 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. + */ + +defined('_JEXEC') or die('Restricted access'); + +$url = clone(JURI::getInstance()); +$showRightColumn = $this->countModules('user1 or user2 or right or top'); +$showRightColumn &= JRequest::getCmd('layout') != 'form'; +$showRightColumn &= JRequest::getCmd('task') != 'edit' +?> +<?php echo '<?xml version="1.0" encoding="utf-8"?'.'>'; ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>" > +<head> + <jdoc:include type="head" /> + <link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template;?>/css/template.css" type="text/css" /> + <link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template;?>/css/position.css" type="text/css" media="screen,projection" /> + <link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template;?>/css/layout.css" type="text/css" media="screen,projection" /> + <link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template;?>/css/print.css" type="text/css" media="Print" /> + <link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template;?>/css/general.css" type="text/css" /> + <?php if($this->direction == 'rtl') : ?> + <link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template;?>/css/template_rtl.css" type="text/css" /> + <?php endif; ?> + <!--[if lte IE 6]> + <link href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template;?>/css/ieonly.css" rel="stylesheet" type="text/css" /> + <![endif]--> + <!--[if IE 7]> + <link href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template;?>/css/ie7only.css" rel="stylesheet" type="text/css" /> + <![endif]--> + <script type="text/javascript" src="<?php echo $this->baseurl ?>/templates/<?php echo $this->template;?>/javascript/md_stylechanger.js"></script> +</head> +<body> + <div id="all"> + <div id="header"> + <h1 id="logo"> + <img src="<?php echo $this->baseurl ?>/templates/<?php echo $this->template;?>/images/logo.gif" border="0" alt="<?php echo JText::_('Logo Beez, Three little Bees'); ?>" width="300" height="97" /> + <span class="header1"><?php echo JText::_('Joomla Accessible Template'); ?></span> + </h1> + + <ul> + <li><a href="#content" class="u2"><?php echo JText::_('Skip to Content'); ?></a></li> + <li><a href="#mainmenu" class="u2"><?php echo JText::_('Jump to Main Navigation and Login'); ?></a></li> + <li><a href="#additional" class="u2"><?php echo JText::_('Jump to additional Information'); ?></a></li> + </ul> + + <h2 class="unseen"> + <?php echo JText::_('Search, View and Navigation'); ?> + </h2> + + <div id="fontsize"> + <script type="text/javascript"> + //<![CDATA[ + document.write('<h3><?php echo JText::_('FONTSIZE'); ?></h3><p class="fontsize">'); + document.write('<a href="index.php" title="<?php echo JText::_('Increase size'); ?>" onclick="changeFontSize(2); return false;" class="larger"><?php echo JText::_('bigger'); ?></a><span class="unseen"> </span>'); + document.write('<a href="index.php" title="<?php echo JText::_('Decrease size'); ?>" onclick="changeFontSize(-2); return false;" class="smaller"><?php echo JText::_('smaller'); ?></a><span class="unseen"> </span>'); + document.write('<a href="index.php" title="<?php echo JText::_('Revert styles to default'); ?>" onclick="revertStyles(); return false;" class="reset"><?php echo JText::_('reset'); ?></a></p>'); + //]]> + </script> + </div> + + <jdoc:include type="modules" name="user3" /> + <jdoc:include type="modules" name="user4" /> + + <div id="breadcrumbs"> + <p> + <?php echo JText::_('You are here'); ?> + <jdoc:include type="modules" name="breadcrumb" /> + </p> + </div> + + <div class="wrap"> </div> + </div><!-- end header --> + + <div id="<?php echo $showRightColumn ? 'contentarea2' : 'contentarea'; ?>"> + <a name="mainmenu"></a> + <div id="left"> + <jdoc:include type="modules" name="left" style="beezDivision" headerLevel="3" /> + </div><!-- left --> + + <a name="content"></a> + <div id="wrapper"> + <div id="<?php echo $showRightColumn ? 'main2' : 'main'; ?>"> + <?php if ($this->getBuffer('message')) : ?> + <div class="error"> + <h2> + <?php echo JText::_('Message'); ?> + </h2> + <jdoc:include type="message" /> + </div> + <?php endif; ?> + + <jdoc:include type="component" /> + </div><!-- end main or main2 --> + + <?php if ($showRightColumn) : ?> + <div id="right"> + + <a name="additional"></a> + <h2 class="unseen"> + <?php echo JText::_('Additional Information'); ?> + </h2> + + <jdoc:include type="modules" name="top" style="beezDivision" headerLevel="3" /> + <jdoc:include type="modules" name="user1" style="beezDivision" headerLevel="3" /> + <jdoc:include type="modules" name="user2" style="beezDivision" headerLevel="3" /> + <jdoc:include type="modules" name="right" style="beezDivision" headerLevel="3" /> + + </div><!-- right --> + <?php endif; ?> + + <div class="wrap"></div> + </div><!-- wrapper --> + </div><!-- contentarea --> + + <div id="footer"> + <p class="syndicate"> + <jdoc:include type="modules" name="syndicate" /> + </p> + + <p> + <?php echo JText::_('Powered by');?> <a href="http://www.joomla.org/">Joomla!</a> + </p> + + <div class="wrap"></div> + </div><!-- footer --> + </div><!-- all --> + + <jdoc:include type="modules" name="debug" /> + +</body> +</html> diff --git a/oss/joomla/trunk/templates/beez/javascript/index.html b/oss/joomla/trunk/templates/beez/javascript/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/javascript/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/javascript/md_stylechanger.js b/oss/joomla/trunk/templates/beez/javascript/md_stylechanger.js new file mode 100644 index 00000000..9158928a --- /dev/null +++ b/oss/joomla/trunk/templates/beez/javascript/md_stylechanger.js @@ -0,0 +1,80 @@ +var prefsLoaded = false; +var defaultFontSize =100; +var currentFontSize = defaultFontSize; + +function revertStyles(){ + + currentFontSize = defaultFontSize; + changeFontSize(0); + +} + +function toggleColors(){ + if(currentStyle == "White"){ + setColor("Black"); + }else{ + setColor("White"); + } +} + +function changeFontSize(sizeDifference){ + currentFontSize = parseInt(currentFontSize) + parseInt(sizeDifference * 5); + + if(currentFontSize > 220){ + currentFontSize = 220; + }else if(currentFontSize < 60){ + currentFontSize = 60; + } + + setFontSize(currentFontSize); +}; + +function setFontSize(fontSize){ + var stObj = (document.getElementById) ? document.getElementById('content_area') : document.all('content_area'); + document.body.style.fontSize = fontSize + '%'; + + //alert (document.body.style.fontSize); +}; + + +function createCookie(name,value,days) { + if (days) { + var date = new Date(); + date.setTime(date.getTime()+(days*24*60*60*1000)); + var expires = "; expires="+date.toGMTString(); + } + else expires = ""; + document.cookie = name+"="+value+expires+"; path=/"; +}; + +function readCookie(name) { + var nameEQ = name + "="; + var ca = document.cookie.split(';'); + for(var i=0;i < ca.length;i++) { + var c = ca[i]; + while (c.charAt(0)==' ') c = c.substring(1,c.length); + if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length); + } + return null; +}; + +window.onload = setUserOptions; + +function setUserOptions(){ + if(!prefsLoaded){ + + cookie = readCookie("fontSize"); + currentFontSize = cookie ? cookie : defaultFontSize; + setFontSize(currentFontSize); + + prefsLoaded = true; + } + +} + +window.onunload = saveSettings; + +function saveSettings() +{ + createCookie("fontSize", currentFontSize, 365); +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/beez/params.ini b/oss/joomla/trunk/templates/beez/params.ini new file mode 100644 index 00000000..e69de29b diff --git a/oss/joomla/trunk/templates/beez/templateDetails.xml b/oss/joomla/trunk/templates/beez/templateDetails.xml new file mode 100644 index 00000000..d5675843 --- /dev/null +++ b/oss/joomla/trunk/templates/beez/templateDetails.xml @@ -0,0 +1,168 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE install PUBLIC "-//Joomla! 1.5//DTD template 1.0//EN" "http://www.joomla.org/xml/dtd/1.5/template-install.dtd"> +<install version="1.5" type="template"> + <name>beez</name> + <creationDate>19 February 2007</creationDate> + <author>Angie Radtke/Robert Deutz</author> + <authorEmail>joomla@run-digital.com</authorEmail> + <authorUrl>http://www.run-digital.com</authorUrl> + <copyright></copyright> + <license>GNU/GPL</license> + <version>1.0.0</version> + <description>Accessible template for Joomla 1.5</description> + <files> + <filename>css/layout.css</filename> + <filename>css/position.css</filename> + <filename>css/template.css</filename> + <filename>css/ieonly.css</filename> + <filename>css/ie7only.css</filename> + <filename>css/print.css</filename> + <filename>css/general.css</filename> + <filename>css/index.html</filename> + <filename>css/template_rtl.css</filename> + <filename>html/com_contact/category/default.php</filename> + <filename>html/com_contact/category/default_items.php</filename> + <filename>html/com_contact/category/index.html</filename> + <filename>html/com_contact/contact/default.php</filename> + <filename>html/com_contact/contact/default_address.php</filename> + <filename>html/com_contact/contact/default_form.php</filename> + <filename>html/com_contact/contact/index.html</filename> + <filename>html/com_contact/index.html</filename> + <filename>html/com_content/article/default.php</filename> + <filename>html/com_content/article/index.html</filename> + <filename>html/com_content/article/form.php</filename> + <filename>html/com_content/category/blog.php</filename> + <filename>html/com_content/category/blog_item.php</filename> + <filename>html/com_content/category/blog_links.php</filename> + <filename>html/com_content/category/index.html</filename> + <filename>html/com_content/category/default_items.php</filename> + <filename>html/com_content/category/default.php</filename> + <filename>html/com_content/frontpage/default.php</filename> + <filename>html/com_content/frontpage/default_item.php</filename> + <filename>html/com_content/frontpage/default_links.php</filename> + <filename>html/com_content/frontpage/index.html</filename> + <filename>html/com_content/section/blog.php</filename> + <filename>html/com_content/section/blog_item.php</filename> + <filename>html/com_content/section/blog_links.php</filename> + <filename>html/com_content/section/default.php</filename> + <filename>html/com_content/section/index.html</filename> + <filename>html/com_content/index.html</filename> + <filename>html/index.html</filename> + <filename>html/com_search/search/default.php</filename> + <filename>html/com_search/search/default_error.php</filename> + <filename>html/com_search/search/default_form.php</filename> + <filename>html/com_search/search/default_results.php</filename> + <filename>html/com_search/search/index.html</filename> + <filename>html/com_search/index.html</filename> + <filename>html/editor_content.css</filename> + <filename>html/mod_latestnews/default.php</filename> + <filename>html/mod_latestnews/index.html</filename> + <filename>html/mod_login/default.php</filename> + <filename>html/mod_login/index.html</filename> + <filename>html/mod_newsflash/_item.php</filename> + <filename>html/mod_newsflash/default.php</filename> + <filename>html/mod_newsflash/horiz.php</filename> + <filename>html/mod_newsflash/vert.php</filename> + <filename>html/mod_newsflash/index.html</filename> + <filename>html/mod_poll/default.php</filename> + <filename>html/mod_poll/index.html</filename> + <filename>html/mod_search/default.php</filename> + <filename>html/mod_search/index.html</filename> + <filename>html/modules.php</filename> + <filename>html/pagination.php</filename> + <filename>html/com_poll/poll/default.php</filename> + <filename>html/com_poll/poll/default_graph.php</filename> + <filename>html/com_poll/poll/index.html</filename> + <filename>html/com_poll/index.html</filename> + <filename>html/com_newsfeeds/categories/default.php</filename> + <filename>html/com_newsfeeds/categories/index.html</filename> + <filename>html/com_newsfeeds/category/default.php</filename> + <filename>html/com_newsfeeds/category/default_items.php</filename> + <filename>html/com_newsfeeds/category/index.html</filename> + <filename>html/com_newsfeeds/newsfeed/default.php</filename> + <filename>html/com_newsfeeds/newsfeed/index.html</filename> + <filename>html/com_newsfeeds/index.html</filename> + <filename>html/com_weblinks/categories/default.php</filename> + <filename>html/com_weblinks/categories/index.html</filename> + <filename>html/com_weblinks/category/default.php</filename> + <filename>html/com_weblinks/category/default_items.php</filename> + <filename>html/com_weblinks/category/index.html</filename> + <filename>html/com_weblinks/weblink/form.php</filename> + <filename>html/com_weblinks/weblink/index.html</filename> + <filename>html/com_weblinks/index.html</filename> + <filename>html/com_user/user/index.html</filename> + <filename>html/com_user/user/default.php</filename> + <filename>html/com_user/user/form.php</filename> + <filename>html/com_user/login/index.html</filename> + <filename>html/com_user/login/default_login.php</filename> + <filename>html/com_user/login/default.php</filename> + <filename>html/com_user/login/default_logout.php</filename> + <filename>html/com_user/register/default.php</filename> + <filename>html/com_user/register/index.html</filename> + <filename>html/com_user/register/default_message.php</filename> + <filename>html/com_user/index.html</filename> + <filename>html/com_user/remind/index.html</filename> + <filename>html/com_user/remind/default.php</filename> + <filename>html/com_user/remind/default_message.php</filename> + <filename>html/com_user/reset/index.html</filename> + <filename>html/com_user/reset/default.php</filename> + <filename>html/com_user/reset/confirm.php</filename> + <filename>html/com_user/reset/complete.php</filename> + <filename>images_general/index.html</filename> + <filename>images_general/calendar.png</filename> + <filename>images_general/j_button2_blank.png</filename> + <filename>images_general/j_button2_image.png</filename> + <filename>images_general/j_button2_left.png</filename> + <filename>images_general/j_button2_pagebreak.png</filename> + <filename>images_general/j_button2_readmore.png</filename> + <filename>images_general/selector-arrow.png</filename> + <filename>images/arrow.png</filename> + <filename>images/arrow_rtl.png</filename> + <filename>images/pfeil.gif</filename> + <filename>images/pfeil_rtl.gif</filename> + <filename>images/trans.gif</filename> + <filename>images/logo.gif</filename> + <filename>images/arrow.gif</filename> + <filename>images/biene.gif</filename> + <filename>images/biene_rtl.gif</filename> + <filename>images/index.html</filename> + <filename>images/con_address.png</filename> + <filename>images/lupe_larger.gif</filename> + <filename>images/lupe_larger_black.gif</filename> + <filename>images/lupe_reset.gif</filename> + <filename>images/lupe_reset_black.gif</filename> + <filename>images/lupe_smaller.gif</filename> + <filename>images/lupe_smaller_black.gif</filename> + <filename>index.html</filename> + <filename>index.php</filename> + <filename>javascript/md_stylechanger.js</filename> + <filename>javascript/index.html</filename> + <filename>params.ini</filename> + <filename>templateDetails.xml</filename> + <filename>template_thumbnail.png</filename> + <filename>favicon.ico</filename> + <filename>component.php</filename> + </files> + <languages> + <language tag="en-GB">en-GB.tpl_beez.ini</language> + </languages> + <administration> + <languages folder="admin"> + <language tag="en-GB">en-GB.tpl_beez.ini</language> + </languages> + </administration> + <positions> + <position>left</position> + <position>right</position> + <position>top</position> + <position>breadcrumb</position> + <position>user1</position> + <position>user2</position> + <position>user3</position> + <position>user4</position> + <position>debug</position> + <position>syndicate</position> + </positions> + <params> + </params> +</install> diff --git a/oss/joomla/trunk/templates/beez/template_thumbnail.png b/oss/joomla/trunk/templates/beez/template_thumbnail.png new file mode 100644 index 00000000..b272f27a Binary files /dev/null and b/oss/joomla/trunk/templates/beez/template_thumbnail.png differ diff --git a/oss/joomla/trunk/templates/hawebs/component.php b/oss/joomla/trunk/templates/hawebs/component.php new file mode 100644 index 00000000..c98c4b2e --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/component.php @@ -0,0 +1,29 @@ +<?php +/** + * @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( 'Restricted access' ); +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>"> +<head> + <jdoc:include type="head" /> + <link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/hawebs/css/template.css" type="text/css" /> + +<?php if($this->direction == 'rtl') : ?> + <link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/hawebs/css/template_rtl.css" type="text/css" /> +<?php endif; ?> +</head> +<body class="contentpane"> + <jdoc:include type="message" /> + <jdoc:include type="component" /> +</body> +</html> diff --git a/oss/joomla/trunk/templates/hawebs/css/black.css b/oss/joomla/trunk/templates/hawebs/css/black.css new file mode 100644 index 00000000..1360bfdf --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/css/black.css @@ -0,0 +1,62 @@ +@charset "UTF-8"; +/** + * Copyright (C) 2006-2009 YUCHENG HU + * + * ---------------------------------------------------------------------------------- + * HA WEBSYSTEMS + * http://www.hawebs.net + * http://www.tcivis.com + * + * Contact + * huyuchengus@gmail.com / yuchenghu@hawebs.net + * + * ---------------------------------------------------------------------------------- + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + * GNU GENERAL PUBLIC LICENSE + * + * ---------------------------------------------------------------------------------- + */ + +a:link, a:visited { + color: #135cae; +} +a:hover { + color: #0b3768; +} +#pillmenu a:hover { + color: #135cae; +} +#pillmenu a#active_menu-nav { + background: url(../images/black/mw_menu_active_bg.png) 0 0 repeat-x; + color: #fff; +} +#pillmenu a#active_menu-nav:hover { + color: #fff; +} +h3, .componentheading, table.moduletable th { + color: #135cae; +} +div.module_menu { + background: url(../images/black/mw_box_br.png) 100% 100% no-repeat; +} +div.module_menu div { + background: url(../images/black/mw_box_bl.png) 0 100% no-repeat; +} +div.module_menu div div { + background: url(../images/black/mw_box_tr.png) 100% 0 no-repeat; +} +div.module_menu div div div { + background: url(../images/black/mw_box_tl.png) 0 0 no-repeat; +} diff --git a/oss/joomla/trunk/templates/hawebs/css/black_bg.css b/oss/joomla/trunk/templates/hawebs/css/black_bg.css new file mode 100644 index 00000000..39bb5cf5 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/css/black_bg.css @@ -0,0 +1,36 @@ +/* black */ +#page_bg { + background: #333; +} + +div#wrapper { + background: #f7f7f7 url(../images/black/mw_shadow_l.png) 0 0 repeat-y; +} + +div#wrapper_r { + background: url(../images/black/mw_shadow_r.png) 100% 0 repeat-y; +} + +div#header { + background: url(../images/black/mw_header_t.png) 0 0 repeat-x; +} + +div#header_l { + background: url(../images/black/mw_header_t_l.png) 0 0 no-repeat; +} + +div#header_r { + background: url(../images/black/mw_header_t_r.png) 100% 0 no-repeat; +} + +div#footer { + background: #f7f7f7 url(../images/black/mw_footer_b.png) 0 100% repeat-x; +} + +div#footer_l { + background: url(../images/black/mw_footer_b_l.png) 0 0 no-repeat; +} + +div#footer_r { + background: url(../images/black/mw_footer_b_r.png) 100% 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/css/blue.css b/oss/joomla/trunk/templates/hawebs/css/blue.css new file mode 100644 index 00000000..c6b23b2b --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/css/blue.css @@ -0,0 +1,41 @@ +/* blue */ +a:link, a:visited { + color: #135cae; +} + +a:hover { + color: #0b3768; +} + +#pillmenu a:hover { + color: #135cae; +} + +#pillmenu a#active_menu-nav { + background: url(../images/blue/mw_menu_active_bg.png) repeat-x; + color: #fff; +} + +#pillmenu a#active_menu-nav:hover { + color: #fff; +} + +h3, .componentheading, table.moduletable th { + color: #135cae; +} + +div.module_menu { + background: url(../images/blue/mw_box_br.png) 100% 100% no-repeat; +} + +div.module_menu div { + background: url(../images/blue/mw_box_bl.png) 0 100% no-repeat; +} + +div.module_menu div div { + background: url(../images/blue/mw_box_tr.png) 100% 0 no-repeat; +} + +div.module_menu div div div { + background: url(../images/blue/mw_box_tl.png) 0 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/css/blue_bg.css b/oss/joomla/trunk/templates/hawebs/css/blue_bg.css new file mode 100644 index 00000000..1e09ba8e --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/css/blue_bg.css @@ -0,0 +1,36 @@ +/* blue */ +#page_bg { + background: #0C3A6D; +} + +div#wrapper { + background: #f7f7f7 url(../images/blue/mw_shadow_l.png) 0 0 repeat-y; +} + +div#wrapper_r { + background: url(../images/blue/mw_shadow_r.png) 100% 0 repeat-y; +} + +div#header { + background: url(../images/blue/mw_header_t.png) 0 0 repeat-x; +} + +div#header_l { + background: url(../images/blue/mw_header_t_l.png) 0 0 no-repeat; +} + +div#header_r { + background: url(../images/blue/mw_header_t_r.png) 100% 0 no-repeat; +} + +div#footer { + background: #f7f7f7 url(../images/blue/mw_footer_b.png) 0 100% repeat-x; +} + +div#footer_l { + background: url(../images/blue/mw_footer_b_l.png) 0 0 no-repeat; +} + +div#footer_r { + background: url(../images/blue/mw_footer_b_r.png) 100% 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/css/green.css b/oss/joomla/trunk/templates/hawebs/css/green.css new file mode 100644 index 00000000..57979c02 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/css/green.css @@ -0,0 +1,41 @@ +/* green */ +a:link, a:visited { + color: #4ba123; +} + +a:hover { + color: #316b16; +} + +#pillmenu a:hover { + color: #4ba123; +} + +#pillmenu a#active_menu-nav { + background: url(../images/green/mw_menu_active_bg.png) 0 0 repeat-x; + color: #fff; +} + +#pillmenu a#active_menu-nav:hover { + color: #fff; +} + +h3, .componentheading, table.moduletable th { + color: #4ba123; +} + +div.module_menu { + background: url(../images/green/mw_box_br.png) 100% 100% no-repeat; +} + +div.module_menu div { + background: url(../images/green/mw_box_bl.png) 0 100% no-repeat; +} + +div.module_menu div div { + background: url(../images/green/mw_box_tr.png) 100% 0 no-repeat; +} + +div.module_menu div div div { + background: url(../images/green/mw_box_tl.png) 0 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/css/green_bg.css b/oss/joomla/trunk/templates/hawebs/css/green_bg.css new file mode 100644 index 00000000..ae58cc4d --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/css/green_bg.css @@ -0,0 +1,36 @@ +/* green */ +#page_bg { + background: #316b16; +} + +div#wrapper { + background: #f7f7f7 url(../images/green/mw_shadow_l.png) 0 0 repeat-y; +} + +div#wrapper_r { + background: url(../images/green/mw_shadow_r.png) 100% 0 repeat-y; +} + +div#header { + background: url(../images/green/mw_header_t.png) 0 0 repeat-x; +} + +div#header_l { + background: url(../images/green/mw_header_t_l.png) 0 0 no-repeat; +} + +div#header_r { + background: url(../images/green/mw_header_t_r.png) 100% 0 no-repeat; +} + +div#footer { + background: #f7f7f7 url(../images/green/mw_footer_b.png) 0 100% repeat-x; +} + +div#footer_l { + background: url(../images/green/mw_footer_b_l.png) 0 0 no-repeat; +} + +div#footer_r { + background: url(../images/green/mw_footer_b_r.png) 100% 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/css/ieonly.css b/oss/joomla/trunk/templates/hawebs/css/ieonly.css new file mode 100644 index 00000000..5e2222ef --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/css/ieonly.css @@ -0,0 +1,20 @@ +/* IE ONLY CSS */ + +body.width_fmax div#wrapper { + width: expression(((document.body.clientWidth)) < 751? "750px": ((document.body.clientWidth)) > 1050? "1050px": "auto" ); +} + +div.module_menu div div div { + width: 100%; +} + +div#footer { + width: 100%; +} + +div#whitebox_b { + width: 100%; +} +#pathway { + float: left; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/css/index.html b/oss/joomla/trunk/templates/hawebs/css/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/css/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/css/orange.css b/oss/joomla/trunk/templates/hawebs/css/orange.css new file mode 100644 index 00000000..f6f67023 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/css/orange.css @@ -0,0 +1,71 @@ +@charset "UTF-8"; +/** + * Copyright (C) 2006-2009 YUCHENG HU + * + * ---------------------------------------------------------------------------------- + * HA WEBSYSTEMS + * http://www.hawebs.net + * http://www.tcivis.com + * + * Contact + * huyuchengus@gmail.com / yuchenghu@hawebs.net + * + * ---------------------------------------------------------------------------------- + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + * GNU GENERAL PUBLIC LICENSE + * + * ---------------------------------------------------------------------------------- + */ + +a:link, a:visited { + color: #cd6620; +} + +a:hover { + color: #ac5419; +} + +#pillmenu a:hover { + color: #cd6620; +} + +#pillmenu a#active_menu-nav { + background: url(../images/orange/mw_menu_active_bg.png) 0 0 repeat-x; + color: #fff; +} + +#pillmenu a#active_menu-nav:hover { + color: #fff; +} + +h3, .componentheading, table.moduletable th { + color: #cd6620; +} + +div.module_menu { + background: url(../images/orange/mw_box_br.png) 100% 100% no-repeat; +} + +div.module_menu div { + background: url(../images/orange/mw_box_bl.png) 0 100% no-repeat; +} + +div.module_menu div div { + background: url(../images/orange/mw_box_tr.png) 100% 0 no-repeat; +} + +div.module_menu div div div { + background: url(../images/orange/mw_box_tl.png) 0 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/css/orange_bg.css b/oss/joomla/trunk/templates/hawebs/css/orange_bg.css new file mode 100644 index 00000000..52bd2c14 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/css/orange_bg.css @@ -0,0 +1,36 @@ +/* orange */ +#page_bg { + background: #ac5419; +} + +div#wrapper { + background: #f7f7f7 url(../images/orange/mw_shadow_l.png) 0 0 repeat-y; +} + +div#wrapper_r { + background: url(../images/orange/mw_shadow_r.png) 100% 0 repeat-y; +} + +div#header { + background: url(../images/orange/mw_header_t.png) 0 0 repeat-x; +} + +div#header_l { + background: url(../images/orange/mw_header_t_l.png) 0 0 no-repeat; +} + +div#header_r { + background: url(../images/orange/mw_header_t_r.png) 100% 0 no-repeat; +} + +div#footer { + background: #f7f7f7 url(../images/orange/mw_footer_b.png) 0 100% repeat-x; +} + +div#footer_l { + background: url(../images/orange/mw_footer_b_l.png) 0 0 no-repeat; +} + +div#footer_r { + background: url(../images/orange/mw_footer_b_r.png) 100% 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/css/position.css b/oss/joomla/trunk/templates/hawebs/css/position.css new file mode 100644 index 00000000..9d85558d --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/css/position.css @@ -0,0 +1,55 @@ +@charset "UTF-8"; +/** + * Copyright (C) 2006-2009 YUCHENG HU + * + * ---------------------------------------------------------------------------------- + * HA WEBSYSTEMS + * http://www.hawebs.net + * http://www.tcivis.com + * + * Contact + * huyuchengus@gmail.com / yuchenghu@hawebs.net + * + * ---------------------------------------------------------------------------------- + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + * GNU GENERAL PUBLIC LICENSE + * + * ---------------------------------------------------------------------------------- + */ + +#page { +} + +#page .articlecontext { + font-size:125%; + line-height:1.5em; +} + +#page p { + margin-bottom:1.2em; +} + +#header { +} + +.articlecontext { + font-size:125%; + line-height:1.5em; +} + +.contentpane li { + font-size:1.2em; + line-height:1.5em; +} diff --git a/oss/joomla/trunk/templates/hawebs/css/red.css b/oss/joomla/trunk/templates/hawebs/css/red.css new file mode 100644 index 00000000..93c51d43 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/css/red.css @@ -0,0 +1,41 @@ +/* red */ +a:link, a:visited { + color: #a10f15; +} + +a:hover { + color: #7b0b12; +} + +#pillmenu a:hover { + color: #a10f15; +} + +#pillmenu a#active_menu-nav { + background: url(../images/red/mw_menu_active_bg.png) 0 0 repeat-x; + color: #fff; +} + +#pillmenu a#active_menu-nav:hover { + color: #fff; +} + +h3, .componentheading, table.moduletable th { + color: #a10f15; +} + +div.module_menu { + background: url(../images/red/mw_box_br.png) 100% 100% no-repeat; +} + +div.module_menu div { + background: url(../images/red/mw_box_bl.png) 0 100% no-repeat; +} + +div.module_menu div div { + background: url(../images/red/mw_box_tr.png) 100% 0 no-repeat; +} + +div.module_menu div div div { + background: url(../images/red/mw_box_tl.png) 0 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/css/red_bg.css b/oss/joomla/trunk/templates/hawebs/css/red_bg.css new file mode 100644 index 00000000..a5ddf829 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/css/red_bg.css @@ -0,0 +1,36 @@ +/* red */ +#page_bg { + background: #640b0f; +} + +div#wrapper { + background: #f7f7f7 url(../images/red/mw_shadow_l.png) 0 0 repeat-y; +} + +div#wrapper_r { + background: url(../images/red/mw_shadow_r.png) 100% 0 repeat-y; +} + +div#header { + background: url(../images/red/mw_header_t.png) 0 0 repeat-x; +} + +div#header_l { + background: url(../images/red/mw_header_t_l.png) 0 0 no-repeat; +} + +div#header_r { + background: url(../images/red/mw_header_t_r.png) 100% 0 no-repeat; +} + +div#footer { + background: #f7f7f7 url(../images/red/mw_footer_b.png) 0 100% repeat-x; +} + +div#footer_l { + background: url(../images/red/mw_footer_b_l.png) 0 0 no-repeat; +} + +div#footer_r { + background: url(../images/red/mw_footer_b_r.png) 100% 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/css/template.css b/oss/joomla/trunk/templates/hawebs/css/template.css new file mode 100644 index 00000000..73cd9e1c --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/css/template.css @@ -0,0 +1,802 @@ +@charset "UTF-8"; +/** + * Copyright (C) 2006-2009 YUCHENG HU + * + * ---------------------------------------------------------------------------------- + * HA WEBSYSTEMS + * http://www.hawebs.net + * http://www.tcivis.com + * + * Contact + * huyuchengus@gmail.com / yuchenghu@hawebs.net + * + * ---------------------------------------------------------------------------------- + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + * GNU GENERAL PUBLIC LICENSE + * + * ---------------------------------------------------------------------------------- + */ + +html { + height: 100%; + margin-bottom: 1px; +} +form { + margin: 0; + padding: 0; +} +body { + font-family: Helvetica, Arial, sans-serif; + line-height: 1.3em; + margin: 0px 0px 0px 0px; + font-size: 12px; + color: #333; +} +a:link, a:visited { + text-decoration: none; + font-weight: normal; +} +a:hover { + text-decoration: underline; + font-weight: normal; +} +input.button { + cursor: pointer; +} +p { + margin-top: 0; + margin-bottom: 5px; +} +img { + border: 0 none; +} +/*****************************************/ + +/*** Template specific layout elements ***/ + +/*****************************************/ + +#page_bg { + padding: 10px 0; + margin-bottom: 1px; +} +div.center { + text-align: center; +} +div#wrapper { + margin-left: auto; + margin-right: auto; +} +body.width_medium div#wrapper { + width: 950px; +} +body.width_small div#wrapper { + width: 773px; +} +body.width_fmax div#wrapper { + min-width: 750px; + max-width: 1050px; +} +div#header_l { + position: relative; +} +div#header_r { + height: 90px; + padding-left: 370px; + padding-right: 30px; + padding-top: 25px; + overflow: hidden; + text-align: left; +} +div#logo { + position: absolute; + left: 0; + top: 0; + float: left; + width: 298px; + height: 75px; + background: url(../images/mw_joomla_logo.png) 0 0 no-repeat; + margin-left: 30px; + margin-top: 25px; +} +div#newsflash { + width: auto; + margin-left: 350px; + margin-right: 30px; + border: 1px solid #00f; +} +div#tabarea { + background: #f7f7f7 url(../images/mw_header_b.png) 0 0 repeat-x; + margin: 0 11px; +} +div#tabarea_l { + background: url(../images/mw_header_l_b.png) 0 0 no-repeat; + padding-left: 32px; +} +div#tabarea_r { + height: 42px; + background: url(../images/mw_header_r_b.png) 100% 0 no-repeat; + padding-right: 1px; +} +div#footer_r { + padding-top: 10px; + height: 47px; + overflow: hidden; +} +div#footer_r div { + text-align: center; + font-size: .90em; + color: #aaa; +} +div#footer_r a:link, div#footer_r a:visited { + color: #999; +} +div#footerspacer { + height: 10px; +} +#pathway { + padding: 0px 10px 8px; + width: auto; + margin-top: -2px; + margin-right: 250px; + text-align: left; +} +#search { + float: right; + width:320px; + margin-top: -20px; + margin-right: 30px; + height: 40px; + overflow: hidden; + text-align:right; +} +form#searchForm input { + vertical-align: middle; +} +form#searchForm table { + border-collapse: collapse; +} +form#searchForm td { + padding:0; +} +#mod_search_searchword { + padding-left: 3px; +} +#area { + padding: 0; +} +#whitebox { + margin: 0 21px 0px 21px; + background: #fff; + width: auto; +} +#whitebox div { + text-align: left; +} +#whitebox_t { + background: #fff url(../images/mw_content_t.png) 0 0 repeat-x; +} +#whitebox_tl { + background: url(../images/mw_content_t_l.png) 0 0 no-repeat; +} +#whitebox_tr { + height: 10px; + overflow: hidden; + background: url(../images/mw_content_t_r.png) 100% 0 no-repeat; +} +#whitebox_m { + border-left: 1px solid #ccc; + border-right: 1px solid #ccc; + width: auto; + padding: 1px 8px; +} +#whitebox_b { + margin-top: -5px; + background: url(../images/mw_content_b.png) 0 100% repeat-x; +} +#whitebox_bl { + background: url(../images/mw_content_b_l.png) 0 100% no-repeat; +} +#whitebox_br { + height: 13px; + background: url(../images/mw_content_b_r.png) 100% 100% no-repeat; +} +/* horizontal pill menu */ + +table.pill { + margin-left: auto; + margin-right: auto; + padding: 0; +} +td.pill_l { + background: url(../images/mw_menu_cap_l.png) no-repeat; + width: 20px; + height: 32px; +} +td.pill_m { + background: url(../images/mw_menu_normal_bg.png) repeat-x; + padding: 0; + margin: 0; + width: auto; +} +td.pill_r { + background: url(../images/mw_menu_cap_r.png) no-repeat; + width: 19px; + height: 32px; +} +#pillmenu { + white-space: nowrap; + height: 32px; + float: left; +} +#pillmenu ul { + margin: 0; + padding: 0; + list-style:none; +} +#pillmenu li { + float: left; + background: url(../images/mw_menu_separator.png) top right no-repeat; + margin: 0; + padding: 0; +} +#pillmenu a { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + font-weight: bold; + float:left; + display:block; + height: 24px; + line-height: 24px; + padding: 0 20px; + color: #000; + text-decoration: none; +} +#pillmenu a#active_menu-nav { + margin-top:2px; + height: 21px; + line-height: 21px; + background-position: 0 0; +} +#leftcolumn { + padding: 0; + margin: 0; + width: 20%; + float:left; +} +#maincolumn, #maincolumn_full { + margin-left: 20%; + padding-left: 15px; + width: 75%; +} +#maincolumn_full { + margin-left: 0; + padding: 0; + width: 100%; +} +table.nopad { + width: 100%; + border-collapse: collapse; + padding: 0; + margin: 0; + margin-bottom: 15px; +} +table.nopad td.middle_pad { + width: 20px; +} + +table.nopad li{ + font-size:1.2em; + line-height:1.2em; +} + +/*****************************************/ + +/*** Joomla! specific content elements ***/ + +/*****************************************/ + + + +div.offline { + background: #fffebb; + width: 100%; + position: absolute; + top: 0; + left: 0; + font-size: 1.2em; + padding: 5px; +} +span.pathway { + display: block; + margin: 0 20px; + height: 16px; + line-height: 16px; + overflow: hidden; +} +/* headers */ + +div.componentheading { + padding-left: 0px; +} +h1 { + padding: 0; + font-family:Helvetica, Arial, sans-serif; + font-size: 1.3em; + font-weight: bold; + vertical-align: bottom; + color: #666; + text-align: left; + width: 100%; +} +h2, .contentheading { + padding: 0; + font-family: Arial, Helvetica, sans-serif; + font-size: 1.4em; + font-weight: normal; + vertical-align: bottom; + color: #135CAE; + text-align: left; + width: 100%; +} +table.contentpaneopen h3 { + margin-top: 25px; +} +h4 { + font-family: Arial, Helvetica, sans-serif; + color: #333; +} +h3, .componentheading, table.moduletable th, legend { + margin: 0; + font-weight: bold; + font-family: Helvetica, Arial, sans-serif; + font-size: 1.5em; + padding-left: 0px; + margin-bottom: 10px; + text-align: left; +} +/* small text */ + +.small { + font-size: .90em; + color: #999; + font-weight: normal; + text-align: left; +} +.modifydate { + height: 20px; + vertical-align: bottom; + font-size: .90em; + color: #999; + font-weight: normal; + text-align: left; +} +.createdate { + height: 20px; + vertical-align: top; + font-size: .90em; + color: #999; + font-weight: normal; + vertical-align: top; + padding-bottom: 5px; + padding-top: 0px; +} +a.readon { + margin-top: 10px; + display: block; + float: left; + background: url(../images/mw_readon.png) top right no-repeat; + padding-right: 20px; + line-height: 14px; + height: 16px; +} +/* form validation */ + +.invalid { + border-color: #ff0000; +} +label.invalid { + color: #ff0000; +} +/** overlib **/ + + + +.ol-foreground { + background-color: #f6f6f6; +} +.ol-background { + background-color: #666; +} +.ol-textfont { + font-family: Arial, Helvetica, sans-serif; + font-size: 10px; +} +.ol-captionfont { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + color: #f6f6f6; + font-weight: bold; +} +.ol-captionfont a { + color: #0B55C4; + text-decoration: none; + font-size: 12px; +} +.ol-closefont { +} +/* menu links */ + +a.mainlevel:link, a.mainlevel:visited { + padding-left: 5px; +} +a.mainlevel:hover { +} +/* spacers */ + +span.article_separator { + display: block; + height: 20px; +} +.article_column { + padding-right: 5px; +} +.column_separator { + border-left: 1px dashed #e0e0e0; + padding-left: 10px; +} +td.buttonheading { +} +td.buttonheading img { + border:none; +} +.clr { + clear: both; +} +td.greyline { + width: 20px; + background: url(../images/mw_line_grey.png) 50% 0 repeat-y; +} +div#maindivider { + border-top: 1px solid #ddd; + margin-bottom: 10px; + overflow: hidden; + height: 1px; +} +table.blog span.article_separator { + display: block; + height: 20px; +} +/* edit button */ + +.contentpaneopen_edit { + float: left; +} +/* table of contents */ + +table.contenttoc { + margin: 5px; + border: 1px solid #ccc; + padding: 5px; + float: right; +} +table.contenttoc td { + padding: 0 5px; +} +/* content tables */ + +td.sectiontableheader { + background: #efefef; + color: #333; + font-weight: bold; + padding: 4px; + border-right: 1px solid #fff; +} +tr.sectiontableentry0 td, tr.sectiontableentry1 td, tr.sectiontableentry2 td { + font-size: 1.2em; + padding-top: 0.8em; + padding-right: 4px; + padding-bottom: 4px; + padding-left: 4px; +} +td.sectiontableentry0, td.sectiontableentry1, td.sectiontableentry2 { + font-size: 1.2em; + padding: 3px; +} +/* content styles */ + +table.contentpaneopen, table.contentpane { + margin: 0; + padding: 0; + width: 100%; +} + +table.contentpaneopen { + font-size: 1.2em; +} +table.contentpaneopen li { + margin-bottom: 5px; +} +table.contentpaneopen fieldset { + border: 0; + border-top: 1px solid #ddd; +} +table.contentpaneopen h3 { + margin-top: 25px; +} +table.contentpaneopen h4 { + font-family: Arial, Helvetica, sans-serif; + color: #333; +} +.highlight { + background-color: #fffebb; +} +/* module control elements */ + +table.user1user2 div.moduletable { + margin-bottom: 0px; +} +div.moduletable, div.module { + margin-bottom: 25px; +} +div.module_menu h3 { + font-family: Helvetica, Arial, sans-serif; + font-size: 12px; + font-weight: bold; + color: #eee; + margin: -23px -4px 5px -5px; + padding-left: 10px; + padding-bottom: 2px; +} +div.module_menu { + margin: 0; + padding: 0; + margin-bottom: 15px; +} +div.module_menu div div div { + padding: 10px; + padding-top: 30px; + padding-bottom: 15px; + width: auto; +} +div.module_menu div div div div { + background: none; + padding: 0; +} +div.module_menu ul { + margin: 10px 0; + padding-left: 20px; +} +div.module_menu ul li a:link, div.module_menu ul li a:visited { + font-weight: bold; +} +#leftcolumn div.module { + padding: 0 10px; +} +#leftcolumn div.module table { + width: auto; +} +/* forms */ + +table.adminform textarea { + width: 540px; + height: 400px; + font-size: 1em; + color: #000099; +} +div.search input { + width: 145px; + border: 1px solid #ccc; + margin: 15px 0 10px 0; +} +form#form-login fieldset { + border: 0 none; + margin: 0em; + padding: 0.2em; +} +form#form-login ul { + padding-left: 20px; +} +form#com-form-login fieldset { + border: 0 none; + margin: 0em; + padding: 0.2em; +} +form#com-form-login ul { + padding-left: 20px; +} +/* thumbnails */ + +div.mosimage { + margin: 5px; +} +div.mosimage_caption { + font-size: .90em; + color: #666; +} +div.caption { + padding: 0 10px 0 10px; +} +div.caption img { + border: 1px solid #CCC; +} +div.caption p { + font-size: .90em; + color: #666; + text-align: center; +} +/* Parameter Table */ + +table.paramlist { + margin-top: 5px; +} +table.paramlist td.paramlist_key { + width: 128px; + text-align: left; + height: 30px; +} +table.paramlist td.paramlist_value { +} +div.message { + font-family : "Trebuchet MS", Arial, Helvetica, sans-serif; + font-weight: bold; + font-size : 14px; + color : #c30; + text-align: center; + width: auto; + background-color: #f9f9f9; + border: solid 1px #d5d5d5; + margin: 3px 0px 10px; + padding: 3px 20px; +} +/* Banners module */ + + + +/* Default skyscraper style */ + +.bannergroup { +} +.banneritem img { + display: block; + margin-left: auto; + margin-right: auto; +} +/* Text advert style */ + + + +.banneritem_text { + padding: 4px; + font-size: 11px; +} +.bannerfooter_text { + padding: 4px; + font-size: 11px; + background-color: #F7F7F7; + text-align: right; +} +/* System Messages */ + +/* see system general.css */ + + + +.pagination span { + padding: 2px; +} +.pagination a { + padding: 2px; +} +/* Polls */ + +.pollstableborder td { + text-align: left; +} +/* WebLinks */ + +span.description { + display:block; + padding-left: 30px; +} +/* Frontend Editing*/ + +fieldset { + border: 1px solid #ccc; + margin-top: 15px; + padding: 15px; +} +legend { + margin: 0; + padding: 0 10px; +} +td.key { + border-bottom:1px solid #eee; + color: #666; +} +/* Tooltips */ + + + +.tool-tip { + float: left; + background: #ffc; + border: 1px solid #D4D5AA; + padding: 5px; + max-width: 200px; +} +.tool-title { + padding: 0; + margin: 0; + font-size: 100%; + font-weight: bold; + margin-top: -15px; + padding-top: 15px; + padding-bottom: 5px; + background: url(../../system/images/selector-arrow.png) no-repeat; +} +.tool-text { + font-size: 100%; + margin: 0; +} +/* System Standard Messages */ + +#system-message { + margin-bottom: 20px; +} +#system-message dd.message ul { + background: #C3D2E5 url(../../system/images/notice-info.png) 4px center no-repeat; + border-top: 3px solid #DE7A7B; + border-bottom: 3px solid #DE7A7B; + margin:0px; + padding-left: 40px; + text-indent:0px; +} +/* System Error Messages */ + +#system-message dd.error ul { + color: #c00; + background: #E6C0C0 url(../../system/images/notice-alert.png) 4px center no-repeat; + border-top: 3px solid #DE7A7B; + border-bottom: 3px solid #DE7A7B; + margin:0px; + padding-left: 40px; + text-indent:0px; +} +/* System Notice Messages */ + +#system-message dd.notice ul { + color: #c00; + background: #EFE7B8 url(../../system/images/notice-note.png) 4px center no-repeat; + border-top: 3px solid #F0DC7E; + border-bottom: 3px solid #F0DC7E; + margin:0px; + padding-left: 40px; + text-indent:0px; +} +#syndicate { + float:left; + padding-left: 25px; +} +#power_by { + float:right; + padding-right: 25px; +} +/* Component Specific Fixes */ + + +#component-contact table td { + padding: 2px 0; +} diff --git a/oss/joomla/trunk/templates/hawebs/css/template_rtl.css b/oss/joomla/trunk/templates/hawebs/css/template_rtl.css new file mode 100644 index 00000000..ea5120ca --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/css/template_rtl.css @@ -0,0 +1,201 @@ +@charset "UTF-8"; +/** + * Copyright (C) 2006-2009 YUCHENG HU + * + * ---------------------------------------------------------------------------------- + * HA WEBSYSTEMS + * http://www.hawebs.net + * http://www.tcivis.com + * + * Contact + * huyuchengus@gmail.com / yuchenghu@hawebs.net + * + * ---------------------------------------------------------------------------------- + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + * GNU GENERAL PUBLIC LICENSE + * + * ---------------------------------------------------------------------------------- + */ + +body{ + direction: rtl; +} + +div#logo { + float:right; + right:0pt; + left:auto; + margin-left:0px; + margin-right:30px; +} + +div#header_r { + text-align:right; + padding-right:370px; + padding-left:30px; +} + +td.pill_m { + background: url(../images/mw_menu_normal_bg.png) repeat-x; +} + +td.pill_r { + background:transparent url(../images/mw_menu_cap_l.png) no-repeat scroll 0%; +} + +td.pill_l { + background:transparent url(../images/mw_menu_cap_r.png) no-repeat scroll 0%; +} + +#pillmenu { + float:none; +} + +#pillmenu ul { + width: 420px; +} + +#pillmenu li{ + float: right; +} + +#pillmenu a { + float:none; + padding: 0px 10px; +} + +#search{ + float: left; + margin-right: 0px; + margin-left: 30px; + text-align: left; +} + +#mod_search_searchword { + padding-right:3px; +} + +#pathway{ + margin-left: 250px; + margin-right: 0px; + text-align: right; +} + +#whitebox div { + text-align:right; +} + +#leftcolumn { + float:right; +} + +#maincolumn, #maincolumn_full { + margin-right: 20%; + margin-left: 0%; + padding-right: 15px; + padding-left: 0px; +} + +h3, .componentheading, table.moduletable th, legend{ + text-align: right; +} + +div.module_menu h3{ + padding-right: 10px; + padding-left: 0px; +} + +div.module_menu ul{ + padding-right: 20px; + padding-left: 0px; +} + +h1 { + text-align: right; +} + +h2, .contentheading{ + text-align: right; +} + +td.buttonheading { + text-align:left; +} + +.small, .modifydate{ + text-align: right; +} + +.pollstableborder td { + text-align:right; +} + +.article_column { + padding-right:0px; + padding-left:5px; +} + +.column_separator { + border-right: 1px dashed #E0E0E0; + border-left: none; + padding-right: 10px; + padding-left: 0px; +} + +form#form-login ul { + padding-right: 20px; + padding-left: 0px; +} + +form#com-form-login ul { + padding-right: 20px; + padding-left: 0px; +} + +a.readon { + background:transparent url(../images/mw_readon_rtl.png) no-repeat scroll left top; + float:right; + padding-right:0px; + padding-left:20px; +} + +#syndicate{ + float:right; + padding-left: 0px; + padding-right: 25px; +} + +#power_by{ + float:left; + padding-right: 0px; + padding-left: 25px; +} + +.contentpaneopen_edit { + float:right; +} + +table.contenttoc{ + float: left; +} + +span.pagination a{ + float: right; +} + +span.pagination span{ + float: right; + display: block; +} diff --git a/oss/joomla/trunk/templates/hawebs/css/white.css b/oss/joomla/trunk/templates/hawebs/css/white.css new file mode 100644 index 00000000..c95583dd --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/css/white.css @@ -0,0 +1,45 @@ +/* white */ +a:link, a:visited { + color: #135cae; +} + +a:hover { + color: #0b3768; +} + +#pillmenu a:hover { + color: #135cae; +} + +#pillmenu a#active_menu-nav { + background: url(../images/white/mw_menu_active_bg.png) 0 0 repeat-x; + color: #fff; +} + +#pillmenu a#active_menu-nav:hover { + color: #fff; +} + +h3, div.module_menu h3, .componentheading, table.moduletable th { + color: #135cae; +} + +h3, .componentheading, table.moduletable th { + color: #135cae; +} + +div.module_menu { + background: url(../images/white/mw_box_br.png) 100% 100% no-repeat; +} + +div.module_menu div { + background: url(../images/white/mw_box_bl.png) 0 100% no-repeat; +} + +div.module_menu div div { + background: url(../images/white/mw_box_tr.png) 100% 0 no-repeat; +} + +div.module_menu div div div { + background: url(../images/white/mw_box_tl.png) 0 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/css/white_bg.css b/oss/joomla/trunk/templates/hawebs/css/white_bg.css new file mode 100644 index 00000000..a48d0b91 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/css/white_bg.css @@ -0,0 +1,36 @@ +/* white */ +#page_bg { + background: #fff; +} + +div#wrapper { + background: #f7f7f7 url(../images/white/mw_shadow_l.png) 0 0 repeat-y; +} + +div#wrapper_r { + background: url(../images/white/mw_shadow_r.png) 100% 0 repeat-y; +} + +div#header { + background: url(../images/white/mw_header_t.png) 0 0 repeat-x; +} + +div#header_l { + background: url(../images/white/mw_header_t_l.png) 0 0 no-repeat; +} + +div#header_r { + background: url(../images/white/mw_header_t_r.png) 100% 0 no-repeat; +} + +div#footer { + background: #f7f7f7 url(../images/white/mw_footer_b.png) 0 100% repeat-x; +} + +div#footer_l { + background: url(../images/white/mw_footer_b_l.png) 0 0 no-repeat; +} + +div#footer_r { + background: url(../images/white/mw_footer_b_r.png) 100% 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/favicon.ico b/oss/joomla/trunk/templates/hawebs/favicon.ico new file mode 100644 index 00000000..b5e79cb6 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/favicon.ico differ diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/article/default.php b/oss/joomla/trunk/templates/hawebs/html/com_content/article/default.php new file mode 100644 index 00000000..cd60c1e2 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/article/default.php @@ -0,0 +1,122 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<div id="page"> + +<?php if (($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) && !($this->print)) : ?> +<div class="contentpaneopen_edit<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo JHTML::_('icon.edit', $this->article, $this->params, $this->access); ?> +</div> +<?php endif; ?> + +<?php if ($this->params->get('show_page_title',1) && $this->params->get('page_title') != $this->article->title) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<?php if ($this->params->get('show_title')) : ?> +<h2 class="contentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php if ($this->params->get('link_titles') && $this->article->readmore_link != '') : ?> + <a href="<?php echo $this->article->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->article->title); ?></a> + <?php else : + echo $this->escape($this->article->title); + endif; ?> +</h2> +<?php endif; ?> + +<?php if ((intval($this->article->modified) !=0 && $this->params->get('show_modify_date')) || ($this->params->get('show_author') && ($this->article->author != "")) || ($this->params->get('show_create_date'))) : ?> +<p class="articleinfo"> + <?php if (intval($this->article->modified) !=0 && $this->params->get('show_modify_date')) : ?> + <span class="modifydate"> + <?php echo JText::sprintf('LAST_UPDATED2', JHTML::_('date', $this->article->modified, JText::_('DATE_FORMAT_LC2'))); ?> + </span> + <?php endif; ?> + + <?php if (($this->params->get('show_author')) && ($this->article->author != "")) : ?> + <span class="createdby"> + <?php JText::printf('Written by', ($this->article->created_by_alias ? $this->escape($this->article->created_by_alias) : $this->escape($this->article->author))); ?> + </span> + <?php endif; ?> + + <?php if ($this->params->get('show_create_date')) : ?> + <span class="createdate"> + <?php echo JHTML::_('date', $this->article->created, JText::_('DATE_FORMAT_LC2')); ?> + </span> + <?php endif; ?> +</p> +<?php endif; ?> + +<?php if (!$this->params->get('show_intro')) : + echo $this->article->event->afterDisplayTitle; +endif; ?> + +<p class="buttonheading"> + <?php if ($this->print) : + echo JHTML::_('icon.print_screen', $this->article, $this->params, $this->access); + elseif ($this->params->get('show_pdf_icon') || $this->params->get('show_print_icon') || $this->params->get('show_email_icon')) : ?> + <img src="<?php echo $this->baseurl ?>/templates/<?php echo $mainframe->getTemplate(); ?>/images/trans.gif" alt="<?php echo JText::_('attention open in a new window'); ?>" /> + <?php if ($this->params->get('show_pdf_icon')) : + echo JHTML::_('icon.pdf', $this->article, $this->params, $this->access); + endif; + if ($this->params->get('show_print_icon')) : + echo JHTML::_('icon.print_popup', $this->article, $this->params, $this->access); + endif; + if ($this->params->get('show_email_icon')) : + echo JHTML::_('icon.email', $this->article, $this->params, $this->access); + endif; + endif; ?> +</p> + +<?php if (($this->params->get('show_section') && $this->article->sectionid) || ($this->params->get('show_category') && $this->article->catid)) : ?> +<p class="iteminfo"> + <?php if ($this->params->get('show_section') && $this->article->sectionid) : ?> + <span> + <?php if ($this->params->get('link_section')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->article->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->article->section); ?> + <?php if ($this->params->get('link_section')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + <?php if ($this->params->get('show_category')) : ?> + <?php echo ' - '; ?> + <?php endif; ?> + </span> + <?php endif; ?> + <?php if ($this->params->get('show_category') && $this->article->catid) : ?> + <span> + <?php if ($this->params->get('link_category')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->article->catslug, $this->article->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->article->category); ?> + <?php if ($this->params->get('link_category')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + </span> + <?php endif; ?> +</p> +<?php endif; ?> + +<?php echo $this->article->event->beforeDisplayContent; ?> + +<?php if ($this->params->get('show_url') && $this->article->urls) : ?> +<span class="small"> + <a href="<?php echo $this->escape($this->article->urls); ?>" target="_blank"> + <?php echo $this->escape($this->article->urls); ?></a> +</span> +<?php endif; ?> + +<?php if (isset ($this->article->toc)) : + echo $this->article->toc; +endif; ?> + +<span class="articlecontext"> + <?php echo JFilterOutput::ampReplace($this->article->text); ?> +</span> + +<?php echo $this->article->event->afterDisplayContent; ?> + +</div> diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/article/form.php b/oss/joomla/trunk/templates/hawebs/html/com_content/article/form.php new file mode 100644 index 00000000..4d9e3e4a --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/article/form.php @@ -0,0 +1,202 @@ +<?php // @version: $Id: form.php 12389 2009-07-01 00:34:45Z ian $ +defined('_JEXEC') or die('Restricted access'); +$config =& JFactory::getConfig(); +$publish_up =& JFactory::getDate($this->article->publish_up); +$publish_up->setOffset($config->getValue('config.offset')); +$publish_up = $publish_up->toFormat(); + +if (! isset($this->article->publish_down) || $this->article->publish_down == 'Never') { + $publish_down = JText::_('Never'); +} else { + $publish_down =& JFactory::getDate($this->article->publish_down); + $publish_down->setOffset($config->getValue('config.offset')); + $publish_down = $publish_down->toFormat(); +} +?> +<script language="javascript" type="text/javascript"> +<!-- +function setgood() { + // TODO: Put setGood back + return true; +} + +var sectioncategories = new Array; +<?php +$i = 0; +foreach ($this->lists['sectioncategories'] as $k=>$items) { + foreach ($items as $v) { + echo "sectioncategories[".$i++."] = new Array( '$k','".addslashes( $v->id )."','".addslashes( $v->title )."' );\n\t\t"; + } +} +?> + + +function submitbutton(pressbutton) { + var form = document.adminForm; + if (pressbutton == 'cancel') { + submitform( pressbutton ); + return; + } + try { + form.onsubmit(); + } catch(e) { + alert(e); + } + + // do field validation + var text = <?php echo $this->editor->getContent( 'text' ); ?> + if (form.title.value == '') { + return alert ( "<?php echo JText::_( 'Article must have a title', true ); ?>" ); + } else if (text == '') { + return alert ( "<?php echo JText::_( 'Article must have some text', true ); ?>"); + } else if (parseInt('<?php echo $this->article->sectionid;?>')) { + // for articles + if (form.catid && getSelectedValue('adminForm','catid') < 1) { + return alert ( "<?php echo JText::_( 'Please select a category', true ); ?>" ); + } + } + <?php echo $this->editor->save( 'text' ); ?> + submitform(pressbutton); +} +//--> +</script> +<?php if ($this->params->get('show_page_title', 1)) : ?> +<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"><?php echo $this->escape($this->params->get('page_title')); ?></div> +<?php endif; ?> +<form action="<?php echo $this->action ?>" method="post" name="adminForm" onSubmit="setgood();" class="editor"> +<fieldset> +<legend><?php echo JText::_('Editor'); ?></legend> + + <div> + <label for="title"> + <?php echo JText::_( 'Title' ); ?>: + </label> + <input class="inputbox" type="text" id="title" name="title" size="50" maxlength="100" value="<?php echo $this->escape($this->article->title); ?>" /> + </div> + <div class="save"> + <button type="button" onclick="submitbutton('save')"> + <?php echo JText::_('Save') ?> + </button> + <button type="button" onclick="submitbutton('cancel')" /> + <?php echo JText::_('Cancel') ?> + </button> + </div> + <div class="wrap"> </div> + +<?php +echo $this->editor->display('text', $this->article->text, '100%', '400', '70', '15'); +?> +</fieldset> +<fieldset class="publishing"> +<legend><?php echo JText::_('Publishing'); ?></legend> + + <div> + <label for="sectionid"> + <?php echo JText::_( 'Section' ); ?>: + </label> + + <?php echo $this->lists['sectionid']; ?> + </div> + <div class="wrap"> </div> + + <div> + <label for="catid"> + <?php echo JText::_( 'Category' ); ?>: + </label> + + <?php echo $this->lists['catid']; ?> + </div> + <div class="wrap"> </div> + +<?php if ($this->user->authorize('com_content', 'publish', 'content', 'all')) : ?> + + <div class="radio"> + <label for="state" > + <span><?php echo JText::_( 'Published' ); ?>:</span> + </label> + + <?php echo $this->lists['state']; ?> + </div> + + +<?php endif; ?> + + <div class="radio"> + <label for="frontpage"> + <span><?php echo JText::_( 'Show on Front Page' ); ?>:</span> + </label> + + <?php echo $this->lists['frontpage']; ?> + </div> + <div class="wrap"> </div> + + <div> + <label for="created_by_alias"> + <?php echo JText::_( 'Author Alias' ); ?>: + </label> + + <input type="text" id="created_by_alias" name="created_by_alias" size="50" maxlength="100" value="<?php echo $this->escape($this->article->created_by_alias); ?>" class="inputbox" /> + + </div> + <div class="wrap"> </div> + <div> + <label for="publish_up"> + <?php echo JText::_( 'Start Publishing' ); ?>: + </label> + <?php echo JHTML::_('calendar', $publish_up, 'publish_up', 'publish_up', '%Y-%m-%d %H:%M:%S', array('class'=>'inputbox', 'size'=>'25', 'maxlength'=>'19')); ?> + </div> + <div class="wrap"> </div> + <div> + <label for="publish_down"> + <?php echo JText::_( 'Finish Publishing' ); ?>: + </label> + <?php echo JHTML::_('calendar', $publish_down, 'publish_down', 'publish_down', '%Y-%m-%d %H:%M:%S', array('class'=>'inputbox', 'size'=>'25', 'maxlength'=>'19')); ?> + </div> + <div class="wrap"> </div> + <div> + <label for="access"> + <?php echo JText::_( 'Access Level' ); ?>: + </label> + + <?php echo $this->lists['access']; ?> + </div> + <div class="wrap"> </div> + <div> + <label for="ordering"> + <?php echo JText::_( 'Ordering' ); ?>: + </label> + + <?php echo $this->lists['ordering']; ?> + </div> + <div class="wrap"> </div> + +</fieldset> + +<fieldset class="metadata"> +<legend><?php echo JText::_('Metadata'); ?></legend> + + + <label for="metadesc"> + <?php echo JText::_( 'Description' ); ?>: + </label> + + <textarea rows="5" cols="50" style="width:500px; height:120px" class="inputbox" id="metadesc" name="metadesc"><?php echo str_replace('&','&',$this->article->metadesc); ?></textarea> + + <label for="metakey"> + <?php echo JText::_( 'Keywords' ); ?>: + </label> + + <textarea rows="5" cols="50" style="width:500px; height:50px" class="inputbox" id="metakey" name="metakey"><?php echo str_replace('&','&',$this->article->metakey); ?></textarea> + +</fieldset> + + <input type="hidden" name="option" value="com_content" /> + <input type="hidden" name="Returnid" value="<?php echo $this->returnid; ?>" /> + <input type="hidden" name="id" value="<?php echo $this->article->id; ?>" /> + <input type="hidden" name="version" value="<?php echo $this->article->version; ?>" /> + <input type="hidden" name="created_by" value="<?php echo $this->article->created_by; ?>" /> + <input type="hidden" name="referer" value="<?php echo str_replace(array('"', '<', '>', "'"), '', @$_SERVER['HTTP_REFERER']); ?>" /> + <input type="hidden" name="task" value="" /> + <?php echo JHTML::_( 'form.token' ); ?> +</form> +<?php echo JHTML::_('behavior.keepalive'); ?> diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/article/index.html b/oss/joomla/trunk/templates/hawebs/html/com_content/article/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/article/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/category/blog.php b/oss/joomla/trunk/templates/hawebs/html/com_content/category/blog.php new file mode 100644 index 00000000..bca41ece --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/category/blog.php @@ -0,0 +1,83 @@ +<?php // @version $Id: blog.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +$cparams = JComponentHelper::getParams ('com_media'); +?> + +<?php if ($this->params->get('show_page_title')) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<div class="blog<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php if ($this->params->def('show_description', 1) || $this->params->def('show_description_image', 1)) : ?> + <div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php if ($this->params->get('show_description_image') && $this->category->image) : ?> + <img src="<?php echo $this->baseurl . $cparams->get('image_path') . '/' . $this->category->image; ?>" class="image_<?php echo $this->category->image_position; ?>" /> + <?php endif; ?> + + <?php if ($this->params->get('show_description') && $this->category->description) : + echo $this->category->description; + endif; ?> + + <?php if ($this->params->get('show_description_image') && $this->category->image) : ?> + <div class="wrap_image"> </div> + <?php endif; ?> + + </div> + <?php endif; ?> + + <?php $i = $this->pagination->limitstart; + $rowcount = $this->params->def('num_leading_articles', 1); + for ($y = 0; $y < $rowcount && $i < $this->total; $y++, $i++) : ?> + <div class="leading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php $this->item =& $this->getItem($i, $this->params); + echo $this->loadTemplate('item'); ?> + </div> + <span class="leading_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> </span> + <?php endfor; ?> + + <?php $introcount = $this->params->def('num_intro_articles', 4); + if ($introcount) : + $colcount = (int)$this->params->def('num_columns', 2); + if ($colcount == 0) : + $colcount = 1; + endif; + $rowcount = (int) $introcount / $colcount; + $ii = 0; + for ($y = 0; $y < $rowcount && $i < $this->total; $y++) : ?> + <div class="article_row<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php for ($z = 0; $z < $colcount && $ii < $introcount && $i < $this->total; $z++, $i++, $ii++) : ?> + <div class="article_column column<?php echo $z + 1; ?> cols<?php echo $colcount; ?>" > + <?php $this->item =& $this->getItem($i, $this->params); + echo $this->loadTemplate('item'); ?> + </div> + <span class="article_separator"> </span> + <?php endfor; ?> + <span class="row_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> </span> + </div> + <?php endfor; + endif; ?> + + <?php $numlinks = $this->params->def('num_links', 4); + if ($numlinks && $i < $this->total) : ?> + <div class="blog_more<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php $this->links = array_slice($this->items, $i - $this->pagination->limitstart, $i - $this->pagination->limitstart + $numlinks); + echo $this->loadTemplate('links'); ?> + </div> + <?php endif; ?> + + <?php if ($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2 && $this->pagination->get('pages.total') > 1)) : ?> + <?php if( $this->pagination->get('pages.total') > 1 ) : ?> + <p class="counter"> + <?php echo $this->pagination->getPagesCounter(); ?> + </p> + <?php endif; ?> + <?php if ($this->params->def('show_pagination_results', 1)) : ?> + <?php echo $this->pagination->getPagesLinks(); ?> + <?php endif; ?> + <?php endif; ?> + +</div> diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/category/blog_item.php b/oss/joomla/trunk/templates/hawebs/html/com_content/category/blog_item.php new file mode 100644 index 00000000..35f7a8f2 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/category/blog_item.php @@ -0,0 +1,123 @@ +<?php // @version $Id: blog_item.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php if ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) : ?> +<div class="contentpaneopen_edit<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?> +</div> +<?php endif; ?> + +<?php if ($this->item->params->get('show_title')) : ?> +<h2 class="contentheading<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?> + <a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->item->title); ?></a> + <?php else : + echo $this->escape($this->item->title); + endif; ?> +</h2> +<?php endif; ?> + +<?php if (!$this->item->params->get('show_intro')) : + echo $this->item->event->afterDisplayTitle; +endif; ?> + +<?php if ($this->item->params->get('show_pdf_icon') || $this->item->params->get('show_print_icon') || $this->item->params->get('show_email_icon')) : ?> +<p class="buttonheading"> + <img src="<?php echo $this->baseurl ?>/templates/<?php echo $mainframe->getTemplate(); ?>/images/trans.gif" alt="<?php echo JText::_('attention open in a new window'); ?>" /> + <?php if ($this->item->params->get('show_pdf_icon')) : + echo JHTML::_('icon.pdf', $this->item, $this->item->params, $this->access); + endif; + if ($this->item->params->get('show_print_icon')) : + echo JHTML::_('icon.print_popup', $this->item, $this->item->params, $this->access); + endif; + if ($this->item->params->get('show_email_icon')) : + echo JHTML::_('icon.email', $this->item, $this->item->params, $this->access); + endif; ?> +</p> +<?php endif; ?> + +<?php if (($this->item->params->get('show_section') && $this->item->sectionid) || ($this->item->params->get('show_category') && $this->item->catid)) : ?> +<p class="pageinfo"> + <?php if ($this->item->params->get('show_section') && $this->item->sectionid && isset($this->item->section)) : ?> + <span> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->item->section); ?> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + <?php if ($this->item->params->get('show_category')) : ?> + <?php echo ' - '; ?> + <?php endif; ?> + </span> + <?php endif; ?> + <?php if ($this->item->params->get('show_category') && $this->item->catid) : ?> + <span> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->item->category); ?> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + </span> + <?php endif; ?> +</p> +<?php endif; ?> + +<?php if ((intval($this->item->modified) !=0 && $this->item->params->get('show_modify_date')) || ($this->item->params->get('show_author') && ($this->item->author != "")) || ($this->item->params->get('show_create_date'))) : ?> +<p class="iteminfo"> + <?php if (intval($this->item->modified) !=0 && $this->item->params->get('show_modify_date')) : ?> + <span class="modifydate"> + <?php echo JText::sprintf('LAST_UPDATED2', JHTML::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC2'))); ?> + </span> + <?php endif; ?> + + <?php if (($this->item->params->get('show_author')) && ($this->item->author != "")) : ?> + <span class="createdby"> + <?php JText::printf('Written by', ($this->escape($this->item->created_by_alias) ? $this->escape($this->item->created_by_alias) : $this->escape($this->item->author))); ?> + </span> + <?php endif; ?> + + <?php if ($this->item->params->get('show_create_date')) : ?> + <span class="createdate"> + <?php echo JHTML::_('date', $this->item->created, JText::_('DATE_FORMAT_LC2')); ?> + </span> + <?php endif; ?> +</p> +<?php endif; ?> + +<?php echo $this->item->event->beforeDisplayContent; ?> + +<?php if ($this->item->params->get('show_url') && $this->item->urls) : ?> +<span class="small"> + <a href="<?php echo $this->item->urls; ?>" target="_blank"> + <?php echo $this->escape($this->item->urls); ?></a> +</span> +<?php endif; ?> + +<?php if (isset ($this->item->toc)) : + echo $this->item->toc; +endif; ?> + +<span class="articlecontext"> +<?php echo JFilterOutput::ampReplace($this->item->text); ?> +</span> + +<?php if ($this->item->params->get('show_readmore') && $this->item->readmore) : ?> +<p> + <a href="<?php echo $this->item->readmore_link; ?>" class="readon<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php if ($this->item->readmore_register) : + echo JText::_('Register to read more...'); + elseif ($readmore = $this->item->params->get('readmore')) : + echo $readmore; + else : + echo JText::sprintf('Read more', $this->escape($this->item->title)); + endif; ?></a> +</p> +<?php endif; ?> + +<?php echo $this->item->event->afterDisplayContent; diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/category/blog_links.php b/oss/joomla/trunk/templates/hawebs/html/com_content/category/blog_links.php new file mode 100644 index 00000000..71836274 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/category/blog_links.php @@ -0,0 +1,16 @@ +<?php // @version $Id: blog_links.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<h2> + <?php echo JText::_('More Articles...'); ?> +</h2> + +<ul> + <?php foreach ($this->links as $link) : ?> + <li> + <a class="blogsection" href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($link->slug, $link->catslug, $link->sectionid)); ?>"> + <?php echo $this->escape($link->title); ?></a> + </li> + <?php endforeach; ?> +</ul> diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/category/default.php b/oss/joomla/trunk/templates/hawebs/html/com_content/category/default.php new file mode 100644 index 00000000..78c4ad74 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/category/default.php @@ -0,0 +1,33 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +$cparams = JComponentHelper::getParams ('com_media'); +?> + +<?php if ($this->params->get('show_page_title',1)) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<?php if ($this->params->def('show_description', 1) || $this->params->def('show_description_image', 1)) : ?> +<div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php if ($this->params->get('show_description_image') && $this->category->image) : ?> + <img src="<?php echo $this->baseurl . $cparams->get('image_path').'/'.$this->category->image; ?>" class="image_<?php echo $this->category->image_position; ?>" /> + <?php endif; ?> + + <?php if ($this->params->get('show_description') && $this->category->description) : + echo $this->category->description; + endif; ?> + + <?php if ($this->params->get('show_description_image') && $this->category->image) : ?> + <div class="wrap_image"> </div> + <?php endif; ?> +</div> +<?php endif; ?> + +<?php $this->items =& $this->getItems(); +echo $this->loadTemplate('items'); ?> + +<?php if ($this->access->canEdit || $this->access->canEditOwn) : + echo JHTML::_('icon.create', $this->category, $this->params, $this->access); +endif; diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/category/default_items.php b/oss/joomla/trunk/templates/hawebs/html/com_content/category/default_items.php new file mode 100644 index 00000000..bd7356e8 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/category/default_items.php @@ -0,0 +1,124 @@ +<?php // @version: $Id: default_items.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<script language="javascript" type="text/javascript"> +<!-- +function tableOrdering( order, dir, task ) +{ +var form = document.adminForm; + +form.filter_order.value = order; +form.filter_order_Dir.value = dir; +document.adminForm.submit( task ); +} +// --> +</script> + +<form action="<?php echo $this->action; ?>" method="post" name="adminForm"> + +<?php if ($this->params->get('filter')) : ?> +<div class="filter"> + <?php echo JText::_($this->escape($this->params->get('filter_type')) . ' ' . 'Filter').' '; ?> + <input type="text" name="filter" value="<?php echo $this->escape($this->lists['filter']); ?>" class="inputbox" onchange="document.adminForm.submit();" /> + +<?php endif; ?> + +<?php if ($this->params->get('show_pagination_limit')) : ?> + + <?php echo JText::_('Display Num'); ?>  + <?php echo $this->pagination->getLimitBox(); ?> +</div> +<?php endif; ?> + +<table class="category"> + + <?php if ($this->params->get('show_headings')) : ?> + <tr> + <th class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" id="count"> + <?php echo JText::_('Num'); ?> + </th> + + <?php if ($this->params->get('show_title')) : ?> + <th class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" id="tableOrdering"> + <?php echo JHTML::_('grid.sort', 'Item Title', 'a.title', $this->lists['order_Dir'], $this->lists['order']); ?> + </th> + <?php endif; ?> + + <?php if ($this->params->get('show_date')) : ?> + <th class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" id="tableOrdering2"> + <?php echo JHTML::_('grid.sort', 'Date', 'a.created', $this->lists['order_Dir'], $this->lists['order']); ?> + </th> + <?php endif; ?> + + <?php if ($this->params->get('show_author')) : ?> + <th class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" id="author"> + <?php echo JHTML::_('grid.sort', 'Author', 'author', $this->lists['order_Dir'], $this->lists['order']); ?> + </th> + <?php endif; ?> + + <?php if ($this->params->get('show_hits')) : ?> + <th align="center" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" width="5%" nowrap="nowrap" id="hits"> + <?php echo JHTML::_('grid.sort', 'Hits', 'a.hits', $this->lists['order_Dir'], $this->lists['order']); ?> + </th> + <?php endif; ?> + </tr> + <?php endif; ?> + + <?php foreach ($this->items as $item) : ?> + <tr class="sectiontableentry<?php echo ($item->odd + 1) . $this->escape($this->params->get('pageclass_sfx')); ?>"> + <td headers="count"> + <?php echo $this->pagination->getRowOffset((int)$item->count); ?> + </td> + + <?php if ($this->params->get('show_title')) : ?> + <td headers="tableOrdering"> + <?php if ($item->access <= $this->user->get('aid', 0)) : ?> + <a href="<?php echo $item->link; ?>"> + <?php echo $this->escape($item->title); ?></a> + <?php echo JHTML::_('icon.edit', $item, $this->params, $this->access); + else : + echo $item->title; ?> : + <a href="<?php echo JRoute::_('index.php?option=com_user&task=register'); ?>"> + <?php echo JText::_('Register to read more...'); ?></a> + <?php endif; ?> + </td> + <?php endif; ?> + + <?php if ($this->params->get('show_date')) : ?> + <td headers="tableOrdering2"> + <?php echo $this->escape($item->created); ?> + </td> + <?php endif; ?> + + <?php if ($this->params->get('show_author')) : ?> + <td headers="author"> + <?php echo $item->created_by_alias ? $this->escape($item->created_by_alias) : $this->escape($item->author); ?> + </td> + <?php endif; ?> + + <?php if ($this->params->get('show_hits')) : ?> + <td headers="hits"> + <?php echo $item->hits ? (int)$item->hits : '-'; ?> + </td> + <?php endif; ?> + + </tr> + <?php endforeach; ?> + +</table> + +<?php if ($this->params->get('show_pagination')) : ?> +<p class="counter"> + <?php echo $this->pagination->getPagesCounter(); ?> +</p> +<?php echo $this->pagination->getPagesLinks(); +endif; ?> + +<input type="hidden" name="id" value="<?php echo (int)$this->category->id; ?>" /> +<input type="hidden" name="sectionid" value="<?php echo (int)$this->category->sectionid; ?>" /> +<input type="hidden" name="task" value="<?php echo $this->lists['task']; ?>" /> +<input type="hidden" name="filter_order" value="" /> +<input type="hidden" name="filter_order_Dir" value="" /> +<input type="hidden" name="limitstart" value="0" /> +</form> diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/category/index.html b/oss/joomla/trunk/templates/hawebs/html/com_content/category/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/category/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/frontpage/default.php b/oss/joomla/trunk/templates/hawebs/html/com_content/frontpage/default.php new file mode 100644 index 00000000..cb4bcb2d --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/frontpage/default.php @@ -0,0 +1,63 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php if ($this->params->get('show_page_title',1)) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<div class="blog<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php $i = $this->pagination->limitstart; + $rowcount = $this->params->def('num_leading_articles', 1); + for ($y = 0; $y < $rowcount && $i < $this->total; $y++, $i++) : ?> + <div class="leading<?php echo $this->params->get('pageclass_sfx'); ?>"> + <?php $this->item =& $this->getItem($i, $this->params); + echo $this->loadTemplate('item'); ?> + </div> + <span class="leading_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> </span> + <?php endfor; ?> + + <?php $introcount = $this->params->def('num_intro_articles', 4); + if ($introcount) : + $colcount = $this->params->def('num_columns', 2); + if ($colcount == 0) : + $colcount = 1; + endif; + $rowcount = (int) $introcount / $colcount; + $ii = 0; + for ($y = 0; $y < $rowcount && $i < $this->total; $y++) : ?> + <div class="article_row<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php for ($z = 0; $z < $colcount && $ii < $introcount && $i < $this->total; $z++, $i++, $ii++) : ?> + <div class="article_column column<?php echo $z + 1; ?> cols<?php echo $colcount; ?>" > + <?php $this->item =& $this->getItem($i, $this->params); + echo $this->loadTemplate('item'); ?> + </div> + <span class="article_separator"> </span> + <?php endfor; ?> + <span class="row_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> </span> + </div> + <?php endfor; + endif; ?> + + <?php $numlinks = $this->params->def('num_links', 4); + if ($numlinks && $i < $this->total) : ?> + <div class="blog_more<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php $this->links = array_slice($this->items, $i - $this->pagination->limitstart, $i - $this->pagination->limitstart + $numlinks); + echo $this->loadTemplate('links'); ?> + </div> + <?php endif; ?> + + <?php if ($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2 && $this->pagination->get('pages.total') > 1)) : ?> + <?php if( $this->pagination->get('pages.total') > 1 ) : ?> + <p class="counter"> + <?php echo $this->pagination->getPagesCounter(); ?> + </p> + <?php endif; ?> + <?php if ($this->params->def('show_pagination_results', 1)) : ?> + <?php echo $this->pagination->getPagesLinks(); ?> + <?php endif; ?> + <?php endif; ?> +</div> diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/frontpage/default_item.php b/oss/joomla/trunk/templates/hawebs/html/com_content/frontpage/default_item.php new file mode 100644 index 00000000..5d472db4 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/frontpage/default_item.php @@ -0,0 +1,121 @@ +<?php // @version $Id: default_item.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php if ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) : ?> +<div class="contentpaneopen_edit<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?> +</div> +<?php endif; ?> + +<?php if ($this->item->params->get('show_title')) : ?> +<h2 class="contentheading<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?> + <a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->item->title); ?></a> + <?php else : + echo $this->escape($this->item->title); + endif; ?> +</h2> +<?php endif; ?> + +<?php if (!$this->item->params->get('show_intro')) : + echo $this->item->event->afterDisplayTitle; +endif; ?> + +<?php if ($this->item->params->get('show_pdf_icon') || $this->item->params->get('show_print_icon') || $this->item->params->get('show_email_icon')) : ?> +<p class="buttonheading"> + <img src="<?php echo $this->baseurl ?>/templates/<?php echo $mainframe->getTemplate(); ?>/images/trans.gif" alt="<?php echo JText::_('attention open in a new window'); ?>" /> + <?php if ($this->item->params->get('show_pdf_icon')) : + echo JHTML::_('icon.pdf', $this->item, $this->item->params, $this->access); + endif; + if ($this->item->params->get('show_print_icon')) : + echo JHTML::_('icon.print_popup', $this->item, $this->item->params, $this->access); + endif; + if ($this->item->params->get('show_email_icon')) : + echo JHTML::_('icon.email', $this->item, $this->item->params, $this->access); + endif; ?> +</p> +<?php endif; ?> + +<?php if (($this->item->params->get('show_section') && $this->item->sectionid) || ($this->item->params->get('show_category') && $this->item->catid)) : ?> +<p class="pageinfo"> + <?php if ($this->item->params->get('show_section') && $this->item->sectionid && isset($this->item->section)) : ?> + <span> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->item->section); ?> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + <?php if ($this->item->params->get('show_category')) : ?> + <?php echo ' - '; ?> + <?php endif; ?> + </span> + <?php endif; ?> + <?php if ($this->item->params->get('show_category') && $this->item->catid) : ?> + <span> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->item->category); ?> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + </span> + <?php endif; ?> +</p> +<?php endif; ?> + +<?php if ((intval($this->item->modified) !=0 && $this->item->params->get('show_modify_date')) || ($this->item->params->get('show_author') && ($this->item->author != "")) || ($this->item->params->get('show_create_date'))) : ?> +<p class="iteminfo"> + <?php if (intval($this->item->modified) !=0 && $this->item->params->get('show_modify_date')) : ?> + <span class="modifydate"> + <?php echo JText::sprintf('LAST_UPDATED2', JHTML::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC2'))); ?> + </span> + <?php endif; ?> + + <?php if (($this->item->params->get('show_author')) && ($this->item->author != "")) : ?> + <span class="createdby"> + <?php JText::printf('Written by', ($this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author)); ?> + </span> + <?php endif; ?> + + <?php if ($this->item->params->get('show_create_date')) : ?> + <span class="createdate"> + <?php echo JHTML::_('date', $this->item->created, JText::_('DATE_FORMAT_LC2')); ?> + </span> + <?php endif; ?> +</p> +<?php endif; ?> + +<?php echo $this->item->event->beforeDisplayContent; ?> + +<?php if ($this->item->params->get('show_url') && $this->item->urls) : ?> +<span class="small"> + <a href="<?php echo $this->escape($this->item->urls); ?>" target="_blank"> + <?php echo $this->escape($this->item->urls); ?></a> +</span> +<?php endif; ?> + +<?php if (isset ($this->item->toc)) : + echo $this->item->toc; +endif; ?> + +<?php echo JFilterOutput::ampReplace($this->item->text); ?> + +<?php if ($this->item->params->get('show_readmore') && $this->item->readmore) : ?> +<p> + <a href="<?php echo $this->item->readmore_link; ?>" class="readon<?php echo $this->item->params->get('pageclass_sfx'); ?>"> + <?php if ($this->item->readmore_register) : + echo JText::_('Register to read more...'); + elseif ($readmore = $this->item->params->get('readmore')) : + echo $readmore; + else : + echo JText::sprintf('Read more', $this->escape($this->item->title)); + endif; ?></a> +</p> +<?php endif; ?> + +<?php echo $this->item->event->afterDisplayContent; diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/frontpage/default_links.php b/oss/joomla/trunk/templates/hawebs/html/com_content/frontpage/default_links.php new file mode 100644 index 00000000..ef44a3ce --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/frontpage/default_links.php @@ -0,0 +1,16 @@ +<?php // @version $Id: default_links.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<h2> + <?php echo JText::_('More Articles...'); ?> +</h2> + +<ul> + <?php foreach ($this->links as $link) : ?> + <li> + <a class="blogsection" href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($link->slug, $link->catslug, $link->sectionid)); ?>"> + <?php echo $this->escape($link->title); ?></a> + </li> + <?php endforeach; ?> +</ul> diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/frontpage/index.html b/oss/joomla/trunk/templates/hawebs/html/com_content/frontpage/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/frontpage/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/index.html b/oss/joomla/trunk/templates/hawebs/html/com_content/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/section/blog.php b/oss/joomla/trunk/templates/hawebs/html/com_content/section/blog.php new file mode 100644 index 00000000..7f1e937f --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/section/blog.php @@ -0,0 +1,83 @@ +<?php // @version $Id: blog.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +$cparams = JComponentHelper::getParams ('com_media'); +?> + +<?php if ($this->params->get('show_page_title')) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<div class="blog<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php if ($this->params->def('show_description', 1) || $this->params->def('show_description_image', 1)) : ?> + <div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + + <?php if ($this->params->get('show_description_image') && $this->section->image) : ?> + <img src="<?php echo $this->baseurl . $cparams->get('image_path').'/'.$this->escape($this->section->image); ?>" class="image_<?php echo $this->escape($this->section->image_position); ?>" /> + <?php endif; ?> + + <?php if ($this->params->get('show_description') && $this->section->description) : + echo $this->section->description; + endif; ?> + + <?php if ($this->params->get('show_description_image') && $this->section->image) : ?> + <div class="wrap_image"> </div> + <?php endif; ?> + + </div> + <?php endif; ?> + + <?php $i = $this->pagination->limitstart; + $rowcount = $this->params->def('num_leading_articles', 1); + for ($y = 0; $y < $rowcount && $i < $this->total; $y++, $i++) : ?> + <div class="leading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php $this->item =& $this->getItem($i, $this->params); + echo $this->loadTemplate('item'); ?> + </div> + <span class="leading_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> </span> + <?php endfor; ?> + + <?php $introcount = (int)$this->params->def('num_intro_articles', 4); + if ($introcount) : + $colcount = (int)$this->params->def('num_columns', 2); + if ($colcount == 0) : + $colcount = 1; + endif; + $rowcount = (int) $introcount / $colcount; + $ii = 0; + for ($y = 0; $y < $rowcount && $i < $this->total; $y++) : ?> + <div class="article_row<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php for ($z = 0; $z < $colcount && $ii < $introcount && $i < $this->total; $z++, $i++, $ii++) : ?> + <div class="article_column column<?php echo $z + 1; ?> cols<?php echo $colcount; ?>" > + <?php $this->item =& $this->getItem($i, $this->params); + echo $this->loadTemplate('item'); ?> + </div> + <span class="article_separator"> </span> + <?php endfor; ?> + <span class="row_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> </span> + </div> + <?php endfor; + endif; ?> + + <?php $numlinks = (int)$this->params->def('num_links', 4); + if ($numlinks && $i < $this->total) : ?> + <div class="blog_more<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php $this->links = array_slice($this->items, $i - $this->pagination->limitstart, $i - $this->pagination->limitstart + $numlinks); + echo $this->loadTemplate('links'); ?> + </div> + <?php endif; ?> + + <?php if ($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2 && $this->pagination->get('pages.total') > 1)) : ?> + <?php if( $this->pagination->get('pages.total') > 1 ) : ?> + <p class="counter"> + <?php echo $this->pagination->getPagesCounter(); ?> + </p> + <?php endif; ?> + <?php if ($this->params->def('show_pagination_results', 1)) : ?> + <?php echo $this->pagination->getPagesLinks(); ?> + <?php endif; ?> + <?php endif; ?> + +</div> diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/section/blog_item.php b/oss/joomla/trunk/templates/hawebs/html/com_content/section/blog_item.php new file mode 100644 index 00000000..ee8897d1 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/section/blog_item.php @@ -0,0 +1,121 @@ +<?php // @version $Id: blog_item.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<?php if ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) : ?> +<div class="contentpaneopen_edit<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?> +</div> +<?php endif; ?> + +<?php if ($this->item->params->get('show_title')) : ?> +<h2 class="contentheading<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?> + <a href="<?php echo $this->escape($this->item->readmore_link); ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->item->title); ?></a> + <?php else : + echo $this->escape($this->item->title); + endif; ?> +</h2> +<?php endif; ?> + +<?php if (!$this->item->params->get('show_intro')) : + echo $this->item->event->afterDisplayTitle; +endif; ?> + +<?php if ($this->item->params->get('show_pdf_icon') || $this->item->params->get('show_print_icon') || $this->item->params->get('show_email_icon')) : ?> +<p class="buttonheading"> + <img src="<?php echo $this->baseurl ?>/templates/<?php echo $mainframe->getTemplate(); ?>/images/trans.gif" alt="<?php echo JText::_('attention open in a new window'); ?>" /> + <?php if ($this->item->params->get('show_pdf_icon')) : + echo JHTML::_('icon.pdf', $this->item, $this->item->params, $this->access); + endif; + if ($this->item->params->get('show_print_icon')) : + echo JHTML::_('icon.print_popup', $this->item, $this->item->params, $this->access); + endif; + if ($this->item->params->get('show_email_icon')) : + echo JHTML::_('icon.email', $this->item, $this->item->params, $this->access); + endif; ?> +</p> +<?php endif; ?> + +<?php if (($this->item->params->get('show_section') && $this->item->sectionid) || ($this->item->params->get('show_category') && $this->item->catid)) : ?> +<p class="pageinfo"> + <?php if ($this->item->params->get('show_section') && $this->item->sectionid && isset($this->section->title)) : ?> + <span> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->section->title); ?> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + <?php if ($this->item->params->get('show_category')) : ?> + <?php echo ' - '; ?> + <?php endif; ?> + </span> + <?php endif; ?> + <?php if ($this->item->params->get('show_category') && $this->item->catid) : ?> + <span> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->item->category); ?> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + </span> + <?php endif; ?> +</p> +<?php endif; ?> + +<?php if ((intval($this->item->modified) !=0 && $this->item->params->get('show_modify_date')) || ($this->item->params->get('show_author') && ($this->item->author != "")) || ($this->item->params->get('show_create_date'))) : ?> +<p class="iteminfo"> + <?php if ( intval($this->item->modified) != 0 && $this->item->params->get('show_modify_date')) : ?> + <span class="modifydate"> + <?php echo JText::sprintf('LAST_UPDATED2', JHTML::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC2'))); ?> + </span> + <?php endif; ?> + + <?php if (($this->item->params->get('show_author')) && ($this->item->author != "")) : ?> + <span class="createdby"> + <?php JText::printf('Written by', ($this->item->created_by_alias ? $this->escape($this->item->created_by_alias) : $this->escape($this->item->author))); ?> + </span> + <?php endif; ?> + + <?php if ($this->item->params->get('show_create_date')) : ?> + <span class="createdate"> + <?php echo JHTML::_('date', $this->item->created, JText::_('DATE_FORMAT_LC2')); ?> + </span> + <?php endif; ?> +</p> +<?php endif; ?> + +<?php echo $this->item->event->beforeDisplayContent; ?> + +<?php if ($this->item->params->get('show_url') && $this->item->urls) : ?> +<span class="small"> + <a href="<?php echo $this->escape($this->item->urls); ?>" target="_blank"> + <?php echo $this->escape($this->item->urls); ?></a> +</span> +<?php endif; ?> + +<?php if (isset ($this->item->toc)) : + echo $this->item->toc; +endif; ?> + +<?php echo JFilterOutput::ampReplace($this->item->text); ?> + +<?php if ($this->item->params->get('show_readmore') && $this->item->readmore) : ?> +<p> + <a href="<?php echo $this->item->readmore_link; ?>" class="readon<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php if ($this->item->readmore_register) : + echo JText::_('Register to read more...'); + elseif ($readmore = $this->item->params->get('readmore')) : + echo $readmore; + else : + echo JText::sprintf('Read more', $this->escape($this->item->title)); + endif; ?></a> +</p> +<?php endif; ?> + +<?php echo $this->item->event->afterDisplayContent; diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/section/blog_links.php b/oss/joomla/trunk/templates/hawebs/html/com_content/section/blog_links.php new file mode 100644 index 00000000..71836274 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/section/blog_links.php @@ -0,0 +1,16 @@ +<?php // @version $Id: blog_links.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +?> + +<h2> + <?php echo JText::_('More Articles...'); ?> +</h2> + +<ul> + <?php foreach ($this->links as $link) : ?> + <li> + <a class="blogsection" href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($link->slug, $link->catslug, $link->sectionid)); ?>"> + <?php echo $this->escape($link->title); ?></a> + </li> + <?php endforeach; ?> +</ul> diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/section/default.php b/oss/joomla/trunk/templates/hawebs/html/com_content/section/default.php new file mode 100644 index 00000000..b4558f05 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/section/default.php @@ -0,0 +1,53 @@ +<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $ +defined('_JEXEC') or die('Restricted access'); +$cparams = JComponentHelper::getParams ('com_media'); +?> + +<?php if ($this->params->get('show_page_title',1)) : ?> +<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php echo $this->escape($this->params->get('page_title')); ?> +</h1> +<?php endif; ?> + +<?php if ($this->params->def('show_description', 1) || $this->params->def('show_description_image', 1)) : ?> +<div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"> + <?php if ($this->params->get('show_description_image') && $this->section->image) : ?> + <img src="<?php echo $this->baseurl . '/' . $this->escape($cparams->get('image_path')).'/'.$this->escape($this->section->image); ?>" class="image_<?php echo $this->escape($this->section->image_position); ?>" /> + <?php endif; ?> + + <?php if ($this->params->get('show_description') && $this->section->description) : + echo $this->section->description; + endif; ?> + + <?php if ($this->params->get('show_description_image') && $this->section->image) : ?> + <div class="wrap_image"> </div> + <?php endif; ?> +</div> +<?php endif; ?> + +<?php if ($this->params->def('show_categories', 1) && count($this->categories)) : ?> +<ul> + <?php foreach ($this->categories as $category) : + if (!$this->params->get('show_empty_categories') && !$category->numitems) : + continue; + endif; ?> + <li> + <a href="<?php echo $category->link; ?>" class="category"><?php echo $this->escape($category->title); ?></a> + + <?php if ($this->params->get('show_cat_num_articles')) : ?> + <span class="small"> + ( <?php if ($category->numitems==1) { + echo $category->numitems ." ". JText::_( 'item' ); } + else { + echo $category->numitems ." ". JText::_( 'items' );} ?> ) + </span> + <?php endif; ?> + + <?php if ($this->params->def('show_category_description', 1) && $category->description) : ?> + <br /> + <?php echo $category->description; ?> + <?php endif; ?> + </li> + <?php endforeach; ?> +</ul> +<?php endif; diff --git a/oss/joomla/trunk/templates/hawebs/html/com_content/section/index.html b/oss/joomla/trunk/templates/hawebs/html/com_content/section/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/com_content/section/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/html/index.html b/oss/joomla/trunk/templates/hawebs/html/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/html/modules.php b/oss/joomla/trunk/templates/hawebs/html/modules.php new file mode 100644 index 00000000..c0b2e1fa --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/modules.php @@ -0,0 +1,43 @@ +<?php +/** + * @version $Id: modules.php 10381 2008-06-01 03:35:53Z pasamio $ + * @package Joomla + * @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('Restricted access'); + +/** + * This is a file to add template specific chrome to module rendering. To use it you would + * set the style attribute for the given module(s) include in your template to use the style + * for each given modChrome function. + * + * eg. To render a module mod_test in the sliders style, you would use the following include: + * <jdoc:include type="module" name="test" style="slider" /> + * + * This gives template designers ultimate control over how modules are rendered. + * + * NOTICE: All chrome wrapping methods should be named: modChrome_{STYLE} and take the same + * two arguments. + */ + +/* + * Module chrome for rendering the module in a slider + */ +function modChrome_slider($module, &$params, &$attribs) +{ + jimport('joomla.html.pane'); + // Initialize variables + $sliders = & JPane::getInstance('sliders'); + $sliders->startPanel( JText::_( $module->title ), 'module' . $module->id ); + echo $module->content; + $sliders->endPanel(); +} +?> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/html/pagination.php b/oss/joomla/trunk/templates/hawebs/html/pagination.php new file mode 100644 index 00000000..5a6d8e18 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/html/pagination.php @@ -0,0 +1,116 @@ +<?php +/** + * @version $Id: pagination.php 10381 2008-06-01 03:35:53Z pasamio $ + * @package Joomla + * @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('Restricted access'); + +/** + * This is a file to add template specific chrome to pagination rendering. + * + * pagination_list_footer + * Input variable $list is an array with offsets: + * $list[limit] : int + * $list[limitstart] : int + * $list[total] : int + * $list[limitfield] : string + * $list[pagescounter] : string + * $list[pageslinks] : string + * + * pagination_list_render + * Input variable $list is an array with offsets: + * $list[all] + * [data] : string + * [active] : boolean + * $list[start] + * [data] : string + * [active] : boolean + * $list[previous] + * [data] : string + * [active] : boolean + * $list[next] + * [data] : string + * [active] : boolean + * $list[end] + * [data] : string + * [active] : boolean + * $list[pages] + * [{PAGE}][data] : string + * [{PAGE}][active] : boolean + * + * pagination_item_active + * Input variable $item is an object with fields: + * $item->base : integer + * $item->link : string + * $item->text : string + * + * pagination_item_inactive + * Input variable $item is an object with fields: + * $item->base : integer + * $item->link : string + * $item->text : string + * + * This gives template designers ultimate control over how pagination is rendered. + * + * NOTE: If you override pagination_item_active OR pagination_item_inactive you MUST override them both + */ + +function pagination_list_footer($list) +{ + $html = "<div class=\"list-footer\">\n"; + + $html .= "\n<div class=\"limit\">".JText::_('Display Num').$list['limitfield']."</div>"; + $html .= $list['pageslinks']; + $html .= "\n<div class=\"counter\">".$list['pagescounter']."</div>"; + + $html .= "\n<input type=\"hidden\" name=\"limitstart\" value=\"".$list['limitstart']."\" />"; + $html .= "\n</div>"; + + return $html; +} + +function pagination_list_render($list) +{ + // Initialize variables + $html = "<span class=\"pagination\">"; + $html .= '<span>«</span>'.$list['start']['data']; + $html .= $list['previous']['data']; + + foreach( $list['pages'] as $page ) + { + if($page['data']['active']) { + $html .= '<strong>'; + } + + $html .= $page['data']; + + if($page['data']['active']) { + $html .= '</strong>'; + } + } + + $html .= $list['next']['data']; + $html .= $list['end']['data']; + $html .= '<span>»</span>'; + + $html .= "</span>"; + return $html; +} + +function pagination_item_active(&$item) { + return "<a href=\"".$item->link."\" title=\"".$item->text."\">".$item->text."</a>"; +} + +function pagination_item_inactive(&$item) { + return "<span>".$item->text."</span>"; +} +?> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/images/arrow.png b/oss/joomla/trunk/templates/hawebs/images/arrow.png new file mode 100644 index 00000000..92f93616 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/arrow.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/black/index.html b/oss/joomla/trunk/templates/hawebs/images/black/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/images/black/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/images/black/mw_box_bl.png b/oss/joomla/trunk/templates/hawebs/images/black/mw_box_bl.png new file mode 100644 index 00000000..e553a09d Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/black/mw_box_bl.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/black/mw_box_br.png b/oss/joomla/trunk/templates/hawebs/images/black/mw_box_br.png new file mode 100644 index 00000000..3f1307bd Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/black/mw_box_br.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/black/mw_box_tl.png b/oss/joomla/trunk/templates/hawebs/images/black/mw_box_tl.png new file mode 100644 index 00000000..3fd8a393 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/black/mw_box_tl.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/black/mw_box_tr.png b/oss/joomla/trunk/templates/hawebs/images/black/mw_box_tr.png new file mode 100644 index 00000000..492891b2 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/black/mw_box_tr.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/black/mw_footer_b.png b/oss/joomla/trunk/templates/hawebs/images/black/mw_footer_b.png new file mode 100644 index 00000000..386c2f30 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/black/mw_footer_b.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/black/mw_footer_b_l.png b/oss/joomla/trunk/templates/hawebs/images/black/mw_footer_b_l.png new file mode 100644 index 00000000..2d347969 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/black/mw_footer_b_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/black/mw_footer_b_r.png b/oss/joomla/trunk/templates/hawebs/images/black/mw_footer_b_r.png new file mode 100644 index 00000000..343115c2 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/black/mw_footer_b_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/black/mw_header_t.png b/oss/joomla/trunk/templates/hawebs/images/black/mw_header_t.png new file mode 100644 index 00000000..b00fce44 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/black/mw_header_t.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/black/mw_header_t_l.png b/oss/joomla/trunk/templates/hawebs/images/black/mw_header_t_l.png new file mode 100644 index 00000000..c25dfa97 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/black/mw_header_t_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/black/mw_header_t_r.png b/oss/joomla/trunk/templates/hawebs/images/black/mw_header_t_r.png new file mode 100644 index 00000000..b8ebf498 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/black/mw_header_t_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/black/mw_menu_active_bg.png b/oss/joomla/trunk/templates/hawebs/images/black/mw_menu_active_bg.png new file mode 100644 index 00000000..67d484f3 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/black/mw_menu_active_bg.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/black/mw_shadow_l.png b/oss/joomla/trunk/templates/hawebs/images/black/mw_shadow_l.png new file mode 100644 index 00000000..1d6f4c86 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/black/mw_shadow_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/black/mw_shadow_r.png b/oss/joomla/trunk/templates/hawebs/images/black/mw_shadow_r.png new file mode 100644 index 00000000..d0df5857 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/black/mw_shadow_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/blue/index.html b/oss/joomla/trunk/templates/hawebs/images/blue/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/images/blue/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/images/blue/mw_box_bl.png b/oss/joomla/trunk/templates/hawebs/images/blue/mw_box_bl.png new file mode 100644 index 00000000..03e59410 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/blue/mw_box_bl.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/blue/mw_box_br.png b/oss/joomla/trunk/templates/hawebs/images/blue/mw_box_br.png new file mode 100644 index 00000000..cd9d500e Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/blue/mw_box_br.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/blue/mw_box_tl.png b/oss/joomla/trunk/templates/hawebs/images/blue/mw_box_tl.png new file mode 100644 index 00000000..0e8c6ee5 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/blue/mw_box_tl.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/blue/mw_box_tr.png b/oss/joomla/trunk/templates/hawebs/images/blue/mw_box_tr.png new file mode 100644 index 00000000..87d38248 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/blue/mw_box_tr.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/blue/mw_footer_b.png b/oss/joomla/trunk/templates/hawebs/images/blue/mw_footer_b.png new file mode 100644 index 00000000..dd88b848 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/blue/mw_footer_b.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/blue/mw_footer_b_l.png b/oss/joomla/trunk/templates/hawebs/images/blue/mw_footer_b_l.png new file mode 100644 index 00000000..7a4b32f6 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/blue/mw_footer_b_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/blue/mw_footer_b_r.png b/oss/joomla/trunk/templates/hawebs/images/blue/mw_footer_b_r.png new file mode 100644 index 00000000..bb8380e3 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/blue/mw_footer_b_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/blue/mw_header_t.png b/oss/joomla/trunk/templates/hawebs/images/blue/mw_header_t.png new file mode 100644 index 00000000..72d182ba Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/blue/mw_header_t.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/blue/mw_header_t_l.png b/oss/joomla/trunk/templates/hawebs/images/blue/mw_header_t_l.png new file mode 100644 index 00000000..eb72e04b Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/blue/mw_header_t_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/blue/mw_header_t_r.png b/oss/joomla/trunk/templates/hawebs/images/blue/mw_header_t_r.png new file mode 100644 index 00000000..c074176e Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/blue/mw_header_t_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/blue/mw_menu_active_bg.png b/oss/joomla/trunk/templates/hawebs/images/blue/mw_menu_active_bg.png new file mode 100644 index 00000000..0cf7cb05 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/blue/mw_menu_active_bg.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/blue/mw_shadow_l.png b/oss/joomla/trunk/templates/hawebs/images/blue/mw_shadow_l.png new file mode 100644 index 00000000..cf53573d Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/blue/mw_shadow_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/blue/mw_shadow_r.png b/oss/joomla/trunk/templates/hawebs/images/blue/mw_shadow_r.png new file mode 100644 index 00000000..90a9aa95 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/blue/mw_shadow_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/green/index.html b/oss/joomla/trunk/templates/hawebs/images/green/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/images/green/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/images/green/mw_box_bl.png b/oss/joomla/trunk/templates/hawebs/images/green/mw_box_bl.png new file mode 100644 index 00000000..cc58c435 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/green/mw_box_bl.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/green/mw_box_br.png b/oss/joomla/trunk/templates/hawebs/images/green/mw_box_br.png new file mode 100644 index 00000000..27b9cdba Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/green/mw_box_br.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/green/mw_box_tl.png b/oss/joomla/trunk/templates/hawebs/images/green/mw_box_tl.png new file mode 100644 index 00000000..2b8b942e Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/green/mw_box_tl.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/green/mw_box_tr.png b/oss/joomla/trunk/templates/hawebs/images/green/mw_box_tr.png new file mode 100644 index 00000000..71214f29 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/green/mw_box_tr.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/green/mw_footer_b.png b/oss/joomla/trunk/templates/hawebs/images/green/mw_footer_b.png new file mode 100644 index 00000000..39818710 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/green/mw_footer_b.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/green/mw_footer_b_l.png b/oss/joomla/trunk/templates/hawebs/images/green/mw_footer_b_l.png new file mode 100644 index 00000000..343f044e Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/green/mw_footer_b_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/green/mw_footer_b_r.png b/oss/joomla/trunk/templates/hawebs/images/green/mw_footer_b_r.png new file mode 100644 index 00000000..b6db6064 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/green/mw_footer_b_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/green/mw_header_t.png b/oss/joomla/trunk/templates/hawebs/images/green/mw_header_t.png new file mode 100644 index 00000000..c3124445 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/green/mw_header_t.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/green/mw_header_t_l.png b/oss/joomla/trunk/templates/hawebs/images/green/mw_header_t_l.png new file mode 100644 index 00000000..6819f4eb Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/green/mw_header_t_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/green/mw_header_t_r.png b/oss/joomla/trunk/templates/hawebs/images/green/mw_header_t_r.png new file mode 100644 index 00000000..f22fcc17 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/green/mw_header_t_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/green/mw_menu_active_bg.png b/oss/joomla/trunk/templates/hawebs/images/green/mw_menu_active_bg.png new file mode 100644 index 00000000..fadcbd10 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/green/mw_menu_active_bg.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/green/mw_shadow_l.png b/oss/joomla/trunk/templates/hawebs/images/green/mw_shadow_l.png new file mode 100644 index 00000000..31dab354 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/green/mw_shadow_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/green/mw_shadow_r.png b/oss/joomla/trunk/templates/hawebs/images/green/mw_shadow_r.png new file mode 100644 index 00000000..a1e8db0a Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/green/mw_shadow_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/indent1.png b/oss/joomla/trunk/templates/hawebs/images/indent1.png new file mode 100644 index 00000000..cb9fd6b4 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/indent1.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/indent2.png b/oss/joomla/trunk/templates/hawebs/images/indent2.png new file mode 100644 index 00000000..00c96328 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/indent2.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/indent3.png b/oss/joomla/trunk/templates/hawebs/images/indent3.png new file mode 100644 index 00000000..9332e783 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/indent3.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/indent4.png b/oss/joomla/trunk/templates/hawebs/images/indent4.png new file mode 100644 index 00000000..97838e99 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/indent4.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/index.html b/oss/joomla/trunk/templates/hawebs/images/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/images/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/images/login-bg.gif b/oss/joomla/trunk/templates/hawebs/images/login-bg.gif new file mode 100644 index 00000000..cde836c8 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/login-bg.gif differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_content_b.png b/oss/joomla/trunk/templates/hawebs/images/mw_content_b.png new file mode 100644 index 00000000..c4fb01fc Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_content_b.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_content_b_l.png b/oss/joomla/trunk/templates/hawebs/images/mw_content_b_l.png new file mode 100644 index 00000000..4252805b Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_content_b_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_content_b_r.png b/oss/joomla/trunk/templates/hawebs/images/mw_content_b_r.png new file mode 100644 index 00000000..969b71cc Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_content_b_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_content_t.png b/oss/joomla/trunk/templates/hawebs/images/mw_content_t.png new file mode 100644 index 00000000..4f3192e9 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_content_t.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_content_t_l.png b/oss/joomla/trunk/templates/hawebs/images/mw_content_t_l.png new file mode 100644 index 00000000..5f95d37b Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_content_t_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_content_t_r.png b/oss/joomla/trunk/templates/hawebs/images/mw_content_t_r.png new file mode 100644 index 00000000..ffe64477 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_content_t_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_footer_separator.png b/oss/joomla/trunk/templates/hawebs/images/mw_footer_separator.png new file mode 100644 index 00000000..a47026fb Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_footer_separator.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_header.jpg b/oss/joomla/trunk/templates/hawebs/images/mw_header.jpg new file mode 100644 index 00000000..cf61a57d Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_header.jpg differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_header_b.png b/oss/joomla/trunk/templates/hawebs/images/mw_header_b.png new file mode 100644 index 00000000..32f25d9e Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_header_b.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_header_l_b.png b/oss/joomla/trunk/templates/hawebs/images/mw_header_l_b.png new file mode 100644 index 00000000..c24a09b5 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_header_l_b.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_header_r_b.png b/oss/joomla/trunk/templates/hawebs/images/mw_header_r_b.png new file mode 100644 index 00000000..2618a6c0 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_header_r_b.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_joomla_logo.png b/oss/joomla/trunk/templates/hawebs/images/mw_joomla_logo.png new file mode 100644 index 00000000..0934ee58 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_joomla_logo.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_line_grey.png b/oss/joomla/trunk/templates/hawebs/images/mw_line_grey.png new file mode 100644 index 00000000..1b1b8bb8 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_line_grey.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_menu_cap_l.png b/oss/joomla/trunk/templates/hawebs/images/mw_menu_cap_l.png new file mode 100644 index 00000000..08b2e8b9 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_menu_cap_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_menu_cap_r.png b/oss/joomla/trunk/templates/hawebs/images/mw_menu_cap_r.png new file mode 100644 index 00000000..5a408889 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_menu_cap_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_menu_normal_bg.png b/oss/joomla/trunk/templates/hawebs/images/mw_menu_normal_bg.png new file mode 100644 index 00000000..5133b2e1 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_menu_normal_bg.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_menu_separator.png b/oss/joomla/trunk/templates/hawebs/images/mw_menu_separator.png new file mode 100644 index 00000000..2121292b Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_menu_separator.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_readon.png b/oss/joomla/trunk/templates/hawebs/images/mw_readon.png new file mode 100644 index 00000000..56c38b29 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_readon.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/mw_readon_rtl.png b/oss/joomla/trunk/templates/hawebs/images/mw_readon_rtl.png new file mode 100644 index 00000000..fbc20c00 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/mw_readon_rtl.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/orange/index.html b/oss/joomla/trunk/templates/hawebs/images/orange/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/images/orange/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/images/orange/mw_box_bl.png b/oss/joomla/trunk/templates/hawebs/images/orange/mw_box_bl.png new file mode 100644 index 00000000..958f6d5a Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/orange/mw_box_bl.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/orange/mw_box_br.png b/oss/joomla/trunk/templates/hawebs/images/orange/mw_box_br.png new file mode 100644 index 00000000..7146057c Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/orange/mw_box_br.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/orange/mw_box_tl.png b/oss/joomla/trunk/templates/hawebs/images/orange/mw_box_tl.png new file mode 100644 index 00000000..48394c3f Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/orange/mw_box_tl.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/orange/mw_box_tr.png b/oss/joomla/trunk/templates/hawebs/images/orange/mw_box_tr.png new file mode 100644 index 00000000..944be6ef Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/orange/mw_box_tr.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/orange/mw_footer_b.png b/oss/joomla/trunk/templates/hawebs/images/orange/mw_footer_b.png new file mode 100644 index 00000000..97a728c4 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/orange/mw_footer_b.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/orange/mw_footer_b_l.png b/oss/joomla/trunk/templates/hawebs/images/orange/mw_footer_b_l.png new file mode 100644 index 00000000..27d1fcfa Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/orange/mw_footer_b_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/orange/mw_footer_b_r.png b/oss/joomla/trunk/templates/hawebs/images/orange/mw_footer_b_r.png new file mode 100644 index 00000000..347f7a1a Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/orange/mw_footer_b_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/orange/mw_header_t.png b/oss/joomla/trunk/templates/hawebs/images/orange/mw_header_t.png new file mode 100644 index 00000000..dce0f0e5 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/orange/mw_header_t.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/orange/mw_header_t_l.png b/oss/joomla/trunk/templates/hawebs/images/orange/mw_header_t_l.png new file mode 100644 index 00000000..7d5382dd Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/orange/mw_header_t_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/orange/mw_header_t_r.png b/oss/joomla/trunk/templates/hawebs/images/orange/mw_header_t_r.png new file mode 100644 index 00000000..58428c33 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/orange/mw_header_t_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/orange/mw_menu_active_bg.png b/oss/joomla/trunk/templates/hawebs/images/orange/mw_menu_active_bg.png new file mode 100644 index 00000000..88a8be2f Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/orange/mw_menu_active_bg.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/orange/mw_shadow_l.png b/oss/joomla/trunk/templates/hawebs/images/orange/mw_shadow_l.png new file mode 100644 index 00000000..253cddd5 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/orange/mw_shadow_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/orange/mw_shadow_r.png b/oss/joomla/trunk/templates/hawebs/images/orange/mw_shadow_r.png new file mode 100644 index 00000000..b35e4317 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/orange/mw_shadow_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/red/index.html b/oss/joomla/trunk/templates/hawebs/images/red/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/images/red/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/images/red/mw_box_bl.png b/oss/joomla/trunk/templates/hawebs/images/red/mw_box_bl.png new file mode 100644 index 00000000..bcab1ec2 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/red/mw_box_bl.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/red/mw_box_br.png b/oss/joomla/trunk/templates/hawebs/images/red/mw_box_br.png new file mode 100644 index 00000000..a8381a56 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/red/mw_box_br.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/red/mw_box_tl.png b/oss/joomla/trunk/templates/hawebs/images/red/mw_box_tl.png new file mode 100644 index 00000000..addef039 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/red/mw_box_tl.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/red/mw_box_tr.png b/oss/joomla/trunk/templates/hawebs/images/red/mw_box_tr.png new file mode 100644 index 00000000..21ab5581 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/red/mw_box_tr.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/red/mw_footer_b.png b/oss/joomla/trunk/templates/hawebs/images/red/mw_footer_b.png new file mode 100644 index 00000000..04f4b64f Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/red/mw_footer_b.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/red/mw_footer_b_l.png b/oss/joomla/trunk/templates/hawebs/images/red/mw_footer_b_l.png new file mode 100644 index 00000000..cbcce048 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/red/mw_footer_b_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/red/mw_footer_b_r.png b/oss/joomla/trunk/templates/hawebs/images/red/mw_footer_b_r.png new file mode 100644 index 00000000..03e0a7d4 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/red/mw_footer_b_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/red/mw_header_t.png b/oss/joomla/trunk/templates/hawebs/images/red/mw_header_t.png new file mode 100644 index 00000000..a98ec753 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/red/mw_header_t.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/red/mw_header_t_l.png b/oss/joomla/trunk/templates/hawebs/images/red/mw_header_t_l.png new file mode 100644 index 00000000..55dce337 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/red/mw_header_t_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/red/mw_header_t_r.png b/oss/joomla/trunk/templates/hawebs/images/red/mw_header_t_r.png new file mode 100644 index 00000000..73e3ea27 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/red/mw_header_t_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/red/mw_menu_active_bg.png b/oss/joomla/trunk/templates/hawebs/images/red/mw_menu_active_bg.png new file mode 100644 index 00000000..479ff16c Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/red/mw_menu_active_bg.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/red/mw_shadow_l.png b/oss/joomla/trunk/templates/hawebs/images/red/mw_shadow_l.png new file mode 100644 index 00000000..310e5958 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/red/mw_shadow_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/red/mw_shadow_r.png b/oss/joomla/trunk/templates/hawebs/images/red/mw_shadow_r.png new file mode 100644 index 00000000..d6dd1875 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/red/mw_shadow_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/spacer.png b/oss/joomla/trunk/templates/hawebs/images/spacer.png new file mode 100644 index 00000000..b91e00da Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/spacer.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/white/index.html b/oss/joomla/trunk/templates/hawebs/images/white/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/images/white/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/images/white/mw_box_bl.png b/oss/joomla/trunk/templates/hawebs/images/white/mw_box_bl.png new file mode 100644 index 00000000..861a0f8d Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/white/mw_box_bl.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/white/mw_box_br.png b/oss/joomla/trunk/templates/hawebs/images/white/mw_box_br.png new file mode 100644 index 00000000..b53e693b Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/white/mw_box_br.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/white/mw_box_tl.png b/oss/joomla/trunk/templates/hawebs/images/white/mw_box_tl.png new file mode 100644 index 00000000..6b8eee8e Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/white/mw_box_tl.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/white/mw_box_tr.png b/oss/joomla/trunk/templates/hawebs/images/white/mw_box_tr.png new file mode 100644 index 00000000..62dff3e9 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/white/mw_box_tr.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/white/mw_footer_b.png b/oss/joomla/trunk/templates/hawebs/images/white/mw_footer_b.png new file mode 100644 index 00000000..04704756 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/white/mw_footer_b.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/white/mw_footer_b_l.png b/oss/joomla/trunk/templates/hawebs/images/white/mw_footer_b_l.png new file mode 100644 index 00000000..689560e2 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/white/mw_footer_b_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/white/mw_footer_b_r.png b/oss/joomla/trunk/templates/hawebs/images/white/mw_footer_b_r.png new file mode 100644 index 00000000..23df213d Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/white/mw_footer_b_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/white/mw_header_t.png b/oss/joomla/trunk/templates/hawebs/images/white/mw_header_t.png new file mode 100644 index 00000000..5805868b Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/white/mw_header_t.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/white/mw_header_t_l.png b/oss/joomla/trunk/templates/hawebs/images/white/mw_header_t_l.png new file mode 100644 index 00000000..8ddf9816 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/white/mw_header_t_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/white/mw_header_t_r.png b/oss/joomla/trunk/templates/hawebs/images/white/mw_header_t_r.png new file mode 100644 index 00000000..c23f5cc5 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/white/mw_header_t_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/white/mw_menu_active_bg.png b/oss/joomla/trunk/templates/hawebs/images/white/mw_menu_active_bg.png new file mode 100644 index 00000000..100acdbd Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/white/mw_menu_active_bg.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/white/mw_shadow_l.png b/oss/joomla/trunk/templates/hawebs/images/white/mw_shadow_l.png new file mode 100644 index 00000000..a383e4d4 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/white/mw_shadow_l.png differ diff --git a/oss/joomla/trunk/templates/hawebs/images/white/mw_shadow_r.png b/oss/joomla/trunk/templates/hawebs/images/white/mw_shadow_r.png new file mode 100644 index 00000000..cc81e833 Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/white/mw_shadow_r.png differ diff --git a/oss/joomla/trunk/templates/hawebs/index.html b/oss/joomla/trunk/templates/hawebs/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/index.php b/oss/joomla/trunk/templates/hawebs/index.php new file mode 100644 index 00000000..2ca1cfbd --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/index.php @@ -0,0 +1,204 @@ +<?php +/** + * Copyright (C) 2006-2009 YUCHENG HU + * + * ---------------------------------------------------------------------------------- + * HA WEBSYSTEMS + * http://www.hawebs.net + * http://www.tcivis.com + * + * Contact + * huyuchengus@gmail.com / yuchenghu@hawebs.net + * + * ---------------------------------------------------------------------------------- + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + * GNU GENERAL PUBLIC LICENSE + * + * ---------------------------------------------------------------------------------- + */ + +// no direct access +defined( '_JEXEC' ) or die( 'Restricted access' ); +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" > +<head> +<jdoc:include type="head" /> + +<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/system.css" type="text/css" /> +<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/general.css" type="text/css" /> +<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/hawebs/css/template.css" type="text/css" /> +<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/hawebs/css/position.css" type="text/css" /> +<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/hawebs/css/<?php echo $this->params->get('colorVariation'); ?>.css" type="text/css" /> +<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/hawebs/css/<?php echo $this->params->get('backgroundVariation'); ?>_bg.css" type="text/css" /> +<!--[if lte IE 6]> +<link href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template ?>/css/ieonly.css" rel="stylesheet" type="text/css" /> +<![endif]--> +<?php if($this->direction == 'rtl') : ?> + <link href="<?php echo $this->baseurl ?>/templates/hawebs/css/template_rtl.css" rel="stylesheet" type="text/css" /> +<?php endif; ?> + +</head> +<body id="page_bg" class="color_<?php echo $this->params->get('colorVariation'); ?> bg_<?php echo $this->params->get('backgroundVariation'); ?> width_<?php echo $this->params->get('widthStyle'); ?>"> +<a name="up" id="up"></a> +<div class="center" align="center"> + <div id="wrapper"> + <div id="wrapper_r"> + <div id="header"> + <div id="header_l"> + <div id="header_r"> + <div id="logo"></div> + <jdoc:include type="modules" name="top" /> + </div> + </div> + </div> + + <div id="tabarea"> + <div id="tabarea_l"> + <div id="tabarea_r"> + <div id="tabmenu"> + <table cellpadding="0" cellspacing="0" class="pill"> + <tr> + <td class="pill_l"> </td> + <td class="pill_m"> + <div id="pillmenu"> + <jdoc:include type="modules" name="user3" /> + </div> + </td> + <td class="pill_r"> </td> + </tr> + </table> + </div> + </div> + </div> + </div> + + <div id="search"> + <jdoc:include type="modules" name="user4" /> + </div> + + <div id="pathway"> + <jdoc:include type="modules" name="breadcrumb" /> + </div> + + <div class="clr"></div> + + <div id="whitebox"> + <div id="whitebox_t"> + <div id="whitebox_tl"> + <div id="whitebox_tr"></div> + </div> + </div> + + <div id="whitebox_m"> + <div id="area"> + <jdoc:include type="message" /> + + <div id="leftcolumn"> + <?php if($this->countModules('left')) : ?> + <jdoc:include type="modules" name="left" style="rounded" /> + <?php endif; ?> + </div> + + <?php if($this->countModules('left')) : ?> + <div id="maincolumn"> + <?php else: ?> + <div id="maincolumn_full"> + <?php endif; ?> + <?php if($this->countModules('user1 or user2')) : ?> + <table class="nopad user1user2"> + <tr valign="top"> + <?php if($this->countModules('user1')) : ?> + <td> + <jdoc:include type="modules" name="user1" style="xhtml" /> + </td> + <?php endif; ?> + <?php if($this->countModules('user1 and user2')) : ?> + <td class="greyline"> </td> + <?php endif; ?> + <?php if($this->countModules('user2')) : ?> + <td> + <jdoc:include type="modules" name="user2" style="xhtml" /> + </td> + <?php endif; ?> + </tr> + </table> + + <div id="maindivider"></div> + <?php endif; ?> + + <table class="nopad"> + <tr valign="top"> + <td> + <jdoc:include type="component" /> + <jdoc:include type="modules" name="footer" style="xhtml"/> + </td> + <?php if($this->countModules('right') and JRequest::getCmd('layout') != 'form') : ?> + <td class="greyline"> </td> + <td width="170"> + <jdoc:include type="modules" name="right" style="xhtml"/> + </td> + <?php endif; ?> + </tr> + </table> + + </div> + <div class="clr"></div> + </div> + <div class="clr"></div> + </div> + + <div id="whitebox_b"> + <div id="whitebox_bl"> + <div id="whitebox_br"></div> + </div> + </div> + </div> + + <div id="footerspacer"></div> + </div> + + <div id="footer"> + <div id="footer_l"> + <div id="footer_r"> + <p id="syndicate"> + <jdoc:include type="modules" name="syndicate" /> + </p> + <p id="power_by"> + <?php echo JText::_('技术支æŒ') ?> <a href="http://www.hawebs.net">HA WEBSYSTEMS</a>. + <?php echo JText::_('校验') ?> <a href="http://validator.w3.org/check/referer">XHTML</a> <?php echo JText::_('å’Œ') ?> <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a>. + </p> + </div> + </div> + </div> + </div> +</div> +<jdoc:include type="modules" name="debug" /> + +<script type="text/javascript"> +var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); +document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); +</script> +<script type="text/javascript"> +try { +var pageTracker = _gat._getTracker("UA-13048050-1"); +pageTracker._setDomainName(".hawebs.net"); +pageTracker._setLocalRemoteServerMode(); +pageTracker._trackPageview(); +} catch(err) {}</script> + + +</body> +</html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/hawebs/params.ini b/oss/joomla/trunk/templates/hawebs/params.ini new file mode 100644 index 00000000..bd9cab11 --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/params.ini @@ -0,0 +1,4 @@ +colorVariation=blue +backgroundVariation=blue +widthStyle=fmax + diff --git a/oss/joomla/trunk/templates/hawebs/templateDetails.xml b/oss/joomla/trunk/templates/hawebs/templateDetails.xml new file mode 100644 index 00000000..aaca8c8d --- /dev/null +++ b/oss/joomla/trunk/templates/hawebs/templateDetails.xml @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE install PUBLIC "-//Joomla! 1.5//DTD template 1.0//EN" "http://www.joomla.org/xml/dtd/1.5/template-install.dtd"> +<install version="1.5" type="template"> + <name>hawebs</name> + <creationDate>12/01/2009</creationDate> + <author>YUCHENG HU</author> + <authorEmail>yuchenghu@hawebs.net</authorEmail> + <authorUrl>http://www.hawebs.net</authorUrl> + <copyright></copyright> + <license>GNU/GPL</license> + <version>1.0.0</version> + <description>TPL_X_YUCHENGHU</description> + <files> + <filename>index.php</filename> + <filename>templateDetails.xml</filename> + <filename>template_thumbnail.png</filename> + <filename>params.ini</filename> + <filename>images/arrow.png</filename> + <filename>images/indent1.png</filename> + <filename>images/indent2.png</filename> + <filename>images/indent3.png</filename> + <filename>images/indent4.png</filename> + <filename>images/index.html</filename> + <filename>images/mw_box_blue_bl.png</filename> + <filename>images/mw_box_blue_br.png</filename> + <filename>images/mw_box_blue_tl.png</filename> + <filename>images/mw_box_blue_tr.png</filename> + <filename>images/mw_content_b_l.png</filename> + <filename>images/mw_content_b_r.png</filename> + <filename>images/mw_content_b.png</filename> + <filename>images/mw_content_t_l.png</filename> + <filename>images/mw_content_t_r.png</filename> + <filename>images/mw_content_t.png</filename> + <filename>images/mw_footer_blue_b_l.png</filename> + <filename>images/mw_footer_blue_b_r.png</filename> + <filename>images/mw_footer_blue_b.png</filename> + <filename>images/mw_footer_separator.png</filename> + <filename>images/mw_header_b.png</filename> + <filename>images/mw_header_blue_t_l.png</filename> + <filename>images/mw_header_blue_t_r.png</filename> + <filename>images/mw_header_blue_t.png</filename> + <filename>images/mw_header_l_b.png</filename> + <filename>images/mw_header_r_b.png</filename> + <filename>images/mw_header.jpg</filename> + <filename>images/mw_joomla_logo.png</filename> + <filename>images/mw_line_grey.png</filename> + <filename>images/mw_menu_active_bg.png</filename> + <filename>images/mw_menu_cap_l.png</filename> + <filename>images/mw_menu_cap_r.png</filename> + <filename>images/mw_menu_normal_bg.png</filename> + <filename>images/mw_menu_separator.png</filename> + <filename>images/mw_readon.png</filename> + <filename>images/mw_shadow_blue_l.png</filename> + <filename>images/mw_shadow_blue_r.png</filename> + <filename>images/spacer.png</filename> + <filename>css/index.html</filename> + <filename>css/template.css</filename> + <filename>css/template_rtl.css</filename> + <filename>css/editor.css</filename> + <filename>css/ieonly.css</filename> + </files> + <positions> + <position>breadcrumb</position> + <position>left</position> + <position>right</position> + <position>top</position> + <position>user1</position> + <position>user2</position> + <position>user3</position> + <position>user4</position> + <position>footer</position> + <position>debug</position> + <position>syndicate</position> + </positions> + <params> + <param name="colorVariation" type="list" default="white" label="Color Variation" description="Color variation to use"> + <option value="blue">Blue</option> + <option value="red">Red</option> + <option value="green">Green</option> + <option value="orange">Orange</option> + <option value="black">Black</option> + <option value="white">White</option> + </param> + <param name="backgroundVariation" type="list" default="blue" label="Background Variation" description="Background color variation to use"> + <option value="blue">Blue</option> + <option value="red">Red</option> + <option value="green">Green</option> + <option value="orange">Orange</option> + <option value="black">Black</option> + <option value="white">White</option> + </param> + <param name="widthStyle" type="list" default="fmax" label="Template Width" description="Width style of the template"> + <option value="fmax">Fluid with maximum</option> + <option value="medium">Medium</option> + <option value="small">Small</option> + <option value="fluid">Fluid</option> + </param> + </params> +</install> diff --git a/oss/joomla/trunk/templates/hawebs/template_thumbnail.png b/oss/joomla/trunk/templates/hawebs/template_thumbnail.png new file mode 100644 index 00000000..ecce69df Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/template_thumbnail.png differ diff --git a/oss/joomla/trunk/templates/index.html b/oss/joomla/trunk/templates/index.html new file mode 100644 index 00000000..f1ba3766 --- /dev/null +++ b/oss/joomla/trunk/templates/index.html @@ -0,0 +1,7 @@ +<!----------------------------------------- + + YUCHENG HU (C) [http://www.hawebs.net] + + + + + + [huyuchengus@gmail.com] + + + [yuchenghu@hawebs.net] + + -----------------------------------------> +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/component.php b/oss/joomla/trunk/templates/ja_purity/component.php new file mode 100644 index 00000000..687822d2 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/component.php @@ -0,0 +1,29 @@ +<?php +/** + * @copyright Copyright (C) 2005 - 2010 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( 'Restricted access' ); +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>"> +<head> + <jdoc:include type="head" /> + <link rel="stylesheet" href="templates/<?php echo $this->template; ?>/css/template.css" type="text/css" /> + +<?php if($this->direction == 'rtl') : ?> + <link rel="stylesheet" href="templates/<?php echo $this->template ?>/css/template_rtl.css" type="text/css" /> +<?php endif; ?> +</head> +<body class="contentpane"> + <jdoc:include type="message" /> + <jdoc:include type="component" /> +</body> +</html> diff --git a/oss/joomla/trunk/templates/ja_purity/css/index.html b/oss/joomla/trunk/templates/ja_purity/css/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/css/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/css/ja-sosdmenu.css b/oss/joomla/trunk/templates/ja_purity/css/ja-sosdmenu.css new file mode 100644 index 00000000..c6e64df0 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/css/ja-sosdmenu.css @@ -0,0 +1,313 @@ +/* Son of Suckerfish Dropdowns +--------------------------------------------------------- +Originally developed by Patrick Griffiths and Dan Webb +http://www.htmldog.com/articles/suckerfish/dropdowns/ +--------------------------------------------------------- +NOTE: After a deep research, we decide to divide this +CSS into 2 parts. The first part will define the layout. +The second part will define the visual look for this menu. +---------------------------------------------------------*/ + +/*--------------------------- LAYOUT ----------------------------*/ +#ja-mainnav, #ja-mainnav ul { + padding: 0; + margin: 0; + line-height: 20px; +} + +#ja-mainnav a { + display: block; + line-height: 20px; + margin: 0; + padding: 10px 20px; +} + +#ja-mainnav li { /* all list items */ + float: left; + margin: 0; + padding: 0; +} + +#ja-mainnav li ul { /* second-level lists */ + position: absolute; + width: 202px; + /* + * Using left instead of display to hide menus because display: none isn't + * read by screen readers + */ + left: -999em; +} + +#ja-mainnav ul ul a { /* sub-links */ + width: 160px; +} + +#ja-mainnav li ul ul { /* third-and-above-level lists */ + margin: -42px 0 0 200px; +} + +#ja-mainnav li:hover ul ul, +#ja-mainnav li:hover ul ul ul, +#ja-mainnav li.sfhover ul ul, +#ja-mainnav li.sfhover ul ul ul { + left: -999em; +} + +#ja-mainnav li:hover ul, +#ja-mainnav li li:hover ul, +#ja-mainnav li li li:hover ul, +#ja-mainnav li.sfhover ul, +#ja-mainnav li li.sfhover ul, +#ja-mainnav li li li.sfhover ul { /* lists nested under hovered list items */ + left: auto; +} +/*--------------------------- VISUAL ----------------------------*/ +/* -------- All levels -------- */ +#ja-mainnavwrap { + border-top: 1px solid #666666; + background: #444444; +} +#ja-mainnav ul, #ja-mainnav li { + background-image: none; + list-style: none; +} + +#ja-mainnav span.separator { + display:none; +} + +/* -------- Top level -------- */ +#ja-mainnav > ul { + background-color: #444444; + padding-left: 20px; +} + +#ja-mainnav > ul > li { + background-color: #444444; + border-left: 1px solid #666666; + border-right: 1px solid #333333; + margin-right: 1px; +} + +#ja-mainnav > ul > li.active { + background: url(../images/arrow2.png) no-repeat bottom center #444444; + color: #CCCCCC; +} + +#ja-mainnav > ul > li:hover, +#ja-mainnav > ul > li:active, +#ja-mainnav > ul > li:focus { + background: url(../images/arrow2.png) no-repeat bottom center #555555; + color: #FFFFFF; +} + +/* -------- sub-levels -------- */ +#ja-mainnav ul ul li { + border-left: 1px solid #666666; + border-right: 1px solid #333333; + border-top: 1px solid #666666; + border-bottom: 1px solid #333333; + margin-bottom: 1px; +} + +#ja-mainnav li ul { /* second-level lists */ + background-color: #555555; +} + +#ja-mainnav li a { + color: #CCCCCC; + font-weight: bold; + text-decoration: none; +} + +#ja-mainnav ul ul li:hover, +#ja-mainnav ul ul li:active, +#ja-mainnav ul ul li:focus { + background: #444444; + color: #FFFFFF; +} +/*old css*/ +/* Son of Suckerfish Dropdowns +--------------------------------------------------------- +Originally developed by Patrick Griffiths and Dan Webb +http://www.htmldog.com/articles/suckerfish/dropdowns/ +--------------------------------------------------------- +NOTE: After a deep research, we decide to divide this +CSS into 2 parts. The first part will define the layout. +The second part will define the visual look for this menu. +---------------------------------------------------------*/ + +#ja-mainnav ul.menu { + margin: 0; /* all lists */ + padding: 0; + float: left; + border-right: 1px solid #555555; +} + +#ja-mainnav ul.menu ul { + margin: 0; /* all lists */ + padding: 0; +} + +#ja-mainnav ul.menu li { + margin: 0; /* all list items */ + padding: 0; + float: left; + display: block; + background: none; + cursor: pointer; + position: relative; + list-style: none; +} + +#ja-mainnav ul.menu li ul { + width: 16.4em; + position: absolute; /* second-level lists */ + z-index: 99; + height: auto; + w\idth: 15.9em; +} + +#ja-mainnav ul.menu li ul ul { + margin: -1.5em 0 0 14em; /* third-and-above-level lists */ +} + +#ja-mainnav ul.menu li li { + padding: 0 1em 0 0; + margin: 0; + width: 14.9em; +} + +#ja-mainnav ul.menu ul a { + width: 14.8em; + w\idth: 10.8em; +} + +#ja-mainnav ul.menu li ul { + left: -999em; /* using left instead of display to hide menus because display: none isn't read by screen readers */ +} + +#ja-mainnav ul.menu li:hover ul ul, #ja-mainnav ul.menu li:hover ul ul ul, +#ja-mainnav ul.menu li.sfhover ul ul, #ja-mainnav ul.menu li.parentsfhover ul ul, #ja-mainnav ul.menu li.parent-activesfhover ul ul, #ja-mainnav ul.menu li.activesfhover ul ul, +#ja-mainnav ul.menu li.sfhover ul ul ul, #ja-mainnav ul.menu li.parentsfhover ul ul ul, #ja-mainnav ul.menu li.parent-activesfhover ul ul ul, #ja-mainnav ul.menu li.activesfhover ul ul ul { + left: -999em; +} + +/* This "unhides" the sub-menus (left: -999em is what hides them) */ +#ja-mainnav ul.menu li:hover ul, #ja-mainnav ul.menu li li:hover ul, #ja-mainnav ul.menu li li li:hover ul, +#ja-mainnav ul.menu li.sfhover ul, #ja-mainnav ul.menu li.parentsfhover ul, #ja-mainnav ul.menu li.parent-activesfhover ul, #ja-mainnav ul.menu li.activesfhover ul, +#ja-mainnav ul.menu li li.sfhover ul, #ja-mainnav ul.menu li li.havesubchildsfhover ul, #ja-mainnav ul.menu li li.havesubchild-activesfhover ul, #ja-mainnav ul.menu li li.activesfhover ul, +#ja-mainnav ul.menu li li li.sfhover ul, #ja-mainnav ul.menu li li li.havesubchildsfhover ul, #ja-mainnav ul.menu li li li.havesubchild-activesfhover ul, #ja-mainnav ul.menu li li li.activesfhover ul { + left: auto; +} + +/* STYLING THE MENU +-----------------------------------*/ +/* 1st level */ +#ja-mainnav ul.menu li a { + margin: 0; + padding: 10px 20px; + border-left: 1px solid #555555; + border-right: 1px solid #333333; + display: block; + color: #CCCCCC; + font-weight: bold; + line-height: normal; + text-decoration: none; +} + +#ja-mainnav ul.menu li a:hover, +#ja-mainnav ul.menu li a:active, +#ja-mainnav ul.menu li a:focus { + background: url(../images/arrow2.png) no-repeat bottom center #555555; + color: #FFFFFF; +} + +#ja-mainnav ul.menu li { + margin: 0; +} + +#ja-mainnav ul.menu li:hover, +#ja-mainnav ul.menu li.sfhover, +#ja-mainnav ul.menu li.parentsfhover, +#ja-mainnav ul.menu li.parent-activesfhover { + background: url(../images/arrow2.png) no-repeat bottom center #555555; + color: #FFFFFF; +} + +#ja-mainnav ul.menu li.active a, +#ja-mainnav ul.menu li.active a:hover, +#ja-mainnav ul.menu li.active a:active, +#ja-mainnav ul.menu li.active a:focus { + background: url(../images/arrow2.png) no-repeat bottom center #333333; + color: #FFFFFF; +} + +/* 2nd level and above */ +#ja-mainnav ul.menu li ul { + border: 1px solid #555555; + background: url(../images/opaque.png); +} + +#ja-mainnav ul.menu li ul li { + border-top: 1px solid #777777; + border-bottom: 1px solid #444444; + background: none; +} + +#ja-mainnav ul.menu li ul a { + border-right: none; + margin: 0; + padding: 7px 10px; + background: none; + color: #CCCCCC; + font-weight: normal; + line-height: normal; + text-transform: none; +} + +#ja-mainnav ul.menu li.havesubchild, +#ja-mainnav ul.menu li.havesubchild-active { + background: url(../images/bullet2.gif) no-repeat 94% 50%; +} + +#ja-mainnav ul.menu li ul a:hover, +#ja-mainnav ul.menu li ul a:active, +#ja-mainnav ul.menu li ul a:focus, +#ja-mainnav ul.menu ul li:hover, +#ja-mainnav ul.menu ul li.sfhover, +#ja-mainnav ul.menu ul li.havesubchildsfhover, +#ja-mainnav ul.menu ul li.havesubchild-activesfhover, +#ja-mainnav ul.menu ul ul li:hover, +#ja-mainnav ul.menu ul ul li.sfhover, +#ja-mainnav ul.menu ul ul li.havesubchildsfhover, +#ja-mainnav ul.menu ul ul li.havesubchild-activesfhover { + background: #333333; + color: #CCCCCC; +} + +#ja-mainnav ul.menu ul li.active a, +#ja-mainnav ul.menu ul li.active a:hover, +#ja-mainnav ul.menu ul li.active a:active, +#ja-mainnav ul.menu ul li.active a:focus { + background: none !important; + color: #FFFFFF; + font-weight: bold; +} + +#ja-mainnav ul.menu li.active li a, +#ja-mainnav ul.menu li.active li a:hover, +#ja-mainnav ul.menu li.active li a:active, +#ja-mainnav ul.menu li.active li a:focus { + background: none !important; +} + +#ja-mainnav h3 { + display: none; +} + +#ja-mainnav .moduletable_menu { + background: none; + margin: 0; + padding: 0; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/css/menu.css b/oss/joomla/trunk/templates/ja_purity/css/menu.css new file mode 100644 index 00000000..a23f54e1 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/css/menu.css @@ -0,0 +1,79 @@ +/* Default Joomla! Menu */ +#ja-container2 ul.menu { + margin: 0; + padding: 1px 0 0; + list-style: none; + background: url(../images/hdot2.gif) repeat-x top; +} + +#ja-container2 ul.menu li { + margin: 0 !important; + padding: 0 !important; + background: none !important; +} + +#ja-container2 ul.menu li a { + padding: 2px 0; + display: block; + color: #333333; + background: url(../images/hdot2.gif) repeat-x bottom; + text-decoration: none; + outline: none; +} + +#ja-container2 ul.menu li a span { + padding-left: 16px; + background: url(../images/bullet.gif) no-repeat 5px 5px; +} + +#ja-container2 ul.menu li a:hover, +#ja-container2 ul.menu li a:active, +#ja-container2 ul.menu li a:focus { + color: #333333; + background: url(../images/hdot2.gif) repeat-x bottom #DDDDDD; + text-decoration: none; +} + +#ja-container2 ul.menu li.active a { + background: url(../images/hdot2.gif) repeat-x bottom #FFFFFF; + color: #7BA566; + font-weight: bold; + text-decoration: none; +} + +#ja-container2 ul.menu li.active a span { + background: url(../images/bullet3.gif) no-repeat 5px 5px; +} + +#ja-container2 ul.menu li li a span { + background: none; +} + +#ja-container2 ul.menu li ul { + margin: 0; + padding: 0; + list-style: none; +} + +#ja-container2 ul.menu li li { + padding: 0 0 0 15px !important; + list-style: none; +} + +#ja-container2 ul.menu li li a { + color: #333333; + background: none !important; + font-size: 92%; + font-weight: normal; +} + +#ja-container2 ul.menu li li a:hover, +#ja-container2 ul.menu li li a:active, +#ja-container2 ul.menu li li a:focus { + color: #006699; +} + +#ja-container2 ul.menu li li a span { + background: url(../images/bullet.gif) no-repeat 5px; + font-weight: normal; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/css/template.css b/oss/joomla/trunk/templates/ja_purity/css/template.css new file mode 100644 index 00000000..c9eacf35 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/css/template.css @@ -0,0 +1,1631 @@ +/* COMMON STYLE +--------------------------------------------------------- */ +html, body, form, fieldset { + margin: 0; + padding: 0; +} + +body { + color: #000000; + background: #FFFFFF; + font-family: Arial, Helvetica, sans-serif; + line-height: 150%; +} + +body#bd { + color: #333333; + background: #F2F2F2; +} + +body.contentpane { + width: auto; /* Printable Page */ + margin: 1em 2em; + line-height: 1.3em; + margin: 0px 0px 0px 0px; + font-size: 12px; + color: #333; +} + +body.fs1 { + font-size: 10px; +} + +body.fs2{ + font-size: 11px; +} + +body.fs3{ + font-size: 12px; +} + +body.fs4{ + font-size: 13px; +} + +body.fs5{ + font-size: 14px; +} + +body.fs6{ + font-size: 15px; +} + +/* Normal link */ +a { + color: #006699; + text-decoration: underline; +} + +a:hover, a:active, a:focus { + color: #333333; + text-decoration: underline; +} + +/* Title text */ +.contentheading, .componentheading, .blog_more strong, h1, h2, h3, h4 { + font-family: "Segoe UI", Arial, Helvetica, sans-serif; +} + +/* Small text */ +small, .small, .smalldark, .mosimage_caption, .createby, .createdate, .modifydate, a.readon, .img_caption { + color: #666666; + font-size: 92%; +} + +/* Heading */ +h1 { + font-size: 180%; +} + +h2 { + font-size: 150%; +} + +h3 { + font-size: 125%; +} + +h4 { + font-size: 100%; + text-transform: uppercase; +} + +p, pre, blockquote, ul, ol, h1, h2, h3, h4, h5, h6 { + margin: 1em 0; + padding: 0; +} + +ul { + list-style: none; +} + +ul li { + padding-left: 30px; + background: url(../images/bullet.gif) no-repeat 18px 8px; + line-height: 180%; +} + +ol li { + margin-left: 35px; + line-height: 180%; +} + +th { + padding: 5px; + font-weight: bold; + text-align: left; +} + +fieldset { + border: none; + padding: 10px 5px; + background: url(../images/hdot2.gif) repeat-x top; +} + +fieldset a { + font-weight: bold; +} + +hr { + border-top: 1px solid #CCCCCC; + border-right: 0; + border-left: 0; + border-bottom: 0; + height: 1px; +} + +td, div { + font-size: 100%; +} + +img { + border: none; +} +/* FORM +--------------------------------------------------------- */ +form { + margin: 0; + padding: 0; +} + +form label { + cursor: pointer; +} + +input, select, textarea, .inputbox { + padding: 3px 5px; + font-family: Tahoma, Arial, Helvetica, sans-serif; + font-size: 100%; +} + +.button { + padding: 3px 5px; + border: 1px solid #333333; + background: url(../images/grad1.gif) repeat-x top #333333; + color: #CCCCCC; + font-size: 85%; + text-transform: uppercase; +} + +.button:hover, .button:focus { + border: 1px solid #999999; + background: #333333; + color: #FFFFFF; +} + +* html .button { + padding: 2px 0 !important; /*IE 6*/ +} + +*+html .button { + padding: 2px 0 !important; /*IE 7*/ +} + +.inputbox { + border: 1px solid #CCCCCC; + background: #FFFFFF; +} + +.inputbox:hover, .inputbox:focus { + background: #FFFFCC; +} + +/* BONUS TYPOGRAPHY STYLES +--------------------------------------------------------- */ +pre, .code { + padding: 10px 15px; + margin: 5px 0 15px; + border-left: 5px solid #999999; + background: #FFFFFF; + font: 1em/1.5 "Courier News", monospace; +} + +blockquote { + padding: 1em 40px 1em 15px; +} + +blockquote span.open { + padding: 0 0 0 20px; + background: url(../images/so-q.gif) no-repeat left top; +} + +blockquote span.close { + padding: 0 20px 0 0; + background: url(../images/sc-q.gif) no-repeat bottom right; +} + +/* Quote hilight */ +.quote-hilite { + padding: 10px 15px; + margin: 0; + border: 1px solid #CACACC; + background: #FFFFFF; +} + +/* Small quote */ +.small-quote { + margin: 0; + padding: 0; + background: none; +} + +.small-quote span.open-quote { + margin: 0; + padding-left: 20px; + background: url(../images/so-q.gif) no-repeat center left; +} + +.small-quote span.close-quote { + margin: 0; + padding-right: 20px; + background: url(../images/sc-q.gif) no-repeat center right; +} + +.small-quote span.author { + padding: 2px 5px 2px 20px; + border-top: 1px solid #DCDDE0; + margin: 0.5em 0 0; + display: block; + background: url(../images/author.gif) no-repeat 5px 4px #EAEBEE; + font-size: 90%; + text-transform: uppercase; +} + +/* Rropcap */ +.dropcap { + float: left; + padding: 4px 8px 0 0; + display: block; + color: #999999; + font: 50px/40px Georgia, Times, serif; +} + +/* Tips, Error, Message, Hightlight*/ +p.error { + padding-left: 25px; + color: #BF0000; + background: url(../images/icon-error.gif) no-repeat top left; +} + +p.message { + padding-left: 25px; + color: #006699; + background: url(../images/icon-info.gif) no-repeat top left; +} + +p.tips { + padding-left: 25px; + color: #EE9600; + background: url(../images/icon-tips.gif) no-repeat top left; +} + +.highlight { + padding: 1px 5px; + background: #FFFFCC; + font-weight: bold; +} + +/* Note Style */ +p.stickynote { + padding: 10px 0px 10px 40px; + border: 1px solid #CACACC; + background: url(../images/sticky-bg.gif) no-repeat 5px center #FFFFFF; +} + +p.download { + padding: 10px 0px 10px 40px; + border: 1px solid #CACACC; + background: url(../images/download-bg.gif) no-repeat 5px center #FFFFFF; +} + +.blocknumber { + clear: both; + padding: 5px 15px 10px; + position: relative; +} + +/* Check list */ +ul.checklist { + list-style: none; +} + +ul.checklist li { + margin-left: 15px; + padding: 0 0 5px 20px; + background: url(../images/checklist-bg.gif) no-repeat 0 3px; +} + +/* Small checklist */ +ul.small-checklist { + list-style: none; +} + +ul.small-checklist li { + margin-left: 15px; + padding: 0 0 5px 20px; + background: url(../images/icon_list.gif) no-repeat 0 3px; +} + +/* Check list */ +ul.stars { + list-style: none; +} + +ul.stars li { + margin-left: 15px; + padding: 0px 0 5px 20px; + background: url(../images/star-bg.gif) no-repeat 0 3px; +} + +/* Bignumber */ +.bignumber { + float: left; + margin-right: 8px; + padding: 6px 7px; + display: block; + background: url(../images/ol-bg.gif) no-repeat top left; + color: #7BA566; + font: bold 20px/normal Arial, sans-serif; +} + +/* Talking box. Thinking box. */ +div.bubble1, div.bubble2, div.bubble3, div.bubble4 { + margin: 15px 0; +} + +div.bubble1 span.author, +div.bubble2 span.author, +div.bubble3 span.author, +div.bubble4 span.author { + padding-left: 15px; + margin-left: 15px; + background: url(../images/author.gif) no-repeat center left; + font-weight: bold; +} + +div.bubble1 div { + margin: 0; + width: 100%; + background: url(../images/bub1-br.gif) no-repeat bottom right; +} + +div.bubble1 div div { + background: url(../images/bub1-bl.gif) no-repeat bottom left; +} + +div.bubble1 div div div { + background: url(../images/bub1-tr.gif) no-repeat top right; +} + +div.bubble1 div div div div { + background: url(../images/bub1-tl.gif) no-repeat top left; +} + +div.bubble1 div div div div div { + margin: 0; + padding: 15px 15px 30px 15px; + width: auto; +} + +div.bubble2 div { + margin: 0; + width: 100%; + background: url(../images/bub2-br.gif) no-repeat bottom right; +} + +div.bubble2 div div { + background: url(../images/bub2-bl.gif) no-repeat bottom left; +} + +div.bubble2 div div div { + background: url(../images/bub2-tr.gif) no-repeat top right; +} + +div.bubble2 div div div div { + background: url(../images/bub2-tl.gif) no-repeat top left; +} + +div.bubble2 div div div div div { + margin: 0; + padding: 15px 15px 35px 15px; + width: auto; +} + +div.bubble3 div { + margin: 0; + width: 100%; + background: url(../images/bub3-br.gif) no-repeat bottom right; +} + +div.bubble3 div div { + background: url(../images/bub3-bl.gif) no-repeat bottom left; +} + +div.bubble3 div div div { + background: url(../images/bub3-tr.gif) no-repeat top right; +} + +div.bubble3 div div div div { + background: url(../images/bub3-tl.gif) no-repeat top left; +} + +div.bubble3 div div div div div { + margin: 0; + padding: 15px 15px 50px 15px; + width: auto; +} + +div.bubble4 div { + margin: 0; + width: 100%; + background: url(../images/bub4-br.gif) no-repeat bottom right; +} + +div.bubble4 div div { + background: url(../images/bub4-bl.gif) no-repeat bottom left; +} + +div.bubble4 div div div { + background: url(../images/bub4-tr.gif) no-repeat top right; +} + +div.bubble4 div div div div { + background: url(../images/bub4-tl.gif) no-repeat top left; +} + +div.bubble4 div div div div div { + margin: 0; + padding: 15px 15px 55px 15px; + width: auto; +} + +/* Legend */ +.legend-title { + margin: 0; + padding: 0 3px; + float: left; + display: block; + background: #F6F6F6; + font-weight: bold; + position: absolute; + top: -10px; + left: 7px; +} + +.legend { + margin: 20px 0; + padding: 0 10px; + border: 1px solid #CACACC; + background: #FFFFFF; + position: relative; +} + +/* JOOMLA STYLE +--------------------------------------------------------- */ +table.blog { +} + +.article_separator { + clear: both; + display: block; + height: 20px; +} + +.article_column { +} + +.column_separator { + padding: 0 25px; +} + +/* content tables */ +td.sectiontableheader { + padding: 4px; + border-right: 1px solid #fff; +} + +tr.sectiontableentry0 td, +tr.sectiontableentry1 td, +tr.sectiontableentry2 td { + padding: 4px; +} + +td.sectiontableentry0, +td.sectiontableentry1, +td.sectiontableentry2 { + padding: 3px; +} + +table.contentpane { + border: none; + width: 100%; +} + +table.contentpaneopen { + border: none; + border-collapse: collapse; + border-spacing: 0; +} + +table.contenttoc { + margin: 0 0 10px 10px; + padding: 0; + width: 35%; + float: right; +} + +table.contenttoc a { + text-decoration: none; +} + +table.contenttoc td { + padding: 1px 5px 1px 25px; + background: url(../images/bullet-list.gif) no-repeat 5% 50%; +} + +table.contenttoc th { + padding: 0 0 3PX; + border-bottom: 1px solid #CCCCCC; + text-indent: 5px; +} + +table.poll { + padding: 0; + width: 100%; + border-collapse: collapse; +} + +table.pollstableborder { + padding: 0; + width: 100%; + border: none; + text-align: left; +} + +table.pollstableborder img { + vertical-align: baseline; +} + +table.pollstableborder td { + padding: 4px!important; + border-collapse: collapse; + border-spacing: 0; +} + +table.pollstableborder tr.sectiontableentry1 td { + background: #ECECEC; +} + +table.searchintro { + padding: 10px 0; + width: 100%; +} + +table.searchintro td { + padding: 5px!important; +} + +table.adminform { +} + +.adminform .inputbox { +} + +.blog_more { + padding: 10px 0; + background: url(../images/hdot.gif) repeat-x top; +} + +.blog_more strong { + margin: 0 0 5px; + display: block; + font-size: 125%; +} + +.blog_more ul { + margin: 0; + padding: 0; +} + +.blog_more ul li { + margin: 0; + padding: 0 0 0 17px; + background: url(../images/bullet.gif) no-repeat 6px 8px; +} + +.category { + font-weight: bold; +} + +h1.componentheading, .componentheading { + padding: 5px 0 15px; + margin: 0 0 10px; + background: url(../images/hdot.gif) repeat-x bottom; +} + +.componentheading { + font-size: 200%; + font-weight: bold; +} + +.contentdescription { + padding-bottom: 30px; +} + +h2.contentheading, .contentheading { + padding: 5px 0 8px; + margin: 0; + font-weight: normal; +} + +table.blog .contentheading { + font-size: 150%; +} + +.contentheading { + font-size: 200%; +} + +a.contentpagetitle, +a.contentpagetitle:hover, +a.contentpagetitle:active, +a.contentpagetitle:focus { + text-decoration: none !important; +} + +a.readon { + float: left; + margin-top: 10px; + padding: 1px 5px 1px 14px; + border: 1px solid #F6F6F6; + display: block; + background: url(../images/arrow.png) no-repeat 5px 48%; + color: #006699; + font-weight: bold; + text-decoration: none; + text-transform: uppercase; +} + +a.readon:hover, a.readon:active, a.readon:focus { + border: 1px solid #ECECEC; + background: url(../images/arrow.png) no-repeat 5px 48% #FFFFFF; +} + +table.contentpaneopen td, table.contentpane td { +} + +table.contentpaneopen, table.contentpane, table.blog { + width: 100%; +} + +.moduletable { + padding: 0; +} + +ul.pagination { + margin: 15px auto; + padding: 10px 0; + background: url(../images/hdot.gif) repeat-x top; +} + +ul.pagination li { + margin: 0; + padding: 0; + display: inline; + background: none; +} + +ul.pagination li span{ + padding: 2px 5px; +} + +ul.pagination a { + padding: 2px 5px; + border: 1px solid #F6F6F6; +} + +ul.pagination a:hover, ul.pagination a:active, ul.pagination a:focus { + border: 1px solid #ECECEC; + background: #FFFFFF; +} + +.pagenavbar { + padding-left: 14px; +} + +.pagenavcounter { + padding: 8px 14px 0 14px; +} + +.sectiontableheader { + padding: 8px 5px; + background: #444444; + color: #FFFFFF; +} + +.sectiontableheader a { + color: #FFFFFF; +} + +tr.sectiontableentry1 td { + padding: 8px 5px; + background: url(../images/hdot2.gif) repeat-x bottom; +} + +tr.sectiontableentry2 td { + padding: 8px 5px; + background: url(../images/hdot2.gif) repeat-x bottom #ECECEC; +} + +tr.sectiontableentry1:hover td, +tr.sectiontableentry2:hover td { + background: url(../images/hdot2.gif) repeat-x bottom #FFFFCC; +} + +.smalldark { + text-align: left; +} + +div.syndicate div { + text-align: center; +} + +.pollstableborder tr.sectiontableentry1 td, +.pollstableborder tr.sectiontableentry2 td { + background: none; +} + +/* META +--------------------------------------------------------- */ +.article-tools { + border-top: 1px solid #DDDDDD; + width: 100%; + float: left; + clear: both; + margin-bottom: 15px; + display: block; + background: #ECECEC; +} + +.article-meta { + padding: 5px; + width: 80%; + float: left; +} + +.createby { + padding: 3px 3px 3px 20px; + background: url(../images/icon-user.gif) no-repeat 0 2px; +} + +.createdate { + padding: 3px 3px 3px 20px; + background: url(../images/icon-date.gif) no-repeat 0 2px; +} + +.modifydate { + width: 100%; + float: left; +} + +div.buttonheading { + float: right; + width: 15%; +} + +.buttonheading img { + margin: 7px 5px 0 0; + border: 0; + float: right; +} + +/* MAIN LAYOUT DIVS +--------------------------------------------------------- */ +#ja-wrapper { + width: 100%; + margin: 0; + background: #F2F2F2; +} + +#ja-containerwrap { + background: url(../images/cw-bg1.gif) repeat-y 50% 0; +} + +#ja-containerwrap2 { + background: url(../images/cw-bg2.gif) no-repeat 50% 0; +} + +#ja-container { + background: url(../images/c-bg1.gif) repeat-y 18% 0; +} + +#ja-container2 { + padding: 20px 0; + background: url(../images/c-bg2.gif) no-repeat 18% 0; +} + +#ja-mainbody-fr #ja-col1 { + width: 20%; +} + +#ja-mainbody-fr #ja-contentwrap { + width: 80%; +} + +#ja-mainbody, #ja-mainbody-fl { + float: left; + width: 80%; +} + +#ja-mainbody #ja-contentwrap { + float: right; + width: 75%; +} + +#ja-mainbody-fl #ja-contentwrap { + float: left; + width: 100%; +} + +#ja-mainbody-f, #ja-mainbody-fr { + float: none; + width: 100%; +} + +#ja-mainbody-fr #ja-contentwrap { + width: 74.8%; + float: right; +} + +#ja-mainbody-fr #ja-col1 { + width: 20%; + float: left; +} + +#ja-mainbody-fr #ja-contentwrap { + width: 80%; +} + +#ja-content { + padding: 0 20px 0 40px; +} +#ja-contentwrap { + min-height: 300px; + height: auto; +} +* html #ja-contentwrap { + height: 300px; +} +#ja-mainbody-fl #ja-content { + padding-left: 0; +} + +#ja-mainbody-f #ja-content { + padding: 0; +} + +/* Full */ +#ja-containerwrap-f { + background: url(../images/cwf-bg.gif) repeat-x top left #F6F6F6; +} + +#ja-containerwrap-f #ja-containerwrap2 { + background: none; +} + +#ja-containerwrap-f #ja-container, +#ja-containerwrap-f #ja-container2 { + background: none; +} + +/* Full left */ +#ja-containerwrap-fl { + background: url(../images/cwf-bg.gif) repeat-x top left #F6F6F6; +} + +#ja-containerwrap-fl #ja-containerwrap2, +#ja-containerwrap-fl #ja-container, +#ja-containerwrap-fl #ja-container2 { + background: none; +} + +/* Full right */ +#ja-containerwrap-fr { + background: url(../images/cw-bg1.gif) repeat-y 50% 0; +} + +#ja-containerwrap-fr #ja-containerwrap2 { + background: url(../images/cw-bg2.gif) no-repeat 50% 0; +} + +/* HEADER +--------------------------------------------------------- */ +#ja-headerwrap { + background: #333333; + color: #CCCCCC; + line-height: normal; + height: 80px; +} + +#ja-header { + position: relative; + height: 80px; +} + +.ja-headermask { + width: 602px; + display: block; + background: url(../images/header-mask.png) no-repeat top right; + height: 80px; + position: absolute; + top: 0; + right: -1px; +} + +#ja-header a { + color: #CCCCCC; +} + +h1.logo, h1.logo-text { + margin: 0 0 0 5px; + padding: 0; + font-size: 180%; + text-transform: uppercase; +} + +h1.logo a { + width: 208px; + display: block; + background: url(../images/logo.png) no-repeat; + height: 80px; + position: relative; + z-index: 100; +} + +h1.logo a span { + position: absolute; + top: -1000px; +} + +h1.logo-text a { + color: #CCCCCC !important; + text-decoration: none; + outline: none; + position: absolute; + bottom: 40px; + left: 5px; +} + +p.site-slogan { + margin: 0; + padding: 0; + padding: 2px 5px; + color: #FFFFFF; + background: #444444; + font-size: 92%; + position: absolute; + bottom: 20px; + left: 0; +} + +/* Search */ +#ja-search { + padding-left: 20px; + background: url(../images/icon-search.gif) no-repeat center left; + position: absolute; + bottom: 15px; + right: 0; +} + +#ja-search .inputbox { + width: 120px; + border: 1px solid #333333; + padding: 3px 5px; + color: #999999; + background: #444444; + font-size: 92%; +} + +/* MAIN NAVIGATION +--------------------------------------------------------- */ + +#ja-pathway { + font-size: 92%; +} + +#ja-pathway strong { + margin-right: 5px; + font-weight: normal; +} + +#ja-pathway a { + text-decoration: none; +} + +#ja-pathway img { + margin: 1px 5px; +} + +/* MODULE +--------------------------------------------------------- */ +div.moduletable, +div.moduletable_menu, +div.moduletable_text { + padding: 0 0 20px; + margin-bottom: 15px; + background: url(../images/hdot.gif) repeat-x bottom; +} + +div.moduletable h3, +div.moduletable_menu h3, +div.moduletable_text h3 { + padding: 0 0 8px; + margin: 0; + color: #7BA566; + font-size: 125%; + font-weight: bold; + text-transform: uppercase; +} + +/* Module rounded */ +div.module h3 { + margin: 0 -15px 10px; + padding: 8px 15px 5px; + border-bottom: 2px solid #F6F6F6; + color: #7BA566; + font-size: 125%; + font-weight: bold; + text-transform: uppercase; +} + +div.module_black, +div.module_green, +div.module_blue, +div.module_red, +div.module { + margin-bottom: 20px; + float: left; + clear: both; + width: 100%; + background: url(../images/b-br.gif) no-repeat bottom right #FFFFFF; +} + +div.module div { + background: url(../images/b-bl.gif) no-repeat bottom left; +} + +div.module div div { + background: url(../images/b-tr.gif) no-repeat top right; +} + +div.module div div div { + padding: 0 15px 10px; + background: url(../images/b-tl.gif) no-repeat top left; +} + +div.module_black div div div div, +div.module_green div div div div, +div.module_blue div div div div, +div.module_red div div div div, +div.module_text div div div div, +div.module div div div div { + margin: 0; + padding: 0; + float: none; + width: 99%; + background: none; +} + +div.module_text h3 { + margin: 0 0 10px; + width: 100%; + clear: both; + display: block; + overflow: hidden; +} + +div.module_text span { + padding: 0 3px 0 0; + float: left; + clear: both; + display: block; + background: #F6F6F6; + font-weight: bold; +} + +div.module_text { + margin-bottom: 20px; + padding: 0; + float: left; + clear: both; + width: 100%; + background: url(../images/bt-br.gif) no-repeat bottom right #F6F6F6; +} + +div.module_text div { + background: url(../images/bt-bl.gif) no-repeat bottom left; +} + +div.module_text div div { + background: url(../images/bt-tr.gif) no-repeat top right; +} + +div.module_text div div div { + padding: 0 15px 10px; + display: block; + background: url(../images/bt-tl.gif) no-repeat top left; +} + +div.banneritem_text { + padding: 5px 0 !important; +} + +/* red */ +div.module_black h3, +div.module_green h3, +div.module_blue h3, +div.module_red h3 { + margin: 0 -15px 10px; + padding: 8px 15px 5px; + border-bottom: 1px solid #F6F6F6; + color: #FFFFFF; + font-size: 125%; + font-weight: bold; + text-transform: uppercase; +} + +div.module_red { + background: url(../images/br-br.gif) no-repeat bottom right #BF0000; + color: #FFFFFF; +} + +div.module_red div { + background: url(../images/br-bl.gif) no-repeat bottom left; +} + +div.module_red div div { + background: url(../images/br-tr.gif) no-repeat top right; +} + +div.module_red div div div { + padding: 0 15px 10px; + background: url(../images/br-tl.gif) no-repeat top left; +} + +/* blue */ +div.module_blue { + background: url(../images/bb-br.gif) no-repeat bottom right #006699; + color: #FFFFFF; +} + +div.module_blue div { + background: url(../images/bb-bl.gif) no-repeat bottom left; +} + +div.module_blue div div { + background: url(../images/bb-tr.gif) no-repeat top right; +} + +div.module_blue div div div { + padding: 0 15px 10px; + background: url(../images/bb-tl.gif) no-repeat top left; +} + +/* green */ +div.module_green { + background: url(../images/bg-br.gif) no-repeat bottom right #7BA566; + color: #FFFFFF; +} + +div.module_green div { + background: url(../images/bg-bl.gif) no-repeat bottom left; +} + +div.module_green div div { + background: url(../images/bg-tr.gif) no-repeat top right; +} + +div.module_green div div div { + padding: 0 15px 10px; + background: url(../images/bg-tl.gif) no-repeat top left; +} + +/* black */ +div.module_black { + background: url(../images/bl-br.gif) no-repeat bottom right #333333; + color: #FFFFFF; +} + +div.module_black div { + background: url(../images/bl-bl.gif) no-repeat bottom left; +} + +div.module_black div div { + background: url(../images/bl-tr.gif) no-repeat top right; +} + +div.module_black div div div { + padding: 0 15px 10px; + background: url(../images/bl-tl.gif) no-repeat top left; +} + +div.module_blue ul, +div.module_blue ol, +div.module_red ul, +div.module_red ol, +div.module_black ul, +div.module_black ol, +div.module_green ul, +div.module_green ol { + margin: 0; + padding: 0; +} + +div.module_blue li, +div.module_red li, +div.module_black li, +div.module_green li { + margin-left: 20px; + padding: 0; + line-height: 150%; +} + +div.module_blue a, +div.module_red a, +div.module_black a, +div.module_green a { + color: #FFFFFF; +} + +div.advs { + float: left; + width: 100%; + clear: both; + display: block; +} + +/* LEFT COLUMN + RIGHT COLUMN +--------------------------------------------------------- */ +#ja-col1 { + float: left; + width: 24.99%; + padding-top: 10px; + overflow: hidden; +} + +#ja-col2 { + float: right; + width: 20%; + overflow: hidden; +} + +#ja-col1 table, +#ja-col2 table { + border-collapse: collapse; + border-spacing: 0; +} + +#ja-col1 ul li, +#ja-col2 ul li { + padding-left: 15px; + margin: 0; + background: url(../images/bullet.gif) no-repeat 5px 50%; +} + +#ja-col1 ul, #ja-col2 ul { + margin: 0; +} + +#ja-col1 ol, #ja-col2 ol { + margin-left: 5px; +} + +#ja-col1 .article_separator, +#ja-col2 .article_separator { + display: none; +} + +/* SPOTLIGHT +--------------------------------------------------------- */ +/* Spotlight Box Style */ +.ja-box-full, .ja-box-left, .ja-box-center, .ja-box-right { + float: left; + overflow: hidden; +} + +.ja-box-left div.moduletable, +.ja-box-full div.moduletable { + padding-right: 30px; + background: none; +} + +.ja-box-right div.moduletable { + padding-left: 30px; + background: url(../images/vdot2.gif) repeat-y left; +} + +.ja-box-center div.moduletable { + padding: 0 30px; + background: url(../images/vdot2.gif) repeat-y left; +} + +#ja-botsl h3 { + background: none; +} + +#ja-botslwrap { + border-top: 5px solid #CCCCCC; + background: #444444; + color: #CCCCCC; +} + +#ja-botsl { + padding: 15px 0; +} + +#ja-botsl div.moduletable { + padding-top: 0; + padding-bottom: 0; + margin: 0; +} + +#ja-botsl h3 { + margin: 0 0 12px; + padding: 0; + color: #FFFFFF; +} + +#ja-botsl a { + color: #CCCCCC; +} + +#ja-botsl a:hover, #ja-botsl a:active, #ja-botsl a:focus { + color: #FFFFFF; +} + +#ja-botsl ul, #ja-botsl p, #ja-botsl ol { + padding: 0; + margin: 0 !important; +} + +#ja-botsl ul li { + padding: 0 0 0 15px; + margin: 0; + background: url(../images/bullet2.gif) no-repeat 3px 8px; +} + +#ja-botsl ol li { + margin-left: 25px; + padding: 0 !important; +} + +#ja-botsl td { + padding: 0; +} + +#ja-botsl .article_separator { + display: none; +} + +#ja-botsl table { + border-spacing: 0; + border-collapse: collapse; +} + +/* FOOTER +--------------------------------------------------------- */ +#ja-footerwrap { + border-top: 5px solid #CCCCCC; + padding: 20px 0 30px; + clear: both; + background: url(../images/grad3.gif) repeat-x bottom #F6F6F6; +} + +#ja-footer { + padding: 0; + color: #666666; + background: url(../images/vdot.gif) repeat-y 22% 0; + position: relative; +} + +#ja-footer .copyright { + clear: both; + display: block; + padding-left: 25%; + color: #666666; + font-style: normal; + font-size: 92%; +} + +#ja-footnav { + padding-left: 25%; +} + +#ja-footer ul { + margin: 0 0 5px; + padding: 0; +} + +#ja-footer li { + margin: 0; + padding: 0; + display: inline; + background: none; +} + +#ja-footer li a { + padding: 0 15px 0 0; + display: inline; + color: #666666; + font-weight: bold; + font-size: 92%; + line-height: normal; + text-decoration: none; + text-transform: uppercase; +} + +#ja-footer li a:hover, #ja-footer li a:active, #ja-footer li a:focus { + color: #333333; + text-decoration: none; +} + +.ja-cert { + font-size: 92%; + position: absolute; + right: 0; + top: 18px; +} + +.ja-cert a { + margin: 0 0 0 5px; + padding: 0; + border: none; + border: none; + text-decoration: none; +} + +.ja-cert a span { + display: none; +} + +.ja-cert a img { + border: none; +} + +.banneritem { + display: block; + margin-top: 15px; +} + +/* MISCELLANOUS +----------------------------------------------------------- */ +ul.accessibility { + position: absolute; + top: -100%; +} + +/*usertool*/ +ul.ja-usertools-font { + font-size: 11px; + position: absolute; + top: 8px; + right: 70px; +} + +ul.ja-usertools-font li { + padding: 0; + margin: 0; + display: inline; + background: none; +} + +/*collapsible h3*/ +h3.show { + background: url(../images/arrow2.png) no-repeat 90% 60%; + cursor: pointer; +} + +h3.hide { + background: url(../images/arrow3.png) no-repeat 90% 60%; + cursor: pointer; +} + +/*others*/ +#ja-banner { + margin: 15px 0; + text-align: center; +} + +div.back_button a, +div.back_button a:hover, +div.back_button a:active { + margin: 10px 0; + display: block; + background: none!important; + text-decoration: none!important; +} + +#form-login p { + margin: 0 0 5px; +} + +#form-login ul { + margin: 10px 0 0; +} + +#form-login .inputbox { + width: 90%; +} + +.clr { + clear: both; +} + +.hasTip img { + margin: 10px 5px 0 0; + border: none; +} + +/* Tooltips */ +.tool-tip { + float: left; + border: 1px solid #D4D5AA; + padding: 5px; + background: #FFFFCC; + max-width: 200px; +} + +.tool-title { + padding: 0; + margin: 0; + margin-top: -15px; + padding-top: 15px; + padding-bottom: 5px; + background: url(../../system/images/selector-arrow.png) no-repeat; + font-size: 100%; + font-weight: bold; +} + +.tool-text { + margin: 0; + font-size: 100%; +} + +#system-message dd.message ul, +#system-message dd.error ul, +#system-message dd.notice ul { + padding: 0; + margin: 0; +} + +#system-message dd.message ul li, +#system-message dd.error ul li, +#system-message dd.notice ul li { + background: none; + padding: 5px; + margin: 0; + color: #FFFFFF; +} + +/* System Standard Messages */ +#system-message dd.message ul { + background: #006699; + border: none; +} + +/* System Error Messages */ +#system-message dd.error ul { + background: #BF0000; + border: none; +} + +/* System Notice Messages */ +#system-message dd.notice ul { + background: #EE9600; + border: none; +} + +/* Clearfix */ +.clearfix:after { + clear: both; + display: block; + content: "."; + height: 0; + visibility: hidden; +} + +* html > body .clearfix { + width: 100%; + display: block; +} + +* html .clearfix { + height: 1%; +} + +/* Firefox Scrollbar Hack - Do not remove */ +html { + margin-bottom: 1px; + height: 100%!important; + height: auto; +} diff --git a/oss/joomla/trunk/templates/ja_purity/css/template_rtl.css b/oss/joomla/trunk/templates/ja_purity/css/template_rtl.css new file mode 100644 index 00000000..17f53a57 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/css/template_rtl.css @@ -0,0 +1,655 @@ +/* COMMON STYLE +--------------------------------------------------------- */ +html { + direction: rtl; +} + +ul li { + padding-right: 30px; + background-position: 98% 8px; +} + +ol li { + margin-right: 35px; + margin-left: -35px; + padding: 0; +} + +th { + text-align: right; +} + +/* JOOMLA STYLE +--------------------------------------------------------- */ +td.sectiontableheader { + border-left: 1px solid #fff; + border-right: none; +} + +table.contenttoc { + float:left; + margin: 0 10px 10px 0px; +} + +table.contenttoc td { + padding: 1px 25px 1px 5px; + background-position: 95% 50%; +} + +table.pollstableborder { + text-align: right; +} + +.blog_more ul li { + padding: 0 17px 0 0; + background-position: 98% 8px; +} + +a.readon { + float: right; + padding: 1px 14px 1px 5px; + background: url(../images/rtl/arrow.png) no-repeat 95% 48%; +} + +a.readon:hover, a.readon:active, a.readon:focus { + background: url(../images/rtl/arrow.png) no-repeat 95% 48% #FFFFFF; +} + +ul.pagination li span{ + padding: 0; +} + +.pagenavbar { + padding-right: 14px; + background-position: center right; +} + +.pagenavcounter { + padding: 8px 14px 0 14px; + background-position: 0 11px; +} + +.smalldark { + text-align: right; +} + +/* META +--------------------------------------------------------- */ +.article-tools { + float: right; +} + +.article-meta { + float: right; +} + +.createby { + padding: 3px 20px 3px 3px; + background-position: 100% 5px; + float: right; +} + +.createdate { + padding: 3px 20px 3px 3px; + background-position: 100% 5px; + float: right; +} + +.buttonheading img { + margin: 7px 0 0 5px; + float: left; +} + +/* MAIN LAYOUT DIVS +--------------------------------------------------------- */ +#ja-containerwrap { + background: url(../images/rtl/cw-bg12.gif) repeat-y 50% 0; +} + +#ja-containerwrap-fr { + background: url(../images/rtl/cw-bg12.gif) repeat-y 50% 0; +} + +#ja-containerwrap2 { + background: url(../images/rtl/cw-bg2.gif) no-repeat 50% 0; +} + +#ja-container { + background: url(../images/rtl/c-bg1.gif) repeat-y 82% 0; + padding: 0; +} + +#ja-container2 { + background: url(../images/rtl/c-bg2.gif) no-repeat 82% top; + padding: 20px 0; +} + +#ja-mainbody, #ja-mainbody-fl { + float: right; +} + +#ja-mainbody #ja-contentwrap, +#ja-mainbody-fr #ja-contentwrap, +#ja-mainbody-fl #ja-contentwrap { + float: left; +} + +#ja-mainbody-fl #ja-contentwrap #ja-content { + padding-left: 20px; +} + +#ja-mainbody-f, #ja-mainbody-fr { + float: right; +} + +#ja-content { + padding: 0 40px 0 20px; +} +.OPE #ja-content { + padding-left: 40px; +} +.OPE #ja-mainbody #ja-content { + padding-right: 20px; +} +#ja-mainbody-fl #ja-content { + padding-right: 0; +} + +/* Full */ +#ja-containerwrap-f { + background: url(../images/rtl/cwf-bg.gif) repeat-x top right #F6F6F6; +} + +/* Full right */ +#ja-containerwrap-fl { + background: url(../images/rtl/cwf-bg.gif) repeat-x top right #F6F6F6; +} + +#ja-containerwrap-fr #ja-containerwrap2 { + background: url(../images/rtl/cw-bg2.gif) no-repeat 50% 0; +} + +/* HEADER +--------------------------------------------------------- */ +.ja-headermask { + background-position: top left; + left: -1px; + right: auto; +} + +h1.logo-text a { + right: 5px; + left: auto; +} + +p.site-slogan { + right: 0; + left: auto; +} + +/* Search */ +#ja-search { + background-position: center right; + left: 0; + right: auto; +} + +/* MAIN NAVIGATION +--------------------------------------------------------- */ + +/* MODULE +--------------------------------------------------------- */ +div.module_black, +div.module_green, +div.module_blue, +div.module_red, +div.module { + float: right; +} + +div.module_black div div div div, +div.module_green div div div div, +div.module_blue div div div div, +div.module_red div div div div, +div.module_text div div div div, +div.module div div div div { + float: none; +} + +div.module_text span { + float: right; +} + +div.module_text { + float: right; +} + +div.module_blue li, +div.module_red li, +div.module_black li, +div.module_green li { + margin-right: 20px; + margin-left: auto; +} + +div.advs { + float: right; +} + +/* PATHWAY +--------------------------------------------------------- */ +#ja-pathway { +} + +/* right COLUMN + left COLUMN +--------------------------------------------------------- */ +#ja-col1 { + float: right; +} + +#ja-col2 { + float: left; +} + +#ja-col1 ul li, +#ja-col2 ul li { + padding-right: 15px; + background-position: 100% 10px; +} + +#ja-col1 ol, #ja-col2 ol, +#ja-col1 ul, #ja-col2 ul +{ + margin-right: 5px; +} +ul.menu li.active a span { + background: none; +} + +/* SPOTLIGHT +--------------------------------------------------------- */ +/* Spotlight Box Style */ +.ja-box-full, .ja-box-right, .ja-box-center, .ja-box-left { + float: right; +} + +.ja-box-left div.moduletable, +.ja-box-full div.moduletable { + padding-left: 30px; +} + +.ja-box-right div.moduletable { + padding-left: 30px; + padding-right: 30px; + background-position: right; +} + +.ja-box-center div.moduletable { + background-position: right; +} + +#ja-botsl ul li { + padding: 0 15px 0 0; + background-position: 99% 8px; +} + +#ja-botsl ol li { + margin-right: 25px; +} + +/* FOOTER +--------------------------------------------------------- */ +#ja-footer { + background-position: 78% 0; +} + +#ja-footer .copyright { + padding-right: 25%; +} + +#ja-footnav { + padding-right: 25%; +} + +#ja-footnav li{ + float: right; + direction: ltr; +} + +#ja-footer li a { + padding: 0 0 0 15px; +} + +.ja-cert { + left: 0; + right: auto; +} + +.ja-cert a { + margin: 0 5px 0 0; +} + +.banneritem { + display: block; + margin-top: 15px; +} + +/* MISCELLANOUS +----------------------------------------------------------- */ +/*usertool*/ +ul.ja-usertools-font { + left: 70px; + right: auto; +} + +/*collapsible h3*/ +h3.show { + background-position: 10% 60%; +} + +h3.hide { + background-position: 10% 60%; +} + +.hasTip img { + margin: 10px 0 0 5px; +} + +/* Tooltips */ +.tool-tip { + float: right; +} + +.breadcrumbs { +} + +.breadcrumbs a { + float: right; +} + +.breadcrumbs img { + float: right; + margin-top: 10px; + padding-top: 5px; +} + +/* MainNav +--------------------------------------------------------- */ +#ja-mainnav{ + direction: ltr; +} + +#ja-mainnav li a { + direction: rtl; +} + +#ja-cssmenu { + float: right; +} + +#ja-cssmenu li { + float: right; +} + +#ja-cssmenu li ul { + right: 0; +} + +#ja-cssmenu li ul ul { + margin: -1.5em 14em 0 0; /* third-and-above-level lists */ +} + +#ja-cssmenu li li { + padding: 0 0 0 1em; +} + +/* STYLING THE MENU +-----------------------------------*/ +/* 1st level */ +#ja-cssmenu li ul a { + border-left: none; +} + +#ja-cssmenu li.havesubchild, +#ja-cssmenu li.havesubchild-active { + background-position: 6% 50%; +} + +body.IE6 #ja-cssmenu li ul, +body.IE7 #ja-cssmenu li ul, +body.OPE #ja-cssmenu li ul { + left: auto; + top: -999em; /* using left instead of display to hide menus because display: none isn't read by screen readers */ +} + +body.IE6 #ja-cssmenu li.sfhover ul ul, body.IE6 #ja-cssmenu li.havechildsfhover ul ul, body.IE6 #ja-cssmenu li.havechild-activesfhover ul ul, body.IE6 #ja-cssmenu li.activesfhover ul ul, +body.IE6 #ja-cssmenu li.sfhover ul ul ul, body.IE6 #ja-cssmenu li.havechildsfhover ul ul ul, body.IE6 #ja-cssmenu li.havechild-activesfhover ul ul ul, body.IE6 #ja-cssmenu li.activesfhover ul ul ul, +body.IE7 #ja-cssmenu li.sfhover ul ul, body.IE7 #ja-cssmenu li.havechildsfhover ul ul, body.IE7 #ja-cssmenu li.havechild-activesfhover ul ul, body.IE7 #ja-cssmenu li.activesfhover ul ul, +body.IE7 #ja-cssmenu li.sfhover ul ul ul, body.IE7 #ja-cssmenu li.havechildsfhover ul ul ul, body.IE7 #ja-cssmenu li.havechild-activesfhover ul ul ul, body.IE7 #ja-cssmenu li.activesfhover ul ul ul, +body.OPE #ja-cssmenu li.sfhover ul ul, body.OPE #ja-cssmenu li.havechildsfhover ul ul, body.OPE #ja-cssmenu li.havechild-activesfhover ul ul, body.OPE #ja-cssmenu li.activesfhover ul ul, +body.OPE #ja-cssmenu li.sfhover ul ul ul, body.OPE #ja-cssmenu li.havechildsfhover ul ul ul, body.OPE #ja-cssmenu li.havechild-activesfhover ul ul ul, body.OPE #ja-cssmenu li.activesfhover ul ul ul { + left: auto; + left: auto; + top: -999em; +} + +/* This "unhides" the sub-menus (left: -999em is what hides them) */ +body.IE6 #ja-cssmenu li.sfhover ul, body.IE6 #ja-cssmenu li.havechildsfhover ul, body.IE6 #ja-cssmenu li.havechild-activesfhover ul, body.IE6 #ja-cssmenu li.activesfhover ul, +body.IE6 #ja-cssmenu li li.sfhover ul, body.IE6 #ja-cssmenu li li.havesubchildsfhover ul, body.IE6 #ja-cssmenu li li.havesubchild-activesfhover ul, body.IE6 #ja-cssmenu li li.activesfhover ul, +body.IE6 #ja-cssmenu li li li.sfhover ul, body.IE6 #ja-cssmenu li li li.havesubchildsfhover ul, body.IE6 #ja-cssmenu li li li.havesubchild-activesfhover ul, body.IE6 #ja-cssmenu li li li.activesfhover ul, +body.IE7 #ja-cssmenu li.sfhover ul, body.IE7 #ja-cssmenu li.havechildsfhover ul, body.IE7 #ja-cssmenu li.havechild-activesfhover ul, body.IE7 #ja-cssmenu li.activesfhover ul, +body.IE7 #ja-cssmenu li li.sfhover ul, body.IE7 #ja-cssmenu li li.havesubchildsfhover ul, body.IE7 #ja-cssmenu li li.havesubchild-activesfhover ul, body.IE7 #ja-cssmenu li li.activesfhover ul, +body.IE7 #ja-cssmenu li li li.sfhover ul, body.IE7 #ja-cssmenu li li li.havesubchildsfhover ul, body.IE7 #ja-cssmenu li li li.havesubchild-activesfhover ul, body.IE7 #ja-cssmenu li li li.activesfhover ul, +body.OPE #ja-cssmenu li.sfhover ul, body.OPE #ja-cssmenu li.havechildsfhover ul, body.OPE #ja-cssmenu li.havechild-activesfhover ul, body.OPE #ja-cssmenu li.activesfhover ul, +body.OPE #ja-cssmenu li li.sfhover ul, body.OPE #ja-cssmenu li li.havesubchildsfhover ul, body.OPE #ja-cssmenu li li.havesubchild-activesfhover ul, body.OPE #ja-cssmenu li li.activesfhover ul, +body.OPE #ja-cssmenu li li li.sfhover ul, body.OPE #ja-cssmenu li li li.havesubchildsfhover ul, body.OPE #ja-cssmenu li li li.havesubchild-activesfhover ul, body.OPE #ja-cssmenu li li li.activesfhover ul { + top: auto; +} + +/* TYPOGRAPY FIX FOR RTL */ +pre, .code { + border-right: 5px solid #999999; + border-left: none; +} + +blockquote { + padding: 1em 40px 1em 15px; +} + +blockquote span.open { + float: right; + padding: 0 20px 0 0; + background-position: right top; +} + +blockquote span.close { + padding: 0 0 0 20px; + background-position: bottom left; +} + +/* Small quote */ +.small-quote span.open-quote { + padding-left: 20px; + background-position: center left; +} + +.small-quote span.close-quote { + padding-right: 20px; + background-position: center right; +} + +.small-quote span.author { + padding: 2px 20px 2px 5px; + background-position: 99% 4px; +} + +/* Dropcap */ +.dropcap { + float: right; + padding: 4px 0 0 8px; +} + +/* Note Style */ +p.stickynote { + padding: 10px 40px 10px 0; + background-position: 99% 50%; +} + +p.download { + padding: 10px 40px 10px 0; + background-position: 99% 50%; +} + +.blocknumber { + clear: both; + padding: 5px 15px 10px; + position: relative; +} + +/* Check list */ +ul.checklist { + list-style: none; +} + +ul.checklist li { + margin-right: 15px; + padding: 0 20px 5px 0px; + background-position: right 3px; +} +/* Small checklist */ +ul.small-checklist { + list-style: none; +} + +ul.small-checklist li { + margin-right: 15px; + padding: 0 20px 5px 0; + background-position: right 3px; +} + +/* Check list */ +ul.stars { + list-style: none; +} + +ul.stars li { + margin-right: 15px; + padding: 0px 20px 5px 0; + background-position: right 3px; +} + +.IE7 ul li, +.IE7 ul.checklist li, +.IE7 ul.small-checklist li, +.IE7 ul.stars li +{ + padding-right: 40px; +} + +/* Tips, Error, Message, Hightlight*/ +p.error { + padding-right: 25px; + background-position: top right; +} + +p.message { + padding-right: 25px; + background-position: top right; +} + +p.tips { + padding-right: 25px; + background-position: top right; +} + +/* Bignumber */ +.bignumber { + float: right; + margin-left: 8px; + padding: 6px 7px; + display: block; + background-position: top right; +} + +/* Talking box. Thinking box. */ +div.bubble1 span.author, +div.bubble2 span.author, +div.bubble3 span.author, +div.bubble4 span.author { + padding-right: 15px; + margin-right: 15px; + background-position: center right; + float: right; +} + +div.bubble1 div { + background: url(../images/rtl/bub12-br.gif) no-repeat bottom left; +} + +div.bubble1 div div { + background: url(../images/rtl/bub12-bl.gif) no-repeat bottom right; +} + +div.bubble1 div div div { + background: url(../images/rtl/bub12-tr.gif) no-repeat top left; +} + +div.bubble1 div div div div { + background: url(../images/rtl/bub12-tl.gif) no-repeat top right; +} + +div.bubble2 div { + background: url(../images/rtl/bub22-br.gif) no-repeat bottom left; +} + +div.bubble2 div div { + background: url(../images/rtl/bub22-bl.gif) no-repeat bottom right; +} + +div.bubble2 div div div { + background: url(../images/rtl/bub22-tr.gif) no-repeat top left; +} + +div.bubble2 div div div div { + background: url(../images/rtl/bub22-tl.gif) no-repeat top right; +} + +div.bubble3 div { + background: url(../images/rtl/bub32-br.gif) no-repeat bottom left; +} + +div.bubble3 div div { + background: url(../images/rtl/bub32-bl.gif) no-repeat bottom right; +} + +div.bubble3 div div div { + background: url(../images/rtl/bub32-tr.gif) no-repeat top left; +} + +div.bubble3 div div div div { + background: url(../images/rtl/bub32-tl.gif) no-repeat top right; +} + +div.bubble4 div { + background: url(../images/rtl/bub42-br.gif) no-repeat bottom left; +} + +div.bubble4 div div { + background: url(../images/rtl/bub42-bl.gif) no-repeat bottom right; +} + +div.bubble4 div div div { + background: url(../images/rtl/bub42-tr.gif) no-repeat top left; +} + +div.bubble4 div div div div { + background: url(../images/rtl/bub42-tl.gif) no-repeat top right; +} + +/* Legend */ +.legend-title { + display: block; + float: left; + right: 7px; + left: auto; +} diff --git a/oss/joomla/trunk/templates/ja_purity/favicon.ico b/oss/joomla/trunk/templates/ja_purity/favicon.ico new file mode 100644 index 00000000..b5e79cb6 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/favicon.ico differ diff --git a/oss/joomla/trunk/templates/ja_purity/html/com_content/article/default.php b/oss/joomla/trunk/templates/ja_purity/html/com_content/article/default.php new file mode 100644 index 00000000..5ffc1734 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/html/com_content/article/default.php @@ -0,0 +1,133 @@ +<?php // no direct access +defined('_JEXEC') or die('Restricted access'); ?> +<?php if ($this->params->get('show_page_title', 1) && $this->params->get('page_title') != $this->article->title) : ?> +<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"><?php echo $this->escape($this->params->get('page_title')); ?></div> +<?php endif; ?> +<?php if (($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) && !$this->print) : ?> + <div class="contentpaneopen_edit<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>" > + <?php echo JHTML::_('icon.edit', $this->article, $this->params, $this->access); ?> + </div> +<?php endif; ?> + +<?php if ($this->params->get('show_title',1)) : ?> +<h2 class="contentheading<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>"> + <?php if ($this->params->get('link_titles') && $this->article->readmore_link != '') : ?> + <a href="<?php echo $this->article->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>"> + <?php echo $this->escape($this->article->title); ?> + </a> + <?php else : ?> + <?php echo $this->escape($this->article->title); ?> + <?php endif; ?> +</h2> +<?php endif; ?> + +<?php if (!$this->params->get('show_intro')) : + echo $this->article->event->afterDisplayTitle; +endif; ?> + +<?php +if ( +($this->params->get('show_create_date')) +|| (($this->params->get('show_author')) && ($this->article->author != "")) +|| (($this->params->get('show_section') && $this->article->sectionid) || ($this->params->get('show_category') && $this->article->catid)) +|| ($this->params->get('show_pdf_icon') || $this->params->get('show_print_icon') || $this->params->get('show_email_icon')) +|| ($this->params->get('show_url') && $this->article->urls) +) : +?> +<div class="article-tools"> + <div class="article-meta"> + <?php if ($this->params->get('show_create_date')) : ?> + <span class="createdate"> + <?php echo JHTML::_('date', $this->article->created, JText::_('DATE_FORMAT_LC2')) ?> + </span> + <?php endif; ?> + + <?php if (($this->params->get('show_author')) && ($this->article->author != "")) : ?> + <span class="createby"> + <?php $this->escape(JText::printf(($this->escape($this->article->created_by_alias) ? $this->escape($this->article->created_by_alias) : $this->escape($this->article->author)) )); ?> + </span> + <?php endif; ?> + + <?php if (($this->params->get('show_section') && $this->article->sectionid) || ($this->params->get('show_category') && $this->article->catid)) : ?> + <?php if ($this->params->get('show_section') && $this->article->sectionid && isset($this->article->section)) : ?> + <span class="article-section"> + <?php if ($this->params->get('link_section')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->article->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->article->section); ?> + <?php if ($this->params->get('link_section')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + <?php if ($this->params->get('show_category')) : ?> + <?php echo ' - '; ?> + <?php endif; ?> + </span> + <?php endif; ?> + <?php if ($this->params->get('show_category') && $this->article->catid) : ?> + <span class="article-section"> + <?php if ($this->params->get('link_category')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->article->catslug, $this->article->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->article->category); ?> + <?php if ($this->params->get('link_category')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + </span> + <?php endif; ?> + <?php endif; ?> + </div> + + <?php if ($this->params->get('show_pdf_icon') || $this->params->get('show_print_icon') || $this->params->get('show_email_icon')) : ?> + <div class="buttonheading"> + <?php if (!$this->print) : ?> + <?php if ($this->params->get('show_email_icon')) : ?> + <span> + <?php echo JHTML::_('icon.email', $this->article, $this->params, $this->access); ?> + </span> + <?php endif; ?> + + <?php if ( $this->params->get( 'show_print_icon' )) : ?> + <span> + <?php echo JHTML::_('icon.print_popup', $this->article, $this->params, $this->access); ?> + </span> + <?php endif; ?> + + <?php if ($this->params->get('show_pdf_icon')) : ?> + <span> + <?php echo JHTML::_('icon.pdf', $this->article, $this->params, $this->access); ?> + </span> + <?php endif; ?> + <?php else : ?> + <span> + <?php echo JHTML::_('icon.print_screen', $this->article, $this->params, $this->access); ?> + </span> + <?php endif; ?> + </div> + <?php endif; ?> + + <?php if ($this->params->get('show_url') && $this->article->urls) : ?> + <span class="article-url"> + <a href="http://<?php echo $this->escape($this->article->urls) ; ?>" target="_blank"> + <?php echo $this->escape($this->article->urls); ?></a> + </span> + <?php endif; ?> +</div> +<?php endif; ?> + +<?php echo $this->article->event->beforeDisplayContent; ?> + +<div class="article-content"> +<?php if (isset ($this->article->toc)) : ?> + <?php echo $this->article->toc; ?> +<?php endif; ?> +<?php echo $this->article->text; ?> +</div> + +<?php if ( intval($this->article->modified) !=0 && $this->params->get('show_modify_date')) : ?> + <span class="modifydate"> + <?php echo JText::sprintf('LAST_UPDATED2', $this->escape(JHTML::_('date', $this->article->modified, JText::_('DATE_FORMAT_LC2')))); ?> + </span> +<?php endif; ?> + +<span class="article_separator"> </span> +<?php echo $this->article->event->afterDisplayContent; ?> diff --git a/oss/joomla/trunk/templates/ja_purity/html/com_content/article/index.html b/oss/joomla/trunk/templates/ja_purity/html/com_content/article/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/html/com_content/article/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/html/com_content/category/blog_item.php b/oss/joomla/trunk/templates/ja_purity/html/com_content/category/blog_item.php new file mode 100644 index 00000000..6600c5b5 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/html/com_content/category/blog_item.php @@ -0,0 +1,146 @@ +<?php // no direct access +defined('_JEXEC') or die('Restricted access'); ?> + +<?php if ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) : ?> + <div class="contentpaneopen_edit<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>" style="float: left;"> + <?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?> + </div> +<?php endif; ?> +<div class="contentpaneopen<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>"> + +<?php if ($this->item->params->get('show_title')) : ?> +<h2 class="contentheading<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>"> + <?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?> + <a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>"> + <?php echo $this->escape($this->item->title); ?> + </a> + <?php else : ?> + <?php echo $this->escape($this->item->title); ?> + <?php endif; ?> +</h2> +<?php endif; ?> + +<?php if (!$this->item->params->get('show_intro')) : + echo $this->item->event->afterDisplayTitle; +endif; ?> + +<?php +if ( +($this->item->params->get('show_create_date')) +|| (($this->item->params->get('show_author')) && ($this->item->author != "")) +|| (($this->item->params->get('show_section') && $this->item->sectionid) || ($this->item->params->get('show_category') && $this->item->catid)) +|| ($this->item->params->get('show_pdf_icon') || $this->item->params->get('show_print_icon') || $this->item->params->get('show_email_icon')) +|| ($this->item->params->get('show_url') && $this->item->urls) +) : +?> +<div class="article-tools"> +<div class="article-meta"> + +<?php if ($this->item->params->get('show_create_date')) : ?> + <span class="createdate"> + <?php echo JHTML::_('date', $this->item->created, JText::_('DATE_FORMAT_LC2')); ?> + </span> +<?php endif; ?> + +<?php if (($this->item->params->get('show_author')) && ($this->item->author != "")) : ?> + <span class="createby"> + <?php JText::printf(($this->item->created_by_alias + ? $this->escape($this->item->created_by_alias) + : $this->escape($this->item->author)) ); ?> + </span> +<?php endif; ?> + +<?php if (($this->item->params->get('show_section') && $this->item->sectionid) || ($this->item->params->get('show_category') && $this->item->catid)) : ?> + <?php if ($this->item->params->get('show_section') && $this->item->sectionid && isset($this->item->section)) : ?> + <span class="article-section"> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->item->section); ?> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + <?php if ($this->item->params->get('show_category')) : ?> + <?php echo ' - '; ?> + <?php endif; ?> + </span> + <?php endif; ?> + <?php if ($this->item->params->get('show_category') && $this->item->catid) : ?> + <span class="article-section"> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->item->category); ?> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + </span> + <?php endif; ?> +<?php endif; ?> +</div> + +<?php if ($this->item->params->get('show_pdf_icon') || $this->item->params->get('show_print_icon') || $this->item->params->get('show_email_icon')) : ?> +<div class="buttonheading"> + <?php if ($this->item->params->get('show_email_icon')) : ?> + <span> + <?php echo JHTML::_('icon.email', $this->item, $this->item->params, $this->access); ?> + </span> + <?php endif; ?> + + <?php if ( $this->item->params->get( 'show_print_icon' )) : ?> + <span> + <?php echo JHTML::_('icon.print_popup', $this->item, $this->item->params, $this->access); ?> + </span> + <?php endif; ?> + + <?php if ($this->item->params->get('show_pdf_icon')) : ?> + <span> + <?php echo JHTML::_('icon.pdf', $this->item, $this->item->params, $this->access); ?> + </span> + <?php endif; ?> +</div> +<?php endif; ?> + +<?php if ($this->item->params->get('show_url') && $this->item->urls) : ?> + <span class="article-url"> + <a href="http://<?php echo $this->escape($this->item->urls) ; ?>" target="_blank"> + <?php echo $this->escape($this->item->urls); ?> + </a> + </span> +<?php endif; ?> +</div> +<?php endif; ?> + +<?php echo $this->item->event->beforeDisplayContent; ?> + +<div class="article-content"> +<?php if (isset ($this->item->toc)) : ?> + <?php echo $this->item->toc; ?> +<?php endif; ?> +<?php echo $this->item->text; ?> +</div> + +<?php if ( intval($this->item->modified) != 0 && $this->item->params->get('show_modify_date')) : ?> + <span class="modifydate"> + <?php echo JText::sprintf('LAST_UPDATED2', JHTML::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC2'))); ?> + </span> +<?php endif; ?> + +<?php if ($this->item->params->get('show_readmore') && $this->item->readmore) : ?> + <a href="<?php echo $this->item->readmore_link; ?>" title="<?php echo $this->escape($this->item->title); ?>" class="readon<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php + if ($this->item->readmore_register) : + echo JText::_('Register to read more...'); + elseif ($readmore = $this->item->params->get('readmore')) : + echo $readmore ; + else : + echo JText::sprintf('Read more...'); + endif; + ?> + </a> +<?php endif; ?> + +</div> + +<span class="article_separator"> </span> +<?php echo $this->item->event->afterDisplayContent; ?> diff --git a/oss/joomla/trunk/templates/ja_purity/html/com_content/category/index.html b/oss/joomla/trunk/templates/ja_purity/html/com_content/category/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/html/com_content/category/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/html/com_content/frontpage/default_item.php b/oss/joomla/trunk/templates/ja_purity/html/com_content/frontpage/default_item.php new file mode 100644 index 00000000..7d1b361e --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/html/com_content/frontpage/default_item.php @@ -0,0 +1,140 @@ +<?php // no direct access +defined('_JEXEC') or die('Restricted access'); ?> + +<?php if ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) : ?> + <div class="contentpaneopen_edit<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>" style="float: left;"> + <?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?> + </div> +<?php endif; ?> +<div class="contentpaneopen<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>"> + +<?php if ($this->item->params->get('show_title')) : ?> +<h2 class="contentheading<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>"> + <?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?> + <a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>"> + <?php echo $this->escape($this->item->title); ?> + </a> + <?php else : ?> + <?php echo $this->escape($this->item->title); ?> + <?php endif; ?> +</h2> +<?php endif; ?> + +<?php if (!$this->item->params->get('show_intro')) : + echo $this->item->event->afterDisplayTitle; +endif; ?> + +<?php +if ( +($this->item->params->get('show_create_date')) +|| (($this->item->params->get('show_author')) && ($this->item->author != "")) +|| (($this->item->params->get('show_section') && $this->item->sectionid) || ($this->item->params->get('show_category') && $this->item->catid)) +|| ($this->item->params->get('show_pdf_icon') || $this->item->params->get('show_print_icon') || $this->item->params->get('show_email_icon')) +|| ($this->item->params->get('show_url') && $this->item->urls) +) : +?> +<div class="article-tools"> +<div class="article-meta"> + +<?php if ($this->item->params->get('show_create_date')) : ?> + <span class="createdate"> + <?php echo JHTML::_('date', $this->item->created, JText::_('DATE_FORMAT_LC2')); ?> + </span> +<?php endif; ?> + +<?php if (($this->item->params->get('show_author')) && ($this->item->author != "")) : ?> + <span class="createby"> + <?php JText::printf(($this->item->created_by_alias ? $this->escape($this->item->created_by_alias) : $this->escape($this->item->author)) ); ?> + </span> +<?php endif; ?> + +<?php if (($this->item->params->get('show_section') && $this->item->sectionid) || ($this->item->params->get('show_category') && $this->item->catid)) : ?> + <?php if ($this->item->params->get('show_section') && $this->item->sectionid && isset($this->item->section)) : ?> + <span class="article-section"> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->item->section); ?> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + <?php if ($this->item->params->get('show_category')) : ?> + <?php echo ' - '; ?> + <?php endif; ?> + </span> + <?php endif; ?> + <?php if ($this->item->params->get('show_category') && $this->item->catid) : ?> + <span class="article-section"> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->item->category); ?> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + </span> + <?php endif; ?> +<?php endif; ?> +</div> + +<?php if ($this->item->params->get('show_pdf_icon') || $this->item->params->get('show_print_icon') || $this->item->params->get('show_email_icon')) : ?> +<div class="buttonheading"> + <?php if ($this->item->params->get('show_email_icon')) : ?> + <span> + <?php echo JHTML::_('icon.email', $this->item, $this->item->params, $this->access); ?> + </span> + <?php endif; ?> + + <?php if ( $this->item->params->get( 'show_print_icon' )) : ?> + <span> + <?php echo JHTML::_('icon.print_popup', $this->item, $this->item->params, $this->access); ?> + </span> + <?php endif; ?> + + <?php if ($this->item->params->get('show_pdf_icon')) : ?> + <span> + <?php echo JHTML::_('icon.pdf', $this->item, $this->item->params, $this->access); ?> + </span> + <?php endif; ?> +</div> +<?php endif; ?> + +<?php if ($this->item->params->get('show_url') && $this->item->urls) : ?> + <span class="article-url"> + <a href="http://<?php echo $this->escape($this->item->urls) ; ?>" target="_blank"> + <?php echo $this->escape($this->item->urls); ?> + </a> + </span> +<?php endif; ?> +</div> +<?php endif; ?> + +<?php echo $this->item->event->beforeDisplayContent; ?> + +<div class="article-content"> +<?php if (isset ($this->item->toc)) : ?> + <?php echo $this->item->toc; ?> +<?php endif; ?> +<?php echo $this->item->text; ?> +</div> + +<?php if ( intval($this->item->modified) != 0 && $this->item->params->get('show_modify_date')) : ?> + <span class="modifydate"> + <?php echo JText::sprintf('LAST_UPDATED2', JHTML::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC2'))); ?> + </span> +<?php endif; ?> + +<?php if ($this->item->params->get('show_readmore') && $this->item->readmore) : ?> + <a href="<?php echo $this->item->readmore_link; ?>" title="<?php echo $this->escape($this->item->title); ?>" class="readon<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php if ($this->item->readmore_register) : ?> + <?php echo JText::_('Register to read more...'); ?> + <?php else : ?> + <?php echo JText::_('Read more...'); ?> + <?php endif; ?> + </a> +<?php endif; ?> + +</div> + +<span class="article_separator"> </span> +<?php echo $this->item->event->afterDisplayContent; ?> diff --git a/oss/joomla/trunk/templates/ja_purity/html/com_content/frontpage/index.html b/oss/joomla/trunk/templates/ja_purity/html/com_content/frontpage/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/html/com_content/frontpage/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/html/com_content/index.html b/oss/joomla/trunk/templates/ja_purity/html/com_content/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/html/com_content/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/html/com_content/section/blog_item.php b/oss/joomla/trunk/templates/ja_purity/html/com_content/section/blog_item.php new file mode 100644 index 00000000..95118b69 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/html/com_content/section/blog_item.php @@ -0,0 +1,139 @@ +<?php // no direct access +defined('_JEXEC') or die('Restricted access'); ?> + +<?php if ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) : ?> + <div class="contentpaneopen_edit<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>" style="float: left;"> + <?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?> + </div> +<?php endif; ?> +<div class="contentpaneopen<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>"> + +<?php if ($this->item->params->get('show_title')) : ?> +<h2 class="contentheading<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>"> + <?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?> + <a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>"> + <?php echo $this->escape($this->item->title); ?> + </a> + <?php else : ?> + <?php echo $this->escape($this->item->title); ?> + <?php endif; ?> +</h2> +<?php endif; ?> + +<?php if (!$this->item->params->get('show_intro')) : + echo $this->item->event->afterDisplayTitle; +endif; ?> + +<?php +if ( +($this->item->params->get('show_create_date')) +|| (($this->item->params->get('show_author')) && ($this->item->author != "")) +|| (($this->item->params->get('show_section') && $this->item->sectionid) || ($this->item->params->get('show_category') && $this->item->catid)) +|| ($this->item->params->get('show_pdf_icon') || $this->item->params->get('show_print_icon') || $this->item->params->get('show_email_icon')) +|| ($this->item->params->get('show_url') && $this->item->urls) +) : +?> +<div class="article-tools"> +<div class="article-meta"> + +<?php if ($this->item->params->get('show_create_date')) : ?> + <span class="createdate"> + <?php echo JHTML::_('date', $this->item->created, JText::_('DATE_FORMAT_LC2')); ?> + </span> +<?php endif; ?> + +<?php if (($this->item->params->get('show_author')) && ($this->item->author != "")) : ?> + <span class="createby"> + <?php JText::printf(($this->item->created_by_alias ? $this->escape($this->item->created_by_alias) : $this->escape($this->item->author)) ); ?> + </span> +<?php endif; ?> + +<?php if (($this->item->params->get('show_section') && $this->item->sectionid) || ($this->item->params->get('show_category') && $this->item->catid)) : ?> + <?php if ($this->item->params->get('show_section') && $this->item->sectionid && isset($this->section->title)) : ?> + <span class="article-section"> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->section->title); ?> + <?php if ($this->item->params->get('link_section')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + <?php if ($this->item->params->get('show_category')) : ?> + <?php echo ' - '; ?> + <?php endif; ?> + </span> + <?php endif; ?> + <?php if ($this->item->params->get('show_category') && $this->item->catid) : ?> + <span class="article-section"> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?> + <?php endif; ?> + <?php echo $this->escape($this->item->category); ?> + <?php if ($this->item->params->get('link_category')) : ?> + <?php echo '</a>'; ?> + <?php endif; ?> + </span> + <?php endif; ?> +<?php endif; ?> +</div> + +<?php if ($this->item->params->get('show_pdf_icon') || $this->item->params->get('show_print_icon') || $this->item->params->get('show_email_icon')) : ?> +<div class="buttonheading"> + <?php if ($this->item->params->get('show_email_icon')) : ?> + <span> + <?php echo JHTML::_('icon.email', $this->item, $this->item->params, $this->access); ?> + </span> + <?php endif; ?> + + <?php if ( $this->item->params->get( 'show_print_icon' )) : ?> + <span> + <?php echo JHTML::_('icon.print_popup', $this->item, $this->item->params, $this->access); ?> + </span> + <?php endif; ?> + + <?php if ($this->item->params->get('show_pdf_icon')) : ?> + <span> + <?php echo JHTML::_('icon.pdf', $this->item, $this->item->params, $this->access); ?> + </span> + <?php endif; ?> +</div> +<?php endif; ?> + +<?php if ($this->item->params->get('show_url') && $this->item->urls) : ?> + <span class="article-url"> + <a href="http://<?php echo $this->item->urls ; ?>" target="_blank"> + <?php echo $this->escape($this->item->urls); ?></a> + </span> +<?php endif; ?> +</div> +<?php endif; ?> + +<?php echo $this->item->event->beforeDisplayContent; ?> + +<div class="article-content"> +<?php if (isset ($this->item->toc)) : ?> + <?php echo $this->item->toc; ?> +<?php endif; ?> +<?php echo $this->item->text; ?> +</div> + +<?php if ( intval($this->item->modified) != 0 && $this->item->params->get('show_modify_date')) : ?> + <span class="modifydate"> + <?php echo JText::sprintf('LAST_UPDATED2', JHTML::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC2'))); ?> + </span> +<?php endif; ?> + +<?php if ($this->item->params->get('show_readmore') && $this->item->readmore) : ?> + <a href="<?php echo $this->escape($this->item->readmore_link); ?>" title="<?php echo $this->escape($this->item->title); ?>" class="readon<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>"> + <?php if ($this->item->readmore_register) : ?> + <?php echo JText::_('Register to read more...'); ?> + <?php else : ?> + <?php echo JText::_('Read more...'); ?> + <?php endif; ?> + </a> +<?php endif; ?> + +</div> + +<span class="article_separator"> </span> +<?php echo $this->item->event->afterDisplayContent; ?> diff --git a/oss/joomla/trunk/templates/ja_purity/html/com_content/section/index.html b/oss/joomla/trunk/templates/ja_purity/html/com_content/section/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/html/com_content/section/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/html/index.html b/oss/joomla/trunk/templates/ja_purity/html/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/html/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/html/mod_banners/default.php b/oss/joomla/trunk/templates/ja_purity/html/mod_banners/default.php new file mode 100644 index 00000000..06c46597 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/html/mod_banners/default.php @@ -0,0 +1,22 @@ +<?php // no direct access +defined('_JEXEC') or die('Restricted access'); ?> +<div class="advs bannergroup<?php echo $params->get( 'moduleclass_sfx' ) ?>"> + +<?php if ($headerText) : ?> + <div class="bannerheader"><?php echo $headerText ?></div> +<?php endif; + +foreach($list as $item) : + + ?><div class="banneritem<?php echo $params->get( 'moduleclass_sfx' ) ?>"><?php + echo modBannersHelper::renderBanner($params, $item); + ?> + </div> +<?php endforeach; ?> + +<?php if ($footerText) : ?> + <div class="bannerfooter<?php echo $params->get( 'moduleclass_sfx' ) ?>"> + <?php echo $footerText ?> + </div> +<?php endif; ?> +</div> diff --git a/oss/joomla/trunk/templates/ja_purity/html/mod_banners/index.html b/oss/joomla/trunk/templates/ja_purity/html/mod_banners/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/html/mod_banners/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/html/mod_login/default.php b/oss/joomla/trunk/templates/ja_purity/html/mod_login/default.php new file mode 100644 index 00000000..00068482 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/html/mod_login/default.php @@ -0,0 +1,79 @@ +<?php // no direct access +defined('_JEXEC') or die('Restricted access'); ?> +<?php if($type == 'logout') : ?> +<form action="index.php" method="post" name="form-login" id="form-login"> +<?php if ($params->get('greeting')) : ?> + <div> + <?php if ($params->get('name')) : { + echo JText::sprintf( 'HINAME', $user->get('name') ); + } else : { + echo JText::sprintf( 'HINAME', $user->get('username') ); + } endif; ?> + </div> +<?php endif; ?> + <div align="center"> + <input type="submit" name="Submit" class="button" value="<?php echo JText::_( 'BUTTON_LOGOUT'); ?>" /> + </div> + + <input type="hidden" name="option" value="com_user" /> + <input type="hidden" name="task" value="logout" /> + <input type="hidden" name="return" value="<?php echo $return; ?>" /> +</form> +<?php else : ?> +<?php if(JPluginHelper::isEnabled('authentication', 'openid')) : ?> + <?php JHTML::_('script', 'openid'); ?> +<?php endif; ?> +<form action="index.php" method="post" name="form-login" id="form-login" > + <?php echo $params->get('pretext'); ?> + <fieldset class="input"> + <p id="form-login-username"> + <label for="username"> + <?php echo JText::_('Username') ?><br /> + <input name="username" id="username" type="text" class="inputbox" alt="username" size="18" /> + </label> + </p> + <p id="form-login-password"> + <label for="passwd"> + <?php echo JText::_('Password') ?><br /> + <input type="password" name="passwd" id="passwd" class="inputbox" size="18" alt="password" /> + </label> + </p> + <?php if(JPluginHelper::isEnabled('system', 'remember')) : ?> + <p id="form-login-remember"> + <label for="remember"> + <?php echo JText::_('Remember me') ?> + <input type="checkbox" name="remember" id="remember" value="yes" alt="Remember Me" /> + </label> + </p> + <?php endif; ?> + <input type="submit" name="Submit" class="button" value="<?php echo JText::_('LOGIN') ?>" /> + </fieldset> + <ul> + <li> + <a href="<?php echo JRoute::_( 'index.php?option=com_user&view=reset' ); ?>"> + <?php echo JText::_('FORGOT_YOUR_PASSWORD'); ?> + </a> + </li> + <li> + <a href="<?php echo JRoute::_( 'index.php?option=com_user&view=remind' ); ?>"> + <?php echo JText::_('FORGOT_YOUR_USERNAME'); ?> + </a> + </li> + <?php + $usersConfig = &JComponentHelper::getParams( 'com_users' ); + if ($usersConfig->get('allowUserRegistration')) : ?> + <li> + <a href="<?php echo JRoute::_( 'index.php?option=com_user&view=register' ); ?>"> + <?php echo JText::_('REGISTER'); ?> + </a> + </li> + <?php endif; ?> + </ul> + <?php echo $params->get('posttext'); ?> + + <input type="hidden" name="option" value="com_user" /> + <input type="hidden" name="task" value="login" /> + <input type="hidden" name="return" value="<?php echo $return; ?>" /> + <?php echo JHTML::_( 'form.token' ); ?> +</form> +<?php endif; ?> diff --git a/oss/joomla/trunk/templates/ja_purity/html/mod_login/index.html b/oss/joomla/trunk/templates/ja_purity/html/mod_login/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/html/mod_login/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/html/modules.php b/oss/joomla/trunk/templates/ja_purity/html/modules.php new file mode 100644 index 00000000..73929805 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/html/modules.php @@ -0,0 +1,67 @@ +<?php +/** + * @version $Id: modules.php 14401 2010-01-26 14:10:00Z louis $ + * @package Joomla + * @copyright Copyright (C) 2005 - 2010 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('Restricted access'); + +/** + * This is a file to add template specific chrome to module rendering. To use it you would + * set the style attribute for the given module(s) include in your template to use the style + * for each given modChrome function. + * + * eg. To render a module mod_test in the sliders style, you would use the following include: + * <jdoc:include type="module" name="test" style="slider" /> + * + * This gives template designers ultimate control over how modules are rendered. + * + * NOTICE: All chrome wrapping methods should be named: modChrome_{STYLE} and take the same + * two arguments. + */ + +/* + * Module chrome for rendering the module in a slider + */ +function modChrome_slider($module, &$params, &$attribs) +{ + jimport('joomla.html.pane'); + // Initialize variables + $sliders = & JPane::getInstance('sliders'); + $sliders->startPanel( JText::_( $module->title ), 'module' . $module->id ); + echo $module->content; + $sliders->endPanel(); +} + +/* + * Module chrome that allows for rounded corners by wrapping in nested div tags + */ +function modChrome_jarounded($module, &$params, &$attribs) +{ ?> + <div class="jamod module<?php echo $params->get('moduleclass_sfx'); ?>" id="Mod<?php echo $module->id; ?>"> + <div> + <div> + <div> + <?php if ($module->showtitle != 0) : ?> + <?php + if(isset($_COOKIE['Mod'.$module->id])) $modhide = $_COOKIE['Mod'.$module->id]; + else $modhide = 'show'; + ?> + <h3 class="<?php echo $modhide; ?>"><span><?php echo $module->title; ?></span></h3> + <?php endif; ?> + <div class="jamod-content"><?php echo $module->content; ?></div> + </div> + </div> + </div> + </div> + <?php +} +?> diff --git a/oss/joomla/trunk/templates/ja_purity/html/pagination.php b/oss/joomla/trunk/templates/ja_purity/html/pagination.php new file mode 100644 index 00000000..56283608 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/html/pagination.php @@ -0,0 +1,157 @@ +<?php +/** + * @version $Id: pagination.php 14401 2010-01-26 14:10:00Z louis $ + * @package Joomla + * @copyright Copyright (C) 2005 - 2010 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('Restricted access'); + +/** + * This is a file to add template specific chrome to pagination rendering. + * + * pagination_list_footer + * Input variable $list is an array with offsets: + * $list[limit] : int + * $list[limitstart] : int + * $list[total] : int + * $list[limitfield] : string + * $list[pagescounter] : string + * $list[pageslinks] : string + * + * pagination_list_render + * Input variable $list is an array with offsets: + * $list[all] + * [data] : string + * [active] : boolean + * $list[start] + * [data] : string + * [active] : boolean + * $list[previous] + * [data] : string + * [active] : boolean + * $list[next] + * [data] : string + * [active] : boolean + * $list[end] + * [data] : string + * [active] : boolean + * $list[pages] + * [{PAGE}][data] : string + * [{PAGE}][active] : boolean + * + * pagination_item_active + * Input variable $item is an object with fields: + * $item->base : integer + * $item->link : string + * $item->text : string + * + * pagination_item_inactive + * Input variable $item is an object with fields: + * $item->base : integer + * $item->link : string + * $item->text : string + * + * This gives template designers ultimate control over how pagination is rendered. + * + * NOTE: If you override pagination_item_active OR pagination_item_inactive you MUST override them both + */ + +function pagination_list_footer($list) +{ + // Initialize variables + $lang =& JFactory::getLanguage(); + $html = "<div class=\"list-footer\">\n"; + + if ($lang->isRTL()) + { + $html .= "\n<div class=\"counter\">".$list['pagescounter']."</div>"; + $html .= $list['pageslinks']; + $html .= "\n<div class=\"limit\">".JText::_('Display Num').$list['limitfield']."</div>"; + } + else + { + $html .= "\n<div class=\"limit\">".JText::_('Display Num').$list['limitfield']."</div>"; + $html .= $list['pageslinks']; + $html .= "\n<div class=\"counter\">".$list['pagescounter']."</div>"; + } + + $html .= "\n<input type=\"hidden\" name=\"limitstart\" value=\"".$list['limitstart']."\" />"; + $html .= "\n</div>"; + + return $html; +} + +function pagination_list_render($list) +{ + // Initialize variables + $lang =& JFactory::getLanguage(); + $html = "<ul class=\"pagination\">"; + $html .= '<li>«</li>'; + // Reverse output rendering for right-to-left display + if($lang->isRTL()) + { + $html .= $list['start']['data']; + $html .= $list['previous']['data']; + + $list['pages'] = array_reverse( $list['pages'] ); + + foreach( $list['pages'] as $page ) { + if($page['data']['active']) { + // $html .= '<strong>'; + } + + $html .= $page['data']; + + if($page['data']['active']) { + // $html .= '</strong>'; + } + } + + $html .= $list['next']['data']; + $html .= $list['end']['data']; + // $html .= '«'; + } + else + { + $html .= $list['start']['data']; + $html .= $list['previous']['data']; + + foreach( $list['pages'] as $page ) + { + if($page['data']['active']) { + // $html .= '<strong>'; + } + + $html .= $page['data']; + + if($page['data']['active']) { + // $html .= '</strong>'; + } + } + + $html .= $list['next']['data']; + $html .= $list['end']['data']; + // $html .= '«'; + + } + $html .= '<li>»</li>'; + $html .= "</ul>"; + return $html; +} + +function pagination_item_active(&$item) { + return "<li> <strong><a href=\"".$item->link."\" title=\"".$item->text."\">".$item->text."</a></strong> </li>"; +} + +function pagination_item_inactive(&$item) { + return "<li> <span>".$item->text."</span> </li>"; +} +?> diff --git a/oss/joomla/trunk/templates/ja_purity/images/arrow.png b/oss/joomla/trunk/templates/ja_purity/images/arrow.png new file mode 100644 index 00000000..f0f0b3c3 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/arrow.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/arrow2.png b/oss/joomla/trunk/templates/ja_purity/images/arrow2.png new file mode 100644 index 00000000..50e7c26c Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/arrow2.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/arrow3.png b/oss/joomla/trunk/templates/ja_purity/images/arrow3.png new file mode 100644 index 00000000..031c4c01 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/arrow3.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/author.gif b/oss/joomla/trunk/templates/ja_purity/images/author.gif new file mode 100644 index 00000000..9274f527 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/author.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/b-bl.gif b/oss/joomla/trunk/templates/ja_purity/images/b-bl.gif new file mode 100644 index 00000000..c94c3138 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/b-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/b-br.gif b/oss/joomla/trunk/templates/ja_purity/images/b-br.gif new file mode 100644 index 00000000..293af34e Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/b-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/b-tl.gif b/oss/joomla/trunk/templates/ja_purity/images/b-tl.gif new file mode 100644 index 00000000..7efe0ef9 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/b-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/b-tr.gif b/oss/joomla/trunk/templates/ja_purity/images/b-tr.gif new file mode 100644 index 00000000..89b2ca8e Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/b-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bb-bl.gif b/oss/joomla/trunk/templates/ja_purity/images/bb-bl.gif new file mode 100644 index 00000000..23fcef34 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bb-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bb-br.gif b/oss/joomla/trunk/templates/ja_purity/images/bb-br.gif new file mode 100644 index 00000000..8b7f4892 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bb-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bb-tl.gif b/oss/joomla/trunk/templates/ja_purity/images/bb-tl.gif new file mode 100644 index 00000000..f02c96cf Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bb-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bb-tr.gif b/oss/joomla/trunk/templates/ja_purity/images/bb-tr.gif new file mode 100644 index 00000000..65faef76 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bb-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bg-bl.gif b/oss/joomla/trunk/templates/ja_purity/images/bg-bl.gif new file mode 100644 index 00000000..fb921535 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bg-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bg-br.gif b/oss/joomla/trunk/templates/ja_purity/images/bg-br.gif new file mode 100644 index 00000000..3e40d137 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bg-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bg-tl.gif b/oss/joomla/trunk/templates/ja_purity/images/bg-tl.gif new file mode 100644 index 00000000..1fd62de0 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bg-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bg-tr.gif b/oss/joomla/trunk/templates/ja_purity/images/bg-tr.gif new file mode 100644 index 00000000..97d5639e Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bg-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bl-bl.gif b/oss/joomla/trunk/templates/ja_purity/images/bl-bl.gif new file mode 100644 index 00000000..afda43ab Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bl-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bl-br.gif b/oss/joomla/trunk/templates/ja_purity/images/bl-br.gif new file mode 100644 index 00000000..b7470d49 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bl-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bl-tl.gif b/oss/joomla/trunk/templates/ja_purity/images/bl-tl.gif new file mode 100644 index 00000000..b8d15d1b Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bl-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bl-tr.gif b/oss/joomla/trunk/templates/ja_purity/images/bl-tr.gif new file mode 100644 index 00000000..8896bba3 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bl-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/blank.png b/oss/joomla/trunk/templates/ja_purity/images/blank.png new file mode 100644 index 00000000..b67de7c4 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/blank.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/br-bl.gif b/oss/joomla/trunk/templates/ja_purity/images/br-bl.gif new file mode 100644 index 00000000..5dff98cd Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/br-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/br-br.gif b/oss/joomla/trunk/templates/ja_purity/images/br-br.gif new file mode 100644 index 00000000..4ca3ad87 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/br-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/br-tl.gif b/oss/joomla/trunk/templates/ja_purity/images/br-tl.gif new file mode 100644 index 00000000..3d374a08 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/br-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/br-tr.gif b/oss/joomla/trunk/templates/ja_purity/images/br-tr.gif new file mode 100644 index 00000000..ebb6455d Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/br-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bt-bl.gif b/oss/joomla/trunk/templates/ja_purity/images/bt-bl.gif new file mode 100644 index 00000000..60ddbfdd Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bt-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bt-br.gif b/oss/joomla/trunk/templates/ja_purity/images/bt-br.gif new file mode 100644 index 00000000..dd43be0e Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bt-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bt-tl.gif b/oss/joomla/trunk/templates/ja_purity/images/bt-tl.gif new file mode 100644 index 00000000..455566c6 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bt-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bt-tr.gif b/oss/joomla/trunk/templates/ja_purity/images/bt-tr.gif new file mode 100644 index 00000000..d46afa42 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bt-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bub1-bl.gif b/oss/joomla/trunk/templates/ja_purity/images/bub1-bl.gif new file mode 100644 index 00000000..8a26c057 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bub1-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bub1-br.gif b/oss/joomla/trunk/templates/ja_purity/images/bub1-br.gif new file mode 100644 index 00000000..57d38142 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bub1-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bub1-tl.gif b/oss/joomla/trunk/templates/ja_purity/images/bub1-tl.gif new file mode 100644 index 00000000..e2f89efb Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bub1-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bub1-tr.gif b/oss/joomla/trunk/templates/ja_purity/images/bub1-tr.gif new file mode 100644 index 00000000..1c66806f Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bub1-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bub2-bl.gif b/oss/joomla/trunk/templates/ja_purity/images/bub2-bl.gif new file mode 100644 index 00000000..c614a420 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bub2-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bub2-br.gif b/oss/joomla/trunk/templates/ja_purity/images/bub2-br.gif new file mode 100644 index 00000000..8d0135d1 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bub2-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bub2-tl.gif b/oss/joomla/trunk/templates/ja_purity/images/bub2-tl.gif new file mode 100644 index 00000000..6b23fb27 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bub2-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bub2-tr.gif b/oss/joomla/trunk/templates/ja_purity/images/bub2-tr.gif new file mode 100644 index 00000000..5bc266a4 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bub2-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bub3-bl.gif b/oss/joomla/trunk/templates/ja_purity/images/bub3-bl.gif new file mode 100644 index 00000000..ed29b237 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bub3-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bub3-br.gif b/oss/joomla/trunk/templates/ja_purity/images/bub3-br.gif new file mode 100644 index 00000000..e6ef4471 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bub3-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bub3-tl.gif b/oss/joomla/trunk/templates/ja_purity/images/bub3-tl.gif new file mode 100644 index 00000000..e2f89efb Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bub3-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bub3-tr.gif b/oss/joomla/trunk/templates/ja_purity/images/bub3-tr.gif new file mode 100644 index 00000000..1c66806f Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bub3-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bub4-bl.gif b/oss/joomla/trunk/templates/ja_purity/images/bub4-bl.gif new file mode 100644 index 00000000..0465cb17 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bub4-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bub4-br.gif b/oss/joomla/trunk/templates/ja_purity/images/bub4-br.gif new file mode 100644 index 00000000..34b858cd Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bub4-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bub4-tl.gif b/oss/joomla/trunk/templates/ja_purity/images/bub4-tl.gif new file mode 100644 index 00000000..6b23fb27 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bub4-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bub4-tr.gif b/oss/joomla/trunk/templates/ja_purity/images/bub4-tr.gif new file mode 100644 index 00000000..5bc266a4 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bub4-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bullet-list.gif b/oss/joomla/trunk/templates/ja_purity/images/bullet-list.gif new file mode 100644 index 00000000..359f124b Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bullet-list.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bullet.gif b/oss/joomla/trunk/templates/ja_purity/images/bullet.gif new file mode 100644 index 00000000..359f124b Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bullet.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bullet2.gif b/oss/joomla/trunk/templates/ja_purity/images/bullet2.gif new file mode 100644 index 00000000..3d3d8f6f Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bullet2.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/bullet3.gif b/oss/joomla/trunk/templates/ja_purity/images/bullet3.gif new file mode 100644 index 00000000..4d6bdb2e Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/bullet3.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/but-css.gif b/oss/joomla/trunk/templates/ja_purity/images/but-css.gif new file mode 100644 index 00000000..8f4efc6f Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/but-css.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/but-rss.gif b/oss/joomla/trunk/templates/ja_purity/images/but-rss.gif new file mode 100644 index 00000000..419c6a99 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/but-rss.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/but-xhtml10.gif b/oss/joomla/trunk/templates/ja_purity/images/but-xhtml10.gif new file mode 100644 index 00000000..7ea1bb7c Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/but-xhtml10.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/but-xhtml101.gif b/oss/joomla/trunk/templates/ja_purity/images/but-xhtml101.gif new file mode 100644 index 00000000..99ce4d0c Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/but-xhtml101.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/c-bg1.gif b/oss/joomla/trunk/templates/ja_purity/images/c-bg1.gif new file mode 100644 index 00000000..e40407c9 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/c-bg1.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/c-bg2.gif b/oss/joomla/trunk/templates/ja_purity/images/c-bg2.gif new file mode 100644 index 00000000..487a4f17 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/c-bg2.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/checklist-bg.gif b/oss/joomla/trunk/templates/ja_purity/images/checklist-bg.gif new file mode 100644 index 00000000..9e1e6eca Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/checklist-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/cw-bg1.gif b/oss/joomla/trunk/templates/ja_purity/images/cw-bg1.gif new file mode 100644 index 00000000..1d58c91b Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/cw-bg1.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/cw-bg12.gif b/oss/joomla/trunk/templates/ja_purity/images/cw-bg12.gif new file mode 100644 index 00000000..457d2834 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/cw-bg12.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/cw-bg2.gif b/oss/joomla/trunk/templates/ja_purity/images/cw-bg2.gif new file mode 100644 index 00000000..4c64ad1b Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/cw-bg2.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/cw-bg22.gif b/oss/joomla/trunk/templates/ja_purity/images/cw-bg22.gif new file mode 100644 index 00000000..62d8846e Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/cw-bg22.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/cwf-bg.gif b/oss/joomla/trunk/templates/ja_purity/images/cwf-bg.gif new file mode 100644 index 00000000..8ccc2cb6 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/cwf-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/download-bg.gif b/oss/joomla/trunk/templates/ja_purity/images/download-bg.gif new file mode 100644 index 00000000..617e6635 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/download-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/emailButton.png b/oss/joomla/trunk/templates/ja_purity/images/emailButton.png new file mode 100644 index 00000000..f2a99bbb Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/emailButton.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/grad1.gif b/oss/joomla/trunk/templates/ja_purity/images/grad1.gif new file mode 100644 index 00000000..d78b45d1 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/grad1.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/grad2.gif b/oss/joomla/trunk/templates/ja_purity/images/grad2.gif new file mode 100644 index 00000000..0176c2e9 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/grad2.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/grad3.gif b/oss/joomla/trunk/templates/ja_purity/images/grad3.gif new file mode 100644 index 00000000..a90a7ec1 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/grad3.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/hdot.gif b/oss/joomla/trunk/templates/ja_purity/images/hdot.gif new file mode 100644 index 00000000..20246aac Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/hdot.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/hdot2.gif b/oss/joomla/trunk/templates/ja_purity/images/hdot2.gif new file mode 100644 index 00000000..b99f4ba0 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/hdot2.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/header-mask.png b/oss/joomla/trunk/templates/ja_purity/images/header-mask.png new file mode 100644 index 00000000..3f557bb5 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/header-mask.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/header/header1.jpg b/oss/joomla/trunk/templates/ja_purity/images/header/header1.jpg new file mode 100644 index 00000000..81217a3f Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/header/header1.jpg differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/header/header2.jpg b/oss/joomla/trunk/templates/ja_purity/images/header/header2.jpg new file mode 100644 index 00000000..f9e448d6 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/header/header2.jpg differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/header/header3.jpg b/oss/joomla/trunk/templates/ja_purity/images/header/header3.jpg new file mode 100644 index 00000000..b3af049b Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/header/header3.jpg differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/icon-date.gif b/oss/joomla/trunk/templates/ja_purity/images/icon-date.gif new file mode 100644 index 00000000..169493b1 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/icon-date.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/icon-error.gif b/oss/joomla/trunk/templates/ja_purity/images/icon-error.gif new file mode 100644 index 00000000..e7c14463 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/icon-error.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/icon-info.gif b/oss/joomla/trunk/templates/ja_purity/images/icon-info.gif new file mode 100644 index 00000000..02c5b2e5 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/icon-info.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/icon-search.gif b/oss/joomla/trunk/templates/ja_purity/images/icon-search.gif new file mode 100644 index 00000000..276c858f Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/icon-search.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/icon-tips.gif b/oss/joomla/trunk/templates/ja_purity/images/icon-tips.gif new file mode 100644 index 00000000..1a677d1b Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/icon-tips.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/icon-user.gif b/oss/joomla/trunk/templates/ja_purity/images/icon-user.gif new file mode 100644 index 00000000..a2e4e510 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/icon-user.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/icon_list.gif b/oss/joomla/trunk/templates/ja_purity/images/icon_list.gif new file mode 100644 index 00000000..a9395051 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/icon_list.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/icons_license.txt b/oss/joomla/trunk/templates/ja_purity/images/icons_license.txt new file mode 100644 index 00000000..400a64d7 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/images/icons_license.txt @@ -0,0 +1,22 @@ +Silk icon set 1.3 + +_________________________________________ +Mark James +http://www.famfamfam.com/lab/icons/silk/ +_________________________________________ + +This work is licensed under a +Creative Commons Attribution 2.5 License. +[ http://creativecommons.org/licenses/by/2.5/ ] + +This means you may use it for any purpose, +and make any changes you like. +All I ask is that you include a link back +to this page in your credits. + +Are you using this icon set? Send me an email +(including a link or picture if available) to +mjames@gmail.com + +Any other questions about this icon set please +contact mjames@gmail.com \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/images/indent1.png b/oss/joomla/trunk/templates/ja_purity/images/indent1.png new file mode 100644 index 00000000..cb9fd6b4 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/indent1.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/indent2.png b/oss/joomla/trunk/templates/ja_purity/images/indent2.png new file mode 100644 index 00000000..00c96328 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/indent2.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/indent3.png b/oss/joomla/trunk/templates/ja_purity/images/indent3.png new file mode 100644 index 00000000..9332e783 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/indent3.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/indent4.png b/oss/joomla/trunk/templates/ja_purity/images/indent4.png new file mode 100644 index 00000000..97838e99 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/indent4.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/index.html b/oss/joomla/trunk/templates/ja_purity/images/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/images/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/images/login-bg.gif b/oss/joomla/trunk/templates/ja_purity/images/login-bg.gif new file mode 100644 index 00000000..cde836c8 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/login-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/logo.gif b/oss/joomla/trunk/templates/ja_purity/images/logo.gif new file mode 100644 index 00000000..931f3544 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/logo.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/logo.png b/oss/joomla/trunk/templates/ja_purity/images/logo.png new file mode 100644 index 00000000..08c0358b Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/logo.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/ol-bg.gif b/oss/joomla/trunk/templates/ja_purity/images/ol-bg.gif new file mode 100644 index 00000000..9b601390 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/ol-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/opaque.png b/oss/joomla/trunk/templates/ja_purity/images/opaque.png new file mode 100644 index 00000000..2512ffc5 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/opaque.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/pages.gif b/oss/joomla/trunk/templates/ja_purity/images/pages.gif new file mode 100644 index 00000000..aa6abae2 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/pages.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/pdf_button.png b/oss/joomla/trunk/templates/ja_purity/images/pdf_button.png new file mode 100644 index 00000000..9be891f5 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/pdf_button.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/printButton.png b/oss/joomla/trunk/templates/ja_purity/images/printButton.png new file mode 100644 index 00000000..f0b5ecea Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/printButton.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/arrow.png b/oss/joomla/trunk/templates/ja_purity/images/rtl/arrow.png new file mode 100644 index 00000000..eb0a57e3 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/arrow.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/bub12-bl.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub12-bl.gif new file mode 100644 index 00000000..ba405e6f Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub12-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/bub12-br.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub12-br.gif new file mode 100644 index 00000000..83ea4327 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub12-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/bub12-tl.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub12-tl.gif new file mode 100644 index 00000000..fe0dcfc0 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub12-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/bub12-tr.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub12-tr.gif new file mode 100644 index 00000000..021f6258 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub12-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/bub22-bl.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub22-bl.gif new file mode 100644 index 00000000..9792d234 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub22-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/bub22-br.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub22-br.gif new file mode 100644 index 00000000..475f647a Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub22-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/bub22-tl.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub22-tl.gif new file mode 100644 index 00000000..6f46db5a Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub22-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/bub22-tr.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub22-tr.gif new file mode 100644 index 00000000..55257ae9 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub22-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/bub32-bl.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub32-bl.gif new file mode 100644 index 00000000..610b2fb3 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub32-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/bub32-br.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub32-br.gif new file mode 100644 index 00000000..b2fef198 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub32-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/bub32-tl.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub32-tl.gif new file mode 100644 index 00000000..fe0dcfc0 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub32-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/bub32-tr.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub32-tr.gif new file mode 100644 index 00000000..021f6258 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub32-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/bub42-bl.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub42-bl.gif new file mode 100644 index 00000000..acda25ce Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub42-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/bub42-br.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub42-br.gif new file mode 100644 index 00000000..e85b3d8b Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub42-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/bub42-tl.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub42-tl.gif new file mode 100644 index 00000000..6f46db5a Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub42-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/bub42-tr.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub42-tr.gif new file mode 100644 index 00000000..55257ae9 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/bub42-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/c-bg1.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/c-bg1.gif new file mode 100644 index 00000000..8400fb1c Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/c-bg1.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/c-bg2.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/c-bg2.gif new file mode 100644 index 00000000..fda9e372 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/c-bg2.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/cw-bg1.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/cw-bg1.gif new file mode 100644 index 00000000..d3918dbb Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/cw-bg1.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/cw-bg12.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/cw-bg12.gif new file mode 100644 index 00000000..2abcce92 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/cw-bg12.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/cw-bg122.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/cw-bg122.gif new file mode 100644 index 00000000..af4d3316 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/cw-bg122.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/cw-bg2.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/cw-bg2.gif new file mode 100644 index 00000000..7b748167 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/cw-bg2.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/rtl/cw-bg22.gif b/oss/joomla/trunk/templates/ja_purity/images/rtl/cw-bg22.gif new file mode 100644 index 00000000..66f2deb2 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/rtl/cw-bg22.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/sc-q.gif b/oss/joomla/trunk/templates/ja_purity/images/sc-q.gif new file mode 100644 index 00000000..314d730e Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/sc-q.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/so-q.gif b/oss/joomla/trunk/templates/ja_purity/images/so-q.gif new file mode 100644 index 00000000..e41ff147 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/so-q.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/spacer.png b/oss/joomla/trunk/templates/ja_purity/images/spacer.png new file mode 100644 index 00000000..b91e00da Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/spacer.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/star-bg.gif b/oss/joomla/trunk/templates/ja_purity/images/star-bg.gif new file mode 100644 index 00000000..6e573c5f Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/star-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/sticky-bg.gif b/oss/joomla/trunk/templates/ja_purity/images/sticky-bg.gif new file mode 100644 index 00000000..084a7188 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/sticky-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/trans-bg.png b/oss/joomla/trunk/templates/ja_purity/images/trans-bg.png new file mode 100644 index 00000000..af3f549a Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/trans-bg.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/trans.gif b/oss/joomla/trunk/templates/ja_purity/images/trans.gif new file mode 100644 index 00000000..c7bee69b Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/trans.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/user-decrease.png b/oss/joomla/trunk/templates/ja_purity/images/user-decrease.png new file mode 100644 index 00000000..ae0c83b9 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/user-decrease.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/user-increase.png b/oss/joomla/trunk/templates/ja_purity/images/user-increase.png new file mode 100644 index 00000000..70dd09e4 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/user-increase.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/user-reset.png b/oss/joomla/trunk/templates/ja_purity/images/user-reset.png new file mode 100644 index 00000000..d1310d6c Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/user-reset.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/vdot.gif b/oss/joomla/trunk/templates/ja_purity/images/vdot.gif new file mode 100644 index 00000000..ea364b0a Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/vdot.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/images/vdot2.gif b/oss/joomla/trunk/templates/ja_purity/images/vdot2.gif new file mode 100644 index 00000000..978c2e60 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/images/vdot2.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/index.html b/oss/joomla/trunk/templates/ja_purity/index.html new file mode 100644 index 00000000..f1ba3766 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/index.html @@ -0,0 +1,7 @@ +<!----------------------------------------- + + YUCHENG HU (C) [http://www.hawebs.net] + + + + + + [huyuchengus@gmail.com] + + + [yuchenghu@hawebs.net] + + -----------------------------------------> +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/index.php b/oss/joomla/trunk/templates/ja_purity/index.php new file mode 100644 index 00000000..afc75d79 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/index.php @@ -0,0 +1,278 @@ +<?php +/** + * @copyright Copyright (C) 2005 - 2010 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( 'Restricted access' ); + +include_once (dirname(__FILE__).DS.'/ja_vars.php'); + +?> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>"> + +<head> +<jdoc:include type="head" /> +<?php JHTML::_('behavior.mootools'); ?> + +<link rel="stylesheet" href="<?php echo $tmpTools->baseurl(); ?>templates/system/css/system.css" type="text/css" /> +<link rel="stylesheet" href="<?php echo $tmpTools->baseurl(); ?>templates/system/css/general.css" type="text/css" /> +<link rel="stylesheet" href="<?php echo $tmpTools->templateurl(); ?>/css/template.css" type="text/css" /> + +<script language="javascript" type="text/javascript" src="<?php echo $tmpTools->templateurl(); ?>/js/ja.script.js"></script> + +<?php if ($tmpTools->getParam('rightCollapsible')): ?> +<script language="javascript" type="text/javascript"> +var rightCollapseDefault='<?php echo $tmpTools->getParam('rightCollapseDefault'); ?>'; +var excludeModules='<?php echo $tmpTools->getParam('excludeModules'); ?>'; +</script> +<script language="javascript" type="text/javascript" src="<?php echo $tmpTools->templateurl(); ?>/js/ja.rightcol.js"></script> +<?php endif; ?> + +<?php if($this->direction == 'rtl') : ?> +<link rel="stylesheet" href="<?php echo $tmpTools->templateurl(); ?>/css/template_rtl.css" type="text/css" /> +<?php else : ?> +<link rel="stylesheet" href="<?php echo $tmpTools->templateurl(); ?>/css/menu.css" type="text/css" /> +<?php endif; ?> + +<?php if ($this->countModules('hornav')): ?> +<?php if ($tmpTools->getParam('horNavType') == 'css'): ?> +<link rel="stylesheet" href="<?php echo $tmpTools->templateurl(); ?>/css/ja-sosdmenu.css" type="text/css" /> +<script language="javascript" type="text/javascript" src="<?php echo $tmpTools->templateurl(); ?>/js/ja.cssmenu.js"></script> +<?php else: ?> +<link rel="stylesheet" href="<?php echo $tmpTools->templateurl(); ?>/css/ja-sosdmenu.css" type="text/css" /> +<script language="javascript" type="text/javascript" src="<?php echo $tmpTools->templateurl(); ?>/js/ja.moomenu.js"></script> +<?php endif; ?> +<?php endif; ?> + +<?php if ($tmpTools->getParam('theme_header') && $tmpTools->getParam('theme_header')!='-1') : ?> +<link rel="stylesheet" href="<?php echo $tmpTools->templateurl(); ?>/styles/header/<?php echo $tmpTools->getParam('theme_header'); ?>/style.css" type="text/css" /> +<?php endif; ?> +<?php if ($tmpTools->getParam('theme_background') && $tmpTools->getParam('theme_background')!='-1') : ?> +<link rel="stylesheet" href="<?php echo $tmpTools->templateurl(); ?>/styles/background/<?php echo $tmpTools->getParam('theme_background'); ?>/style.css" type="text/css" /> +<?php endif; ?> +<?php if ($tmpTools->getParam('theme_elements') && $tmpTools->getParam('theme_elements')!='-1') : ?> +<link rel="stylesheet" href="<?php echo $tmpTools->templateurl(); ?>/styles/elements/<?php echo $tmpTools->getParam('theme_elements'); ?>/style.css" type="text/css" /> +<?php endif; ?> + +<!--[if IE 7.0]> +<style type="text/css"> +.clearfix {display: inline-block;} +</style> +<![endif]--> +<?php if ($tmpTools->isIE6()): ?> +<!--[if lte IE 6]> +<script type="text/javascript"> +var siteurl = '<?php echo $tmpTools->baseurl();?>'; + +window.addEvent ('load', makeTransBG); +function makeTransBG() { + fixIEPNG($E('.ja-headermask'), '', '', 1); + fixIEPNG($E('h1.logo a')); + fixIEPNG($$('img')); + fixIEPNG ($$('#ja-mainnav ul.menu li ul'), '', 'scale', 0, 2); +} +</script> +<style type="text/css"> +.ja-headermask, h1.logo a, #ja-cssmenu li ul { background-position: -1000px; } +#ja-cssmenu li ul li, #ja-cssmenu li a { background:transparent url(<?php echo $tmpTools->templateurl(); ?>/images/blank.png) no-repeat right;} +.clearfix {height: 1%;} +</style> +<![endif]--> +<?php endif; ?> + +<style type="text/css"> +#ja-header,#ja-mainnav,#ja-container,#ja-botsl,#ja-footer {width: <?php echo $tmpWidth; ?>;margin: 0 auto;} +#ja-wrapper {min-width: <?php echo $tmpWrapMin; ?>;} +</style> +</head> + +<body id="bd" class="fs<?php echo $tmpTools->getParam(JA_TOOL_FONT);?> <?php echo $tmpTools->browser();?>" > +<a name="Top" id="Top"></a> +<ul class="accessibility"> + <li><a href="#ja-content" title="<?php echo JText::_("Skip to content");?>"><?php echo JText::_("Skip to content");?></a></li> + <li><a href="#ja-mainnav" title="<?php echo JText::_("Skip to main navigation");?>"><?php echo JText::_("Skip to main navigation");?></a></li> + <li><a href="#ja-col1" title="<?php echo JText::_("Skip to 1st column");?>"><?php echo JText::_("Skip to 1st column");?></a></li> + <li><a href="#ja-col2" title="<?php echo JText::_("Skip to 2nd column");?>"><?php echo JText::_("Skip to 2nd column");?></a></li> +</ul> + +<div id="ja-wrapper"> + +<!-- BEGIN: HEADER --> +<div id="ja-headerwrap"> + <div id="ja-header" class="clearfix" style="background: url(<?php echo $tmpTools->templateurl(); ?>/images/header/<?php echo $tmpTools->getRandomImage(dirname(__FILE__).DS.'images/header'); ?>) no-repeat top <?php if($this->direction == 'rtl') echo 'left'; else echo 'right';?>;"> + + <div class="ja-headermask"> </div> + + <?php + $siteName = $tmpTools->sitename(); + if ($tmpTools->getParam('logoType')=='image'): ?> + <h1 class="logo"> + <a href="index.php" title="<?php echo $siteName; ?>"><span><?php echo $siteName; ?></span></a> + </h1> + <?php else: + $logoText = (trim($tmpTools->getParam('logoText'))=='') ? $config->sitename : $tmpTools->getParam('logoText'); + $sloganText = (trim($tmpTools->getParam('sloganText'))=='') ? JText::_('SITE SLOGAN') : $tmpTools->getParam('sloganText'); ?> + <h1 class="logo-text"> + <a href="index.php" title="<?php echo $siteName; ?>"><span><?php echo $logoText; ?></span></a> + </h1> + <p class="site-slogan"><?php echo $sloganText;?></p> + <?php endif; ?> + + <?php $tmpTools->genToolMenu(JA_TOOL_FONT, 'png'); ?> + + <?php if($this->countModules('user4')) : ?> + <div id="ja-search"> + <jdoc:include type="modules" name="user4" /> + </div> + <?php endif; ?> + + </div> +</div> +<!-- END: HEADER --> + +<!-- BEGIN: MAIN NAVIGATION --> +<?php if ($this->countModules('hornav')): ?> +<div id="ja-mainnavwrap"> + <div id="ja-mainnav" class="clearfix"> + <jdoc:include type="modules" name="hornav" /> + </div> +</div> +<?php endif; ?> +<!-- END: MAIN NAVIGATION --> + +<div id="ja-containerwrap<?php echo $divid; ?>"> +<div id="ja-containerwrap2"> + <div id="ja-container"> + <div id="ja-container2" class="clearfix"> + + <div id="ja-mainbody<?php echo $divid; ?>" class="clearfix"> + + <!-- BEGIN: CONTENT --> + <div id="ja-contentwrap"> + <div id="ja-content"> + + <jdoc:include type="message" /> + + <?php if(!$tmpTools->isFrontPage()) : ?> + <div id="ja-pathway"> + <jdoc:include type="module" name="breadcrumbs" /> + </div> + <?php endif ; ?> + + <jdoc:include type="component" /> + + <?php if($this->countModules('banner')) : ?> + <div id="ja-banner"> + <jdoc:include type="modules" name="banner" /> + </div> + <?php endif; ?> + + </div> + </div> + <!-- END: CONTENT --> + + <?php if ($this->countModules('left')): ?> + <!-- BEGIN: LEFT COLUMN --> + <div id="ja-col1"> + <jdoc:include type="modules" name="left" style="xhtml" /> + </div><br /> + <!-- END: LEFT COLUMN --> + <?php endif; ?> + + </div> + + <?php if ($this->countModules('right')): ?> + <!-- BEGIN: RIGHT COLUMN --> + <div id="ja-col2"> + <jdoc:include type="modules" name="right" style="jarounded" /> + </div><br /> + <!-- END: RIGHT COLUMN --> + <?php endif; ?> + + </div> + </div> +</div> +</div> + +<?php +$spotlight = array ('user1','user2','top','user5'); +$botsl = $tmpTools->calSpotlight ($spotlight,99,22); +if( $botsl ) : +?> +<!-- BEGIN: BOTTOM SPOTLIGHT --> +<div id="ja-botslwrap"> + <div id="ja-botsl" class="clearfix"> + + <?php if( $this->countModules('user1') ): ?> + <div class="ja-box<?php echo $botsl['user1']['class']; ?>" style="width: <?php echo $botsl['user1']['width']; ?>;"> + <jdoc:include type="modules" name="user1" style="xhtml" /> + </div> + <?php endif; ?> + + <?php if( $this->countModules('user2') ): ?> + <div class="ja-box<?php echo $botsl['user2']['class']; ?>" style="width: <?php echo $botsl['user2']['width']; ?>;"> + <jdoc:include type="modules" name="user2" style="xhtml" /> + </div> + <?php endif; ?> + + <?php if( $this->countModules('top') ): ?> + <div class="ja-box<?php echo $botsl['top']['class']; ?>" style="width: <?php echo $botsl['top']['width']; ?>;"> + <jdoc:include type="modules" name="top" style="xhtml" /> + </div> + <?php endif; ?> + + <?php if( $this->countModules('user5') ): ?> + <div class="ja-box<?php echo $botsl['user5']['class']; ?>" style="width: <?php echo $botsl['user5']['width']; ?>;"> + <jdoc:include type="modules" name="user5" style="xhtml" /> + </div> + <?php endif; ?> + + </div> +</div> +<!-- END: BOTTOM SPOTLIGHT --> +<?php endif; ?> + +<!-- BEGIN: FOOTER --> +<div id="ja-footerwrap"> +<div id="ja-footer" class="clearfix"> + + <div id="ja-footnav"> + <jdoc:include type="modules" name="user3" /> + </div> + + <div class="copyright"> + <jdoc:include type="modules" name="footer" /> + </div> + + <div class="ja-cert"> + <jdoc:include type="modules" name="syndicate" /> + <a href="http://jigsaw.w3.org/css-validator/check/referer" target="_blank" title="<?php echo JText::_("CSS Validity");?>" style="text-decoration: none;"> + <img src="<?php echo $tmpTools->templateurl(); ?>/images/but-css.gif" border="none" alt="<?php echo JText::_("CSS Validity");?>" /> + </a> + <a href="http://validator.w3.org/check/referer" target="_blank" title="<?php echo JText::_("XHTML Validity");?>" style="text-decoration: none;"> + <img src="<?php echo $tmpTools->templateurl(); ?>/images/but-xhtml10.gif" border="none" alt="<?php echo JText::_("XHTML Validity");?>" /> + </a> + </div> + + <br /> +</div> +</div> +<!-- END: FOOTER --> + +</div> + +<jdoc:include type="modules" name="debug" /> + +</body> + +</html> diff --git a/oss/joomla/trunk/templates/ja_purity/ja_templatetools.php b/oss/joomla/trunk/templates/ja_purity/ja_templatetools.php new file mode 100644 index 00000000..9020017b --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/ja_templatetools.php @@ -0,0 +1,240 @@ +<?php +define ('JA_TOOL_COLOR', 'ja_color'); +define ('JA_TOOL_SCREEN', 'ja_screen'); +define ('JA_TOOL_FONT', 'ja_font'); +define ('JA_TOOL_MENU', 'ja_menu'); + +class JA_Tools { + var $_params_cookie = null; //Params will store in cookie for user select. Default: store all params + var $_tpl = null; + var $template = ''; + + function JA_Tools ($template, $_params_cookie=null) { + $this->_tpl = $template; + $this->template = $template->template; + + if(!$_params_cookie) { + $this->_params_cookie = $this->_tpl->params->toArray(); + } else { + foreach ($_params_cookie as $k) { + $this->_params_cookie[$k] = $this->_tpl->params->get($k); + } + } + + $this->getUserSetting(); + } + + function getUserSetting(){ + $exp = time() + 60*60*24*355; + if (isset($_COOKIE[$this->template.'_tpl']) && $_COOKIE[$this->template.'_tpl'] == $this->template){ + foreach($this->_params_cookie as $k=>$v) { + $kc = $this->template."_".$k; + if (JRequest::getVar($k, null, 'GET') !== null) { + $v = preg_replace('/[\x00-\x1F\x7F<>;\/\"\'%()]/', '', JRequest::getString($k, '', 'GET')); + setcookie ($kc, $v, $exp, '/'); + }else{ + if (isset($_COOKIE[$kc])){ + $v = $_COOKIE[$kc]; + } + } + $this->setParam($k, $v); + } + + }else{ + setcookie ($this->template.'_tpl', $this->template, $exp, '/'); + } + return $this; + } + + function getParam ($param, $default='') { + if (isset($this->_params_cookie[$param])) { + return preg_replace('/[\x00-\x1F\x7F<>;\/\"\'%()]/', '', $this->_params_cookie[$param]); + } + return preg_replace('/[\x00-\x1F\x7F<>;\/\"\'%()]/', '', $this->_tpl->params->get($param, $default)); + } + + function setParam ($param, $value) { + $this->_params_cookie[$param] = $value; + } + + function getCurrentURL(){ + $cururl = JRequest::getURI(); + if(($pos = strpos($cururl, "index.php"))!== false){ + $cururl = substr($cururl,$pos); + } + $cururl = JRoute::_($cururl, true, 0); + return $cururl; + } + + function genToolMenu($_array_tools=null, $imgext = 'gif'){ + if(!is_array($_array_tools)) $_array_tools = array($_array_tools); + if(!$_array_tools) $_array_tools = array_keys($this->_params_cookie); + if (in_array(JA_TOOL_FONT, $_array_tools)){//show font tools + ?> + <ul class="ja-usertools-font"> + <li><img style="cursor: pointer;" title="<?php echo JText::_('Increase font size');?>" src="<?php echo $this->templateurl();?>/images/user-increase.<?php echo $imgext;?>" alt="<?php echo JText::_('Increase font size');?>" id="ja-tool-increase" onclick="switchFontSize('<?php echo $this->template."_".JA_TOOL_FONT;?>','inc'); return false;" /></li> + <li><img style="cursor: pointer;" title="<?php echo JText::_('Default font size');?>" src="<?php echo $this->templateurl();?>/images/user-reset.<?php echo $imgext;?>" alt="<?php echo JText::_('Default font size');?>" id="ja-tool-reset" onclick="switchFontSize('<?php echo $this->template."_".JA_TOOL_FONT;?>',<?php echo $this->_tpl->params->get(JA_TOOL_FONT);?>); return false;" /></li> + <li><img style="cursor: pointer;" title="<?php echo JText::_('Decrease font size');?>" src="<?php echo $this->templateurl();?>/images/user-decrease.<?php echo $imgext;?>" alt="<?php echo JText::_('Decrease font size');?>" id="ja-tool-decrease" onclick="switchFontSize('<?php echo $this->template."_".JA_TOOL_FONT;?>','dec'); return false;" /></li> + </ul> + <script type="text/javascript">var CurrentFontSize=parseInt('<?php echo $this->getParam(JA_TOOL_FONT);?>');</script> + <?php + } + } + + function getCurrentMenuIndex(){ + $Itemid = JRequest::getInt( 'Itemid'); + $database =& JFactory::getDBO(); + $id = $Itemid; + $menutype = 'mainmenu'; + $ordering = '0'; + while (1){ + $sql = "select parent, menutype, ordering from #__menu where id = $id limit 1"; + $database->setQuery($sql); + $row = null; + $row = $database->loadObject(); + if ($row) { + $menutype = $row->menutype; + $ordering = $row->ordering; + if ($row->parent > 0) + { + $id = $row->parent; + }else break; + }else break; + } + + $user =& JFactory::getUser(); + if (isset($user)) + { + $aid = $user->get('aid', 0); + $sql = "SELECT count(*) FROM #__menu AS m" + . "\nWHERE menutype='". $menutype ."' AND published='1' AND access <= '$aid' AND parent=0 and ordering < $ordering"; + } else { + $sql = "SELECT count(*) FROM #__menu AS m" + . "\nWHERE menutype='". $menutype ."' AND published='1' AND parent=0 and ordering < $ordering"; + } + $database->setQuery($sql); + + return $database->loadResult(); + } + + function calSpotlight ($spotlight, $totalwidth=100, $firstwidth=0) { + + /******************************************** + $spotlight = array ('position1', 'position2',...) + *********************************************/ + $modules = array(); + $modules_s = array(); + foreach ($spotlight as $position) { + if( $this->_tpl->countModules ($position) ){ + $modules_s[] = $position; + } + $modules[$position] = array('class'=>'-full', 'width'=>$totalwidth); + } + + if (!count($modules_s)) return null; + + if ($firstwidth) { + if (count($modules_s)>1) { + $width = round(($totalwidth-$firstwidth)/(count($modules_s)-1),1) . "%"; + $firstwidth = $firstwidth . "%"; + }else{ + $firstwidth = $totalwidth . "%"; + } + }else{ + $width = round($totalwidth/(count($modules_s)),1) . "%"; + $firstwidth = $width; + } + + if (count ($modules_s) > 1){ + $modules[$modules_s[0]]['class'] = "-left"; + $modules[$modules_s[0]]['width'] = $firstwidth; + $modules[$modules_s[count ($modules_s) - 1]]['class'] = "-right"; + $modules[$modules_s[count ($modules_s) - 1]]['width'] = $width; + for ($i=1; $i<count ($modules_s) - 1; $i++){ + $modules[$modules_s[$i]]['class'] = "-center"; + $modules[$modules_s[$i]]['width'] = $width; + } + } + return $modules; + } + + function isIE6 () { + return $this->browser() == 'IE6'; + } + + function baseurl(){ + return JURI::base(); + } + + function templateurl(){ + return JURI::base()."templates/".$this->template; + } + + function getRandomImage ($img_folder) { + $imglist=array(); + + mt_srand((double)microtime()*1000); + + //use the directory class + $imgs = dir($img_folder); + + //read all files from the directory, checks if are images and ads them to a list (see below how to display flash banners) + while ($file = $imgs->read()) { + if (preg_match("#gif#i", $file) || preg_match("#jpg#i", $file) || preg_match("#png#i", $file)) + $imglist[] = $file; + } + closedir($imgs->handle); + + if(!count($imglist)) return ''; + + //generate a random number between 0 and the number of images + $random = mt_rand(0, count($imglist)-1); + $image = $imglist[$random]; + + return $image; + } + + function isFrontPage(){ + return (JRequest::getCmd( 'view' ) == 'frontpage') ; + } + + function sitename() { + $config = new JConfig(); + return $config->sitename; + } + + function browser () { + $agent = $_SERVER['HTTP_USER_AGENT']; + if ( strpos($agent, 'Gecko') ) + { + if ( strpos($agent, 'Netscape') ) + { + $browser = 'NS'; + } + else if ( strpos($agent, 'Firefox') ) + { + $browser = 'FF'; + } + else + { + $browser = 'Moz'; + } + } + else if ( strpos($agent, 'MSIE') && !preg_match('/opera/i',$agent) ) + { + $msie='/msie\s(7\.[0-9]).*(win)/i'; + if (preg_match($msie,$agent)) $browser = 'IE7'; + else $browser = 'IE6'; + } + else if ( preg_match('/opera/i',$agent) ) + { + $browser = 'OPE'; + } + else + { + $browser = 'Others'; + } + return $browser; + } +} +?> diff --git a/oss/joomla/trunk/templates/ja_purity/ja_vars.php b/oss/joomla/trunk/templates/ja_purity/ja_vars.php new file mode 100644 index 00000000..16eb4209 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/ja_vars.php @@ -0,0 +1,59 @@ +<?php +/** + * @copyright Copyright (C) 2005 - 2010 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( 'Restricted access' ); + +include_once (dirname(__FILE__).DS.'/ja_templatetools.php'); + +$tmpTools = new JA_Tools($this); + +# Auto Collapse Divs Functions ########## +$ja_left = $this->countModules('left') || ($tmpTools->getParam(JA_TOOL_MENU) == 1); +$ja_right = $this->countModules('right'); + +if ( $ja_left && $ja_right ) { + $divid = ''; + } elseif ( $ja_left ) { + $divid = '-fr'; + } elseif ( $ja_right ) { + $divid = '-fl'; + } else { + $divid = '-f'; +} + +$curidx = $tmpTools->getCurrentMenuIndex(); +//if ($curidx) $curidx--; + +//Calculate the width of template +$tmpWidth = ''; +$tmpWrapMin = '100%'; +switch ($tmpTools->getParam(JA_TOOL_SCREEN)){ + case 'auto': + $tmpWidth = '97%'; + break; + case 'fluid': + $tmpWidth = intval($tmpTools->getParam('ja_screen_width')); + $tmpWidth = $tmpWidth ? $tmpWidth.'%' : '90%'; + break; + case 'fix': + $tmpWidth = intval($tmpTools->getParam('ja_screen_width')); + $tmpWrapMin = $tmpWidth ? ($tmpWidth+1).'px' : '751px'; + $tmpWidth = $tmpWidth ? $tmpWidth.'px' : '750px'; + break; + default: + $tmpWidth = intval($tmpTools->getParam(JA_TOOL_SCREEN)); + $tmpWrapMin = $tmpWidth ? ($tmpWidth+1).'px' : '751px'; + $tmpWidth = $tmpWidth ? $tmpWidth.'px' : '750px'; + break; +} + +?> diff --git a/oss/joomla/trunk/templates/ja_purity/js/ja.cssmenu.js b/oss/joomla/trunk/templates/ja_purity/js/ja.cssmenu.js new file mode 100644 index 00000000..f11669a0 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/js/ja.cssmenu.js @@ -0,0 +1,21 @@ + +sfHover = function() { + var sfEls = document.getElementById("ja-mainnav").getElementsByTagName("li"); + for (var i=0; i<sfEls.length; ++i) { + sfEls[i].onmouseover=function() { + clearTimeout(this.timer); + if(this.className.indexOf(" sfhover") == -1) + this.className+=" sfhover"; + } + sfEls[i].onmouseout=function() { + this.timer = setTimeout(sfHoverOut.bind(this), 20); + } + } +} + +function sfHoverOut() { + clearTimeout(this.timer); + this.className=this.className.replace(new RegExp(" sfhover\\b"), ""); +} + +if (window.attachEvent) window.attachEvent("onload", sfHover); diff --git a/oss/joomla/trunk/templates/ja_purity/js/ja.moomenu.js b/oss/joomla/trunk/templates/ja_purity/js/ja.moomenu.js new file mode 100644 index 00000000..4a540290 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/js/ja.moomenu.js @@ -0,0 +1,207 @@ +if (typeof(MooTools) != 'undefined'){ + + var subnav = new Array(); + + Element.extend( + { + hide: function(timeout) + { + this.status = 'hide'; + clearTimeout (this.timeout); + if (timeout) + { + this.timeout = setTimeout (this.anim.bind(this), timeout); + }else{ + this.anim(); + } + }, + + show: function(timeout) + { + this.status = 'show'; + clearTimeout (this.timeout); + if (timeout) + { + this.timeout = setTimeout (this.anim.bind(this), timeout); + }else{ + this.anim(); + } + }, + + setActive: function () { + //this.addClass(classname); + this.className+='sfhover'; + /* + for(var i=0;i<this.childNodes.length; i++) { + if(this.childNodes[i].nodeName.toLowerCase() == 'a') { + //$(this.childNodes[i]).addClass(classname); + $(this.childNodes[i]).setActive(); + return; + } + } + */ + }, + + setDeactive: function () { + //this.removeClass(classname); + this.className=this.className.replace(new RegExp("sfhover\\b"), ""); + /* + for(var i=0;i<this.childNodes.length; i++) { + if(this.childNodes[i].nodeName.toLowerCase() == 'a') { + $(this.childNodes[i]).setDeactive(); + return; + } + } + */ + }, + + anim: function() { + if ((this.status == 'hide' && this.style.left != 'auto') || (this.status == 'show' && this.style.left == 'auto' && !this.hidding)) return; + this.setStyle('overflow', 'hidden'); + if (this.status == 'show') { + this.hidding = 0; + this.hideAll(); + //this.parentNode.setActive(); + } else { + //this.parentNode.setDeactive(); + } + + if (this.status == 'hide') + { + this.hidding = 1; + //this.myFx1.stop(); + this.myFx2.stop(); + //this.myFx1.start(1,0); + if (this.parent._id) this.myFx2.start(this.offsetWidth,0); + else this.myFx2.start(this.offsetHeight,0); + } else { + this.setStyle('left', 'auto'); + //this.myFx1.stop(); + this.myFx2.stop(); + //this.myFx1.start(0,1); + if (this.parent._id) this.myFx2.start(0,this.mw); + else this.myFx2.start(0,this.mh); + } + }, + + init: function() { + this.mw = this.clientWidth; + this.mh = this.clientHeight; + //this.myFx1 = new Fx.Style(this, 'opacity'); + //this.myFx1.set(0); + if (this.parent._id) + { + this.myFx2 = new Fx.Style(this, 'width', {duration: 300}); + this.myFx2.set(0); + }else{ + this.myFx2 = new Fx.Style(this, 'height', {duration: 300}); + this.myFx2.set(0); + } + this.setStyle('left', '-999em'); + animComp = function(){ + if (this.status == 'hide') + { + this.setStyle('left', '-999em'); + this.hidding = 0; + } + this.setStyle('overflow', ''); + } + this.myFx2.addEvent ('onComplete', animComp.bind(this)); + }, + + hideAll: function() { + for(var i=0;i<subnav.length; i++) { + if (!this.isChild(subnav[i])) + { + subnav[i].hide(0); + } + } + }, + + isChild: function(_obj) { + obj = this; + while (obj.parent) + { + if (obj._id == _obj._id) + { + //alert(_obj._id); + return true; + } + obj = obj.parent; + } + return false; + } + + + }); + + + var DropdownMenu = new Class({ + initialize: function(element) + { + //$(element).mh = 0; + $A($(element).childNodes).each(function(el) + { + if(el.nodeName.toLowerCase() == 'li') + { + //if($(element)._id) $(element).mh += 30; + $A($(el).childNodes).each(function(el2) + { + if(el2.nodeName.toLowerCase() == 'ul') + { + $(el2)._id = subnav.length+1; + $(el2).parent = $(element); + subnav.push ($(el2)); + el2.init(); + el.addEvent('mouseover', function() + { + el.setActive(); + el2.show(0); + return false; + }); + + el.addEvent('mouseout', function() + { + el.setDeactive(); + el2.hide(20); + }); + new DropdownMenu(el2); + el.hasSub = 1; + } + }); + if (!el.hasSub) + { + el.addEvent('mouseover', function() + { + el.setActive(); + return false; + }); + + el.addEvent('mouseout', function() + { + el.setDeactive(); + }); + } + } + }); + return this; + } + }); + + Window.onDomReady(function() {new DropdownMenu($E('#ja-mainnav ul.menu'))}); + + }else { + + sfHover = function() { + var sfEls = document.getElementById("ja-mainnav").getElementsByTagName("li"); + for (var i=0; i<sfEls.length; ++i) { + sfEls[i].onmouseover=function() { + this.className+="sfhover"; + } + sfEls[i].onmouseout=function() { + this.className=this.className.replace(new RegExp("sfhover\\b"), ""); + } + } + } + if (window.attachEvent) window.attachEvent("onload", sfHover); +} diff --git a/oss/joomla/trunk/templates/ja_purity/js/ja.rightcol.js b/oss/joomla/trunk/templates/ja_purity/js/ja.rightcol.js new file mode 100644 index 00000000..b29fe8e2 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/js/ja.rightcol.js @@ -0,0 +1,60 @@ +//JS script for Joomla template + +var JA_Collapse_Mod = new Class({ + + initialize: function(myElements) { + options = Object.extend({ + transition: Fx.Transitions.quadOut + }, {}); + this.myElements = myElements; + var exModules = excludeModules.split(','); + exModules.each(function(el,i){exModules[i]='Mod'+el}); + myElements.each(function(el, i){ + el.elmain = $E('.jamod-content',el); + el.titleEl = $E('h3',el); + if(!el.titleEl) return; + + if (exModules.contains(el.id)) { + el.titleEl.className = ''; + return; + } + + el.titleEl.className = rightCollapseDefault; + el.status = rightCollapseDefault; + el.openH = el.elmain.getStyle('height').toInt(); + el.elmain.setStyle ('overflow','hidden'); + + el.titleEl.addEvent('click', function(e){ + e = new Event(e).stop(); + el.toggle(); + }); + + el.toggle = function(){ + if (el.status=='hide') el.show(); + else el.hide(); + } + + el.show = function() { + el.titleEl.className='show'; + var ch = el.elmain.getStyle('height').toInt(); + new Fx.Style(el.elmain,'height',{onComplete:el.toggleStatus}).start(ch,el.openH); + } + el.hide = function() { + el.titleEl.className='hide'; + var ch = (rightCollapseDefault=='hide')?0:el.elmain.getStyle('height').toInt(); + new Fx.Style(el.elmain,'height',{onComplete:el.toggleStatus}).start(ch,0); + } + el.toggleStatus = function () { + el.status=(el.status=='hide')?'show':'hide'; + Cookie.set(el.id,el.status,{duration:365}); + } + + if(!el.titleEl.className) el.titleEl.className=rightCollapseDefault; + if(el.titleEl.className=='hide') el.hide(); + }); + } +}); + +window.addEvent ('load', function(e){ + var jamod = new JA_Collapse_Mod ($ES('.jamod')); +}); diff --git a/oss/joomla/trunk/templates/ja_purity/js/ja.script.js b/oss/joomla/trunk/templates/ja_purity/js/ja.script.js new file mode 100644 index 00000000..2e4b5eb7 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/js/ja.script.js @@ -0,0 +1,106 @@ +//JS script for Joomla template +var siteurl = ''; + +function fixIEPNG(el, bgimgdf, sizingMethod, type, offset){ + var objs = el; + if(!objs) return; + if ($type(objs) != 'array') objs = [objs]; + if(!sizingMethod) sizingMethod = 'crop'; + if(!offset) offset = 0; + var blankimg = siteurl + 'images/blank.png'; + objs.each(function(obj) { + var bgimg = bgimgdf; + if (obj.tagName == 'IMG') { + //This is an image + if (!bgimg) bgimg = obj.src; + if (!(/\.png$/i).test(bgimg) || (/blank\.png$/i).test(bgimg)) return; + + obj.setStyle('height',obj.offsetHeight); + obj.setStyle('width',obj.offsetWidth); + obj.src = blankimg; + obj.setStyle ('visibility', 'visible'); + obj.setStyle('filter', "progid:DXImageTransform.Microsoft.AlphaImageLoader(src="+bgimg+", sizingMethod='"+sizingMethod+"')"); + }else{ + //Background + if (!bgimg) bgimg = obj.getStyle('backgroundImage'); + var pattern = new RegExp('url\s*[\(\"\']*([^\'\"\)]*)[\'\"\)]*'); + if ((m = pattern.exec(bgimg))) bgimg = m[1]; + if (!(/\.png$/i).test(bgimg) || (/blank\.png$/i).test(bgimg)) return; + if (!type) + { + obj.setStyle('background', 'none'); + //if(!obj.getStyle('position')) + if(obj.getStyle('position')!='absolute' && obj.getStyle('position')!='relative') { + obj.setStyle('position', 'relative'); + } + + //Get all child + var childnodes = obj.childNodes; + for(var j=0;j<childnodes.length;j++){ + if((child = $(childnodes[j]))) { + if(child.getStyle('position')!='absolute' && child.getStyle('position')!='relative') { + child.setStyle('position', 'relative'); + } + child.setStyle('z-index',2); + } + } + //Create background layer: + var bgdiv = new Element('IMG'); + bgdiv.src = blankimg; + bgdiv.width = obj.offsetWidth - offset; + bgdiv.height = obj.offsetHeight - offset; + bgdiv.setStyles({ + 'position': 'absolute', + 'top': 0, + 'left': 0 + }); + + bgdiv.className = 'TransBG'; + + bgdiv.setStyle('filter', "progid:DXImageTransform.Microsoft.AlphaImageLoader(src="+bgimg+", sizingMethod='"+sizingMethod+"')"); + bgdiv.inject(obj, 'top'); + //alert(obj.innerHTML + '\n' + bgdiv.innerHTML); + } else { + obj.setStyle('filter', "progid:DXImageTransform.Microsoft.AlphaImageLoader(src="+bgimg+", sizingMethod='"+sizingMethod+"')"); + } + } + }.bind(this)); + +} + +window.addEvent ('load', function(e){ + if (!$('ja-botsl')) return; + var divs = $ES('.moduletable',$('ja-botsl')); + var maxh = 0; + divs.each(function(el, i){ + maxh < el.getStyle('height').toInt()?maxh=el.getStyle('height').toInt():''; + }); + divs.each(function(el, i){ + el.setStyle('height', maxh); + }); +}); + +switchFontSize=function(ckname,val){ + var bd = $E('BODY'); + switch (val) { + case 'inc': + if (CurrentFontSize+1 < 7) { + bd.removeClass('fs'+CurrentFontSize); + CurrentFontSize++; + bd.addClass('fs'+CurrentFontSize); + } + break; + case 'dec': + if (CurrentFontSize-1 > 0) { + bd.removeClass('fs'+CurrentFontSize); + CurrentFontSize--; + bd.addClass('fs'+CurrentFontSize); + } + break; + default: + bd.removeClass('fs'+CurrentFontSize); + CurrentFontSize = val; + bd.addClass('fs'+CurrentFontSize); + } + Cookie.set(ckname, CurrentFontSize,{duration:365}); +} diff --git a/oss/joomla/trunk/templates/ja_purity/params.ini b/oss/joomla/trunk/templates/ja_purity/params.ini new file mode 100644 index 00000000..853d7b0d --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/params.ini @@ -0,0 +1,15 @@ +logoType=image +logoText=Joomla! +sloganText=...because open source matters +ja_font=3 +ja_screen=fluid +ja_screen_width=97 +theme_header= +theme_background=lighter +theme_elements=black +horNav=1 +horNavType=css +rightCollapsible=1 +rightCollapseDefault=show +excludeModules=38 +showComponent=1 diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/index.html b/oss/joomla/trunk/templates/ja_purity/styles/background/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/background/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/arrow.png b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/arrow.png new file mode 100644 index 00000000..f0f0b3c3 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/arrow.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/b-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/b-bl.gif new file mode 100644 index 00000000..66a7ad5b Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/b-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/b-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/b-br.gif new file mode 100644 index 00000000..2a337fb6 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/b-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/b-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/b-tl.gif new file mode 100644 index 00000000..9c627a81 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/b-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/b-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/b-tr.gif new file mode 100644 index 00000000..8745ae44 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/b-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bb-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bb-bl.gif new file mode 100644 index 00000000..2cb1416b Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bb-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bb-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bb-br.gif new file mode 100644 index 00000000..69017014 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bb-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bb-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bb-tl.gif new file mode 100644 index 00000000..8a4aa02a Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bb-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bb-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bb-tr.gif new file mode 100644 index 00000000..dc430722 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bb-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bg-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bg-bl.gif new file mode 100644 index 00000000..da55a4d4 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bg-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bg-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bg-br.gif new file mode 100644 index 00000000..ed15bcc1 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bg-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bg-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bg-tl.gif new file mode 100644 index 00000000..c4b5bc44 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bg-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bg-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bg-tr.gif new file mode 100644 index 00000000..d49b88ab Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bg-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bl-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bl-bl.gif new file mode 100644 index 00000000..73689735 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bl-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bl-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bl-br.gif new file mode 100644 index 00000000..17283fe5 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bl-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bl-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bl-tl.gif new file mode 100644 index 00000000..864ef172 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bl-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bl-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bl-tr.gif new file mode 100644 index 00000000..5a04f60a Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bl-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/br-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/br-bl.gif new file mode 100644 index 00000000..ef5a74fa Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/br-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/br-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/br-br.gif new file mode 100644 index 00000000..ebcff7d1 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/br-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/br-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/br-tl.gif new file mode 100644 index 00000000..310f4696 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/br-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/br-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/br-tr.gif new file mode 100644 index 00000000..6c95a76a Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/br-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bt-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bt-bl.gif new file mode 100644 index 00000000..c2510473 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bt-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bt-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bt-br.gif new file mode 100644 index 00000000..58a4f020 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bt-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bt-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bt-tl.gif new file mode 100644 index 00000000..91a13df5 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bt-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bt-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bt-tr.gif new file mode 100644 index 00000000..75725ff8 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bt-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub1-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub1-bl.gif new file mode 100644 index 00000000..acf2001d Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub1-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub1-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub1-br.gif new file mode 100644 index 00000000..37651c15 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub1-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub1-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub1-tl.gif new file mode 100644 index 00000000..6262df92 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub1-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub1-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub1-tr.gif new file mode 100644 index 00000000..1b55acbf Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub1-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub2-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub2-bl.gif new file mode 100644 index 00000000..211c3464 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub2-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub2-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub2-br.gif new file mode 100644 index 00000000..4d540ca2 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub2-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub2-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub2-tl.gif new file mode 100644 index 00000000..bfb43b26 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub2-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub2-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub2-tr.gif new file mode 100644 index 00000000..33541937 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub2-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub3-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub3-bl.gif new file mode 100644 index 00000000..4908ff05 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub3-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub3-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub3-br.gif new file mode 100644 index 00000000..44424779 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub3-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub3-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub3-tl.gif new file mode 100644 index 00000000..6262df92 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub3-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub3-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub3-tr.gif new file mode 100644 index 00000000..1b55acbf Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub3-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub4-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub4-bl.gif new file mode 100644 index 00000000..2a97b344 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub4-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub4-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub4-br.gif new file mode 100644 index 00000000..c447edf6 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub4-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub4-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub4-tl.gif new file mode 100644 index 00000000..bfb43b26 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub4-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub4-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub4-tr.gif new file mode 100644 index 00000000..33541937 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/bub4-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/c-bg1.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/c-bg1.gif new file mode 100644 index 00000000..1e27853f Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/c-bg1.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/c-bg2.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/c-bg2.gif new file mode 100644 index 00000000..4d62dff6 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/c-bg2.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/checklist-bg.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/checklist-bg.gif new file mode 100644 index 00000000..9e1e6eca Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/checklist-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/cw-bg1.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/cw-bg1.gif new file mode 100644 index 00000000..4dbadf22 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/cw-bg1.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/cw-bg2.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/cw-bg2.gif new file mode 100644 index 00000000..34515d19 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/cw-bg2.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/cwf-bg.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/cwf-bg.gif new file mode 100644 index 00000000..a75b5987 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/cwf-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/download-bg.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/download-bg.gif new file mode 100644 index 00000000..617e6635 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/download-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/icon_list.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/icon_list.gif new file mode 100644 index 00000000..05e019e3 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/icon_list.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/index.html b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/ol-bg.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/ol-bg.gif new file mode 100644 index 00000000..9b601390 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/ol-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/sc-q.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/sc-q.gif new file mode 100644 index 00000000..314d730e Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/sc-q.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/so-q.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/so-q.gif new file mode 100644 index 00000000..e41ff147 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/so-q.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/star-bg.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/star-bg.gif new file mode 100644 index 00000000..6fb27ec5 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/star-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/sticky-bg.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/sticky-bg.gif new file mode 100644 index 00000000..084a7188 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/images/sticky-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/index.html b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/style.css b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/style.css new file mode 100644 index 00000000..94d7ab0c --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/background/lighter/style.css @@ -0,0 +1,361 @@ +/* BONUS TYPOGRAPHY STYLES +--------------------------------------------------------- */ +pre, .code { + border-left: 5px solid #999999; + background: #F6F6F6; +} + +blockquote span.open { + background: url(images/so-q.gif) no-repeat left top; +} + +blockquote span.close { + background: url(images/sc-q.gif) no-repeat bottom right; +} + +/* Quote hilight */ +.quote-hilite { + border: 1px solid #CACACC; + background: #FFFFFF; +} + +/* Small quote */ +.small-quote span.open-quote { + background: url(images/so-q.gif) no-repeat center left; +} + +.small-quote span.close-quote { + background: url(images/sc-q.gif) no-repeat center right; +} + +.small-quote span.author { + border-top: 1px solid #DCDDE0; +} + +/* Rropcap */ +.dropcap { + color: #999999; +} + +/* Tips, Error, Message, Hightlight*/ +.error { + color: #666666; +} + +.message { + color: #999999; +} + +.tips { + color: #666666; +} + +.highlight { + background: #FFFFCC; +} + +/* Note Style */ +p.stickynote { + border: 1px solid #CACACC; + background: url(images/sticky-bg.gif) no-repeat 5px center #FFFFFF; +} + +p.download { + border: 1px solid #CACACC; + background: url(images/download-bg.gif) no-repeat 5px center #FFFFFF; +} + +/* Check list */ +ul.checklist li { + background: url(images/checklist-bg.gif) no-repeat 0 3px; +} + +/* Small checklist */ +ul.small-checklist li { + background: url(images/icon_list.gif) no-repeat 0 3px; +} + +/* Check list */ +ul.stars li { + background: url(images/star-bg.gif) no-repeat 0 3px; +} + +/* Bignumber */ +.bignumber { + background: url(images/ol-bg.gif) no-repeat top left; + color: #7BA566; +} + +/* Talking box. Thinking box. */ +div.bubble1 span.author, +div.bubble2 span.author, +div.bubble3 span.author, +div.bubble4 span.author { +} + +div.bubble1 div { + background: url(images/bub1-br.gif) no-repeat bottom right; +} + +div.bubble1 div div { + background: url(images/bub1-bl.gif) no-repeat bottom left; +} + +div.bubble1 div div div { + background: url(images/bub1-tr.gif) no-repeat top right; +} + +div.bubble1 div div div div { + background: url(images/bub1-tl.gif) no-repeat top left; +} + +div.bubble2 div { + background: url(images/bub2-br.gif) no-repeat bottom right; +} + +div.bubble2 div div { + background: url(images/bub2-bl.gif) no-repeat bottom left; +} + +div.bubble2 div div div { + background: url(images/bub2-tr.gif) no-repeat top right; +} + +div.bubble2 div div div div { + background: url(images/bub2-tl.gif) no-repeat top left; +} + +div.bubble3 div { + background: url(images/bub3-br.gif) no-repeat bottom right; +} + +div.bubble3 div div { + background: url(images/bub3-bl.gif) no-repeat bottom left; +} + +div.bubble3 div div div { + background: url(images/bub3-tr.gif) no-repeat top right; +} + +div.bubble3 div div div div { + background: url(images/bub3-tl.gif) no-repeat top left; +} + +div.bubble4 div { + background: url(images/bub4-br.gif) no-repeat bottom right; +} + +div.bubble4 div div { + background: url(images/bub4-bl.gif) no-repeat bottom left; +} + +div.bubble4 div div div { + background: url(images/bub4-tr.gif) no-repeat top right; +} + +div.bubble4 div div div div { + background: url(images/bub4-tl.gif) no-repeat top left; +} + +/* Legend */ +.legend-title { + background: #FFFFFF; +} + +.legend { + border: 1px solid #CACACC; + background: #FFFFFF; +} + +/* MAIN LAYOUT DIVS +--------------------------------------------------------- */ +#ja-wrapper { + background: #F2F2F2; +} + +#ja-containerwrap { + background: url(images/cw-bg1.gif) repeat-y 50% 0; +} + +#ja-containerwrap2 { + background: url(images/cw-bg2.gif) no-repeat 50% 0; +} + +#ja-container { + background: url(images/c-bg1.gif) repeat-y 18% 0; +} + +#ja-container2 { + padding: 20px 0; + background: url(images/c-bg2.gif) no-repeat 18% 0; +} + +/* Full */ +#ja-containerwrap-f { + background: url(images/cwf-bg.gif) repeat-x top left #FFFFFF; +} + +/* Full left */ +#ja-containerwrap-fl { + background: url(images/cwf-bg.gif) repeat-x top left #FFFFFF; +} + +/* Full right */ +#ja-containerwrap-fr { + background: url(images/cw-bg1.gif) repeat-y 50% 0; +} + +#ja-containerwrap-fr #ja-containerwrap2 { + background: url(images/cw-bg2.gif) no-repeat 50% 0; +} + +/* Module rounded */ +div.module h3 { + border-bottom: 1px solid #E9E9E9; + color: #7BA566; +} + +div.module_black, +div.module_green, +div.module_blue, +div.module_red, +div.module { + background: url(images/b-br.gif) no-repeat bottom right #FFFFFF; +} + +div.module div { + background: url(images/b-bl.gif) no-repeat bottom left; +} + +div.module div div { + background: url(images/b-tr.gif) no-repeat top right; +} + +div.module div div div { + background: url(images/b-tl.gif) no-repeat top left; +} + +div.module_text span { + background: #FFFFFF; +} + +div.module_text { + background: url(images/bt-br.gif) no-repeat bottom right #F6F6F6; +} + +div.module_text div { + background: url(images/bt-bl.gif) no-repeat bottom left; +} + +div.module_text div div { + background: url(images/bt-tr.gif) no-repeat top right; +} + +div.module_text div div div { + background: url(images/bt-tl.gif) no-repeat top left; +} + +/* red */ +div.module_black h3, +div.module_green h3, +div.module_blue h3, +div.module_red h3 { + border-bottom: 1px solid #F6F6F6; + color: #FFFFFF; +} + +div.module_red { + background: url(images/br-br.gif) no-repeat bottom right #BF0000; + color: #FFFFFF; +} + +div.module_red div { + background: url(images/br-bl.gif) no-repeat bottom left; +} + +div.module_red div div { + background: url(images/br-tr.gif) no-repeat top right; +} + +div.module_red div div div { + padding: 0 15px 10px; + background: url(images/br-tl.gif) no-repeat top left; +} + +/* blue */ +div.module_blue { + background: url(images/bb-br.gif) no-repeat bottom right #025291; + color: #FFFFFF; +} + +div.module_blue div { + background: url(images/bb-bl.gif) no-repeat bottom left; +} + +div.module_blue div div { + background: url(images/bb-tr.gif) no-repeat top right; +} + +div.module_blue div div div { + background: url(images/bb-tl.gif) no-repeat top left; +} + +/* green */ +div.module_green { + background: url(images/bg-br.gif) no-repeat bottom right #7BA566; + color: #FFFFFF; +} + +div.module_green div { + background: url(images/bg-bl.gif) no-repeat bottom left; +} + +div.module_green div div { + background: url(images/bg-tr.gif) no-repeat top right; +} + +div.module_green div div div { + padding: 0 15px 10px; + background: url(images/bg-tl.gif) no-repeat top left; +} + +/* black */ +div.module_black { + background: url(images/bl-br.gif) no-repeat bottom right #333333; + color: #FFFFFF; +} + +div.module_black div { + background: url(images/bl-bl.gif) no-repeat bottom left; +} + +div.module_black div div { + background: url(images/bl-tr.gif) no-repeat top right; +} + +div.module_black div div div { + background: url(images/bl-tl.gif) no-repeat top left; +} + +/* JOOMLA STYLE +--------------------------------------------------------- */ +a.readon { + border: 1px solid #ECECEC; + background: url(images/arrow.png) no-repeat 5px 48%; + color: #006699; +} + +a.readon:hover, a.readon:active, a.readon:focus { + border: 1px solid #DDDDDD; + background: url(images/arrow.png) no-repeat 5px 48% #F6F6F6; +} + +ul.menu li.active a { + background-color: #ECECEC; +} + +ul.menu li a:hover, +ul.menu li a:active, +ul.menu li a:focus { + background-color: #F6F6F6; +} diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/arrow.png b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/arrow.png new file mode 100644 index 00000000..f0f0b3c3 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/arrow.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/b-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/b-bl.gif new file mode 100644 index 00000000..66a7ad5b Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/b-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/b-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/b-br.gif new file mode 100644 index 00000000..2a337fb6 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/b-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/b-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/b-tl.gif new file mode 100644 index 00000000..9c627a81 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/b-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/b-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/b-tr.gif new file mode 100644 index 00000000..8745ae44 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/b-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bb-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bb-bl.gif new file mode 100644 index 00000000..2cb1416b Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bb-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bb-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bb-br.gif new file mode 100644 index 00000000..69017014 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bb-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bb-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bb-tl.gif new file mode 100644 index 00000000..8a4aa02a Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bb-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bb-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bb-tr.gif new file mode 100644 index 00000000..dc430722 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bb-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bg-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bg-bl.gif new file mode 100644 index 00000000..da55a4d4 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bg-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bg-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bg-br.gif new file mode 100644 index 00000000..ed15bcc1 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bg-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bg-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bg-tl.gif new file mode 100644 index 00000000..c4b5bc44 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bg-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bg-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bg-tr.gif new file mode 100644 index 00000000..d49b88ab Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bg-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bl-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bl-bl.gif new file mode 100644 index 00000000..73689735 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bl-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bl-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bl-br.gif new file mode 100644 index 00000000..17283fe5 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bl-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bl-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bl-tl.gif new file mode 100644 index 00000000..864ef172 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bl-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bl-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bl-tr.gif new file mode 100644 index 00000000..5a04f60a Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bl-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/br-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/br-bl.gif new file mode 100644 index 00000000..ef5a74fa Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/br-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/br-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/br-br.gif new file mode 100644 index 00000000..ebcff7d1 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/br-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/br-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/br-tl.gif new file mode 100644 index 00000000..310f4696 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/br-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/br-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/br-tr.gif new file mode 100644 index 00000000..6c95a76a Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/br-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bt-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bt-bl.gif new file mode 100644 index 00000000..c2510473 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bt-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bt-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bt-br.gif new file mode 100644 index 00000000..58a4f020 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bt-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bt-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bt-tl.gif new file mode 100644 index 00000000..91a13df5 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bt-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bt-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bt-tr.gif new file mode 100644 index 00000000..75725ff8 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bt-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub1-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub1-bl.gif new file mode 100644 index 00000000..acf2001d Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub1-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub1-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub1-br.gif new file mode 100644 index 00000000..37651c15 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub1-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub1-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub1-tl.gif new file mode 100644 index 00000000..6262df92 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub1-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub1-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub1-tr.gif new file mode 100644 index 00000000..1b55acbf Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub1-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub2-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub2-bl.gif new file mode 100644 index 00000000..211c3464 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub2-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub2-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub2-br.gif new file mode 100644 index 00000000..4d540ca2 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub2-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub2-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub2-tl.gif new file mode 100644 index 00000000..bfb43b26 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub2-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub2-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub2-tr.gif new file mode 100644 index 00000000..33541937 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub2-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub3-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub3-bl.gif new file mode 100644 index 00000000..4908ff05 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub3-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub3-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub3-br.gif new file mode 100644 index 00000000..44424779 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub3-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub3-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub3-tl.gif new file mode 100644 index 00000000..6262df92 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub3-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub3-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub3-tr.gif new file mode 100644 index 00000000..1b55acbf Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub3-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub4-bl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub4-bl.gif new file mode 100644 index 00000000..2a97b344 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub4-bl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub4-br.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub4-br.gif new file mode 100644 index 00000000..c447edf6 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub4-br.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub4-tl.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub4-tl.gif new file mode 100644 index 00000000..bfb43b26 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub4-tl.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub4-tr.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub4-tr.gif new file mode 100644 index 00000000..33541937 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/bub4-tr.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/c-bg1.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/c-bg1.gif new file mode 100644 index 00000000..f61353d2 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/c-bg1.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/c-bg2.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/c-bg2.gif new file mode 100644 index 00000000..4d62dff6 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/c-bg2.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/checklist-bg.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/checklist-bg.gif new file mode 100644 index 00000000..9e1e6eca Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/checklist-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/cw-bg1.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/cw-bg1.gif new file mode 100644 index 00000000..4dbadf22 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/cw-bg1.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/cw-bg2.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/cw-bg2.gif new file mode 100644 index 00000000..34515d19 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/cw-bg2.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/cw-bg3.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/cw-bg3.gif new file mode 100644 index 00000000..a75b5987 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/cw-bg3.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/cwf-bg.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/cwf-bg.gif new file mode 100644 index 00000000..a75b5987 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/cwf-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/download-bg.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/download-bg.gif new file mode 100644 index 00000000..617e6635 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/download-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/icon_list.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/icon_list.gif new file mode 100644 index 00000000..05e019e3 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/icon_list.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/index.html b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/ol-bg.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/ol-bg.gif new file mode 100644 index 00000000..9b601390 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/ol-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/sc-q.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/sc-q.gif new file mode 100644 index 00000000..314d730e Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/sc-q.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/so-q.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/so-q.gif new file mode 100644 index 00000000..e41ff147 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/so-q.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/star-bg.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/star-bg.gif new file mode 100644 index 00000000..6fb27ec5 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/star-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/sticky-bg.gif b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/sticky-bg.gif new file mode 100644 index 00000000..084a7188 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/images/sticky-bg.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/index.html b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/style.css b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/style.css new file mode 100644 index 00000000..416dd33b --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/background/purewhite/style.css @@ -0,0 +1,366 @@ +/* BONUS TYPOGRAPHY STYLES +--------------------------------------------------------- */ +pre, .code { + border-left: 5px solid #999999; + background: #F6F6F6; +} + +blockquote span.open { + background: url(images/so-q.gif) no-repeat left top; +} + +blockquote span.close { + background: url(images/sc-q.gif) no-repeat bottom right; +} + +/* Quote hilight */ +.quote-hilite { + border: 1px solid #CACACC; + background: #FFFFFF; +} + +/* Small quote */ +.small-quote span.open-quote { + background: url(images/so-q.gif) no-repeat center left; +} + +.small-quote span.close-quote { + background: url(images/sc-q.gif) no-repeat center right; +} + +.small-quote span.author { + border-top: 1px solid #DCDDE0; + background: url(../.../.../images/author.gif) no-repeat 5px 4px #EAEBEE; +} + +/* Rropcap */ +.dropcap { + color: #999999; +} + +/* Tips, Error, Message, Hightlight*/ +.error { + color: #666666; + background: url(../.../.../images/icon-error.gif) no-repeat top left; +} + +.message { + color: #999999; + background: url(../.../.../images/icon-info.gif) no-repeat top left; +} + +.tips { + color: #666666; + background: url(../.../.../images/icon-tips.gif) no-repeat top left; +} + +.highlight { + background: #FFFFCC; +} + +/* Note Style */ +p.stickynote { + border: 1px solid #CACACC; + background: url(images/sticky-bg.gif) no-repeat 5px center #FFFFFF; +} + +p.download { + border: 1px solid #CACACC; + background: url(images/download-bg.gif) no-repeat 5px center #FFFFFF; +} + +/* Check list */ +ul.checklist li { + background: url(images/checklist-bg.gif) no-repeat 0 3px; +} + +/* Small checklist */ +ul.small-checklist li { + background: url(images/icon_list.gif) no-repeat 0 3px; +} + +/* Check list */ +ul.stars li { + background: url(images/star-bg.gif) no-repeat 0 3px; +} + +/* Bignumber */ +.bignumber { + background: url(images/ol-bg.gif) no-repeat top left; + color: #7BA566; +} + +/* Talking box. Thinking box. */ +div.bubble1 span.author, +div.bubble2 span.author, +div.bubble3 span.author, +div.bubble4 span.author { +} + +div.bubble1 div { + background: url(images/bub1-br.gif) no-repeat bottom right; +} + +div.bubble1 div div { + background: url(images/bub1-bl.gif) no-repeat bottom left; +} + +div.bubble1 div div div { + background: url(images/bub1-tr.gif) no-repeat top right; +} + +div.bubble1 div div div div { + background: url(images/bub1-tl.gif) no-repeat top left; +} + +div.bubble2 div { + background: url(images/bub2-br.gif) no-repeat bottom right; +} + +div.bubble2 div div { + background: url(images/bub2-bl.gif) no-repeat bottom left; +} + +div.bubble2 div div div { + background: url(images/bub2-tr.gif) no-repeat top right; +} + +div.bubble2 div div div div { + background: url(images/bub2-tl.gif) no-repeat top left; +} + +div.bubble3 div { + background: url(images/bub3-br.gif) no-repeat bottom right; +} + +div.bubble3 div div { + background: url(images/bub3-bl.gif) no-repeat bottom left; +} + +div.bubble3 div div div { + background: url(images/bub3-tr.gif) no-repeat top right; +} + +div.bubble3 div div div div { + background: url(images/bub3-tl.gif) no-repeat top left; +} + +div.bubble4 div { + background: url(images/bub4-br.gif) no-repeat bottom right; +} + +div.bubble4 div div { + background: url(images/bub4-bl.gif) no-repeat bottom left; +} + +div.bubble4 div div div { + background: url(images/bub4-tr.gif) no-repeat top right; +} + +div.bubble4 div div div div { + background: url(images/bub4-tl.gif) no-repeat top left; +} + +/* Legend */ +.legend-title { + background: #FFFFFF; +} + +.legend { + border: 1px solid #CACACC; + background: #FFFFFF; +} + +/* MAIN LAYOUT DIVS +--------------------------------------------------------- */ +#ja-wrapper { + background: #FFFFFF; +} + +#ja-containerwrap { + background: none; +} + +#ja-containerwrap2 { + background: url(images/cwf-bg.gif) repeat-x top left; +} + +#ja-container { + padding: 20px 0; + background: url(images/cwf-bg.gif) repeat-x top left; +} + +#ja-container2 { + padding: 0; + background: url(images/c-bg1.gif) repeat-y 18% 0; +} + +/* Full */ +#ja-containerwrap-f { + background: url(images/cwf-bg.gif) repeat-x top left #FFFFFF; +} + +/* Full left */ +#ja-containerwrap-fl { + background: url(images/cwf-bg.gif) repeat-x top left #FFFFFF; +} + +/* Full right */ +#ja-containerwrap-fr { + background: none; +} + +#ja-containerwrap-fr #ja-containerwrap2 { + background: url(images/cwf-bg.gif) repeat-x top left; +} + +/* Module rounded */ +div.module h3 { + border-bottom: 1px solid #E9E9E9; + color: #7BA566; +} + +div.module_black, +div.module_green, +div.module_blue, +div.module_red, +div.module { + background: url(images/b-br.gif) no-repeat bottom right #FFFFFF; +} + +div.module div { + background: url(images/b-bl.gif) no-repeat bottom left; +} + +div.module div div { + background: url(images/b-tr.gif) no-repeat top right; +} + +div.module div div div { + background: url(images/b-tl.gif) no-repeat top left; +} + +div.module_text span { + background: #FFFFFF; +} + +div.module_text { + background: url(images/bt-br.gif) no-repeat bottom right #F6F6F6; +} + +div.module_text div { + background: url(images/bt-bl.gif) no-repeat bottom left; +} + +div.module_text div div { + background: url(images/bt-tr.gif) no-repeat top right; +} + +div.module_text div div div { + background: url(images/bt-tl.gif) no-repeat top left; +} + +/* red */ +div.module_black h3, +div.module_green h3, +div.module_blue h3, +div.module_red h3 { + border-bottom: 1px solid #F6F6F6; + color: #FFFFFF; +} + +div.module_red { + background: url(images/br-br.gif) no-repeat bottom right #BF0000; + color: #FFFFFF; +} + +div.module_red div { + background: url(images/br-bl.gif) no-repeat bottom left; +} + +div.module_red div div { + background: url(images/br-tr.gif) no-repeat top right; +} + +div.module_red div div div { + padding: 0 15px 10px; + background: url(images/br-tl.gif) no-repeat top left; +} + +/* blue */ +div.module_blue { + background: url(images/bb-br.gif) no-repeat bottom right #025291; + color: #FFFFFF; +} + +div.module_blue div { + background: url(images/bb-bl.gif) no-repeat bottom left; +} + +div.module_blue div div { + background: url(images/bb-tr.gif) no-repeat top right; +} + +div.module_blue div div div { + background: url(images/bb-tl.gif) no-repeat top left; +} + +/* green */ +div.module_green { + background: url(images/bg-br.gif) no-repeat bottom right #7BA566; + color: #FFFFFF; +} + +div.module_green div { + background: url(images/bg-bl.gif) no-repeat bottom left; +} + +div.module_green div div { + background: url(images/bg-tr.gif) no-repeat top right; +} + +div.module_green div div div { + padding: 0 15px 10px; + background: url(images/bg-tl.gif) no-repeat top left; +} + +/* black */ +div.module_black { + background: url(images/bl-br.gif) no-repeat bottom right #333333; + color: #FFFFFF; +} + +div.module_black div { + background: url(images/bl-bl.gif) no-repeat bottom left; +} + +div.module_black div div { + background: url(images/bl-tr.gif) no-repeat top right; +} + +div.module_black div div div { + background: url(images/bl-tl.gif) no-repeat top left; +} + +/* JOOMLA STYLE +--------------------------------------------------------- */ +a.readon { + border: 1px solid #ECECEC; + background: url(images/arrow.png) no-repeat 5px 48%; + color: #006699; +} + +a.readon:hover, a.readon:active, a.readon:focus { + border: 1px solid #DDDDDD; + background: url(images/arrow.png) no-repeat 5px 48% #F6F6F6; +} + +ul.menu li.active a { + background-color: #ECECEC; +} + +ul.menu li a:hover, +ul.menu li a:active, +ul.menu li a:focus { + background-color: #F6F6F6; +} diff --git a/oss/joomla/trunk/templates/ja_purity/styles/elements/black/images/index.html b/oss/joomla/trunk/templates/ja_purity/styles/elements/black/images/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/elements/black/images/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/styles/elements/black/index.html b/oss/joomla/trunk/templates/ja_purity/styles/elements/black/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/elements/black/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/styles/elements/black/style.css b/oss/joomla/trunk/templates/ja_purity/styles/elements/black/style.css new file mode 100644 index 00000000..41c3630b --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/elements/black/style.css @@ -0,0 +1,36 @@ +a { + color: #333333; + text-decoration: underline; +} + +a.readon { + color: #333333; +} + +#ja-container2 ul.menu li li a:hover, +#ja-container2 ul.menu li li a:active, +#ja-container2 ul.menu li li a:focus { + color: #333333; +} + +#ja-container2 ul.menu li.active a span { + background: url(../../../images/bullet.gif) no-repeat 5px; +} + +.bignumber { + color: #333333; +} + +#ja-container2 ul.menu li.active a { + color: #333333; +} + +div.moduletable h3, +div.moduletable_menu h3, +div.moduletable_text h3 { + color: #333333; +} + +div.module h3 { + color: #333333; +} diff --git a/oss/joomla/trunk/templates/ja_purity/styles/elements/blue/images/bullet3.gif b/oss/joomla/trunk/templates/ja_purity/styles/elements/blue/images/bullet3.gif new file mode 100644 index 00000000..5a77844c Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/elements/blue/images/bullet3.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/elements/blue/style.css b/oss/joomla/trunk/templates/ja_purity/styles/elements/blue/style.css new file mode 100644 index 00000000..ddb55b06 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/elements/blue/style.css @@ -0,0 +1,36 @@ +a { + color: #006699; + text-decoration: underline; +} + +a.readon { + color: #006699; +} + +#ja-container2 ul.menu li li a:hover, +#ja-container2 ul.menu li li a:active, +#ja-container2 ul.menu li li a:focus { + color: #006699; +} + +.bignumber { + color: #006699; +} + +#ja-container2 ul.menu li.active a { + color: #006699; +} + +div.moduletable h3, +div.moduletable_menu h3, +div.moduletable_text h3 { + color: #006699; +} + +div.module h3 { + color: #006699; +} + +#ja-container2 ul.menu li.active a span { + background: url(images/bullet3.gif) no-repeat 5px; +} diff --git a/oss/joomla/trunk/templates/ja_purity/styles/elements/green/images/bullet3.gif b/oss/joomla/trunk/templates/ja_purity/styles/elements/green/images/bullet3.gif new file mode 100644 index 00000000..5a77844c Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/elements/green/images/bullet3.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/elements/green/style.css b/oss/joomla/trunk/templates/ja_purity/styles/elements/green/style.css new file mode 100644 index 00000000..8ead127d --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/elements/green/style.css @@ -0,0 +1,32 @@ +a { + color: #7BA566; + text-decoration: underline; +} + +a.readon { + color: #7BA566; +} + +#ja-container2 ul.menu li li a:hover, +#ja-container2 ul.menu li li a:active, +#ja-container2 ul.menu li li a:focus { + color: #7BA566; +} + +.bignumber { + color: #7BA566; +} + +#ja-container2 ul.menu li.active a { + color: #7BA566; +} + +div.moduletable h3, +div.moduletable_menu h3, +div.moduletable_text h3 { + color: #7BA566; +} + +div.module h3 { + color: #7BA566; +} diff --git a/oss/joomla/trunk/templates/ja_purity/styles/elements/index.html b/oss/joomla/trunk/templates/ja_purity/styles/elements/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/elements/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/styles/elements/red/images/bullet3.gif b/oss/joomla/trunk/templates/ja_purity/styles/elements/red/images/bullet3.gif new file mode 100644 index 00000000..c27e4c72 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/elements/red/images/bullet3.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/elements/red/images/index.html b/oss/joomla/trunk/templates/ja_purity/styles/elements/red/images/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/elements/red/images/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/styles/elements/red/index.html b/oss/joomla/trunk/templates/ja_purity/styles/elements/red/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/elements/red/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/styles/elements/red/style.css b/oss/joomla/trunk/templates/ja_purity/styles/elements/red/style.css new file mode 100644 index 00000000..f5c367aa --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/elements/red/style.css @@ -0,0 +1,36 @@ +a { + color: #CC0000; + text-decoration: underline; +} + +a.readon { + color: #CC0000; +} + +#ja-container2 ul.menu li li a:hover, +#ja-container2 ul.menu li li a:active, +#ja-container2 ul.menu li li a:focus { + color: #CC0000; +} + +.bignumber { + color: #CC0000; +} + +#ja-container2 ul.menu li.active a { + color: #CC0000; +} + +div.moduletable h3, +div.moduletable_menu h3, +div.moduletable_text h3 { + color: #CC0000; +} + +div.module h3 { + color: #CC0000; +} + +#ja-container2 ul.menu li.active a span { + background: url(images/bullet3.gif) no-repeat 5px; +} diff --git a/oss/joomla/trunk/templates/ja_purity/styles/header/blue/images/header-mask.png b/oss/joomla/trunk/templates/ja_purity/styles/header/blue/images/header-mask.png new file mode 100644 index 00000000..f86e90b7 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/header/blue/images/header-mask.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/header/blue/images/icon-search.gif b/oss/joomla/trunk/templates/ja_purity/styles/header/blue/images/icon-search.gif new file mode 100644 index 00000000..313ad237 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/header/blue/images/icon-search.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/header/blue/images/index.html b/oss/joomla/trunk/templates/ja_purity/styles/header/blue/images/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/header/blue/images/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/styles/header/blue/images/opaque.png b/oss/joomla/trunk/templates/ja_purity/styles/header/blue/images/opaque.png new file mode 100644 index 00000000..dd16dc97 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/header/blue/images/opaque.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/header/blue/images/vdot2.gif b/oss/joomla/trunk/templates/ja_purity/styles/header/blue/images/vdot2.gif new file mode 100644 index 00000000..7a2a1f86 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/header/blue/images/vdot2.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/header/blue/index.html b/oss/joomla/trunk/templates/ja_purity/styles/header/blue/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/header/blue/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/styles/header/blue/style.css b/oss/joomla/trunk/templates/ja_purity/styles/header/blue/style.css new file mode 100644 index 00000000..b4058a33 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/header/blue/style.css @@ -0,0 +1,117 @@ +#ja-headerwrap { + background: #006699; + color: #C3DFED; +} + +.ja-headermask { + background: url(images/header-mask.png) no-repeat top right; +} + +#ja-header a { + color: #C3DFED; +} + +h1.logo-text a { + color: #C3DFED !important; +} + +p.site-slogan { + background: #1E7CAB; +} + +#ja-search { + background: url(images/icon-search.gif) no-repeat center left; +} + +#ja-search .inputbox { + border: 1px solid #005A87; + color: #C3DFED; + background: #1E7CAB; +} + +.sectiontableheader { + background: #1374A5; +} + +#ja-botslwrap { + background: #006699; + color: #C3DFED; +} + +.ja-box-right div.moduletable { + background: url(images/vdot2.gif) repeat-y left; +} + +.ja-box-center div.moduletable { + background: url(images/vdot2.gif) repeat-y left; +} + +#ja-botsl a { + color: #C3DFED; +} + +/*--------------------------- VISUAL ----------------------------*/ +/* -------- All levels -------- */ +#ja-mainnavwrap { + border-top: 1px solid #4394BD; + background: #1374A5; +} +#ja-mainnav ul, #ja-mainnav li { + background-image: none; + list-style: none; +} + +#ja-mainnav span.separator { + display:none; +} + +/* -------- Top level -------- */ +#ja-mainnav > ul { + background-color: #1374A5; + padding-left: 20px; +} + +#ja-mainnav > ul > li { + background-color: #1374A5; + border-left: 1px solid #4394BD; + border-right: 1px solid #005A87; + margin-right: 1px; +} + +#ja-mainnav > ul > li.active { + background: url(../../../images/arrow2.png) no-repeat bottom center #1374A5; + color: #C3DFED; +} + +#ja-mainnav > ul > li:hover, +#ja-mainnav > ul > li:active, +#ja-mainnav > ul > li:focus { + background: url(../../../images/arrow2.png) no-repeat bottom center #2A84B1; + color: #C3DFED; +} + +/* -------- sub-levels -------- */ +#ja-mainnav ul ul li { + border-left: 1px solid #4394BD; + border-right: 1px solid #005A87; + border-top: 1px solid #4394BD; + border-bottom: 1px solid #005A87; + margin-bottom: 1px; +} + +#ja-mainnav li ul { /* second-level lists */ + background-color: #2A84B1; +} + +#ja-mainnav li a { + color: #C3DFED; + font-weight: bold; + text-decoration: none; +} + +#ja-mainnav ul ul li:hover, +#ja-mainnav ul ul li:active, +#ja-mainnav ul ul li:focus { + background: #006699; + color: #C3DFED; +} diff --git a/oss/joomla/trunk/templates/ja_purity/styles/header/green/images/header-mask.png b/oss/joomla/trunk/templates/ja_purity/styles/header/green/images/header-mask.png new file mode 100644 index 00000000..a754f809 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/header/green/images/header-mask.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/header/green/images/icon-search.gif b/oss/joomla/trunk/templates/ja_purity/styles/header/green/images/icon-search.gif new file mode 100644 index 00000000..4a75dfe2 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/header/green/images/icon-search.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/header/green/images/index.html b/oss/joomla/trunk/templates/ja_purity/styles/header/green/images/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/header/green/images/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/styles/header/green/images/opaque.png b/oss/joomla/trunk/templates/ja_purity/styles/header/green/images/opaque.png new file mode 100644 index 00000000..c8a15304 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/header/green/images/opaque.png differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/header/green/images/vdot2.gif b/oss/joomla/trunk/templates/ja_purity/styles/header/green/images/vdot2.gif new file mode 100644 index 00000000..a73c9323 Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/styles/header/green/images/vdot2.gif differ diff --git a/oss/joomla/trunk/templates/ja_purity/styles/header/green/index.html b/oss/joomla/trunk/templates/ja_purity/styles/header/green/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/header/green/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/styles/header/green/style.css b/oss/joomla/trunk/templates/ja_purity/styles/header/green/style.css new file mode 100644 index 00000000..9061cfbe --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/header/green/style.css @@ -0,0 +1,117 @@ +#ja-headerwrap { + background: #7BA566; + color: #E4EFDF; +} + +.ja-headermask { + background: url(images/header-mask.png) no-repeat top right; +} + +#ja-header a { + color: #E4EFDF; +} + +h1.logo-text a { + color: #E4EFDF !important; +} + +p.site-slogan { + background: #9DBF8C; +} + +#ja-search { + background: url(images/icon-search.gif) no-repeat center left; +} + +#ja-search .inputbox { + border: 1px solid #658854; + color: #E4EFDF; + background: #9DBF8C; +} + +.sectiontableheader { + background: #88B074; +} + +#ja-botslwrap { + background: #7BA566; + color: #E4EFDF; +} + +.ja-box-right div.moduletable { + background: url(images/vdot2.gif) repeat-y left; +} + +.ja-box-center div.moduletable { + background: url(images/vdot2.gif) repeat-y left; +} + +#ja-botsl a { + color: #E4EFDF; +} + +/*--------------------------- VISUAL ----------------------------*/ +/* -------- All levels -------- */ +#ja-mainnavwrap { + border-top: 1px solid #A4C594; + background: #88B074; +} +#ja-mainnav ul, #ja-mainnav li { + background-image: none; + list-style: none; +} + +#ja-mainnav span.separator { + display:none; +} + +/* -------- Top level -------- */ +#ja-mainnav > ul { + background-color: #88B074; + padding-left: 20px; +} + +#ja-mainnav > ul > li { + background-color: #88B074; + border-left: 1px solid #A4C594; + border-right: 1px solid #658854; + margin-right: 1px; +} + +#ja-mainnav > ul > li.active { + background: url(../../../images/arrow2.png) no-repeat bottom center #88B074; + color: #E4EFDF; +} + +#ja-mainnav > ul > li:hover, +#ja-mainnav > ul > li:active, +#ja-mainnav > ul > li:focus { + background: url(../../../images/arrow2.png) no-repeat bottom center #9DBF8C; + color: #E4EFDF; +} + +/* -------- sub-levels -------- */ +#ja-mainnav ul ul li { + border-left: 1px solid #A4C594; + border-right: 1px solid #658854; + border-top: 1px solid #A4C594; + border-bottom: 1px solid #658854; + margin-bottom: 1px; +} + +#ja-mainnav li ul { /* second-level lists */ + background-color: #9DBF8C; +} + +#ja-mainnav li a { + color: #E4EFDF; + font-weight: bold; + text-decoration: none; +} + +#ja-mainnav ul ul li:hover, +#ja-mainnav ul ul li:active, +#ja-mainnav ul ul li:focus { + background: #88B074; + color: #E4EFDF; +} diff --git a/oss/joomla/trunk/templates/ja_purity/styles/header/index.html b/oss/joomla/trunk/templates/ja_purity/styles/header/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/header/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/styles/index.html b/oss/joomla/trunk/templates/ja_purity/styles/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/styles/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/ja_purity/templateDetails.xml b/oss/joomla/trunk/templates/ja_purity/templateDetails.xml new file mode 100644 index 00000000..c1ac0c84 --- /dev/null +++ b/oss/joomla/trunk/templates/ja_purity/templateDetails.xml @@ -0,0 +1,404 @@ +<?xml version="1.0" encoding="utf-8"?> +<install version="1.5" type="template"> + <name>JA_Purity</name> + <version>1.2.0</version> + <creationDate>12/26/07</creationDate> + <author>JoomlArt.com</author> + <authorEmail>webmaster@joomlart.com</authorEmail> + <authorUrl>http://www.joomlart.com</authorUrl> + <copyright></copyright> + <license>GNU/GPL version 2</license> + <description>JA PURITY DESCRIPTION</description> +<files> + <filename>component.php</filename> + <filename>css/index.html</filename> + <filename>favicon.ico</filename> + <filename>html/com_content/article/default.php</filename> + <filename>html/com_content/article/index.html</filename> + <filename>html/com_content/category/blog_item.php</filename> + <filename>html/com_content/category/index.html</filename> + <filename>html/com_content/frontpage/default_item.php</filename> + <filename>html/com_content/frontpage/index.html</filename> + <filename>html/com_content/index.html</filename> + <filename>html/com_content/section/blog_item.php</filename> + <filename>html/com_content/section/index.html</filename> + <filename>html/index.html</filename> + <filename>html/modules.php</filename> + <filename>html/mod_banners/default.php</filename> + <filename>html/mod_banners/index.html</filename> + <filename>html/mod_login/default.php</filename> + <filename>html/mod_login/index.html</filename> + <filename>html/pagination.php</filename> + <filename>images/icons_license.txt</filename> + <filename>images/index.html</filename> + <filename>index.html</filename> + <filename>index.php</filename> + <filename>ja_templatetools.php</filename> + <filename>ja_vars.php</filename> + <filename>js/ja.cssmenu.js</filename> + <filename>js/ja.moomenu.js</filename> + <filename>js/ja.rightcol.js</filename> + <filename>js/ja.script.js</filename> + <filename>params.ini</filename> + <filename>styles/background/index.html</filename> + <filename>styles/background/lighter/images/index.html</filename> + <filename>styles/background/lighter/index.html</filename> + <filename>styles/background/purewhite/images/index.html</filename> + <filename>styles/background/purewhite/index.html</filename> + <filename>styles/elements/black/images/index.html</filename> + <filename>styles/elements/black/index.html</filename> + <filename>styles/elements/index.html</filename> + <filename>styles/elements/red/images/index.html</filename> + <filename>styles/elements/red/index.html</filename> + <filename>styles/header/blue/images/index.html</filename> + <filename>styles/header/blue/index.html</filename> + <filename>styles/header/green/images/index.html</filename> + <filename>styles/header/green/index.html</filename> + <filename>styles/header/index.html</filename> + <filename>styles/index.html</filename> + <filename>templateDetails.xml</filename> + </files> + <images> + <filename>images/arrow.png</filename> + <filename>images/arrow2.png</filename> + <filename>images/arrow3.png</filename> + <filename>images/author.gif</filename> + <filename>images/b-bl.gif</filename> + <filename>images/b-br.gif</filename> + <filename>images/b-tl.gif</filename> + <filename>images/b-tr.gif</filename> + <filename>images/bb-bl.gif</filename> + <filename>images/bb-br.gif</filename> + <filename>images/bb-tl.gif</filename> + <filename>images/bb-tr.gif</filename> + <filename>images/bg-bl.gif</filename> + <filename>images/bg-br.gif</filename> + <filename>images/bg-tl.gif</filename> + <filename>images/bg-tr.gif</filename> + <filename>images/bl-bl.gif</filename> + <filename>images/bl-br.gif</filename> + <filename>images/bl-tl.gif</filename> + <filename>images/bl-tr.gif</filename> + <filename>images/blank.png</filename> + <filename>images/br-bl.gif</filename> + <filename>images/br-br.gif</filename> + <filename>images/br-tl.gif</filename> + <filename>images/br-tr.gif</filename> + <filename>images/bt-bl.gif</filename> + <filename>images/bt-br.gif</filename> + <filename>images/bt-tl.gif</filename> + <filename>images/bt-tr.gif</filename> + <filename>images/bub1-bl.gif</filename> + <filename>images/bub1-br.gif</filename> + <filename>images/bub1-tl.gif</filename> + <filename>images/bub1-tr.gif</filename> + <filename>images/bub2-bl.gif</filename> + <filename>images/bub2-br.gif</filename> + <filename>images/bub2-tl.gif</filename> + <filename>images/bub2-tr.gif</filename> + <filename>images/bub3-bl.gif</filename> + <filename>images/bub3-br.gif</filename> + <filename>images/bub3-tl.gif</filename> + <filename>images/bub3-tr.gif</filename> + <filename>images/bub4-bl.gif</filename> + <filename>images/bub4-br.gif</filename> + <filename>images/bub4-tl.gif</filename> + <filename>images/bub4-tr.gif</filename> + <filename>images/bullet.gif</filename> + <filename>images/bullet2.gif</filename> + <filename>images/bullet3.gif</filename> + <filename>images/bullet-list.gif</filename> + <filename>images/but-css.gif</filename> + <filename>images/but-rss.gif</filename> + <filename>images/but-xhtml10.gif</filename> + <filename>images/but-xhtml101.gif</filename> + <filename>images/c-bg1.gif</filename> + <filename>images/c-bg2.gif</filename> + <filename>images/checklist-bg.gif</filename> + <filename>images/cw-bg1.gif</filename> + <filename>images/cw-bg12.gif</filename> + <filename>images/cw-bg2.gif</filename> + <filename>images/cw-bg22.gif</filename> + <filename>images/cwf-bg.gif</filename> + <filename>images/download-bg.gif</filename> + <filename>images/emailbutton.png</filename> + <filename>images/grad1.gif</filename> + <filename>images/grad2.gif</filename> + <filename>images/grad3.gif</filename> + <filename>images/hdot.gif</filename> + <filename>images/hdot2.gif</filename> + <filename>images/header/header1.jpg</filename> + <filename>images/header/header2.jpg</filename> + <filename>images/header/header3.jpg</filename> + <filename>images/header-mask.png</filename> + <filename>images/icon-date.gif</filename> + <filename>images/icon-error.gif</filename> + <filename>images/icon-info.gif</filename> + <filename>images/icon-search.gif</filename> + <filename>images/icon-tips.gif</filename> + <filename>images/icon-user.gif</filename> + <filename>images/icon_list.gif</filename> + <filename>images/indent1.png</filename> + <filename>images/indent2.png</filename> + <filename>images/indent3.png</filename> + <filename>images/indent4.png</filename> + <filename>images/login-bg.gif</filename> + <filename>images/logo.gif</filename> + <filename>images/logo.png</filename> + <filename>images/ol-bg.gif</filename> + <filename>images/opaque.png</filename> + <filename>images/pages.gif</filename> + <filename>images/pdf_button.png</filename> + <filename>images/printbutton.png</filename> + <filename>images/rtl/arrow.png</filename> + <filename>images/rtl/bub12-bl.gif</filename> + <filename>images/rtl/bub12-br.gif</filename> + <filename>images/rtl/bub12-tl.gif</filename> + <filename>images/rtl/bub12-tr.gif</filename> + <filename>images/rtl/bub22-bl.gif</filename> + <filename>images/rtl/bub22-br.gif</filename> + <filename>images/rtl/bub22-tl.gif</filename> + <filename>images/rtl/bub22-tr.gif</filename> + <filename>images/rtl/bub32-bl.gif</filename> + <filename>images/rtl/bub32-br.gif</filename> + <filename>images/rtl/bub32-tl.gif</filename> + <filename>images/rtl/bub32-tr.gif</filename> + <filename>images/rtl/bub42-bl.gif</filename> + <filename>images/rtl/bub42-br.gif</filename> + <filename>images/rtl/bub42-tl.gif</filename> + <filename>images/rtl/bub42-tr.gif</filename> + <filename>images/rtl/c-bg1.gif</filename> + <filename>images/rtl/c-bg2.gif</filename> + <filename>images/rtl/cw-bg1.gif</filename> + <filename>images/rtl/cw-bg12.gif</filename> + <filename>images/rtl/cw-bg122.gif</filename> + <filename>images/rtl/cw-bg2.gif</filename> + <filename>images/rtl/cw-bg22.gif</filename> + <filename>images/sc-q.gif</filename> + <filename>images/so-q.gif</filename> + <filename>images/spacer.png</filename> + <filename>images/star-bg.gif</filename> + <filename>images/sticky-bg.gif</filename> + <filename>images/trans-bg.png</filename> + <filename>images/trans.gif</filename> + <filename>images/user-decrease.png</filename> + <filename>images/user-increase.png</filename> + <filename>images/user-reset.png</filename> + <filename>images/vdot.gif</filename> + <filename>images/vdot2.gif</filename> + <filename>styles/background/lighter/images/arrow.png</filename> + <filename>styles/background/lighter/images/b-bl.gif</filename> + <filename>styles/background/lighter/images/b-br.gif</filename> + <filename>styles/background/lighter/images/b-tl.gif</filename> + <filename>styles/background/lighter/images/b-tr.gif</filename> + <filename>styles/background/lighter/images/bb-bl.gif</filename> + <filename>styles/background/lighter/images/bb-br.gif</filename> + <filename>styles/background/lighter/images/bb-tl.gif</filename> + <filename>styles/background/lighter/images/bb-tr.gif</filename> + <filename>styles/background/lighter/images/bg-bl.gif</filename> + <filename>styles/background/lighter/images/bg-br.gif</filename> + <filename>styles/background/lighter/images/bg-tl.gif</filename> + <filename>styles/background/lighter/images/bg-tr.gif</filename> + <filename>styles/background/lighter/images/bl-bl.gif</filename> + <filename>styles/background/lighter/images/bl-br.gif</filename> + <filename>styles/background/lighter/images/bl-tl.gif</filename> + <filename>styles/background/lighter/images/bl-tr.gif</filename> + <filename>styles/background/lighter/images/br-bl.gif</filename> + <filename>styles/background/lighter/images/br-br.gif</filename> + <filename>styles/background/lighter/images/br-tl.gif</filename> + <filename>styles/background/lighter/images/br-tr.gif</filename> + <filename>styles/background/lighter/images/bt-bl.gif</filename> + <filename>styles/background/lighter/images/bt-br.gif</filename> + <filename>styles/background/lighter/images/bt-tl.gif</filename> + <filename>styles/background/lighter/images/bt-tr.gif</filename> + <filename>styles/background/lighter/images/bub1-bl.gif</filename> + <filename>styles/background/lighter/images/bub1-br.gif</filename> + <filename>styles/background/lighter/images/bub1-tl.gif</filename> + <filename>styles/background/lighter/images/bub1-tr.gif</filename> + <filename>styles/background/lighter/images/bub2-bl.gif</filename> + <filename>styles/background/lighter/images/bub2-br.gif</filename> + <filename>styles/background/lighter/images/bub2-tl.gif</filename> + <filename>styles/background/lighter/images/bub2-tr.gif</filename> + <filename>styles/background/lighter/images/bub3-bl.gif</filename> + <filename>styles/background/lighter/images/bub3-br.gif</filename> + <filename>styles/background/lighter/images/bub3-tl.gif</filename> + <filename>styles/background/lighter/images/bub3-tr.gif</filename> + <filename>styles/background/lighter/images/bub4-bl.gif</filename> + <filename>styles/background/lighter/images/bub4-br.gif</filename> + <filename>styles/background/lighter/images/bub4-tl.gif</filename> + <filename>styles/background/lighter/images/bub4-tr.gif</filename> + <filename>styles/background/lighter/images/c-bg1.gif</filename> + <filename>styles/background/lighter/images/c-bg2.gif</filename> + <filename>styles/background/lighter/images/checklist-bg.gif</filename> + <filename>styles/background/lighter/images/cw-bg1.gif</filename> + <filename>styles/background/lighter/images/cw-bg2.gif</filename> + <filename>styles/background/lighter/images/cwf-bg.gif</filename> + <filename>styles/background/lighter/images/download-bg.gif</filename> + <filename>styles/background/lighter/images/icon_list.gif</filename> + <filename>styles/background/lighter/images/ol-bg.gif</filename> + <filename>styles/background/lighter/images/sc-q.gif</filename> + <filename>styles/background/lighter/images/so-q.gif</filename> + <filename>styles/background/lighter/images/star-bg.gif</filename> + <filename>styles/background/lighter/images/sticky-bg.gif</filename> + <filename>styles/background/purewhite/images/arrow.png</filename> + <filename>styles/background/purewhite/images/b-bl.gif</filename> + <filename>styles/background/purewhite/images/b-br.gif</filename> + <filename>styles/background/purewhite/images/b-tl.gif</filename> + <filename>styles/background/purewhite/images/b-tr.gif</filename> + <filename>styles/background/purewhite/images/bb-bl.gif</filename> + <filename>styles/background/purewhite/images/bb-br.gif</filename> + <filename>styles/background/purewhite/images/bb-tl.gif</filename> + <filename>styles/background/purewhite/images/bb-tr.gif</filename> + <filename>styles/background/purewhite/images/bg-bl.gif</filename> + <filename>styles/background/purewhite/images/bg-br.gif</filename> + <filename>styles/background/purewhite/images/bg-tl.gif</filename> + <filename>styles/background/purewhite/images/bg-tr.gif</filename> + <filename>styles/background/purewhite/images/bl-bl.gif</filename> + <filename>styles/background/purewhite/images/bl-br.gif</filename> + <filename>styles/background/purewhite/images/bl-tl.gif</filename> + <filename>styles/background/purewhite/images/bl-tr.gif</filename> + <filename>styles/background/purewhite/images/br-bl.gif</filename> + <filename>styles/background/purewhite/images/br-br.gif</filename> + <filename>styles/background/purewhite/images/br-tl.gif</filename> + <filename>styles/background/purewhite/images/br-tr.gif</filename> + <filename>styles/background/purewhite/images/bt-bl.gif</filename> + <filename>styles/background/purewhite/images/bt-br.gif</filename> + <filename>styles/background/purewhite/images/bt-tl.gif</filename> + <filename>styles/background/purewhite/images/bt-tr.gif</filename> + <filename>styles/background/purewhite/images/bub1-bl.gif</filename> + <filename>styles/background/purewhite/images/bub1-br.gif</filename> + <filename>styles/background/purewhite/images/bub1-tl.gif</filename> + <filename>styles/background/purewhite/images/bub1-tr.gif</filename> + <filename>styles/background/purewhite/images/bub2-bl.gif</filename> + <filename>styles/background/purewhite/images/bub2-br.gif</filename> + <filename>styles/background/purewhite/images/bub2-tl.gif</filename> + <filename>styles/background/purewhite/images/bub2-tr.gif</filename> + <filename>styles/background/purewhite/images/bub3-bl.gif</filename> + <filename>styles/background/purewhite/images/bub3-br.gif</filename> + <filename>styles/background/purewhite/images/bub3-tl.gif</filename> + <filename>styles/background/purewhite/images/bub3-tr.gif</filename> + <filename>styles/background/purewhite/images/bub4-bl.gif</filename> + <filename>styles/background/purewhite/images/bub4-br.gif</filename> + <filename>styles/background/purewhite/images/bub4-tl.gif</filename> + <filename>styles/background/purewhite/images/bub4-tr.gif</filename> + <filename>styles/background/purewhite/images/c-bg1.gif</filename> + <filename>styles/background/purewhite/images/c-bg2.gif</filename> + <filename>styles/background/purewhite/images/checklist-bg.gif</filename> + <filename>styles/background/purewhite/images/cw-bg1.gif</filename> + <filename>styles/background/purewhite/images/cw-bg2.gif</filename> + <filename>styles/background/purewhite/images/cw-bg3.gif</filename> + <filename>styles/background/purewhite/images/cwf-bg.gif</filename> + <filename>styles/background/purewhite/images/download-bg.gif</filename> + <filename>styles/background/purewhite/images/icon_list.gif</filename> + <filename>styles/background/purewhite/images/ol-bg.gif</filename> + <filename>styles/background/purewhite/images/sc-q.gif</filename> + <filename>styles/background/purewhite/images/so-q.gif</filename> + <filename>styles/background/purewhite/images/star-bg.gif</filename> + <filename>styles/background/purewhite/images/sticky-bg.gif</filename> + <filename>styles/elements/blue/images/bullet3.gif</filename> + <filename>styles/elements/green/images/bullet3.gif</filename> + <filename>styles/elements/red/images/bullet3.gif</filename> + <filename>styles/header/blue/images/header-mask.png</filename> + <filename>styles/header/blue/images/icon-search.gif</filename> + <filename>styles/header/blue/images/opaque.png</filename> + <filename>styles/header/blue/images/vdot2.gif</filename> + <filename>styles/header/green/images/header-mask.png</filename> + <filename>styles/header/green/images/icon-search.gif</filename> + <filename>styles/header/green/images/opaque.png</filename> + <filename>styles/header/green/images/vdot2.gif</filename> + <filename>template_thumbnail.png</filename> + </images> + <css> + <filename>css/ja-sosdmenu.css</filename> + <filename>css/menu.css</filename> + <filename>css/template.css</filename> + <filename>css/template_rtl.css</filename> + <filename>styles/background/lighter/style.css</filename> + <filename>styles/background/purewhite/style.css</filename> + <filename>styles/elements/black/style.css</filename> + <filename>styles/elements/blue/style.css</filename> + <filename>styles/elements/green/style.css</filename> + <filename>styles/elements/red/style.css</filename> + <filename>styles/header/blue/style.css</filename> + <filename>styles/header/green/style.css</filename> + </css> + <languages> + <language tag="en-GB">en-GB.tpl_ja_purity.ini</language> + </languages> + <administration> + <languages> + <language tag="en-GB">admin/en-GB.tpl_ja_purity.ini</language> + </languages> + </administration> + + <positions> + <position>hornav</position> + <position>breadcrumbs</position> + <position>banner</position> + <position>left</position> + <position>right</position> + <position>top</position> + <position>user1</position> + <position>user2</position> + <position>user3</position> + <position>user4</position> + <position>user5</position> + <position>footer</position> + <position>syndicate</position> + <position>debug</position> + </positions> + + <params> + <param type="spacer" default="Template Logo" /> + <param name="logoType" type="list" default="image" label="Logo type" description="LOGO TYPE DESCRIPTION"> + <option value="image">Image</option> + <option value="text">Text</option> + </param> + <param name="logoText" type="text" default="" size="50" label="Logo text" description="LOGO TEXT DESCRIPTION" /> + <param name="sloganText" type="text" default="" size="50" label="Slogan" description="SLOGAN DESCRIPTION" /> + + <param type="spacer" default="Horizontal Navigation" /> + <param name="horNavType" type="list" default="moo" label="Horizontal Navigation Type" description="Suckerfish menu or JAMoo menu"> + <option value="moo">JAMoo Menu</option> + <option value="css">Suckerfish Menu</option> + </param> + + + <param type="spacer" default="Template Font Size" /> + <param name="ja_font" type="list" default="3" label="Font size" description="FONT SIZE DESCRIPTION"> + <option value="1">1</option> + <option value="2">2</option> + <option value="3">3</option> + <option value="4">4</option> + <option value="5">5</option> + <option value="6">6</option> + </param> + + <param type="spacer" default="Template_Width" /> + <param name="ja_screen" type="list" default="950" label="Template Width" description="TEMPLATE WIDTH DESCRIPTION"> + <option value="auto">AUTO</option> + <option value="750">Narrow Screen</option> + <option value="950">Wide Screen</option> + <option value="fluid">SPECIFIED PERCENTAGE</option> + <option value="fix">SPECIFIED PIXEL</option> + </param> + <param name="ja_screen_width" type="text" default="" label="Specified width" description="SPECIFIED WIDTH DESCRIPTION" /> + + <param type="spacer" default="Template Styles" /> + <param name="theme_header" type="folderlist" directory="templates/ja_purity/styles/header" default="" label="Header Themes" description="HEADER THEMES DESCRIPTION" /> + <param name="theme_background" type="folderlist" directory="templates/ja_purity/styles/background" default="" label="Background Themes" description="BACKGROUND THEMES DESCRIPTION" /> + <param name="theme_elements" type="folderlist" directory="templates/ja_purity/styles/elements" default="" label="Primary Elements" description="PRIMARY ELEMENTS DESCRIPTION" /> + + <param type="spacer" default="Right modules" /> + <param name="rightCollapsible" type="radio" default="1" label="Right modules collapsible function" description="RIGHT MODULES COLLAPSIBLE FUNCTION DESCRIPTION"> + <option value="1">Enable</option> + <option value="0">Disable</option> + </param> + <param name="rightCollapseDefault" type="radio" default="show" label="Default status" description="DEFAULT STATUS DESCRIPTION"> + <option value="show">Expand All</option> + <option value="hide">Collapse All</option> + </param> + <param name="excludeModules" type="text" default="38" size="50" label="Exclude Modules" description="EXCLUDE MODULES DESCRIPTION" /> + + </params> +</install> diff --git a/oss/joomla/trunk/templates/ja_purity/template_thumbnail.png b/oss/joomla/trunk/templates/ja_purity/template_thumbnail.png new file mode 100644 index 00000000..49d4efae Binary files /dev/null and b/oss/joomla/trunk/templates/ja_purity/template_thumbnail.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/component.php b/oss/joomla/trunk/templates/rhuk_milkyway/component.php new file mode 100644 index 00000000..5ffe2ca0 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/component.php @@ -0,0 +1,29 @@ +<?php +/** + * @copyright Copyright (C) 2005 - 2010 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( 'Restricted access' ); +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>"> +<head> + <jdoc:include type="head" /> + <link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/rhuk_milkyway/css/template.css" type="text/css" /> + +<?php if($this->direction == 'rtl') : ?> + <link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/rhuk_milkyway/css/template_rtl.css" type="text/css" /> +<?php endif; ?> +</head> +<body class="contentpane"> + <jdoc:include type="message" /> + <jdoc:include type="component" /> +</body> +</html> diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/css/black.css b/oss/joomla/trunk/templates/rhuk_milkyway/css/black.css new file mode 100644 index 00000000..3f1c1da8 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/css/black.css @@ -0,0 +1,41 @@ +/* black */ +a:link, a:visited { + color: #135cae; +} + +a:hover { + color: #0b3768; +} + +#pillmenu a:hover { + color: #135cae; +} + +#pillmenu a#active_menu-nav { + background: url(../images/black/mw_menu_active_bg.png) 0 0 repeat-x; + color: #fff; +} + +#pillmenu a#active_menu-nav:hover { + color: #fff; +} + +h3, .componentheading, table.moduletable th { + color: #135cae; +} + +div.module_menu { + background: url(../images/black/mw_box_br.png) 100% 100% no-repeat; +} + +div.module_menu div { + background: url(../images/black/mw_box_bl.png) 0 100% no-repeat; +} + +div.module_menu div div { + background: url(../images/black/mw_box_tr.png) 100% 0 no-repeat; +} + +div.module_menu div div div { + background: url(../images/black/mw_box_tl.png) 0 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/css/black_bg.css b/oss/joomla/trunk/templates/rhuk_milkyway/css/black_bg.css new file mode 100644 index 00000000..39bb5cf5 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/css/black_bg.css @@ -0,0 +1,36 @@ +/* black */ +#page_bg { + background: #333; +} + +div#wrapper { + background: #f7f7f7 url(../images/black/mw_shadow_l.png) 0 0 repeat-y; +} + +div#wrapper_r { + background: url(../images/black/mw_shadow_r.png) 100% 0 repeat-y; +} + +div#header { + background: url(../images/black/mw_header_t.png) 0 0 repeat-x; +} + +div#header_l { + background: url(../images/black/mw_header_t_l.png) 0 0 no-repeat; +} + +div#header_r { + background: url(../images/black/mw_header_t_r.png) 100% 0 no-repeat; +} + +div#footer { + background: #f7f7f7 url(../images/black/mw_footer_b.png) 0 100% repeat-x; +} + +div#footer_l { + background: url(../images/black/mw_footer_b_l.png) 0 0 no-repeat; +} + +div#footer_r { + background: url(../images/black/mw_footer_b_r.png) 100% 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/css/blue.css b/oss/joomla/trunk/templates/rhuk_milkyway/css/blue.css new file mode 100644 index 00000000..c6b23b2b --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/css/blue.css @@ -0,0 +1,41 @@ +/* blue */ +a:link, a:visited { + color: #135cae; +} + +a:hover { + color: #0b3768; +} + +#pillmenu a:hover { + color: #135cae; +} + +#pillmenu a#active_menu-nav { + background: url(../images/blue/mw_menu_active_bg.png) repeat-x; + color: #fff; +} + +#pillmenu a#active_menu-nav:hover { + color: #fff; +} + +h3, .componentheading, table.moduletable th { + color: #135cae; +} + +div.module_menu { + background: url(../images/blue/mw_box_br.png) 100% 100% no-repeat; +} + +div.module_menu div { + background: url(../images/blue/mw_box_bl.png) 0 100% no-repeat; +} + +div.module_menu div div { + background: url(../images/blue/mw_box_tr.png) 100% 0 no-repeat; +} + +div.module_menu div div div { + background: url(../images/blue/mw_box_tl.png) 0 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/css/blue_bg.css b/oss/joomla/trunk/templates/rhuk_milkyway/css/blue_bg.css new file mode 100644 index 00000000..1e09ba8e --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/css/blue_bg.css @@ -0,0 +1,36 @@ +/* blue */ +#page_bg { + background: #0C3A6D; +} + +div#wrapper { + background: #f7f7f7 url(../images/blue/mw_shadow_l.png) 0 0 repeat-y; +} + +div#wrapper_r { + background: url(../images/blue/mw_shadow_r.png) 100% 0 repeat-y; +} + +div#header { + background: url(../images/blue/mw_header_t.png) 0 0 repeat-x; +} + +div#header_l { + background: url(../images/blue/mw_header_t_l.png) 0 0 no-repeat; +} + +div#header_r { + background: url(../images/blue/mw_header_t_r.png) 100% 0 no-repeat; +} + +div#footer { + background: #f7f7f7 url(../images/blue/mw_footer_b.png) 0 100% repeat-x; +} + +div#footer_l { + background: url(../images/blue/mw_footer_b_l.png) 0 0 no-repeat; +} + +div#footer_r { + background: url(../images/blue/mw_footer_b_r.png) 100% 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/css/green.css b/oss/joomla/trunk/templates/rhuk_milkyway/css/green.css new file mode 100644 index 00000000..57979c02 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/css/green.css @@ -0,0 +1,41 @@ +/* green */ +a:link, a:visited { + color: #4ba123; +} + +a:hover { + color: #316b16; +} + +#pillmenu a:hover { + color: #4ba123; +} + +#pillmenu a#active_menu-nav { + background: url(../images/green/mw_menu_active_bg.png) 0 0 repeat-x; + color: #fff; +} + +#pillmenu a#active_menu-nav:hover { + color: #fff; +} + +h3, .componentheading, table.moduletable th { + color: #4ba123; +} + +div.module_menu { + background: url(../images/green/mw_box_br.png) 100% 100% no-repeat; +} + +div.module_menu div { + background: url(../images/green/mw_box_bl.png) 0 100% no-repeat; +} + +div.module_menu div div { + background: url(../images/green/mw_box_tr.png) 100% 0 no-repeat; +} + +div.module_menu div div div { + background: url(../images/green/mw_box_tl.png) 0 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/css/green_bg.css b/oss/joomla/trunk/templates/rhuk_milkyway/css/green_bg.css new file mode 100644 index 00000000..ae58cc4d --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/css/green_bg.css @@ -0,0 +1,36 @@ +/* green */ +#page_bg { + background: #316b16; +} + +div#wrapper { + background: #f7f7f7 url(../images/green/mw_shadow_l.png) 0 0 repeat-y; +} + +div#wrapper_r { + background: url(../images/green/mw_shadow_r.png) 100% 0 repeat-y; +} + +div#header { + background: url(../images/green/mw_header_t.png) 0 0 repeat-x; +} + +div#header_l { + background: url(../images/green/mw_header_t_l.png) 0 0 no-repeat; +} + +div#header_r { + background: url(../images/green/mw_header_t_r.png) 100% 0 no-repeat; +} + +div#footer { + background: #f7f7f7 url(../images/green/mw_footer_b.png) 0 100% repeat-x; +} + +div#footer_l { + background: url(../images/green/mw_footer_b_l.png) 0 0 no-repeat; +} + +div#footer_r { + background: url(../images/green/mw_footer_b_r.png) 100% 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/css/ieonly.css b/oss/joomla/trunk/templates/rhuk_milkyway/css/ieonly.css new file mode 100644 index 00000000..5e2222ef --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/css/ieonly.css @@ -0,0 +1,20 @@ +/* IE ONLY CSS */ + +body.width_fmax div#wrapper { + width: expression(((document.body.clientWidth)) < 751? "750px": ((document.body.clientWidth)) > 1050? "1050px": "auto" ); +} + +div.module_menu div div div { + width: 100%; +} + +div#footer { + width: 100%; +} + +div#whitebox_b { + width: 100%; +} +#pathway { + float: left; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/css/index.html b/oss/joomla/trunk/templates/rhuk_milkyway/css/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/css/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/css/orange.css b/oss/joomla/trunk/templates/rhuk_milkyway/css/orange.css new file mode 100644 index 00000000..2b815dd4 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/css/orange.css @@ -0,0 +1,41 @@ +/* orange */ +a:link, a:visited { + color: #cd6620; +} + +a:hover { + color: #ac5419; +} + +#pillmenu a:hover { + color: #cd6620; +} + +#pillmenu a#active_menu-nav { + background: url(../images/orange/mw_menu_active_bg.png) 0 0 repeat-x; + color: #fff; +} + +#pillmenu a#active_menu-nav:hover { + color: #fff; +} + +h3, .componentheading, table.moduletable th { + color: #cd6620; +} + +div.module_menu { + background: url(../images/orange/mw_box_br.png) 100% 100% no-repeat; +} + +div.module_menu div { + background: url(../images/orange/mw_box_bl.png) 0 100% no-repeat; +} + +div.module_menu div div { + background: url(../images/orange/mw_box_tr.png) 100% 0 no-repeat; +} + +div.module_menu div div div { + background: url(../images/orange/mw_box_tl.png) 0 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/css/orange_bg.css b/oss/joomla/trunk/templates/rhuk_milkyway/css/orange_bg.css new file mode 100644 index 00000000..52bd2c14 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/css/orange_bg.css @@ -0,0 +1,36 @@ +/* orange */ +#page_bg { + background: #ac5419; +} + +div#wrapper { + background: #f7f7f7 url(../images/orange/mw_shadow_l.png) 0 0 repeat-y; +} + +div#wrapper_r { + background: url(../images/orange/mw_shadow_r.png) 100% 0 repeat-y; +} + +div#header { + background: url(../images/orange/mw_header_t.png) 0 0 repeat-x; +} + +div#header_l { + background: url(../images/orange/mw_header_t_l.png) 0 0 no-repeat; +} + +div#header_r { + background: url(../images/orange/mw_header_t_r.png) 100% 0 no-repeat; +} + +div#footer { + background: #f7f7f7 url(../images/orange/mw_footer_b.png) 0 100% repeat-x; +} + +div#footer_l { + background: url(../images/orange/mw_footer_b_l.png) 0 0 no-repeat; +} + +div#footer_r { + background: url(../images/orange/mw_footer_b_r.png) 100% 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/css/red.css b/oss/joomla/trunk/templates/rhuk_milkyway/css/red.css new file mode 100644 index 00000000..93c51d43 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/css/red.css @@ -0,0 +1,41 @@ +/* red */ +a:link, a:visited { + color: #a10f15; +} + +a:hover { + color: #7b0b12; +} + +#pillmenu a:hover { + color: #a10f15; +} + +#pillmenu a#active_menu-nav { + background: url(../images/red/mw_menu_active_bg.png) 0 0 repeat-x; + color: #fff; +} + +#pillmenu a#active_menu-nav:hover { + color: #fff; +} + +h3, .componentheading, table.moduletable th { + color: #a10f15; +} + +div.module_menu { + background: url(../images/red/mw_box_br.png) 100% 100% no-repeat; +} + +div.module_menu div { + background: url(../images/red/mw_box_bl.png) 0 100% no-repeat; +} + +div.module_menu div div { + background: url(../images/red/mw_box_tr.png) 100% 0 no-repeat; +} + +div.module_menu div div div { + background: url(../images/red/mw_box_tl.png) 0 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/css/red_bg.css b/oss/joomla/trunk/templates/rhuk_milkyway/css/red_bg.css new file mode 100644 index 00000000..a5ddf829 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/css/red_bg.css @@ -0,0 +1,36 @@ +/* red */ +#page_bg { + background: #640b0f; +} + +div#wrapper { + background: #f7f7f7 url(../images/red/mw_shadow_l.png) 0 0 repeat-y; +} + +div#wrapper_r { + background: url(../images/red/mw_shadow_r.png) 100% 0 repeat-y; +} + +div#header { + background: url(../images/red/mw_header_t.png) 0 0 repeat-x; +} + +div#header_l { + background: url(../images/red/mw_header_t_l.png) 0 0 no-repeat; +} + +div#header_r { + background: url(../images/red/mw_header_t_r.png) 100% 0 no-repeat; +} + +div#footer { + background: #f7f7f7 url(../images/red/mw_footer_b.png) 0 100% repeat-x; +} + +div#footer_l { + background: url(../images/red/mw_footer_b_l.png) 0 0 no-repeat; +} + +div#footer_r { + background: url(../images/red/mw_footer_b_r.png) 100% 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/css/template.css b/oss/joomla/trunk/templates/rhuk_milkyway/css/template.css new file mode 100644 index 00000000..d5405735 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/css/template.css @@ -0,0 +1,806 @@ +/*****************************/ +/*** Core html setup stuff ***/ +/*****************************/ + +html { + height: 100%; + margin-bottom: 1px; +} + +form { + margin: 0; + padding: 0; +} + +body { + font-family: Helvetica,Arial,sans-serif; + line-height: 1.3em; + margin: 0px 0px 0px 0px; + font-size: 12px; + color: #333; +} + +a:link, a:visited { + text-decoration: none; + font-weight: normal; +} + +a:hover { + text-decoration: underline; + font-weight: normal; +} + +input.button { cursor: pointer; } + +p { margin-top: 0; margin-bottom: 5px; } + +img { border: 0 none; } + +/*****************************************/ +/*** Template specific layout elements ***/ +/*****************************************/ +#page_bg { + padding: 10px 0; + margin-bottom: 1px; +} + +div.center { + text-align: center; +} + +div#wrapper { + margin-left: auto; + margin-right: auto; +} + +body.width_medium div#wrapper { + width: 950px; +} + +body.width_small div#wrapper { + width: 773px; +} + +body.width_fmax div#wrapper { + min-width: 750px; + max-width: 1050px; +} + +div#header_l { + position: relative; +} + +div#header_r { + height: 90px; + padding-left: 370px; + padding-right: 30px; + padding-top: 25px; + overflow: hidden; + text-align: left; +} + +div#logo { + position: absolute; + left: 0; + top: 0; + float: left; + width: 298px; + height: 75px; + background: url(../images/mw_joomla_logo.png) 0 0 no-repeat; + margin-left: 30px; + margin-top: 25px; +} + +div#newsflash { + width: auto; + margin-left: 350px; + margin-right: 30px; + border: 1px solid #00f; +} + +div#tabarea { + background: #f7f7f7 url(../images/mw_header_b.png) 0 0 repeat-x; + margin: 0 11px; + +} + +div#tabarea_l { + background: url(../images/mw_header_l_b.png) 0 0 no-repeat; + padding-left: 32px; +} + +div#tabarea_r { + height: 42px; + background: url(../images/mw_header_r_b.png) 100% 0 no-repeat; + padding-right: 1px; +} + +div#footer_r { + padding-top: 10px; + height: 47px; + overflow: hidden; +} + +div#footer_r div { + text-align: center; + font-size: .90em; + color: #aaa; +} + +div#footer_r a:link, div#footer_r a:visited { + color: #999; +} + +div#footerspacer { + height: 10px; +} + +#pathway { + padding: 0px 10px 8px; + width: auto; + margin-top: -2px; + margin-right: 250px; + text-align: left; +} + +#search { + float: right; + width:320px; + margin-top: -20px; + margin-right: 30px; + height: 40px; + overflow: hidden; + text-align:right; +} + +form#searchForm input { + vertical-align: middle; +} + +form#searchForm table { + border-collapse: collapse; +} + +form#searchForm td { + padding:0; +} + +#mod_search_searchword { + padding-left: 3px; +} + +#area { + padding: 0; +} + +#whitebox { + margin: 0 21px 0px 21px; + background: #fff; + width: auto; +} + +#whitebox div { + text-align: left; +} + +#whitebox_t { + background: #fff url(../images/mw_content_t.png) 0 0 repeat-x; +} + +#whitebox_tl { + background: url(../images/mw_content_t_l.png) 0 0 no-repeat; +} + +#whitebox_tr { + height: 10px; + overflow: hidden; + background: url(../images/mw_content_t_r.png) 100% 0 no-repeat; +} + +#whitebox_m { + border-left: 1px solid #ccc; + border-right: 1px solid #ccc; + width: auto; + padding: 1px 8px; +} + +#whitebox_b { + margin-top: -5px; + background: url(../images/mw_content_b.png) 0 100% repeat-x; +} + +#whitebox_bl { + background: url(../images/mw_content_b_l.png) 0 100% no-repeat; +} + +#whitebox_br { + height: 13px; + background: url(../images/mw_content_b_r.png) 100% 100% no-repeat; +} + +/* horizontal pill menu */ +table.pill { + margin-left: auto; + margin-right: auto; + padding: 0; +} + +td.pill_l { + background: url(../images/mw_menu_cap_l.png) no-repeat; + width: 20px; + height: 32px; + +} + +td.pill_m { + background: url(../images/mw_menu_normal_bg.png) repeat-x; + padding: 0; + margin: 0; + width: auto; +} + +td.pill_r { + background: url(../images/mw_menu_cap_r.png) no-repeat; + width: 19px; + height: 32px; +} + +#pillmenu { + white-space: nowrap; + height: 32px; + float: left; +} + +#pillmenu ul { + margin: 0; + padding: 0; + list-style:none; +} + +#pillmenu li { + float: left; + background: url(../images/mw_menu_separator.png) top right no-repeat; + margin: 0; + padding: 0; +} + +#pillmenu a { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + font-weight: bold; + float:left; + display:block; + height: 24px; + line-height: 24px; + padding: 0 20px; + color: #000; + text-decoration: none; +} + +#pillmenu a#active_menu-nav { + margin-top:2px; + height: 21px; + line-height: 21px; + background-position: 0 0; +} + +#leftcolumn { + padding: 0; + margin: 0; + width: 20%; + float:left; +} + +#maincolumn, +#maincolumn_full { + margin-left: 20%; + padding-left: 15px; + width: 75%; +} + +#maincolumn_full { + margin-left: 0; + padding: 0; + width: 100%; +} + +table.nopad { + width: 100%; + border-collapse: collapse; + padding: 0; + margin: 0; + margin-bottom: 15px; +} + +table.nopad td.middle_pad { + width: 20px; +} + +/*****************************************/ +/*** Joomla! specific content elements ***/ +/*****************************************/ + +div.offline { + background: #fffebb; + width: 100%; + position: absolute; + top: 0; + left: 0; + font-size: 1.2em; + padding: 5px; +} + +span.pathway { + display: block; + margin: 0 20px; + height: 16px; + line-height: 16px; + overflow: hidden; +} + +/* headers */ +div.componentheading { + padding-left: 0px; +} + +h1 { + padding: 0; + font-family:Helvetica ,Arial,sans-serif; + font-size: 1.3em; + font-weight: bold; + vertical-align: bottom; + color: #666; + text-align: left; + width: 100%; +} + +h2, .contentheading { + padding: 0; + font-family: Arial, Helvetica,sans-serif; + font-size: 1.4em; + font-weight: normal; + vertical-align: bottom; + color: #333; + text-align: left; + width: 100%; +} + +table.contentpaneopen h3 { + margin-top: 25px; +} + +h4 { + font-family: Arial, Helvetica, sans-serif; + color: #333; +} + +h3, .componentheading, table.moduletable th, legend { + margin: 0; + font-weight: bold; + font-family: Helvetica,Arial,sans-serif; + font-size: 1.5em; + padding-left: 0px; + margin-bottom: 10px; + text-align: left; +} + +/* small text */ +.small { + font-size: .90em; + color: #999; + font-weight: normal; + text-align: left; +} + +.modifydate { + height: 20px; + vertical-align: bottom; + font-size: .90em; + color: #999; + font-weight: normal; + text-align: left; +} + +.createdate { + height: 20px; + vertical-align: top; + font-size: .90em; + color: #999; + font-weight: normal; + vertical-align: top; + padding-bottom: 5px; + padding-top: 0px; + +} + +a.readon { + margin-top: 10px; + display: block; + float: left; + background: url(../images/mw_readon.png) top right no-repeat; + padding-right: 20px; + line-height: 14px; + height: 16px; +} + +/* form validation */ +.invalid { border-color: #ff0000; } +label.invalid { color: #ff0000; } + + +/** overlib **/ + +.ol-foreground { + background-color: #f6f6f6; +} + +.ol-background { + background-color: #666; +} + +.ol-textfont { + font-family: Arial, Helvetica, sans-serif; + font-size: 10px; +} + +.ol-captionfont { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + color: #f6f6f6; + font-weight: bold; +} +.ol-captionfont a { + color: #0B55C4; + text-decoration: none; + font-size: 12px; +} + +.ol-closefont {} + +/* menu links */ +a.mainlevel:link, a.mainlevel:visited { + padding-left: 5px; +} + +a.mainlevel:hover { + +} + +/* spacers */ +span.article_separator { + display: block; + height: 20px; +} + +.article_column { + padding-right: 5px; +} + +.column_separator { + border-left: 1px dashed #e0e0e0; + padding-left: 10px; +} + +td.buttonheading { + +} + +td.buttonheading img { + border:none; +} + +.clr { + clear: both; +} + +td.greyline { + width: 20px; + background: url(../images/mw_line_grey.png) 50% 0 repeat-y; +} + +div#maindivider { + border-top: 1px solid #ddd; + margin-bottom: 10px; + overflow: hidden; + height: 1px; +} + +table.blog span.article_separator { + display: block; + height: 20px; +} + +/* edit button */ +.contentpaneopen_edit{ + float: left; +} + +/* table of contents */ +table.contenttoc { + margin: 5px; + border: 1px solid #ccc; + padding: 5px; + float: right; +} + +table.contenttoc td { + padding: 0 5px; +} + + +/* content tables */ +td.sectiontableheader { + background: #efefef; + color: #333; + font-weight: bold; + padding: 4px; + border-right: 1px solid #fff; +} + +tr.sectiontableentry0 td, +tr.sectiontableentry1 td, +tr.sectiontableentry2 td { + padding: 4px; +} + +td.sectiontableentry0, +td.sectiontableentry1, +td.sectiontableentry2 { + padding: 3px; +} + + +/* content styles */ +table.contentpaneopen, table.contentpane { + margin: 0; + padding: 0; + width: 100%; +} + +table.contentpaneopen li { + margin-bottom: 5px; +} + +table.contentpaneopen fieldset { + border: 0; + border-top: 1px solid #ddd; +} + +table.contentpaneopen h3 { + margin-top: 25px; +} + +table.contentpaneopen h4 { + font-family: Arial, Helvetica, sans-serif; + color: #333; +} + +.highlight { + background-color: #fffebb; +} + +/* module control elements */ +table.user1user2 div.moduletable { + margin-bottom: 0px; +} + +div.moduletable, div.module { + margin-bottom: 25px; +} + +div.module_menu h3 { + font-family: Helvetica, Arial, sans-serif; + font-size: 12px; + font-weight: bold; + color: #eee; + margin: -23px -4px 5px -5px; + padding-left: 10px; + padding-bottom: 2px; +} + +div.module_menu { + margin: 0; + padding: 0; + margin-bottom: 15px; +} + +div.module_menu div div div { + padding: 10px; + padding-top: 30px; + padding-bottom: 15px; + width: auto; +} + +div.module_menu div div div div { + background: none; + padding: 0; +} + +div.module_menu ul { + margin: 10px 0; + padding-left: 20px; +} + +div.module_menu ul li a:link, div.module_menu ul li a:visited { + font-weight: bold; +} + +#leftcolumn div.module { + padding: 0 10px; +} + +#leftcolumn div.module table { + width: auto; +} + +/* forms */ +table.adminform textarea { + width: 540px; + height: 400px; + font-size: 1em; + color: #000099; +} + +div.search input { + width: 145px; + border: 1px solid #ccc; + margin: 15px 0 10px 0; +} + +form#form-login fieldset { border: 0 none; margin: 0em; padding: 0.2em;} +form#form-login ul { padding-left: 20px; } + +form#com-form-login fieldset { border: 0 none; margin: 0em; padding: 0.2em;} +form#com-form-login ul { padding-left: 20px; } + +/* thumbnails */ +div.mosimage { margin: 5px; } +div.mosimage_caption { font-size: .90em; color: #666; } + +div.caption { padding: 0 10px 0 10px; } +div.caption img { border: 1px solid #CCC; } +div.caption p { font-size: .90em; color: #666; text-align: center; } + +div.img_caption { padding: 0 10px 0 10px; } +div.img_caption img { border: 1px solid #CCC; } +div.img_caption p { font-size: .90em; color: #666; text-align: center; } + +/* Parameter Table */ +table.paramlist { + margin-top: 5px; +} + +table.paramlist td.paramlist_key { + width: 128px; + text-align: left; + height: 30px; +} + +table.paramlist td.paramlist_value { +} + +div.message { + font-family : "Trebuchet MS", Arial, Helvetica, sans-serif; + font-weight: bold; + font-size : 14px; + color : #c30; + text-align: center; + width: auto; + background-color: #f9f9f9; + border: solid 1px #d5d5d5; + margin: 3px 0px 10px; + padding: 3px 20px; +} + +/* Banners module */ + +/* Default skyscraper style */ +.bannergroup { +} + +.banneritem img { + display: block; + margin-left: auto; + margin-right: auto; +} + +/* Text advert style */ + +.banneritem_text { + padding: 4px; + font-size: 11px; +} + +.bannerfooter_text { + padding: 4px; + font-size: 11px; + background-color: #F7F7F7; + text-align: right; +} + +/* System Messages */ +/* see system general.css */ + +.pagination span { padding: 2px; } +.pagination a { padding: 2px; } + +/* Polls */ +.pollstableborder td { + text-align: left; +} + +/* WebLinks */ +span.description { + display:block; + padding-left: 30px; +} + +/* Frontend Editing*/ +fieldset { + border: 1px solid #ccc; + margin-top: 15px; + padding: 15px; +} + +legend { + margin: 0; + padding: 0 10px; +} + +td.key { + border-bottom:1px solid #eee; + color: #666; +} + +/* Tooltips */ + +.tool-tip { + float: left; + background: #ffc; + border: 1px solid #D4D5AA; + padding: 5px; + max-width: 200px; +} + +.tool-title { + padding: 0; + margin: 0; + font-size: 100%; + font-weight: bold; + margin-top: -15px; + padding-top: 15px; + padding-bottom: 5px; + background: url(../../system/images/selector-arrow.png) no-repeat; +} + +.tool-text { + font-size: 100%; + margin: 0; +} + +/* System Standard Messages */ +#system-message { margin-bottom: 20px; } + +#system-message dd.message ul { background: #C3D2E5 url(../../system/images/notice-info.png) 4px center no-repeat;border-top: 3px solid #DE7A7B; border-bottom: 3px solid #DE7A7B; margin:0px; padding-left: 40px; text-indent:0px;} + +/* System Error Messages */ +#system-message dd.error ul { color: #c00; background: #E6C0C0 url(../../system/images/notice-alert.png) 4px center no-repeat; border-top: 3px solid #DE7A7B; border-bottom: 3px solid #DE7A7B; margin:0px; padding-left: 40px; text-indent:0px;} + +/* System Notice Messages */ +#system-message dd.notice ul { color: #c00; background: #EFE7B8 url(../../system/images/notice-note.png) 4px center no-repeat; border-top: 3px solid #F0DC7E; border-bottom: 3px solid #F0DC7E; margin:0px; padding-left: 40px; text-indent:0px;} + +#syndicate{ + float:left; + padding-left: 25px; +} + +#power_by{ + float:right; + padding-right: 25px; +} + +/* Component Specific Fixes */ + +#component-contact table td { + padding: 2px 0; +} diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/css/template_rtl.css b/oss/joomla/trunk/templates/rhuk_milkyway/css/template_rtl.css new file mode 100644 index 00000000..75f61896 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/css/template_rtl.css @@ -0,0 +1,192 @@ +/** + * @version $Id: template_rtl.css 9141 2007-10-04 08:23:14Z mtk $ + * @package Joomla + * @subpackage Template-rhuk_milkway + * @copyright Copyright (C) 2005 - 2010 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. + */ + + /** + * Joomla! 1.5 rhuk_milkway template RTL css file + * + * @author Mati Kochen + * @package Joomla + * @since 1.5 + * @version 1.0 + */ + +body{ + direction: rtl; +} + +div#logo { + float:right; + right:0pt; + left:auto; + margin-left:0px; + margin-right:30px; +} + +div#header_r { + text-align:right; + padding-right:370px; + padding-left:30px; +} + +td.pill_m { + background: url(../images/mw_menu_normal_bg.png) repeat-x; +} + +td.pill_r { + background:transparent url(../images/mw_menu_cap_l.png) no-repeat scroll 0%; +} + +td.pill_l { + background:transparent url(../images/mw_menu_cap_r.png) no-repeat scroll 0%; +} + +#pillmenu { + float:none; +} + +#pillmenu ul { + width: 420px; +} + +#pillmenu li{ + float: right; +} + +#pillmenu a { + float:none; + padding: 0px 10px; +} + +#search{ + float: left; + margin-right: 0px; + margin-left: 30px; + text-align: left; +} + +#mod_search_searchword { + padding-right:3px; +} + +#pathway{ + margin-left: 250px; + margin-right: 0px; + text-align: right; +} + +#whitebox div { + text-align:right; +} + +#leftcolumn { + float:right; +} + +#maincolumn, #maincolumn_full { + margin-right: 20%; + margin-left: 0%; + padding-right: 15px; + padding-left: 0px; +} + +h3, .componentheading, table.moduletable th, legend{ + text-align: right; +} + +div.module_menu h3{ + padding-right: 10px; + padding-left: 0px; +} + +div.module_menu ul{ + padding-right: 20px; + padding-left: 0px; +} + +h1 { + text-align: right; +} + +h2, .contentheading{ + text-align: right; +} + +td.buttonheading { + text-align:left; +} + +.small, .modifydate{ + text-align: right; +} + +.pollstableborder td { + text-align:right; +} + +.article_column { + padding-right:0px; + padding-left:5px; +} + +.column_separator { + border-right: 1px dashed #E0E0E0; + border-left: none; + padding-right: 10px; + padding-left: 0px; +} + +form#form-login ul { + padding-right: 20px; + padding-left: 0px; +} + +form#com-form-login ul { + padding-right: 20px; + padding-left: 0px; +} + +a.readon { + background:transparent url(../images/mw_readon_rtl.png) no-repeat scroll left top; + float:right; + padding-right:0px; + padding-left:20px; +} + +#syndicate{ + float:right; + padding-left: 0px; + padding-right: 25px; +} + +#power_by{ + float:left; + padding-right: 0px; + padding-left: 25px; +} + +.contentpaneopen_edit { + float:right; +} + +table.contenttoc{ + float: left; +} + +span.pagination a{ + float: right; +} + +span.pagination span{ + float: right; + display: block; +} diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/css/white.css b/oss/joomla/trunk/templates/rhuk_milkyway/css/white.css new file mode 100644 index 00000000..c95583dd --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/css/white.css @@ -0,0 +1,45 @@ +/* white */ +a:link, a:visited { + color: #135cae; +} + +a:hover { + color: #0b3768; +} + +#pillmenu a:hover { + color: #135cae; +} + +#pillmenu a#active_menu-nav { + background: url(../images/white/mw_menu_active_bg.png) 0 0 repeat-x; + color: #fff; +} + +#pillmenu a#active_menu-nav:hover { + color: #fff; +} + +h3, div.module_menu h3, .componentheading, table.moduletable th { + color: #135cae; +} + +h3, .componentheading, table.moduletable th { + color: #135cae; +} + +div.module_menu { + background: url(../images/white/mw_box_br.png) 100% 100% no-repeat; +} + +div.module_menu div { + background: url(../images/white/mw_box_bl.png) 0 100% no-repeat; +} + +div.module_menu div div { + background: url(../images/white/mw_box_tr.png) 100% 0 no-repeat; +} + +div.module_menu div div div { + background: url(../images/white/mw_box_tl.png) 0 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/css/white_bg.css b/oss/joomla/trunk/templates/rhuk_milkyway/css/white_bg.css new file mode 100644 index 00000000..a48d0b91 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/css/white_bg.css @@ -0,0 +1,36 @@ +/* white */ +#page_bg { + background: #fff; +} + +div#wrapper { + background: #f7f7f7 url(../images/white/mw_shadow_l.png) 0 0 repeat-y; +} + +div#wrapper_r { + background: url(../images/white/mw_shadow_r.png) 100% 0 repeat-y; +} + +div#header { + background: url(../images/white/mw_header_t.png) 0 0 repeat-x; +} + +div#header_l { + background: url(../images/white/mw_header_t_l.png) 0 0 no-repeat; +} + +div#header_r { + background: url(../images/white/mw_header_t_r.png) 100% 0 no-repeat; +} + +div#footer { + background: #f7f7f7 url(../images/white/mw_footer_b.png) 0 100% repeat-x; +} + +div#footer_l { + background: url(../images/white/mw_footer_b_l.png) 0 0 no-repeat; +} + +div#footer_r { + background: url(../images/white/mw_footer_b_r.png) 100% 0 no-repeat; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/favicon.ico b/oss/joomla/trunk/templates/rhuk_milkyway/favicon.ico new file mode 100644 index 00000000..b5e79cb6 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/favicon.ico differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/html/index.html b/oss/joomla/trunk/templates/rhuk_milkyway/html/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/html/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/html/modules.php b/oss/joomla/trunk/templates/rhuk_milkyway/html/modules.php new file mode 100644 index 00000000..89b380b6 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/html/modules.php @@ -0,0 +1,43 @@ +<?php +/** + * @version $Id: modules.php 14401 2010-01-26 14:10:00Z louis $ + * @package Joomla + * @copyright Copyright (C) 2005 - 2010 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('Restricted access'); + +/** + * This is a file to add template specific chrome to module rendering. To use it you would + * set the style attribute for the given module(s) include in your template to use the style + * for each given modChrome function. + * + * eg. To render a module mod_test in the sliders style, you would use the following include: + * <jdoc:include type="module" name="test" style="slider" /> + * + * This gives template designers ultimate control over how modules are rendered. + * + * NOTICE: All chrome wrapping methods should be named: modChrome_{STYLE} and take the same + * two arguments. + */ + +/* + * Module chrome for rendering the module in a slider + */ +function modChrome_slider($module, &$params, &$attribs) +{ + jimport('joomla.html.pane'); + // Initialize variables + $sliders = & JPane::getInstance('sliders'); + $sliders->startPanel( JText::_( $module->title ), 'module' . $module->id ); + echo $module->content; + $sliders->endPanel(); +} +?> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/html/pagination.php b/oss/joomla/trunk/templates/rhuk_milkyway/html/pagination.php new file mode 100644 index 00000000..b0d71412 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/html/pagination.php @@ -0,0 +1,116 @@ +<?php +/** + * @version $Id: pagination.php 14401 2010-01-26 14:10:00Z louis $ + * @package Joomla + * @copyright Copyright (C) 2005 - 2010 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('Restricted access'); + +/** + * This is a file to add template specific chrome to pagination rendering. + * + * pagination_list_footer + * Input variable $list is an array with offsets: + * $list[limit] : int + * $list[limitstart] : int + * $list[total] : int + * $list[limitfield] : string + * $list[pagescounter] : string + * $list[pageslinks] : string + * + * pagination_list_render + * Input variable $list is an array with offsets: + * $list[all] + * [data] : string + * [active] : boolean + * $list[start] + * [data] : string + * [active] : boolean + * $list[previous] + * [data] : string + * [active] : boolean + * $list[next] + * [data] : string + * [active] : boolean + * $list[end] + * [data] : string + * [active] : boolean + * $list[pages] + * [{PAGE}][data] : string + * [{PAGE}][active] : boolean + * + * pagination_item_active + * Input variable $item is an object with fields: + * $item->base : integer + * $item->link : string + * $item->text : string + * + * pagination_item_inactive + * Input variable $item is an object with fields: + * $item->base : integer + * $item->link : string + * $item->text : string + * + * This gives template designers ultimate control over how pagination is rendered. + * + * NOTE: If you override pagination_item_active OR pagination_item_inactive you MUST override them both + */ + +function pagination_list_footer($list) +{ + $html = "<div class=\"list-footer\">\n"; + + $html .= "\n<div class=\"limit\">".JText::_('Display Num').$list['limitfield']."</div>"; + $html .= $list['pageslinks']; + $html .= "\n<div class=\"counter\">".$list['pagescounter']."</div>"; + + $html .= "\n<input type=\"hidden\" name=\"limitstart\" value=\"".$list['limitstart']."\" />"; + $html .= "\n</div>"; + + return $html; +} + +function pagination_list_render($list) +{ + // Initialize variables + $html = "<span class=\"pagination\">"; + $html .= '<span>«</span>'.$list['start']['data']; + $html .= $list['previous']['data']; + + foreach( $list['pages'] as $page ) + { + if($page['data']['active']) { + $html .= '<strong>'; + } + + $html .= $page['data']; + + if($page['data']['active']) { + $html .= '</strong>'; + } + } + + $html .= $list['next']['data']; + $html .= $list['end']['data']; + $html .= '<span>»</span>'; + + $html .= "</span>"; + return $html; +} + +function pagination_item_active(&$item) { + return "<a href=\"".$item->link."\" title=\"".$item->text."\">".$item->text."</a>"; +} + +function pagination_item_inactive(&$item) { + return "<span>".$item->text."</span>"; +} +?> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/_mw_joomla_logo.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/_mw_joomla_logo.png new file mode 100644 index 00000000..b1775756 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/_mw_joomla_logo.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/arrow.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/arrow.png new file mode 100644 index 00000000..92f93616 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/arrow.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/black/index.html b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_box_bl.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_box_bl.png new file mode 100644 index 00000000..e553a09d Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_box_bl.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_box_br.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_box_br.png new file mode 100644 index 00000000..3f1307bd Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_box_br.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_box_tl.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_box_tl.png new file mode 100644 index 00000000..3fd8a393 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_box_tl.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_box_tr.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_box_tr.png new file mode 100644 index 00000000..492891b2 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_box_tr.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_footer_b.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_footer_b.png new file mode 100644 index 00000000..386c2f30 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_footer_b.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_footer_b_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_footer_b_l.png new file mode 100644 index 00000000..2d347969 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_footer_b_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_footer_b_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_footer_b_r.png new file mode 100644 index 00000000..343115c2 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_footer_b_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_header_t.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_header_t.png new file mode 100644 index 00000000..b00fce44 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_header_t.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_header_t_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_header_t_l.png new file mode 100644 index 00000000..c25dfa97 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_header_t_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_header_t_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_header_t_r.png new file mode 100644 index 00000000..b8ebf498 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_header_t_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_menu_active_bg.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_menu_active_bg.png new file mode 100644 index 00000000..67d484f3 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_menu_active_bg.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_shadow_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_shadow_l.png new file mode 100644 index 00000000..1d6f4c86 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_shadow_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_shadow_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_shadow_r.png new file mode 100644 index 00000000..d0df5857 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/black/mw_shadow_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/index.html b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_box_bl.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_box_bl.png new file mode 100644 index 00000000..03e59410 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_box_bl.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_box_br.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_box_br.png new file mode 100644 index 00000000..cd9d500e Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_box_br.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_box_tl.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_box_tl.png new file mode 100644 index 00000000..0e8c6ee5 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_box_tl.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_box_tr.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_box_tr.png new file mode 100644 index 00000000..87d38248 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_box_tr.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_footer_b.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_footer_b.png new file mode 100644 index 00000000..dd88b848 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_footer_b.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_footer_b_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_footer_b_l.png new file mode 100644 index 00000000..7a4b32f6 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_footer_b_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_footer_b_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_footer_b_r.png new file mode 100644 index 00000000..bb8380e3 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_footer_b_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_header_t.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_header_t.png new file mode 100644 index 00000000..72d182ba Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_header_t.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_header_t_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_header_t_l.png new file mode 100644 index 00000000..eb72e04b Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_header_t_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_header_t_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_header_t_r.png new file mode 100644 index 00000000..c074176e Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_header_t_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_menu_active_bg.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_menu_active_bg.png new file mode 100644 index 00000000..0cf7cb05 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_menu_active_bg.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_shadow_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_shadow_l.png new file mode 100644 index 00000000..cf53573d Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_shadow_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_shadow_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_shadow_r.png new file mode 100644 index 00000000..90a9aa95 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/blue/mw_shadow_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/green/index.html b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_box_bl.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_box_bl.png new file mode 100644 index 00000000..cc58c435 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_box_bl.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_box_br.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_box_br.png new file mode 100644 index 00000000..27b9cdba Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_box_br.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_box_tl.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_box_tl.png new file mode 100644 index 00000000..2b8b942e Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_box_tl.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_box_tr.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_box_tr.png new file mode 100644 index 00000000..71214f29 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_box_tr.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_footer_b.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_footer_b.png new file mode 100644 index 00000000..39818710 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_footer_b.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_footer_b_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_footer_b_l.png new file mode 100644 index 00000000..343f044e Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_footer_b_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_footer_b_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_footer_b_r.png new file mode 100644 index 00000000..b6db6064 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_footer_b_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_header_t.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_header_t.png new file mode 100644 index 00000000..c3124445 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_header_t.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_header_t_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_header_t_l.png new file mode 100644 index 00000000..6819f4eb Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_header_t_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_header_t_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_header_t_r.png new file mode 100644 index 00000000..f22fcc17 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_header_t_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_menu_active_bg.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_menu_active_bg.png new file mode 100644 index 00000000..fadcbd10 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_menu_active_bg.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_shadow_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_shadow_l.png new file mode 100644 index 00000000..31dab354 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_shadow_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_shadow_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_shadow_r.png new file mode 100644 index 00000000..a1e8db0a Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/green/mw_shadow_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/indent1.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/indent1.png new file mode 100644 index 00000000..cb9fd6b4 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/indent1.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/indent2.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/indent2.png new file mode 100644 index 00000000..00c96328 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/indent2.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/indent3.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/indent3.png new file mode 100644 index 00000000..9332e783 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/indent3.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/indent4.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/indent4.png new file mode 100644 index 00000000..97838e99 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/indent4.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/index.html b/oss/joomla/trunk/templates/rhuk_milkyway/images/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/images/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/login-bg.gif b/oss/joomla/trunk/templates/rhuk_milkyway/images/login-bg.gif new file mode 100644 index 00000000..cde836c8 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/login-bg.gif differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_b.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_b.png new file mode 100644 index 00000000..c4fb01fc Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_b.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_b_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_b_l.png new file mode 100644 index 00000000..4252805b Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_b_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_b_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_b_r.png new file mode 100644 index 00000000..969b71cc Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_b_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_t.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_t.png new file mode 100644 index 00000000..4f3192e9 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_t.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_t_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_t_l.png new file mode 100644 index 00000000..5f95d37b Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_t_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_t_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_t_r.png new file mode 100644 index 00000000..ffe64477 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_content_t_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_footer_separator.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_footer_separator.png new file mode 100644 index 00000000..a47026fb Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_footer_separator.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_header.jpg b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_header.jpg new file mode 100644 index 00000000..cf61a57d Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_header.jpg differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_header_b.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_header_b.png new file mode 100644 index 00000000..32f25d9e Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_header_b.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_header_l_b.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_header_l_b.png new file mode 100644 index 00000000..c24a09b5 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_header_l_b.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_header_r_b.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_header_r_b.png new file mode 100644 index 00000000..2618a6c0 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_header_r_b.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_joomla_logo.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_joomla_logo.png new file mode 100644 index 00000000..d23a1ae9 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_joomla_logo.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_line_grey.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_line_grey.png new file mode 100644 index 00000000..1b1b8bb8 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_line_grey.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_menu_cap_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_menu_cap_l.png new file mode 100644 index 00000000..08b2e8b9 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_menu_cap_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_menu_cap_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_menu_cap_r.png new file mode 100644 index 00000000..5a408889 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_menu_cap_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_menu_normal_bg.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_menu_normal_bg.png new file mode 100644 index 00000000..5133b2e1 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_menu_normal_bg.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_menu_separator.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_menu_separator.png new file mode 100644 index 00000000..2121292b Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_menu_separator.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_readon.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_readon.png new file mode 100644 index 00000000..56c38b29 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_readon.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_readon_rtl.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_readon_rtl.png new file mode 100644 index 00000000..fbc20c00 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/mw_readon_rtl.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/index.html b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_box_bl.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_box_bl.png new file mode 100644 index 00000000..958f6d5a Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_box_bl.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_box_br.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_box_br.png new file mode 100644 index 00000000..7146057c Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_box_br.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_box_tl.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_box_tl.png new file mode 100644 index 00000000..48394c3f Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_box_tl.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_box_tr.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_box_tr.png new file mode 100644 index 00000000..944be6ef Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_box_tr.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_footer_b.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_footer_b.png new file mode 100644 index 00000000..97a728c4 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_footer_b.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_footer_b_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_footer_b_l.png new file mode 100644 index 00000000..27d1fcfa Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_footer_b_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_footer_b_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_footer_b_r.png new file mode 100644 index 00000000..347f7a1a Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_footer_b_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_header_t.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_header_t.png new file mode 100644 index 00000000..dce0f0e5 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_header_t.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_header_t_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_header_t_l.png new file mode 100644 index 00000000..7d5382dd Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_header_t_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_header_t_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_header_t_r.png new file mode 100644 index 00000000..58428c33 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_header_t_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_menu_active_bg.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_menu_active_bg.png new file mode 100644 index 00000000..88a8be2f Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_menu_active_bg.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_shadow_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_shadow_l.png new file mode 100644 index 00000000..253cddd5 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_shadow_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_shadow_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_shadow_r.png new file mode 100644 index 00000000..b35e4317 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/orange/mw_shadow_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/red/index.html b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_box_bl.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_box_bl.png new file mode 100644 index 00000000..bcab1ec2 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_box_bl.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_box_br.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_box_br.png new file mode 100644 index 00000000..a8381a56 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_box_br.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_box_tl.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_box_tl.png new file mode 100644 index 00000000..addef039 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_box_tl.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_box_tr.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_box_tr.png new file mode 100644 index 00000000..21ab5581 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_box_tr.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_footer_b.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_footer_b.png new file mode 100644 index 00000000..04f4b64f Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_footer_b.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_footer_b_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_footer_b_l.png new file mode 100644 index 00000000..cbcce048 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_footer_b_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_footer_b_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_footer_b_r.png new file mode 100644 index 00000000..03e0a7d4 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_footer_b_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_header_t.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_header_t.png new file mode 100644 index 00000000..a98ec753 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_header_t.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_header_t_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_header_t_l.png new file mode 100644 index 00000000..55dce337 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_header_t_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_header_t_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_header_t_r.png new file mode 100644 index 00000000..73e3ea27 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_header_t_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_menu_active_bg.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_menu_active_bg.png new file mode 100644 index 00000000..479ff16c Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_menu_active_bg.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_shadow_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_shadow_l.png new file mode 100644 index 00000000..310e5958 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_shadow_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_shadow_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_shadow_r.png new file mode 100644 index 00000000..d6dd1875 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/red/mw_shadow_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/spacer.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/spacer.png new file mode 100644 index 00000000..b91e00da Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/spacer.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/white/index.html b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_box_bl.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_box_bl.png new file mode 100644 index 00000000..861a0f8d Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_box_bl.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_box_br.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_box_br.png new file mode 100644 index 00000000..b53e693b Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_box_br.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_box_tl.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_box_tl.png new file mode 100644 index 00000000..6b8eee8e Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_box_tl.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_box_tr.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_box_tr.png new file mode 100644 index 00000000..62dff3e9 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_box_tr.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_footer_b.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_footer_b.png new file mode 100644 index 00000000..04704756 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_footer_b.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_footer_b_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_footer_b_l.png new file mode 100644 index 00000000..689560e2 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_footer_b_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_footer_b_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_footer_b_r.png new file mode 100644 index 00000000..23df213d Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_footer_b_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_header_t.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_header_t.png new file mode 100644 index 00000000..5805868b Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_header_t.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_header_t_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_header_t_l.png new file mode 100644 index 00000000..8ddf9816 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_header_t_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_header_t_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_header_t_r.png new file mode 100644 index 00000000..c23f5cc5 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_header_t_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_menu_active_bg.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_menu_active_bg.png new file mode 100644 index 00000000..100acdbd Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_menu_active_bg.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_shadow_l.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_shadow_l.png new file mode 100644 index 00000000..a383e4d4 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_shadow_l.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_shadow_r.png b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_shadow_r.png new file mode 100644 index 00000000..cc81e833 Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/images/white/mw_shadow_r.png differ diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/index.html b/oss/joomla/trunk/templates/rhuk_milkyway/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/index.php b/oss/joomla/trunk/templates/rhuk_milkyway/index.php new file mode 100644 index 00000000..da142166 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/index.php @@ -0,0 +1,170 @@ +<?php +/** + * @copyright Copyright (C) 2005 - 2010 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( 'Restricted access' ); +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" > +<head> +<jdoc:include type="head" /> + +<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/system.css" type="text/css" /> +<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/general.css" type="text/css" /> +<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/rhuk_milkyway/css/template.css" type="text/css" /> +<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/rhuk_milkyway/css/<?php echo $this->params->get('colorVariation'); ?>.css" type="text/css" /> +<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/rhuk_milkyway/css/<?php echo $this->params->get('backgroundVariation'); ?>_bg.css" type="text/css" /> +<!--[if lte IE 6]> +<link href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template ?>/css/ieonly.css" rel="stylesheet" type="text/css" /> +<![endif]--> +<?php if($this->direction == 'rtl') : ?> + <link href="<?php echo $this->baseurl ?>/templates/rhuk_milkyway/css/template_rtl.css" rel="stylesheet" type="text/css" /> +<?php endif; ?> + +</head> +<body id="page_bg" class="color_<?php echo $this->params->get('colorVariation'); ?> bg_<?php echo $this->params->get('backgroundVariation'); ?> width_<?php echo $this->params->get('widthStyle'); ?>"> +<a name="up" id="up"></a> +<div class="center" align="center"> + <div id="wrapper"> + <div id="wrapper_r"> + <div id="header"> + <div id="header_l"> + <div id="header_r"> + <div id="logo"></div> + <jdoc:include type="modules" name="top" /> + </div> + </div> + </div> + + <div id="tabarea"> + <div id="tabarea_l"> + <div id="tabarea_r"> + <div id="tabmenu"> + <table cellpadding="0" cellspacing="0" class="pill"> + <tr> + <td class="pill_l"> </td> + <td class="pill_m"> + <div id="pillmenu"> + <jdoc:include type="modules" name="user3" /> + </div> + </td> + <td class="pill_r"> </td> + </tr> + </table> + </div> + </div> + </div> + </div> + + <div id="search"> + <jdoc:include type="modules" name="user4" /> + </div> + + <div id="pathway"> + <jdoc:include type="modules" name="breadcrumb" /> + </div> + + <div class="clr"></div> + + <div id="whitebox"> + <div id="whitebox_t"> + <div id="whitebox_tl"> + <div id="whitebox_tr"></div> + </div> + </div> + + <div id="whitebox_m"> + <div id="area"> + <jdoc:include type="message" /> + + <div id="leftcolumn"> + <?php if($this->countModules('left')) : ?> + <jdoc:include type="modules" name="left" style="rounded" /> + <?php endif; ?> + </div> + + <?php if($this->countModules('left')) : ?> + <div id="maincolumn"> + <?php else: ?> + <div id="maincolumn_full"> + <?php endif; ?> + <?php if($this->countModules('user1 or user2')) : ?> + <table class="nopad user1user2"> + <tr valign="top"> + <?php if($this->countModules('user1')) : ?> + <td> + <jdoc:include type="modules" name="user1" style="xhtml" /> + </td> + <?php endif; ?> + <?php if($this->countModules('user1 and user2')) : ?> + <td class="greyline"> </td> + <?php endif; ?> + <?php if($this->countModules('user2')) : ?> + <td> + <jdoc:include type="modules" name="user2" style="xhtml" /> + </td> + <?php endif; ?> + </tr> + </table> + + <div id="maindivider"></div> + <?php endif; ?> + + <table class="nopad"> + <tr valign="top"> + <td> + <jdoc:include type="component" /> + <jdoc:include type="modules" name="footer" style="xhtml"/> + </td> + <?php if($this->countModules('right') and JRequest::getCmd('layout') != 'form') : ?> + <td class="greyline"> </td> + <td width="170"> + <jdoc:include type="modules" name="right" style="xhtml"/> + </td> + <?php endif; ?> + </tr> + </table> + + </div> + <div class="clr"></div> + </div> + <div class="clr"></div> + </div> + + <div id="whitebox_b"> + <div id="whitebox_bl"> + <div id="whitebox_br"></div> + </div> + </div> + </div> + + <div id="footerspacer"></div> + </div> + + <div id="footer"> + <div id="footer_l"> + <div id="footer_r"> + <p id="syndicate"> + <jdoc:include type="modules" name="syndicate" /> + </p> + <p id="power_by"> + <?php echo JText::_('Powered by') ?> <a href="http://www.joomla.org">Joomla!</a>. + <?php echo JText::_('Valid') ?> <a href="http://validator.w3.org/check/referer">XHTML</a> <?php echo JText::_('and') ?> <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a>. + </p> + </div> + </div> + </div> + </div> +</div> +<jdoc:include type="modules" name="debug" /> + +</body> +</html> diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/params.ini b/oss/joomla/trunk/templates/rhuk_milkyway/params.ini new file mode 100644 index 00000000..bd9cab11 --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/params.ini @@ -0,0 +1,4 @@ +colorVariation=blue +backgroundVariation=blue +widthStyle=fmax + diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/templateDetails.xml b/oss/joomla/trunk/templates/rhuk_milkyway/templateDetails.xml new file mode 100644 index 00000000..c135f50d --- /dev/null +++ b/oss/joomla/trunk/templates/rhuk_milkyway/templateDetails.xml @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE install PUBLIC "-//Joomla! 1.5//DTD template 1.0//EN" "http://www.joomla.org/xml/dtd/1.5/template-install.dtd"> +<install version="1.5" type="template"> + <name>rhuk_milkyway</name> + <creationDate>11/20/06</creationDate> + <author>Andy Miller</author> + <authorEmail>rhuk@rockettheme.com</authorEmail> + <authorUrl>http://www.rockettheme.com</authorUrl> + <copyright></copyright> + <license>GNU/GPL</license> + <version>1.0.2</version> + <description>TPL_RHUK_MILKYWAY</description> + <files> + <filename>index.php</filename> + <filename>templateDetails.xml</filename> + <filename>template_thumbnail.png</filename> + <filename>params.ini</filename> + <filename>images/arrow.png</filename> + <filename>images/indent1.png</filename> + <filename>images/indent2.png</filename> + <filename>images/indent3.png</filename> + <filename>images/indent4.png</filename> + <filename>images/index.html</filename> + <filename>images/mw_box_blue_bl.png</filename> + <filename>images/mw_box_blue_br.png</filename> + <filename>images/mw_box_blue_tl.png</filename> + <filename>images/mw_box_blue_tr.png</filename> + <filename>images/mw_content_b_l.png</filename> + <filename>images/mw_content_b_r.png</filename> + <filename>images/mw_content_b.png</filename> + <filename>images/mw_content_t_l.png</filename> + <filename>images/mw_content_t_r.png</filename> + <filename>images/mw_content_t.png</filename> + <filename>images/mw_footer_blue_b_l.png</filename> + <filename>images/mw_footer_blue_b_r.png</filename> + <filename>images/mw_footer_blue_b.png</filename> + <filename>images/mw_footer_separator.png</filename> + <filename>images/mw_header_b.png</filename> + <filename>images/mw_header_blue_t_l.png</filename> + <filename>images/mw_header_blue_t_r.png</filename> + <filename>images/mw_header_blue_t.png</filename> + <filename>images/mw_header_l_b.png</filename> + <filename>images/mw_header_r_b.png</filename> + <filename>images/mw_header.jpg</filename> + <filename>images/mw_joomla_logo.png</filename> + <filename>images/mw_line_grey.png</filename> + <filename>images/mw_menu_active_bg.png</filename> + <filename>images/mw_menu_cap_l.png</filename> + <filename>images/mw_menu_cap_r.png</filename> + <filename>images/mw_menu_normal_bg.png</filename> + <filename>images/mw_menu_separator.png</filename> + <filename>images/mw_readon.png</filename> + <filename>images/mw_shadow_blue_l.png</filename> + <filename>images/mw_shadow_blue_r.png</filename> + <filename>images/spacer.png</filename> + <filename>css/index.html</filename> + <filename>css/template.css</filename> + <filename>css/template_rtl.css</filename> + <filename>css/editor.css</filename> + <filename>css/ieonly.css</filename> + </files> + <positions> + <position>breadcrumb</position> + <position>left</position> + <position>right</position> + <position>top</position> + <position>user1</position> + <position>user2</position> + <position>user3</position> + <position>user4</position> + <position>footer</position> + <position>debug</position> + <position>syndicate</position> + </positions> + <params> + <param name="colorVariation" type="list" default="white" label="Color Variation" description="Color variation to use"> + <option value="blue">Blue</option> + <option value="red">Red</option> + <option value="green">Green</option> + <option value="orange">Orange</option> + <option value="black">Black</option> + <option value="white">White</option> + </param> + <param name="backgroundVariation" type="list" default="blue" label="Background Variation" description="Background color variation to use"> + <option value="blue">Blue</option> + <option value="red">Red</option> + <option value="green">Green</option> + <option value="orange">Orange</option> + <option value="black">Black</option> + <option value="white">White</option> + </param> + <param name="widthStyle" type="list" default="fmax" label="Template Width" description="Width style of the template"> + <option value="fmax">Fluid with maximum</option> + <option value="medium">Medium</option> + <option value="small">Small</option> + <option value="fluid">Fluid</option> + </param> + </params> +</install> diff --git a/oss/joomla/trunk/templates/rhuk_milkyway/template_thumbnail.png b/oss/joomla/trunk/templates/rhuk_milkyway/template_thumbnail.png new file mode 100644 index 00000000..ecce69df Binary files /dev/null and b/oss/joomla/trunk/templates/rhuk_milkyway/template_thumbnail.png differ diff --git a/oss/joomla/trunk/templates/system/component.php b/oss/joomla/trunk/templates/system/component.php new file mode 100644 index 00000000..233e7e8f --- /dev/null +++ b/oss/joomla/trunk/templates/system/component.php @@ -0,0 +1,44 @@ +<?php +/** + * @copyright Copyright (C) 2005 - 2010 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( 'Restricted access' ); +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>"> +<head> + <jdoc:include type="head" /> + <link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/general.css" type="text/css" /> + <?php + $db = & JFactory::getDbo(); + $query = 'SELECT template' + . ' FROM #__templates_menu' + . ' WHERE client_id = 0 AND menuid = 0'; + + $db->setQuery($query); + $template = $db->loadResult(); + + if($this->direction == 'rtl' && (!file_exists(JPATH_THEMES.DS.$template.DS.'css/template_rtl.css') || !file_exists(JPATH_THEMES.DS.$template.DS.'css/template.css'))) : ?> + <link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/template_rtl.css" type="text/css" /> +<?php elseif($this->direction == 'rtl' ) : ?> +<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $template; ?>/css/template.css" type="text/css" /> +<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $template; ?>/css/template_rtl.css" type="text/css" /> +<?php elseif($this->direction == 'ltr' && !file_exists(JPATH_THEMES.DS.$template.DS.'css/template.css')) : ?> + <link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/template.css" type="text/css" /> +<?php elseif($this->direction == 'ltr' ) : ?> +<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $template; ?>/css/template.css" type="text/css" /> +<?php endif; ?> +</head> +<body class="contentpane"> + <jdoc:include type="message" /> + <jdoc:include type="component" /> +</body> +</html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/system/css/editor.css b/oss/joomla/trunk/templates/system/css/editor.css new file mode 100644 index 00000000..78f2c8dd --- /dev/null +++ b/oss/joomla/trunk/templates/system/css/editor.css @@ -0,0 +1,52 @@ +body { + background: #fff; + font-family: Tahoma,Helvetica,Arial,sans-serif; + line-height: 1.3em; + font-size: 76%; + color: #333; +} + +h1 { + font-family:Helvetica ,Arial,sans-serif; + font-size: 16px; + font-weight: bold; + color: #666; +} + +h2 { + font-family: Arial, Helvetica,sans-serif; + font-size: 14px;; + font-weight: normal; + color: #333; +} + +h3 { + font-weight: bold; + font-family: Helvetica,Arial,sans-serif; + font-size: 13px; + color: #135cae; +} + +h4 { + font-weight: bold; + font-family: Arial, Helvetica, sans-serif; + color: #333; +} + +a:link, a:visited { + color: #1B57B1; text-decoration: none; + font-weight: normal; +} + +a:hover { + color: #00c; text-decoration: underline; + font-weight: normal; +} + +div.caption { padding: 0 10px 0 10px; } +div.caption img { border: 1px solid #CCC; } +div.caption p { font-size: .90em; color: #666; text-align: center; } + +/* STYLES FOR JOOMLA! EDITOR */ +hr#system-readmore { border: red dashed 1px; color: red; } +hr.system-pagebreak { border: gray dashed 1px; color: gray; } \ No newline at end of file diff --git a/oss/joomla/trunk/templates/system/css/error.css b/oss/joomla/trunk/templates/system/css/error.css new file mode 100644 index 00000000..0fa849ef --- /dev/null +++ b/oss/joomla/trunk/templates/system/css/error.css @@ -0,0 +1,81 @@ +/** + * CSS Document for offline page + * @version $Id: error.css 14401 2010-01-26 14:10:00Z louis $ + * @package Joomla + * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. + * @license GNU/GPL, see LICENSE.php + * Joomla! is free software and parts of it may contain or be derived from the + * GNU General Public License or other free or open source software licenses. + * See COPYRIGHT.php for copyright notices and details. + */ + +/* Start Common Styles */ +* { + font-family: helvetica, arial, sans-serif; + font-size: 11px; + color: #5F6565; +} + +html { + height: 100%; + margin-bottom: 1px; +} + +body { + margin: 0px; + padding: 0px; + height: 100%; + margin-bottom: 1px; + background: #FFFFFF; + font-family: helvetica, arial, sans-serif; + font-weight: normal; + padding-top: 0px; + margin-top: 0px; +} + +table, td, th, div, pre, blockquote, ul, ol, dl, address,.componentheading,.contentheading,.contentpagetitle,.sectiontableheader,.newsfeedheading { + font-family: helvetica, arial, sans-serif; + font-weight: normal; +} + +#outline { + width: 814px; + margin: 0px; + padding: 0px; + padding-top: 60px; + padding-bottom: 60px; + background: #FFFFFF; +} +#errorboxoutline { + width: 600px; + margin: 0px; + padding: 0px; + border: 1px solid #000000; +} +#errorboxheader { + width: 600px; + margin: 0px; + padding: 0px; + background: #E44249; + color: #FFFFFF; + font-weight: bold; + font-size: 12px; + line-height: 22px; + text-align: center; + border-bottom: 1px solid #000000; +} +#errorboxbody { + margin: 0px; + padding: 10px; + text-align: left; +} +#techinfo { + margin: 10px; + padding: 10px; + text-align: left; + border: 1px solid #CCCCCC; + color: #CCCCCC; +} +#techinfo p { + color: #CCCCCC; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/system/css/general.css b/oss/joomla/trunk/templates/system/css/general.css new file mode 100644 index 00000000..f001a9a3 --- /dev/null +++ b/oss/joomla/trunk/templates/system/css/general.css @@ -0,0 +1,185 @@ +/* Form validation */ +.invalid { border-color: #ff0000; } +label.invalid { color: #ff0000; } + +/* Buttons */ +#editor-xtd-buttons { + padding: 5px; +} + +.button2-left, +.button2-right, +.button2-left div, +.button2-right div { + float: left; +} + +.button2-left a, +.button2-right a, +.button2-left span, +.button2-right span { + display: block; + height: 22px; + float: left; + line-height: 22px; + font-size: 11px; + color: #666; + cursor: pointer; +} + +.button2-left span, +.button2-right span { + cursor: default; + color: #999; +} + +.button2-left .page a, +.button2-right .page a, +.button2-left .page span, +.button2-right .page span { + padding: 0 6px; +} + +.page span { + color: #000; + font-weight: bold; +} + +.button2-left a:hover, +.button2-right a:hover { + text-decoration: none; + color: #0B55C4; +} + +.button2-left a, +.button2-left span { + padding: 0 24px 0 6px; +} + +.button2-right a, +.button2-right span { + padding: 0 6px 0 24px; +} + +.button2-left { + background: url(../images/j_button2_left.png) no-repeat; + float: left; + margin-left: 5px; +} + +.button2-right { + background: url(../images/j_button2_right.png) 100% 0 no-repeat; + float: left; + margin-left: 5px; +} + +.button2-left .image { + background: url(../images/j_button2_image.png) 100% 0 no-repeat; +} + +.button2-left .readmore { + background: url(../images/j_button2_readmore.png) 100% 0 no-repeat; +} + +.button2-left .pagebreak { + background: url(../images/j_button2_pagebreak.png) 100% 0 no-repeat; +} + +.button2-left .blank { + background: url(../images/j_button2_blank.png) 100% 0 no-repeat; +} + +/* Tooltips */ +div.tooltip { + float: left; + background: #ffc; + border: 1px solid #D4D5AA; + padding: 5px; + max-width: 200px; + z-index:13000; +} + +div.tooltip h4 { + padding: 0; + margin: 0; + font-size: 95%; + font-weight: bold; + margin-top: -15px; + padding-top: 15px; + padding-bottom: 5px; + background: url(../images/selector-arrow.png) no-repeat; +} + +div.tooltip p { + font-size: 90%; + margin: 0; +} + +/* Caption fixes */ +.img_caption.left { + float: left; + margin-right: 1em; +} + +.img_caption.right { + float: right; + margin-left: 1em; +} + +.img_caption.left p { + clear: left; + text-align: center; +} + +.img_caption.right p { + clear: right; + text-align: center; +} + +.img_caption { +text-align: center!important; +} + +.img_caption.none { + margin-left:auto; + margin-right:auto; +} + +.caption.left { + float: left; + margin-right: 1em; +} + +.caption.right { + float: right; + margin-left: 1em; +} + +.caption.left p { + clear: left; + text-align: center; +} + +.caption.right p { + clear: right; + text-align: center; +} + +.caption.none { + margin-left:auto; + margin-right:auto; +} + +.caption { + text-align: center!important; +} + +/* Calendar */ +a img.calendar { + width: 16px; + height: 16px; + margin-left: 3px; + background: url(../images/calendar.png) no-repeat; + cursor: pointer; + vertical-align: middle; +} diff --git a/oss/joomla/trunk/templates/system/css/index.html b/oss/joomla/trunk/templates/system/css/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/system/css/index.html @@ -0,0 +1 @@ +<html><body bgcolor="#FFFFFF"></body></html> \ No newline at end of file diff --git a/oss/joomla/trunk/templates/system/css/offline.css b/oss/joomla/trunk/templates/system/css/offline.css new file mode 100644 index 00000000..cfe11134 --- /dev/null +++ b/oss/joomla/trunk/templates/system/css/offline.css @@ -0,0 +1,63 @@ +/** + * CSS Document for offline page + * @version $Id: offline.css 14401 2010-01-26 14:10:00Z louis $ + * @package Joomla + * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. + * @license GNU/GPL, see LICENSE.php + * Joomla! is free software and parts of it may contain or be derived from the + * GNU General Public License or other free or open source software licenses. + * See COPYRIGHT.php for copyright notices and details. + */ + +body { + margin: 0; padding: 0; + font-family: Arial, Helvetica, Sans Serif; font-size: 78%; + color: #333333; + text-align: center; +} + +img { border: 0 none; } + +/* -- id styles ------------------------------------- */ + +#frame { + margin: 20px auto; + width: 400px; + padding: 20px; +} + +#frame form { + text-align: left; +} + +/* -- class styles ---------------------------------- */ + +.outline { + border: 1px solid #cccccc; + background: #ffffff; + padding: 2px; +} + +/* -- form styles ----------------------------------- */ + +form { margin: auto; } +form p { margin: 0; padding: 0; } +form fieldset { border: 0 none; margin: 0em; padding: 0.2em;} +label { display: block; float: left; } +input { padding: 1px; } +input.button { width: auto; height: 1.8em; cursor: pointer; } + +label { margin: 5px 0px 2px 0px; width: 10em;} +form p { padding: 0.2em 0 0.2em 0; } +form br { display: none; } +input { border: 1px solid #0E67A1; } +input.button { background-color: white; } +input.button:hover { border-color: #FC902E; } + + + +#frmlogin { margin: 0 10px 0 10px; } +#frmlogin fieldset.button { text-align: right; } + + + diff --git a/oss/joomla/trunk/templates/system/css/offline_rtl.css b/oss/joomla/trunk/templates/system/css/offline_rtl.css new file mode 100644 index 00000000..801051be --- /dev/null +++ b/oss/joomla/trunk/templates/system/css/offline_rtl.css @@ -0,0 +1,24 @@ +/** + * @version $Id: offline_rtl.css 10054 2008-02-22 11:24:37Z mtk $ + * @package Joomla + * @subpackage Accessible-Template-Beez + * @copyright Copyright (C) 2005 - 2010 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. + */ + + /** + * Joomla! 1.5 Offline RTL css file + * + * @author Mati Kochen + * @package Joomla + * @since 1.5 + * @version 1.0 + */ + +#frame form{ text-align: right; } +label { float:right; } diff --git a/oss/joomla/trunk/templates/system/css/system.css b/oss/joomla/trunk/templates/system/css/system.css new file mode 100644 index 00000000..e3eb09c5 --- /dev/null +++ b/oss/joomla/trunk/templates/system/css/system.css @@ -0,0 +1,38 @@ +/* OpenID icon style */ +input.system-openid, input.com-system-openid { + background: url(http://openid.net/images/login-bg.gif) no-repeat; + background-color: #fff; + background-position: 0 50%; + color: #000; + padding-left: 18px; +} + + +/* Unpublished */ +.system-unpublished { +background: #e8edf1; +border-top: 4px solid #c4d3df; +border-bottom: 4px solid #c4d3df; +} + +/* System Messages */ +#system-message { margin-bottom: 10px; padding: 0;} +#system-message dt { font-weight: bold; } +#system-message dd { margin: 0; font-weight: bold; text-indent: 30px; } +#system-message dd ul { color: #0055BB; margin-bottom: 10px; list-style: none; padding: 10px; border-top: 3px solid #84A7DB; border-bottom: 3px solid #84A7DB;} + +/* System Standard Messages */ +#system-message dt.message { display: none; } +#system-message dd.message { } + +/* System Error Messages */ +#system-message dt.error { display: none; } +#system-message dd.error ul { color: #c00; background-color: #E6C0C0; border-top: 3px solid #DE7A7B; border-bottom: 3px solid #DE7A7B;} + +/* System Notice Messages */ +#system-message dt.notice { display: none; } +#system-message dd.notice ul { color: #c00; background: #EFE7B8; border-top: 3px solid #F0DC7E; border-bottom: 3px solid #F0DC7E;} + +/* Debug */ +#system-debug { color: #ccc; background-color: #fff; padding: 10px; margin: 10px; } +#system-debug div { font-size: 11px;} diff --git a/oss/joomla/trunk/templates/system/css/toolbar.css b/oss/joomla/trunk/templates/system/css/toolbar.css new file mode 100644 index 00000000..607d5813 --- /dev/null +++ b/oss/joomla/trunk/templates/system/css/toolbar.css @@ -0,0 +1,34 @@ +/** + * CSS Document for edit page for toolbar control + * @version $Id: toolbar.css 14401 2010-01-26 14:10:00Z louis $ + * @package Joomla + * @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved. + * @license GNU/GPL, see LICENSE.php + * Joomla! is free software and parts of it may contain or be derived from the + * GNU General Public License or other free or open source software licenses. + * See COPYRIGHT.php for copyright notices and details. + */ + + +table#toolbar { + margin-right: 10px; +} + +table#toolbar a.toolbar { + color : #808080; + text-decoration : none; + display: block; + border: 1px solid #DDD; + width: 40px; + padding: 2px 5px 2px 5px; +} +table#toolbar a.toolbar:hover { + color : #C64934; + cursor: pointer; + border: 1px solid #c24733; + background-color: #f1e8e6; + padding: 3px 5px 1px 5px; +} +table#toolbar a.toolbar:active { + color : #FF9900; +} \ No newline at end of file diff --git a/oss/joomla/trunk/templates/system/error.php b/oss/joomla/trunk/templates/system/error.php new file mode 100644 index 00000000..b97eda61 --- /dev/null +++ b/oss/joomla/trunk/templates/system/error.php @@ -0,0 +1,59 @@ +<?php +/** + * @copyright Copyright (C) 2005 - 2010 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( 'Restricted access' ); +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>"> +<head> + <title><?php echo $this->error->code ?> - <?php echo $this->title; ?> + + direction == 'rtl') : ?> + + + + +
+
+
+
error->code ?> - error->message ?>
+
+

+
    +
    2. +
    3. +
    4. +
    5. +
    6. +
    7. +
+

+

+

    +
    • +
+

+

+
+

error->message; ?>

+

+ debug) : + echo $this->renderBacktrace(); + endif; ?> +

+
+
+
+
+
+ + diff --git a/oss/joomla/trunk/templates/system/html/index.html b/oss/joomla/trunk/templates/system/html/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/system/html/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/oss/joomla/trunk/templates/system/html/modules.php b/oss/joomla/trunk/templates/system/html/modules.php new file mode 100644 index 00000000..fd0f8e46 --- /dev/null +++ b/oss/joomla/trunk/templates/system/html/modules.php @@ -0,0 +1,116 @@ +content; +} + +/* + * Module chrome that wraps the module in a table + */ +function modChrome_table($module, &$params, &$attribs) +{ ?> + + showtitle != 0) : ?> + + + + + + + +
+ title; ?> +
+ content; ?> +
+ tag of another table + */ +function modChrome_horz($module, &$params, &$attribs) +{ ?> + + + + +
+ +
+ content)) : ?> +
+ showtitle != 0) : ?> +

title; ?>

+ + content; ?> +
+ +
+
+
+
+ showtitle != 0) : ?> +

title; ?>

+ + content; ?> +
+
+
+
+ addStyleDeclaration($css); + + ?> +
+
position."[".$module->style."]"; ?>
+
+ content; ?> +
+
+ \ No newline at end of file diff --git a/oss/joomla/trunk/templates/system/images/calendar.png b/oss/joomla/trunk/templates/system/images/calendar.png new file mode 100644 index 00000000..65891385 Binary files /dev/null and b/oss/joomla/trunk/templates/system/images/calendar.png differ diff --git a/oss/joomla/trunk/templates/system/images/index.html b/oss/joomla/trunk/templates/system/images/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/system/images/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/oss/joomla/trunk/templates/system/images/j_button2_blank.png b/oss/joomla/trunk/templates/system/images/j_button2_blank.png new file mode 100644 index 00000000..a8c2e300 Binary files /dev/null and b/oss/joomla/trunk/templates/system/images/j_button2_blank.png differ diff --git a/oss/joomla/trunk/templates/system/images/j_button2_image.png b/oss/joomla/trunk/templates/system/images/j_button2_image.png new file mode 100644 index 00000000..c1fc2e4d Binary files /dev/null and b/oss/joomla/trunk/templates/system/images/j_button2_image.png differ diff --git a/oss/joomla/trunk/templates/system/images/j_button2_left.png b/oss/joomla/trunk/templates/system/images/j_button2_left.png new file mode 100644 index 00000000..c364b745 Binary files /dev/null and b/oss/joomla/trunk/templates/system/images/j_button2_left.png differ diff --git a/oss/joomla/trunk/templates/system/images/j_button2_pagebreak.png b/oss/joomla/trunk/templates/system/images/j_button2_pagebreak.png new file mode 100644 index 00000000..aa619b49 Binary files /dev/null and b/oss/joomla/trunk/templates/system/images/j_button2_pagebreak.png differ diff --git a/oss/joomla/trunk/templates/system/images/j_button2_readmore.png b/oss/joomla/trunk/templates/system/images/j_button2_readmore.png new file mode 100644 index 00000000..8cf01ccd Binary files /dev/null and b/oss/joomla/trunk/templates/system/images/j_button2_readmore.png differ diff --git a/oss/joomla/trunk/templates/system/images/notice-alert.png b/oss/joomla/trunk/templates/system/images/notice-alert.png new file mode 100644 index 00000000..83adc35f Binary files /dev/null and b/oss/joomla/trunk/templates/system/images/notice-alert.png differ diff --git a/oss/joomla/trunk/templates/system/images/notice-download.png b/oss/joomla/trunk/templates/system/images/notice-download.png new file mode 100644 index 00000000..e77ae4b4 Binary files /dev/null and b/oss/joomla/trunk/templates/system/images/notice-download.png differ diff --git a/oss/joomla/trunk/templates/system/images/notice-info.png b/oss/joomla/trunk/templates/system/images/notice-info.png new file mode 100644 index 00000000..55bf7e0f Binary files /dev/null and b/oss/joomla/trunk/templates/system/images/notice-info.png differ diff --git a/oss/joomla/trunk/templates/system/images/notice-note.png b/oss/joomla/trunk/templates/system/images/notice-note.png new file mode 100644 index 00000000..b5342ebc Binary files /dev/null and b/oss/joomla/trunk/templates/system/images/notice-note.png differ diff --git a/oss/joomla/trunk/templates/system/images/selector-arrow.png b/oss/joomla/trunk/templates/system/images/selector-arrow.png new file mode 100644 index 00000000..1c74b082 Binary files /dev/null and b/oss/joomla/trunk/templates/system/images/selector-arrow.png differ diff --git a/oss/joomla/trunk/templates/system/index.html b/oss/joomla/trunk/templates/system/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/oss/joomla/trunk/templates/system/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/oss/joomla/trunk/templates/system/index.php b/oss/joomla/trunk/templates/system/index.php new file mode 100644 index 00000000..a09e8d63 --- /dev/null +++ b/oss/joomla/trunk/templates/system/index.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/oss/joomla/trunk/templates/system/offline.php b/oss/joomla/trunk/templates/system/offline.php new file mode 100644 index 00000000..cb6e8a32 --- /dev/null +++ b/oss/joomla/trunk/templates/system/offline.php @@ -0,0 +1,61 @@ + + + + + + + direction == 'rtl') : ?> + + + + + + +
+ Joomla! Logo +

+ getCfg('sitename'); ?> +

+

+ getCfg('offline_message'); ?> +

+ + + +
+
+

+
+ +

+

+
+ +

+

+ + +

+ +
+ + + + +
+
+ + \ No newline at end of file