From f980b79edcff78a849d65de15f36f2b0475665d7 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Fri, 6 Apr 2012 11:19:12 +0200 Subject: new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox... --- js/main.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) mode change 100644 => 100755 js/main.js (limited to 'js') diff --git a/js/main.js b/js/main.js old mode 100644 new mode 100755 index 744691b6d..7f0428b5b --- a/js/main.js +++ b/js/main.js @@ -119,9 +119,7 @@ var home = $(data).find('home').text(); if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') } $('#home-update').html(home); - - - + var intro = $(data).find('intro').text(); if(intro == 0) { intro = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') } $('#intro-update').html(intro); @@ -129,6 +127,14 @@ var mail = $(data).find('mail').text(); if(mail == 0) { mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') } $('#mail-update').html(mail); + + var intro = $(data).find('intro').text(); + if(intro == 0) { intro = ''; $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') } + $('#intro-update-li').html(intro); + + var mail = $(data).find('mail').text(); + if(mail == 0) { mail = ''; $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') } + $('#mail-update-li').html(mail); var eNotif = $(data).find('notif') notif = eNotif.attr('count'); -- cgit v1.2.3 From a23d46c49b59f05d89a7c5a949ae9b9af107e7c9 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 12 Apr 2012 09:15:08 +0200 Subject: main.js: set notifications icon "on" with new unread notifcations. Show "Nothing new here" with no notifications at all --- js/main.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'js') diff --git a/js/main.js b/js/main.js index 7f0428b5b..7a90fa910 100755 --- a/js/main.js +++ b/js/main.js @@ -137,13 +137,12 @@ $('#mail-update-li').html(mail); var eNotif = $(data).find('notif') - notif = eNotif.attr('count'); - if (notif>=0){ - $("#nav-notifications-linkmenu").addClass("on"); + + if (eNotif.children("note").length==0){ + $("#nav-notifications-menu").html(notifications_empty); + } else { nnm = $("#nav-notifications-menu"); - nnm.html(notifications_all + notifications_mark); - //nnm.attr('popup','true'); eNotif.children("note").each(function(){ e = $(this); @@ -151,10 +150,12 @@ html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen')); nnm.append(html); }); - + } + notif = eNotif.attr('count'); + if (notif>0){ + $("#nav-notifications-linkmenu").addClass("on"); } else { - // $("#nav-notifications-linkmenu").removeClass("on"); - // $("#nav-notifications-menu").html(notifications_empty); + $("#nav-notifications-linkmenu").removeClass("on"); } if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') } $('#notify-update').html(notif); @@ -609,4 +610,4 @@ function previewTheme(elm) { $('#theme-preview').html('
' + data.desc + '
' + theme + ''); }); -} \ No newline at end of file +} -- cgit v1.2.3 From 626bb57e1dd0024c8d5d7f02cc8d4fb359152136 Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Sat, 14 Apr 2012 20:04:54 +0530 Subject: Removed execution permission: lintian warning in Debian packaging --- js/main.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 js/main.js (limited to 'js') diff --git a/js/main.js b/js/main.js old mode 100755 new mode 100644 -- cgit v1.2.3 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 --- js/main.js | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'js') diff --git a/js/main.js b/js/main.js index 7a90fa910..8cb522743 100644 --- a/js/main.js +++ b/js/main.js @@ -17,6 +17,7 @@ } + var src = null; var prev = null; var livetime = null; @@ -558,6 +559,30 @@ function notifyMarkAll() { } +// code from http://www.tinymce.com/wiki.php/How-to_implement_a_custom_file_browser +function fcFileBrowser (field_name, url, type, win) { + /* TODO: If you work with sessions in PHP and your client doesn't accept cookies you might need to carry + the session name and session ID in the request string (can look like this: "?PHPSESSID=88p0n70s9dsknra96qhuk6etm5"). + These lines of code extract the necessary parameters and add them back to the filebrowser URL again. */ + + + var cmsURL = baseurl+"/fbrowser/"+type+"/"; + + tinyMCE.activeEditor.windowManager.open({ + file : cmsURL, + title : 'File Browser', + width : 420, // Your dimensions may differ - toy around with them! + height : 400, + resizable : "yes", + inline : "yes", // This parameter only has an effect if you use the inlinepopups plugin! + close_previous : "no" + }, { + window : win, + input : field_name + }); + return false; + } + function setupFieldRichtext(){ tinyMCE.init({ theme : "advanced", @@ -580,6 +605,7 @@ function setupFieldRichtext(){ convert_urls: false, content_css: baseurl+"/view/custom_tinymce.css", theme_advanced_path : false, + file_browser_callback : "fcFileBrowser", }); } -- 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 --- js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/main.js b/js/main.js index 8cb522743..ac238bf6a 100644 --- a/js/main.js +++ b/js/main.js @@ -588,7 +588,7 @@ function setupFieldRichtext(){ theme : "advanced", mode : "specific_textareas", editor_selector: "fieldRichtext", - plugins : "bbcode,paste", + plugins : "bbcode,paste, 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