diff --git a/lib/classes/basketCollection.class.php b/lib/classes/basketCollection.class.php index ba151b14eb..66501e80f1 100644 --- a/lib/classes/basketCollection.class.php +++ b/lib/classes/basketCollection.class.php @@ -42,8 +42,8 @@ class basketCollection $baskets['baskets'] = $baskets['recept'] = $baskets['regroup'] = array(); - $kernel = bootstrap::getKernel(); - $em = $kernel->getEntityManager(); + $core = bootstrap::getCore(); + $em = $core->getEntityManager(); $baskets['baskets'] = $em->getRepository('Entities\Basket') ->findBy(array('usr_id' => $usr_id, 'pusher_id' => null)); diff --git a/lib/classes/bootstrap.class.php b/lib/classes/bootstrap.class.php index cf4429e49a..b34f44efc1 100644 --- a/lib/classes/bootstrap.class.php +++ b/lib/classes/bootstrap.class.php @@ -16,46 +16,46 @@ * @link www.phraseanet.com */ -require_once __DIR__ . '/../Alchemy/Phrasea/Kernel.php'; +require_once __DIR__ . '/../Alchemy/Phrasea/Core.php'; class bootstrap { - protected static $kernel; + protected static $core; public static function set_php_configuration() { - return Alchemy\Phrasea\Kernel::initPHPConf(); + return Alchemy\Phrasea\Core::initPHPConf(); } /** * - * @return Alchemy\Phrasea\Kernel + * @return Alchemy\Phrasea\Core */ public static function execute() { - if(static::$kernel) + if(static::$core) { - return static::$kernel; + return static::$core; } - static::$kernel = new Alchemy\Phrasea\Kernel(); + static::$core = new Alchemy\Phrasea\Core(); - return static::$kernel; + return static::$core; } /** * - * @return Alchemy\Phrasea\Kernel + * @return Alchemy\Phrasea\Core */ - public static function getKernel() + public static function getCore() { - return static::$kernel; + return static::$core; } public static function register_autoloads() { - return Alchemy\Phrasea\Kernel::initAutoloads(); + return Alchemy\Phrasea\Core::initAutoloads(); } } diff --git a/lib/classes/supertwig.class.php b/lib/classes/supertwig.class.php index e7e71a20ff..3939271e11 100644 --- a/lib/classes/supertwig.class.php +++ b/lib/classes/supertwig.class.php @@ -243,13 +243,13 @@ class supertwig $user = User_Adapter::getInstance($session->get_usr_id(), $appbox); } - $kernel = bootstrap::getKernel(); + $core = bootstrap::getCore(); $this->default_vars = array( 'session' => $session, - 'version_number' => $kernel->getVersion()->getNumber(), - 'version_name' => $kernel->getVersion()->getName(), - 'kernel' => $kernel, + 'version_number' => $core->getVersion()->getNumber(), + 'version_name' => $core->getVersion()->getName(), + 'core' => $core, 'browser' => $browser, 'request' => $request, 'display_chrome_frame' => $registry->is_set('GV_display_gcf') ? $registry->get('GV_display_gcf') : true, diff --git a/templates/web/prod/Baskets/Create.html.twig b/templates/web/prod/Baskets/Create.html.twig new file mode 100644 index 0000000000..eba67c0f6d --- /dev/null +++ b/templates/web/prod/Baskets/Create.html.twig @@ -0,0 +1,19 @@ +
+ + + + + + + + + + + + + +
\ No newline at end of file diff --git a/templates/web/prod/baskets.html b/templates/web/prod/baskets.html index c8cac52bc4..ad2c8b2c2a 100644 --- a/templates/web/prod/baskets.html +++ b/templates/web/prod/baskets.html @@ -1,2 +1,2 @@ {% import 'prod/baskets_macro.html' as baskets %} -{{baskets.make_bloc(basket_collection, selected_ssel, srt)}} +{{baskets.make_bloc(WorkZone, selected_type, selected_id, srt)}}