fixed: rich editor image picker displays incorrectly in IE
This commit is contained in:
parent
5d597b709c
commit
a38024e832
8 changed files with 60 additions and 61 deletions
|
|
@ -2,6 +2,7 @@
|
|||
- fix: template variable isUncommitted is not documented in the help
|
||||
- fix: Event is no longer editable by anyone who can add events
|
||||
- fixed: Package search is slow for large websites
|
||||
- fixed: rich editor image picker displays incorrectly in IE
|
||||
|
||||
7.5.10
|
||||
- fix: Syntax error in GetCsMail
|
||||
|
|
|
|||
|
|
@ -25,68 +25,62 @@
|
|||
</fieldset>
|
||||
<fieldset>
|
||||
<legend>{#wginsertimage.selectedproperties}</legend>
|
||||
<table class="image-properties">
|
||||
<table class="image-properties" style="width: 100%">
|
||||
<tr>
|
||||
<td><label for="image-url">{#wginsertimage.imageurl}</label></td>
|
||||
<td><input id="image-url" type="text" name="imageurl" /></td>
|
||||
<td style="width: 6.5em;"><label for="image-url">{#wginsertimage.imageurl}</label></td>
|
||||
<td width="100%"><input id="image-url" type="text" name="imageurl" /></td>
|
||||
<td rowspan="3"><iframe id="image-preview"></iframe></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><label for="image-alt">{#wginsertimage.imagealt}</label></td>
|
||||
<td><input id="image-alt" type="text" name="imagealt" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
<fieldset>
|
||||
<legend>{#wginsertimage.imagelayout}</legend>
|
||||
<table class="image-layout">
|
||||
<tr>
|
||||
<td><label for="image-align">{#wginsertimage.imagealign}</label></td>
|
||||
<td>
|
||||
<select id="image-align" name="imagealign">
|
||||
<option value="" selected="selected">(none)</option>
|
||||
<option value="absbottom">absbottom</option>
|
||||
<option value="absmiddle">absmiddle</option>
|
||||
<option value="baseline">baseline</option>
|
||||
<option value="bottom">bottom</option>
|
||||
<option value="left">left</option>
|
||||
<option value="middle">middle</option>
|
||||
<option value="right">right</option>
|
||||
<option value="texttop">texttop</option>
|
||||
<option value="top">top</option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><label for="image-border">{#wginsertimage.imageborder}</label></td>
|
||||
<td><input id="image-border" type="text" name="imageborder" /></td>
|
||||
</tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
</td>
|
||||
<td>
|
||||
<fieldset>
|
||||
<legend>{#wginsertimage.imagespacing}</legend>
|
||||
<table class="image-spacing">
|
||||
<tr>
|
||||
<td><label for="image-hspace">{#wginsertimage.imagehspace}</label></td>
|
||||
<td><input id="image-hspace" type="text" name="imagehspace" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><label for="image-vspace">{#wginsertimage.imagevspace}</label></td>
|
||||
<td><input id="image-vspace" type="text" name="imagevspace" /></td>
|
||||
</tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<tr><td colspan="2">
|
||||
<table style="width: 100%"><tr>
|
||||
<td>
|
||||
<fieldset>
|
||||
<legend>{#wginsertimage.imagelayout}</legend>
|
||||
<table class="image-layout" style="width: 100%">
|
||||
<tr>
|
||||
<td style="width: 6em"><label for="image-align">{#wginsertimage.imagealign}</label></td>
|
||||
<td>
|
||||
<select id="image-align" name="imagealign">
|
||||
<option value="" selected="selected">(none)</option>
|
||||
<option value="absbottom">absbottom</option>
|
||||
<option value="absmiddle">absmiddle</option>
|
||||
<option value="baseline">baseline</option>
|
||||
<option value="bottom">bottom</option>
|
||||
<option value="left">left</option>
|
||||
<option value="middle">middle</option>
|
||||
<option value="right">right</option>
|
||||
<option value="texttop">texttop</option>
|
||||
<option value="top">top</option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><label for="image-border">{#wginsertimage.imageborder}</label></td>
|
||||
<td><input id="image-border" type="text" name="imageborder" /></td>
|
||||
</tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
</td>
|
||||
<td>
|
||||
<fieldset>
|
||||
<legend>{#wginsertimage.imagespacing}</legend>
|
||||
<table class="image-spacing" style="width: 100%">
|
||||
<tr>
|
||||
<td style="width: 6em;"><label for="image-hspace">{#wginsertimage.imagehspace}</label></td>
|
||||
<td><input id="image-hspace" type="text" name="imagehspace" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><label for="image-vspace">{#wginsertimage.imagevspace}</label></td>
|
||||
<td><input id="image-vspace" type="text" name="imagevspace" /></td>
|
||||
</tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
</td></tr></table>
|
||||
</td></tr></table>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
tinyMCE.addI18n('en.wginsertimage',{
|
||||
desc : 'Insert WebGUI Image',
|
||||
desc : 'Insert WebGUI Image'
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ tinyMCE.addI18n('en.wginsertimage',{
|
|||
manager : 'WebGUI Collateral Image Manager',
|
||||
newwindow : 'Open link in new window.',
|
||||
selectedproperties : 'Selected Image',
|
||||
imageurl : 'Image URL:',
|
||||
imagealt : 'Alt Text:',
|
||||
imageurl : 'Image URL:',
|
||||
imagealt : 'Alt Text:',
|
||||
imagelayout : 'Layout',
|
||||
imagealign : 'Alignment:',
|
||||
imageborder : 'Border:',
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
height : 125 + ed.getLang('wgmacro.delta_height', 0),
|
||||
inline : 1
|
||||
}, {
|
||||
plugin_url : url,
|
||||
plugin_url : url
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,10 @@ iframe.pages {
|
|||
height: 100%;
|
||||
}
|
||||
|
||||
td.label-column {
|
||||
width: 4em;
|
||||
}
|
||||
|
||||
.nav {
|
||||
font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, Arial, sans-serif;
|
||||
font-size: 12px;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
tinyMCE.addI18n('en.wgpagetree',{
|
||||
desc : 'Link to a page in the WebGUI asset tree',
|
||||
desc : 'Link to a page in the WebGUI asset tree'
|
||||
});
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<div id="general_panel" class="panel current">
|
||||
<table width="100%">
|
||||
<tr>
|
||||
<td><label for="link_url">{#wgpagetree.linkurl}</label></td>
|
||||
<td class="label-column"><label for="link_url">{#wgpagetree.linkurl}</label></td>
|
||||
<td><input type="text" name="link_url" value="" id="link_url" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue