makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix some bugs in the theme editor

Browse source 
git-svn-id: file:///svn/phpbb/trunk@5954 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2006-05-21 01:08:31 +00:00
parent 5fb416fc26
commit 205c3245a5
3 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/adm/style/acp_styles.html
View file

@ -251,8 +251,8 @@
<p>{L_SELECTED_THEME}: <b>{SELECTED_THEME}</b></p> <p>{L_SELECTED_THEME}: <b>{SELECTED_THEME}</b></p>
<!-- IF S_SHOWCSS --> <!-- IF S_SHOWCSS -->
<h3>{L_SHOW_RAW_CSS_NOTE}</h3> <h3>{L_SHOW_CSS_NOTE}</h3>
<p>{L_SHOW_RAW_CSS_EXPLAIN}</p> <p>{L_SHOW_CSS_EXPLAIN}</p>
<!-- ENDIF --> <!-- ENDIF -->
<form id="acp_styles" method="post" action="{U_ACTION}"> <form id="acp_styles" method="post" action="{U_ACTION}">
@ -292,7 +292,7 @@
<legend>{L_BACKGROUND}</legend> <legend>{L_BACKGROUND}</legend>
<dl> <dl>
<dt><label for="background_color">{L_BACKGROUND_COLOUR}:</label><br /><span>{L_CSS_COLOUR_EXPLAIN}</span></dt> <dt><label for="background_color">{L_BACKGROUND_COLOUR}:</label><br /><span>{L_CSS_COLOUR_EXPLAIN}</span></dt>
<dd><input id="background_color" name="background_color" type="text" value="{BACKGROUND_COLOR}" size="6" maxlength="6" />&nbsp;&nbsp;<span>[ <a href="#" onclick="swatch('background_color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> <dd><input id="background_color" name="background_color" type="text" value="{BACKGROUND_COLOR}" size="6" />&nbsp;&nbsp;<span>[ <a href="#" onclick="swatch('background_color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
</dl> </dl>
<dl> <dl>
<dt><label for="backround_image">{L_BACKGROUND_IMAGE}:</label></td> <dt><label for="backround_image">{L_BACKGROUND_IMAGE}:</label></td>
@ -307,8 +307,8 @@
<fieldset> <fieldset>
<legend>{L_FOREGROUND}</legend> <legend>{L_FOREGROUND}</legend>
<dl> <dl>
<dt><label for="font_color">{L_FONT_COLOUR}:</label><br /><span>{L_CSS_COLOUR_EXPLAIN}</span></dt> <dt><label for="color">{L_FONT_COLOUR}:</label><br /><span>{L_CSS_COLOUR_EXPLAIN}</span></dt>
<dd><input id="font_color" name="font_color" type="text" value="{FONT_COLOR}" size="6" maxlength="6" />&nbsp;&nbsp;<span>[ <a href="#" onclick="swatch('font_color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> <dd><input id="color" name="color" type="text" value="{COLOR}" size="6" />&nbsp;&nbsp;<span>[ <a href="#" onclick="swatch('color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
</dl> </dl>
<dl> <dl>
<dt><label for="font_family">{L_FONT_FACE}:</label><br /><span>{L_FONT_FACE_EXPLAIN}</span></dt> <dt><label for="font_family">{L_FONT_FACE}:</label><br /><span>{L_FONT_FACE_EXPLAIN}</span></dt>

12
phpBB/includes/acp/acp_styles.php
View file

@ -933,7 +933,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
if ((request_var($var, '') === '') || !in_array($unit, $units)) if ((request_var($var, '') === '') || !in_array($unit, $units))
{ {
continue 2; $value = '';
} }
break; break;
@ -941,7 +941,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
$value = str_replace('..', '.', request_var($var, '')); $value = str_replace('..', '.', request_var($var, ''));
if (!file_exists($value)) if (!file_exists($value))
{ {
continue 2; $value = '';
} }
break; break;
@ -953,6 +953,14 @@ pagination_sep = \'{PAGINATION_SEP}\'
} }
break; break;
case 'repeat':
$value = request_var($var, '');
if (!isset($repeat_types[$value]))
{
$value = '';
}
break;
default: default:
$value = request_var($var, ''); $value = request_var($var, '');
} }

2
phpBB/language/en/acp/styles.php
View file

@ -272,6 +272,8 @@ $lang = array_merge($lang, array(
'SELECTED_THEME' => 'Selected theme', 'SELECTED_THEME' => 'Selected theme',
'SELECTED_CLASS' => 'Selected CSS class', 'SELECTED_CLASS' => 'Selected CSS class',
'SHOW_CSS' => 'Show raw CSS', 'SHOW_CSS' => 'Show raw CSS',
'SHOW_CSS_NOTE' => 'Note',
'SHOW_CSS_EXPLAIN' => 'Enter each element on a new line, ending with a ; Expand the data for each element, e.g. do not use font: use font-family:, font-weight:, etc.',
'STORE_DATABASE' => 'Database', 'STORE_DATABASE' => 'Database',
'STORE_FILESYSTEM' => 'Filesystem', 'STORE_FILESYSTEM' => 'Filesystem',
'STYLE_ACTIVATE' => 'Activate', 'STYLE_ACTIVATE' => 'Activate',