Merge https://github.com/redmatrix/hubzilla into pending_merge

12 files changed, 57 insertions, 52 deletions

diff --git a/include/widgets.php b/include/widgets.php
index a995fdf1c..aa0be87d6 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -1197,7 +1197,7 @@ function widget_forums($arr) {
 
 	$perms_sql = item_permissions_sql(local_channel()) . item_normal();
 
-	$r1 = q("select * from abook left join xchan on abook_xchan = xchan_hash where ( xchan_pubforum = 1 or ((abook_their_perms & %d ) != 0 and (abook_their_perms & %d ) = 0) ) and abook_channel = %d order by xchan_name $limit ",
+	$r1 = q("select * from abook left join xchan on abook_xchan = xchan_hash where ( xchan_pubforum = 1 or ((abook_their_perms & %d ) != 0 and (abook_their_perms & %d ) = 0) ) and xchan_deleted = 0 and abook_channel = %d order by xchan_name $limit ",
 		intval(PERMS_W_TAGWALL),
 		intval(PERMS_W_STREAM),
 		intval(local_channel())
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 0ff78e873..a7cd5875c 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -560,7 +560,7 @@ CREATE TABLE "iconfig" (
   "k" text NOT NULL DEFAULT '',
   "v" text NOT NULL DEFAULT '',
   "sharing" int NOT NULL DEFAULT '0',
-  PRIMARY_KEY("id")
+  PRIMARY KEY("id")
 );
 create index "iconfig_iid" on iconfig ("iid");
 create index "iconfig_cat" on iconfig ("cat");
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 9063ffa60..39c973c14 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -19,20 +19,30 @@ code {
 	display:none;
 }
 
+#jot-title-wrap,
+#jot-pagetitle-wrap,
+#jot-category-wrap {
+	border-bottom: 1px solid #ccc;
+}
+
+#jot-attachment-wrap {
+	border-top: 1px solid #ccc;
+}
+
 #jot-title-wrap input,
 #jot-pagetitle-wrap input {
-	padding: 8px;
-	margin-bottom: 5px;
+	padding: 10px;
 }
 
 .profile-jot-text {
 	height: 39px;
-	padding: 8px;
+	padding: 10px;
 	width: 100%;
 }
 
 .jot-attachment {
-	padding: 8px;
+	border: 0px;
+	padding: 10px;
 	width: 100%;
 }
 
@@ -42,13 +52,18 @@ code {
 }
 
 #profile-jot-submit-wrapper {
-	margin-top: 10px;
+	border-top: 1px solid #ccc;
+	padding: 10px;
 }
 
 #profile-jot-perms-end {
 	height: 30px;
 }
 
+#profile-jot-form {
+	line-height: initial;
+}
+
 #profile-jot-wrapper {
 	margin-bottom: 30px;
 }
@@ -194,6 +209,7 @@ a.wall-item-name-link {
 	padding: 8px;
 	height: 150px;
 	overflow: auto;
+	resize: vertical;
 }
 
 .qcomment {
diff --git a/view/css/mod_cloud.css b/view/css/mod_cloud.css
index 76ac82690..ed07ceb6f 100644
--- a/view/css/mod_cloud.css
+++ b/view/css/mod_cloud.css
@@ -38,6 +38,6 @@
 }
 
 #files-upload {
-	padding: 4px;
+	padding: 7px 10px;
 	width: 100%;
 }
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index ae250bc1c..72dd7ffe7 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -25,7 +25,7 @@
 }
 
 #photos-upload-choose {
-	padding: 4px;
+	padding: 7px 10px;
 	width: 100%;
 }
 
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 5dca2785c..2cf311baa 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -295,7 +295,7 @@ footer {
 
 .vcard {
 	margin-bottom: 10px;
-	padding: 10px;
+	padding: 0px 10px 10px 10px;
 	background-color: rgba(254,254,254,0.5);
 	border: 1px solid rgba(254,254,254,0.5);
 	-moz-border-radius: $radiuspx;
@@ -341,9 +341,7 @@ footer {
 #profile-photo-wrapper {
 	width: 251px;
 	height: 251px;
-	margin-top: -10px;
 	margin-bottom: 10px;
-	border: 1px solid #ccc;
 	border-radius: $radiuspx;
 }
 
@@ -1142,7 +1140,6 @@ img.mail-conv-sender-photo {
 
 .jothidden {
 	font-weight: bold;
-	border-radius: $radiuspx;
 }
 
 .jothidden input::-webkit-input-placeholder {
@@ -1153,30 +1150,26 @@ img.mail-conv-sender-photo {
 	font-weight: bold;
 }
 
-.jothidden > input {
-	border: 1px solid transparent;
-	background-color: transparent;
-}
-.jothidden > input:hover,
-.jothidden > input:focus {
-	border: 1px solid #cccccc;
-	background-color: #fff;
-}
+
 
 #profile-jot-wrapper {
-	background-color: rgba(254,254,254,.5);
-	border: 1px solid rgba(254,254,254,.5);
+	background-color: rgba(254,254,254,1);
+	border: 1px solid #ccc;
 	border-radius: $radiuspx;
 
 }
 
 #profile-jot-text {
-	color:#000;
-	border: 1px solid #cccccc;
-	-moz-border-radius: $radiuspx;
+	resize: none;
+	border-width: 0px;
 	border-radius: $radiuspx;
 }
 
+#profile-jot-text:focus {
+	resize: vertical;
+}
+
+
 #profile-jot-text::-webkit-input-placeholder {
 	font-size:16px;
 }
@@ -1515,7 +1508,7 @@ nav .dropdown-menu {
 .section-content-tools-wrapper {
 	padding: 7px 10px;
 	background-color: $comment_item_colour;
-	border-bottom: 3px solid $comment_item_colour;
+	border-bottom: 3px solid comment_item_colour;
 }
 
 .section-content-info-wrapper {
@@ -1709,9 +1702,8 @@ nav .badge.mail-update:hover {
 
 .nav-tabs.nav-justified {
 	background-color: rgba(254,254,254,.5);
-	border: 1px solid rgba(254,254,254,.5);
-	border-top-left-radius: $radiuspx;
-	border-top-right-radius: $radiuspx;
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
 }
 
 .nav-tabs.nav-justified > .active > a,
@@ -1824,13 +1816,13 @@ nav .badge.mail-update:hover {
 
 /* Modified original CSS to match input in Redbasic */
 .jothidden .bootstrap-tagsinput {
-	border-color: $bgcolour;
-	background-color: $bgcolour;
+	border: 0px solid transparent;
+	margin-bottom: 0px;
 	box-shadow: none;
 	display: inline-block;
 	border-radius: $radiuspx;
 	cursor: text;
-	padding: 0px 8px;
+	padding: 0px 10px;
 	width: 100%;
 }
 
@@ -1838,11 +1830,6 @@ nav .badge.mail-update:hover {
 	font-size: 100%;
 }
 
-.jothidden .bootstrap-tagsinput:hover, .jothidden .bootstrap-tagsinput:focus {
-	border: 1px solid #ccc;
-	background-color: #fff;
-}
-
 /* Abusing theme-green is less work than makeing a new new one */
 .theme-green .back-bar .selected-bar { background-color: #000000; background-image: none; !important }
 
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index 08c8aa64a..c29d80347 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -1,7 +1,7 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-			<button class="btn btn-success btn-xs" onclick="openClose('form'); closeMenu('event-tools');">{{$new_event.1}}</button>
+			<button class="btn btn-success btn-xs" onclick="openClose('form');">{{$new_event.1}}</button>
 			<div class="btn-group">
 				<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button>
 				<button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button>
diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl
index 128bbfbe1..d6a7f56b2 100755
--- a/view/tpl/field_input.tpl
+++ b/view/tpl/field_input.tpl
@@ -1,4 +1,4 @@
-	<div class='form-group field input'>
+	<div id="id_{{$field.0}}_wrapper" class='form-group field input'>
 		<label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
 		<input class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>
 		<span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 32a08a9b3..631f55d83 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -1,3 +1,10 @@
+{{$mimeselect}}
+{{$layoutselect}}
+{{if $id_select}}
+<div class="channel-id-select-div">
+	<span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
+</div>
+{{/if}}
 <div id="profile-jot-wrapper">
 	<form id="profile-jot-form" action="{{$action}}" method="post">
 		{{if $parent}}
@@ -17,13 +24,7 @@
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" />
 		{{if $showacl}}{{$acl}}{{/if}}
-		{{$mimeselect}}
-		{{$layoutselect}}
-		{{if $id_select}}
-		<div class="channel-id-select-div">
-			<span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
-		</div>
-		{{/if}}
+
 		{{if $webpage}}
 		<div id="jot-pagetitle-wrap" class="jothidden">
 			<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}">
@@ -159,10 +160,11 @@
 		</div>
 		<div id="profile-jot-text-loading"></div>
 		<div id="profile-jot-end" class="clear"></div>
-		<div id="jot-preview-content" style="display:none;"></div>
 	</form>
 </div>
 
+<div id="jot-preview-content" style="display:none;"></div>
+
 <!-- Modal for item expiry-->
 <div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
   <div class="modal-dialog">
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 11a08204d..5bcef5dc1 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -26,7 +26,7 @@
 			<div id="body-textarea">
 			{{include file="field_textarea.tpl" field=$body}}
 			</div>
-			<div class="pull-right btn-group form-group">
+			<div class="pull-right btn-group">
 				<div class="btn-group">
 					{{if $lockstate}}
 					<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index b7c527c31..034a6d43d 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -23,7 +23,7 @@
 				<li><a href="profile_photo" >{{$editmenu.menu.chg_photo}}</a></li>
 				{{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}}
 			</ul>
-			{{else}}
+			{{elseif $editmenu}}
 			<a class="btn btn-primary btn-xs" href="{{$editmenu.edit.0}}" ><i class="icon-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
 			{{/if}}
 		</div>
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 3c3bfda5a..943cc6339 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -19,7 +19,7 @@
 		{{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}}
 	</ul>
 	</div>
-	{{else}}
+	{{elseif $editmenu}}
 	<a class="profile-edit-side-link" href="{{$editmenu.edit.0}}" ><i class="icon-pencil" title="{{$editmenu.edit.1}}"></i></a>
 	{{/if}}
 	{{/if}}