Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

This commit is contained in:
Matthias Mees 2014-02-27 20:25:25 +01:00
commit 4e1a285119

@ -38,7 +38,7 @@
<div class="clearfix odd form_field">
<label for="group_name">{$CONST.NAME} <button class="toggle_info button_link" type="button" data-href="#groupName_info"><span class="icon-info-circled"></span><span class="visuallyhidden"> More</span></button></label>
<input id="group_name" name="serendipity[name]" type="text" value="{$from.name|escape:'html'}">
<span id="groupName_info" class="field_info additional_info">Use as uppercased eg. USERLEVEL_EXAMPLE_DESC (change 'EXAMPLE' name)</span>
<span id="groupName_info" class="field_info additional_info">Use as uppercased eg. 'EXAMPLE_GROUP' name, but not as a constant 'USERLEVEL_XYZ' group name.</span>
</div>
<div class="clearfix even form_select">