mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-12 02:25:18 +02:00
[ticket/15522] Improve color palette syntax
PHPBB3-15522
This commit is contained in:
parent
2470dcbc20
commit
42ff95c300
@ -44,7 +44,7 @@
|
|||||||
<!-- INCLUDE acp_posting_buttons.html -->
|
<!-- INCLUDE acp_posting_buttons.html -->
|
||||||
|
|
||||||
<dl class="responsive-columns">
|
<dl class="responsive-columns">
|
||||||
<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
|
<dt style="width: 90px;" id="color_palette_placeholder" data-color-palette="v" data-height="12" data-width="15" data-bbcode="true">
|
||||||
</dt>
|
</dt>
|
||||||
|
|
||||||
<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;">
|
<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;">
|
||||||
|
@ -98,7 +98,7 @@
|
|||||||
<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />
|
<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />
|
||||||
<!-- IF GROUP_COLOUR --> <span style="background-color: #{GROUP_COLOUR}"> </span><!-- ENDIF --> <span>
|
<!-- IF GROUP_COLOUR --> <span style="background-color: #{GROUP_COLOUR}"> </span><!-- ENDIF --> <span>
|
||||||
[ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ]</span>
|
[ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ]</span>
|
||||||
<div id="color_palette_placeholder" style="display: none;" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div>
|
<div id="color_palette_placeholder" style="display: none;" data-color-palette="h" data-height="12" data-width="15" data-target="#group_colour"></div>
|
||||||
</dd>
|
</dd>
|
||||||
</dl>
|
</dl>
|
||||||
<dl>
|
<dl>
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
<!-- INCLUDE acp_posting_buttons.html -->
|
<!-- INCLUDE acp_posting_buttons.html -->
|
||||||
|
|
||||||
<dl class="responsive-columns">
|
<dl class="responsive-columns">
|
||||||
<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
|
<dt style="width: 90px;" id="color_palette_placeholder" data-color-palette="v" data-height="12" data-width="15" data-bbcode="true">
|
||||||
</dt>
|
</dt>
|
||||||
<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{SIGNATURE}</textarea></dd>
|
<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{SIGNATURE}</textarea></dd>
|
||||||
<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
|
<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
|
||||||
|
@ -1482,7 +1482,7 @@ phpbb.colorPalette = function(dir, width, height) {
|
|||||||
* @param {jQuery} el jQuery object for the palette container.
|
* @param {jQuery} el jQuery object for the palette container.
|
||||||
*/
|
*/
|
||||||
phpbb.registerPalette = function(el) {
|
phpbb.registerPalette = function(el) {
|
||||||
var orientation = el.attr('data-orientation'),
|
var orientation = el.attr('data-color-palette'),
|
||||||
height = el.attr('data-height'),
|
height = el.attr('data-height'),
|
||||||
width = el.attr('data-width'),
|
width = el.attr('data-width'),
|
||||||
target = el.attr('data-target'),
|
target = el.attr('data-target'),
|
||||||
@ -1652,7 +1652,7 @@ $(function() {
|
|||||||
|
|
||||||
phpbb.registerPageDropdowns();
|
phpbb.registerPageDropdowns();
|
||||||
|
|
||||||
$('[data-orientation]').each(function() {
|
$('[data-color-palette]').each(function() {
|
||||||
phpbb.registerPalette($(this));
|
phpbb.registerPalette($(this));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
<div id="colour_palette" style="display: none;">
|
<div id="colour_palette" style="display: none;">
|
||||||
<dl style="clear: left;">
|
<dl style="clear: left;">
|
||||||
<dt><label>{L_FONT_COLOR}{L_COLON}</label></dt>
|
<dt><label>{L_FONT_COLOR}{L_COLON}</label></dt>
|
||||||
<dd id="color_palette_placeholder" class="color_palette_placeholder" data-orientation="h" data-height="12" data-width="15" data-bbcode="true"></dd>
|
<dd id="color_palette_placeholder" class="color_palette_placeholder" data-color-palette="h" data-height="12" data-width="15" data-bbcode="true"></dd>
|
||||||
</dl>
|
</dl>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@
|
|||||||
<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" class="inputbox narrow" />
|
<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" class="inputbox narrow" />
|
||||||
<span style="background-color: #{GROUP_COLOUR};"> </span>
|
<span style="background-color: #{GROUP_COLOUR};"> </span>
|
||||||
[ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ]
|
[ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ]
|
||||||
<div id="color_palette_placeholder" class="color_palette_placeholder hidden" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div>
|
<div id="color_palette_placeholder" class="color_palette_placeholder hidden" data-color-palette="h" data-height="12" data-width="15" data-target="#group_colour"></div>
|
||||||
</dd>
|
</dd>
|
||||||
</dl>
|
</dl>
|
||||||
<dl>
|
<dl>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user