github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-11-29 08:54:31 -05:00
Code Issues Projects Releases Packages Wiki Activity

LDAP signin form moved to main signin-modal

Browse source 
- previously was a separate modal
- now is located on main modal, like email auth
This commit is contained in:
alecdwm 2016-12-14 12:42:42 +01:00
parent fc8d709afb
commit 72a0e90f7d
4 changed files with 24 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
locales/en.json
View file

@ -100,6 +100,5 @@
"Select From Available Snippets": "Select From Available Snippets", "Select From Available Snippets": "Select From Available Snippets",
"OR": "OR", "OR": "OR",
"Export to Snippet": "Export to Snippet", "Export to Snippet": "Export to Snippet",
"Select Visibility Level": "Select Visibility Level", "Select Visibility Level": "Select Visibility Level"
"LDAP Sign in": "LDAP Sign in"
} }

1
public/views/index.ejs
View file

@ -192,7 +192,6 @@
</div> </div>
</div> </div>
<%- include signin-modal %> <%- include signin-modal %>
<%- include signin-ldap-modal %>
<% if(useCDN) { %> <% if(useCDN) { %>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>

35
public/views/signin-ldap-modal.ejs
View file

@ -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">&times;</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>

27
public/views/signin-modal.ejs
View file

@ -38,12 +38,31 @@
<i class="fa fa-google"></i> <%= __('Sign in via %s', 'Google') %> <i class="fa fa-google"></i> <%= __('Sign in via %s', 'Google') %>
</a> </a>
<% } %> <% } %>
<% if((facebook || twitter || github || gitlab || dropbox || google) && ldap) { %>
<hr>
<% }%>
<% if(ldap) { %> <% if(ldap) { %>
<a type="button" class="btn btn-lg btn-block btn-social btn-reddit "data-toggle="modal" data-target=".signin-ldap-modal"> <h4>Via LDAP</h4>
<i class="fa fa-book"></i> <%= __('Sign in via %s', 'LDAP') %> <form data-toggle="validator" role="form" class="form-horizontal" method="post" enctype="application/x-www-form-urlencoded">
</a> <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) { %> <% if((facebook || twitter || github || gitlab || dropbox || google || ldap) && email) { %>
<hr> <hr>
<% }%> <% }%>