Merge branch 'master' into gp/bugfixes-p2

# Conflicts:
#	app/events/event-details/event-details.template.html

app/events/event-details/event-details.component.css

@@ -35,6 +35,11 @@
   vertical-align: middle;
 }
 
+.btn {
+  margin-right: 0;
+  margin-left: 0;
+}
+
 /* this is angular2 syntax :| */
 .registered-users-wrapper >>> Image,
 .registered-users-wrapper >>> .no-image {
@@ -85,3 +90,17 @@
 .votes-count {
   font-size: 13;
 }
+
+.registered-label {
+  width: 99;
+  height: 34;
+  margin-top: 5;
+  padding: 8 20 0 15;
+  color: #F4550F;
+  font-size: 12;
+  font-weight: bold;
+  background-image: url("res://background_registered_label_event");
+  background-repeat: no-repeat;
+  background-size: cover;
+  background-position: -5 0;
+}

app/events/event-details/event-details.template.html

@@ -23,9 +23,14 @@
                 <Label *ngIf="alreadyRegistered" (tap)="unregister()" text="Unregister"></Label>
                 <Label *ngIf="canEdit()" (tap)="deleteEvent()" text="Delete Event"></Label>
             </StackLayout>
-            
-            <Label *ngIf="alreadyRegistered" text="Registered"></Label>
-            <photo-picker [url]="event.ImageUrl" [type]="'event'" [noImageIcon]="'&#x77;'" [noImageText]="'No image available'"></photo-picker>
+            <AbsoluteLayout width="100%" height="200">
+                <StackLayout left="0" top="0" width="100%" height="200" class="user">
+                    <photo-picker [url]="event.ImageUrl" [type]="'event'" [noImageIcon]="'&#x77;'" [noImageText]="'No image available'"></photo-picker>
+                </StackLayout>
+                <StackLayout left="0" top="20" height="40">
+                    <Label *ngIf="alreadyRegistered" text="Registered" class="registered-label"></Label>
+                </StackLayout>
+            </AbsoluteLayout>
 
             <StackLayout class="info-container">
                 <Label *ngIf="canRegister()" text="Register" (tap)="register()" class="btn btn-primary"></Label>

app/events/event-list/event-list.component.css

@@ -7,7 +7,7 @@
   height: 100%;
 }
 
-.event-name,
+.event-name-wrp,
 .event-date-wrp,
 .event-description,
 .event-organiser,
@@ -21,12 +21,30 @@
   color: #ADADAD;
 }
 
+.event-name,
+.registered-label {
+  vertical-align: middle;
+}
+
 .event-name {
+  margin-right: 5;
   margin-bottom: 0;
-  font-size: 28;
+  font-size: 26;
   color: #F4550F;
 }
 
+.registered-label {
+  width: 75;
+  height: 20;
+  margin-top: 5;
+  padding: 1 0 0 7;
+  color: #F4550F;
+  font-size: 12;
+  background-image: url("res://background_registered_label_list");
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+
 .event-remaining-time {
   horizontal-align: right;
 }
@@ -56,9 +74,3 @@
   border-color: #c8c7cc;
   height: 1;
 }
-
-.registered-label {
-  border-width: 1;
-  border-color: #F4550F;
-  height: 25;
-}

app/events/event-list/event-list.template.html

@@ -1,7 +1,7 @@
 <ScrollView class="list-events">
     <StackLayout>
         <StackLayout *ngFor="let event of events; let isLast = last" (tap)="eventTap(event)">
-            <WrapLayout>
+            <WrapLayout class="event-name-wrp">
                 <Label [text]="event.Name" textWrap="true" class="event-name"></Label>
                 <Label *ngIf="userIsRegistered(event.Id) && !isPastEvent(event)" class="registered-label" text="Registered"></Label>
             </WrapLayout>