friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-12 04:09:40 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

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

Browse source 
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

70
view/theme/smoothly/jot-header.tpl
View file

@ -1,22 +1,23 @@
<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
var editor=false; var editor=false;
var textlen = 0; var textlen = 0;
var plaintext = '$editselect'; var plaintext = '$editselect';
function initEditor(cb) { function initEditor(cb){
if (editor==false) { if (editor==false){
$("#profile-jot-text-loading").show(); $("#profile-jot-text-loading").show();
if(plaintext == 'none') { if(plaintext == 'none') {
$("#profile-jot-text-loading").hide(); $("#profile-jot-text-loading").hide();
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$(".jothidden").show(); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true; $(".jothidden").show();
$("a#jot-perms-icon").fancybox({ editor = true;
'transitionIn' : 'elastic', $("a#jot-perms-icon").fancybox({
'transitionOut' : 'elastic' 'transitionIn' : 'elastic',
}); 'transitionOut' : 'elastic'
});
$("#profile-jot-submit-wrapper").show(); $("#profile-jot-submit-wrapper").show();
{{ if $newpost }} {{ if $newpost }}
$("#profile-upload-wrapper").show(); $("#profile-upload-wrapper").show();
@ -32,8 +33,8 @@ function initEditor(cb) {
{{ endif }} {{ endif }}
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();
return; return;
} }
tinyMCE.init({ tinyMCE.init({
theme : "advanced", theme : "advanced",
@ -89,7 +90,7 @@ function initEditor(cb) {
$('#profile-jot-desc').html('&nbsp;'); $('#profile-jot-desc').html('&nbsp;');
} }
//Character count //Character count
if(textlen <= 140) { if(textlen <= 140) {
$('#character-counter').removeClass('red'); $('#character-counter').removeClass('red');
@ -140,18 +141,26 @@ function initEditor(cb) {
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();
} }
} // initEditor } // 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(){
if (editor) return;
$(this).val("");
initEditor();
});
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( var uploader = new window.AjaxUpload(
'wall-image-upload', 'wall-image-upload',
@ -164,6 +173,7 @@ function initEditor(cb) {
} }
} }
); );
var file_uploader = new window.AjaxUpload( var file_uploader = new window.AjaxUpload(
'wall-file-upload', 'wall-file-upload',
{ action: 'wall_attach/$nickname', { action: 'wall_attach/$nickname',
@ -328,9 +338,9 @@ function initEditor(cb) {
if(reply && reply.length) { if(reply && reply.length) {
commentBusy = true; commentBusy = true;
$('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$.get('filer/' + id + '?term=' + reply); $.get('filer/' + id + '?term=' + reply, NavUpdate);
if(timer) clearTimeout(timer); // if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000); // timer = setTimeout(NavUpdate,3000);
liking = 1; liking = 1;
$.fancybox.close(); $.fancybox.close();
} else { } else {

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

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

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

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