Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 03:20:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #250 from simonlnu/master

Browse source 
tweak drop-down and add in filebrowser
This commit is contained in:
Simon 2012-04-19 09:55:36 -07:00
commit 51967edfe8
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@ function initEditor(cb) {
mode : "specific_textareas",
editor_selector: $editselect,
auto_focus: "profile-jot-text",
plugins : "bbcode,paste,fullscreen,autoresize",
plugins : "bbcode,paste,fullscreen,autoresize,inlinepopups",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
@ -42,6 +42,7 @@ function initEditor(cb) {
convert_urls: false,
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,
file_browser_callback : "fcFileBrowser",
setup : function(ed) {
cPopup = null;
ed.onKeyDown.add(function(ed,e) {

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

@ -476,7 +476,6 @@ div.jGrowl div.info {
display: block;
}
#nav-notifications-menu li {
padding: 7px 0px 7px 10px;
word-wrap: normal;
border-bottom: 1px solid #000;
}

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

@ -24,7 +24,7 @@ function initEditor(cb) {
mode : "specific_textareas",
editor_selector: $editselect,
auto_focus: "profile-jot-text",
plugins : "bbcode,paste,fullscreen,autoresize",
plugins : "bbcode,paste,fullscreen,autoresize,inlinepopups",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
@ -42,6 +42,7 @@ function initEditor(cb) {
convert_urls: false,
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,
file_browser_callback : "fcFileBrowser",
setup : function(ed) {
cPopup = null;
ed.onKeyDown.add(function(ed,e) {

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

@ -79,6 +79,7 @@ option {
background: #e8e8e8;
}
option[selected="selected"] {
color: #111;
background: #cca;
}
ul, ol {
@ -476,7 +477,6 @@ div.jGrowl div.info {
display: block;
}
#nav-notifications-menu li {
padding: 7px 0px 7px 10px;
word-wrap: normal;
border-bottom: 1px solid #000;
}