Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 a7796bec1be01b51f400e9a3a698535b12b636aa

 interface/web/help/templates/support_message_edit.htm

@@ -9,15 +9,14 @@
                <label for="recipient_id" class="col-sm-3 control-label">{tmpl_var name='recipient_id_txt'}</label>
                <div class="col-sm-9"><select name="recipient_id" id="recipient_id" class="form-control">
                    {tmpl_var name='recipient_id'}
                </select>
            </div></div>
                </select></div>
            </div>
            <div class="form-group">
                <label for="subject" class="col-sm-3 control-label">{tmpl_var name='subject_txt'}</label>
                <div class="col-sm-9"><input type="text" name="subject" id="subject" value="{tmpl_var name='subject'}" class="form-control" />
            </div></div>
                <div class="col-sm-9"><input type="text" name="subject" id="subject" value="{tmpl_var name='subject'}" class="form-control" /></div></div>
            <div class="form-group">
                <label for="message" class="col-sm-3 control-label">{tmpl_var name='message_txt'}</label>
                <div class="col-sm-9"><textarea name="message" id="message" rows='10' cols='30'>{tmpl_var name='message'}</textarea></div>
                <div class="col-sm-9"><textarea class="form-control" name="message" id="message" rows='10' cols='30'>{tmpl_var name='message'}</textarea></div>
            </div>
        

@@ -25,6 +24,6 @@
        <input type="hidden" name="tstamp" value="{tmpl_var name='tstamp'}">

        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','help/support_message_edit.php');">{tmpl_var name='btn_save_txt'}</button>
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="help/support_message_edit.php">{tmpl_var name='btn_save_txt'}</button>
            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="help/support_message_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>