Merge branch 'master' into dev

view/css/conversation.css

@@ -34,10 +34,18 @@ code {
 	padding: 10px;
 }
 
-.profile-jot-text {
+#profile-jot-text {
+	resize: none;
+	border-width: 0px;
 	height: 39px;
+	line-height: 19px;
 	padding: 10px;
 	width: 100%;
+	display: inherit;
+}
+
+#profile-jot-text:focus {
+	resize: vertical;
 }
 
 .jot-attachment {
@@ -60,10 +68,6 @@ code {
 	height: 30px;
 }
 
-#profile-jot-form {
-	line-height: initial;
-}
-
 #profile-jot-wrapper {
 	margin-bottom: 30px;
 }

view/theme/redbasic/css/style.css

@@ -1108,16 +1108,9 @@ img.mail-conv-sender-photo {
 }
 
 #profile-jot-text {
-	resize: none;
-	border-width: 0px;
 	border-radius: $radiuspx;
 }
 
-#profile-jot-text:focus {
-	resize: vertical;
-}
-
-
 #profile-jot-text::-webkit-input-placeholder {
 	font-size: 16px;
 }
@@ -1681,7 +1674,8 @@ nav .badge.mail-update:hover {
 }
 
 #expand-aside,
-#expand-tabs {
+#expand-tabs,
+#help-btn {
 	color: $nav_active_icon_colour;
 	padding: 7px 10px;
 }
@@ -1815,7 +1809,10 @@ nav .badge.mail-update:hover {
 }
 
 /* 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 }
+.theme-green .back-bar .selected-bar {
+	background-color: #000000;
+	background-image: none !important;
+}
 
 
 /* Turn checkboxes into switches */
@@ -1891,10 +1888,6 @@ nav .badge.mail-update:hover {
     background-color: #337AB7;
 }
 
-/*.channels_ckbx, .pending_ckbx, .users_ckbx {
-	margin-top: -5px !important;
-}*/
-
 .help-searchlist {
 	list-style-type: none;
 }
@@ -1902,3 +1895,31 @@ nav .badge.mail-update:hover {
 .help-searchlist a {
 	font-size: 130%;
 }
+
+/* contextual help */
+.help-content {
+	background: rgba(255, 255, 255, 0.9);
+	color: #333333;
+	position: fixed;
+	top: 50px;
+	left: -80%;
+	width: 80%;
+        height: 60%;
+	padding: 20px;
+	transition: left 300ms cubic-bezier(0.17, 0.04, 0.03, 0.94);
+	box-sizing: border-box;
+	border: #CCC thin solid;
+        overflow: auto;
+}
+
+.help-content-open {
+	left: 0px;
+	-moz-box-shadow: 3px 3px 3px #ccc;
+	-webkit-box-shadow: 3px 3px 3px #ccc;
+	box-shadow: 3px 3px 3px #ccc;
+}
+
+.help-content dd {
+	margin-bottom: 1em;
+}
+/* contextual help end */

view/theme/redbasic/js/redbasic.js

@@ -67,3 +67,15 @@ function makeFullScreen(full) {
 		$('main').css({'transition': ''});
 	}
 }
+
+/* contextual help */
+$(document).mouseup(function (e) {
+        var container = $("#help-content");
+
+        if (!container.is(e.target) // if the target of the click isn't the container...
+                && container.has(e.target).length === 0 // ... nor a descendant of the container
+                && container.hasClass('help-content-open'))
+        {
+            container.removeClass('help-content-open');
+        }
+});

view/tpl/jot-header.tpl

@@ -10,7 +10,7 @@ function initEditor(cb){
 		$("#profile-jot-text-loading").spin('small').show();
 		if(plaintext == 'none') {
 			$("#profile-jot-text-loading").spin(false).hide();
-			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			$("#profile-jot-text").css({ 'height': 200, 'color': '#000', 'line-height': 'inherit' });
 			{{if $bbco_autocomplete}}
 			$("#profile-jot-text").bbco_autocomplete('{{$bbco_autocomplete}}'); // autocomplete bbcode
 			{{/if}}

view/tpl/nav.tpl

@@ -1,44 +1,3 @@
-<script>
-    $(document).mouseup(function (e)
-    {
-        var container = $("#help-content");
-
-        if (!container.is(e.target) // if the target of the click isn't the container...
-                && container.has(e.target).length === 0 // ... nor a descendant of the container
-                && container.hasClass('help-content-open'))
-        {
-            container.removeClass('help-content-open');
-        }
-    });
-</script>
-<style>
-.help-content {
-	background: rgba(255, 255, 255, 0.9);
-	color: #333333;
-	position: fixed;
-	top: 50px;
-	left: -80%;
-	width: 80%;
-        height: 60%;
-	padding: 20px;
-	transition: left 300ms cubic-bezier(0.17, 0.04, 0.03, 0.94);
-	box-sizing: border-box;
-	border: #CCC thin solid;
-        overflow: auto;
-}
-
-.help-content-open {
-	left: 0px;
-	-moz-box-shadow: 3px 3px 3px #ccc;
-	-webkit-box-shadow: 3px 3px 3px #ccc;
-	box-shadow: 3px 3px 3px #ccc;
-}
-
-.help-content dd {
-    margin-bottom: 1em;
-}
-</style>
-
 <div class="container-fluid">
 	<div class="navbar-header">
 		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
@@ -52,6 +11,11 @@
 		<button id="expand-aside" type="button" class="navbar-toggle" data-toggle="offcanvas" data-target="#region_1">
 			<i class="icon-circle-arrow-right" id="expand-aside-icon"></i>
 		</button>
+		{{if $nav.help}}
+		<button id="help-btn" type="button" class="navbar-toggle" title="{{$nav.help.3}}" onclick="$('#help-content').toggleClass('help-content-open');">
+			<i class="icon-question"></i>
+		</button>
+		{{/if}}
 		{{if $userinfo}}
 			<img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret" id="usermenu-caret"></span>
 			{{if $localuser}}
@@ -104,9 +68,7 @@
 			{{/foreach}}
 			{{/if}}
 		{{/if}}
-
 		{{if $nav.alogout}}<li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a></li>{{/if}}
-
 		{{if $nav.network}}
 			<li class="{{$sel.network}} hidden-xs">
 				<a href="{{$nav.network.0}}" title="{{$nav.network.3}}" id="{{$nav.network.4}}"><i class="icon-th"></i></a>
@@ -122,7 +84,6 @@
 				<span class="net-update badge" rel="#nav-network-menu"></span>
 			</li>
 		{{/if}}
-
 		{{if $nav.home}}
 			<li class="{{$sel.home}} hidden-xs">
 				<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" id="{{$nav.home.4}}"><i class="icon-home"></i></a>
@@ -138,8 +99,6 @@
 				<span class="home-update badge" rel="#nav-home-menu"></span>
 			</li>
 		{{/if}}
-
-
 		{{if $nav.messages}}
 			<li class="{{$sel.messages}} hidden-xs">
 				<a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}"><i class="icon-envelope"></i></a>
@@ -155,7 +114,6 @@
 				<span class="mail-update badge" rel="#nav-messages-menu"></span>
 			</li>
 		{{/if}}
-
 		{{if $nav.all_events}}
 			<li class="{{$sel.all_events}} hidden-xs">
 				<a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" id='{{$nav.all_events.4}}'><i class="icon-calendar"></i></a>
@@ -171,7 +129,6 @@
 				<span class="all_events-update badge" rel="#nav-all_events-menu"></span>
 			</li>
 		{{/if}}
-
 		{{if $nav.intros}}
 			<li class="{{$sel.intros}} hidden-xs">
 				<a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}"><i class="icon-user"></i></a>
@@ -186,7 +143,6 @@
 				<span class="intro-update badge" rel="#nav-intros-menu"></span>
 			</li>
 		{{/if}}
-		
 		{{if $nav.notifications}}
 			<li class="{{$sel.notifications}} hidden-xs">
 				<a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}"><i class="icon-exclamation"></i></a>
@@ -212,7 +168,6 @@
 			<li class="visible-xs">
 				<a href="/search" title="{{$nav.search.3}}"><i class="icon-search"></i></a>
 			</li>
-
 			{{if $powered_by}}
 			<div id="powered-by">{{$powered_by}}</div>
 			{{/if}}
@@ -221,23 +176,20 @@
 				<a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" id="{{$nav.directory.4}}"><i class="icon-sitemap"></i></a>
 			</li>
 			{{/if}}
-
 			{{if $nav.apps}}
 			<li class="{{$sel.apps}}">
 				<a class="{{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" id="{{$nav.apps.4}}"><i class="icon-cogs"></i></a>
 			</li>
 			{{/if}}
-
 			{{if $nav.help}}
-				<li class="{{$sel.help}}">
+			<li class="{{$sel.help}} hidden-xs">
 				<a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="$('#help-content').toggleClass('help-content-open'); return false;"><i class="icon-question"></i></a>
 			</li>
-                                
+			{{/if}}
+		</ul>
+	</div>
 	<div id="help-content" class="help-content">
 		{{$nav.help.5}}
 		<p class="pull-right"><a href="{{$nav.help.0}}">Click here for more documentation...</a></p>
 	</div>
-			{{/if}}
-			</ul>
-		</div>
 </div>