composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-18 14:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2847 - refactor twigs

Browse Source
This commit is contained in:
Eric
2020-09-17 11:16:53 +02:00
parent 077ac81208
commit e83dfe5982
14 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sources/application/UI/Layout/TabContainer/Tab/AjaxTab.php
View File

@@ -35,17 +35,16 @@ class AjaxTab extends Tab
{
// Overloaded constants
public const BLOCK_CODE = 'ibo-ajaxtab';
public const HTML_TEMPLATE_REL_PATH = 'layouts/tabcontainer/ajaxtab/layout';
public const JS_TEMPLATE_REL_PATH = 'layouts/tabcontainer/ajaxtab/layout';
public const HTML_TEMPLATE_REL_PATH = 'layouts/tabcontainer/tab/ajaxtab';
public const JS_TEMPLATE_REL_PATH = 'layouts/tabcontainer/tab/ajaxtab';
protected const TAB_TYPE = TabManager::ENUM_TAB_TYPE_AJAX;
/** @var string */
private $sURL;
/** @var bool */
private $bCache;
public function GetType(): string
{
return TabManager::ENUM_TAB_TYPE_AJAX;
}
/**
* @param string $sHtml
*
@@ -88,28 +87,28 @@ class AjaxTab extends Tab
}
/**
* @param mixed $bCache
* @param bool $bCache
*
* @return AjaxTab
*/
public function SetCache(string $bCache): self
public function SetCache(bool $bCache): self
{
$this->bCache = $bCache;
return $this;
}
/**
* @return mixed
* @return string
*/
public function GetURL()
public function GetURL(): string
{
return $this->sURL;
}
/**
* @return mixed
* @return string
*/
public function GetCache()
public function GetCache(): string
{
return $this->bCache ? 'true' : 'false';
}

8
sources/application/UI/Layout/TabContainer/Tab/Tab.php
View File

@@ -32,8 +32,10 @@ class Tab extends UIContentBlock
{
// Overloaded constants
public const BLOCK_CODE = 'ibo-tab';
public const HTML_TEMPLATE_REL_PATH = 'layouts/tabcontainer/tab/layout';
public const JS_TEMPLATE_REL_PATH = 'layouts/tabcontainer/tab/layout';
public const HTML_TEMPLATE_REL_PATH = 'layouts/tabcontainer/tab/tab';
public const JS_TEMPLATE_REL_PATH = 'layouts/tabcontainer/tab/tab';
protected const TAB_TYPE = TabManager::ENUM_TAB_TYPE_HTML;
protected $sTitle;
@@ -45,7 +47,7 @@ class Tab extends UIContentBlock
public function GetType(): string
{
return TabManager::ENUM_TAB_TYPE_HTML;
return static::TAB_TYPE;
}
public function GetTitle(): string

0
templates/layouts/tabcontainer/ajaxtab/layout.html.twig
View File

0
templates/layouts/tabcontainer/ajaxtab/layout.js.twig
View File

2
templates/layouts/tabcontainer/layout.html.twig
View File

@@ -1,3 +1,5 @@
{# @copyright Copyright (C) 2010-2020 Combodo SARL #}
{# @license http://opensource.org/licenses/AGPL-3.0 #}
<div id="{{ oUIBlock.GetId() }}" class="ibo-tab-container">
{% block iboTabContainer %}
<!-- tabs -->

2
templates/layouts/tabcontainer/layout.js.twig
View File

@@ -1,3 +1,5 @@
{# @copyright Copyright (C) 2010-2020 Combodo SARL #}
{# @license http://opensource.org/licenses/AGPL-3.0 #}
// The "tab widgets" to handle.
var tabs = $('div[id^=tabbedContent]');

2
templates/layouts/tabcontainer/tab/ajaxtab.html.twig Normal file
View File

@@ -0,0 +1,2 @@
{# @copyright Copyright (C) 2010-2020 Combodo SARL #}
{# @license http://opensource.org/licenses/AGPL-3.0 #}

9
templates/layouts/tabcontainer/tab/layout.html.twig
View File

@@ -1,7 +1,2 @@
<div id="{{ oUIBlock.GetId() }}" class="ibo-tab-content-block">
{% block iboContentBlockContainer %}
{% for oSubBlock in oUIBlock.GetSubBlocks() %}
{{ render_block(oSubBlock, {aPage: aPage}) }}
{% endfor %}
{% endblock %}
</div>
{# @copyright Copyright (C) 2010-2020 Combodo SARL #}
{# @license http://opensource.org/licenses/AGPL-3.0 #}

0
templates/layouts/tabcontainer/tab/layout.js.twig
View File

9
templates/layouts/tabcontainer/tab/tab.html.twig Normal file
View File

@@ -0,0 +1,9 @@
{# @copyright Copyright (C) 2010-2020 Combodo SARL #}
{# @license http://opensource.org/licenses/AGPL-3.0 #}
<div id="{{ oUIBlock.GetId() }}" class="ibo-tab-content-block">
{% block iboContentBlockContainer %}
{% for oSubBlock in oUIBlock.GetSubBlocks() %}
{{ render_block(oSubBlock, {aPage: aPage}) }}
{% endfor %}
{% endblock %}
</div>

2
templates/pages/backoffice/ajaxpage/layout.html.twig
View File

@@ -1,3 +1,5 @@
{# @copyright Copyright (C) 2010-2020 Combodo SARL #}
{# @license http://opensource.org/licenses/AGPL-3.0 #}
{% apply spaceless %}
{% if bEscapeContent %}
{{ render_block(oLayout, {aPage: aPage})|escape }}

2
templates/pages/backoffice/itopwebpage/layout.html.twig
View File

@@ -1,3 +1,5 @@
{# @copyright Copyright (C) 2010-2020 Combodo SARL #}
{# @license http://opensource.org/licenses/AGPL-3.0 #}
{% extends "pages/backoffice/nicewebpage/layout.html.twig" %}
{% block iboPageBodyHtml %}

2
templates/pages/backoffice/nicewebpage/layout.html.twig
View File

@@ -1,3 +1,5 @@
{# @copyright Copyright (C) 2010-2020 Combodo SARL #}
{# @license http://opensource.org/licenses/AGPL-3.0 #}
{% extends "pages/backoffice/webpage/layout.html.twig" %}
{% block iboPageJsInlineOnDomReady %}

2
templates/pages/backoffice/webpage/layout.html.twig
View File

@@ -1,3 +1,5 @@
{# @copyright Copyright (C) 2010-2020 Combodo SARL #}
{# @license http://opensource.org/licenses/AGPL-3.0 #}
<!DOCTYPE html>
<html lang="{{ aPage.aMetadata.sLang }}">
<head>