Changeset 1014:65b07a8688ca

Timestamp:

11/14/12 22:47:48 (13 years ago)

Author:

JcDenis

Branch:

twig

Message:

Use $core->page as new Twig environment

Files:

• admin/post.php (modified) (3 diffs)
• inc/admin/class.dc.admincontext.php (moved) (moved from inc/admin/class.dc.adminpage.php) (3 diffs)
• inc/admin/class.dc.form.php (modified) (1 diff)
• inc/core/class.dc.twig.page.php (modified) (2 diffs)
• inc/prepend.php (modified) (2 diffs)

admin/post.php

@@ -69 +69 @@
 
 
-
-$page = new dcAdminPage($core);
 
 $form = new dcForm($core,'post','post.php');
@@ -314 +312 @@
 }
 
-$ctx = $page->getContext();
-$ctx 
+$core->page->getContext()
      ->jsDatePicker()
      ->jsToolBar()
@@ -324 +321 @@
      ->jsConfirmClose('entry-form','comment-form');
 
-echo $page->render('post.html.twig',array(
+echo $core->page->render('post.html.twig',array(
      'edit_size'=> $core->auth->getOption('edit_size')));
 ?>

inc/admin/class.dc.admincontext.php

@@ -1 +1 @@
 <?php
-
 
 class dcAdminContext extends Twig_Extension {
@@ -23 +22 @@
                }
           }
-          $this->blog = array(
-               'url' => $core->blog->url,
-               'name' => $core->blog->name
-          );
+          $this->blog = array();
+          if ($this->core->auth->blog_count) { // no blog on auth.php
+               $this->blog = array(
+                    'url' => $core->blog->url,
+                    'name' => $core->blog->name
+               );
+          }
      }
      
@@ -430 +432 @@
 
 }
-
-class dcAdminPage {
-     protected $loader;
-     protected $twig;
-     protected $context;
-     protected $core;
-
-     public function __construct($core) {
-          $this->core = $core;
-          $this->loader = new Twig_Loader_Filesystem(dirname(__FILE__).'/default-templates');
-          files::makeDir(dirname(DC_TPL_CACHE.'/admtpl'),true);
-          $core->twig = new Twig_Environment (
-               $this->loader,
-               array(
-                    'cache' => DC_TPL_CACHE.'/admtpl',
-                    //'debug' => true,
-                    'auto_reload' => true
-          ));
-          //$core->twig->addExtension(new Twig_Extensions_Extension_Debug());
-          $core->twig->addExtension(new Twig_Extension_Optimizer(0));
-          $core->twig->addExtension(new dcFormExtension($GLOBALS['core']));
-          $this->context = new dcAdminContext($GLOBALS['core']);
-          $core->twig->addExtension($this->context);
-          $core->twig->clearCacheFiles();
-     }
-
-     public function getContext() {
-          return $this->context;
-     }
-     
-     public function getTwig() {
-          return $this->twig;
-     }
-     public function render($name,array $context = array()) {
-          $tpl = $this->core->twig->loadTemplate($name);
-          
-          return $tpl->render($context);
-
-     }
-}
-
-
 ?>

inc/admin/class.dc.form.php

@@ -145 +145 @@
           $this->action = $action;
           $this->fields = array();
-          $this->core->twig->getExtension('dc_form')->addForm($this);
+          $this->core->page->getExtension('dc_form')->addForm($this);
      }
 

inc/core/class.dc.twig.page.php

@@ -4 +4 @@
 class dcTwigPage extends Twig_Environment
 {
-     protected $core; // not in use by now
+     protected $core;
      protected $context = null;
      
@@ -34 +34 @@
           
           # Add form helper
-          $this->addExtension(new dcFormExtension());
+          $this->addExtension(new dcFormExtension($core));
           
           $this->clearCacheFiles();

inc/prepend.php

@@ -53 +53 @@
 $__autoload['rsExtUser']                = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
 
-
-$__autoload['dcAdminPage']                   = dirname(__FILE__).'/admin/class.dc.adminpage.php';
-$__autoload['dcAdminContext']                = dirname(__FILE__).'/admin/class.dc.adminpage.php';
+$__autoload['dcAdminContext']                = dirname(__FILE__).'/admin/class.dc.admincontext.php';
 $__autoload['dcMenu']                   = dirname(__FILE__).'/admin/class.dc.menu.php';
 $__autoload['dcPage']                   = dirname(__FILE__).'/admin/lib.dc.page.php';
@@ -87 +85 @@
 require TWIG_PATH.'/Autoloader.php';
 Twig_Autoloader::register();
+
 /* ------------------------------------------------------------------------------------------- */