Files
@ 631e8000eae8
Branch filter:
Location: kallithea/rhodecode/templates/admin/ldap/ldap.html - annotation
631e8000eae8
4.2 KiB
text/html
diff parser: match the header order of hg diff --git patches
The output might look like:
diff --git a/A b/B
old mode 100644
new mode 100755
rename from A
rename to B
--- a/A
+++ b/B
Such files were shown as 'modified binary file chmod 100644 => 100755' without
diff.
Now the chmod and diff will be shown ... but still not the rename.
Correct parsing of headers do require a better parser - one do not just use a
regexp.
The output might look like:
diff --git a/A b/B
old mode 100644
new mode 100755
rename from A
rename to B
--- a/A
+++ b/B
Such files were shown as 'modified binary file chmod 100644 => 100755' without
diff.
Now the chmod and diff will be shown ... but still not the rename.
Correct parsing of headers do require a better parser - one do not just use a
regexp.
4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 1f334a68d057 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 f91d3f9b7230 4bdcc08b04c4 ec6354949623 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 f91d3f9b7230 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 c20adbaf16af 4bdcc08b04c4 b232a36cc51f a1ab3e9c7e82 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 74685a31cc43 74685a31cc43 b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f c20adbaf16af b232a36cc51f 4bdcc08b04c4 4bdcc08b04c4 4bdcc08b04c4 b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f c20adbaf16af b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f b232a36cc51f f91d3f9b7230 4bdcc08b04c4 7ae36df760ce f91d3f9b7230 4bdcc08b04c4 f91d3f9b7230 f91d3f9b7230 4bdcc08b04c4 f91d3f9b7230 | ## -*- coding: utf-8 -*-
<%inherit file="/base/base.html"/>
<%def name="title()">
${_('LDAP administration')} · ${c.rhodecode_name}
</%def>
<%def name="breadcrumbs_links()">
${h.link_to(_('Admin'),h.url('admin_home'))}
»
${_('LDAP')}
</%def>
<%def name="page_nav()">
${self.menu('admin')}
</%def>
<%def name="main()">
<div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
</div>
${h.form(url('ldap_settings'))}
<div class="form">
<div class="fields">
<h3>${_('Connection settings')}</h3>
<div class="field">
<div class="label label-checkbox"><label for="ldap_active">${_('Enable LDAP')}</label></div>
<div class="checkboxes"><div class="checkbox">${h.checkbox('ldap_active',True,class_='small')}</div></div>
</div>
<div class="field">
<div class="label"><label for="ldap_host">${_('Host')}</label></div>
<div class="input">${h.text('ldap_host',class_='small')}</div>
</div>
<div class="field">
<div class="label"><label for="ldap_port">${_('Port')}</label></div>
<div class="input">${h.text('ldap_port',class_='small')}</div>
</div>
<div class="field">
<div class="label"><label for="ldap_dn_user">${_('Account')}</label></div>
<div class="input">${h.text('ldap_dn_user',class_='small')}</div>
</div>
<div class="field">
<div class="label"><label for="ldap_dn_pass">${_('Password')}</label></div>
<div class="input">${h.password('ldap_dn_pass',class_='small')}</div>
</div>
<div class="field">
<div class="label"><label for="ldap_tls_kind">${_('Connection security')}</label></div>
<div class="select">${h.select('ldap_tls_kind',c.tls_kind_cur,c.tls_kind_choices,class_='small')}</div>
</div>
<div class="field">
<div class="label"><label for="ldap_tls_reqcert">${_('Certificate Checks')}</label></div>
<div class="select">${h.select('ldap_tls_reqcert',c.tls_reqcert_cur,c.tls_reqcert_choices,class_='small')}</div>
</div>
<h3>${_('Search settings')}</h3>
<div class="field">
<div class="label"><label for="ldap_base_dn">${_('Base DN')}</label></div>
<div class="input">${h.text('ldap_base_dn',class_='small')}</div>
</div>
<div class="field">
<div class="label"><label for="ldap_filter">${_('LDAP Filter')}</label></div>
<div class="input">${h.text('ldap_filter',class_='small')}</div>
</div>
<div class="field">
<div class="label"><label for="ldap_search_scope">${_('LDAP Search Scope')}</label></div>
<div class="select">${h.select('ldap_search_scope',c.search_scope_cur,c.search_scope_choices,class_='small')}</div>
</div>
<h3>${_('Attribute mappings')}</h3>
<div class="field">
<div class="label"><label for="ldap_attr_login">${_('Login Attribute')}</label></div>
<div class="input">${h.text('ldap_attr_login',class_='small')}</div>
</div>
<div class="field">
<div class="label"><label for="ldap_attr_firstname">${_('First Name Attribute')}</label></div>
<div class="input">${h.text('ldap_attr_firstname',class_='small')}</div>
</div>
<div class="field">
<div class="label"><label for="ldap_attr_lastname">${_('Last Name Attribute')}</label></div>
<div class="input">${h.text('ldap_attr_lastname',class_='small')}</div>
</div>
<div class="field">
<div class="label"><label for="ldap_attr_email">${_('E-mail Attribute')}</label></div>
<div class="input">${h.text('ldap_attr_email',class_='small')}</div>
</div>
<div class="buttons">
${h.submit('save',_('Save'),class_="ui-btn large")}
</div>
</div>
</div>
${h.end_form()}
</div>
</%def>
|