diff options
| -rw-r--r-- | locales/en.json | 3 | ||||
| -rw-r--r-- | public/views/index.ejs | 1 | ||||
| -rw-r--r-- | public/views/signin-ldap-modal.ejs | 35 | ||||
| -rw-r--r-- | public/views/signin-modal.ejs | 27 |
4 files changed, 24 insertions, 42 deletions
diff --git a/locales/en.json b/locales/en.json index dda317f1..f1f0d140 100644 --- a/locales/en.json +++ b/locales/en.json @@ -100,6 +100,5 @@ "Select From Available Snippets": "Select From Available Snippets", "OR": "OR", "Export to Snippet": "Export to Snippet", - "Select Visibility Level": "Select Visibility Level", - "LDAP Sign in": "LDAP Sign in" + "Select Visibility Level": "Select Visibility Level" }
\ No newline at end of file diff --git a/public/views/index.ejs b/public/views/index.ejs index baca1417..39674b02 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -192,7 +192,6 @@ </div> </div> <%- include signin-modal %> - <%- include signin-ldap-modal %> <% if(useCDN) { %> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script> diff --git a/public/views/signin-ldap-modal.ejs b/public/views/signin-ldap-modal.ejs deleted file mode 100644 index 6a665f17..00000000 --- a/public/views/signin-ldap-modal.ejs +++ /dev/null @@ -1,35 +0,0 @@ -<!-- signin ldap modal --> -<div class="modal fade signin-ldap-modal" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true"> - <div class="modal-dialog modal-sm"> - <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span> - </button> - <h4 class="modal-title" id="mySmallModalLabel"><%= __('LDAP Sign in') %></h4> - </div> - <div class="modal-body" style="text-align: center;"> - <% if(ldap) { %> - <form data-toggle="validator" role="form" class="form-horizontal" method="post" enctype="application/x-www-form-urlencoded"> - <div class="form-group"> - <div class="col-sm-12"> - <input type="username" class="form-control" name="username" placeholder="Username" required> - <span class="help-block control-label with-errors" style="display: inline;"></span> - </div> - </div> - <div class="form-group"> - <div class="col-sm-12"> - <input type="password" class="form-control" name="password" placeholder="Password" required> - <span class="help-block control-label with_errors" style="display: inline;"></span> - </div> - </div> - <div class="form-group"> - <div class="col-sm-12"> - <button type="submit" class="btn btn-primary" formaction="<%- url %>/auth/ldap">Sign in</button> - </div> - </div> - </form> - <% } %> - </div> - </div> - </div> -</div> diff --git a/public/views/signin-modal.ejs b/public/views/signin-modal.ejs index ba6c57ff..e71b09c6 100644 --- a/public/views/signin-modal.ejs +++ b/public/views/signin-modal.ejs @@ -38,12 +38,31 @@ <i class="fa fa-google"></i> <%= __('Sign in via %s', 'Google') %> </a> <% } %> + <% if((facebook || twitter || github || gitlab || dropbox || google) && ldap) { %> + <hr> + <% }%> <% if(ldap) { %> - <a type="button" class="btn btn-lg btn-block btn-social btn-reddit "data-toggle="modal" data-target=".signin-ldap-modal"> - <i class="fa fa-book"></i> <%= __('Sign in via %s', 'LDAP') %> - </a> + <h4>Via LDAP</h4> + <form data-toggle="validator" role="form" class="form-horizontal" method="post" enctype="application/x-www-form-urlencoded"> + <div class="form-group"> + <div class="col-sm-12"> + <input type="username" class="form-control" name="username" placeholder="Username" required> + <span class="help-block control-label with-errors" style="display: inline;"></span> + </div> + </div> + <div class="form-group"> + <div class="col-sm-12"> + <input type="password" class="form-control" name="password" placeholder="Password" required> + <span class="help-block control-label with_errors" style="display: inline;"></span> + </div> + </div> + <div class="form-group"> + <div class="col-sm-12"> + <button type="submit" class="btn btn-primary" formaction="<%- url %>/auth/ldap">Sign in</button> + </div> + </div> + </form> <% } %> - <% if((facebook || twitter || github || gitlab || dropbox || google || ldap) && email) { %> <hr> <% }%> |