hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update client

Browse Source
This commit is contained in:
Romain Neutron
2012-09-21 16:41:03 +02:00
parent 4754c2cc8e
commit e2cb1fe0c9
6 changed files with 98 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
www/client/answer.php
View File

@@ -8,19 +8,21 @@
* file that was distributed with this source code.
*/
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Core\Configuration;
/**
*
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
/* @var $Core \Alchemy\Phrasea\Core */
require_once __DIR__ . "/../../lib/bootstrap.php";
$Core = \bootstrap::getCore();
$appbox = appbox::get_instance($Core);
$session = $appbox->get_session();
$app = new Application();
$appbox = $app['phraseanet.appbox'];
$registry = $appbox->get_registry();
$user = $Core->getAuthenticatedUser();
$user = $app['phraseanet.user'];
if ( ! isset($parm)) {
@@ -131,7 +133,7 @@ $form = serialize($options);
$perPage = $mod_xy;
$search_engine = new searchEngine_adapter($registry);
$search_engine = new searchEngine_adapter($app);
$search_engine->set_options($options);
@@ -172,7 +174,7 @@ if ($registry->get('GV_thesaurus')) {
$history = queries::history();
$history = queries::history($app['phraseanet.appbox'], $app['phraseanet.user']->get_id());
echo '<script language="javascript" type="text/javascript">$("#history").empty().append("' . str_replace('"', '\"', $history) . '")</script>';
@@ -182,7 +184,7 @@ $longueur = strlen($parm['qry']);
$qrys = '<div>' . _('client::answers: rapport de questions par bases') . '</div>';
foreach ($qrySbas as $sbas => $qryBas)
$qrys .= '<div style="font-weight:bold;">' . phrasea::sbas_names($sbas) . '</div><div>' . $qryBas . '</div>';
$qrys .= '<div style="font-weight:bold;">' . phrasea::sbas_names($sbas, $app) . '</div><div>' . $qryBas . '</div>';
$txt = "<b>" . substr($parm['qry'], 0, 36) . ($longueur > 36 ? "..." : "") . "</b>" . sprintf(_('client::answers: %d reponses'), (int) $nbanswers) . " <a style=\"float:none;display:inline-block;padding:2px 3px\" class=\"infoTips\" title=\"" . str_replace('"', "'", $qrys) . "\">&nbsp;</a>";
?>
@@ -285,9 +287,6 @@ if (count($result->get_datas()) > 0) {
?></tr><?php
}
$core = \bootstrap::getCore();
$twig = $core->getTwig();
foreach ($result->get_datas() as $record) {
/* @var $record record_adapter */
$base_id = $record->get_base_id();
@@ -301,11 +300,11 @@ if (count($result->get_datas()) > 0) {
try {
$record->get_subdef('document');
$light_info = $twig->render('common/technical_datas.html.twig', array('record' => $record));
$light_info = $app['twig']->render('common/technical_datas.html.twig', array('record' => $record));
} catch (\Exception $e) {
$light_info = '';
}
$caption = $twig->render('common/caption.html.twig', array('view' => 'answer', 'record' => $record));
$caption = $app['twig']->render('common/caption.html.twig', array('view' => 'answer', 'record' => $record));
if ($i == 0) {
@@ -383,7 +382,7 @@ if (count($result->get_datas()) > 0) {
<div class="diapo w160px" style="border-top:none;"><?php ?><div class="buttons"><?php
$minilogos = "";
$minilogos .= '<div class="minilogos">' . collection::getLogo($record->get_base_id());
$minilogos .= '<div class="minilogos">' . collection::getLogo($record->get_base_id(), $app);
$minilogos .= '</div>';
$sbas_id = $record->get_sbas_id();
echo $minilogos;
@@ -443,7 +442,7 @@ if (count($result->get_datas()) > 0) {
</div><?php
} else {
?><div><?php echo _('reponses:: Votre recherche ne retourne aucun resultat'); ?></div><?php
phrasea::getHome('HELP', 'client');
phrasea::getHome($app, 'HELP', 'client');
}
//function proposalsToHTML(&$proposals)

63
www/client/baskets.php
View File

@@ -8,59 +8,61 @@
* file that was distributed with this source code.
*/
use Alchemy\Phrasea\Application;
/**
*
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
/* @var $Core \Alchemy\Phrasea\Core */
$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
$em = $Core->getEntityManager();
require_once __DIR__ . "/../../lib/bootstrap.php";
$app = new Application();
$Request = \Symfony\Component\HttpFoundation\Request::createFromGlobals();
$nbNoview = 0;
$user = $Core->getAuthenticatedUser();
$user = $app['phraseanet.user'];
$ACL = $user->ACL();
$out = null;
if ($Request->get("act") == "DELIMG" && $Request->get("p0") != "") {
$repository = $em->getRepository('\Entities\BasketElement');
$repository = $app['EM']->getRepository('\Entities\BasketElement');
/* @var $repository \Repositories\BasketElementRepository */
$basket_element = $repository->findUserElement($Request->get('p0'), $user);
$em->remove($basket_element);
$em->flush();
$app['EM']->remove($basket_element);
$app['EM']->flush();
}
if ($Request->get('act') == "ADDIMG" && ($Request->get("p0") != "" && $Request->get("p0") != null)) {
$repository = $em->getRepository('\Entities\Basket');
$repository = $app['EM']->getRepository('\Entities\Basket');
/* @var $repository \Repositories\BasketRepository */
$basket = $repository->findUserBasket($Request->get('courChuId'), $user, true);
$basket = $repository->findUserBasket($app, $Request->get('courChuId'), $user, true);
$sbas_id = $Request->get('sbas');
$record = new record_adapter($sbas_id, $Request->get('p0'));
$record = new record_adapter($app, $sbas_id, $Request->get('p0'));
$BasketElement = new \Entities\BasketElement();
$BasketElement->setRecord($record);
$BasketElement->setBasket($basket);
$basket->addBasketElement($BasketElement);
$em->persist($BasketElement);
$em->merge($basket);
$app['EM']->persist($BasketElement);
$app['EM']->merge($basket);
$em->flush();
$app['EM']->flush();
}
if ($Request->get('act') == "DELCHU" && ($Request->get("p0") != "" && $Request->get("p0") != null)) {
$repository = $em->getRepository('\Entities\Basket');
$repository = $app['EM']->getRepository('\Entities\Basket');
/* @var $repository \Repositories\BasketRepository */
$basket = $repository->findUserBasket($Request->get('courChuId'), $user, true);
$basket = $repository->findUserBasket($app, $Request->get('courChuId'), $user, true);
$em->remove($basket);
$em->flush();
$app['EM']->remove($basket);
$app['EM']->flush();
unset($basket);
}
@@ -72,13 +74,13 @@ if ($Request->get('act') == "NEWCHU" && ($Request->get("p0") != "" && $Request->
$basket->setName($Request->get('p0'));
$basket->setOwner($user);
$em->persist($basket);
$em->flush();
$app['EM']->persist($basket);
$app['EM']->flush();
$courChuId = $basket->getId();
}
$repository = $em->getRepository('\Entities\Basket');
$repository = $app['EM']->getRepository('\Entities\Basket');
/* @var $repository \Repositories\BasketRepository */
$baskets = $repository->findActiveByUser($user);
@@ -129,18 +131,17 @@ $out .= '</td><td style="width:40%">';
$em = $Core->getEntityManager();
$repository = $em->getRepository('\Entities\Basket');
$repository = $app['EM']->getRepository('\Entities\Basket');
/* @var $repository \Repositories\BasketRepository */
$basket = $repository->findUserBasket($courChuId, $user, true);
$basket = $repository->findUserBasket($app, $courChuId, $user, true);
$jscriptnochu = $basket->getName() . " : " . sprintf(_('paniers:: %d documents dans le panier'), $basket->getElements()->count());
$nbElems = $basket->getElements()->count();
?><div id="blocBask" class="bodyLeft" style="height:314px;bottom:0px;"><?php ?><div class="baskTitle"><?php ?><div id="flechenochu" class="flechenochu"></div><?php
$totSizeMega = $basket->getSize();
$totSizeMega = $basket->getSize($app);
echo '<div class="baskName">' . sprintf(_('paniers:: paniers:: %d documents dans le panier'), $nbElems) .
($Core->getRegistry()->get('GV_viewSizeBaket') ? ' (' . $totSizeMega . ' Mo)' : '') . '</div>';
($app['phraseanet.registry']->get('GV_viewSizeBaket') ? ' (' . $totSizeMega . ' Mo)' : '') . '</div>';
?></div><?php ?><div><?php
echo $out;
?><div class="baskDel" title="<?php echo _('action : supprimer') ?>" onclick="evt_chutier('DELSSEL');"/></div><?php ?><div class="baskCreate" title="<?php echo _('action:: nouveau panier') ?>" onclick="newBasket();"></div><?php ?><div style="float:right;position:relative;width:3px;height:16px;"></div><?php
@@ -160,16 +161,16 @@ if (trim($courChuId) != '') {
?></table><?php
?></div><?php
?><div class="divexterne" style="height:270px;overflow-x:hidden;overflow-y:auto;position:relative"><?php
if ($basket->getPusher() instanceof user) {
if ($basket->getPusher($app) instanceof user) {
?><div class="txtPushClient"><?php
echo sprintf(_('paniers:: panier emis par %s'), $basket->getPusher()->get_display_name())
echo sprintf(_('paniers:: panier emis par %s'), $basket->getPusher($app)->get_display_name())
?></div><?php
}
foreach ($basket->getElements() as $basket_element) {
$dim = $dim1 = $top = 0;
$thumbnail = $basket_element->getRecord()->get_thumbnail();
$thumbnail = $basket_element->getRecord($app)->get_thumbnail();
if ($thumbnail->get_width() > $thumbnail->get_height()) { // cas d'un format paysage
if ($thumbnail->get_width() > 67) {
@@ -198,13 +199,13 @@ foreach ($basket->getElements() as $basket_element) {
$tooltip = "";
$record = $basket_element->getRecord();
if ($Core->getRegistry()->get('GV_rollover_chu')) {
$record = $basket_element->getRecord($app);
if ($app['phraseanet.registry']->get('GV_rollover_chu')) {
$tooltip = 'tooltipsrc="/prod/tooltip/caption/' . $record->get_sbas_id() . '/' . $record->get_record_id() . '/basket/"';
}
?><div class="diapochu"><?php
?><div class="image"><?php
?><img onclick="openPreview('BASK',<?php echo $basket_element->getRecord()->get_number() ?>,<?php echo $courChuId ?>); return(false);"
?><img onclick="openPreview('BASK',<?php echo $basket_element->getRecord($app)->get_number() ?>,<?php echo $courChuId ?>); return(false);"
<?php echo $tooltip ?> style="position:relative; top:<?php echo $top ?>px; <?php echo $dim ?>"
class="<?php echo $classSize ?> baskTips" src="<?php echo $thumbnail->get_url() ?>"><?php
?></div><?php ?><div class="tools"><?php ?><div class="baskOneDel" onclick="evt_del_in_chutier('<?php echo $basket_element->getId() ?>');"

47
www/client/clientFeedBack.php
View File

@@ -9,21 +9,23 @@
* file that was distributed with this source code.
*/
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Core\Configuration;
/**
*
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
/* @var $Core \Alchemy\Phrasea\Core */
$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
$em = $Core->getEntityManager();
require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance($Core);
$app = new Application();
$appbox = $app['phraseanet.appbox'];
$registry = $appbox->get_registry();
$user = $Core->getAuthenticatedUser();
$user = $app['phraseanet.user'];
$lng = Session_Handler::get_locale();
$lng = $app['locale'];
$output = '';
@@ -32,32 +34,29 @@ $parm = $request->get_parms('action', 'env', 'pos', 'cont', 'roll', 'mode', 'col
switch ($parm['action']) {
case 'LANGUAGE':
$output = module_client::getLanguage($lng);
$output = module_client::getLanguage($app, $lng);
break;
case 'PREVIEW':
$core = \bootstrap::getCore();
$twig = $core->getTwig();
$search_engine = null;
if ($parm['env'] == 'RESULT' && ($options = unserialize($parm['options_serial'])) !== false) {
$search_engine = new searchEngine_adapter($registry);
$search_engine = new searchEngine_adapter($app);
$search_engine->set_options($options);
}
$record = new record_preview($parm['env'], $parm['pos'], $parm['cont'], $parm['roll'], $search_engine, $parm['query']);
$record = new record_preview($app, $parm['env'], $parm['pos'], $parm['cont'], $parm['roll'], $search_engine, $parm['query']);
$train = '';
if ($record->is_from_reg()) {
$train = $twig->render('prod/preview/reg_train.html.twig', array(
$train = $app['twig']->render('prod/preview/reg_train.html.twig', array(
'record' => $record
)
);
}
if ($record->is_from_basket() && $parm['roll']) {
$train = $twig->render('prod/preview/basket_train.html.twig', array(
$train = $app['twig']->render('prod/preview/basket_train.html.twig', array(
'record' => $record
)
);
@@ -65,7 +64,7 @@ switch ($parm['action']) {
if ($record->is_from_feed()) {
$train = $twig->render('prod/preview/feed_train.html.twig', array(
$train = $app['twig']->render('prod/preview/feed_train.html.twig', array(
'record' => $record
)
);
@@ -73,25 +72,25 @@ switch ($parm['action']) {
$output = p4string::jsonencode(
array(
"desc" => $twig->render('prod/preview/caption.html.twig', array(
"desc" => $app['twig']->render('prod/preview/caption.html.twig', array(
'record' => $record
, 'highlight' => $parm['query']
, 'searchEngine' => $search_engine
)
)
, "html_preview" => $twig->render('common/preview.html.twig', array('record' => $record)
, "html_preview" => $app['twig']->render('common/preview.html.twig', array('record' => $record)
)
, "others" => $twig->render('prod/preview/appears_in.html.twig', array(
, "others" => $app['twig']->render('prod/preview/appears_in.html.twig', array(
'parents' => $record->get_grouping_parents(),
'baskets' => $record->get_container_baskets()
'baskets' => $record->get_container_baskets($app['EM'], $app['phraseanet.user'])
)
)
, "current" => $train
, "history" => $twig->render('prod/preview/short_history.html.twig', array('record' => $record)
, "history" => $app['twig']->render('prod/preview/short_history.html.twig', array('record' => $record)
)
, "popularity" => $twig->render('prod/preview/popularity.html.twig', array('record' => $record)
, "popularity" => $app['twig']->render('prod/preview/popularity.html.twig', array('record' => $record)
)
, "tools" => $twig->render('prod/preview/tools.html.twig', array('record' => $record)
, "tools" => $app['twig']->render('prod/preview/tools.html.twig', array('record' => $record)
)
, "pos" => $record->get_number()
, "title" => $record->get_title($parm['query'], $search_engine)
@@ -100,7 +99,7 @@ switch ($parm['action']) {
break;
case 'HOME':
$output = phrasea::getHome('PUBLI', 'client');
$output = phrasea::getHome($app, 'PUBLI', 'client');
break;
case 'CSS':
$output = $user->setPrefs('css', $parm['color']);
@@ -111,7 +110,7 @@ switch ($parm['action']) {
case 'BASKUPDATE':
$noview = 0;
$repository = $em->getRepository('\Entities\Basket');
$repository = $app['EM']->getRepository('\Entities\Basket');
/* @var $repository \Repositories\BasketRepository */
$baskets = $repository->findActiveByUser($user);

4
www/client/help.php
View File

@@ -13,8 +13,8 @@
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
$help_lng = $session->get_I18n();
if ( ! in_array($session->get_I18n(), array('fr', 'en', 'us')))
$help_lng = $app['locale.I18n'];
if ( ! in_array($app['locale.I18n'], array('fr', 'en', 'us')))
$help_lng = 'fr';
if ($help_lng == 'fr') {

19
www/client/homeinterpubbask.php
View File

@@ -8,23 +8,24 @@
* file that was distributed with this source code.
*/
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Core\Configuration;
/**
*
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
$Core = \bootstrap::getCore();
$appbox = appbox::get_instance($Core);
$app = new Application();
$appbox = $app['phraseanet.appbox'];
$user = $Core->getAuthenticatedUser();
$user = $app['phraseanet.user'];
$feeds = \Feed_Collection::load_all($appbox, $user);
$feeds = \Feed_Collection::load_all($app, $user);
$th_size = $user->getPrefs('images_size');
$core = \bootstrap::getCore();
$twig = $core->getTwig();
?>
<div style="height:50px;" class="homePubTitleBox">
<div style="float:left;width:350px;"><h1 style="font-size:20px;margin-top:15px;">
@@ -51,7 +52,7 @@ foreach ($feeds->get_aggregate()->get_entries(0, 5)->get_entries() as $entry) {
. $entry->get_title() .
'</a> </h2>' .
'<span class="publiInfos">' .
' ' . \phraseadate::getPrettyString($entry->get_created_on()) .
' ' . $app['date-formatter']->getPrettyString($entry->get_created_on()) .
' ';
if ($entry->get_author_email())
@@ -64,7 +65,7 @@ foreach ($feeds->get_aggregate()->get_entries(0, 5)->get_entries() as $entry) {
if ($entry->get_updated_on() > $entry->get_created_on())
$feed .= '<br/><span style="font-style:italic;">' . _('publications:: derniere mise a jour')
. ' ' . \phraseadate::getPrettyString($entry->get_updated_on()) . '</span><br/><br/>';
. ' ' . $app['date-formatter']->getPrettyString($entry->get_updated_on()) . '</span><br/><br/>';
$feed .= '</span></div><div class="descPubli"><div style="margin:10px 0 10px 20px;width:80%;">';
@@ -88,7 +89,7 @@ foreach ($feeds->get_aggregate()->get_entries(0, 5)->get_entries() as $entry) {
$thumbnail = $record->get_thumbnail();
$title = $record->get_title();
$caption = $twig->render(
$caption = $app['twig']->render(
'common/caption.html.twig', array('view' => 'internal_publi', 'record' => $record)
);

33
www/client/index.php
View File

@@ -8,24 +8,27 @@
* file that was distributed with this source code.
*/
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Core\Configuration;
/**
*
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance($Core);
$session = $appbox->get_session();
require_once __DIR__ . "/../../lib/bootstrap.php";
$app = new Application();
$appbox = $app['phraseanet.appbox'];
$registry = $appbox->get_registry();
$usr_id = $session->get_usr_id();
$usr_id = $app['phraseanet.user']->get_id();
phrasea::headers();
User_Adapter::updateClientInfos(2);
$user = User_Adapter::getInstance($usr_id, $appbox);
User_Adapter::updateClientInfos($app, 2);
$user = User_Adapter::getInstance($usr_id, $app);
?>
<html lang="<?php echo $session->get_I18n(); ?>">
<html lang="<?php echo $app['locale.I18n']; ?>">
<head>
<title><?php echo $registry->get('GV_homeTitle') ?> Client</title>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
@@ -109,11 +112,9 @@ $user = User_Adapter::getInstance($usr_id, $appbox);
<div id="container" style="position:absolute;top:0;left:0;overflow:hidden;width:100%;height:100%;">
<?php
$events_mngr = $Core['events-manager'];
$events_mngr = $app['events-manager'];
$core = \bootstrap::getCore();
$twig = $core->getTwig();
echo $twig->render('common/menubar.twig', array('module' => 'client', 'events' => $events_mngr));
echo $app['twig']->render('common/menubar.twig', array('module' => 'client', 'events' => $events_mngr));
?>
<div style="top:30px;position:relative;float:left;">
<div id="left" style="height:100%;width:265px;position:relative;float:left;">
@@ -469,9 +470,9 @@ if ($registry->get('GV_thesaurus')) {
<?php
if ($registry->get('GV_client_render_topics') == 'popups')
echo queries::dropdown_topics();
echo queries::dropdown_topics($app['locale.I18n']);
elseif ($registry->get('GV_client_render_topics') == 'tree')
echo queries::tree_topics();
echo queries::tree_topics($app['locale.I18n']);
?>
</div>
@@ -491,7 +492,7 @@ if ($registry->get('GV_thesaurus')) {
</div>
<div id="answers" style="overflow-x:auto;overflow-y:auto;border:none;padding:0;margin:0;position:relative;left:0;top:0;margin:10px 0;">
<?php
echo phrasea::getHome($start_page, 'client');
echo phrasea::getHome($app, $start_page, 'client');
?>
</div>
<div class="divNavig" id="navigation"></div>
@@ -645,9 +646,9 @@ echo phrasea::getHome($start_page, 'client');
checkBases(true)
<?php
if ( ! $user->is_guest() && Session_Handler::isset_cookie('last_act')) {
if ( ! $user->is_guest() && $app['request']->cookies->has('last_act')) {
?>
lastAct = $.parseJSON('<?php echo Session_Handler::get_cookie('last_act') ?>');
lastAct = $.parseJSON('<?php echo $app['request']->cookies->get('last_act') ?>');
execLastAct(lastAct);
<?php
}