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

Merge pull request #2643 from rabuzarus/2606_jot_mobile

Browse source 
frio: restructure jot modal and make jot modal work on mobile
This commit is contained in:
Michael Vogel 2016-06-27 11:34:02 +02:00 committed by GitHub
parent f17f0d1b02 571a4fed99
commit a5030f0b60
5 changed files with 119 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
view/theme/frio/css/style.css
View file

@ -69,6 +69,9 @@ iframe, img {
.fakelink { .fakelink {
cursor: pointer; cursor: pointer;
} }
.hidden {
display: none !important;
}
/* /*
* standard page elements * standard page elements
@ -156,6 +159,15 @@ a#item-delete-selected {
outline: 0; outline: 0;
background: $btn_primary_hover_color !important; background: $btn_primary_hover_color !important;
} }
.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
.open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
.open>.dropdown-toggle.btn-primary:hover,.btn-primary.active, .btn-primary:active,
.open>.dropdown-toggle.btn-primary {
background: $btn_primary_hover_color;
border-color: none;
}
.btn-link { .btn-link {
/* color: #6fdbe8;*/ /* color: #6fdbe8;*/
color: $link_color; color: $link_color;

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

@ -224,7 +224,7 @@ function editpost(url) {
url = url + " #profile-jot-form"; url = url + " #profile-jot-form";
//var rand_num = random_digits(12); //var rand_num = random_digits(12);
$(".jot-nav #jot-perms-lnk").parent("li").hide(); $(".jot-nav .jot-perms-lnk").parent("li").addClass("hidden");
// For editpost we load the modal html form the edit page. So we would have two jot forms in // For editpost we load the modal html form the edit page. So we would have two jot forms in
// the page html. To avoid js conflicts we store the original jot in the variable jotcache. // the page html. To avoid js conflicts we store the original jot in the variable jotcache.
@ -241,7 +241,7 @@ function editpost(url) {
jotreset(); jotreset();
modal modal
.find('#jot-modal-body') .find('#jot-modal-content')
.load(url, function (responseText, textStatus) { .load(url, function (responseText, textStatus) {
if ( textStatus === 'success' || if ( textStatus === 'success' ||
textStatus === 'notmodified') textStatus === 'notmodified')
@ -267,7 +267,7 @@ function jotreset() {
// We need this to prevent that the modal displays old content // We need this to prevent that the modal displays old content
$('body').on('hidden.bs.modal', '#jot-modal.edit-jot', function () { $('body').on('hidden.bs.modal', '#jot-modal.edit-jot', function () {
$(this).removeData('bs.modal'); $(this).removeData('bs.modal');
$(".jot-nav #jot-perms-lnk").parent("li").show(); $(".jot-nav .jot-perms-lnk").parent("li").removeClass("hidden");
$("#profile-jot-form #jot-title-wrap").show(); $("#profile-jot-form #jot-title-wrap").show();
$("#profile-jot-form #jot-category-wrap").show(); $("#profile-jot-form #jot-category-wrap").show();
@ -281,14 +281,14 @@ function jotreset() {
// remove the "edit-jot" class so we can the standard behavior on close // remove the "edit-jot" class so we can the standard behavior on close
$("#jot-modal.edit-jot").removeClass("edit-jot"); $("#jot-modal.edit-jot").removeClass("edit-jot");
$("#jot-modal-body").empty(); $("#jot-modal-content").empty();
}); });
} }
// Give the active "jot-nav" list element the class "active" // Give the active "jot-nav" list element the class "active"
function toggleJotNav (elm) { function toggleJotNav (elm) {
// select all li of jot-nav and remove the active class // select all li of jot-nav and remove the active class
$(elm).closest(".jot-nav").children("li").removeClass("active"); $(".jot-nav li").removeClass("active");
// add the active class to the parent of the link which was selected // add the active class to the parent of the link which was selected
$(elm).parent("li").addClass("active"); $(elm).parent("li").addClass("active");
} }

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

@ -206,6 +206,16 @@ $(document).ready(function(){
// put the new element to the second nav bar // put the new element to the second nav bar
$("#topbar-second > .container > #tabmenu").append(newText); $("#topbar-second > .container > #tabmenu").append(newText);
} }
// Dropdown menus with the class "dropdown-head" will display the active tab
// as button text
$("body").on('click', '.dropdown-head .dropdown-menu li a', function(){
$(this).closest(".dropdown").find('.btn').html($(this).text() + ' <span class="caret"></span>');
$(this).closest(".dropdown").find('.btn').val($(this).data('value'));
$(this).closest("ul").children("li").show();
$(this).parent("li").hide();
});
}); });
//function commentOpenUI(obj, id) { //function commentOpenUI(obj, id) {
// $(document).unbind( "click.commentOpen", handler ); // $(document).unbind( "click.commentOpen", handler );

5
view/theme/frio/templates/jot-header.tpl
View file

@ -400,10 +400,9 @@ function enableOnUser(){
jotcache = $("#profile-jot-form"); jotcache = $("#profile-jot-form");
modal modal
.find('#jot-modal-body') .find('#jot-modal-content')
.append(jotcache) .append(jotcache)
.modal.show .modal.show;
;
} }
// the following functions show/hide the specific jot content // the following functions show/hide the specific jot content

182
view/theme/frio/templates/jot.tpl
View file

@ -5,68 +5,100 @@
<div id="jot-content"> <div id="jot-content">
<form id="profile-jot-form" action="{{$action}}" method="post"> <form id="profile-jot-form" action="{{$action}}" method="post">
<div id="profile-jot-wrapper"> <div class="modal-header">
<div> {{* Note: We need 2 modal close buttons here to bypass a bug in bootstrap.
<div id="character-counter" class="grey jothidden text-info pull-left"></div> The second is for mobile view. The first one doesnt work with dropdowns. To get a working close button
<!--<div id="profile-jot-desc" class="jothidden pull-right">&nbsp;</div>--> in with dropdows the close button needs to be inserted after the dropdown. *}}
</div> <button type="button" class="close hidden-xs" data-dismiss="modal" style="float: right;">&times;</button>
<div id="profile-jot-banner-end"></div> {{* The Jot navigation menu (text input, permissions, preview, filebrowser) *}}
<ul class="nav nav-tabs hidden-xs jot-nav" role="menubar" data-tabs="tabs">
{{* The hidden input fields which submit important values with the post *}} {{* Mark the first list entry as active because it is the first which is active after opening
<input type="hidden" name="type" value="{{$ptyp}}" /> the modal. Changing of the activity status is done by js in jot.tpl-header *}}
<input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> <li class="active" role="menuitem"><a id="jot-text-lnk" class="jot-text-lnk" onclick="jotActive(); return false;">{{$message}}</a></li>
<input type="hidden" name="return" value="{{$return_path}}" /> {{if $acl}}<li role="menuitem"><a id="jot-perms-lnk" class="jot-perms-lnk" onclick="aclActive();return false;">{{$shortpermset}}</a></li>{{/if}}
<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" /> {{if $preview}}<li role="menuitem"><a id="jot-preview-lnk" class="jot-preview-lnk" onclick="previewActive();return false;">{{$preview}}</a></li>{{/if}}
<input type="hidden" name="coord" id="jot-coord" value="" /> <li role="menuitem"><a id="jot-browser-link" onclick="fbrowserActive(); return false;">{{$browser}}</a></li>
<input type="hidden" name="post_id" value="{{$post_id}}" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
{{if $notes_cid}}
<input type="hidden" name="contact_allow[]" value="<{{$notes_cid}}>" />
{{/if}}
<div id="jot-title-wrap"><input name="title" id="jot-title" class="jothidden jotforms form-control" type="text" placeholder="{{$placeholdertitle}}" title="{{$placeholdertitle}}" value="{{$title}}" style="display:block;" /></div>
{{if $placeholdercategory}}
<div id="jot-category-wrap"><input name="category" id="jot-category" class="jothidden jotforms form-control" type="text" placeholder="{{$placeholdercategory}}" title="{{$placeholdercategory}}" value="{{$category}}" /></div>
{{/if}}
{{* The jot text field in which the post text is inserted *}}
<div id="jot-text-wrap">
<textarea rows="2" cols="64" class="profile-jot-text form-control" id="profile-jot-text" name="body" onFocus="jotTextOpenUI(this);" onBlur="jotTextCloseUI(this);" style="min-width:100%; max-width:100%;">{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
</div>
<ul id="profile-jot-submit-wrapper" class="jothidden nav nav-pills">
{{* uncomment the button for "wall-immage-upload" because we have integrated it directly in the jot modal
<li><a href="#" id="wall-image-upload" title="{{$upload}}"><i class="fa fa-picture-o"></i></a></li>
*}}
<li><a href="#" onclick="return false;" id="wall-file-upload" title="{{$attach}}"><i class="fa fa-paperclip"></i></a></li>
<li><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="{{$weblink}}"><i class="fa fa-link"></i></a></li>
<li><a id="profile-video" onclick="jotVideoURL();return false;" title="{{$video}}"><i class="fa fa-film"></i></a></li>
<li><a id="profile-audio" onclick="jotAudioURL();return false;" title="{{$audio}}"><i class="fa fa-music"></i></a></li>
<li><a id="profile-location" onclick="jotGetLocation();return false;" title="{{$setloc}}"><i class="fa fa-map-marker"></i></a></li>
<!-- TODO: waiting for a better placement
<li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="{{$noloc}}">{{$shortnoloc}}</a></li>
-->
<li class="pull-right"><button class="btn btn-primary" id="jot-submit" type="submit" id="profile-jot-submit" name="submit" ><i class="fa fa-slideshare fa-fw"></i> {{$share}}</button></li>
<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
</div>
<div id="profile-jot-plugin-wrapper">
{{$jotplugins}}
</div>
</ul> </ul>
<div class="dropdown dropdown-head dropdown-mobile-jot jot-nav hidden-lg hidden-md hidden-sm" role="menubar" data-tabs="tabs" style="float: left;">
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">{{$message}}&nbsp;<span class="caret"></span></button>
<ul class="dropdown-menu nav nav-pills">
{{* mark the first list entry as active because it is the first which is active after opening
the modal. Changing of the activity status is done by js in jot.tpl-header *}}
<li role="menuitem" style="display: none;"><a id="jot-text-lnk-mobile" class="jot-text-lnk" onclick="jotActive(); return false;">{{$message}}</a></li>
{{if $acl}}<li role="menuitem"><a id="jot-perms-lnk-mobile" class="jot-perms-lnk" onclick="aclActive();return false;">{{$shortpermset}}</a></li>{{/if}}
{{if $preview}}<li role="menuitem"><a id="jot-preview-lnk-mobile" class="jot-preview-lnk" onclick="previewActive();return false;">{{$preview}}</a></li>{{/if}}
</ul>
</div>
<button type="button" class="close hidden-lg hidden-md hidden-sm" data-dismiss="modal" style="float: right;">&times;</button>
</div> </div>
<div id="profile-jot-acl-wrapper" style="display: none;"> <div id="jot-modal-body" class="modal-body">
{{$acl}}
<div id="profile-jot-wrapper">
<div>
<div id="character-counter" class="grey jothidden text-info pull-left"></div>
<!--<div id="profile-jot-desc" class="jothidden pull-right">&nbsp;</div>-->
</div>
<div id="profile-jot-banner-end"></div>
{{* The hidden input fields which submit important values with the post *}}
<input type="hidden" name="type" value="{{$ptyp}}" />
<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
<input type="hidden" name="return" value="{{$return_path}}" />
<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="{{$post_id}}" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
{{if $notes_cid}}
<input type="hidden" name="contact_allow[]" value="<{{$notes_cid}}>" />
{{/if}}
<div id="jot-title-wrap"><input name="title" id="jot-title" class="jothidden jotforms form-control" type="text" placeholder="{{$placeholdertitle}}" title="{{$placeholdertitle}}" value="{{$title}}" style="display:block;" /></div>
{{if $placeholdercategory}}
<div id="jot-category-wrap"><input name="category" id="jot-category" class="jothidden jotforms form-control" type="text" placeholder="{{$placeholdercategory}}" title="{{$placeholdercategory}}" value="{{$category}}" /></div>
{{/if}}
{{* The jot text field in which the post text is inserted *}}
<div id="jot-text-wrap">
<textarea rows="2" cols="64" class="profile-jot-text form-control" id="profile-jot-text" name="body" onFocus="jotTextOpenUI(this);" onBlur="jotTextCloseUI(this);" style="min-width:100%; max-width:100%;">{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
</div>
<ul id="profile-jot-submit-wrapper" class="jothidden nav nav-pills">
{{* uncomment the button for "wall-immage-upload" because we have integrated it directly in the jot modal
<li><a href="#" id="wall-image-upload" title="{{$upload}}"><i class="fa fa-picture-o"></i></a></li>
*}}
<li><a href="#" onclick="return false;" id="wall-file-upload" title="{{$attach}}"><i class="fa fa-paperclip"></i></a></li>
<li><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="{{$weblink}}"><i class="fa fa-link"></i></a></li>
<li><a id="profile-video" onclick="jotVideoURL();return false;" title="{{$video}}"><i class="fa fa-film"></i></a></li>
<li><a id="profile-audio" onclick="jotAudioURL();return false;" title="{{$audio}}"><i class="fa fa-music"></i></a></li>
<li><a id="profile-location" onclick="jotGetLocation();return false;" title="{{$setloc}}"><i class="fa fa-map-marker"></i></a></li>
<!-- TODO: waiting for a better placement
<li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="{{$noloc}}">{{$shortnoloc}}</a></li>
-->
<li class="pull-right"><button class="btn btn-primary" id="jot-submit" type="submit" id="profile-jot-submit" name="submit" ><i class="fa fa-slideshare fa-fw"></i> {{$share}}</button></li>
<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
</div>
<div id="profile-jot-plugin-wrapper">
{{$jotplugins}}
</div>
</ul>
</div>
<div id="profile-jot-acl-wrapper" style="display: none;">
{{$acl}}
</div>
<div id="jot-preview-content" style="display:none;"></div>
<div id="jot-fbrowser-wrapper" style="display: none"></div>
{{if $content}}<script>initEditor();</script>{{/if}}
</div> </div>
<div id="jot-preview-content" style="display:none;"></div>
<div id="jot-fbrowser-wrapper" style="display: none"></div>
{{if $content}}<script>initEditor();</script>{{/if}}
</form> </form>
</div> </div>
@ -80,41 +112,7 @@ can load different content into the jot moadl (e.g. the item edit jot)
*}} *}}
<div id="jot-modal" class="modal fade" role="dialog"> <div id="jot-modal" class="modal fade" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div id="jot-modal-content" class="modal-content"></div>
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<!--<h4 class="modal-title">Modal Header</h4>-->
{{* The Jot navigation menu (text input, permissions, preview, filebrowser) *}}
<ul class="nav nav-tabs hidden-xs jot-nav" role="menubar" data-tabs="tabs">
{{* Mark the first list entry as active because it is the first which is active after opening
the modal. Changing of the activity status is done by js in jot.tpl-header *}}
<li class="active" role="menuitem"><a id="jot-text-lnk" onclick="jotActive(); return false;">{{$message}}</a></li>
{{if $acl}}<li role="menuitem"><a id="jot-perms-lnk" onclick="aclActive();return false;">{{$shortpermset}}</a></li>{{/if}}
{{if $preview}}<li role="menuitem"><a id="jot-preview-lnk" onclick="previewActive();return false;">{{$preview}}</a></li>{{/if}}
<li role="menuitem"><a id="jot-preview-link" onclick="fbrowserActive(); return false;">{{$browser}}</a></li>
</ul>
<div class="dropdown hidden-lg hidden-md hidden-sm" role="menubar" data-tabs="tabs">
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown"> JOT
<span class="caret"></span></button>
<ul class="dropdown-menu nav nav-pills">
{{* mark the first list entry as active because it is the first which is active after opening
the modal. Changing of the activity status is done by js in jot.tpl-header *}}
<li class="active" role="menuitem"><a id="jot-text-lnk-mobile" onclick="jotActive(); return false;">{{$message}}</a></li>
{{if $acl}}<li role="menuitem"><a id="jot-perms-lnk-mobile" onclick="aclActive();return false;"{{$shortpermset}}</a></li>{{/if}}
{{if $preview}}<li role="menuitem"><a id="jot-preview-lnk-mobile" onclick="previewActive();return false;">{{$preview}}</a></li>{{/if}}
</ul>
</div>
</div>
<div id="jot-modal-body" class="modal-body">
<!-- End Modal -->
</div>
</div>
</div> </div>
</div> </div>