Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 39 insertions, 23 deletions

diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 4f70752c0..68190778c 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -1,39 +1,55 @@
-
+/**
+ * redbasic theme specific JavaScript
+ */
 $(document).ready(function() {
+	// CSS3 calc() fallback (for unsupported browsers)
+	$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
+	if( $('#css3-calc').width() == 10) {
+		$(window).resize(function() {
+			if($(window).width() < 767) {
+				$('main').css('width', $(window).width() + 231 );
+			} else {
+				$('main').css('width', '100%' );
+			}
+		});
+	}
+	$('#css3-calc').remove(); // Remove the test element
 
-$('#expand-aside').click(function() {
-	$('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left');
-	$('main').toggleClass('region_1-on');
-});
-
-if($('aside').length && $('aside').html().length == 0) {
-	$('#expand-aside').hide();
-}
+	$('#expand-aside').click(function() {
+		$('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left');
+		$('main').toggleClass('region_1-on');
+	});
 
-$('#expand-tabs').click(function() {
-	if(!$('#tabs-collapse-1').hasClass('in')){
-		$('html, body').animate({ scrollTop: 0 }, 'slow');
+	if($('aside').length && $('aside').html().length === 0) {
+		$('#expand-aside').hide();
 	}
-	$('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up');
-});
 
-if($('#tabs-collapse-1').length == 0) {
-	$('#expand-tabs').hide();
-}
+	$('#expand-tabs').click(function() {
+		if(!$('#tabs-collapse-1').hasClass('in')){
+			$('html, body').animate({ scrollTop: 0 }, 'slow');
+		}
+		$('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up');
+	});
 
-});
+	if($('#tabs-collapse-1').length === 0) {
+		$('#expand-tabs').hide();
+	}
 
+	$("input[data-role=cat-tagsinput]").tagsinput({
+		tagClass: 'label label-primary'
+	});
+});
 
 $(document).ready(function(){
 	var doctitle = document.title;
 	function checkNotify() {
 		var notifyUpdateElem = document.getElementById('notify-update');
 		if(notifyUpdateElem !== null) { 
-	        if(notifyUpdateElem.innerHTML != "")
-    		    document.title = "("+notifyUpdateElem.innerHTML+") " + doctitle;
-	        else
-    		    document.title = doctitle;
+			if(notifyUpdateElem.innerHTML !== "")
+				document.title = "(" + notifyUpdateElem.innerHTML + ") " + doctitle;
+			else
+				document.title = doctitle;
 		}
-	};
+	}
 	setInterval(function () {checkNotify();}, 10 * 1000);
 });