Merge 26a7966 into 7405503

nextcloud · Oct 4, 2016 · bd6345d · bd6345d
2 parents 7405503 + 26a7966
commit bd6345d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/css/app/eventdialog.css b/css/app/eventdialog.css
@@ -266,8 +266,10 @@ button.delete:focus {
 	display: inline;
 }
 
-.dropdown-menu {
+.dropdown-menu,
+.attendeename {
 	width: 100%;
+	max-width: 470px;
 }
 
 .dropdown-menu li {
@@ -278,6 +280,9 @@ button.delete:focus {
 .dropdown-menu li a {
 	display: block;
 	padding: 5px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
 .dropdown-menu li a:hover {

diff --git a/templates/part.eventsattendees.php b/templates/part.eventsattendees.php
@@ -23,9 +23,9 @@
  */
 ?>
 <div class="advanced--fieldset" ng-hide="emailAddress === ''">
-	<input type="text" class="advanced--input" ng-model="nameofattendee"
+	<input type="text" class="advanced--input attendeename" ng-model="nameofattendee"
 		placeholder="<?php p($l->t('E-Mail address of attendee'))?>" name="nameofattendee" autocomplete="off"
-		uib-typeahead="contact.name for contact in search($viewValue)" typeahead-show-hint="true" typeahead-min-length="3"
+		uib-typeahead="contact as contact.name + ' (' + contact.email + ')' for contact in search($viewValue)" typeahead-show-hint="true" typeahead-min-length="3"
 		   typeahead-on-select="selectFromTypeahead($item)" />
 	<button id="addmoreattendees" ng-click="add(nameofattendee)" class="btn event-button button" type="button">
 		<?php p($l->t('Add')); ?>