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

Merge pull request #75 from simonlnu/master

Browse source 
theme tweaks
This commit is contained in:
Simon 2012-03-04 02:02:15 -08:00
commit a7b637b933
2 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,10 +4,11 @@
var editor=false; var editor=false;
var textlen = 0; var textlen = 0;
var plaintext = '$editselect'; var plaintext = '$editselect';
// this is here because of the silly tinymce error. didn't help.
var skin = 'default'; var skin = 'default';
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();
@ -23,6 +24,7 @@ function initEditor(cb){
} }
return; return;
} }
tinyMCE.init({ tinyMCE.init({
theme : "advanced", theme : "advanced",
skin : "default", skin : "default",
@ -100,7 +102,36 @@ 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(); }
// character count part deux
//
// get # of chars
var textlen = $('#profile-jot-text').val().length();
$('#character-counter').html(textlen);
$('#profile-jot-text').keyup(function() {
$('#character-counter').removeClass('jothidden');
if(textlen <= 140) {
$('#character-counter').removeClass('red');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('grey');
}
if((textlen > 140) && (textlen <= 420)) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('red');
$('#character-counter').addClass('orange');
}
if(textlen > 420) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('red');
}
// get new len
$('#character-counter').html($(this).val().length);
});
}); });
} }
}); });

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

@ -988,7 +988,7 @@ section {
} }
.wall-item-content-wrapper { .wall-item-content-wrapper {
position: relative; position: relative;
border-top: 1px #aaa solid; border-left: 1px #aaa solid;
padding: 10px; padding: 10px;
} }
.wall-item-outside-wrapper .wall-item-comment-wrapper { .wall-item-outside-wrapper .wall-item-comment-wrapper {
@ -996,7 +996,6 @@ section {
} }
.wall-item-content-wrapper.shiny { .wall-item-content-wrapper.shiny {
background: #efefcf; background: #efefcf;
border-right: 3px solid #ffd398;
} }
.wall-item-content { .wall-item-content {
overflow-x: auto; overflow-x: auto;
@ -1039,7 +1038,7 @@ section {
border-radius: 5px; border-radius: 5px;
} }
[class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * { [class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
margin: 0 0 10px 0; margin: 0 0 5px 0;
} }
.wall-item-tools { .wall-item-tools {
float: right; float: right;