diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index 5b3d19c8b6..9a7a3e4b89 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -24,7 +24,7 @@

{L_SEND_TO_USERS_EXPLAIN}
-
[ {L_FIND_USERNAME} ]
+
[ {L_FIND_USERNAME} ]
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 6025629ce1..40adf1ddf1 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -390,7 +390,7 @@ - +
- - - - - - - - -
{L_SELECT_IMAGE}: -   -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_EDIT_IMAGESET}
{L_IMAGESET_UPDATED}
{L_NO_IMAGE}
- - - - - - - - - -
{L_CURRENT_IMAGE}{L_SELECTED_IMAGE}
-
{L_IMAGE_PARAMETER}{L_IMAGE_VALUE}
{L_IMAGE}: -
{L_INCLUDE_DIMENSIONS}:
{L_DIMENSIONS_EXPLAIN}		 checked="checked" /> {L_YES}   checked="checked" /> {L_NO}
  
-
- +   + + +
+ {L_EDIT_IMAGESET} +
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+

{L_DIMENSIONS_EXPLAIN}
+
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}
+
+
+ +
+    +
+
- diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html index b234ad6456..d555bc1443 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -73,16 +73,27 @@ function marklist(id, name, state) } } - - /** - * Color swatch - */ - function swatch() - { - window.open('{UA_SWATCH}', '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636'); - return false; - } - +/** +* Find a member +*/ +function find_username() +{ + + window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); + + return false; +} + +/** +* Color swatch +*/ +function swatch(field) +{ + + window.open('{UA_SWATCH}' + field, '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636'); + + return false; +} //--> diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php index 5d452218b0..3744a967a6 100644 --- a/phpBB/adm/swatch.php +++ b/phpBB/adm/swatch.php @@ -31,8 +31,14 @@ $template->set_filenames(array( $template->assign_vars(array( 'OPENER' => addslashes(request_var('form', '')), 'NAME' => request_var('name', ''), - 'T_IMAGES_PATH' => "{$phpbb_root_path}images/",) -); + 'T_IMAGES_PATH' => "{$phpbb_root_path}images/", + + 'S_USER_LANG' => $user->lang['USER_LANG'], + 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], + 'S_CONTENT_ENCODING' => 'UTF-8', + 'S_CONTENT_DIR_LEFT' => $user->lang['LEFT'], + 'S_CONTENT_DIR_RIGHT' => $user->lang['RIGHT'], +)); $template->display('body'); diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 6b1eefe8e6..f858da6a16 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -457,7 +457,7 @@ class acp_search /** * @todo remove Javascript */ - return ' -