[jasmine-commit] SF.net SVN: newsphp: [130] trunk/jasmine
Brought to you by:
christoph_berg,
red-
Menu
▾
▴
[jasmine-commit] SF.net SVN: newsphp: [130] trunk/jasmine
|
From: <chr...@us...> - 2007-08-19 21:00:40
|
Revision: 130
http://newsphp.svn.sourceforge.net/newsphp/?rev=130&view=rev
Author: christoph_berg
Date: 2007-08-19 14:00:33 -0700 (Sun, 19 Aug 2007)
Log Message:
-----------
Added last of the factories
Corrected hopefully all PHP strict errors
Added Jasmine Theme and Style extension
Refined the XSD schema (have to split it)
Enabled all extension types in Core
Modified Paths:
--------------
trunk/jasmine/classes/Core.class.php
trunk/jasmine/classes/ExtensionManager.class.php
trunk/jasmine/classes/Factory.class.php
trunk/jasmine/classes/Object.class.php
trunk/jasmine/classes/Style.class.php
trunk/jasmine/classes/ThemeFactory.class.php
trunk/jasmine/extension.xsd
trunk/jasmine/modules/DB/DB.class.php
trunk/jasmine/templatesets/Jasmine/Jasmine.xml
trunk/jasmine/tests/test_core.class.php
trunk/jasmine/tests/test_db.class.php
trunk/jasmine/tests/test_object.class.php
Added Paths:
-----------
trunk/jasmine/styles/
trunk/jasmine/styles/Jasmine/
trunk/jasmine/styles/Jasmine/Jasmine.css
Removed Paths:
-------------
trunk/jasmine/templatesets/Jasmine/Jasmine.css
Modified: trunk/jasmine/classes/Core.class.php
===================================================================
--- trunk/jasmine/classes/Core.class.php 2007-08-13 02:40:23 UTC (rev 129)
+++ trunk/jasmine/classes/Core.class.php 2007-08-19 21:00:33 UTC (rev 130)
@@ -70,8 +70,8 @@
{
ExtensionManager::getSingleton()->addType('Module');
ExtensionManager::getSingleton()->addType('TemplateSet');
- //ExtensionManager::getSingleton()->addType('Style');
- //ExtensionManager::getSingleton()->addType('Theme');
+ ExtensionManager::getSingleton()->addType('Style');
+ ExtensionManager::getSingleton()->addType('Theme');
}
catch (NoClassFoundException $x)
{
@@ -98,14 +98,14 @@
// Load the extensions
ExtensionManager::getSingleton()->loadExtensions();
- // Set the default theme
- //self::$Instance->setTheme();
-
// Create the connections
self::$Instance->connect('__construct',
ExtensionManager::getSingleton()->getExtension('DB', 'Module')
, 'createConnection');
+ // Set the default theme
+ self::$Instance->setTheme();
+
// Authentificate the user
self::$Instance->User = new User();
Modified: trunk/jasmine/classes/ExtensionManager.class.php
===================================================================
--- trunk/jasmine/classes/ExtensionManager.class.php 2007-08-13 02:40:23 UTC (rev 129)
+++ trunk/jasmine/classes/ExtensionManager.class.php 2007-08-19 21:00:33 UTC (rev 130)
@@ -103,7 +103,7 @@
foreach ($this->Paths as $Path)
{
- $dirIter =& new DirectoryIterator($Path);
+ $dirIter = new DirectoryIterator($Path);
Logger::getSingleton()->log(Logger::JM_DEBUG, Logger::JM_EM,
"Searching extensions in subdiretories of {$dirIter->getPath()}");
@@ -140,7 +140,7 @@
throw new NoSuchExtensionTypeException($type);
}
- $this->Extensions[$extType][$extName] =&
+ $this->Extensions[$extType][$extName] =
$this->Factories[$extType]->createFromXml($eEntry->getPathname());
Logger::getSingleton()->log(Logger::JM_INFORMATION, Logger::JM_EM,
@@ -239,7 +239,7 @@
}
else
{
- $this->Factories[$type] =& new $factory();
+ $this->Factories[$type] = new $factory();
}
}
}
Modified: trunk/jasmine/classes/Factory.class.php
===================================================================
--- trunk/jasmine/classes/Factory.class.php 2007-08-13 02:40:23 UTC (rev 129)
+++ trunk/jasmine/classes/Factory.class.php 2007-08-19 21:00:33 UTC (rev 130)
@@ -37,10 +37,10 @@
* @return Extension of concrete type
*/
abstract public function createFromXml($filename);
-
+
/**
* Creates a concrete extension from an associative array (key => value)
- *
+ *
* @param $data array Associative data array
* @return Extenion of concrete type
*/
@@ -48,7 +48,7 @@
/**
* Helper function to read common extension data from an XML file
- *
+ *
* @param $filename string Filename of the XML document to load
* @return array of common data
*/
@@ -61,20 +61,20 @@
catch (FileIOException $x)
{
Logger::getSingleton()->log(Logger::JM_WARNING, Logger::JM_EM,
- $x->getMessage());
+ $x->getMessage());
return;
}
catch (XmlParseError $e)
{
Logger::getSingleton()->Log(Logger::JM_ERROR, Logger::JM_EM,
- $e->getMessage());
+ $e->getMessage());
return;
}
$data = array();
-
- $Parser =& Core::getXmlParser();
+ $Parser = Core::getXmlParser();
+
$data['name'] = $Parser->getAttributeValue('extension', 'name');
$data['version'] = $Parser->getAttributeValue('extension', 'version');
@@ -99,7 +99,7 @@
// Create empty array
$data['description'] = array();
-
+
$descriptions = Core::getXMLParser()->getTagValue('description');
if (is_array($descriptions))
@@ -113,34 +113,34 @@
{
$data['description'][] = array($descriptions['lang'] => $descriptions['content']);
}
-
+
return $data;
}
-
+
/**
* Helper function to check array data for common attributes existence
- *
+ *
* @param $data array Associative data array
* @throws NoSuchArrayKeyException if a required key is not found in the array
*/
protected function &getCommonDataFromArray(array $data)
- {
+ {
if (!isset($data['name']))
{
throw new NoSuchArrayKeyException('name');
}
-
+
if (!isset($data['version']))
{
throw new NoSuchArrayKeyException('version');
}
-
+
// Set installed to default value, if it is not given
if (!isset($data['installed']))
{
$data['installed'] = false;
}
-
+
// Set image to default value, if it is not given
if (!isset($data['image']))
{
@@ -150,18 +150,18 @@
{
$data['image'] = $this->extPath . '/' . $data['image'];
}
-
+
if(!isset($data['description']))
{
$data['description'] = array();
}
-
+
return $data;
}
-
+
/**
* Sets the extension path
- *
+ *
* @param string $path New extension path
*/
public function setExtensionPath($path)
@@ -169,4 +169,4 @@
$this->extPath = $path;
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/jasmine/classes/Object.class.php
===================================================================
--- trunk/jasmine/classes/Object.class.php 2007-08-13 02:40:23 UTC (rev 129)
+++ trunk/jasmine/classes/Object.class.php 2007-08-19 21:00:33 UTC (rev 130)
@@ -39,7 +39,8 @@
*/
protected function __construct()
{
- $this->List = new ConnectionList($this->__toString());
+ // Double brackets needed to avoid triggering a php strict error
+ $this->List = new ConnectionList(($this->__toString()));
}
/**
Modified: trunk/jasmine/classes/Style.class.php
===================================================================
--- trunk/jasmine/classes/Style.class.php 2007-08-13 02:40:23 UTC (rev 129)
+++ trunk/jasmine/classes/Style.class.php 2007-08-19 21:00:33 UTC (rev 130)
@@ -13,14 +13,14 @@
/**
* The Style Object class
- *
+ *
* The Style class merely consists of a stylesheet information.
- *
+ *
* @author PHPNews Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public Licence
* @copyright (c) 2005-2006 PHPNews Team
* @version 0.1.0
- * @package Jasmine
+ * @package Jasmine
*/
abstract class Style extends Extension
{
@@ -29,7 +29,7 @@
* @var string
*/
protected $Stylesheet = '';
-
+
/**
* Default constructor
*
@@ -39,12 +39,12 @@
* @param string $version Theme version
* @param string $stylesheet Theme stylesheet
*/
- public function __construct($name, $version, $installed, $stylesheet = '', $description = '', $image = '')
+ public function __construct($name, $version, $installed, $stylesheet, $description = '', $image = '')
{
$this->Stylesheet = $stylesheet;
-
+
// Call the parent constructor
parent::__construct($name, $version, $installed, $description, $image);
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/jasmine/classes/ThemeFactory.class.php
===================================================================
--- trunk/jasmine/classes/ThemeFactory.class.php 2007-08-13 02:40:23 UTC (rev 129)
+++ trunk/jasmine/classes/ThemeFactory.class.php 2007-08-19 21:00:33 UTC (rev 130)
@@ -31,19 +31,19 @@
* @param filename string Filename of the XML document to load
* @return Extension of type Theme
*/
- protected function createFromXml($filename)
+ public function createFromXml($filename)
{
// Get extension path from filename
$this->extPath = dirname($filename);
// Get common data
- $cdata =& $this->getCommonDataFromXml($filename);
+ $cdata =& $this->getCommonDataFromXml($filename);
- $Parser =& Core::getXmlParser();
-
+ $Parser = Core::getXmlParser();
+
$style = ExtensionManager::getSingleton()->getExtension($Parser->getAttributeValue('extension', 'style'), 'Style');
$templateset = ExtensionManager::getSingleton()->getExtension($Parser->getAttributeValue('extension', 'templateset'), 'TemplateSet');
-
+
if ($Parser->getAttributeValue('extension', 'activated') == 'true')
{
$activated = true;
@@ -53,30 +53,28 @@
$activated = false;
}
- require_once ($this->extPath . '/' . $name .'.theme.php');
-
// Create the Theme using collected data and return it
return new $cdata['name']($cdata['name'], $cdata['version'], $cdata['installed'], $activated, $style, $templateset, $cdata['description'], $cdata['image']);
}
-
+
/**
* Creates a Theme object from an associative array (key => value)
- *
+ *
* @param $data array Associative data array
* @throws NoSuchArrayKeyException if a needed key is not found in the array
*/
- protected function createFromArray(array& $data)
+ public function createFromArray(array& $data)
{
if (!isset($data['name']))
{
throw new NoSuchArrayKeyException('name');
}
-
+
if (!isset($data['version']))
{
throw new NoSuchArrayKeyException('version');
}
-
+
if (!isset($data['style']))
{
throw new NoSuchArrayKeyException('style');
@@ -86,7 +84,7 @@
// Get a reference to the Style object
$style =& ExtensionManager::getSingleton()->getExtension($data['style'], 'Style');
}
-
+
if (!isset($data['templateset']))
{
throw new NoSuchArrayKeyException('templateset');
@@ -96,13 +94,13 @@
// Get a reference to the TemplateSet object
$templateset =& ExtensionManager::getSingleton()->getExtension($data['templateset'], 'TemplateSet');
}
-
+
// Set installed to default value, if it is not given
if (!isset($data['installed']))
{
$data['installed'] = false;
}
-
+
// Set active to default value, if it is not given
if (!isset($data['active']))
{
@@ -117,7 +115,7 @@
else
{
$image = $this->extPath . '/' . $data['image'];
- }
+ }
if (isset($data['description']))
{
@@ -135,8 +133,6 @@
}
}
- require_once ($this->extPath . '/' . $name .'.theme.php');
-
// Create the Theme using collected data and return it
return new $data['name']($data['name'], $data['version'], $data['installed'], $data['activated'], $style, $templateset, $description, $image);
}
Modified: trunk/jasmine/extension.xsd
===================================================================
--- trunk/jasmine/extension.xsd 2007-08-13 02:40:23 UTC (rev 129)
+++ trunk/jasmine/extension.xsd 2007-08-19 21:00:33 UTC (rev 130)
@@ -41,5 +41,8 @@
<xsd:attribute name="installed" type="xsd:boolean" use="required"/>
<xsd:attribute name="image" type="xsd:string"/>
<xsd:attribute name="activated" type="xsd:boolean"/>
+ <xsd:attribute name="stylesheet" type="xsd:string"/>
+ <xsd:attribute name="style" type="xsd:string"/>
+ <xsd:attribute name="templateset" type="xsd:string"/>
</xsd:complexType>
</xsd:schema>
Modified: trunk/jasmine/modules/DB/DB.class.php
===================================================================
--- trunk/jasmine/modules/DB/DB.class.php 2007-08-13 02:40:23 UTC (rev 129)
+++ trunk/jasmine/modules/DB/DB.class.php 2007-08-19 21:00:33 UTC (rev 130)
@@ -101,8 +101,8 @@
try
{
- $this->m_DB =& new PDO($this->m_dsn, $cfg['dbUser'], $cfg['dbPass'],
- array(PDO::ATTR_PERSISTENT => true));
+ $this->m_DB = new PDO($this->m_dsn, $cfg['dbUser'], $cfg['dbPass'],
+ array(PDO::ATTR_PERSISTENT => true));
}
catch (PDOException $e) {
die ( 'Failed to obtain database handle: ' . $e->getMessage() );
Copied: trunk/jasmine/styles/Jasmine/Jasmine.css (from rev 129, trunk/jasmine/templatesets/Jasmine/Jasmine.css)
===================================================================
--- trunk/jasmine/styles/Jasmine/Jasmine.css (rev 0)
+++ trunk/jasmine/styles/Jasmine/Jasmine.css 2007-08-19 21:00:33 UTC (rev 130)
@@ -0,0 +1,317 @@
+a:link {
+ color: #000000;
+ text-decoration: underline;
+}
+
+a:active {
+ color: #000000;
+ text-decoration: underline;
+}
+
+a:visited {
+ color: #000000;
+ text-decoration: underline;
+}
+
+a:hover {
+ color: #808080;
+ text-decoration: none;
+}
+
+a.bbcodebutton, a.bbcodebutton:visited, a.bbcodebutton:active {
+ color: #ffffff;
+ background-color: #5F7797;
+ border: 1px solid #354463;
+ padding: 2px 5px 2px 5px;
+ text-decoration: none;
+ line-height: 30px;
+}
+
+a.bbcodebutton:hover {
+ background-color: #354463;
+ color: #cccccc;
+ text-decoration: none;
+}
+
+body {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ text-align: center;
+ font-size: 12px;
+}
+
+img {
+ border: none;
+ vertical-align: middle;
+}
+
+fieldset {
+ border-color: #000000;
+ border-style: solid;
+ border-width: 1px;
+ padding: 3px;
+ text-align: left;
+}
+
+h1 {
+ font-size: 22px;
+ margin: 0px;
+ padding-bottom: 5px;
+ padding-top: 5px;
+ text-align: center;
+}
+
+h2 {
+ font-size: 12px;
+ font-style: italic;
+}
+
+hr {
+ color: #003366;
+ height: 1px;
+ width: 100%;
+}
+
+img {
+ border: none;
+}
+
+label {
+ font-size: 12px;
+}
+
+li {
+ margin: 0px;
+ padding: 0px;
+}
+
+ol {
+ margin-top: 0px;
+ margin-bottom: 0px;
+ margin-left: 11px;
+ padding-left: 11px;
+}
+
+ul {
+ margin-top: 0px;
+ margin-bottom: 0px;
+ margin-left: 8px;
+ padding-left: 8px;
+}
+
+table {
+ font-size: 12px;
+}
+
+td {
+ padding: 4px;
+}
+
+textarea {
+ background-color: #FFFFFF;
+ border-color: #354463;
+ border-style: solid;
+ border-width: 1px;
+}
+
+th {
+ padding: 4px;
+}
+
+body.jswindow {
+ background-color: #BFC4CB;
+ border: none;
+ padding: 0px;
+ margin: 15px;
+}
+
+body.jswindow input[type=text], body.jswindow textarea {
+ background-color: #FFFFFF;
+ border-color: #354463;
+ border-style: solid;
+ border-width: 1px;
+ width: 200px;
+}
+
+div.code {
+ background-color: #DEE7EF;
+ margin-left: 15px;
+ margin-right: 15px;
+ margin-top: 5px;
+ padding: 5px;
+}
+
+div.module {
+ background-color: lightgrey;
+ border: black dotted 1px;
+ padding: 5px;
+ margin: 5px 0px;
+}
+
+div.module .title {
+ font-size: 18px;
+ font-weight: bold;
+ margin: 0px;
+}
+
+div.module p {
+ margin-left: 15px;
+ margin-right: 15px;
+ text-align: justify;
+}
+
+input[type=submit],
+input[type=reset],
+input[type=button] {
+ border-color: #354463;
+ border-style: solid;
+ border-width: 1px;
+ background-color: #5F7797;
+ color: #FFFFFF;
+ font-size: 11px;
+ padding-bottom: 1px;
+ padding-top: 1px;
+ width: 90px;
+}
+
+input[type=submit]:hover,
+input[type=reset]:hover,
+input[type=button]:hover {
+ background-color: #354463;
+}
+
+input[type=text], input[type=password] {
+ background-color: #FFFFFF;
+ border-color: #354463;
+ border-style: solid;
+ border-width: 1px;
+}
+
+table.tablecenter {
+ margin-left: auto;
+ margin-right: auto;
+}
+
+table.login {
+ background-color: #BFC4CB;
+ border-color: #000000;
+ border-style: solid;
+ border-width: 1px;
+ font-size: 12px;
+ margin-left: auto;
+ margin-right: auto;
+ padding: 0px;
+}
+
+table.login th {
+ background-color: #5F7797;
+ color: #E9F2FC;
+ padding: 5px;
+}
+
+table.login td {
+ padding: 5px;
+}
+
+table.installer {
+ background-color: #BFC4CB;
+ border-color: #000000;
+ border-style: solid;
+ border-width: 1px;
+ font-size: 12px;
+ margin-left: auto;
+ margin-right: auto;
+ padding: 0px;
+ width: 370px;
+}
+
+table.installer th {
+ background-color: #5F7797;
+ color: #E9F2FC;
+ padding: 5px;
+}
+
+table.installer td {
+ padding: 5px;
+}
+
+.hr {
+ background-color: transparent;
+ color: #6394bd;
+}
+
+.center {
+ text-align: center;
+}
+
+.copyright {
+ font-size: 11px;
+ text-align: center;
+}
+
+.left {
+ text-align: left;
+}
+
+.menu {
+ border-bottom-color: #000000;
+ border-bottom-style: dashed;
+ border-bottom-width: 1px;
+ border-left-color: #000000;
+ border-left-style: dashed;
+ border-left-width: 1px;
+ padding: 5px;
+}
+
+.notify {
+ background-color: lightgrey;
+}
+
+.notify td {
+ border-bottom-color: #000000;
+ border-bottom-style: solid;
+ border-bottom-width: 1px;
+ border-top-color: #000000;
+ border-top-style: solid;
+ border-top-width: 1px;
+}
+
+.right {
+ text-align: right;
+}
+
+.subtext {
+ margin-top: 0px;
+}
+
+#border {
+ margin-left: auto;
+ margin-right: auto;
+ text-align: left;
+ width: 600px;
+}
+
+#content {
+ border-bottom-color: #000000;
+ border-bottom-style: dashed;
+ border-bottom-width: 1px;
+ border-left-color: #000000;
+ border-left-style: dashed;
+ border-left-width: 1px;
+ border-right-color: #000000;
+ border-right-style: dashed;
+ border-right-width: 1px;
+ float: left;
+ padding: 5px;
+ min-height: 360px;
+ width: 388px;
+}
+
+#navigation {
+ float: left;
+ width: 200px;
+}
+
+#imageupload
+{
+ display: none;
+}
Deleted: trunk/jasmine/templatesets/Jasmine/Jasmine.css
===================================================================
--- trunk/jasmine/templatesets/Jasmine/Jasmine.css 2007-08-13 02:40:23 UTC (rev 129)
+++ trunk/jasmine/templatesets/Jasmine/Jasmine.css 2007-08-19 21:00:33 UTC (rev 130)
@@ -1,317 +0,0 @@
-a:link {
- color: #000000;
- text-decoration: underline;
-}
-
-a:active {
- color: #000000;
- text-decoration: underline;
-}
-
-a:visited {
- color: #000000;
- text-decoration: underline;
-}
-
-a:hover {
- color: #808080;
- text-decoration: none;
-}
-
-a.bbcodebutton, a.bbcodebutton:visited, a.bbcodebutton:active {
- color: #ffffff;
- background-color: #5F7797;
- border: 1px solid #354463;
- padding: 2px 5px 2px 5px;
- text-decoration: none;
- line-height: 30px;
-}
-
-a.bbcodebutton:hover {
- background-color: #354463;
- color: #cccccc;
- text-decoration: none;
-}
-
-body {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- text-align: center;
- font-size: 12px;
-}
-
-img {
- border: none;
- vertical-align: middle;
-}
-
-fieldset {
- border-color: #000000;
- border-style: solid;
- border-width: 1px;
- padding: 3px;
- text-align: left;
-}
-
-h1 {
- font-size: 22px;
- margin: 0px;
- padding-bottom: 5px;
- padding-top: 5px;
- text-align: center;
-}
-
-h2 {
- font-size: 12px;
- font-style: italic;
-}
-
-hr {
- color: #003366;
- height: 1px;
- width: 100%;
-}
-
-img {
- border: none;
-}
-
-label {
- font-size: 12px;
-}
-
-li {
- margin: 0px;
- padding: 0px;
-}
-
-ol {
- margin-top: 0px;
- margin-bottom: 0px;
- margin-left: 11px;
- padding-left: 11px;
-}
-
-ul {
- margin-top: 0px;
- margin-bottom: 0px;
- margin-left: 8px;
- padding-left: 8px;
-}
-
-table {
- font-size: 12px;
-}
-
-td {
- padding: 4px;
-}
-
-textarea {
- background-color: #FFFFFF;
- border-color: #354463;
- border-style: solid;
- border-width: 1px;
-}
-
-th {
- padding: 4px;
-}
-
-body.jswindow {
- background-color: #BFC4CB;
- border: none;
- padding: 0px;
- margin: 15px;
-}
-
-body.jswindow input[type=text], body.jswindow textarea {
- background-color: #FFFFFF;
- border-color: #354463;
- border-style: solid;
- border-width: 1px;
- width: 200px;
-}
-
-div.code {
- background-color: #DEE7EF;
- margin-left: 15px;
- margin-right: 15px;
- margin-top: 5px;
- padding: 5px;
-}
-
-div.module {
- background-color: lightgrey;
- border: black dotted 1px;
- padding: 5px;
- margin: 5px 0px;
-}
-
-div.module .title {
- font-size: 18px;
- font-weight: bold;
- margin: 0px;
-}
-
-div.module p {
- margin-left: 15px;
- margin-right: 15px;
- text-align: justify;
-}
-
-input[type=submit],
-input[type=reset],
-input[type=button] {
- border-color: #354463;
- border-style: solid;
- border-width: 1px;
- background-color: #5F7797;
- color: #FFFFFF;
- font-size: 11px;
- padding-bottom: 1px;
- padding-top: 1px;
- width: 90px;
-}
-
-input[type=submit]:hover,
-input[type=reset]:hover,
-input[type=button]:hover {
- background-color: #354463;
-}
-
-input[type=text], input[type=password] {
- background-color: #FFFFFF;
- border-color: #354463;
- border-style: solid;
- border-width: 1px;
-}
-
-table.tablecenter {
- margin-left: auto;
- margin-right: auto;
-}
-
-table.login {
- background-color: #BFC4CB;
- border-color: #000000;
- border-style: solid;
- border-width: 1px;
- font-size: 12px;
- margin-left: auto;
- margin-right: auto;
- padding: 0px;
-}
-
-table.login th {
- background-color: #5F7797;
- color: #E9F2FC;
- padding: 5px;
-}
-
-table.login td {
- padding: 5px;
-}
-
-table.installer {
- background-color: #BFC4CB;
- border-color: #000000;
- border-style: solid;
- border-width: 1px;
- font-size: 12px;
- margin-left: auto;
- margin-right: auto;
- padding: 0px;
- width: 370px;
-}
-
-table.installer th {
- background-color: #5F7797;
- color: #E9F2FC;
- padding: 5px;
-}
-
-table.installer td {
- padding: 5px;
-}
-
-.hr {
- background-color: transparent;
- color: #6394bd;
-}
-
-.center {
- text-align: center;
-}
-
-.copyright {
- font-size: 11px;
- text-align: center;
-}
-
-.left {
- text-align: left;
-}
-
-.menu {
- border-bottom-color: #000000;
- border-bottom-style: dashed;
- border-bottom-width: 1px;
- border-left-color: #000000;
- border-left-style: dashed;
- border-left-width: 1px;
- padding: 5px;
-}
-
-.notify {
- background-color: lightgrey;
-}
-
-.notify td {
- border-bottom-color: #000000;
- border-bottom-style: solid;
- border-bottom-width: 1px;
- border-top-color: #000000;
- border-top-style: solid;
- border-top-width: 1px;
-}
-
-.right {
- text-align: right;
-}
-
-.subtext {
- margin-top: 0px;
-}
-
-#border {
- margin-left: auto;
- margin-right: auto;
- text-align: left;
- width: 600px;
-}
-
-#content {
- border-bottom-color: #000000;
- border-bottom-style: dashed;
- border-bottom-width: 1px;
- border-left-color: #000000;
- border-left-style: dashed;
- border-left-width: 1px;
- border-right-color: #000000;
- border-right-style: dashed;
- border-right-width: 1px;
- float: left;
- padding: 5px;
- min-height: 360px;
- width: 388px;
-}
-
-#navigation {
- float: left;
- width: 200px;
-}
-
-#imageupload
-{
- display: none;
-}
Modified: trunk/jasmine/templatesets/Jasmine/Jasmine.xml
===================================================================
--- trunk/jasmine/templatesets/Jasmine/Jasmine.xml 2007-08-13 02:40:23 UTC (rev 129)
+++ trunk/jasmine/templatesets/Jasmine/Jasmine.xml 2007-08-19 21:00:33 UTC (rev 130)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<extension name="Jasmine" version="1.00" installed="false" activated="false" type="TemplateSet">
<description lang="en-GB">
- Standard theme for Jasmine.
+ Standard template set for Jasmine.
</description>
<description lang="de-DE">
- Standardthema für Jasmine.
+ Standardvorlagensatz für Jasmine.
</description>
</extension>
Modified: trunk/jasmine/tests/test_core.class.php
===================================================================
--- trunk/jasmine/tests/test_core.class.php 2007-08-13 02:40:23 UTC (rev 129)
+++ trunk/jasmine/tests/test_core.class.php 2007-08-19 21:00:33 UTC (rev 130)
@@ -31,10 +31,10 @@
public function testGetSingelton()
{
// Create the XML parser
- $this->parser =& new DomXmlParser();
+ $this->parser = new DomXmlParser();
Core::setXmlParser($this->parser);
- $this->instance =& Core::getSingleton();
+ $this->instance = Core::getSingleton();
$this->assertEquals(true, $this->instance instanceof Core);
}
Modified: trunk/jasmine/tests/test_db.class.php
===================================================================
--- trunk/jasmine/tests/test_db.class.php 2007-08-13 02:40:23 UTC (rev 129)
+++ trunk/jasmine/tests/test_db.class.php 2007-08-19 21:00:33 UTC (rev 130)
@@ -22,7 +22,7 @@
*/
protected function setUp()
{
- $this->instance =& new DB('', '', false, false, '', '');
+ $this->instance = new DB('', '', false, false, '', '');
}
public function testCreateConnection()
Modified: trunk/jasmine/tests/test_object.class.php
===================================================================
--- trunk/jasmine/tests/test_object.class.php 2007-08-13 02:40:23 UTC (rev 129)
+++ trunk/jasmine/tests/test_object.class.php 2007-08-19 21:00:33 UTC (rev 130)
@@ -70,8 +70,8 @@
*/
protected function setUp()
{
- $this->a =& new Counter();
- $this->b =& new Counter();
+ $this->a = new Counter();
+ $this->b = new Counter();
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
