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

General Bug Fixes and Improvements

parent 1cc2ab4f
...@@ -11,13 +11,13 @@ Installation ...@@ -11,13 +11,13 @@ Installation
Either run Either run
```bash ```bash
composer require elitedivision/amos-layout composer require arter/amos-layout
``` ```
or add or add
``` ```
"elitedivision/amos-layout": "~1.0" "arter/amos-layout": "~1.0"
``` ```
to the require section of your `composer.json` file. to the require section of your `composer.json` file.
...@@ -29,7 +29,7 @@ Installation ...@@ -29,7 +29,7 @@ Installation
$config = [ $config = [
'modules' => [ 'modules' => [
'layout' => [ 'layout' => [
'class' => 'elitedivision\amos\layout\Module', 'class' => 'arter\amos\layout\Module',
'advancedLogoutActions' => true, // [OPTIONAL] if you want to display 'advancedLogoutActions' => true, // [OPTIONAL] if you want to display
// two different logout buttons (one that redirects to login page and one that // two different logout buttons (one that redirects to login page and one that
// redirects to main frontend page set in (common) params['platform']['frontendUrl']) // redirects to main frontend page set in (common) params['platform']['frontendUrl'])
......
{ {
"name": "elitedivision/amos-layout", "name": "arter/amos-layout",
"description": "Amos Basic Layout", "description": "Amos Basic Layout",
"keywords": ["amos", "yii2", "less", "css", "layout"], "keywords": ["amos", "yii2", "less", "css", "layout"],
"homepage": "https://bitbucket.org/elite_division/amos-layout", "homepage": "https://bitbucket.org/arter/amos-layout",
"type": "component", "type": "component",
"require": { "require": {
"php": ">=5.4.0", "php": ">=5.4.0",
"elitedivision/amos-core":"^1.9.58", "arter/amos-core":"^1.9.58",
"elitedivision/amos-dashboard":"^1.9.0", "arter/amos-dashboard":"^1.9.0",
"bower-asset/sticky-sidebar": "^3.2.0" "bower-asset/sticky-sidebar": "^3.2.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"elitedivision\\amos\\layout\\": "src" "arter\\amos\\layout\\": "src"
} }
} }
} }
\ No newline at end of file
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * 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 * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
namespace elitedivision\amos\layout; namespace arter\amos\layout;
use elitedivision\amos\core\module\AmosModule; use arter\amos\core\module\AmosModule;
use elitedivision\amos\core\module\ModuleInterface; use arter\amos\core\module\ModuleInterface;
use elitedivision\amos\layout\components\Layout; use arter\amos\layout\components\Layout;
use yii\base\BootstrapInterface; use yii\base\BootstrapInterface;
/** /**
* Class Module * Class Module
* @package elitedivision\amos\socialauth * @package arter\amos\socialauth
*/ */
class Module extends AmosModule implements ModuleInterface, BootstrapInterface class Module extends AmosModule implements ModuleInterface, BootstrapInterface
{ {
...@@ -38,13 +34,13 @@ class Module extends AmosModule implements ModuleInterface, BootstrapInterface ...@@ -38,13 +34,13 @@ class Module extends AmosModule implements ModuleInterface, BootstrapInterface
/** /**
* @inheritdoc * @inheritdoc
*/ */
public $controllerNamespace = 'elitedivision\amos\layout\controllers'; public $controllerNamespace = 'arter\amos\layout\controllers';
/** /**
* View path of maintenance page * View path of maintenance page
* @var string $viewMaintenanceMode * @var string $viewMaintenanceMode
*/ */
public $viewMaintenanceMode = '@vendor/elitedivision/amos-layout/src/views/maintenance/maintenance'; public $viewMaintenanceMode = '@vendor/arter/amos-layout/src/views/maintenance/maintenance';
/** /**
* Choose to display a single logout action in the navbar or multiple ones * Choose to display a single logout action in the navbar or multiple ones
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * 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 * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
namespace elitedivision\amos\layout\assets; namespace arter\amos\layout\assets;
use yii\web\AssetBundle; use yii\web\AssetBundle;
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * 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 * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
namespace elitedivision\amos\layout\assets; namespace arter\amos\layout\assets;
use Yii; use Yii;
use yii\web\AssetBundle; use yii\web\AssetBundle;
...@@ -68,7 +64,7 @@ class AmosCalendarCoreAsset extends AssetBundle ...@@ -68,7 +64,7 @@ class AmosCalendarCoreAsset extends AssetBundle
'yii\web\YiiAsset', 'yii\web\YiiAsset',
'yii2fullcalendar\MomentAsset', 'yii2fullcalendar\MomentAsset',
'yii2fullcalendar\PrintAsset', 'yii2fullcalendar\PrintAsset',
'elitedivision\amos\layout\assets\AmosCalendarAsset' 'arter\amos\layout\assets\AmosCalendarAsset'
]; ];
/** /**
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * 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 * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
namespace elitedivision\amos\layout\assets; namespace arter\amos\layout\assets;
use yii\web\AssetBundle; use yii\web\AssetBundle;
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * 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 * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
namespace elitedivision\amos\layout\assets; namespace arter\amos\layout\assets;
use elitedivision\amos\core\widget\WidgetAbstract; use arter\amos\core\widget\WidgetAbstract;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
* Class AppAsset * Class AppAsset
* @package elitedivision\amos\layout\assets * @package arter\amos\layout\assets
*/ */
class BaseAsset extends AssetBundle class BaseAsset extends AssetBundle
{ {
...@@ -39,17 +35,17 @@ class BaseAsset extends AssetBundle ...@@ -39,17 +35,17 @@ class BaseAsset extends AssetBundle
public $depends = [ public $depends = [
'yii\web\JqueryAsset', 'yii\web\JqueryAsset',
'yii\jui\JuiAsset', 'yii\jui\JuiAsset',
'elitedivision\amos\layout\assets\LajaxAsset', 'arter\amos\layout\assets\LajaxAsset',
'yii\bootstrap\BootstrapAsset', 'yii\bootstrap\BootstrapAsset',
'kartik\select2\Select2Asset', 'kartik\select2\Select2Asset',
'elitedivision\amos\layout\assets\IEAssets', 'arter\amos\layout\assets\IEAssets',
'elitedivision\amos\layout\assets\JqueryUiTouchPunchImprovedAsset', 'arter\amos\layout\assets\JqueryUiTouchPunchImprovedAsset',
'elitedivision\amos\layout\assets\ConflictJuiBootstrap', 'arter\amos\layout\assets\ConflictJuiBootstrap',
'elitedivision\amos\layout\assets\TourAsset', 'arter\amos\layout\assets\TourAsset',
'elitedivision\amos\layout\assets\IconAsset', 'arter\amos\layout\assets\IconAsset',
'elitedivision\amos\layout\assets\FontAsset', 'arter\amos\layout\assets\FontAsset',
'elitedivision\amos\layout\assets\DialogAsset', 'arter\amos\layout\assets\DialogAsset',
'elitedivision\amos\layout\assets\LajaxAsset', 'arter\amos\layout\assets\LajaxAsset',
]; ];
/** /**
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * 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 amos-layout * @package amos-layout
* @category CategoryName * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
namespace elitedivision\amos\layout\assets; namespace arter\amos\layout\assets;
use yii\web\AssetBundle; use yii\web\AssetBundle;
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * 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 * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
namespace elitedivision\amos\layout\assets; namespace arter\amos\layout\assets;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
* Class AppAsset * Class AppAsset
* @package elitedivision\amos\layout\assets * @package arter\amos\layout\assets
*/ */
class ConflictJuiBootstrap extends AssetBundle { class ConflictJuiBootstrap extends AssetBundle {
public $sourcePath = '@vendor/elitedivision/amos-core/views/assets/web'; public $sourcePath = '@vendor/arter/amos-core/views/assets/web';
public $js = [ public $js = [
'js/conflictJuiBootstrap.js', 'js/conflictJuiBootstrap.js',
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * 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 amos-layout * @package amos-layout
* @category CategoryName * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
namespace elitedivision\amos\layout\assets; namespace arter\amos\layout\assets;
use yii\web\AssetBundle; use yii\web\AssetBundle;
...@@ -24,7 +20,7 @@ class DialogAsset extends AssetBundle ...@@ -24,7 +20,7 @@ class DialogAsset extends AssetBundle
'js/dialog.js', 'js/dialog.js',
]; ];
public $depends = [ public $depends = [
'elitedivision\amos\layout\assets\LajaxAsset', 'arter\amos\layout\assets\LajaxAsset',
'kartik\dialog\DialogBootstrapAsset', 'kartik\dialog\DialogBootstrapAsset',
'kartik\dialog\DialogYiiAsset', 'kartik\dialog\DialogYiiAsset',
]; ];
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * 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 * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
namespace elitedivision\amos\layout\assets; namespace arter\amos\layout\assets;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
* Class AppAsset * Class AppAsset
* @package elitedivision\amos\layout\assets * @package arter\amos\layout\assets
*/ */
class FontAsset extends AssetBundle class FontAsset extends AssetBundle
{ {
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * 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 * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
namespace elitedivision\amos\layout\assets; namespace arter\amos\layout\assets;
use yii\web\AssetBundle; use yii\web\AssetBundle;
...@@ -27,7 +23,7 @@ class FormAsset extends AssetBundle ...@@ -27,7 +23,7 @@ class FormAsset extends AssetBundle
'js/form.js', 'js/form.js',
]; ];
public $depends = [ public $depends = [
//'elitedivision\amos\layout\assets\BaseAsset', //'arter\amos\layout\assets\BaseAsset',
]; ];
/** /**
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * 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 * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
namespace elitedivision\amos\layout\assets; namespace arter\amos\layout\assets;
use yii\web\AssetBundle; use yii\web\AssetBundle;
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * 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 * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
namespace elitedivision\amos\layout\assets; namespace arter\amos\layout\assets;
use yii\web\AssetBundle; use yii\web\AssetBundle;
......
<?php <?php
/** /**
* Lombardia Informatica S.p.A. * Emilia Romagna Open Innovation
* OPEN 2.0 * 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 * @category CategoryName
* @author Lombardia Informatica S.p.A.
*/ */
namespace elitedivision\amos\layout\assets; namespace arter\amos\layout\assets;
use yii\web\AssetBundle; use yii\web\AssetBundle;