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

Merge pull request #236 from simonlnu/master

Browse source 
fix fpostJS, add and fix some other stuff
This commit is contained in:
Simon 2012-04-14 23:14:52 -07:00
commit 4572179a24
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
view/theme/dispy-dark/communityhome.tpl
View file

@ -39,6 +39,6 @@
<h3 id="postit-header">'PostIt' to Friendica</h3> <h3 id="postit-header">'PostIt' to Friendica</h3>
<div id="postit"> <div id="postit">
<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link. <a href="$fpostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
</div> </div>

2
view/theme/dispy-dark/jot-header.tpl
View file

@ -36,7 +36,7 @@ function initEditor(cb) {
entity_encoding : "raw", entity_encoding : "raw",
add_unload_trigger : false, add_unload_trigger : false,
remove_linebreaks : false, remove_linebreaks : false,
force_p_newlines : true, force_p_newlines : false,
force_br_newlines : true, force_br_newlines : true,
forced_root_block : '', forced_root_block : '',
convert_urls: false, convert_urls: false,

4
view/theme/dispy-dark/style.css
View file

@ -2776,8 +2776,8 @@ div[id$="wrapper"] br {
} }
#pause { #pause {
position: fixed; position: fixed;
bottom: 5px; bottom: 40px;
right: 5px; right: 30px;
} }
.border, .border:hover { .border, .border:hover {
border: 1px solid #babdb6; border: 1px solid #babdb6;

2
view/theme/dispy/communityhome.tpl
View file

@ -39,6 +39,6 @@
<h3 id="postit-header">'PostIt' to Friendica</h3> <h3 id="postit-header">'PostIt' to Friendica</h3>
<div id="postit"> <div id="postit">
<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link. <a href="$fpostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
</div> </div>

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

@ -36,7 +36,7 @@ function initEditor(cb) {
entity_encoding : "raw", entity_encoding : "raw",
add_unload_trigger : false, add_unload_trigger : false,
remove_linebreaks : false, remove_linebreaks : false,
force_p_newlines : true, force_p_newlines : false,
force_br_newlines : true, force_br_newlines : true,
forced_root_block : '', forced_root_block : '',
convert_urls: false, convert_urls: false,

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

@ -2777,8 +2777,8 @@ div[id$="wrapper"] br {
} }
#pause { #pause {
position: fixed; position: fixed;
bottom: 5px; bottom: 40px;
right: 5px; right: 30px;
} }
.border, .border:hover { .border, .border:hover {
border: 1px solid #babdb6; border: 1px solid #babdb6;