Skip to content

Commit

Permalink
Version 2.241, released 07/01/2014.
Browse files Browse the repository at this point in the history
[Etc] - Minor changes - last touches here and there.
  • Loading branch information
HectorOrdonez committed Jan 7, 2014
1 parent 40005e0 commit cbcd8b9
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 31 deletions.
2 changes: 1 addition & 1 deletion application/controllers/Login.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
use engine\Form;
use engine\Input;

class Login extends Controller
class login extends Controller
{
/**
* Defining $_service Service type.
Expand Down
4 changes: 2 additions & 2 deletions application/controllers/dashboard.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ public function __construct()
*/
public function index()
{
$this->_view->addLibrary('js', 'application/views/dashboard/js/dashboard.js');
$this->_view->addLibrary('css', 'application/views/dashboard/css/dashboard.css');
$this->_view->addLibrary('application/views/dashboard/js/dashboard.js');
$this->_view->addLibrary('application/views/dashboard/css/dashboard.css');

$this->_view->setParameter('userName', Session::get('userName'));

Expand Down
2 changes: 1 addition & 1 deletion application/controllers/error.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function __construct()

$this->_view->setTitle('Error');

$this->_view->addLibrary('css', 'application/views/error/css/error.css');
$this->_view->addLibrary('application/views/error/css/error.css');
}

/** General Error Page */
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/help.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function __construct()
{
parent::__construct(new HelpService);

$this->_view->addLibrary('css', 'views/help/css/help.css');
$this->_view->addLibrary('application/views/help/css/help.css');
}

/**
Expand Down
9 changes: 6 additions & 3 deletions application/controllers/releaseLog.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,15 @@ public function __construct()
parent::__construct();

// Setting version under construction
$this->_setDevelopmentVersion('2.24', '06/01/2014', array(
'[Refactor] - Mayor change. After intense struggles and researches, decided to use PHP ActiveRecord. Because of this, deleted all Database and Model related constructions used so far. I am aiming to implement my own PHP ActiveRecord technology for the third Hecnel Framework version.',
'[Feature] - Test 4 is designed to be the testing workspace for multiple model work. However, as PHP ActiveRecord comes to play, it is halfway implemented. To be reworked in future.',
$this->_setDevelopmentVersion('2.241', '07/01/2014', array(
'[Etc] - Minor changes - last touches here and there.'
));

// Setting Historical Log of releases
$this->_addHistoryLog('2.24', '06/01/2014', array(
'[Refactor] - Mayor change. After intense struggles and researches, decided to use PHP ActiveRecord. Because of this, deleted all Database and Model related constructions used so far. I am aiming to implement my own PHP ActiveRecord technology for the third Hecnel Framework version.',
'[Feature] - Test 4 is designed to be the testing workspace for multiple model work. However, as PHP ActiveRecord comes to play, it is halfway implemented. To be reworked in future.',
));
$this->_addHistoryLog('2.23', '04/01/2014', array(
'[Refactor] - Modified libraries concept to Service concepts. A Service is tightly related to a controller. It stores intelligence regarding what to do with validated information, which models request a CRUD, and informs the controller about the message to put into the related view.',
'[Refactor] - Modified Hecnel Framework in order to use the new Model architecture.'
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/test1.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function __construct()

public function index()
{
$this->_view->addLibrary('css', 'application/views/tests/test1/css/test1.css');
$this->_view->addLibrary('application/views/tests/test1/css/test1.css');

// Main view
$this->_view->addChunk('tests/test1/index');
Expand Down
4 changes: 2 additions & 2 deletions application/controllers/test3.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ public function __construct()

public function index()
{
$this->_view->addLibrary('js', 'application/views/tests/test3/js/test3.js');
$this->_view->addLibrary('css', 'application/views/tests/test3/css/test3.css');
$this->_view->addLibrary('application/views/tests/test3/js/test3.js');
$this->_view->addLibrary('application/views/tests/test3/css/test3.css');

$this->_view->addChunk('tests/test3/index');
}
Expand Down
4 changes: 2 additions & 2 deletions application/controllers/test4.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ public function __construct()

public function index()
{
$this->_view->addLibrary('js', 'application/views/tests/test4/js/test4.js');
$this->_view->addLibrary('css', 'application/views/tests/test4/css/test4.css');
$this->_view->addLibrary('application/views/tests/test4/js/test4.js');
$this->_view->addLibrary('application/views/tests/test4/css/test4.css');

$this->_view->addChunk('tests/test4/index');
}
Expand Down
10 changes: 5 additions & 5 deletions application/engine/Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ protected function _setView()
parent::_setView();

$this->_view->setTitle('Hecnel Framework');
$this->_view->addLibrary('css', 'public/css/default.css');
$this->_view->addLibrary('public/css/default.css');

$this->_view->addLibrary('js', 'public/js/external/jquery-1.10.1.js');
$this->_view->addLibrary('js', 'public/js/general.js');
$this->_view->addLibrary('public/js/external/jquery-1.10.1.js');
$this->_view->addLibrary('public/js/general.js');

$this->_view->setMeta('description', array(
'name' => 'description',
Expand All @@ -58,8 +58,8 @@ protected function _setView()
'content' => 'Hecnel Framework, PHP, JavaScript, OOP, MVC'
));

$this->_view->addLibrary('css', 'application/views/general/css/base.css');
$this->_view->addLibrary('js', 'application/views/general/js/base.js');
$this->_view->addLibrary('application/views/general/css/base.css');
$this->_view->addLibrary('application/views/general/js/base.js');

$this->_view->addChunk('general/top', 'header');
$this->_view->addChunk('general/bottom', 'footer');
Expand Down
3 changes: 2 additions & 1 deletion application/views/help/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* User: Hector Ordonez
* Description:
* Date: 26/12/13 21:30
* @var \application\engine\View $this
*/
?>

Expand All @@ -15,7 +16,7 @@
<a href='<?php echo _SYSTEM_BASE_URL; ?>help/helpMeWith/aboutECWGT'>Help me with Eating Cakes Without Getting Fat (ECWGF)</a>
<a href='<?php echo _SYSTEM_BASE_URL; ?>help/helpMeWith/aboutDWWGD'>Help me with Drinking Whisky Without Getting Drunk (DWWGD)</a>
<hr />
<?php echo $this->msg; ?>
<?php echo $this->getParameter('msg'); ?>
</div>

<?php $this->printChunk('footer'); ?>
2 changes: 1 addition & 1 deletion engine/Input.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Project: Hecnel Framework
* User: Hector Ordonez
* Description:
* @date: 16/06/13 22:00
* @date: 13/12/13 15:30
*/

namespace engine;
Expand Down
16 changes: 5 additions & 11 deletions engine/View.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* View engine class.
* Its purpose is to define the behavior of the Views of the application and to provide general methods.
* @date: 11/06/13 12:00
* @todo Redesign View concept.
*/

namespace engine;
Expand Down Expand Up @@ -80,25 +79,20 @@ public function __construct()

/**
* Adds a CSS or JS library to the appropriate array in the View.
* The handling of these arrays is normally done in the Header. In case the general Header is not called, another
* view has to render them.
*
* Notice that if the first four characters are http, the library is considered external and the BASE_URL of the system won't be added to the String.
*
* @param string $type
* @param string $libraryPath
* @todo This method can find out itself whether the added library is js or css, just looking by its extension.
*/
public function addLibrary($type, $libraryPath)
public function addLibrary($libraryPath)
{
if (substr($libraryPath, 0, 4) !== "http") {
$libraryPath = _SYSTEM_BASE_URL . $libraryPath;
}

if ($type == 'css') {
$this->_css[] = $libraryPath;
} elseif ($type == 'js') {

if(substr($libraryPath, -2, 2) == 'js'){
$this->_js[] = $libraryPath;
} else {
$this->_css[] = $libraryPath;
}
}

Expand Down
1 change: 1 addition & 0 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* @todo Currency - Which currency User requires.
* @todo Hecnel 3.0 - Validation system similar to old one, in combination with a minor Model modification to allow field type definition when constructing.
* @todo This would allow Models to validate data using the validation system.
* @todo Hecnel 3.0 - Build a customized ActiveRecord system and remove the php-activerecord. This system should make use of the validation system.
*/

// First thing ever, session_start.
Expand Down

0 comments on commit cbcd8b9

Please sign in to comment.