aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/prosilver/template/ucp_groups_manage.html
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-05-19 15:44:25 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-05-19 15:44:25 +0200
commitf49be858598f10abfb9c7886bd698cdec862fe1c (patch)
tree74ec809adab6e537785aba5eb51e407d71e0c344 /phpBB/styles/prosilver/template/ucp_groups_manage.html
parenta70eedecdecd4d0e0955a1ba1ba71879e9b3bd57 (diff)
parent4fc180ade5098d8efca44327795118c018ef255c (diff)
downloadforums-f49be858598f10abfb9c7886bd698cdec862fe1c.tar
forums-f49be858598f10abfb9c7886bd698cdec862fe1c.tar.gz
forums-f49be858598f10abfb9c7886bd698cdec862fe1c.tar.bz2
forums-f49be858598f10abfb9c7886bd698cdec862fe1c.tar.xz
forums-f49be858598f10abfb9c7886bd698cdec862fe1c.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp Conflicts: phpBB/styles/prosilver/template/ucp_groups_manage.html
Diffstat (limited to 'phpBB/styles/prosilver/template/ucp_groups_manage.html')
-rw-r--r--phpBB/styles/prosilver/template/ucp_groups_manage.html17
1 files changed, 8 insertions, 9 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index f6fcfa043d..4f8e933361 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -6,19 +6,18 @@
<div class="panel">
<div class="inner">
-
+
+ <!-- IF S_ERROR -->
+ <fieldset>
+ <p class="error">{ERROR_MSG}</p>
+ </fieldset>
+ <!-- ENDIF -->
+
<p>{L_GROUPS_EXPLAIN}</p>
<!-- IF S_EDIT -->
<h3>{L_GROUP_DETAILS}</h3>
-
- <!-- IF S_ERROR -->
- <div class="errorbox">
- <h3>{L_WARNING}</h3>
- <p>{ERROR_MSG}</p>
- </div>
- <!-- ENDIF -->
-
+
<fieldset>
<dl>
<dt><label for="group_name">{L_GROUP_NAME}{L_COLON}</label></dt>