diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-05-21 01:08:31 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-05-21 01:08:31 +0000 |
| commit | 205c3245a5b0ecf7cb6641569e3decaa4423249b (patch) | |
| tree | 556078994d45bfbefac62941b48380e4d3a380de /phpBB | |
| parent | 5fb416fc26fdbf6d8f7141039f95aba3d3ef681d (diff) | |
| download | forums-205c3245a5b0ecf7cb6641569e3decaa4423249b.tar forums-205c3245a5b0ecf7cb6641569e3decaa4423249b.tar.gz forums-205c3245a5b0ecf7cb6641569e3decaa4423249b.tar.bz2 forums-205c3245a5b0ecf7cb6641569e3decaa4423249b.tar.xz forums-205c3245a5b0ecf7cb6641569e3decaa4423249b.zip | |
- fix some bugs in the theme editor
git-svn-id: file:///svn/phpbb/trunk@5954 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/acp_styles.html | 10 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 12 | ||||
| -rw-r--r-- | phpBB/language/en/acp/styles.php | 2 |
3 files changed, 17 insertions, 7 deletions
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 2388a4e1e0..b38a35702d 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -251,8 +251,8 @@ <p>{L_SELECTED_THEME}: <b>{SELECTED_THEME}</b></p> <!-- IF S_SHOWCSS --> - <h3>{L_SHOW_RAW_CSS_NOTE}</h3> - <p>{L_SHOW_RAW_CSS_EXPLAIN}</p> + <h3>{L_SHOW_CSS_NOTE}</h3> + <p>{L_SHOW_CSS_EXPLAIN}</p> <!-- ENDIF --> <form id="acp_styles" method="post" action="{U_ACTION}"> @@ -292,7 +292,7 @@ <legend>{L_BACKGROUND}</legend> <dl> <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" /> <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" /> <span>[ <a href="#" onclick="swatch('background_color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> </dl> <dl> <dt><label for="backround_image">{L_BACKGROUND_IMAGE}:</label></td> @@ -307,8 +307,8 @@ <fieldset> <legend>{L_FOREGROUND}</legend> <dl> - <dt><label for="font_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" /> <span>[ <a href="#" onclick="swatch('font_color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> + <dt><label for="color">{L_FONT_COLOUR}:</label><br /><span>{L_CSS_COLOUR_EXPLAIN}</span></dt> + <dd><input id="color" name="color" type="text" value="{COLOR}" size="6" /> <span>[ <a href="#" onclick="swatch('color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> </dl> <dl> <dt><label for="font_family">{L_FONT_FACE}:</label><br /><span>{L_FONT_FACE_EXPLAIN}</span></dt> diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 1da2291e8f..1468555ded 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -933,7 +933,7 @@ pagination_sep = \'{PAGINATION_SEP}\' if ((request_var($var, '') === '') || !in_array($unit, $units)) { - continue 2; + $value = ''; } break; @@ -941,7 +941,7 @@ pagination_sep = \'{PAGINATION_SEP}\' $value = str_replace('..', '.', request_var($var, '')); if (!file_exists($value)) { - continue 2; + $value = ''; } break; @@ -953,6 +953,14 @@ pagination_sep = \'{PAGINATION_SEP}\' } break; + case 'repeat': + $value = request_var($var, ''); + if (!isset($repeat_types[$value])) + { + $value = ''; + } + break; + default: $value = request_var($var, ''); } diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 5dc2865f6c..27918011ee 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -272,6 +272,8 @@ $lang = array_merge($lang, array( 'SELECTED_THEME' => 'Selected theme', 'SELECTED_CLASS' => 'Selected CSS class', '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_FILESYSTEM' => 'Filesystem', 'STYLE_ACTIVATE' => 'Activate', |