Skip to content

Transition of Joomla's Wrapper from HTML4 to HTML5 #19965

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 12 commits into from
Closed

Transition of Joomla's Wrapper from HTML4 to HTML5 #19965

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d7cc5ce
Update mod_wrapper.php
BaleshSrle Mar 22, 2018
58cd501
Update helper.php
BaleshSrle Mar 22, 2018
5d39bee
Update mod_wrapper.xml
BaleshSrle Mar 22, 2018
b21a2d7
Update default.php
BaleshSrle Mar 22, 2018
cd1a748
Update default.php
BaleshSrle Mar 22, 2018
465e07f
Update default.xml
BaleshSrle Mar 22, 2018
c5c2845
Update default.php
BaleshSrle Mar 24, 2018
7b8fd33
Update default.php
BaleshSrle Mar 26, 2018
f54b43a
Update default.php
BaleshSrle Mar 26, 2018
20e29b1
Update default.xml
BaleshSrle Mar 28, 2018
3f4863c
Update default.php
BaleshSrle Mar 28, 2018
b417e1d
Update mod_wrapper.xml
BaleshSrle Mar 28, 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/views/wrapper/tmpl/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', 1)); ?>;"
Copy link
Contributor

@ReLater ReLater Mar 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing colon : after width

Copy link
Author

@BaleshSrle BaleshSrle Mar 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hawk eyes ;-)

<?php if ($this->escape($this->params->get('page_heading'))) : ?>
title="<?php echo $this->escape($this->params->get('page_heading')); ?>"
<?php else : ?>
Expand Down
10 changes: 5 additions & 5 deletions components/com_wrapper/views/wrapper/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
<fieldset name="basic" label="COM_WRAPPER_FIELD_LABEL_SCROLLBARSPARAMS">

<field
name="scrolling"
name="overflow"
type="list"
label="COM_WRAPPER_FIELD_SCROLLBARS_LABEL"
description="COM_WRAPPER_FIELD_SCROLLBARS_DESC"
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 @@ -51,10 +51,10 @@

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

Expand Down
4 changes: 2 additions & 2 deletions modules/mod_wrapper/helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ class ModWrapperHelper
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,9 +19,9 @@
$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');
$overflow = htmlspecialchars($params->get('overflow'), ENT_COMPAT, 'UTF-8');
$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
$frameborder = htmlspecialchars($params->get('frameborder'), ENT_COMPAT, 'UTF-8');
$border = htmlspecialchars($params->get('border'), ENT_COMPAT, 'UTF-8');
$ititle = $module->title;
$id = $module->id;

Expand Down
10 changes: 5 additions & 5 deletions modules/mod_wrapper/mod_wrapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@
</field>

<field
name="scrolling"
name="overflow"
type="list"
label="MOD_WRAPPER_FIELD_SCROLL_LABEL"
description="MOD_WRAPPER_FIELD_SCROLL_DESC"
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 @@ -70,7 +70,7 @@
label="MOD_WRAPPER_FIELD_HEIGHT_LABEL"
description="MOD_WRAPPER_FIELD_HEIGHT_DESC"
size="5"
default="200"
default="200px"
/>

<field
Expand All @@ -86,7 +86,7 @@
</field>

<field
name="frameborder"
name="border"
type="radio"
label="MOD_WRAPPER_FIELD_FRAME_LABEL"
description="MOD_WRAPPER_FIELD_FRAME_DESC"
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 @@ -15,10 +15,7 @@
id="blockrandom-<?php echo $id; ?>"
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 $moduleclass_sfx; ?>" >
<?php echo JText::_('MOD_WRAPPER_NO_IFRAMES'); ?>
Expand Down