keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #86 from simonlnu/master

Browse source 
more dispy
This commit is contained in:
Simon 2012-03-05 09:23:01 -08:00
commit fd240687b9
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
view/theme/dispy/jot-header.tpl
View file

@ -19,15 +19,11 @@ function initEditor(cb) {
'transitionOut' : 'elastic' 'transitionOut' : 'elastic'
}); });
$(".jothidden").show(); $(".jothidden").show();
if (typeof cb!="undefined") { if (typeof cb!="undefined") cb();
cb();
}
return; return;
} }
tinyMCE.init({ tinyMCE.init({
theme : "advanced", theme : "advanced",
skin : "default",
mode : "specific_textareas", mode : "specific_textareas",
editor_selector: $editselect, editor_selector: $editselect,
auto_focus: "profile-jot-text", auto_focus: "profile-jot-text",
@ -51,9 +47,8 @@ function initEditor(cb) {
setup : function(ed) { setup : function(ed) {
cPopup = null; cPopup = null;
ed.onKeyDown.add(function(ed,e) { ed.onKeyDown.add(function(ed,e) {
if(cPopup !== null) { if(cPopup !== null)
cPopup.onkey(e); cPopup.onkey(e);
}
}); });
ed.onKeyUp.add(function(ed, e) { ed.onKeyUp.add(function(ed, e) {
@ -64,7 +59,7 @@ function initEditor(cb) {
cPopup = new ACPopup(this,baseurl+"/acl"); cPopup = new ACPopup(this,baseurl+"/acl");
} }
if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]); if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
if(! cPopup.ready) { cPopup = null; } if(! cPopup.ready) cPopup = null;
} }
else { else {
if(cPopup !== null) { cPopup.close(); cPopup = null; } if(cPopup !== null) { cPopup.close(); cPopup = null; }
@ -102,9 +97,9 @@ function initEditor(cb) {
ed.pasteAsPlainText = true; ed.pasteAsPlainText = true;
$("#profile-jot-text-loading").hide(); $("#profile-jot-text-loading").hide();
$(".jothidden").show(); $(".jothidden").show();
if (typeof cb!="undefined") cb();
if (typeof cb!="undefined") { cb(); }
}); });
} }
}); });
editor = true; editor = true;
@ -121,7 +116,7 @@ function initEditor(cb) {
function charCounter() { function charCounter() {
// character count part deux // character count part deux
$('#profile-jot-text').keyup(function(event) { $('#profile-jot-text').keyup(function(event) {
var textlen = $(this).val().length(); var textlen = $('#profile-jot-text').val().length();
var maxLen1 = 140; var maxLen1 = 140;
var maxLen2 = 420; var maxLen2 = 420;
@ -141,7 +136,7 @@ function charCounter() {
$('#character-counter').removeClass('orange'); $('#character-counter').removeClass('orange');
$('#character-counter').addClass('red'); $('#character-counter').addClass('red');
} }
$('#character-counter').html($(this).val().length); $('#character-counter').html($('#profile-jot-text').val().length);
}); });
} }
@ -149,7 +144,6 @@ function enableOnUser(){
if (editor) return; if (editor) return;
$(this).val(""); $(this).val("");
initEditor(); initEditor();
charCounter();
} }
</script> </script>
@ -163,6 +157,8 @@ function enableOnUser(){
/* enable tinymce on focus and click */ /* enable tinymce on focus and click */
$("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser); $("#profile-jot-text").click(enableOnUser);
$("#profile-jot-text").focus(charCounter);
$("#profile-jot-text").click(charCounter);
var uploader = new window.AjaxUpload( var uploader = new window.AjaxUpload(
'wall-image-upload', 'wall-image-upload',

10
view/theme/dispy/style.css
View file

@ -611,8 +611,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
**/ **/
aside { aside {
position: absolute; position: absolute;
right: 8%; right: 15px;
width: 20.5%; width: 255px;
font-size: smaller; font-size: smaller;
} }
.vcard .fn { .vcard .fn {
@ -672,7 +672,7 @@ aside #viewcontacts {
**/ **/
#jot { #jot {
/*width: 785px;*/ /*width: 785px;*/
margin: 0px 0 20px 0px; margin: 10px 0 20px 0px;
width: 100%; width: 100%;
} }
#jot #jot-tools { #jot #jot-tools {
@ -956,7 +956,7 @@ aside #viewcontacts {
* section * section
*/ */
section { section {
margin: 20px 8% 0 6%; margin: 20px 5% 0 6%;
font-size: 0.8em; font-size: 0.8em;
padding-right: 250px; padding-right: 250px;
min-width: 475px; min-width: 475px;
@ -965,7 +965,7 @@ section {
/** tabs **/ /** tabs **/
.tabs { .tabs {
list-style: none; list-style: none;
margin: 0; margin: 10px 0 10px;
padding: 0; padding: 0;
border-bottom: 1px solid #729fcf; border-bottom: 1px solid #729fcf;
font-size: 14px; font-size: 14px;