image upload from chat

jquery/common.js

@@ -47,10 +47,12 @@ $.prototype.addButton = function(sType, sTitle, oClickLink, sId, sButtonClass, s
 		asAttributes.href = oClickLink;
 		asAttributes.target = '_blank';
 	}
-	var $Button = $('<a>', asAttributes)
-		.append($('<i>', {'class':'icon fa fa-c-'+sType}))
-		.append($('<span>', {'class':'value'}).text(sTitle))
-		.appendTo($This);
+	var $Button = $('<a>', asAttributes).append($('<i>', {'class':'icon fa fa-c-'+sType}));
+	
+	if(sButtonClass.indexOf('no_text') == -1) $Button.append($('<span>', {'class':'value'}).text(sTitle));
+	else $Button.attr('title', sTitle);
+	
+	$Button.appendTo($This);
 	
 	//Function
 	if(!bLink) $Button.click(function(e){e.preventDefault(); oClickLink($(this));});
@@ -475,8 +477,7 @@ function debug(text, bQuery)
 function getLoginToken(sPass)
 {
 	if(!window.location.origin) window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: '');
-	//return md5(sPass+window.location.origin+window.location.pathname);
-	return md5(sPass+'http://databap.lutran.fr/');
+	return md5(sPass+window.location.origin+window.location.pathname);
 }
 
 function md5(str)

jquery/databap.js

@@ -710,14 +710,20 @@ function Databap()
 		$msg.hide().insertBefore(elem).slideDown('fast', function(){databap.updateScrollBar('bottom');}).delay(5000).slideUp('fast', function(){$(this).remove();databap.updateScrollBar();});
 	};
 	
-	this.feedback = function(sClass, sMsg)
+	this.feedback = function(sClass, sMsg, bClean)
 	{
+		bClean = bClean || false;
 		if(sClass=='error' && sMsg=='') sMsg = 'Aïe ! Une erreur inconnue est suvenue';
 		else if(sClass=='error' && $.inArray(sMsg, self.consts.errors.system)!=-1) sMsg = 'Une erreur interne est survenue. Merci de contacter l\'admin';
+		
+		//clean box
+		$Box = $('#title_feedback');
+		if(bClean) $Box.empty();
+		
 		$('<span>', {'class':'feedback '+sClass})
 			.append($('<i>', {'class':'fa fa-inline fa-c-'+sClass}))
 			.append(self.addPunctuation(sMsg))
-			.appendTo('#title_feedback')
+			.appendTo($Box)
 			.slideDown('fast')
 			.delay(5000)
 			.slideUp('fast', function(){$(this).remove();});

jquery/fileuploader.js

@@ -486,24 +486,27 @@ qq.FileUploader = function(o){
 	// call parent constructor
 	qq.FileUploaderBasic.apply(this, arguments);
 	
-	// additional options	
+	var sDefTemplate = '<div class="uploader_box">' + 
+							'<div class="uploader_droparea round">' +
+								'<span>' +
+									((typeof o.addSlideText !== 'undefined')?o.addSlideText:'Glisser les images ici') +
+								'</span>' +
+							'</div>' +
+							'<a class="uploader_button button round"><i class="icon fa fa-c-add"></i>'+
+							((typeof o.addFileText !== 'undefined')?o.addFileText:'Ajouter une image') +
+							'</a>' +
+							'<div class="uploader_buffer"></div>' +
+							'<ul id="uploader_list" class="uploader_list"></ul>' + 
+						'</div>';
+	var sTemplate = (typeof o.template !== 'undefined')?o.template:sDefTemplate;
+	
+	// additional options
 	qq.extend(this._options, {
 		element: null,
 		// if set, will be used instead of uploader_list in template
 		listElement: null,
 				
-		template:'<div class="uploader_box">' + 
-					'<div class="uploader_droparea round">' +
-						'<span>' +
-							((typeof o.addSlideText !== 'undefined')?o.addSlideText:'Glisser les images ici') +
-						'</span>' +
-					'</div>' +
-					'<a class="uploader_button button round"><i class="icon fa fa-c-add"></i>'+
-					((typeof o.addFileText !== 'undefined')?o.addFileText:'Ajouter une image') +
-					'</a>' +
-					'<div class="uploader_buffer"></div>' +
-					'<ul id="uploader_list" class="uploader_list"></ul>' + 
-				'</div>',
+		template:sTemplate,
 
 		// template for one item in file list
 		fileTemplate:'<li id="uploader_item">' +