Merge pull request #19 from redmatrix/master

updating from original codebase

11 files changed, 25 insertions, 22 deletions

diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index af80e7b4d..23f1e0dd4 100755
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
@@ -7,6 +7,6 @@
 {{/if}}
 {{/if}}
 <a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}"><img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" /></a>
-<div class="channels-notifications-wrapper"><a href='manage/{{$channel.channel_id}}/message' style="{{if $channel.mail != 0}}color:#c60032;{{/if}}" title='{{$channel.mail|string_format:$mail_format}}'><i class="icon-envelope"></i> {{$channel.mail}}</a>&nbsp;<a href='manage/{{$channel.channel_id}}/connections/ifpending' style="{{if $channel.intros != 0}}color:#c60032;{{/if}}" title='{{$channel.intros|string_format:$intros_format}}'><i class="icon-user"></i> {{$channel.intros}}</a></div>
+<div class="channels-notifications-wrapper">{{if $channel.delegate}}{{else}}<a href='manage/{{$channel.channel_id}}/message' style="{{if $channel.mail != 0}}color:#c60032;{{/if}}" title='{{$channel.mail|string_format:$mail_format}}'><i class="icon-envelope"></i> {{$channel.mail}}</a>&nbsp;<a href='manage/{{$channel.channel_id}}/connections/ifpending' style="{{if $channel.intros != 0}}color:#c60032;{{/if}}" title='{{$channel.intros|string_format:$intros_format}}'><i class="icon-user"></i> {{$channel.intros}}</a>{{/if}}</div>
 <a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a>
 </div>
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 143989971..e2a14d9a2 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -1,9 +1,12 @@
 <div id="contact-entry-wrapper-{{$contact.id}}">
 	<div class="section-subtitle-wrapper">
 		<div class="pull-right">
-			{{if $contact.approve}}
+			{{if $contact.approve && $contact.ignore}}
 			<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>
+
+			<a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-xs" title="{{$contact.ignore_hover}}"><i class="icon-ban-circle"></i> {{$contact.ignore}}</a>
+
 			{{/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-default btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i></a>
diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl
index d1ce5ca67..a32437212 100755
--- a/view/tpl/contact_block.tpl
+++ b/view/tpl/contact_block.tpl
@@ -1,7 +1,9 @@
-<div id="contact-block">
-<div id="contact-block-numcontacts">{{$contacts}}</div>
+<div id="contact-block" class="widget">
+<h3>{{$contacts}}</h3>
 {{if $micropro}}
+		{{if $viewconnections}}
 		<a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a>
+		{{/if}}
 		<div class='contact-block-content'>
 		{{foreach $micropro as $m}}
 			{{$m}}
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
index 61ede1ca2..5b4954c8e 100755
--- a/view/tpl/email_notify_html.tpl
+++ b/view/tpl/email_notify_html.tpl
@@ -18,7 +18,7 @@
 	<tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
 	<tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr>
 	<tr><td style="padding-top:11px;" colspan="2">{{$hsitelink}}</td></tr>
-	<tr><td style="padding-bottom:11px;" colspan="2">{{$hitemlink}}</td></tr>
+	<tr><td style="padding:11px 0;" colspan="2">{{$hitemlink}}</td></tr>
 	<tr><td></td><td>{{$thanks}}</td></tr>
 	<tr><td></td><td>{{$site_admin}}</td></tr>
 	</tbody>
diff --git a/view/tpl/email_notify_text.tpl b/view/tpl/email_notify_text.tpl
index bdab4c273..56925c18b 100755
--- a/view/tpl/email_notify_text.tpl
+++ b/view/tpl/email_notify_text.tpl
@@ -5,6 +5,7 @@
 {{$textversion}}
 				
 {{$tsitelink}}
+
 {{$titemlink}}
 
 {{$thanks}}
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
index 952757076..af6014359 100755
--- a/view/tpl/group_side.tpl
+++ b/view/tpl/group_side.tpl
@@ -16,7 +16,7 @@
 			</li>
 			{{/foreach}}
 			<li>
-				<a href="group/new" title="{{$createtext}}" >{{$createtext}}</a>
+				<a href="group/new" title="{{$createtext}}" ><i class="icon-plus-sign"></i> {{$createtext}}</a>
 			</li>
 		</ul>
 
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index 46b32b8a9..156b5ec2f 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -22,8 +22,9 @@
 	<div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div>
 
 	<label for="newchannel-nickname" id="label-newchannel-nickname" class="newchannel-label" >{{$label_nick}}</label>
-	<input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" />
+	<input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" /> 
 	<div id="nick-spinner"></div>
+	<div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_hub}}</div>
 	<div id="newchannel-nickname-feedback" class="newchannel-feedback"></div>
 	<div id="newchannel-nickname-end"  class="newchannel-field-end"></div>
 
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index c52c2cd81..5857ae5d1 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -1,5 +1,8 @@
 <div class="vcard">
 	<div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
+	{{if $connect}}
+	<div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div>
+	{{/if}}
 	{{if $profile.edit}}
 	<div class="dropdown">
 	<a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a>
@@ -45,16 +48,10 @@
 	{{if $diaspora}}
 	{{include file="diaspora_vcard.tpl"}}
 	{{/if}}
-
-{{if $connect}}
-<a href="{{$connect_url}}" class="rconnect"><i class="icon-plus connect-icon"></i> {{$connect}}</a>
-{{/if}}
-
-{{$rating}}
-
 </div>
-<div id="vcard-end"></div>
+<div id="clear"></div>
 
+{{$rating}}
 
 {{$chanmenu}}
 
diff --git a/view/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl
index aefcd51a8..ce6c8ac22 100644
--- a/view/tpl/removeaccount.tpl
+++ b/view/tpl/removeaccount.tpl
@@ -10,7 +10,7 @@
 			<input type="hidden" name="verify" value="{{$hash}}" />
 			<div class="form-group" id="remove-account-pass-wrapper">
 				<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
-				<input class="form-control" type="password" id="remove-account-pass" name="qxz_password" />
+				<input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password"  value=" " />
 			</div>
 			{{include file="field_checkbox.tpl" field=$global}}
 			<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>
diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl
index 5b329dd6d..40b9546d2 100755
--- a/view/tpl/removeme.tpl
+++ b/view/tpl/removeme.tpl
@@ -10,7 +10,7 @@
 			<input type="hidden" name="verify" value="{{$hash}}" />
 			<div class="form-group" id="remove-account-pass-wrapper">
 				<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
-				<input class="form-control" type="password" id="remove-account-pass" name="qxz_password" />
+				<input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " />
 			</div>
 			{{include file="field_checkbox.tpl" field=$global}}
 			<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
index 2acbb24e4..ad409d75b 100755
--- a/view/tpl/xchan_vcard.tpl
+++ b/view/tpl/xchan_vcard.tpl
@@ -1,11 +1,10 @@
 <div class="vcard">
 <div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
+{{if $connect}}
+<div class="connect-btn-wrapper"><a href="follow?f=&url={{$follow}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div>
+{{/if}}
 <div class="fn">{{$name}}</div>
 </div>
 
 
-{{if $mode != 'mail'}}	
-{{if $connect}}
-	<a href="follow?f=&url={{$follow}}" class="rconnect"><i class="icon-plus connect-icon"></i> {{$connect}}</a>
-{{/if}}
-{{/if}}
+