]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'pull'
authorFriendika <info@friendika.com>
Wed, 26 Oct 2011 19:51:08 +0000 (12:51 -0700)
committerFriendika <info@friendika.com>
Wed, 26 Oct 2011 19:51:08 +0000 (12:51 -0700)
15 files changed:
include/bbcode.php
include/oembed.php
js/fk.autocomplete.js [new file with mode: 0644]
js/jquery.textinputs.js [new file with mode: 0644]
js/main.js
js/webtoolkit.base64.js [new file with mode: 0644]
mod/acl.php
view/head.tpl
view/oembed_video.tpl
view/theme/dispy/style.css
view/theme/duepuntozero/style.css
view/theme/loozah/style.css
view/theme/quattro/quattro.less
view/theme/quattro/style.css
view/theme/testbubble/style.css

index a60d09ce8b1fdab2bd32e5e1d2fd7d50ca6eeda7..4d6eafafa5f28acccef5f7285c28e7d0211aefba 100644 (file)
@@ -19,7 +19,7 @@ function tryoembed($match){
        if ($o->type=="error") return $match[0];
        
        $html = oembed_format_object($o);
-       return oembed_iframe($html,$o->width,$o->height);
+       return $html; //oembed_iframe($html,$o->width,$o->height);
        
 }
 
index 71b62b839dc876224db754acd72e01605bd446d4..3e86627e4dd384683a96e834bd8ec56503ce90a3 100644 (file)
@@ -4,7 +4,7 @@ function oembed_replacecb($matches){
        $embedurl=$matches[1];
        $j = oembed_fetch_url($embedurl);
        $s =  oembed_format_object($j);
-       return oembed_iframe($s,$j->width,$j->height);
+       return $s;//oembed_iframe($s,$j->width,$j->height);
 
 
 }
@@ -56,6 +56,7 @@ function oembed_fetch_url($embedurl){
        
 function oembed_format_object($j){
        $embedurl = $j->embedurl;
+       $jhtml = oembed_iframe($j->html,$j->width,$j->height );
        $ret="<span class='oembed ".$j->type."'>";
        switch ($j->type) {
                case "video": {
@@ -68,14 +69,14 @@ function oembed_format_object($j){
                                $tpl=get_markup_template('oembed_video.tpl');
                                $ret.=replace_macros($tpl, array(
                                        '$embedurl'=>$embedurl,
-                                       '$escapedhtml'=>urlencode($j->html),
+                                       '$escapedhtml'=>base64_encode($jhtml),
                                        '$tw'=>$tw,
                                        '$th'=>$th,
                                        '$turl'=>$j->thumbnail_url,
                                ));
                                
                        } else {
-                               $ret=$j->html;
+                               $ret=$jhtml;
                        }
                        $ret.="<br>";
                }; break;
@@ -88,12 +89,12 @@ function oembed_format_object($j){
                }; break;  
                case "rich": {
                        // not so safe.. 
-                       $ret.= $j->html;
+                       $ret.= $jhtml;
                }; break;
        }
 
        // add link to source if not present in "rich" type
-       if (  $j->type!='rich' || !strpos($ret,$embedurl) ){
+       if (  $j->type!='rich' || !strpos($j->html,$embedurl) ){
                $embedlink = (isset($j->title))?$j->title:$embedurl;
                $ret .= "<a href='$embedurl' rel='oembed'>$embedlink</a>";
                if (isset($j->author_name)) $ret.=" by ".$j->author_name;
@@ -107,7 +108,6 @@ function oembed_format_object($j){
 }
 
 function oembed_iframe($src,$width,$height) {
-
        if(! $width || strstr($width,'%'))
                $width = '640';
        if(! $height || strstr($height,'%'))
diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js
new file mode 100644 (file)
index 0000000..1484758
--- /dev/null
@@ -0,0 +1,165 @@
+/**
+ * Friendika people autocomplete
+ *
+ * require jQuery, jquery.textareas
+ */
+               
+               
+function ACPopup(elm,backend_url){
+       this.idsel=-1;
+       this.element = elm;
+       this.searchText="";
+       this.ready=true;
+       this.kp_timer = false;
+       this.url = backend_url;
+       
+       style = $(elm).offset();
+       w = $(elm).width();
+       h = $(elm).height();
+       style.top=style.top+h;
+       style.width = w;
+       style.position = 'absolute';
+/*     style['max-height'] = '150px';
+       style.border = '1px solid red';
+       style.background = '#cccccc';
+       
+       style.overflow = 'auto';
+       style['z-index'] = '100000';
+*/
+       style.display = 'none';
+       
+       this.cont = $("<div class='acpopup'></div>");
+       this.cont.css(style);
+       
+       $("body").append(this.cont);
+}
+ACPopup.prototype.close = function(){
+       $(this.cont).remove();
+       this.ready=false;
+}
+ACPopup.prototype.search = function(text){
+       var that = this;
+       this.searchText=text;
+       if (this.kp_timer) clearTimeout(this.kp_timer);
+       this.kp_timer = setTimeout( function(){that._search();}, 500);
+}
+ACPopup.prototype._search = function(){        
+       console.log("_search");
+       var that = this;
+       var postdata = {
+               start:0,
+               count:100,
+               search:this.searchText,
+               type:'c',
+       }
+       
+       $.ajax({
+               type:'POST',
+               url: this.url,
+               data: postdata,
+               dataType: 'json',
+               success:function(data){
+                       that.cont.html("");
+                       if (data.tot>0){
+                               that.cont.show();
+                               $(data.items).each(function(){
+                                       html = "<img src='{0}' height='16px' width='16px'>{1} ({2})".format(this.photo, this.name, this.nick)
+                                       that.add(html, this.nick);
+                               });                     
+                       } else {
+                               that.cont.hide();
+                       }
+               }
+       });
+       
+}
+ACPopup.prototype.add = function(label, value){
+       var that=this;
+       var elm = $("<div class='acpopupitem' title='"+value+"'>"+label+"</div>");
+       elm.click(function(e){
+               t = $(this).attr('title');
+               el=$(that.element);
+               sel = el.getSelection();
+               sel.start = sel.start- that.searchText.length;
+               el.setSelection(sel.start,sel.end).replaceSelectedText(t).collapseSelection(false);
+               that.close();
+       });
+       $(this.cont).append(elm);
+}
+ACPopup.prototype.onkey = function(event){
+       if (event.keyCode == '13' && this.idsel>-1) {
+               this.cont.children()[this.idsel].click();
+               event.preventDefault();
+       }
+       if (event.keyCode == '38') { //cursor up
+               cmax = this.cont.children().size()-1;
+               this.idsel--;
+               if (this.idsel<0) this.idsel=cmax;
+               event.preventDefault();
+       }
+       if (event.keyCode == '40') { //cursor down
+               cmax = this.cont.children().size()-1;
+               this.idsel++;
+               if (this.idsel>cmax) this.idsel=0;
+               event.preventDefault();
+       }
+       
+       if (event.keyCode == '38' || event.keyCode == '40' ) {
+               this.cont.children().removeClass('selected');
+               $(this.cont.children()[this.idsel]).addClass('selected');
+       }
+       
+       if (event.keyCode == '27') { //ESC
+               this.close();
+       }
+}
+
+function ContactAutocomplete(element,backend_url){
+       this.pattern=/@([^ \n]+)$/;
+       this.popup=null;
+       var that = this;
+       
+       $(element).unbind('keydown');
+       $(element).unbind('keyup');
+       
+       $(element).keydown(function(event){
+               if (that.popup!==null) that.popup.onkey(event);
+       });
+       
+       $(element).keyup(function(event){
+               cpos = $(this).getSelection();
+               if (cpos.start==cpos.end){
+                       match = $(this).val().substring(0,cpos.start).match(that.pattern);
+                       if (match!==null){
+                               if (that.popup===null){
+                                       that.popup = new ACPopup(this, backend_url);
+                               }
+                               if (that.popup.ready && match[1]!==that.popup.searchText) that.popup.search(match[1]);
+                               if (!that.popup.ready) that.popup=null;
+                               
+                       } else {
+                               if (that.popup!==null) {that.popup.close(); that.popup=null;}
+                       }
+                       
+                       
+               }
+       });             
+       
+}
+
+
+/**
+ * jQuery plugin 'contact_autocomplete'
+ */
+(function( $ ){
+  $.fn.contact_autocomplete = function(backend_url) {
+    this.each(function(){
+               new ContactAutocomplete(this, backend_url);
+       });
+  };
+})( jQuery );
+
+
+
+               
diff --git a/js/jquery.textinputs.js b/js/jquery.textinputs.js
new file mode 100644 (file)
index 0000000..fd6d145
--- /dev/null
@@ -0,0 +1,20 @@
+/*
+ Rangy Text Inputs, a cross-browser textarea and text input library plug-in for jQuery.
+
+ Part of Rangy, a cross-browser JavaScript range and selection library
+ http://code.google.com/p/rangy/
+
+ Depends on jQuery 1.0 or later.
+
+ Copyright 2010, Tim Down
+ Licensed under the MIT license.
+ Version: 0.1.205
+ Build date: 5 November 2010
+*/
+(function(n){function o(e,g){var a=typeof e[g];return a==="function"||!!(a=="object"&&e[g])||a=="unknown"}function p(e,g,a){if(g<0)g+=e.value.length;if(typeof a=="undefined")a=g;if(a<0)a+=e.value.length;return{start:g,end:a}}function k(){return typeof document.body=="object"&&document.body?document.body:document.getElementsByTagName("body")[0]}var i,h,q,l,r,s,t,u,m;n(document).ready(function(){function e(a,b){return function(){var c=this.jquery?this[0]:this,d=c.nodeName.toLowerCase();if(c.nodeType==
+1&&(d=="textarea"||d=="input"&&c.type=="text")){c=[c].concat(Array.prototype.slice.call(arguments));c=a.apply(this,c);if(!b)return c}if(b)return this}}var g=document.createElement("textarea");k().appendChild(g);if(typeof g.selectionStart!="undefined"&&typeof g.selectionEnd!="undefined"){i=function(a){return{start:a.selectionStart,end:a.selectionEnd,length:a.selectionEnd-a.selectionStart,text:a.value.slice(a.selectionStart,a.selectionEnd)}};h=function(a,b,c){b=p(a,b,c);a.selectionStart=b.start;a.selectionEnd=
+b.end};m=function(a,b){if(b)a.selectionEnd=a.selectionStart;else a.selectionStart=a.selectionEnd}}else if(o(g,"createTextRange")&&typeof document.selection=="object"&&document.selection&&o(document.selection,"createRange")){i=function(a){var b=0,c=0,d,f,j;if((j=document.selection.createRange())&&j.parentElement()==a){f=a.value.length;d=a.value.replace(/\r\n/g,"\n");c=a.createTextRange();c.moveToBookmark(j.getBookmark());j=a.createTextRange();j.collapse(false);if(c.compareEndPoints("StartToEnd",j)>
+-1)b=c=f;else{b=-c.moveStart("character",-f);b+=d.slice(0,b).split("\n").length-1;if(c.compareEndPoints("EndToEnd",j)>-1)c=f;else{c=-c.moveEnd("character",-f);c+=d.slice(0,c).split("\n").length-1}}}return{start:b,end:c,length:c-b,text:a.value.slice(b,c)}};h=function(a,b,c){b=p(a,b,c);c=a.createTextRange();var d=b.start-(a.value.slice(0,b.start).split("\r\n").length-1);c.collapse(true);if(b.start==b.end)c.move("character",d);else{c.moveEnd("character",b.end-(a.value.slice(0,b.end).split("\r\n").length-
+1));c.moveStart("character",d)}c.select()};m=function(a,b){var c=document.selection.createRange();c.collapse(b);c.select()}}else{k().removeChild(g);window.console&&window.console.log&&window.console.log("TextInputs module for Rangy not supported in your browser. Reason: No means of finding text input caret position");return}k().removeChild(g);l=function(a,b,c,d){var f;if(b!=c){f=a.value;a.value=f.slice(0,b)+f.slice(c)}d&&h(a,b,b)};q=function(a){var b=i(a);l(a,b.start,b.end,true)};u=function(a){var b=
+i(a),c;if(b.start!=b.end){c=a.value;a.value=c.slice(0,b.start)+c.slice(b.end)}h(a,b.start,b.start);return b.text};r=function(a,b,c,d){var f=a.value;a.value=f.slice(0,c)+b+f.slice(c);if(d){b=c+b.length;h(a,b,b)}};s=function(a,b){var c=i(a),d=a.value;a.value=d.slice(0,c.start)+b+d.slice(c.end);c=c.start+b.length;h(a,c,c)};t=function(a,b,c){var d=i(a),f=a.value;a.value=f.slice(0,d.start)+b+d.text+c+f.slice(d.end);b=d.start+b.length;h(a,b,b+d.length)};n.fn.extend({getSelection:e(i,false),setSelection:e(h,
+true),collapseSelection:e(m,true),deleteSelectedText:e(q,true),deleteText:e(l,true),extractSelectedText:e(u,false),insertText:e(r,true),replaceSelectedText:e(s,true),surroundSelectedText:e(t,true)})})})(jQuery);
\ No newline at end of file
index 03ba11ed849d9e06a96e1e831405ad83125c6472..15c5b5d1f19ec643b0311ca87f1c760d9763c83e 100644 (file)
@@ -78,8 +78,6 @@
                        menu.toggle();
                        return false;
                });
-               
-               
 
                /* notifications template */
                var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
                                }
                        }
 
-               });                                     
+               });
+               
+               
        });
 
        function NavUpdate() {
                                commentBusy = false;
                                $('body').css('cursor', 'auto');
                        }
+                       /* autocomplete @nicknames */
+                       $(".comment-edit-wrapper  textarea").contact_autocomplete(baseurl+"/acl");
                });
        }
 
@@ -445,6 +447,7 @@ function setupFieldRichtext(){
        });
 }
 
+
 /** 
  * sprintf in javascript 
  *     "{0} and {1}".format('zero','uno'); 
diff --git a/js/webtoolkit.base64.js b/js/webtoolkit.base64.js
new file mode 100644 (file)
index 0000000..5fa3c1e
--- /dev/null
@@ -0,0 +1,142 @@
+/**
+*
+*  Base64 encode / decode
+*  http://www.webtoolkit.info/
+*
+**/
+
+var Base64 = {
+
+       // private property
+       _keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
+
+       // public method for encoding
+       encode : function (input) {
+               var output = "";
+               var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+               var i = 0;
+
+               input = Base64._utf8_encode(input);
+
+               while (i < input.length) {
+
+                       chr1 = input.charCodeAt(i++);
+                       chr2 = input.charCodeAt(i++);
+                       chr3 = input.charCodeAt(i++);
+
+                       enc1 = chr1 >> 2;
+                       enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+                       enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+                       enc4 = chr3 & 63;
+
+                       if (isNaN(chr2)) {
+                               enc3 = enc4 = 64;
+                       } else if (isNaN(chr3)) {
+                               enc4 = 64;
+                       }
+
+                       output = output +
+                       this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) +
+                       this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4);
+
+               }
+
+               return output;
+       },
+
+       // public method for decoding
+       decode : function (input) {
+               var output = "";
+               var chr1, chr2, chr3;
+               var enc1, enc2, enc3, enc4;
+               var i = 0;
+
+               input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+
+               while (i < input.length) {
+
+                       enc1 = this._keyStr.indexOf(input.charAt(i++));
+                       enc2 = this._keyStr.indexOf(input.charAt(i++));
+                       enc3 = this._keyStr.indexOf(input.charAt(i++));
+                       enc4 = this._keyStr.indexOf(input.charAt(i++));
+
+                       chr1 = (enc1 << 2) | (enc2 >> 4);
+                       chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+                       chr3 = ((enc3 & 3) << 6) | enc4;
+
+                       output = output + String.fromCharCode(chr1);
+
+                       if (enc3 != 64) {
+                               output = output + String.fromCharCode(chr2);
+                       }
+                       if (enc4 != 64) {
+                               output = output + String.fromCharCode(chr3);
+                       }
+
+               }
+
+               output = Base64._utf8_decode(output);
+
+               return output;
+
+       },
+
+       // private method for UTF-8 encoding
+       _utf8_encode : function (string) {
+               string = string.replace(/\r\n/g,"\n");
+               var utftext = "";
+
+               for (var n = 0; n < string.length; n++) {
+
+                       var c = string.charCodeAt(n);
+
+                       if (c < 128) {
+                               utftext += String.fromCharCode(c);
+                       }
+                       else if((c > 127) && (c < 2048)) {
+                               utftext += String.fromCharCode((c >> 6) | 192);
+                               utftext += String.fromCharCode((c & 63) | 128);
+                       }
+                       else {
+                               utftext += String.fromCharCode((c >> 12) | 224);
+                               utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+                               utftext += String.fromCharCode((c & 63) | 128);
+                       }
+
+               }
+
+               return utftext;
+       },
+
+       // private method for UTF-8 decoding
+       _utf8_decode : function (utftext) {
+               var string = "";
+               var i = 0;
+               var c = c1 = c2 = 0;
+
+               while ( i < utftext.length ) {
+
+                       c = utftext.charCodeAt(i);
+
+                       if (c < 128) {
+                               string += String.fromCharCode(c);
+                               i++;
+                       }
+                       else if((c > 191) && (c < 224)) {
+                               c2 = utftext.charCodeAt(i+1);
+                               string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
+                               i += 2;
+                       }
+                       else {
+                               c2 = utftext.charCodeAt(i+1);
+                               c3 = utftext.charCodeAt(i+2);
+                               string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
+                               i += 3;
+                       }
+
+               }
+
+               return string;
+       }
+
+}
index f2d2456a64586a0d23e9032937758cf1ab2377e1..07ca096e5bbec2f963b74d5d2d891d788a9088b8 100644 (file)
@@ -10,73 +10,90 @@ function acl_init(&$a){
        $start = (x($_POST,'start')?$_POST['start']:0);
        $count = (x($_POST,'count')?$_POST['count']:100);
        $search = (x($_POST,'search')?$_POST['search']:"");
+       $type = (x($_POST,'type')?$_POST['type']:"");
+       
 
        if ($search!=""){
                $sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'";
+               $sql_extra2 = "AND (`name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')";
        }
        
        // count groups and contacts
-       $r = q("SELECT COUNT(`id`) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra",
-               intval(local_user())
-       );
-       $group_count = (int)$r[0]['g'];
-       $r = q("SELECT COUNT(`id`) AS c FROM `contact` 
-                       WHERE `uid` = %d AND `self` = 0 
-                         AND `blocked` = 0 AND `pending` = 0 
-                         AND `notify` != '' $sql_extra" ,
-               intval(local_user())
-       );
-       $contact_count = (int)$r[0]['c'];
+       if ($type=='' || $type=='g'){
+               $r = q("SELECT COUNT(`id`) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra",
+                       intval(local_user())
+               );
+               $group_count = (int)$r[0]['g'];
+       } else {
+               $group_count = 0;
+       }
+       
+       if ($type=='' || $type=='c'){
+               $r = q("SELECT COUNT(`id`) AS c FROM `contact` 
+                               WHERE `uid` = %d AND `self` = 0 
+                               AND `blocked` = 0 AND `pending` = 0 
+                               AND `notify` != '' $sql_extra" ,
+                       intval(local_user())
+               );
+               $contact_count = (int)$r[0]['c'];
+       } else {
+               $contact_count = 0;
+       }
        
        $tot = $group_count+$contact_count;
        
        $groups = array();
        $contacts = array();
        
-       $r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') as uids
-                       FROM `group`,`group_member` 
-                       WHERE `group`.`deleted` = 0 AND `group`.`uid` = %d 
-                               AND `group_member`.`gid`=`group`.`id`
-                               $sql_extra
-                       GROUP BY `group`.`id`
-                       ORDER BY `group`.`name` 
-                       LIMIT %d,%d",
-               intval(local_user()),
-               intval($start),
-               intval($count)
-       );
-
-       
-       foreach($r as $g){
-               $groups[] = array(
-                       "type"  => "g",
-                       "photo" => "images/default-group-mm.png",
-                       "name"  => $g['name'],
-                       "id"    => intval($g['id']),
-                       "uids"  => array_map("intval", explode(",",$g['uids'])),
-                       "link"  => ''
+       if ($type=='' || $type=='g'){
+               
+               $r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') as uids
+                               FROM `group`,`group_member` 
+                               WHERE `group`.`deleted` = 0 AND `group`.`uid` = %d 
+                                       AND `group_member`.`gid`=`group`.`id`
+                                       $sql_extra
+                               GROUP BY `group`.`id`
+                               ORDER BY `group`.`name` 
+                               LIMIT %d,%d",
+                       intval(local_user()),
+                       intval($start),
+                       intval($count)
                );
+
+               
+               foreach($r as $g){
+                       $groups[] = array(
+                               "type"  => "g",
+                               "photo" => "images/default-group-mm.png",
+                               "name"  => $g['name'],
+                               "id"    => intval($g['id']),
+                               "uids"  => array_map("intval", explode(",",$g['uids'])),
+                               "link"  => ''
+                       );
+               }
        }
        
+       if ($type=='' || $type=='c'){
        
-       $r = q("SELECT `id`, `name`, `micro`, `network`, `url` FROM `contact` 
-               WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
-               $sql_extra
-               ORDER BY `name` ASC ",
-               intval(local_user())
-       );
-       foreach($r as $g){
-               $contacts[] = array(
-                       "type"  => "c",
-                       "photo" => $g['micro'],
-                       "name"  => $g['name'],
-                       "id"    => intval($g['id']),
-                       "network" => $g['network'],
-                       "link" => $g['url'],
+               $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url` FROM `contact` 
+                       WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
+                       $sql_extra2
+                       ORDER BY `name` ASC ",
+                       intval(local_user())
                );
+               foreach($r as $g){
+                       $contacts[] = array(
+                               "type"  => "c",
+                               "photo" => $g['micro'],
+                               "name"  => $g['name'],
+                               "id"    => intval($g['id']),
+                               "network" => $g['network'],
+                               "link" => $g['url'],
+                               "nick" => $g['nick'],
+                       );
+               }
+                       
        }
-               
-       
        
        
        $items = array_merge($groups, $contacts);
index b6d78da390a4d5b4b29c5dc500c1ee865a05dd91..752915b14620c92f844f5704e924dfa7d2689725 100644 (file)
 <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
 <script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
+<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script>
 <script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
 <script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
 <script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
 <script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
 <script type="text/javascript" src="$baseurl/js/acl.js" ></script>
+<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
 <script type="text/javascript" src="$baseurl/js/main.js" ></script>
 <script>
 
index 29b5149ba2d985f544e99dfbc80123d60f1a78d8..5824d8d4e88207c1fe30082ecab056c371499de1 100644 (file)
@@ -1,4 +1,4 @@
-<a href='$embedurl' onclick='this.innerHTML=unescape("$escapedhtml").replace(/\+/g," "); return false;' style='float:left; margin: 1em; position: relative;'>
+<a href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'>
        <img width='$tw' height='$th' src='$turl' >
        <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
 </a>
index 3c92a877b5ee60f770cbb33a644cc59ba335aef0..0d8b546980512030b34d252fa1494098e8d4b905 100644 (file)
@@ -1250,3 +1250,24 @@ footer { display: block; margin: 50px 20%; clear: both; }
 /** /acl **/
 
 
+/* autocomplete popup */
+.acpopup {
+       max-height:150px;
+       background-color:#555753;
+       color: #FFFFFF;
+       overflow:auto;
+       z-index:100000;
+       border:1px solid #cccccc;
+}
+.acpopupitem {
+       background-color:#555753; padding: 4px;
+       clear:left;
+}
+.acpopupitem img {
+       float: left;
+       margin-right: 4px;
+}
+
+.acpopupitem.selected {
+       color: #2e3436; background-color: #eeeeec;
+}
index b870f6bd5b7ef11705694e7a1d53917defb3085c..d595c7495ab40ccba81cee205c46a5690b5d3310 100644 (file)
@@ -2833,3 +2833,24 @@ a.mail-list-link {
 .type-text  { background-position: -60px 0px; }
 .type-unkn  { background-position: -80px 0px; }
 
+
+/* autocomplete popup */
+.acpopup {
+       max-height:150px;
+       background-color:#ffffff;
+       overflow:auto;
+       z-index:100000;
+       border:1px solid #cccccc;
+}
+.acpopupitem {
+       background-color:#ffffff; padding: 4px;
+       clear:left;
+}
+.acpopupitem img {
+       float: left;
+       margin-right: 4px;
+}
+
+.acpopupitem.selected {
+       color: #FFFFFF; background: #3465A4;
+}
index 4470723908310f7b3e0ab5ec0763f8de2c489e3d..42b99b08cad46a1be6448276403870a0568f62dd 100644 (file)
@@ -2745,9 +2745,31 @@ a.mail-list-link {
        margin-top: 10px;
 }
 
-.type-video { background-position: 0px; 0px; }
-.type-image { background-position: -20px; 0px; }
-.type-audio { background-position: -40px; 0px; }
-.type-text  { background-position: -60px; 0px; }
-.type-unkn  { background-position: -80px; 0px; }
+.type-video { background-position: 0px 0px; }
+.type-image { background-position: -20px 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+/* autocomplete popup */
+.acpopup {
+       max-height:150px;
+       background-color:#ffffff;
+       overflow:auto;
+       z-index:100000;
+       border:1px solid #cccccc;
+}
+.acpopupitem {
+       background-color:#ffffff; padding: 4px;
+       clear:left;
+}
+.acpopupitem img {
+       float: left;
+       margin-right: 4px;
+}
+
+.acpopupitem.selected {
+       color: #FFFFFF; background: #3465A4;
+}
+
 
index 1fbeb7ae273370edf71b9b929ce0fed8179cf4e3..ea699d5c6f9d2250e0b7e5d3267a210506652fbb 100644 (file)
@@ -192,6 +192,29 @@ ul.menu-popup {
                
 }
 
+/* autocomplete popup */
+.acpopup {
+       max-height:150px;
+       background-color:@MenuBg;
+       color: @Menu;
+       border:1px solid #MenuBorder;
+       overflow:auto;
+       z-index:100000;
+       .shadow();
+}
+.acpopupitem {
+       color: @MenuItem; padding: 4px;
+       clear:left;
+       img {
+               float: left;
+               margin-right: 4px;
+       }
+       &.selected{
+               background-color: @MenuItemHoverBg;
+       }
+}
+
+
 #nav-notifications-menu {
        width: 400px;
        img { float: left; margin-right: 5px; }
index 5852142331fcf77a7e3d7652ad3bb2a08579e7ff..95c3d087ede6430744014e58fa19439c009ba96c 100644 (file)
@@ -388,6 +388,30 @@ ul.menu-popup .empty {
   text-align: center;
   color: #9eabb0;
 }
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
 #nav-notifications-menu {
   width: 400px;
 }
index b7c20ab17c86f8d0ecb981bd490b0f54281e11a3..9c04ec4bafcbb37923cc5df60422d54457be9dee 100644 (file)
@@ -823,7 +823,7 @@ profile-jot-banner-wrapper {
 /* ======== */
 
 .tabs {
-       width: 500px;
+       min-width: 500px;
        list-style: none;
        padding: 10px;
        margin: 0px 0px 10px 0px;
@@ -3086,3 +3086,41 @@ ul.menu-popup {
 #jGrowl {
        z-index: 20000;
 }
+
+/* autocomplete popup */
+.acpopup {
+       max-height:150px;
+       overflow:auto;
+       z-index:100000;
+       
+       color: #2e3436;
+       border-top: 0px;
+       background: #eeeeee;
+       border-right: 1px solid #dddddd;
+       border-left: 1px solid #dddddd;
+       border-bottom: 1px solid #dddddd;
+       -webkit-border-radius: 0px 5px 5px 5px;
+       -moz-border-radius: 0px 5px 5px 5px;
+       border-radius: 0px 5px 5px 5px;
+       -moz-box-shadow: 3px 3px 4px #959494;
+       -webkit-box-shadow: 3px 3px 4px #959494;
+       box-shadow: 3px 3px 4px #959494;
+       
+}
+.acpopupitem {
+       color: #2e3436; padding: 4px;
+       clear:left;
+}
+.acpopupitem img {
+       float: left;
+       margin-right: 4px;
+}
+
+.acpopupitem.selected {
+       color: #efefef;
+       background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
+       background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
+       filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
+       background-color:#b20202; 
+       order-bottom: none;
+}