[Solar-svn] Revision 2838
pmjones at solarphp.com
pmjones at solarphp.com
Sat Oct 6 11:30:07 CDT 2007
whitespace changes
Modified: trunk/Solar/App/Hello/Locale/pt_BR.php
===================================================================
--- trunk/Solar/App/Hello/Locale/pt_BR.php 2007-10-06 16:26:49 UTC (rev 2837)
+++ trunk/Solar/App/Hello/Locale/pt_BR.php 2007-10-06 16:30:07 UTC (rev 2838)
@@ -1,20 +1,20 @@
<?php
/**
- *
+ *
* Translation file.
- *
+ *
* @category Solar
- *
+ *
* @package Solar_App
- *
+ *
* @subpackage Solar_App_HelloWorld
- *
+ *
* @author Rodrigo Moraes <http://tipos.org>
- *
+ *
* @license http://opensource.org/licenses/bsd-license.php BSD
- *
+ *
* @version $Id$
- *
+ *
*/
return array(
'TEXT_HELLO_WORLD' => 'Olá, mundo!'
Modified: trunk/Solar/App/Hello.php
===================================================================
--- trunk/Solar/App/Hello.php 2007-10-06 16:26:49 UTC (rev 2837)
+++ trunk/Solar/App/Hello.php 2007-10-06 16:30:07 UTC (rev 2838)
@@ -107,10 +107,10 @@
// reset the locale strings to the new code
Solar::$locale->setCode($this->code);
-
+
// set the translated text
$this->text = $this->locale('TEXT_HELLO_WORLD');
-
+
// tell the site layout what title to use
$this->layout_head['title'] = 'Solar: Hello World!';
}
@@ -129,13 +129,13 @@
{
// set the code from input
$this->code = $code;
-
+
// reset the locale strings to the new code
Solar::$locale->setCode($this->code);
-
+
// set the translated text
$this->text = $this->locale('TEXT_HELLO_WORLD');
-
+
// turn off the site layout so RSS is not mangled
$this->_layout = false;
}
Modified: trunk/Solar/App/HelloAjax/Locale/en_US.php
===================================================================
--- trunk/Solar/App/HelloAjax/Locale/en_US.php 2007-10-06 16:26:49 UTC (rev 2837)
+++ trunk/Solar/App/HelloAjax/Locale/en_US.php 2007-10-06 16:30:07 UTC (rev 2838)
@@ -1,20 +1,20 @@
<?php
/**
- *
+ *
* Translation file.
- *
+ *
* @category Solar
- *
+ *
* @package Solar_App
- *
+ *
* @subpackage Solar_App_HelloWorld
- *
+ *
* @author Paul M. Jones <pmjones at solarphp.com>
- *
+ *
* @license http://opensource.org/licenses/bsd-license.php BSD
- *
+ *
* @version $Id$
- *
+ *
*/
return array(
'TEXT_HELLO_WORLD' => 'Hello, world! (Ajax Style!)'
Modified: trunk/Solar/App/HelloAjax/Locale/pt_BR.php
===================================================================
--- trunk/Solar/App/HelloAjax/Locale/pt_BR.php 2007-10-06 16:26:49 UTC (rev 2837)
+++ trunk/Solar/App/HelloAjax/Locale/pt_BR.php 2007-10-06 16:30:07 UTC (rev 2838)
@@ -1,20 +1,20 @@
<?php
/**
- *
+ *
* Translation file.
- *
+ *
* @category Solar
- *
+ *
* @package Solar_App
- *
+ *
* @subpackage Solar_App_HelloWorld
- *
+ *
* @author Rodrigo Moraes <http://tipos.org>
- *
+ *
* @license http://opensource.org/licenses/bsd-license.php BSD
- *
+ *
* @version $Id$
- *
+ *
*/
return array(
'TEXT_HELLO_WORLD' => 'Olá, mundo!'
Modified: trunk/Solar/App/HelloAjax/View/main.php
===================================================================
--- trunk/Solar/App/HelloAjax/View/main.php 2007-10-06 16:26:49 UTC (rev 2837)
+++ trunk/Solar/App/HelloAjax/View/main.php 2007-10-06 16:30:07 UTC (rev 2838)
@@ -1,24 +1,23 @@
<?php
/**
- *
+ *
* HTML view.
- *
+ *
* @category Solar
- *
+ *
* @package Solar_App
- *
+ *
* @subpackage Solar_App_HelloWorld
- *
+ *
* @author Paul M. Jones <pmjones at solarphp.com>
- *
+ *
* @license http://opensource.org/licenses/bsd-license.php BSD
- *
+ *
* @version $Id$
- *
+ *
*/
?>
<?php
-
$this->JsPrototype()->event
->observe('#top', 'click', 'function() { location.href = "http://solarphp.com"; }')
->observe('#top', 'mouseover', 'function() { this.style.cursor = "pointer"; }')
@@ -26,8 +25,6 @@
// sample onclick
$this->JsPrototype()->event->observe('#ahello', 'click', 'function(evt) { alert("hello!"); Event.stop(evt); }');
-
-
?>
<p id="hello"><?php echo $this->escape($this->text) ?></p>
@@ -45,8 +42,8 @@
<p><a id="ahello" href="index.php">hello!</a> ... an example of an unobtrusive "onclick" hyperlink.</a></p>
-
<p><?php echo $this->escape($this->code) ?></p>
+
<ul>
<?php foreach ($this->list as $code): ?>
<li>
Modified: trunk/Solar/App/HelloAjax.php
===================================================================
--- trunk/Solar/App/HelloAjax.php 2007-10-06 16:26:49 UTC (rev 2837)
+++ trunk/Solar/App/HelloAjax.php 2007-10-06 16:30:07 UTC (rev 2838)
@@ -1,84 +1,83 @@
<?php
/**
- *
+ *
* Simple "hello world" application with actions, views, and localization ...
* all with a little Ajax goodness
- *
+ *
* @category Solar
- *
+ *
* @package Solar_App
- *
+ *
* @subpackage Solar_App_HelloAjax
- *
+ *
* @author Paul M. Jones <pmjones at solarphp.com>
- *
+ *
* @license http://opensource.org/licenses/bsd-license.php BSD
- *
+ *
* @version $Id$
- *
+ *
*/
/**
- *
+ *
* Simple "hello world" application with actions, views, and localization ...
* all with a little Ajax goodness
- *
+ *
* @category Solar
- *
+ *
* @package Solar_App
- *
+ *
* @subpackage Solar_App_HelloAjax
- *
+ *
*/
class Solar_App_HelloAjax extends Solar_App_Base {
-
+
/**
- *
+ *
* The default controller action.
- *
+ *
* @var string
- *
+ *
*/
protected $_action_default = 'main';
-
+
/**
- *
+ *
* The list of available locale codes.
- *
+ *
* @var array
- *
+ *
*/
public $list = array('en_US', 'es_ES', 'fr_FR');
-
+
/**
- *
+ *
* The requested locale code.
- *
+ *
* @var string
- *
+ *
*/
public $code;
-
-
+
/**
- *
+ *
* The translated text.
- *
+ *
* @var string
- *
+ *
*/
public $text;
-
+
/**
- *
+ *
* Overrides the general Solar_App setup so that we don't need a
* database connection. This is because we want the simplest
* possible hello-world example.
- *
+ *
* Thanks, Clay Loveless, for suggesting this.
- *
+ *
* @return void
- *
+ *
*/
protected function _setup()
{
@@ -87,57 +86,57 @@
if (! Solar::isRegistered('user')) {
Solar::register('user', Solar::factory('Solar_User'));
}
-
+
// set the layout title
$this->layout_head['title'] = get_class($this);
}
-
+
/**
- *
+ *
* Resets to the requested locale code and shows translated output
* as an HTML file.
- *
+ *
* @param string $code The requested locale code.
- *
+ *
* @return void
- *
+ *
*/
public function actionMain($code = 'en_US')
{
// set the code from input
$this->code = $code;
-
+
// reset the locale strings to the new code
Solar::$locale->setCode($this->code);
-
+
// set the translated text
$this->text = $this->locale('TEXT_HELLO_WORLD');
-
+
// tell the site layout what title to use
$this->layout_head['title'] = 'Solar: Hello Ajax!';
}
-
+
/**
- *
+ *
* Resets to the requested locale code and shows translated output
* as an RSS file.
- *
+ *
* @param string $code The requested locale code.
- *
+ *
* @return void
- *
+ *
*/
public function actionRss($code = 'en_US')
{
// set the code from input
$this->code = $code;
-
+
// reset the locale strings to the new code
Solar::$locale->setCode($this->code);
-
+
// set the translated text
$this->text = $this->locale('TEXT_HELLO_WORLD');
-
+
// turn off the site layout so RSS is not mangled
$this->_layout = false;
}
Modified: trunk/Solar/App/Public/scripts/prototype/prototype.js
===================================================================
--- trunk/Solar/App/Public/scripts/prototype/prototype.js 2007-10-06 16:26:49 UTC (rev 2837)
+++ trunk/Solar/App/Public/scripts/prototype/prototype.js 2007-10-06 16:30:07 UTC (rev 2838)
@@ -1,9 +1,9 @@
/* Prototype JavaScript framework, version 1.5.0
* (c) 2005-2007 Sam Stephenson
- *
+ *
* Prototype is freely distributable under the terms of an MIT-style license.
* For details, see the Prototype web site: http://prototype.conio.net/
- *
+ *
/*--------------------------------------------------------------------------*/
var Prototype = {
More information about the Solar-svn
mailing list