4 files changed, 5 insertions, 4 deletions
diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl
index c55ac503a..ab15f9516 100644
--- a/view/theme/dispy-dark/jot-header.tpl
+++ b/view/theme/dispy-dark/jot-header.tpl
@@ -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) {
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 02990c29a..fef0dd8dd 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -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;
 }
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index c55ac503a..ab15f9516 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -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) {
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 5f48e68ec..a9148107f 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -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;
 }