Merge branch 'master' into noglob

src/Tales.php

@@ -31,6 +31,15 @@ class Tales_Component implements PHPTAL_Tales
     }
 }
 
+class Tales_Assets implements PHPTAL_Tales
+{
+    static public function assets($expression, $nothrow = false)
+    {
+        $s = PHPTAL_Php_TalesInternal::string($expression);
+        return "ctiso\\Tales::phptal_asset(" . $s . ")";
+    }
+}
+
 class Tales {
     static $site/*: SiteInterface*/;
 
@@ -42,6 +51,11 @@ class Tales {
         return date("H:i", $e);
     }
 
+    static function phptal_asset($s) {    
+        self::$sit->addStyleSheet($s);
+        return "";
+    }
+
     /**
      * Функция подключения компонента
      */
@@ -66,5 +80,6 @@ class Tales {
         $tales->registerPrefix('component', array('ctiso\\Tales_Component', 'component'));
         $tales->registerPrefix('date', array('ctiso\\Tales_DateTime', 'date'));
         $tales->registerPrefix('time', array('ctiso\\Tales_DateTime', 'time'));
+        $tales->registerPrefix('assets', array('ctiso\\Tales_Assets', 'assets'));
     }
 }