##// END OF EJS Templates
settings: Use the old layout to display labs settings.
Martin Bornhold -
r365:33288bb9 default
parent child Browse files
Show More
@@ -219,15 +219,24 b''
219 % if c.labs_active and (display_globals or repo_type in ['hg']):
219 % if c.labs_active and (display_globals or repo_type in ['hg']):
220 <div class="panel panel-danger">
220 <div class="panel panel-danger">
221 <div class="panel-heading">
221 <div class="panel-heading">
222 <h3 class="panel-title">${_('Labs settings')}</h3>
222 <h3 class="panel-title">${_('Labs settings')}: ${_('These features are considered experimental and may not work as expected.')}</h3>
223 </div>
223 </div>
224 <div class="panel-body">
224 <div class="panel-body">
225 <div class="fields">
226
227 <div class="field">
228 <div class="label">
229 <label>${_('Mercurial server-side merge')}:</label>
230 </div>
231 <div class="checkboxes">
225 <div class="checkbox">
232 <div class="checkbox">
226 ${h.checkbox('rhodecode_hg_use_rebase_for_merging' + suffix, 'True', **kwargs)}
233 ${h.checkbox('rhodecode_hg_use_rebase_for_merging' + suffix, 'True', **kwargs)}
227 <label for="rhodecode_hg_use_rebase_for_merging${suffix}">${_('Mercurial server-side merge')}</label>
234 <label for="rhodecode_hg_use_rebase_for_merging${suffix}">${_('Use rebase instead of creating a merge commit when merging via web interface')}</label>
228 </div>
235 </div>
229 <div class="label">
236 <!-- <p class="help-block">Help message here</p> -->
230 <span class="help-block">${_('Use rebase instead of creating a merge commit when merging via web interface')}</span>
237 </div>
238 </div>
239
231 </div>
240 </div>
232 </div>
241 </div>
233 </div>
242 </div>
General Comments 0
You need to be logged in to leave comments. Login now