clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modified: view/theme/smoothly/jot-header.tpl 

modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
This commit is contained in:
pixelroot 2012-11-13 16:36:36 +01:00
parent ce12b3d2f0
commit 0e2fdee20e
3 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
view/theme/smoothly/jot-header.tpl
View File

@ -1,4 +1,4 @@
<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
<script language="javascript" type="text/javascript">
var editor=false;
@ -11,6 +11,7 @@ function initEditor(cb) {
if(plaintext == 'none') {
$("#profile-jot-text-loading").hide();
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
$(".jothidden").show();
editor = true;
$("a#jot-perms-icon").fancybox({
@ -140,18 +141,26 @@ function initEditor(cb) {
if (typeof cb!="undefined") cb();
}
} // initEditor
</script>
<script type="text/javascript" src="js/ajaxupload.js" ></script>
<script>
var ispublic = '$ispublic';
$(document).ready(function() {
/* enable tinymce on focus */
$("#profile-jot-text").focus(function(){
function enableOnUser(){
if (editor) return;
$(this).val("");
initEditor();
});
}
</script>
<script type="text/javascript" src="js/ajaxupload.js" >
</script>
<script>
var ispublic = '$ispublic';
$(document).ready(function() {
/* enable tinymce on focus and click */
$("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser);
var uploader = new window.AjaxUpload(
'wall-image-upload',
@ -164,6 +173,7 @@ function initEditor(cb) {
}
}
);
var file_uploader = new window.AjaxUpload(
'wall-file-upload',
{ action: 'wall_attach/$nickname',
@ -328,9 +338,9 @@ function initEditor(cb) {
if(reply && reply.length) {
commentBusy = true;
$('body').css('cursor', 'wait');
$.get('filer/' + id + '?term=' + reply);
if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);
$.get('filer/' + id + '?term=' + reply, NavUpdate);
// if(timer) clearTimeout(timer);
// timer = setTimeout(NavUpdate,3000);
liking = 1;
$.fancybox.close();
} else {

3
view/theme/smoothly/style.css
View File

@ -2,7 +2,7 @@
style.css
Smoothly
Created by alex@friendica.pixelbits.de on 2012-11-12
Created by alex@friendica.pixelbits.de on 2012-11-13
** Colors **
Blue links - #1873a2
@ -4204,7 +4204,6 @@ div.wall-item-content-wrapper.shiny {
#profile-upload-wrapper,
#wall-image-upload-div,
#wall-file-upload-div,
.hover,
.focus {
cursor: pointer;

2
view/theme/smoothly/theme.php
View File

@ -3,7 +3,7 @@
/*
* Name: Smoothly
* Description: Like coffee with milk. Theme works fine with iPad[2].
* Version: Version 0.11.12
* Version: Version 0.11.13
* Author: Alex <https://friendica.pixelbits.de/profile/alex>
* Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
* Screenshot: <a href="screenshot.png">Screenshot</a>