flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nextcloud/ocsms.git synced 2026-08-11 16:32:55 +00:00
Code Issues Releases Wiki Activity

Conversation header is now properly rendered

Browse Source
This commit is contained in:
Loic Blot
2018-09-06 23:34:41 +02:00
committed by Loïc Blot
parent b5f67d59f2
commit 78b5c0f915
6 changed files with 117 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/main.php
+21 -23
View File
@@ -9,6 +9,7 @@ use \OCA\OcSms\Lib\CountryCodes;
// Develop
\OCP\Util::addScript('ocsms', 'devel/app');
\OCP\Util::addScript('ocsms', 'devel/contactlist');
\OCP\Util::addScript('ocsms', 'devel/conversation');
\OCP\Util::addScript('ocsms', 'devel/helpers');
\OCP\Util::addScript('ocsms', 'devel/legacy');
\OCP\Util::addScript('ocsms', 'devel/notifications');
@@ -16,7 +17,7 @@ use \OCA\OcSms\Lib\CountryCodes;
\OCP\Util::addStyle('ocsms', 'style');
?>
<div class="ng-scope" id="app" ng-app="OcSms" ng-controller="OcSmsController" xmlns:v-on="http://www.w3.org/1999/xhtml">
<div id="app">
<div id="app-mailbox-peers">
<div id="app-contacts-loader" class="icon-loading" v-if="isContactsLoading">
</div>
@@ -24,8 +25,8 @@ use \OCA\OcSms\Lib\CountryCodes;
<div class="contact-list-no-contact" v-if="orderedContacts.length == 0 && !isContactsLoading"><?php p($l->t('No contact found.'));?></div>
<ul class="contact-list" v-if="orderedContacts.length > 0">
<li v-for="contact in orderedContacts" peer-label="{{ contact.label }}" v-on:click="loadConversation(contact);" href="#">
<img class="ocsms-plavatar" ng-src="{{ contact.avatar }}" ng-show="contact.avatar !== undefined" />
<div class="ocsms-plavatar" v-if="contact.avatar === undefined" ng-style="{'background-color': (contact.uid | peerColor)}">{{ contact.label | firstCharacter }}</div>
<img class="ocsms-plavatar" ng-src="{{ contact.avatar }}" v-if="contact.avatar !== undefined" />
<div class="ocsms-plavatar" v-if="contact.avatar === undefined" v-bind:style="{'backgroundColor': getContactColor(contact.uid) }">{{ contact.label | firstCharacter }}</div>
<a class="ocsms-plname" style="{{ contact.unread > 0 ? 'font-weight:bold;' : ''}}" mailbox-label="{{ contact.label }}" mailbox-navigation="{{ contact.nav }}">{{ contact.label }}{{ contact.unread > 0 ? ' (' + contact.unread + ') ' : '' }}</a>
</li>
</ul>
@@ -71,12 +72,9 @@ use \OCA\OcSms\Lib\CountryCodes;
</div>
</div> <!-- app-settings-content -->
</div>
<div id="ocsms-app-content">
<div id="app-content-loader" class="ng-cloak icon-loading" v-if="isConvLoading">
</div>
<div id="app-content-header" class="ng-cloak" v-if="!isConvLoading && selectedContact.label !== undefined && selectedContact.label !== ''"
ng-style="{'background-color': (selectedContact.uid | peerColor)}">
<div id="app-conversation">
<div id="app-content-loader" class="icon-loading" v-if="isConvLoading"></div>
<div id="app-content-header" v-if="!isConvLoading" v-bind:style="{'backgroundColor': getContactColor(selectedContact.uid) }">
<div id="ocsms-contact-avatar">
<img class="ocsms-plavatar-big" v-if="selectedContact.avatar !== undefined" ng-src="{{ selectedContact.avatar }}" />
<div class="ocsms-plavatar-big" v-if="selectedContact.avatar === undefined">{{ selectedContact.label | firstCharacter }}</div>
@@ -91,19 +89,19 @@ use \OCA\OcSms\Lib\CountryCodes;
</div>
</div>
<div id="app-content-wrapper" v-if="!isConvLoading">
<div v-if="messages.length == 0" id="ocsms-empty-conversation"><?php p($l->t('Please select a conversation from the list to load it.'));?></div>
<div v-if="messages.length > 0" class="ng-cloak ocsms-messages-container">
<div v-for="message in messages | orderBy:'date'">
<div class="msg-{{ message.type }}">
<div>{{ message.content }}</div>
<div style="display: block;" id="ocsms-message-removal" class="icon-delete svn delete action" v-on:click="removeConversationMessage(message.id);"></div>
<div class="msg-date">{{ message.date | date:'medium' }}</div>
</div>
<div class="msg-spacer"></div>
</div>
<div id="searchresults"></div>
</div>
</div>
<!-- <div id="app-content-wrapper" v-if="!isConvLoading">-->
<!-- <div v-if="messages.length == 0" id="ocsms-empty-conversation">--><?php //p($l->t('Please select a conversation from the list to load it.'));?><!--</div>-->
<!-- <div v-if="messages.length > 0" class="ng-cloak ocsms-messages-container">-->
<!-- <div v-for="message in messages | orderBy:'date'">-->
<!-- <div class="msg-{{ message.type }}">-->
<!-- <div>{{ message.content }}</div>-->
<!-- <div style="display: block;" id="ocsms-message-removal" class="icon-delete svn delete action" v-on:click="removeConversationMessage(message.id);"></div>-->
<!-- <div class="msg-date">{{ message.date | date:'medium' }}</div>-->
<!-- </div>-->
<!-- <div class="msg-spacer"></div>-->
<!-- </div>-->
<!-- <div id="searchresults"></div>-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>