From e2e6b56c448da3a67fa25df118bbb7cbc3239664 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 18 Apr 2012 13:23:42 +0200 Subject: tinymce: add filebrowser for photos and attached files --- view/filebrowser.tpl | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++ view/jot-header.tpl | 1 + 2 files changed, 66 insertions(+) create mode 100644 view/filebrowser.tpl (limited to 'view') diff --git a/view/filebrowser.tpl b/view/filebrowser.tpl new file mode 100644 index 000000000..beff8866f --- /dev/null +++ b/view/filebrowser.tpl @@ -0,0 +1,65 @@ + + + + + + + + +
+ > {{ for $path as $p }}$p.1 / {{ endfor }} +
+
+ +
+
+
+
    + {{ for $files as $f }} +
  • $f.1
    • + {{ endfor }} +
+
+
+ + + diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 67e5eb681..3d134fb01 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -44,6 +44,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) { -- cgit v1.2.3 From 56efb422230bd01d22c41daa78b7183b5f1e94ee Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 18 Apr 2012 14:55:21 +0200 Subject: tinymce: add inlinepopups plugin --- view/jot-header.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 3d134fb01..f1c283470 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -26,7 +26,7 @@ function initEditor(cb){ mode : "specific_textareas", editor_selector: $editselect, auto_focus: "profile-jot-text", - plugins : "bbcode,paste,autoresize", + plugins : "bbcode,paste,autoresize, inlinepopups", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", theme_advanced_buttons2 : "", theme_advanced_buttons3 : "", -- cgit v1.2.3 From 063012045563f7c41663e0da5eba24a4191d36d0 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 18 Apr 2012 14:56:03 +0200 Subject: filebrowser: more style, load min and max scale photos --- view/filebrowser.tpl | 51 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 17 deletions(-) (limited to 'view') diff --git a/view/filebrowser.tpl b/view/filebrowser.tpl index beff8866f..45ba3dab9 100644 --- a/view/filebrowser.tpl +++ b/view/filebrowser.tpl @@ -3,12 +3,17 @@ -
- > {{ for $path as $p }}$p.1 / {{ endfor }} -
-
-
    - {{ for $folders as $f }}
  • $f.1
    • {{ endfor }} + +
    +
      +
    • FileBrowser
    -
    -
    -
      - {{ for $files as $f }} -
    • $f.1
      • - {{ endfor }} -
    +
    + +
    +
    + {{ for $path as $p }}$p.1{{ endfor }} +
    +
    +
      + {{ for $folders as $f }}
    • $f.1
      • {{ endfor }} +
    +
    +
    +
      + {{ for $files as $f }} +
    • $f.1
      • + {{ endfor }} +
    +
    - +
    +
    + +
    -- cgit v1.2.3 From fddf21d983e97b489c26dba95aa35227b15fe9f3 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 18 Apr 2012 15:15:52 +0200 Subject: filebrowser: fix style, show 10 recent photos if not in an album --- view/filebrowser.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view') diff --git a/view/filebrowser.tpl b/view/filebrowser.tpl index 45ba3dab9..1e97237f4 100644 --- a/view/filebrowser.tpl +++ b/view/filebrowser.tpl @@ -3,11 +3,13 @@