diff options
| author | Simon Rettberg | 2014-10-16 14:35:39 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-10-16 14:35:39 +0200 |
| commit | fd00aabfae44d2b5dc2a6e554ef8884fe5615d4d (patch) | |
| tree | 5fe59827a58bf614a939793c32258ee6afcced5e /templates | |
| parent | Show notice in menu bar if setup is incomplete (diff) | |
| download | slx-admin-fd00aabfae44d2b5dc2a6e554ef8884fe5615d4d.tar.gz slx-admin-fd00aabfae44d2b5dc2a6e554ef8884fe5615d4d.tar.xz slx-admin-fd00aabfae44d2b5dc2a6e554ef8884fe5615d4d.zip | |
AD-Setup now supports short name domain\account instead of just DN
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/sysconfig/ad-checkconnection.html | 32 | ||||
| -rw-r--r-- | templates/sysconfig/ad-start.html | 30 |
2 files changed, 37 insertions, 25 deletions
diff --git a/templates/sysconfig/ad-checkconnection.html b/templates/sysconfig/ad-checkconnection.html index e321dc6e..eb4afea2 100644 --- a/templates/sysconfig/ad-checkconnection.html +++ b/templates/sysconfig/ad-checkconnection.html @@ -3,6 +3,7 @@ </p> <div id="zeug"> + <div data-tm-id="{{self-search}}" data-tm-log="messages" data-tm-callback="selfCb">LDAP Self-Query</div> <div data-tm-id="{{tm-search}}" data-tm-log="messages" data-tm-callback="ldapCb">LDAP Test-Query</div> </div> <br> @@ -22,22 +23,33 @@ <input type="hidden" name="token" value="{{token}}"> <input name="server" value="{{server}}" type="hidden"> <input name="searchbase" value="{{searchbase}}" type="hidden"> - <input name="binddn" value="{{binddn}}" type="hidden"> + <input id="setdn" name="binddn" value="{{binddn}}" type="hidden"> <input name="bindpw" value="{{bindpw}}" type="hidden"> <input name="home" value="{{home}}" type="hidden"> + <input name="originalbinddn" value="{{binddn}}" type="hidden"> <button id="nextbutton" type="submit" class="btn btn-primary">{{lang_skip}} »</button> </form> </div> <script type="text/javascript"> -function ldapCb(task) -{ - if (!task || !task.statusCode) - return; - if (task.statusCode === 'TASK_FINISHED') { - $('#nextbutton').html('Weiter »'); + function ldapCb(task) + { + if (!task || !task.statusCode) + return; + if (task.statusCode === 'TASK_FINISHED') { + $('#nextbutton').html('Weiter »'); + } + if (task.statusCode === 'TASK_ERROR' || task.statusCode === 'PARENT_FAILED') { + $('#nextbutton').html('Trotzdem weiter »'); + } } - if (task.statusCode === 'TASK_ERROR' || task.statusCode === 'PARENT_FAILED') { - $('#nextbutton').html('Trotzdem weiter »'); + function selfCb(task) + { + if (!task || !task.statusCode) + return; + if (task.statusCode === 'TASK_FINISHED' && task.data && task.data.dn) { + $('#setdn').val(task.data.dn); + } else { + $('#nextbutton').html('Trotzdem weiter »'); + } } -} </script> diff --git a/templates/sysconfig/ad-start.html b/templates/sysconfig/ad-start.html index c3606825..f14f639b 100644 --- a/templates/sysconfig/ad-start.html +++ b/templates/sysconfig/ad-start.html @@ -13,32 +13,32 @@ <form role="form" method="post" action="?do=SysConfig&action=addmodule&step={{step}}"> <input type="hidden" name="token" value="{{token}}"> <div class="input-group"> - <span class="input-group-addon slx-ga">Server </span> + <span class="input-group-addon slx-ga">Server *</span> <input tabindex="1" name="server" value="{{server}}" type="text" class="form-control" placeholder="dc0.institution.example.com"> - <span class="input-group-btn"> + <!--span class="input-group-btn"> <a class="btn btn-default"><span class="glyphicon glyphicon-question-sign"></span></a> - </span> + </span--> </div> <div class="input-group"> - <span class="input-group-addon slx-ga">{{lang_searchBase}}</span> - <input tabindex="2" name="searchbase" value="{{searchbase}}" type="text" class="form-control" placeholder="dc=windows,dc=hs-beispiel,dc=de"> - <span class="input-group-btn"> + <span class="input-group-addon slx-ga">{{lang_bindDN}} *</span> + <input tabindex="2" name="binddn" value="{{binddn}}" type="text" class="form-control" placeholder="domain\bwlp *ODER* CN=bwlp,OU=Benutzer,DC=domain,DC=hs-beispiel,DC=de"> + <!--span class="input-group-btn"> <a class="btn btn-default"><span class="glyphicon glyphicon-question-sign"></span></a> - </span> + </span--> </div> <div class="input-group"> - <span class="input-group-addon slx-ga">{{lang_bindDN}}</span> - <input tabindex="3" name="binddn" value="{{binddn}}" type="text" class="form-control" placeholder="CN=bwlehrpool user,OU=Benutzer,OU=Gruppe XYZ,DC=windows,DC=hs-beispiel,DC=de"> - <span class="input-group-btn"> + <span class="input-group-addon slx-ga">{{lang_password}} *</span> + <input tabindex="3" name="bindpw" value="{{bindpw}}" type="text" class="form-control" placeholder="{{lang_password}}"> + <!--span class="input-group-btn"> <a class="btn btn-default"><span class="glyphicon glyphicon-question-sign"></span></a> - </span> + </span--> </div> <div class="input-group"> - <span class="input-group-addon slx-ga">{{lang_password}}</span> - <input tabindex="4" name="bindpw" value="{{bindpw}}" type="text" class="form-control" placeholder="{{lang_password}}"> - <span class="input-group-btn"> + <span class="input-group-addon slx-ga">{{lang_searchBase}}</span> + <input tabindex="4" name="searchbase" value="{{searchbase}}" type="text" class="form-control" placeholder="dc=windows,dc=hs-beispiel,dc=de"> + <!--span class="input-group-btn"> <a class="btn btn-default"><span class="glyphicon glyphicon-question-sign"></span></a> - </span> + </span--> </div> <br> <div class="input-group"> |