Fit contacts list to guidelines

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

4 files changed, 27 insertions, 32 deletions

diff --git a/templates/contact.html b/templates/contact.html
index ac528cdb..3c29daaf 100644
--- a/templates/contact.html
+++ b/templates/contact.html
@@ -1,8 +1,6 @@
-<a class="app-content-list-item-link" ng-click="ctrl.openContact()">
-    <img class="app-content-list-item-icon contact__icon" ng-show="ctrl.contact.photo()!==undefined" data-ng-src="{{ctrl.contact.photo()}}" />
-    <div class="app-content-list-item-icon contact__icon" ng-show="ctrl.contact.photo()===undefined" ng-style="{'background-color': (ctrl.contact.uid() | contactColor) }">{{ ctrl.contact.displayName() | firstCharacter }}</div>
-    <div class="app-content-list-item-star icon-star" data-starred="false"></div>
-    <div class="app-content-list-item-failed icon-error" tooltip-placement="auto left" ng-if="ctrl.contact.failedProps.length>0" uib-tooltip="{{ ctrl.t.errorMessage }}"></div>
-    <div class="app-content-list-item-line-one" ng-class="{'no-line-two':!ctrl.contact.email()}">{{ ctrl.getName() | newContact }}</div>
-    <div class="app-content-list-item-line-two">{{ctrl.contact.email()}}</div>
-</a>
+<img class="app-content-list-item-icon contact__icon" ng-show="ctrl.contact.photo()!==undefined" data-ng-src="{{ctrl.contact.photo()}}" />
+<div class="app-content-list-item-icon contact__icon" ng-show="ctrl.contact.photo()===undefined" ng-style="{'background-color': (ctrl.contact.uid() | contactColor) }">{{ ctrl.contact.displayName() | firstCharacter }}</div>
+<div class="app-content-list-item-star icon-star" data-starred="false"></div>
+<div class="app-content-list-item-failed icon-error" tooltip-placement="auto left" ng-if="ctrl.contact.failedProps.length>0" uib-tooltip="{{ ctrl.t.errorMessage }}"></div>
+<div class="app-content-list-item-line-one">{{ ctrl.getName() | newContact }}</div>
+<div class="app-content-list-item-line-two" ng-if="ctrl.contact.email()">{{ctrl.contact.email()}}</div>
diff --git a/templates/contactList.html b/templates/contactList.html
index 1cac2f0d..9cc7c55f 100644
--- a/templates/contactList.html
+++ b/templates/contactList.html
@@ -1,14 +1,12 @@
-<div class="contacts-list" ng-class="{loading: ctrl.loading, 'mobile-show': ctrl.show}">
-        <div class="app-content-list-item"
-			 ng-repeat="contact in ctrl.filteredContacts = (ctrl.contactList | contactGroupFilter:ctrl.routeParams.gid | localeOrderBy:ctrl.sortBy | filter:query | limitTo:ctrl.limitTo) as filtered track by contact.uid()"
-			 contact data="contact"
-			 ng-click="setSelected(contact.uid())"
-			 ng-class="{active: contact.uid() === ctrl.getSelectedId()}">
-	</div>
-	<div ng-show="!ctrl.filteredContacts.length && !ctrl.loading && ctrl.searchTerm !== ''">
-	        <div id="emptycontent" class="emptycontent-search">
-		        <div class="icon-search"></div>
-			<h2>{{ctrl.t.emptySearch}}</h2>
-		</div>
+<a class="app-content-list-item"
+   ng-repeat="contact in ctrl.filteredContacts = (ctrl.contactList | contactGroupFilter:ctrl.routeParams.gid | localeOrderBy:ctrl.sortBy | filter:query | limitTo:ctrl.limitTo ) as filtered track by contact.uid()"
+   contact data="contact"
+   href="#/{{ctrl.routeParams.gid}}/{{contact.uid()}}"
+   ng-class="{active: contact.uid() === ctrl.getSelectedId()}">
+</a>
+<div ng-show="!ctrl.filteredContacts.length && !ctrl.loading && ctrl.searchTerm !== ''">
+        <div id="emptycontent" class="emptycontent-search">
+	        <div class="icon-search"></div>
+		<h2>{{ctrl.t.emptySearch}}</h2>
 	</div>
 </div>
diff --git a/templates/importScreen.html b/templates/importScreen.html
index bcfb79f9..a4e5f8fd 100644
--- a/templates/importScreen.html
+++ b/templates/importScreen.html
@@ -1,9 +1,7 @@
-<div id="importscreen-wrapper" ng-show="ctrl.importing">
-	<div id="importscreen-content">
-		<span class="icon-upload"></span>
-		<h3 id="importscreen-title">{{ctrl.t.importingTo}} {{ctrl.selectedAddressBook}}</h3>
-		<progress id="importscreen-progress" max="100" value="{{ctrl.importPercent}}"></progress>
-		<span id="importscreen-user">{{ctrl.importedUser}}</span>
-		<span id="importscreen-percent">{{ctrl.importPercent}} %</span>
-	</div>
+<div id="importscreen-content" class="emptycontent">
+	<span class="icon-upload"></span>
+	<h3 id="importscreen-title">{{ctrl.t.importingTo}} {{ctrl.selectedAddressBook}}</h3>
+	<progress id="importscreen-progress" max="100" value="{{ctrl.importPercent}}"></progress>
+	<span id="importscreen-user">{{ctrl.importedUser}}</span>
+	<span id="importscreen-percent">{{ctrl.importPercent}} %</span>
 </div>
diff --git a/templates/main.php b/templates/main.php
index c16c7367..c00cdcf9 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -47,10 +47,11 @@ style('contacts', 'vendor/ui-select/select.min');
 	</div>
 
 	<div id="app-content">
-		<div class="app-content-list">
-			<contactlist></contactlist>
+		<div id="app-content-wrapper">
+			<div class="app-content-list" contactlist>
+			</div>
+			<div class="app-content-detail" ng-view></div>
+			<importscreen id="importscreen-wrapper" ng-show="ctrl.importing"></importscreen>
 		</div>
-		<div class="app-content-detail" ng-view></div>
-		<importscreen class="emptycontent"></importscreen>
 	</div>
 </div>