Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix #508
  • Loading branch information
JohnSmith-LT committed May 26, 2016
1 parent 1ada86b commit 262ff79
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 1 deletion.
Expand Up @@ -686,9 +686,14 @@ function x_continueSetUp() {
});
}

// get icon position
var icPosition;
if (x_params.icPosition != undefined && x_params.icPosition != "") {
icPosition = (x_params.icPosition === 'right') ? "x_floatRight" : "x_floatLeft";
}
if (x_params.ic != undefined && x_params.ic != "") {
var icTip = x_params.icTip != undefined && x_params.icTip != "" ? 'alt="' + x_params.icTip + '"' : 'aria-hidden="true"';
$x_headerBlock.prepend('<img src="' + x_evalURL(x_params.ic) + '" class="x_floatLeft" onload="if (x_firstLoad == false) {x_updateCss();}" ' + icTip + '/>');
$x_headerBlock.prepend('<img src="' + x_evalURL(x_params.ic) + '" class="' + icPosition + '" onload="if (x_firstLoad == false) {x_updateCss();}" ' + icTip + '/>');
}

// ignores x_params.allpagestitlesize if added as optional property as the header bar will resize to fit any title
Expand Down
Expand Up @@ -34,6 +34,7 @@
<menuImage optional="true" type="media" label="Menu Page Image"/>
<ic optional="true" type="media" label="Icon"/>
<icTip optional="true" type="TextInput" label="Icon Description" defaultValue="Enter a Description for Accessibility"/>
<icPosition optional="true" type="ComboBox" options="Left,Right" data="left,right" label="Icon Position" defaultValue="left" width="100"/>
<nfo optional="true" label="Help File" type="media"/>
<glossary optional="true" label="Glossary" type="DataGrid" height="200" width="390" columns="2" colWidths="100,295" editable="1,1" controls="1" headers="Term,Definition" newRow="term,definition" rendererOptions="none,none" defaultValue="term|definition"/>
<controller optional="true" label="Custom Interface" type="media" flashonly="true"/>
Expand Down
1 change: 1 addition & 0 deletions src/Nottingham/wizards/en-GB/basic.xwd
Expand Up @@ -33,6 +33,7 @@
<menuImage optional="true" type="media" label="Menu Page Image"/>
<ic optional="true" type="media" label="Icon"/>
<icTip optional="true" type="TextInput" label="Icon Description" defaultValue="Enter a Description for Accessibility"/>
<icPosition optional="true" type="ComboBox" options="Left,Right" data="left,right" label="Icon Position" defaultValue="left" width="100"/>
<nfo optional="true" label="Help File" type="media"/>
<glossary optional="true" label="Glossary" type="DataGrid" height="200" width="390" columns="2" colWidths="100,295" editable="1,1" controls="1" headers="Term,Definition" newRow="term,definition" rendererOptions="none,none" defaultValue="term|definition"/>
<controller optional="true" label="Custom Interface" type="media" flashonly="true"/>
Expand Down
1 change: 1 addition & 0 deletions src/Nottingham/wizards/en-GB/template.xwd
Expand Up @@ -34,6 +34,7 @@
<menuImage optional="true" type="media" label="Menu Page Image"/>
<ic optional="true" type="media" label="Icon"/>
<icTip optional="true" type="TextInput" label="Icon Description" defaultValue="Enter a Description for Accessibility"/>
<icPosition optional="true" type="ComboBox" options="Left,Right" data="left,right" label="Icon Position" defaultValue="left" width="100"/>
<nfo optional="true" label="Help File" type="media"/>
<glossary optional="true" label="Glossary" type="DataGrid" height="200" width="390" columns="2" colWidths="100,295" editable="1,1" controls="1" headers="Term,Definition" newRow="term,definition" rendererOptions="none,none" defaultValue="term|definition"/>
<controller optional="true" label="Custom Interface" type="media" flashonly="true"/>
Expand Down

0 comments on commit 262ff79

Please sign in to comment.