Commit 5564cb29 authored by Aster's avatar Aster Committed by waltermazza
Browse files

General Bug Fixes and Improvements

parent 1cc2ab4f
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\community\i18n\en-GB
* @package arter\amos\community\i18n\en-GB
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
return [
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\community\i18n\en-US
* @package arter\amos\community\i18n\en-US
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
return [
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\community\i18n\it-IT
* @package arter\amos\community\i18n\it-IT
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
return [
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
namespace elitedivision\amos\layout\toolbar;
namespace arter\amos\layout\toolbar;
use yii\bootstrap\Nav as YiiNav;
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
namespace elitedivision\amos\layout\toolbar;
namespace arter\amos\layout\toolbar;
use elitedivision\amos\admin\models\UserProfile;
use elitedivision\amos\core\helpers\Html;
use elitedivision\amos\core\icons\AmosIcons;
use elitedivision\amos\core\module\BaseAmosModule;
use elitedivision\amos\core\utilities\CurrentUser;
use elitedivision\amos\dashboard\AmosDashboard;
use elitedivision\amos\layout\Module;
use elitedivision\amos\layout\toolbar\NavBarOverriden as YiiNavBar;
use arter\amos\admin\models\UserProfile;
use arter\amos\core\helpers\Html;
use arter\amos\core\icons\AmosIcons;
use arter\amos\core\module\BaseAmosModule;
use arter\amos\core\utilities\CurrentUser;
use arter\amos\dashboard\AmosDashboard;
use arter\amos\layout\Module;
use arter\amos\layout\toolbar\NavBarOverriden as YiiNavBar;
use Yii;
use yii\helpers\ArrayHelper;
use yii\helpers\Url;
......@@ -30,7 +26,7 @@ use yii\web\JsExpression;
/**
* Class NavBar - draws the toogle button for hamburger menu (small size screen)
* @package elitedivision\amos\core\toolbar
* @package arter\amos\core\toolbar
*/
class NavBar extends YiiNavBar {
......@@ -53,7 +49,7 @@ class NavBar extends YiiNavBar {
}
/* Configuration of Slideshow - begin */
if (\Yii::$app->getModule('slideshow') && isset(\Yii::$app->params['slideshow']) && \Yii::$app->params['slideshow'] === TRUE) {
$slideshow = new \elitedivision\amos\slideshow\models\Slideshow;
$slideshow = new \arter\amos\slideshow\models\Slideshow;
$route = "/" . \Yii::$app->request->getPathInfo();
$idSlideshow = $slideshow->hasSlideshow($route);
$slideshowLabel = ($idSlideshow) ? $slideshow->findOne($idSlideshow)->label : NULL;
......@@ -77,7 +73,7 @@ class NavBar extends YiiNavBar {
/* Configuration of Slideshow - end */
/* Configurazione translation */
$headerMenu = new \elitedivision\amos\core\views\common\HeaderMenu();
$headerMenu = new \arter\amos\core\views\common\HeaderMenu();
$menuTranslation = $headerMenu->getTranslationField();
//if there is information page for policy or cookies - display link at the end of menu
......@@ -127,7 +123,7 @@ class NavBar extends YiiNavBar {
$settingsItemsElements = [];
$atLeastOneSettingsElement = false;
if (\Yii::$app->controller instanceof \elitedivision\amos\dashboard\controllers\base\DashboardController) {
if (\Yii::$app->controller instanceof \arter\amos\dashboard\controllers\base\DashboardController) {
$atLeastOneSettingsElement = true;
$settingsItemsElements[] = [
'label' => \Yii::t('amoscore', 'Ordinamenti dashboard'),
......@@ -239,7 +235,7 @@ class NavBar extends YiiNavBar {
}
if (\Yii::$app->getModule('chat')) {
$widget = new \elitedivision\amos\chat\widgets\icons\WidgetIconChat();
$widget = new \arter\amos\chat\widgets\icons\WidgetIconChat();
$bulletCount = $widget->getBulletCount();
$chatLink = Html::tag(
......@@ -247,7 +243,7 @@ class NavBar extends YiiNavBar {
Html::a(
AmosIcons::show('comments-o', [], 'dash') . "<span class='badge'>" . (($bulletCount > 0 ) ? $bulletCount : "" ) . "</span>",
'/messages',
['title' => \elitedivision\amos\chat\AmosChat::t('amoschat', 'Messaggi privati')]
['title' => \arter\amos\chat\AmosChat::t('amoschat', 'Messaggi privati')]
),
['class' => 'header-plugin-icon']
);
......@@ -257,7 +253,7 @@ class NavBar extends YiiNavBar {
if (\Yii::$app->getModule('myactivities') && !\Yii::$app->user->isGuest) {
$widget = new \elitedivision\amos\myactivities\widgets\icons\WidgetIconMyActivities();
$widget = new \arter\amos\myactivities\widgets\icons\WidgetIconMyActivities();
if (isset(\Yii::$app->params['disableBulletCounters']) && (\Yii::$app->params['disableBulletCounters'] === true)) {
$bulletCount = 0;
}
......@@ -269,7 +265,7 @@ class NavBar extends YiiNavBar {
Html::a(
AmosIcons::show('bell', [], 'dash') . "<span class='badge'>" . (($bulletCount > 0 ) ? $bulletCount : "" ) . "</span>"
, '/myactivities/my-activities/index',
['title' => \elitedivision\amos\myactivities\AmosMyActivities::t('amosmyactivities',
['title' => \arter\amos\myactivities\AmosMyActivities::t('amosmyactivities',
'My activities')]
), ['class' => 'header-plugin-icon']
);
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
namespace elitedivision\amos\layout\toolbar;
namespace arter\amos\layout\toolbar;
use Yii;
use yii\bootstrap\BootstrapPluginAsset;
......@@ -23,7 +19,7 @@ use yii\bootstrap\Html;
/**
* Class NavBarOverriden
* @package elitedivision\amos\core\toolbar
* @package arter\amos\core\toolbar
*
* ovveride yii/bootstrap/NavBar
* the only difference is not setting the role options toi 'navigation' in function init()
......@@ -35,7 +31,6 @@ class NavBarOverriden extends Widget
*
* - tag: string, defaults to "nav", the name of the container tag.
*
* @see \yii\helpers\Html::renderTagAttributes() for details on how attributes are being rendered.
*/
public $options = [];
/**
......@@ -43,12 +38,10 @@ class NavBarOverriden extends Widget
*
* - tag: string, defaults to "div", the name of the container tag.
*
* @see \yii\helpers\Html::renderTagAttributes() for details on how attributes are being rendered.
*/
public $containerOptions = [];
/**
* @var string|boolean the text of the brand or false if it's not used. Note that this is not HTML-encoded.
* @see http://getbootstrap.com/components/#navbar
*/
public $brandLabel = false;
/**
......@@ -60,7 +53,6 @@ class NavBarOverriden extends Widget
public $brandUrl = false;
/**
* @var array the HTML attributes of the brand link.
* @see \yii\helpers\Html::renderTagAttributes() for details on how attributes are being rendered.
*/
public $brandOptions = [];
/**
......@@ -74,7 +66,6 @@ class NavBarOverriden extends Widget
public $renderInnerContainer = true;
/**
* @var array the HTML attributes of the inner container.
* @see \yii\helpers\Html::renderTagAttributes() for details on how attributes are being rendered.
*/
public $innerContainerOptions = [];
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use yii\helpers\Html;
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
/**
......@@ -22,7 +18,7 @@
echo "<?php\n";
?>
use elitedivision\amos\core\migration\AmosMigrationPermissions;
use arter\amos\core\migration\AmosMigrationPermissions;
use yii\rbac\Permission;
class <?= $className ?> extends AmosMigrationPermissions
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use yii\helpers\Html;
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use yii\helpers\Html;
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\layout
* @package arter\amos\layout
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
/* @var $this \yii\web\View */
......@@ -35,16 +31,16 @@
<div class="page-header">
<?php if (!is_null($this->title)): ?>
<h1 class="title"><?= \elitedivision\amos\core\helpers\Html::encode($this->title) ?></h1>
<h1 class="title"><?= \arter\amos\core\helpers\Html::encode($this->title) ?></h1>
<?= $this->render("parts" . DIRECTORY_SEPARATOR . "textHelp"); ?>
<?php endif; ?>
</div>
<?php if ($this instanceof \elitedivision\amos\core\components\AmosView): ?>
<?php if ($this instanceof \arter\amos\core\components\AmosView): ?>
<?php $this->beginViewContent() ?>
<?php endif; ?>
<?= $content ?>
<?php if ($this instanceof \elitedivision\amos\core\components\AmosView): ?>
<?php if ($this instanceof \arter\amos\core\components\AmosView): ?>
<?php $this->endViewContent() ?>
<?php endif; ?>
</div>
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use elitedivision\amos\layout\assets\FormAsset;
use elitedivision\amos\layout\assets\IEAssets;
use arter\amos\layout\assets\FormAsset;
use arter\amos\layout\assets\IEAssets;
use yii\helpers\Html;
use yii\helpers\Url;
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use yii\helpers\Url;
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use yii\helpers\Html;
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use elitedivision\amos\layout\assets\FormAsset;
use elitedivision\amos\layout\assets\IEAssets;
use arter\amos\layout\assets\FormAsset;
use arter\amos\layout\assets\IEAssets;
use yii\helpers\Html;
use yii\helpers\Url;
use elitedivision\amos\core\widget\WidgetAbstract;
use arter\amos\core\widget\WidgetAbstract;
//\bedezign\yii2\audit\web\JSLoggingAsset::register($this);
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use elitedivision\amos\core\components\AmosView;
use elitedivision\amos\dashboard\models\AmosWidgets;
use arter\amos\core\components\AmosView;
use arter\amos\dashboard\models\AmosWidgets;
use yii\helpers\Url;
////\bedezign\yii2\audit\web\JSLoggingAsset::register($this);
......@@ -97,7 +93,7 @@ if ($countArrayUrl) {
<!-- < ?= $this->render("parts" . DIRECTORY_SEPARATOR . "breadcrumb"); ?>-->
<!-- </div>-->
<div class="page-content-noMargin">
<?php if ($this instanceof \elitedivision\amos\core\components\AmosView): ?>
<?php if ($this instanceof \arter\amos\core\components\AmosView): ?>
<?php $this->beginViewContent() ?>
<?php endif; ?>
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use yii\helpers\Html;
use yii\helpers\Url;
use elitedivision\amos\dashboard\models\AmosWidgets;
use elitedivision\amos\core\widget\WidgetAbstract;
use arter\amos\dashboard\models\AmosWidgets;
use arter\amos\core\widget\WidgetAbstract;
////\bedezign\yii2\audit\web\JSLoggingAsset::register($this);
......@@ -126,7 +122,7 @@ if ($countArrayUrl) {
}
}
echo \elitedivision\amos\core\toolbar\Nav::widget([
echo \arter\amos\core\toolbar\Nav::widget([
'items' => $items,
'encodeLabels' => false,
'options' => ['class' => 'nav nav-tabs'],
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
/* @var $this \yii\web\View */
......@@ -35,7 +31,7 @@
<div class="col-xs-12 dropdown-languages">
<?php
$headerMenu = new \elitedivision\amos\core\views\common\HeaderMenu();
$headerMenu = new \arter\amos\core\views\common\HeaderMenu();
$menuLang = $headerMenu->getListLanguages();
echo $menuLang;
?>
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter
*
* @see http://example.com Developers'community
* @license GPLv3
* @license https://opensource.org/licenses/gpl-3.0.html GNU General Public License version 3
*
* @package elitedivision\amos\core
* @package arter\amos\core
* @category CategoryName
* @author Lombardia Informatica S.p.A.
*/
use elitedivision\amos\core\components\AmosView;
use arter\amos\core\components\AmosView;
use yii\helpers\Html;
use yii\helpers\Url;
use elitedivision\amos\core\widget\WidgetAbstract;
use arter\amos\core\widget\WidgetAbstract;
////\bedezign\yii2\audit\web\JSLoggingAsset::register($this);
/** @var $this \elitedivision\amos\core\components\AmosView */
/** @var $this \arter\amos\core\components\AmosView */
/** @var $content string */
$urlCorrente = Url::current();
......
<?php
/**
* Lombardia Informatica S.p.A.
* OPEN 2.0
* Emilia Romagna Open Innovation
* Arter