strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

use js/modal.js to show Login page in modal

Browse source
This commit is contained in:
fabrixxm 2016-06-11 09:58:26 +02:00
parent f8c62f0407
commit 2ec06c1a38
3 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
view/theme/frio/js/modal.js
View file

@ -50,7 +50,11 @@ $(document).ready(function(){
} }
}); });
// Navbar login
$("body").on("click", "#nav-login", function(e){
e.preventDefault();
Dialog.show(this.href, this.dataset.originalTitle || this.title);
});
// Jot nav menu. // Jot nav menu.
$("body").on("click", "#jot-modal .jot-nav li a", function(e){ $("body").on("click", "#jot-modal .jot-nav li a", function(e){
@ -81,8 +85,9 @@ $(document).ready(function(){
}); });
// overwrite Dialog.show from main js to load the filebrowser into a bs modal // overwrite Dialog.show from main js to load the filebrowser into a bs modal
Dialog.show = function(url) { Dialog.show = function(url, title="") {
var modal = $('#modal').modal(); var modal = $('#modal').modal();
modal.find("#modal-header h4").html(title);
modal modal
.find('#modal-body') .find('#modal-body')
.load(url, function (responseText, textStatus) { .load(url, function (responseText, textStatus) {
@ -129,6 +134,7 @@ Dialog._load = function(url) {
// try to fetch the hash form the url // try to fetch the hash form the url
var match = url.match(/fbrowser\/[a-z]+\/\?mode=none(.*)/); var match = url.match(/fbrowser\/[a-z]+\/\?mode=none(.*)/);
if (match===null) return; //not fbrowser
var hash = match[1]; var hash = match[1];
// initialize the filebrowser // initialize the filebrowser

22
view/theme/frio/templates/nav.tpl
View file

@ -240,29 +240,17 @@
<div class="hidden-sm hidden-xs"> <div class="hidden-sm hidden-xs">
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li><a href="register" data-toggle="tooltip" title="{{$register.title}}"><i class="fa fa-street-view fa-fw"></i> {{$register.desc}}</a></li> <li><a href="register" data-toggle="tooltip" title="{{$register.title}}"><i class="fa fa-street-view fa-fw"></i> {{$register.desc}}</a></li>
<li data-toggle="tooltip" title="{{$nav.login.3}}"> <li>
<a href="login?mode=none" <a href="login?mode=none" id="nav-login"
data-remote="false" data-toggle="modal" data-target="#loginModal" data-toggle="tooltip" title="{{$nav.login.3}}">
><i class="fa fa-sign-in fa-fw"></i></a> <i class="fa fa-sign-in fa-fw"></i>
</a>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
</nav> </nav>
<div class="modal fade" id="loginModal" tabindex="-1" role="dialog" aria-labelledby="loginModalLabel" aria-hidden="true">
<div class="modal-dialog">
<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="myModalLabel">{{$nav.login.3}}</h4>
</div>
<div class="modal-body">
...
</div>
</div>
</div>
</div>
{{/if}} {{/if}}
{{* The second navbar which contains nav points of the actual page - (nav points are actual handled by this theme throug js *}} {{* The second navbar which contains nav points of the actual page - (nav points are actual handled by this theme throug js *}}

6
view/theme/frio/templates/nav_head.tpl
View file

@ -2,11 +2,5 @@
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$("#nav-search-input-field").search_autocomplete(baseurl + '/acl'); $("#nav-search-input-field").search_autocomplete(baseurl + '/acl');
$("#loginModal").on("show.bs.modal", function(e) {
var link = $(e.relatedTarget);
$(this).find(".modal-body").load(link.attr("href"));
});
}); });
</script> </script>