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
This commit is contained in:
Andreas Fischer 2013-05-19 15:44:25 +02:00
commit f49be85859

View file

@ -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>