Skip to content

[4.0] Transition of Joomla's Wrapper module and component from HTML4 to HTML5 #20212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 16 commits into from
Closed

[4.0] Transition of Joomla's Wrapper module and component from HTML4 to HTML5 #20212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9b09d0d
Update default.php
BaleshSrle Mar 24, 2018
06e1320
Update default.xml
BaleshSrle Mar 24, 2018
604a324
Update mod_wrapper.xml
BaleshSrle Mar 24, 2018
12ffc04
Update mod_wrapper.php
BaleshSrle Mar 24, 2018
90860bd
Update WrapperHelper.php
BaleshSrle Mar 24, 2018
8699de8
Update default.php
BaleshSrle Mar 24, 2018
90eccd4
Update WrapperHelper.php
BaleshSrle Mar 24, 2018
4255388
Update default.php
BaleshSrle Mar 24, 2018
4fc3107
Update mod_wrapper.php
BaleshSrle Mar 24, 2018
7766d65
Update mod_wrapper.xml
BaleshSrle Mar 28, 2018
f19374f
Update default.php
BaleshSrle Mar 28, 2018
2ef66b1
Update default.xml
BaleshSrle Mar 28, 2018
8adde16
Merge branch '4.0-dev' into 4.0-dev
BaleshSrle Apr 22, 2018
1f0575a
Merge branch '4.0-dev' into 4.0-dev
BaleshSrle May 2, 2018
e783118
Merge branch '4.0-dev' into 4.0-dev
BaleshSrle May 3, 2018
e0b13a9
Merge branch '4.0-dev' into 4.0-dev
laoneo May 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions components/com_wrapper/tmpl/wrapper/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@
id="blockrandom"
name="iframe"
src="<?php echo $this->escape($this->wrapper->url); ?>"
width="<?php echo $this->escape($this->params->get('width')); ?>"
height="<?php echo $this->escape($this->params->get('height')); ?>"
scrolling="<?php echo $this->escape($this->params->get('scrolling')); ?>"
frameborder="<?php echo $this->escape($this->params->get('frameborder', 1)); ?>"
style="width: <?php echo $this->escape($this->params->get('width')); ?>; height: <?php echo $this->escape($this->params->get('height')); ?>; overflow: <?php echo $this->escape($this->params->get('overflow')); ?>; border: <?php echo $this->escape($this->params->get('border')); ?>;"
<?php if ($this->escape($this->params->get('page_heading'))) : ?>
title="<?php echo $this->escape($this->params->get('page_heading')); ?>"
<?php else : ?>
Expand Down
18 changes: 9 additions & 9 deletions components/com_wrapper/tmpl/wrapper/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
<fieldset name="basic" label="COM_WRAPPER_FIELD_LABEL_SCROLLBARSPARAMS">

<field
name="scrolling"
name="overflow"
type="list"
label="COM_WRAPPER_FIELD_SCROLLBARS_LABEL"
default="auto"
>
<option value="no">JNO</option>
<option value="yes">JYES</option>
<option value="hidden">JNO</option>
<option value="scroll">JYES</option>
<option value="auto">COM_WRAPPER_FIELD_VALUE_AUTO</option>
</field>

Expand All @@ -48,9 +48,9 @@

<field
name="height"
type="number"
type="text"
label="COM_WRAPPER_FIELD_HEIGHT_LABEL"
default="500"
default="500px"
size="5"
/>

Expand Down Expand Up @@ -83,14 +83,14 @@
</field>

<field
name="frameborder"
name="border"
type="radio"
label="COM_WRAPPER_FIELD_FRAME_LABEL"
class="switcher"
default="1"
default="thin solid #D3D3D3"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
<option value="none">JNO</option>
<option value="thin solid #D3D3D3">JYES</option>
</field>

</fieldset>
Expand Down
4 changes: 2 additions & 2 deletions modules/mod_wrapper/Helper/WrapperHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class WrapperHelper
public static function getParams(&$params)
{
$params->def('url', '');
$params->def('scrolling', 'auto');
$params->def('height', '200');
$params->def('overflow', 'auto');
$params->def('height', '200px');
$params->def('height_auto', '0');
$params->def('width', '100%');
$params->def('add', '1');
Expand Down
4 changes: 2 additions & 2 deletions modules/mod_wrapper/mod_wrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
$target = htmlspecialchars($params->get('target'), ENT_COMPAT, 'UTF-8');
$width = htmlspecialchars($params->get('width'), ENT_COMPAT, 'UTF-8');
$height = htmlspecialchars($params->get('height'), ENT_COMPAT, 'UTF-8');
$scroll = htmlspecialchars($params->get('scrolling'), ENT_COMPAT, 'UTF-8');
$frameborder = htmlspecialchars($params->get('frameborder'), ENT_COMPAT, 'UTF-8');
$overflow = htmlspecialchars($params->get('overflow'), ENT_COMPAT, 'UTF-8');
$border = htmlspecialchars($params->get('border'), ENT_COMPAT, 'UTF-8');
$ititle = $module->title;

require ModuleHelper::getLayoutPath('mod_wrapper', $params->get('layout', 'default'));
16 changes: 8 additions & 8 deletions modules/mod_wrapper/mod_wrapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
</field>

<field
name="scrolling"
name="overflow"
type="list"
label="MOD_WRAPPER_FIELD_SCROLL_LABEL"
default="auto"
>
<option value="auto">MOD_WRAPPER_FIELD_VALUE_AUTO</option>
<option value="no">JNO</option>
<option value="yes">JYES</option>
<option value="hidden">JNO</option>
<option value="scroll">JYES</option>
</field>

<field
Expand All @@ -66,7 +66,7 @@
type="text"
label="MOD_WRAPPER_FIELD_HEIGHT_LABEL"
size="5"
default="200"
default="200px"
/>

<field
Expand All @@ -81,14 +81,14 @@
</field>

<field
name="frameborder"
name="border"
type="radio"
class="switcher"
label="MOD_WRAPPER_FIELD_FRAME_LABEL"
default="1"
default="thin solid #D3D3D3"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
<option value="none">JNO</option>
<option value="thin solid #D3D3D3">JYES</option>
</field>

<field
Expand Down
5 changes: 1 addition & 4 deletions modules/mod_wrapper/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@
id="blockrandom"
name="<?php echo $target; ?>"
src="<?php echo $url; ?>"
width="<?php echo $width; ?>"
height="<?php echo $height; ?>"
scrolling="<?php echo $scroll; ?>"
frameborder="<?php echo $frameborder; ?>"
style="width: <?php echo $width; ?>; height: <?php echo $height; ?>; overflow: <?php echo $overflow; ?>; border: <?php echo $border; ?>;"
title="<?php echo $ititle; ?>"
class="wrapper">
<?php echo Text::_('MOD_WRAPPER_NO_IFRAMES'); ?>
Expand Down