From b3f7b89aad47672996005ad2061f22dcfff44f61 Mon Sep 17 00:00:00 2001
From: Carles Escrig Royo <esroyo@gmail.com>
Date: Tue, 19 Apr 2016 13:48:20 +0200
Subject: [PATCH] Show all addresses of the key on OpenPGP Settings

---
 dev/Styles/SettingsOpenPGP.less                 |  8 +++++++-
 .../templates/Views/User/SettingsOpenPGP.html   | 17 +++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/dev/Styles/SettingsOpenPGP.less b/dev/Styles/SettingsOpenPGP.less
index 894ca86b9..514f35e98 100644
--- a/dev/Styles/SettingsOpenPGP.less
+++ b/dev/Styles/SettingsOpenPGP.less
@@ -19,6 +19,7 @@
 		.open-pgp-key-img {
 
 			margin-right: 10px;
+            vertical-align: top;
 
 			.svg-icon {
 				width: 12px;
@@ -33,6 +34,11 @@
 			line-height: 22px;
 			cursor: default;
 		}
+
+        .open-pgp-key-user-address:first-child {
+			line-height: 30px;
+            margin-bottom: -4px;
+        }
 	}
 
 	.open-pgp-key-item {
@@ -61,4 +67,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
index 1ebebbb7d..2f373226f 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
@@ -33,7 +33,11 @@
 					<span class="open-pgp-key-img i18n" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PRIVATE">
 						<i class="icon-lock"></i>
 					</span>
-					<span class="open-pgp-key-user" data-bind="text: user"></span>
+					<span class="open-pgp-key-user">
+			        <!-- ko foreach: users -->
+                        <div class="open-pgp-key-user-address" data-bind="text: $data"></div>
+                    <!-- /ko -->
+                    </span>
 					<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oOpenPGP) { $root.deleteOpenPgpKey(oOpenPGP); }">
 						<span class="i18n" data-i18n="SETTINGS_OPEN_PGP/DELETING_ASK"></span>
 					</a>
@@ -56,8 +60,13 @@
 					<span class="open-pgp-key-img i18n" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PUBLIC">
 						<i class="icon-key"></i>
 					</span>
-					<span class="open-pgp-key-user" data-bind="text: user"></span>
-					(<span class="open-pgp-key-id" data-bind="text: id"></span>)
+					<span class="open-pgp-key-user">
+                    <!-- ko foreach: users -->                    
+                        <div class="open-pgp-key-user-address">
+                            <span data-bind="text: $data"></span> (<span class="open-pgp-key-id" data-bind="text: $parent.id"></span>)
+                        </div>
+                    <!-- /ko -->
+                    </span>
 					<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oOpenPGP) { $root.deleteOpenPgpKey(oOpenPGP); }">
 						<span class="i18n" data-i18n="SETTINGS_OPEN_PGP/DELETING_ASK"></span>
 					</a>
@@ -76,4 +85,4 @@
 			<!-- /ko -->
 		</tbody>
 	</table>
-</div>
\ No newline at end of file
+</div>