From 69573c6afe8afcbd75304dd0cd2f12d341f4195e Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 14 Jan 2016 10:36:45 +0100
Subject: some template work on follow widget

---
 view/css/widgets.css    | 11 -----------
 view/tpl/follow.tpl     | 11 ++++++++---
 view/tpl/peoplefind.tpl |  2 +-
 3 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'view')

diff --git a/view/css/widgets.css b/view/css/widgets.css
index f1c1436c7..a1801ac77 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -23,17 +23,6 @@
 	margin-top: 10px;
 }
 
-/* follow */
-
-#side-follow-url {
-	margin-top: 5px;
-	width: 100%;
-}
-
-#side-follow-submit {
-	margin-top: 15px;
-}
-
 /* notes */ 
 
 #note-text {
diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
index 0c808b9a5..8c1f8d4ca 100755
--- a/view/tpl/follow.tpl
+++ b/view/tpl/follow.tpl
@@ -1,9 +1,14 @@
 <div id="follow-sidebar" class="widget">
 	<h3>{{$connect}}</h3>
-	<div id="connect-desc">{{$desc}}</div>
 	<form action="follow" method="post" />
-		<input id="side-follow-url" type="text" name="url" title="{{$hint}}" />
-		<input id="side-follow-submit" type="submit" name="submit" class="btn btn-default" value="{{$follow}}" />
+		<div class="form-group">
+			<div class="input-group">
+				<input class="widget-input" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" />
+				<div class="input-group-btn">
+					<button class="btn btn-default btn-sm" type="submit" name="submit" value="{{$follow}}"><i class="icon-plus"></i></button>
+				</div>
+			</div>
+		</div>
 	</form>
 	{{if $abook_usage_message}}
 	<div class="usage-message" id="abook-usage-message">{{$abook_usage_message}}</div>
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index 5d68cb2d8..d7d48cfd2 100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -5,7 +5,7 @@
 		<div class="form-group">
 			<div class="input-group">
 				<input class="widget-input" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />
-			<div class="input-group-btn">
+				<div class="input-group-btn">
 					<button class="btn btn-default btn-sm" type="submit" name="submit"><i class="icon-search"></i></button>
 				</div>
 			</div>
-- 
cgit v1.2.3


From e2b79c34bc0c1dc5f48295c1cca7261e8cb648fb Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 14 Jan 2016 13:50:47 +0100
Subject: some work on connections

---
 view/css/mod_connections.css     | 154 ++-------------------------------------
 view/tpl/connection_template.tpl |  21 ++++--
 view/tpl/connections.tpl         |  59 +++++++++------
 3 files changed, 56 insertions(+), 178 deletions(-)

(limited to 'view')

diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css
index d5c9b3d4f..d8a50d540 100644
--- a/view/css/mod_connections.css
+++ b/view/css/mod_connections.css
@@ -1,151 +1,13 @@
-.search-input {
-	padding: 4px 12px;
-	margin: 3px;
+#contacts-search-form {
+	display: none;
 }
 
-.field_abook_help {
-	color: #000;
-}
-.abook-them {
-	margin-left: 375px;
-	margin-bottom: 15px;
-}
-.abook-me {
-	margin-left: 36px;
-	margin-bottom: 15px;
-}
-.acheckbox {
-	margin-bottom: 5px !important;
-}
-
-.abook-pending-contact {
-	background: orange;
-	font-weight: bold;
-	margin: 10px;
-	padding: 20px 5px 10px;
-}
-
-#contact-slider {
-	width: 600px !important;
-}
-
-.abook-edit-them, .abook-edit-me {
-	float: left;
-	width: 100px !important;
-}
-.field_abook_help {
-	float: left;
-}
-
-#contacts-main {
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-
-
-
-#contact-edit-wrapper {
-	margin-top: 10px;
-}
-
-#contact-edit-banner-name {
-	font-size: 1.4em;
-	font-weight: bold;
-}
-
-#contact-edit-poll-wrapper {
-	margin-top: 15px;
-}
-
-#contact-edit-poll-text {
-	margin-top: 15px;
-	margin-bottom: 5px;
-}
-
-#contact-edit-update-now {
-	margin-top: 15px;
-}
-
-#contact-edit-links{
-	clear: both;
-}
-
-#contact-edit-links ul {
-	list-style: none;
-	list-style-type: none;
-	margin-left: 0px;
-	padding-left: 0px;
-}
-
-#contact-edit-links li {
-	margin-top: 5px;
-}
-
-#contact-edit-drop-link {
-	float: right;
-	margin-right: 20px;
-}
-
-#contact-edit-nav-end {
-	clear: both;
-}
-
-#contact-edit-wrapper {
-	width: 100%;
-}
-
-#contact-edit-end {
-	clear: both;
-	margin-top: 15px;
-}
-
-#contact-profile-selector {
-	width: 175px;
-	margin-left: 175px;
-}
-
-.contact-edit-submit {
-	margin-top: 20px;
-}
-
-.contact-entry-wrapper {
-	float: left;
-	width: auto;
-	height: auto;
-	padding: 10px;
-	margin: 8px 10px 0 0;
-	border-top: 1px solid #eee;
-	border-left: 2px solid #eee;
-}
-
-#contacts-search {
-	font-size: 1em;
-	width: 300px;
-}
-
-#contacts-search-end {
-	margin-bottom: 10px;
-}
-
-.contact-entry-photo-end {
-	clear: both;
-}
-
-.contact-entry-name {
-	float: left;
-	margin-left: 0px;
-	margin-right: 10px;
-	margin-bottom: 10px;
-	width: 147px;
-	height: auto;
-	overflow: hidden;
-	white-space: nowrap;
-}
-
-.contact-entry-name-end {
-	clear:both;
+.section-subtitle-wrapper .btn-xs {
+	margin-top: -2px;
 }
 
-.contact-entry-end {
-	clear: both;
+.contact-search {
+	height: 22px;
+	border-top-right-radius: 0px;
+	border-bottom-right-radius: 0px;
 }
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 35e97f3e9..aca6aa991 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -1,10 +1,15 @@
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
-	<div class="contact-entry-photo-wrapper" >
-		<a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><img class="contact-block-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
+<div id="contact-entry-wrapper-{{$contact.id}}">
+	<div class="section-subtitle-wrapper">
+		<div class="pull-right">
+			<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>
+		</div>
+		<h3><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" >
+			<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>
-	<div class="contact-entry-photo-end" ></div>
-	<a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div></a>
-	<div class="contact-entry-name-end" ></div>
-	<div class="contact-entry-edit btn btn-default"><a href="{{$contact.link}}"><i class="icon-pencil connection-edit-icons"></i> {{$contact.edit}}</a></div>
-	<div class="contact-entry-end" ></div>
 </div>
+
diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
index 8e5266978..fdd269602 100755
--- a/view/tpl/connections.tpl
+++ b/view/tpl/connections.tpl
@@ -1,27 +1,38 @@
-<div class="generic-content-wrapper-styled">
-
-<h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1>
-
-{{if $finding}}<h4>{{$finding}}</h4>{{/if}}
-
-<div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="{{$cmd}}" method="get" >
-<span class="contacts-search-desc">{{$desc}}</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
-<input type="submit" name="submit" id="contacts-search-submit" class="btn btn-default" value="{{$submit}}" />
-</form>
-</div>
-<div id="contacts-search-end"></div>
-
-{{$tabs}}
-
-<div id="connections-wrapper">
-{{foreach $contacts as $contact}}
-	{{include file="connection_template.tpl"}}
-{{/foreach}}
-<div id="page-end"></div>
-</div>
-<div id="contact-edit-end"></div>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="dropdown pull-right">
+			<button type="button" class="btn btn-primary btn-xs" onclick="openClose('contacts-search-form');">
+				<i class="icon-search"></i>&nbsp;{{$label}}
+			</button>
+			<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
+				<i class="icon-sort"></i>
+			</button>
+			<ul class="dropdown-menu">
+				{{foreach $tabs as $menu}}
+				<li><a href="{{$menu.url}}">{{$menu.label}}</a></li>
+				{{/foreach}}
+			</ul>
+		</div>
+		{{if $finding}}<h2>{{$finding}}</h2>{{else}}<h2>{{$header}}{{if $total}} ({{$total}}){{/if}}</h2>{{/if}}
+	</div>
+	<div id="contacts-search-form" class="section-content-tools-wrapper">
+		<form action="{{$cmd}}" method="get" >
+			<div class="form-group">
+				<div class="input-group">
+					<input type="text" name="search" id="contacts-search" class="widget-input" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" />
+					<div class="input-group-btn">
+						<button id="contacts-search-submit" class="btn btn-default btn-sm" type="submit" name="submit" value="{{$submit}}"><i class="icon-search"></i></button>
+					</div>
+				</div>
+			</div>
+		</form>
+	</div>
+	<div id="connections-wrapper">
+		{{foreach $contacts as $contact}}
+			{{include file="connection_template.tpl"}}
+		{{/foreach}}
+		<div id="page-end"></div>
+	</div>
 </div>
 <script>$(document).ready(function() { loadingPage = false;});</script>
 <div id="page-spinner"></div>
-- 
cgit v1.2.3


From 9f9fdc1434b7283171f8d843f225228cdb322115 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 14 Jan 2016 14:00:02 +0100
Subject: bring back opacity for archived contacts

---
 view/css/mod_connections.css | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'view')

diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css
index d8a50d540..0f35c5dbf 100644
--- a/view/css/mod_connections.css
+++ b/view/css/mod_connections.css
@@ -11,3 +11,8 @@
 	border-top-right-radius: 0px;
 	border-bottom-right-radius: 0px;
 }
+
+.directory-photo-img.archived {
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+}
-- 
cgit v1.2.3