Merge pull request #9 from redmatrix/dev

Dev

7 files changed, 26 insertions, 8 deletions

diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 69ccd1fe5..e92de17c4 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -253,9 +253,18 @@ function string2bb(element) {
 			template: contact_format
 		};
 
+		// Autocomplete hashtags
+		tags = {
+			match: /(^\#)([^ \n]{3,})$/,
+			index: 2,
+			search: function(term, callback) { $.getJSON('/hashtags/' + '$f=&t=' + term).done(function(data) { callback($.map(data, function(entry) { return entry.text.toLowerCase().indexOf(term.toLowerCase()) === 0 ? entry : null; })); }); },
+			replace: function(item) { return "$1" + item.text + ' '; },
+			context: function(text) { return text.toLowerCase(); },
+			template: tag_format
+		};
 
 		this.attr('autocomplete', 'off');
-		var a = this.textcomplete([contacts,forums], {className:'acpopup', maxCount:100, zIndex: 1020, appendTo:'nav'});
+		var a = this.textcomplete([contacts,forums,tags], {className:'acpopup', maxCount:100, zIndex: 1020, appendTo:'nav'});
 		a.on('textComplete:select', function(e, value, strategy) { submit_form(this); });
 	};
 })( jQuery );
diff --git a/view/pdl/mod_pubstream.pdl b/view/pdl/mod_pubstream.pdl
index 95f069031..539900155 100644
--- a/view/pdl/mod_pubstream.pdl
+++ b/view/pdl/mod_pubstream.pdl
@@ -1,3 +1,6 @@
+[region=aside]
+[widget=pubtagcloud][var=trending]8[/var][var=limit]20[/var][/widget]
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index a9dcc292a..6e516b21e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1795,3 +1795,7 @@ dl.bb-dl > dd > li {
     position: absolute;
     text-shadow: -2px 0 1px #fff, 0 2px 1px#fff, 2px 0 1px #fff, 0 -2px 1px #fff;
 }
+
+.cover-photo-review {
+	margin-bottom: 10px;
+}
diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl
index 829a3a556..92efcdf02 100755
--- a/view/tpl/cover_photo.tpl
+++ b/view/tpl/cover_photo.tpl
@@ -86,10 +86,11 @@
     <h2>{{$title}}</h2>
     </div>
     <div class="section-content-wrapper">
-
+		{{if $existing}}
+		<img class="cover-photo-review" style="max-width: 100%;" src="{{$existing.url}}" alt="{{t('Cover Photo')}}" />
+		{{/if}}
 		<form enctype="multipart/form-data" action="cover_photo" method="post">
 		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
 		<div id="profile-photo-upload-wrapper">
 
 			<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index 532e10f22..7bc8df8d5 100755
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -164,7 +164,7 @@
 				{{$channel_app}}
 				{{/foreach}}
 				<div class="dropdown-divider"></div>
-				<div class="dropdown-header sys-apps-toggle" onclick="$('#dropdown-menu').click(function(e) { e.stopPropagation(); }); openClose('sys_apps');">
+				<div class="dropdown-header text-black-50 sys-apps-toggle" onclick="$('#dropdown-menu').click(function(e) { e.stopPropagation(); }); openClose('sys_apps');">
 					{{$sysapps_toggle}}
 				</div>
 				<div id="sys_apps" style="display:none;">
@@ -190,7 +190,7 @@
 		{{foreach $channel_apps as $channel_app}}
 		{{$channel_app|replace:'dropdown-item':'nav-link'}}
 		{{/foreach}}
-		<div class="dropdown-header sys-apps-toggle" onclick="openClose('sys-apps-collapsed');">
+		<div class="dropdown-header text-white-50 sys-apps-toggle" onclick="openClose('sys-apps-collapsed');">
 			{{$sysapps_toggle}}
 		</div>
 		<div id="sys-apps-collapsed" style="display:none;">
diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl
index 800f863dd..362b261c5 100755
--- a/view/tpl/navbar_tucson.tpl
+++ b/view/tpl/navbar_tucson.tpl
@@ -164,7 +164,7 @@
 				{{$channel_app}}
 				{{/foreach}}
 				<div class="dropdown-divider"></div>
-				<div class="dropdown-header sys-apps-toggle" onclick="$('#dropdown-menu').click(function(e) { e.stopPropagation(); }); openClose('sys_apps');">
+				<div class="dropdown-header text-black-50 sys-apps-toggle" onclick="$('#dropdown-menu').click(function(e) { e.stopPropagation(); }); openClose('sys_apps');">
 					{{$sysapps_toggle}}
 				</div>
 				<div id="sys_apps" style="display:none;">
@@ -190,7 +190,7 @@
 		{{foreach $channel_apps as $channel_app}}
 		{{$channel_app|replace:'dropdown-item':'nav-link'}}
 		{{/foreach}}
-		<div class="dropdown-header sys-apps-toggle" onclick="openClose('sys-apps-collapsed');">
+		<div class="dropdown-header text-white-50 sys-apps-toggle" onclick="openClose('sys-apps-collapsed');">
 			{{$sysapps_toggle}}
 		</div>
 		<div id="sys-apps-collapsed" style="display:none;">
diff --git a/view/tpl/profile_tabs.tpl b/view/tpl/profile_tabs.tpl
index 72e98ae82..e77da23f3 100644
--- a/view/tpl/profile_tabs.tpl
+++ b/view/tpl/profile_tabs.tpl
@@ -1,4 +1,5 @@
-<div class="dropdown-header"><img src="{{$thumb}}" class="menu-img-1">{{$name}}</div>
+<div class="dropdown-header text-white-50 d-lg-none" ><img src="{{$thumb}}" class="menu-img-1">{{$name}}</div>
+<div class="dropdown-header text-black-50 d-none d-lg-block"><img src="{{$thumb}}" class="menu-img-1">{{$name}}</div>
 {{foreach $tabs as $tab}}
 <a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}><i class="fa fa-fw fa-{{$tab.icon}} generic-icons-nav"></i>{{$tab.label}}</a>
 {{/foreach}}