Implement requireJS and requireCSS

docs/app.rst

@@ -30,7 +30,7 @@ Will be true if application is currently rendering recursively through the Rende
 Links
 =====
 
-.. php:method:: url(page, extension)
+.. php:method:: url(page)
 
 Method to generate links between pages. Specified with associative array::
 
@@ -40,8 +40,6 @@ this method must respond with a properly formatted url such as::
 
     contact.php?from=John+Smith
 
-If your pages use extension other than .php, then you should pass that extension too.
-
 You may redefine this metod if you are using beautiful URLs and advanced
 routing::
 
@@ -54,11 +52,19 @@ Includes
 
 .. php:method:: requireJS($url)
 
-Method to include additional JavaScript file in page.
+Method to include additional JavaScript file in page::
+
+    $app->requireJS('https://code.jquery.com/jquery-3.1.1.js');
+    $app->requireJS('https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.10/semantic.min.js');
+
+Using of CDN servers is always better than storing external libraries locally.
+Most of the time CDN servers are faster (cached) and more reliable.
 
 .. php:method:: requireCSS($url)
 
-Method to include additional CSS stylesheet in page.
+Method to include additional CSS stylesheet in page::
+
+    $app->requireCSS('http://semantic-ui.com/dist/semantic.css');
 
 Hooks
 =====

src/App.php

@@ -36,14 +36,6 @@ class App
 
     public $ui_persistence = null;
 
-    /**
-     * If you specify a string, then it will be considered a filename
-     * from which to load the template.
-     *
-     * @var string
-     */
-    public $defaultTemplate = 'html.html';
-
     /**
      * Constructor.
      *
@@ -165,9 +157,12 @@ public function initLayout($layout, $options = [])
         }
         $layout->app = $this;
 
-        $this->html = new View(['defaultTemplate' => $this->defaultTemplate]);
-        $this->html->app = $this;
-        $this->html->init();
+        if (!$this->html) {
+            $this->html = new View(['defaultTemplate' => 'html.html']);
+            $this->html->app = $this;
+            $this->html->init();
+        }
+
         $this->layout = $this->html->add($layout);
 
         return $this;
@@ -273,12 +268,11 @@ public function loadTemplate($name)
     /**
      * Build a URL that application can use for call-backs.
      *
-     * @param array|string $args      List of new GET arguments
-     * @param string       $extension Default file extension
+     * @param array|string $args List of new GET arguments
      *
      * @return string
      */
-    public function url($args = [], $extension = 'php')
+    public function url($args = [])
     {
         if (is_string($args)) {
             $args = [$args];
@@ -291,7 +285,7 @@ public function url($args = [], $extension = 'php')
         $page = $args[0];
         unset($args[0]);
 
-        $url = $page ? ($page.($extension ? '.'.$extension : '')) : '';
+        $url = $page ? $page.'.php' : '';
 
         $args = http_build_query($args);
 
@@ -311,7 +305,7 @@ public function url($args = [], $extension = 'php')
      */
     public function requireJS($url)
     {
-        $this->html->template->appendHTML('HEAD', '<script src="'.$this->url($url, null).'"></script>');
+        $this->html->template->appendHTML('HEAD', '<script src="'.$url.'"></script>');
 
         return $this;
     }
@@ -325,7 +319,7 @@ public function requireJS($url)
      */
     public function requireCSS($url)
     {
-        $this->html->template->appendHTML('HEAD', '<link rel="stylesheet" type="text/css" href="'.$this->url($url, null).'">');
+        $this->html->template->appendHTML('HEAD', '<link rel="stylesheet" type="text/css" href="'.$url.'">');
 
         return $this;
     }