Merge pull request #17 from redmatrix/master

updating from original codebase

6 files changed, 62 insertions, 30 deletions

diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css
index 0f35c5dbf..a33430e48 100644
--- a/view/css/mod_connections.css
+++ b/view/css/mod_connections.css
@@ -16,3 +16,20 @@
 	opacity: 0.3;
 	filter:alpha(opacity=30);
 }
+
+.contact-photo-wrapper {
+	display: table-cell;
+	table-layout: fixed;
+	vertical-align: top;
+}
+
+.contact-info {
+	display: table-cell;
+	table-layout: fixed;
+	vertical-align: top;
+	padding-left: 10px;
+}
+
+.contact-info-label {
+	font-weight: bold;
+}
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 511a7f815..437425a0e 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -196,4 +196,4 @@ function submit_form(e) {
 		if(typeof onselect !== 'undefined')
 			a.on('textComplete:select', function(e, value, strategy) { onselect(value); });
 	};
-})( jQuery );
\ No newline at end of file
+})( jQuery );
diff --git a/view/js/mod_connections.js b/view/js/mod_connections.js
index f29d96729..112204a5a 100644
--- a/view/js/mod_connections.js
+++ b/view/js/mod_connections.js
@@ -1,15 +1,16 @@
-$(document).ready(function() { 
+$(document).ready(function() {
 	$("#contacts-search").contact_autocomplete(baseurl + '/acl', 'a', true);
+	$(".autotime").timeago();
 }); 
 
 $("#contacts-search").keyup(function(event){
 		if(event.keyCode == 13){
-			$("#contacts-search-submit").click();
+			$("#contacts-search").click();
 		}
 });
 $(".autocomplete-w1 .selected").keyup(function(event){
 		if(event.keyCode == 13){
-			$("#contacts-search-submit").click();
+			$("#contacts-search").click();
 		}
 });
 
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 1ed3baafa..4fa810cb4 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -73,25 +73,6 @@
 					</div>
 				</div>
 			</div>
-			<div class="modal" id="abook-pending-modal" tabindex="-1" role="dialog">
-				<div class="modal-dialog" role="document">
-					<div class="modal-content">
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-							<h4 class="modal-title" id="myModalLabel">{{$pending_modal_title}}</h4>
-						</div>
-						<div class="modal-body">
-							<strong>{{$name}}</strong> {{$pending_modal_body}}
-						</div>
-						<div class="modal-footer">
-							<button class="btn btn-sm btn-danger pull-left" title="{{$buttons.delete.title}}" onclick="window.location.href='{{$buttons.delete.url}}'; return false;">{{$buttons.delete.label}}</button>
-							<button type="button" class="btn btn-default" data-dismiss="modal">{{$pending_modal_dismiss}}</button>
-							<button type="submit" class="btn btn-primary" name="pending" value="1">{{$pending_modal_approve}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			<script>$('#abook-pending-modal').modal('show');</script>
 			{{/if}}
 
 			{{if $affinity }}
@@ -177,6 +158,7 @@
 
 			{{/if}}
 
+			{{if ! $is_pending}}
 			<div class="panel">
 				{{if $notself}}
 				<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
@@ -222,6 +204,7 @@
 					</div>
 				</div>
 			</div>
+			{{/if}}
 		</div>
 		</form>
 	</div>
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index aca6aa991..143989971 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -1,15 +1,45 @@
 <div id="contact-entry-wrapper-{{$contact.id}}">
 	<div class="section-subtitle-wrapper">
 		<div class="pull-right">
+			{{if $contact.approve}}
+			<form action="connedit/{{$contact.id}}" method="post" >
+			<button type="submit" class="btn btn-success btn-xs" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="icon-ok"></i> {{$contact.approve}}</button>
+			{{/if}}
 			<a href="#" class="btn btn-danger btn-xs" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="icon-trash"></i> {{$contact.delete}}</a>
-			<a href="{{$contact.link}}" class="btn btn-success btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i> {{$contact.edit}}</a>
+			<a href="{{$contact.link}}" class="btn btn-default btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i></a>
+			{{if $contact.approve}}
+			</form>
+			{{/if}}
 		</div>
-		<h3><a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a></h3>
+		<h3>{{if $contact.public_forum}}<i class="icon-comments-alt"></i>&nbsp;{{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a></h3>
 	</div>
 	<div class="section-content-tools-wrapper">
-		<div class="contact-entry-photo-wrapper" >
+		<div class="contact-photo-wrapper" >
 			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><img class="directory-photo-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
 		</div>
+		<div class="contact-info">
+			{{if $contact.status}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.status_label}}:</span> {{$contact.status}}
+			</div>
+			{{/if}}
+			{{if $contact.connected}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.connected_label}}:</span> <span class="autotime" title="{{$contact.connected}}"></span>
+			</div>
+			{{/if}}
+			{{if $contact.webbie}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.webbie_label}}:</span> {{$contact.webbie}}
+			</div>
+			{{/if}}
+			{{if $contact.network}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.network_label}}:</span> {{$contact.network}} - <a href="{{$contact.recentlink}}">{{$contact.recent_label}}</a>
+			</div>
+			{{/if}}
+		</div>
+
 	</div>
 </div>
 
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index ecc38beb9..57e6e1555 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -1,16 +1,17 @@
 <div class="directory-item{{if $entry.safe}} safe{{/if}}" id="directory-item-{{$entry.hash}}" >
 	<div class="section-subtitle-wrapper">
 		<div class="pull-right">
-			{{if $entry.viewrate}}
-				{{if $entry.canrate}}<button class="btn btn-default btn-xs" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="icon-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" >&nbsp;*</span></button>{{/if}}
-				{{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}" id="dir-rating-{{$entry.hash}}" class="btn btn-default btn-xs">{{$entry.total_ratings}}</a>{{/if}}
-			{{/if}}
 			{{if $entry.ignlink}}
 			<a class="directory-ignore btn btn-warning btn-xs" href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a>
 			{{/if}}
 			{{if $entry.connect}}
 			<a class="btn btn-success btn-xs" href="{{$entry.connect}}"><i class="icon-plus connect-icon"></i> {{$entry.conn_label}}</a>
 			{{/if}}
+			{{if $entry.viewrate}}
+				{{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}" id="dir-rating-{{$entry.hash}}" class="btn btn-default btn-xs">{{$entry.total_ratings}}</a>{{/if}}
+				{{if $entry.canrate}}<button class="btn btn-default btn-xs" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="icon-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" >&nbsp;*</span></button>{{/if}}
+
+			{{/if}}
 		</div>
 		<h3>{{if $entry.public_forum}}<i class="icon-comments-alt" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i>&nbsp;{{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}}&nbsp;<i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3>
 	</div>