diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controler/Dashboard.php b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/Dashboard.php similarity index 72% rename from CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controler/Dashboard.php rename to CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/Dashboard.php index ba858f1..3d08361 100644 --- a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controler/Dashboard.php +++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/Dashboard.php @@ -1,14 +1,14 @@ diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controler/Details.php b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/Details.php similarity index 59% rename from CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controler/Details.php rename to CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/Details.php index ebfaf70..ce5eab8 100644 --- a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controler/Details.php +++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/Details.php @@ -1,8 +1,8 @@ oForm->submitted()) { $this->oForm->execute(); @@ -157,7 +156,7 @@ class Users extends \Flake\Core\Controler { } public static function link() { - return BAIKAL_URI . BAIKALADMIN_URIPATH . $GLOBALS["ROUTER"]::buildRouteForControler("\BaikalAdmin\Controler\Users"); + return BAIKAL_URI . BAIKALADMIN_URIPATH . $GLOBALS["ROUTER"]::buildRouteForController("\BaikalAdmin\Controller\Users"); } public static function linkNew() { diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/Page/index.html b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/Page/index.html index 045f5e2..4c2375a 100644 --- a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/Page/index.html +++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/Page/index.html @@ -1,61 +1,52 @@ - - - {pagetitle} - - - - + + + {pagetitle} + + - - - - - + + + + - - - {head} - + + + {head} + + +
+
+
+ + + + + + Baïkal Admin +
+ +
+
+
+
- - -
-
-
- - - - - - Baïkal Admin -
- -
-
-
-
+
+ {Payload} +
-
- {Payload} -
- - - - - - {javascript} - + + + + + {javascript} + \ No newline at end of file diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/Page/style.css b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/Page/style.css index 01e072d..6c998f8 100644 --- a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/Page/style.css +++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/Page/style.css @@ -1,3 +1,7 @@ +body { + padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */ +} + /* Jumbotrons -------------------------------------------------- */ .jumbotron { diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/User/Listing.html b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/User/Listing.html index 760e8b3..af97d06 100644 --- a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/User/Listing.html +++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/User/Listing.html @@ -7,7 +7,7 @@

Users

Browse, create, update and delete Baïkal user accounts.

-

+ Add user

+

+ Add user

@@ -17,9 +17,9 @@ getMailtoURI(); ?> diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/Dashboard.php b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/Dashboard.php index fdd8e3b..086c188 100644 --- a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/Dashboard.php +++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/Dashboard.php @@ -5,6 +5,6 @@ namespace BaikalAdmin\Route; class Dashboard { public static function execute(\Flake\Core\Render\Container &$oRenderContainer) { - $oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controler\Dashboard()); + $oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Dashboard()); } } \ No newline at end of file diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/Details.php b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/Details.php index 3886832..f991f59 100644 --- a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/Details.php +++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/Details.php @@ -5,6 +5,6 @@ namespace BaikalAdmin\Route; class Details { public static function execute(\Flake\Core\Render\Container &$oRenderContainer) { - $oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controler\Details()); + $oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Details()); } } \ No newline at end of file diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/Install.php b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/Install.php index f9a786f..c305042 100644 --- a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/Install.php +++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/Install.php @@ -5,6 +5,6 @@ namespace BaikalAdmin\Route; class Install { public static function execute(\Flake\Core\Render\Container &$oRenderContainer) { - $oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controler\Install()); + $oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Install()); } } \ No newline at end of file diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/Users.php b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/Users.php index 7222f35..fe9f903 100644 --- a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/Users.php +++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/Users.php @@ -5,6 +5,6 @@ namespace BaikalAdmin\Route; class Users { public static function execute(\Flake\Core\Render\Container &$oRenderContainer) { - $oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controler\Users()); + $oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Users()); } } \ No newline at end of file diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/View/User/Form.php b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/View/User/Form.php index 2cdc897..3d27392 100644 --- a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/View/User/Form.php +++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/View/User/Form.php @@ -9,8 +9,8 @@ class Form extends \Flake\Core\View { return $oTemplate->parse(array( "user" => $oUser, - "linkcancel" => \BaikalAdmin\Controler\Users::link(), - "action" => \BaikalAdmin\Controler\Users::linkEdit($oUser), + "linkcancel" => \BaikalAdmin\Controller\Users::link(), + "action" => \BaikalAdmin\Controller\Users::linkEdit($oUser), "messages" => $this->get("messages"), )); } diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/index.php b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/index.php index 41fe9a0..cae710a 100644 --- a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/index.php +++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/index.php @@ -38,11 +38,16 @@ require_once(dirname(__FILE__) . "/Core/Bootstrap.php"); \BaikalAdmin\Core\Auth::assertAuthentified(); # Create and setup a page object -$oPage = new \Flake\Controler\Page(BAIKALADMIN_PATH_TEMPLATES . "Page/index.html"); +$oPage = new \Flake\Controller\Page(BAIKALADMIN_PATH_TEMPLATES . "Page/index.html"); $oPage->injectHTTPHeaders(); $oPage->setTitle("Baïkal Web Admin"); $oPage->setBaseUrl(BAIKAL_URI); +$sControllerForDefaultRoute = $GLOBALS["ROUTER"]::getControllerForRoute("default"); +$oPage->zone("adminurl")->addBlock(new \Flake\Controller\HtmlBlock( + $sControllerForDefaultRoute::link() +)); + # Route the request $GLOBALS["ROUTER"]::route($oPage); diff --git a/CoreVersions/Baikal_0.1/Frameworks/Flake/Controler/Cli.php b/CoreVersions/Baikal_0.1/Frameworks/Flake/Controller/Cli.php similarity index 98% rename from CoreVersions/Baikal_0.1/Frameworks/Flake/Controler/Cli.php rename to CoreVersions/Baikal_0.1/Frameworks/Flake/Controller/Cli.php index afed270..a5140ee 100755 --- a/CoreVersions/Baikal_0.1/Frameworks/Flake/Controler/Cli.php +++ b/CoreVersions/Baikal_0.1/Frameworks/Flake/Controller/Cli.php @@ -1,6 +1,6 @@ sHtml = $sHtml; diff --git a/CoreVersions/Baikal_0.1/Frameworks/Flake/Controler/HtmlBlockTemplated.php b/CoreVersions/Baikal_0.1/Frameworks/Flake/Controller/HtmlBlockTemplated.php similarity index 78% rename from CoreVersions/Baikal_0.1/Frameworks/Flake/Controler/HtmlBlockTemplated.php rename to CoreVersions/Baikal_0.1/Frameworks/Flake/Controller/HtmlBlockTemplated.php index 803aa67..89420ae 100755 --- a/CoreVersions/Baikal_0.1/Frameworks/Flake/Controler/HtmlBlockTemplated.php +++ b/CoreVersions/Baikal_0.1/Frameworks/Flake/Controller/HtmlBlockTemplated.php @@ -1,8 +1,8 @@ sTemplatePath = $sTemplatePath; diff --git a/CoreVersions/Baikal_0.1/Frameworks/Flake/Controler/Kickstart.php b/CoreVersions/Baikal_0.1/Frameworks/Flake/Controller/Kickstart.php similarity index 87% rename from CoreVersions/Baikal_0.1/Frameworks/Flake/Controler/Kickstart.php rename to CoreVersions/Baikal_0.1/Frameworks/Flake/Controller/Kickstart.php index 2c03b96..586fef4 100755 --- a/CoreVersions/Baikal_0.1/Frameworks/Flake/Controler/Kickstart.php +++ b/CoreVersions/Baikal_0.1/Frameworks/Flake/Controller/Kickstart.php @@ -1,12 +1,10 @@ aArgs)) { $this->action_helloworld(); } diff --git a/CoreVersions/Baikal_0.1/Frameworks/Flake/Controler/Page.php b/CoreVersions/Baikal_0.1/Frameworks/Flake/Controller/Page.php similarity index 96% rename from CoreVersions/Baikal_0.1/Frameworks/Flake/Controler/Page.php rename to CoreVersions/Baikal_0.1/Frameworks/Flake/Controller/Page.php index 9fb1a1b..a3e3571 100755 --- a/CoreVersions/Baikal_0.1/Frameworks/Flake/Controler/Page.php +++ b/CoreVersions/Baikal_0.1/Frameworks/Flake/Controller/Page.php @@ -1,6 +1,6 @@ "; - $this->zone("head")->addBlock(new \Flake\Controler\HtmlBlock($sHtml)); + $this->zone("head")->addBlock(new \Flake\Controller\HtmlBlock($sHtml)); } } \ No newline at end of file diff --git a/CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Controler.php b/CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Controller.php similarity index 57% rename from CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Controler.php rename to CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Controller.php index 5c48734..f053423 100755 --- a/CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Controler.php +++ b/CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Controller.php @@ -2,7 +2,7 @@ namespace Flake\Core; -abstract class Controler extends \Flake\Core\FLObject { +abstract class Controller extends \Flake\Core\FLObject { protected $aParams = array(); @@ -12,11 +12,14 @@ abstract class Controler extends \Flake\Core\FLObject { abstract function execute(); abstract function render(); + static function link(/*[$sParam, $sParam2, ...]*/) { + + } public static function buildRoute(/*[$sParam, $sParam2, ...]*/) { $aParams = func_get_args(); - $sControler = "\\" . get_called_class(); - array_unshift($aParams, $sControler); # Injecting current controler as first param - return call_user_func_array($GLOBALS["ROUTER"] . "::buildRouteForControler", $aParams); + $sController = "\\" . get_called_class(); + array_unshift($aParams, $sController); # Injecting current controller as first param + return call_user_func_array($GLOBALS["ROUTER"] . "::buildRouteForController", $aParams); } } \ No newline at end of file diff --git a/CoreVersions/Baikal_0.1/Frameworks/Flake/Route/Kickstart/Main.php b/CoreVersions/Baikal_0.1/Frameworks/Flake/Route/Kickstart/Main.php index d3c6bde..b858bcd 100755 --- a/CoreVersions/Baikal_0.1/Frameworks/Flake/Route/Kickstart/Main.php +++ b/CoreVersions/Baikal_0.1/Frameworks/Flake/Route/Kickstart/Main.php @@ -5,6 +5,6 @@ namespace Flake\Route\Kickstart; class Main { public function execute(\Flake\Core\Render\Container &$oRenderContainer) { - $oRenderContainer->zone("Payload")->addBlock(new \Flake\Controler\Kickstart()); + $oRenderContainer->zone("Payload")->addBlock(new \Flake\Controller\Kickstart()); } } \ No newline at end of file diff --git a/CoreVersions/Baikal_0.1/Frameworks/Flake/Util/Router.php b/CoreVersions/Baikal_0.1/Frameworks/Flake/Util/Router.php index 33837c8..81f8582 100755 --- a/CoreVersions/Baikal_0.1/Frameworks/Flake/Util/Router.php +++ b/CoreVersions/Baikal_0.1/Frameworks/Flake/Util/Router.php @@ -15,22 +15,26 @@ abstract class Router extends \Flake\Core\FLObject { return $GLOBALS["ROUTES"]; } - public static function getControlerForRoute($sRoute) { + public static function getControllerForRoute($sRoute) { + return str_replace("\\Route", "\\Controller", self::getRouteClassForRoute($sRoute)); + } + + public static function getRouteClassForRoute($sRoute) { $aRoutes = $GLOBALS["ROUTER"]::getRoutes(); return $aRoutes[$sRoute]; } - public static function getRouteForControler($sControler) { + public static function getRouteForController($sController) { - if($sControler{0} !== "\\") { - $sControler = "\\" . $sControler; + if($sController{0} !== "\\") { + $sController = "\\" . $sController; } $aRoutes = $GLOBALS["ROUTER"]::getRoutes(); reset($aRoutes); while(list($sRoute,) = each($aRoutes)) { - if(str_replace("\\Route", "\\Controler", $aRoutes[$sRoute]) === $sControler) { + if(str_replace("\\Route", "\\Controller", $aRoutes[$sRoute]) === $sController) { return $sRoute; } } @@ -39,20 +43,20 @@ abstract class Router extends \Flake\Core\FLObject { } public static function route(\Flake\Core\Render\Container &$oRenderContainer) { - $sControler = $GLOBALS["ROUTER"]::getControlerForRoute( + $sRouteClass = $GLOBALS["ROUTER"]::getRouteClassForRoute( $GLOBALS["ROUTER"]::getCurrentRoute() ); - $sControler::execute($oRenderContainer); + $sRouteClass::execute($oRenderContainer); } - public static function buildRouteForControler($sControler /* [, $sParam, $sParam2, ...] */) { + public static function buildRouteForController($sController /* [, $sParam, $sParam2, ...] */) { $aParams = func_get_args(); - array_shift($aParams); # stripping $sControler - $sRouteForControler = $GLOBALS["ROUTER"]::getRouteForControler($sControler); + array_shift($aParams); # stripping $sController + $sRouteForController = $GLOBALS["ROUTER"]::getRouteForController($sController); - array_unshift($aParams, $sRouteForControler); # Injecting route as first param + array_unshift($aParams, $sRouteForController); # Injecting route as first param return call_user_func_array($GLOBALS["ROUTER"] . "::buildRoute", $aParams); } diff --git a/CoreVersions/Baikal_0.1/Frameworks/Flake/Util/Router/QuestionMarkRewrite.php b/CoreVersions/Baikal_0.1/Frameworks/Flake/Util/Router/QuestionMarkRewrite.php index d0c74a1..608d562 100644 --- a/CoreVersions/Baikal_0.1/Frameworks/Flake/Util/Router/QuestionMarkRewrite.php +++ b/CoreVersions/Baikal_0.1/Frameworks/Flake/Util/Router/QuestionMarkRewrite.php @@ -20,7 +20,7 @@ class QuestionMarkRewrite extends \Flake\Util\Router { $aRoutes = self::getRoutes(); reset($aRoutes); - foreach($aRoutes as $sDefinedRoute => $sDefinedControler) { + foreach($aRoutes as $sDefinedRoute => $sDefinedController) { if(strpos($sRoutePart, $sDefinedRoute) !== FALSE) { # found a match