Skip to content

Commit

Permalink
Merge pull request #577 from erasanimoulika/sb
Browse files Browse the repository at this point in the history
issue #91,#97,#98
  • Loading branch information
mnimmagari authored Jul 26, 2016
2 parents a49a299 + d523662 commit 00cbed0
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 13 deletions.
7 changes: 6 additions & 1 deletion public/assets/m/css/myVisitPage.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@
left: 0;
right: 0;
}

.visitagendafont{
font-size: 14px;
}
.visitagendafont1{
font-size: 24px;
}
.searchViewHead{
padding-left: 0px;
}
Expand Down
7 changes: 6 additions & 1 deletion public/assets/m/css/visitspoc.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
/*padding-top: 10px;*/
/*padding-bottom: 20px;*/
}

.locpad{
padding-top: 10px;
}
.spoc-details{
background-color: #fff;
}

.dropdown-menu{
background-color: white;
Expand Down
14 changes: 7 additions & 7 deletions public/m/contacts/contacts.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,24 @@
<a class="email-text" ng-href="mailto: {{anchor.email}}">EMAIL</a>
</div><br>
<div><i class="fa fa-book fa-lg" aria-hidden="true"></i>
<a ng-href="{{fileUrl}}" download="{{anchor.name.first}}.vcf">Download Contact<br></a>
<a ng-href="{{fileUrl}}" download="{{anchor.name.first}}.vcf">Download Contact</a>
</div>

</div>
<br>

</div>
</div>

<br>
<div ng-if="contactList[0]!=null" class="heading1">
<br>CONTACT YOUR LOCATION SPOC FOR {{contactList[0].location}}</div>
<div ng-if="contactList[0]!=null" class="spoc-details-container"><div class="heading1"
> CONTACT YOUR LOCATION SPOC FOR {{contactList[0].location | uppercase}}</div>
<div ng-show="(contactList |filter:query).length==0">No contact Found</div>
<div class="list-group">
<div class="spoc-details" class="list-group-item" ng-repeat="spoc in contactList | filter:query">
<div ng-repeat="spoc in contactList | filter:query">
<div class="spoc-pic col-xs-1 col-sm-1 col-md-1">
<img class="img-circle spocpicture" ng-src="{{spoc.avatar}}">
</div>
<div class="spoc-bios-div col-xs-11 col-sm-11 col-md-11">
<div class="spoc-name"><span>{{spoc.firstName}}</span> <span>{{spoc.lastName}}</span></div>
<div class="spoc-name">{{spoc.firstName}} {{spoc.lastName}}</div>
<div class="spoc-designation">{{spoc.jobTitle}}</div>{{spoc.type}}
<div class="spoc-bios">{{spoc.summary}}</div>
<div class="reach-spoc-phone">
Expand Down
8 changes: 4 additions & 4 deletions public/m/visits/myVisits.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<div ng-repeat="visit in visitBatch.visits | filter: query" class="visit-card">

<div> <div class="visitlinks">
<h3><a href="#/sessions/{{visit._id}}" >{{visit.title}}</a><br></h3>
<a href="#/sessions/{{visit._id}}" >{{visit.title}}</a><br>
<h5><a href="#/client/{{visit.client._id}}/info"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;&nbsp;{{visit.client.name | uppercase}}</a></h5>
</div>
<div class="dropdown pull-right">
Expand All @@ -73,16 +73,16 @@ <h5><a href="#/client/{{visit.client._id}}/info"><i class="fa fa-user" aria-hidd
</div>


<richtext body-text="visit.agenda">
<richtext class="visitagendafont1" body-text="visit.agenda">
</richtext>

<span ng-if="visit.status.toLowerCase() =='confirmed'" class="visit-status-confirmed">CONFIRMED</span>
<span ng-if="visit.status.toLowerCase() =='tentative'" class="visit-status-tentative">TENTATIVE</span>
</p>
<p class="visit-details"><i class="fa fa-calendar">
<p class="visit-details visitagendafont"><i class="fa fa-calendar">
</i> {{visit.startDate | date:"dd MMM yyyy"}} - {{visit.endDate | date:"dd MMM yyyy"}}
</p>
<p class="visit-details">
<p class="visit-details visitagendafont">
<i class="fa fa-map-marker"></i> {{visit.locations}}

<div class="upcoming-sessions" ng-click="showDetails = ! showDetails">
Expand Down

0 comments on commit 00cbed0

Please sign in to comment.