Skip to content

Commit

Permalink
Merge 47c4f6b into bbfc11e
Browse files Browse the repository at this point in the history
  • Loading branch information
@ColonelMoutarde
ColonelMoutarde committed May 22, 2020
2 parents bbfc11e + 47c4f6b commit 1b7a228
Show file tree
Hide file tree
Showing 17 changed files with 35 additions and 27 deletions.
2 changes: 2 additions & 0 deletions src/Controller/BaseController.php
View file
Expand Up @@ -28,6 +28,8 @@
*/
abstract class BaseController
{
const PATH_TO_JS = '/public/js';
const PATH_TO_CSS = '/public/css';
/**
* @param $pageData
* @return string
Expand Down
4 changes: 2 additions & 2 deletions src/Controller/Pages/AdministrationController.php
View file
Expand Up @@ -95,8 +95,8 @@ public static function get(&$pageData): string
$pageData['hddSize'] = $diskTotal;
$pageData['httpConnectionsCount'] = SystemHelper::getHttpConnectionsCount();
$pageData['processCount'] = SystemHelper::getProcessCount();
$pageData[ControllerData::CSS_POOL][] = '/public/css/pages/administration.css';
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/administration.js';
$pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/administration.css';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/administration.js';

return Render::getInstance()->get('/desktop/pages/administration.html.twig', $pageData);
}
Expand Down
4 changes: 2 additions & 2 deletions src/Controller/Pages/ConnectionController.php
View file
Expand Up @@ -55,9 +55,9 @@ public static function get(&$pageData): string
if (count($coreUpdate) > 0) {
$pageData['INSTALL_TYPE'] = $coreUpdate[0]->getSource();
}
$pageData[ControllerData::CSS_POOL][] = '/public/css/pages/connection.css';
$pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/connection.css';
$pageData[ControllerData::JS_END_POOL][] = '/vendor/node_modules/admin-lte/dist/js/adminlte.min.js';
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/connection.js';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/connection.js';


return Render::getInstance()->get('desktop/pages/connection.html.twig', $pageData);
Expand Down
8 changes: 4 additions & 4 deletions src/Controller/Pages/DashBoardController.php
View file
Expand Up @@ -80,7 +80,7 @@ public static function get(&$pageData): string
if (!empty($currentJeeObject)) {
$currentJeeObjectId = $currentJeeObject->getId();
} else {
throw new CoreException(__('Aucun objet racine trouvé. Pour en créer un, allez dans dashboard -> <a href="/index.php?v=d&p=object">Liste objets et résumés</a>'));
throw new CoreException(__('Aucun objet racine trouvé. Pour en créer un, allez dans dashboard -> <a href="/index.php?' . http_build_query(['v' => 'd', 'p' => 'object']). '">Liste objets et résumés</a>'));
}

$pageData[ControllerData::JS_VARS]['SEL_OBJECT_ID'] = $currentJeeObjectId;
Expand All @@ -98,9 +98,9 @@ public static function get(&$pageData): string
$pageData['dashboardObjectListMenu'] = self::getObjectsListMenu($currentJeeObjectId);
$pageData['dashboardChildrenObjects'] = JeeObjectManager::buildTree($currentJeeObject);

$pageData[ControllerData::JS_POOL][] = '/public/js/libs/widget.js';
$pageData[ControllerData::JS_POOL][] = '/public/js/desktop/pages/dashboard.js';
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/dashboard_events.js';
$pageData[ControllerData::JS_POOL][] = self::PATH_TO_JS . '/libs/widget.js';
$pageData[ControllerData::JS_POOL][] = self::PATH_TO_JS . '/desktop/pages/dashboard.js';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/dashboard_events.js';
// A remettre une fois mise sous forme de thème
$pageData[ControllerData::JS_POOL][] = '/vendor/node_modules/isotope-layout/dist/isotope.pkgd.min.js';
$pageData[ControllerData::JS_POOL][] = '/assets/3rdparty/jquery.multi-column-select/multi-column-select.js';
Expand Down
6 changes: 3 additions & 3 deletions src/Controller/Pages/FirstUseController.php
View file
Expand Up @@ -68,9 +68,9 @@ public static function get(&$pageData): string
'serverDatetime' => Utils::getMicrotime()
];

$pageData[ControllerData::CSS_POOL][] = '/public/css/pages/firstUse.css';
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/tools/log.js';
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/firstUse.js';
$pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/firstUse.css';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/tools/log.js';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/firstUse.js';
$pageData[ControllerData::AJAX_TOKEN] = AjaxHelper::getToken();

return Render::getInstance()->get('desktop/pages/firstUse.html.twig', $pageData);
Expand Down
4 changes: 2 additions & 2 deletions src/Controller/Pages/PlanController.php
View file
Expand Up @@ -78,8 +78,8 @@ public static function get(&$pageData): string
$pageData[ControllerData::JS_VARS]['planHeader_id'] = $planHeader->getId();
}

$pageData[ControllerData::CSS_POOL][] = '/public/css/pages/plan.css';
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/plan.js';
$pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/plan.css';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/plan.js';

return Render::getInstance()->get('/desktop/pages/plan.html.twig', $pageData);
}
Expand Down
6 changes: 3 additions & 3 deletions src/Controller/Pages/ViewController.php
View file
Expand Up @@ -81,9 +81,9 @@ public static function get(&$pageData): string
$pageData['viewHideList'] = false;
}
$pageData[ControllerData::JS_VARS][AjaxParams::VIEW_ID] = $currentView->getId();
$pageData[ControllerData::CSS_POOL][] = '/public/css/pages/view.css';
$pageData[ControllerData::JS_END_POOL][] = '/public/js/libs/widget.js';
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/view.js';
$pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/view.css';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/libs/widget.js';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/view.js';

return Render::getInstance()->get('/desktop/pages/view.html.twig', $pageData);
}
Expand Down
4 changes: 2 additions & 2 deletions src/Controller/Pages/ViewEditController.php
View file
Expand Up @@ -44,8 +44,8 @@ class ViewEditController extends BaseController
public static function get(&$pageData): string
{
$pageData['viewEditViewsList'] = ViewManager::all();
$pageData[ControllerData::CSS_POOL][] = '/public/css/pages/view.css';
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/view_edit.js';
$pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/view.css';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/view_edit.js';

return Render::getInstance()->get('/desktop/pages/view_edit.html.twig', $pageData);
}
Expand Down
3 changes: 2 additions & 1 deletion src/Controller/Params/CommandeController.php
View file
Expand Up @@ -39,10 +39,11 @@ class CommandeController extends BaseController
*
* @return string Content of commandes page
*
* @throws \Exception
*/
public static function get(&$pageData): string
{
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/commandes.js';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/commandes.js';

return Render::getInstance()->get('/desktop/params/commandes.html.twig', $pageData);
}
Expand Down
3 changes: 2 additions & 1 deletion src/Controller/Params/EqlogicController.php
View file
Expand Up @@ -36,10 +36,11 @@ class EqlogicController extends BaseController
*
* @param array $pageData
* @return string
* @throws \Exception
*/
public static function get(&$pageData): string
{
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/eqlogic.js';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/eqlogic.js';

return Render::getInstance()->get('/desktop/params/eqlogic.html.twig', $pageData);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Controller/Params/GeneralController.php
View file
Expand Up @@ -51,7 +51,7 @@ public static function get(&$pageData): string
$cache = CacheManager::byKey('hour');
$pageData['adminLastKnowDate'] = $cache->getValue();

$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/general.js';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/general.js';

return Render::getInstance()->get('/desktop/params/general.html.twig', $pageData);
}
Expand Down
3 changes: 2 additions & 1 deletion src/Controller/Params/InteractConfigController.php
View file
Expand Up @@ -39,11 +39,12 @@ class InteractConfigController extends BaseController
*
* @return string Content of interaction config page
*
* @throws \Exception
*/
public static function get(&$pageData): string
{

$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/interact_config.js';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/interact_config.js';

return Render::getInstance()->get('/desktop/params/interact_config.html.twig', $pageData);
}
Expand Down
3 changes: 2 additions & 1 deletion src/Controller/Params/LinksController.php
View file
Expand Up @@ -39,11 +39,12 @@ class LinksController extends BaseController
*
* @return string Content of links page
*
* @throws \Exception
*/
public static function get(&$pageData): string
{

$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/links.js';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/links.js';

return Render::getInstance()->get('/desktop/params/links.html.twig', $pageData);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Controller/Params/LogConfigController.php
View file
Expand Up @@ -58,7 +58,7 @@ public static function get(&$pageData): string
$pluginData['plugin'] = $plugin;
$pageData['adminPluginsList'][] = $pluginData;
}
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/log_config.js';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/log_config.js';

return Render::getInstance()->get('/desktop/params/log_config.html.twig', $pageData);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Controller/Params/ProfilsController.php
View file
Expand Up @@ -136,7 +136,7 @@ public static function get(&$pageData): string

$pageData['adminCategories'] = NextDomHelper::getConfiguration('eqLogic:category');

$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/profils.js';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/profils.js';

return Render::getInstance()->get('/desktop/params/profils.html.twig', $pageData);
}
Expand Down
3 changes: 2 additions & 1 deletion src/Controller/Params/ReportConfigController.php
View file
Expand Up @@ -39,10 +39,11 @@ class ReportConfigController extends BaseController
*
* @return string Content of report config page
*
* @throws \Exception
*/
public static function get(&$pageData): string
{
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/report_config.js';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/report_config.js';

return Render::getInstance()->get('/desktop/params/report_config.html.twig', $pageData);
}
Expand Down
3 changes: 2 additions & 1 deletion src/Controller/Params/SummaryController.php
View file
Expand Up @@ -38,10 +38,11 @@ class SummaryController extends BaseController
*
* @return string Content of summary page
*
* @throws \Exception
*/
public static function get(&$pageData): string
{
$pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/summary.js';
$pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/summary.js';

return Render::getInstance()->get('/desktop/params/summary.html.twig', $pageData);
}
Expand Down

0 comments on commit 1b7a228

Please sign in to comment.