From 93eda9d9c1deb50cfa36392dbcbc4dc56883160f Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Fri, 22 Jul 2011 17:37:51 +0200 Subject: Initial work on new UI --- include/template_processor.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/template_processor.php b/include/template_processor.php index 83f680f02..f1d2eae4e 100644 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -166,6 +166,9 @@ $s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s); if ($s==Null) $this->_preg_error(); + // remove comments block + $s = preg_replace('/{#[^#]*#}/', "" , $s); + // replace strings recursively (limit to 10 loops) $os = ""; $count=0; while($os!=$s && $count<10){ -- cgit v1.2.3 From e6444adafdd3c50913ca44d8701996e058e064b9 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 25 Jul 2011 16:52:30 +0200 Subject: change nav selected css class --- include/nav.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/nav.php b/include/nav.php index 895c321e6..caed9453a 100644 --- a/include/nav.php +++ b/include/nav.php @@ -41,7 +41,7 @@ function nav(&$a) { $nav['logout'] = Array('logout',t('Logout'), "", t('End this session')); } else { - $nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'nav-selected':''), t('Sign in')); + $nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'selected':''), t('Sign in')); } -- cgit v1.2.3 From 99ab06bad3eb8b4c20e70c255d9d4b168c137dde Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 25 Jul 2011 16:54:39 +0200 Subject: js to open close popup nav menu and to populate notification menu via ping. Update mod/ping to return details about messages and intros --- include/main.js | 53 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 19 deletions(-) (limited to 'include') diff --git a/include/main.js b/include/main.js index d17d923e4..dc39a7281 100644 --- a/include/main.js +++ b/include/main.js @@ -34,6 +34,9 @@ msie = $.browser.msie ; + /* setup navbar menus */ + + /* setup onoff widgets */ $(".onoff input").each(function(){ @@ -55,34 +58,46 @@ /* setup field_richtext */ setupFieldRichtext(); - - /* load tinyMCE if needed and setup field_richtext */ - /*if(typeof tinyMCE == "undefined") { - window.tinyMCEPreInit = { - suffix:"", - base: baseurl+"/library/tinymce/jscripts/tiny_mce/", - query:"", - }; - $.getScript(baseurl +"/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js", setupFieldRichtext); - } else { - }*/ + + /* popup menus */ + $('a[rel^=#]').click(function(e){ + e.stopPropagation(); + menu = $( $(this).attr('rel') ); + $(this).parent().toggleClass("selected"); + menu.toggle(); + return false; + }); + + /* notifications template */ + var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html()); /* nav update event */ $('nav').bind('nav-update', function(e,data){; var net = $(data).find('net').text(); - if(net == 0) { net = ''; $('#net-update').hide() } else { $('#net-update').show() } + if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') } $('#net-update').html(net); + var home = $(data).find('home').text(); - if(home == 0) { home = ''; $('#home-update').hide() } else { $('#home-update').show() } + if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') } $('#home-update').html(home); - var mail = $(data).find('mail').text(); - if(mail == 0) { mail = ''; $('#mail-update').hide() } else { $('#mail-update').show() } - $('#mail-update').html(mail); - var intro = $(data).find('intro').text(); - if(intro == 0) { intro = ''; $('#notify-update').hide() } else { $('#notify-update').show() } - $('#notify-update').html(intro); + + var eNotif = $(data).find('notif') + notif = eNotif.attr('count'); + if (notif>0){ + nnm = $("#nav-notifications-menu"); + nnm.html(""); + eNotif.children("note").each(function(){ + e = $(this); + text = e.text().format(""+e.attr('name')+""); + html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date')); + nnm.append(html); + }); + } + if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') } + $('#notify-update').html(notif); + }); -- cgit v1.2.3 From 23d6339a4152759d8dcf68afc6e7dea652336d8c Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 25 Jul 2011 17:12:42 +0200 Subject: change to some nav ids, notice in empty notifications popup --- include/main.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/main.js b/include/main.js index dc39a7281..3574e6eb8 100644 --- a/include/main.js +++ b/include/main.js @@ -61,8 +61,9 @@ /* popup menus */ $('a[rel^=#]').click(function(e){ - e.stopPropagation(); menu = $( $(this).attr('rel') ); + e.stopPropagation(); + if (menu.attr('popup')=="false") return false; $(this).parent().toggleClass("selected"); menu.toggle(); return false; @@ -72,6 +73,7 @@ /* notifications template */ var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html()); + var notifications_empty = unescape($("#nav-notifications-menu").html()); /* nav update event */ $('nav').bind('nav-update', function(e,data){; @@ -88,12 +90,15 @@ if (notif>0){ nnm = $("#nav-notifications-menu"); nnm.html(""); + nnm.attr('popup','true'); eNotif.children("note").each(function(){ e = $(this); text = e.text().format(""+e.attr('name')+""); html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date')); nnm.append(html); }); + } else { + $("#nav-notifications-menu").html(notifications_empty); } if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') } $('#notify-update').html(notif); -- cgit v1.2.3 From d12e2cbfe913529fbca0cc75c4f157ae42db616d Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Fri, 29 Jul 2011 16:23:47 +0200 Subject: Fix nav template and add missing strings --- include/nav.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'include') diff --git a/include/nav.php b/include/nav.php index caed9453a..bb1a5b2d8 100644 --- a/include/nav.php +++ b/include/nav.php @@ -37,8 +37,26 @@ function nav(&$a) { * Display login or logout */ + $nav['usermenu']=array(); + $userinfo = null; + if(local_user()) { $nav['logout'] = Array('logout',t('Logout'), "", t('End this session')); + + // user menu + $nav['usermenu'][] = Array('profile/' . $a->user['nickname'], t('Status'), "", t('Your posts and conversations')); + $nav['usermenu'][] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); + $nav['usermenu'][] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); + $nav['usermenu'][] = Array('events/', t('Events'), "", t('Your events')); + $nav['usermenu'][] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); + + // user info + $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); + $userinfo = array( + 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"), + 'name' => $a->user['username'], + ); + } else { $nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'selected':''), t('Sign in')); @@ -137,6 +155,8 @@ function nav(&$a) { '$sitelocation' => $sitelocation, '$nav' => $nav, '$banner' => $banner, + '$emptynotifications' => t('Nothing new here'), + '$userinfo' => $userinfo, )); call_hooks('page_header', $a->page['nav']); -- cgit v1.2.3 From 07b6c868b3a66efc2737dfc6459b4114fea59ba0 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Wed, 17 Aug 2011 18:36:24 +0200 Subject: remove javascript to set selectect nav item. enanche img template prefetch ignoring --- include/nav.php | 20 ++++++++++++++++++++ include/template_processor.php | 13 ++++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/nav.php b/include/nav.php index bb1a5b2d8..f9e72bda7 100644 --- a/include/nav.php +++ b/include/nav.php @@ -157,8 +157,28 @@ function nav(&$a) { '$banner' => $banner, '$emptynotifications' => t('Nothing new here'), '$userinfo' => $userinfo, + '$sel' => $a->nav_sel, )); call_hooks('page_header', $a->page['nav']); +} +/* + * Set a menu item in navbar as selected + * + */ +function nav_set_selected($item){ + $a = get_app(); + $a->nav_sel = array( + 'community' => null, + 'network' => null, + 'home' => null, + 'profiles' => null, + 'notifications' => null, + 'messages' => null, + 'directyory' => null, + 'settings' => null, + 'contacts' => null, + ); + $a->nav_sel[$item] = 'selected'; } diff --git a/include/template_processor.php b/include/template_processor.php index f1d2eae4e..11769bbd0 100644 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -11,15 +11,18 @@ private function _preg_error(){ switch(preg_last_error()){ - case PREG_INTERNAL_ERROR: die('PREG_INTERNAL_ERROR'); break; - case PREG_BACKTRACK_LIMIT_ERROR: die('PREG_BACKTRACK_LIMIT_ERROR'); break; - case PREG_RECURSION_LIMIT_ERROR: die('PREG_RECURSION_LIMIT_ERROR'); break; - case PREG_BAD_UTF8_ERROR: die('PREG_BAD_UTF8_ERROR'); break; - case PREG_BAD_UTF8_OFFSET_ERROR: die('PREG_BAD_UTF8_OFFSET_ERROR'); break; + case PREG_INTERNAL_ERROR: echo('PREG_INTERNAL_ERROR'); break; + case PREG_BACKTRACK_LIMIT_ERROR: echo('PREG_BACKTRACK_LIMIT_ERROR'); break; + case PREG_RECURSION_LIMIT_ERROR: echo('PREG_RECURSION_LIMIT_ERROR'); break; + case PREG_BAD_UTF8_ERROR: echo('PREG_BAD_UTF8_ERROR'); break; + case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break; default: //die("Unknown preg error."); return; } + echo "
";
+			debug_print_backtrace();
+			die();
 		}
 		
 		private function _build_replace($r, $prefix){
-- 
cgit v1.2.3


From 5ce6f893a64984eae9685db305b8d29ae3ced509 Mon Sep 17 00:00:00 2001
From: Fabio Comuni 
Date: Wed, 31 Aug 2011 16:18:03 +0200
Subject: Apps popup menu in navbar

---
 include/nav.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/nav.php b/include/nav.php
index f9e72bda7..b290a8da2 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -81,7 +81,7 @@ function nav(&$a) {
 	if(! get_config('system','hide_help'))
 		$nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'));
 
-	if($a->apps)
+	if(count($a->apps)>0)
 		$nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games'));
 
 	$nav['search'] = array('search', t('Search'), "", t('Search site content'));
@@ -158,6 +158,7 @@ function nav(&$a) {
 		'$emptynotifications' => t('Nothing new here'),
 		'$userinfo' => $userinfo,
 		'$sel' => 	$a->nav_sel,
+		'$apps' => $a->apps,
 	));
 
 	call_hooks('page_header', $a->page['nav']);
-- 
cgit v1.2.3


From 8b615133d528eb074a23746afef6201f474a4e3f Mon Sep 17 00:00:00 2001
From: Fabio Comuni 
Date: Wed, 31 Aug 2011 17:31:44 +0200
Subject: remove html from profile vcard code

---
 include/text.php | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

(limited to 'include')

diff --git a/include/text.php b/include/text.php
index 66447069e..075caee00 100644
--- a/include/text.php
+++ b/include/text.php
@@ -539,22 +539,30 @@ function contact_block() {
 		$total = intval($r[0]['total']);
 	}
 	if(! $total) {
-		$o .= '
' . t('No contacts') . '
';
-		return $o;
-	}
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 ORDER BY RAND() LIMIT %d",
-			intval($a->profile['uid']),
-			intval($shown)
-	);
-	if(count($r)) {
-		$o .= '
' .  sprintf( tt('%d Contact','%d Contacts', $total),$total) . '
';
-		foreach($r as $rr) {
-			$o .= micropro($rr,true,'mpfriend');
-		}
-		$o .= '
';
-		$o .=  '';
+		$contacts = t('No contacts');
+		$micropro = Null;
 		
+	} else {
+		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 ORDER BY RAND() LIMIT %d",
+				intval($a->profile['uid']),
+				intval($shown)
+		);
+		if(count($r)) {
+			$contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total);
+			$micropro = Array();
+			foreach($r as $rr) {
+				$micropro[] = micropro($rr,true,'mpfriend');
+			}
+		}
 	}
+	
+	$tpl = get_markup_template('contact_block.tpl');
+	$o = replace_macros($tpl, array(
+		'$contacts' => $contacts,
+		'$nickname' => $a->profile['nickname'],
+		'$viewcontacts' => t('View Contacts'),
+		'$micropro' => $micropro,
+	));
 
 	$arr = array('contacts' => $r, 'output' => $o);
 
-- 
cgit v1.2.3


From 20ca4512000e80386fe6f9b3fd85864bc0e91627 Mon Sep 17 00:00:00 2001
From: Fabio Comuni 
Date: Mon, 5 Sep 2011 11:15:30 +0200
Subject: move js to js folder

---
 include/acl.js               | 240 ---------------
 include/ajaxupload.js        | 695 -------------------------------------------
 include/country.js           | 438 ---------------------------
 include/jquery.htmlstream.js | 157 ----------
 include/jquery.js            | 154 ----------
 include/main.js              | 426 --------------------------
 6 files changed, 2110 deletions(-)
 delete mode 100644 include/acl.js
 delete mode 100644 include/ajaxupload.js
 delete mode 100644 include/country.js
 delete mode 100644 include/jquery.htmlstream.js
 delete mode 100644 include/jquery.js
 delete mode 100644 include/main.js

(limited to 'include')

diff --git a/include/acl.js b/include/acl.js
deleted file mode 100644
index 82b631ee9..000000000
--- a/include/acl.js
+++ /dev/null
@@ -1,240 +0,0 @@
-function ACL(backend_url, preset){
-	that = this;
-	
-	that.url = backend_url;
-	
-	that.kp_timer = null;
-	
-	if (preset==undefined) preset = [];
-	that.allow_cid = (preset[0] || []);
-	that.allow_gid = (preset[1] || []);
-	that.deny_cid  = (preset[2] || []);
-	that.deny_gid  = (preset[3] || []);
-	that.group_uids = [];
-	that.nw = 4; //items per row. should be calulated from #acl-list.width
-	
-	that.list_content = $("#acl-list-content");
-	that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html());
-	that.showall = $("#acl-showall");
-
-	if (preset.length==0) that.showall.addClass("selected");
-	
-	/*events*/
-	that.showall.click(that.on_showall);
-	$(".acl-button-show").live('click', that.on_button_show);
-	$(".acl-button-hide").live('click', that.on_button_hide);
-	$("#acl-search").keypress(that.on_search);
-	$("#acl-wrapper").parents("form").submit(that.on_submit);
-	
-	/* startup! */
-	that.get(0,100);
-}
-
-ACL.prototype.on_submit = function(){
-	aclfileds = $("#acl-fields").html("");
-	$(that.allow_gid).each(function(i,v){
-		aclfileds.append("");
-	});
-	$(that.allow_cid).each(function(i,v){
-		aclfileds.append("");
-	});
-	$(that.deny_gid).each(function(i,v){
-		aclfileds.append("");
-	});
-	$(that.deny_cid).each(function(i,v){
-		aclfileds.append("");
-	});	
-}
-
-ACL.prototype.search = function(){
-	var srcstr = $("#acl-search").val();
-	that.list_content.html("");
-	that.get(0,100, srcstr);
-}
-
-ACL.prototype.on_search = function(event){
-	if (that.kp_timer) clearTimeout(that.kp_timer);
-	that.kp_timer = setTimeout( that.search, 1000);
-}
-
-ACL.prototype.on_showall = function(event){
-	event.stopPropagation();
-	if (that.showall.hasClass("selected")){
-		return false;
-	}
-	that.showall.addClass("selected");
-	
-	that.allow_cid = [];
-	that.allow_gid = [];
-	that.deny_cid  = [];
-	that.deny_gid  = [];
-	
-	that.updateview();
-	
-	return false;
-}
-
-ACL.prototype.on_button_show = function(event){
-	event.stopPropagation();
-
-	/*that.showall.removeClass("selected");
-	$(this).siblings(".acl-button-hide").removeClass("selected");
-	$(this).toggleClass("selected");*/
-
-	that.set_allow($(this).parent().attr('id'));
-
-	return false;
-}
-ACL.prototype.on_button_hide = function(event){
-	event.stopPropagation();
-
-	/*that.showall.removeClass("selected");
-	$(this).siblings(".acl-button-show").removeClass("selected");
-	$(this).toggleClass("selected");*/
-
-	that.set_deny($(this).parent().attr('id'));
-
-	return false;
-}
-
-ACL.prototype.set_allow = function(itemid){
-	type = itemid[0];
-	id 	 = parseInt(itemid.substr(1));
-	switch(type){
-		case "g":
-			if (that.allow_gid.indexOf(id)<0){
-				that.allow_gid.push(id)
-			}else {
-				that.allow_gid.remove(id);
-			}
-			if (that.deny_gid.indexOf(id)>=0) that.deny_gid.remove(id);
-			break;
-		case "c":
-			if (that.allow_cid.indexOf(id)<0){
-				that.allow_cid.push(id)
-			} else {
-				that.allow_cid.remove(id);
-			}
-			if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id);			
-			break;
-	}
-	that.updateview();
-}
-
-ACL.prototype.set_deny = function(itemid){
-	type = itemid[0];
-	id 	 = parseInt(itemid.substr(1));
-	switch(type){
-		case "g":
-			if (that.deny_gid.indexOf(id)<0){
-				that.deny_gid.push(id)
-			} else {
-				that.deny_gid.remove(id);
-			}
-			if (that.allow_gid.indexOf(id)>=0) that.allow_gid.remove(id);
-			break;
-		case "c":
-			if (that.deny_cid.indexOf(id)<0){
-				that.deny_cid.push(id)
-			} else {
-				that.deny_cid.remove(id);
-			}
-			if (that.allow_cid.indexOf(id)>=0) that.allow_cid.remove(id);
-			break;
-	}
-	that.updateview();
-}
-
-ACL.prototype.updateview = function(){
-	if (that.allow_gid.length==0 && that.allow_cid.length==0 &&
-		that.deny_gid.length==0 && that.deny_cid.length==0){
-			that.showall.addClass("selected");
-			/* jot acl */
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-				$('.profile-jot-net input').attr('disabled', false);			
-				if(editor != false) {
-					$('#profile-jot-desc').html(ispublic);
-				}
-			
-	} else {
-			that.showall.removeClass("selected");
-			/* jot acl */
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-				$('.profile-jot-net input').attr('disabled', 'disabled');			
-				$('#profile-jot-desc').html(' ');
-	}
-	
-	$("#acl-list-content .acl-list-item").each(function(){
-		itemid = $(this).attr('id');
-		type = itemid[0];
-		id 	 = parseInt(itemid.substr(1));
-		
-		btshow = $(this).children(".acl-button-show").removeClass("selected");
-		bthide = $(this).children(".acl-button-hide").removeClass("selected");	
-		
-		switch(type){
-			case "g":
-				var uclass = "";
-				if (that.allow_gid.indexOf(id)>=0){
-					btshow.addClass("selected");
-					bthide.removeClass("selected");
-					uclass="groupshow";
-				}
-				if (that.deny_gid.indexOf(id)>=0){
-					btshow.removeClass("selected");
-					bthide.addClass("selected");
-					uclass="grouphide";
-				}
-				
-				$(that.group_uids[id]).each(function(i,v){
-					$("#c"+v).removeClass("groupshow grouphide").addClass(uclass);
-				});
-				
-				break;
-			case "c":
-				if (that.allow_cid.indexOf(id)>=0){
-					btshow.addClass("selected");
-					bthide.removeClass("selected");
-				}
-				if (that.deny_cid.indexOf(id)>=0){
-					btshow.removeClass("selected");
-					bthide.addClass("selected");
-				}			
-		}
-		
-	});
-	
-}
-
-
-ACL.prototype.get = function(start,count, search){
-	var postdata = {
-		start:start,
-		count:count,
-		search:search,
-	}
-	
-	$.ajax({
-		type:'POST',
-		url: that.url,
-		data: postdata,
-		dataType: 'json',
-		success:that.populate
-	});
-}
-
-ACL.prototype.populate = function(data){
-	var height = Math.ceil(data.tot / that.nw) * 42;
-	that.list_content.height(height);
-	$(data.items).each(function(){
-		html = "
"+that.item_tpl+"
";
-		html = html.format( this.photo, this.name, this.type, this.id, '', this.network );
-		if (this.uids!=undefined) that.group_uids[this.id] = this.uids;
-		//console.log(html);
-		that.list_content.append(html);
-	});
-	that.updateview();
-}
-
diff --git a/include/ajaxupload.js b/include/ajaxupload.js
deleted file mode 100644
index 67c4a56fb..000000000
--- a/include/ajaxupload.js
+++ /dev/null
@@ -1,695 +0,0 @@
-/**
- * AJAX Upload ( http://valums.com/ajax-upload/ ) 
- * Copyright (c) Andris Valums
- * Licensed under the MIT license ( http://valums.com/mit-license/ )
- * Thanks to Gary Haran, David Mark, Corey Burns and others for contributions. 
- */
-
-(function () {
-    /* global window */
-    /* jslint browser: true, devel: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true */
-    
-    /**
-     * Wrapper for FireBug's console.log
-     */
-    function log(){
-        if (typeof(console) != 'undefined' && typeof(console.log) == 'function'){            
-            Array.prototype.unshift.call(arguments, '[Ajax Upload]');
-            console.log( Array.prototype.join.call(arguments, ' '));
-        }
-    } 
-
-    /**
-     * Attaches event to a dom element.
-     * @param {Element} el
-     * @param type event name
-     * @param fn callback This refers to the passed element
-     */
-    function addEvent(el, type, fn){
-        if (el.addEventListener) {
-            el.addEventListener(type, fn, false);
-        } else if (el.attachEvent) {
-            el.attachEvent('on' + type, function(){
-                fn.call(el);
-	        });
-	    } else {
-            throw new Error('not supported or DOM not loaded');
-        }
-    }   
-    
-    /**
-     * Attaches resize event to a window, limiting
-     * number of event fired. Fires only when encounteres
-     * delay of 100 after series of events.
-     * 
-     * Some browsers fire event multiple times when resizing
-     * http://www.quirksmode.org/dom/events/resize.html
-     * 
-     * @param fn callback This refers to the passed element
-     */
-    function addResizeEvent(fn){
-        var timeout;
-               
-	    addEvent(window, 'resize', function(){
-            if (timeout){
-                clearTimeout(timeout);
-            }
-            timeout = setTimeout(fn, 100);                        
-        });
-    }    
-    
-    // Needs more testing, will be rewriten for next version        
-    // getOffset function copied from jQuery lib (http://jquery.com/)
-    if (document.documentElement.getBoundingClientRect){
-        // Get Offset using getBoundingClientRect
-        // http://ejohn.org/blog/getboundingclientrect-is-awesome/
-        var getOffset = function(el){
-            var box = el.getBoundingClientRect();
-            var doc = el.ownerDocument;
-            var body = doc.body;
-            var docElem = doc.documentElement; // for ie 
-            var clientTop = docElem.clientTop || body.clientTop || 0;
-            var clientLeft = docElem.clientLeft || body.clientLeft || 0;
-             
-            // In Internet Explorer 7 getBoundingClientRect property is treated as physical,
-            // while others are logical. Make all logical, like in IE8.	
-            var zoom = 1;            
-            if (body.getBoundingClientRect) {
-                var bound = body.getBoundingClientRect();
-                zoom = (bound.right - bound.left) / body.clientWidth;
-            }
-            
-            if (zoom > 1) {
-                clientTop = 0;
-                clientLeft = 0;
-            }
-            
-            var top = box.top / zoom + (window.pageYOffset || docElem && docElem.scrollTop / zoom || body.scrollTop / zoom) - clientTop, left = box.left / zoom + (window.pageXOffset || docElem && docElem.scrollLeft / zoom || body.scrollLeft / zoom) - clientLeft;
-            
-            return {
-                top: top,
-                left: left
-            };
-        };        
-    } else {
-        // Get offset adding all offsets 
-        var getOffset = function(el){
-            var top = 0, left = 0;
-            do {
-                top += el.offsetTop || 0;
-                left += el.offsetLeft || 0;
-                el = el.offsetParent;
-            } while (el);
-            
-            return {
-                left: left,
-                top: top
-            };
-        };
-    }
-    
-    /**
-     * Returns left, top, right and bottom properties describing the border-box,
-     * in pixels, with the top-left relative to the body
-     * @param {Element} el
-     * @return {Object} Contains left, top, right,bottom
-     */
-    function getBox(el){
-        var left, right, top, bottom;
-        var offset = getOffset(el);
-        left = offset.left;
-        top = offset.top;
-        
-        right = left + el.offsetWidth;
-        bottom = top + el.offsetHeight;
-        
-        return {
-            left: left,
-            right: right,
-            top: top,
-            bottom: bottom
-        };
-    }
-    
-    /**
-     * Helper that takes object literal
-     * and add all properties to element.style
-     * @param {Element} el
-     * @param {Object} styles
-     */
-    function addStyles(el, styles){
-        for (var name in styles) {
-            if (styles.hasOwnProperty(name)) {
-                el.style[name] = styles[name];
-            }
-        }
-    }
-        
-    /**
-     * Function places an absolutely positioned
-     * element on top of the specified element
-     * copying position and dimentions.
-     * @param {Element} from
-     * @param {Element} to
-     */    
-    function copyLayout(from, to){
-	    var box = getBox(from);
-        
-        addStyles(to, {
-	        position: 'absolute',                    
-	        left : box.left + 'px',
-	        top : box.top + 'px',
-	        width : from.offsetWidth + 'px',
-	        height : from.offsetHeight + 'px'
-	    });        
-	to.title = from.title;
-
-    }
-
-    /**
-    * Creates and returns element from html chunk
-    * Uses innerHTML to create an element
-    */
-    var toElement = (function(){
-        var div = document.createElement('div');
-        return function(html){
-            div.innerHTML = html;
-            var el = div.firstChild;
-            return div.removeChild(el);
-        };
-    })();
-            
-    /**
-     * Function generates unique id
-     * @return unique id 
-     */
-    var getUID = (function(){
-        var id = 0;
-        return function(){
-            return 'ValumsAjaxUpload' + id++;
-        };
-    })();        
- 
-    /**
-     * Get file name from path
-     * @param {String} file path to file
-     * @return filename
-     */  
-    function fileFromPath(file){
-        return file.replace(/.*(\/|\\)/, "");
-    }
-    
-    /**
-     * Get file extension lowercase
-     * @param {String} file name
-     * @return file extenstion
-     */    
-    function getExt(file){
-        return (-1 !== file.indexOf('.')) ? file.replace(/.*[.]/, '') : '';
-    }
-
-    function hasClass(el, name){        
-        var re = new RegExp('\\b' + name + '\\b');        
-        return re.test(el.className);
-    }    
-    function addClass(el, name){
-        if ( ! hasClass(el, name)){   
-            el.className += ' ' + name;
-        }
-    }    
-    function removeClass(el, name){
-        var re = new RegExp('\\b' + name + '\\b');                
-        el.className = el.className.replace(re, '');        
-    }
-    
-    function removeNode(el){
-        el.parentNode.removeChild(el);
-    }
-
-    /**
-     * Easy styling and uploading
-     * @constructor
-     * @param button An element you want convert to 
-     * upload button. Tested dimentions up to 500x500px
-     * @param {Object} options See defaults below.
-     */
-    window.AjaxUpload = function(button, options){
-        this._settings = {
-            // Location of the server-side upload script
-            action: 'upload.php',
-            // File upload name
-            name: 'userfile',
-            // Additional data to send
-            data: {},
-            // Submit file as soon as it's selected
-            autoSubmit: true,
-            // The type of data that you're expecting back from the server.
-            // html and xml are detected automatically.
-            // Only useful when you are using json data as a response.
-            // Set to "json" in that case. 
-            responseType: false,
-            // Class applied to button when mouse is hovered
-            hoverClass: 'hover',
-            // Class applied to button when button is focused
-            focusClass: 'focus',
-            // Class applied to button when AU is disabled
-            disabledClass: 'disabled',            
-            // When user selects a file, useful with autoSubmit disabled
-            // You can return false to cancel upload			
-            onChange: function(file, extension){
-            },
-            // Callback to fire before file is uploaded
-            // You can return false to cancel upload
-            onSubmit: function(file, extension){
-            },
-            // Fired when file upload is completed
-            // WARNING! DO NOT USE "FALSE" STRING AS A RESPONSE!
-            onComplete: function(file, response){
-            }
-        };
-                        
-        // Merge the users options with our defaults
-        for (var i in options) {
-            if (options.hasOwnProperty(i)){
-                this._settings[i] = options[i];
-            }
-        }
-                
-        // button isn't necessary a dom element
-        if (button.jquery){
-            // jQuery object was passed
-            button = button[0];
-        } else if (typeof button == "string") {
-            if (/^#.*/.test(button)){
-                // If jQuery user passes #elementId don't break it					
-                button = button.slice(1);                
-            }
-            
-            button = document.getElementById(button);
-        }
-        
-        if ( ! button || button.nodeType !== 1){
-            throw new Error("Please make sure that you're passing a valid element"); 
-        }
-                
-        if ( button.nodeName.toUpperCase() == 'A'){
-            // disable link                       
-            addEvent(button, 'click', function(e){
-                if (e && e.preventDefault){
-                    e.preventDefault();
-                } else if (window.event){
-                    window.event.returnValue = false;
-                }
-            });
-        }
-                    
-        // DOM element
-        this._button = button;        
-        // DOM element                 
-        this._input = null;
-        // If disabled clicking on button won't do anything
-        this._disabled = false;
-        
-        // if the button was disabled before refresh if will remain
-        // disabled in FireFox, let's fix it
-        this.enable();        
-        
-        this._rerouteClicks();
-    };
-    
-    // assigning methods to our class
-    AjaxUpload.prototype = {
-        setData: function(data){
-            this._settings.data = data;
-        },
-        disable: function(){            
-            addClass(this._button, this._settings.disabledClass);
-            this._disabled = true;
-            
-            var nodeName = this._button.nodeName.toUpperCase();            
-            if (nodeName == 'INPUT' || nodeName == 'BUTTON'){
-                this._button.setAttribute('disabled', 'disabled');
-            }            
-            
-            // hide input
-            if (this._input){
-                // We use visibility instead of display to fix problem with Safari 4
-                // The problem is that the value of input doesn't change if it 
-                // has display none when user selects a file           
-                this._input.parentNode.style.visibility = 'hidden';
-            }
-        },
-        enable: function(){
-            removeClass(this._button, this._settings.disabledClass);
-            this._button.removeAttribute('disabled');
-            this._disabled = false;
-            
-        },
-        /**
-         * Creates invisible file input 
-         * that will hover above the button
-         * 

-         */
-        _createInput: function(){ 
-            var self = this;
-                        
-            var input = document.createElement("input");
-            input.setAttribute('type', 'file');
-            input.setAttribute('name', this._settings.name);
-
-            addStyles(input, {
-                'position' : 'absolute',
-                // in Opera only 'browse' button
-                // is clickable and it is located at
-                // the right side of the input
-                'right' : 0,
-                'margin' : 0,
-                'padding' : 0,
-                'fontSize' : '480px',
-                // in Firefox if font-family is set to
-                // 'inherit' the input doesn't work
-                'fontFamily' : 'sans-serif',
-                'cursor' : 'pointer'
-            });            
-
-            var div = document.createElement("div");                        
-            addStyles(div, {
-                'display' : 'block',
-                'position' : 'absolute',
-                'overflow' : 'hidden',
-                'margin' : 0,
-                'padding' : 0,                
-                'opacity' : 0,
-                // Make sure browse button is in the right side
-                // in Internet Explorer
-                'direction' : 'ltr',
-                //Max zIndex supported by Opera 9.0-9.2
-                'zIndex': 2147483583,
-				'cursor' : 'pointer'
-
-            });
-            
-            // Make sure that element opacity exists.
-            // Otherwise use IE filter            
-            if ( div.style.opacity !== "0") {
-                if (typeof(div.filters) == 'undefined'){
-                    throw new Error('Opacity not supported by the browser');
-                }
-                div.style.filter = "alpha(opacity=0)";
-            }            
-            
-            addEvent(input, 'change', function(){
-                 
-                if ( ! input || input.value === ''){                
-                    return;                
-                }
-                            
-                // Get filename from input, required                
-                // as some browsers have path instead of it          
-                var file = fileFromPath(input.value);
-                                
-                if (false === self._settings.onChange.call(self, file, getExt(file))){
-                    self._clearInput();                
-                    return;
-                }
-                
-                // Submit form when value is changed
-                if (self._settings.autoSubmit) {
-                    self.submit();
-                }
-            });            
-
-            addEvent(input, 'mouseover', function(){
-                addClass(self._button, self._settings.hoverClass);
-            });
-            
-            addEvent(input, 'mouseout', function(){
-                removeClass(self._button, self._settings.hoverClass);
-                removeClass(self._button, self._settings.focusClass);
-                
-                // We use visibility instead of display to fix problem with Safari 4
-                // The problem is that the value of input doesn't change if it 
-                // has display none when user selects a file           
-                input.parentNode.style.visibility = 'hidden';
-
-            });   
-                        
-            addEvent(input, 'focus', function(){
-                addClass(self._button, self._settings.focusClass);
-            });
-            
-            addEvent(input, 'blur', function(){
-                removeClass(self._button, self._settings.focusClass);
-            });
-            
-	        div.appendChild(input);
-            document.body.appendChild(div);
-              
-            this._input = input;
-        },
-        _clearInput : function(){
-            if (!this._input){
-                return;
-            }            
-                             
-            // this._input.value = ''; Doesn't work in IE6                               
-            removeNode(this._input.parentNode);
-            this._input = null;                                                                   
-            this._createInput();
-            
-            removeClass(this._button, this._settings.hoverClass);
-            removeClass(this._button, this._settings.focusClass);
-        },
-        /**
-         * Function makes sure that when user clicks upload button,
-         * the this._input is clicked instead
-         */
-        _rerouteClicks: function(){
-            var self = this;
-            
-            // IE will later display 'access denied' error
-            // if you use using self._input.click()
-            // other browsers just ignore click()
-
-            addEvent(self._button, 'mouseover', function(){
-                if (self._disabled){
-                    return;
-                }
-                                
-                if ( ! self._input){
-	                self._createInput();
-                }
-                
-                var div = self._input.parentNode;                            
-                copyLayout(self._button, div);
-                div.style.visibility = 'visible';
-                                
-            });
-            
-            
-            // commented because we now hide input on mouseleave
-            /**
-             * When the window is resized the elements 
-             * can be misaligned if button position depends
-             * on window size
-             */
-            //addResizeEvent(function(){
-            //    if (self._input){
-            //        copyLayout(self._button, self._input.parentNode);
-            //    }
-            //});            
-                                         
-        },
-        /**
-         * Creates iframe with unique name
-         * @return {Element} iframe
-         */
-        _createIframe: function(){
-            // We can't use getTime, because it sometimes return
-            // same value in safari :(
-            var id = getUID();            
-             
-            // We can't use following code as the name attribute
-            // won't be properly registered in IE6, and new window
-            // on form submit will open
-            // var iframe = document.createElement('iframe');
-            // iframe.setAttribute('name', id);                        
- 
-            var iframe = toElement('