flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nerzhul/ocsms.git synced 2025-10-27 08:27:52 +00:00
Code Issues Releases Wiki Activity

Implement colors in conversation header + show the avatar

Browse Source
This commit is contained in:
Loic Blot 2016-05-19 23:39:09 +02:00
parent 09480e4856
commit 74bbb03993
4 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,6 +2,8 @@
* Enhance the contact list using nicer list like in contact app * Enhance the contact list using nicer list like in contact app
* PHP code cleanup (thanks to PHPStorm) * PHP code cleanup (thanks to PHPStorm)
* Angular app code cleanup & enhancements * Angular app code cleanup & enhancements
* Start to implement API calls for restoring messages to phones (using ownCloud SMS app)
* Show the contact avatar in the conversation
1.6.0 1.6.0
* You can now limit messages shown when loading a conversation * You can now limit messages shown when loading a conversation

15
css/style.css
View File

@ -73,6 +73,21 @@
box-shadow: 0 1px 0 0 #CCC; box-shadow: 0 1px 0 0 #CCC;
} }
#ocsms-contact-avatar {
background-color: transparent;
height: 75px;
width: 75px;
font-size: 2.5em;
line-height: 75px;
}
#ocsms-contact-details,
#ocsms-contact-actions,
#ocsms-contact-avatar {
display: inline-block;
}
#ocsms-phone-label { #ocsms-phone-label {
font-weight: bold; font-weight: bold;
color: #555; color: #555;

2
js/public/app.js
View File

@ -232,6 +232,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
// Reinit main window // Reinit main window
$scope.selectedContact.label = ""; $scope.selectedContact.label = "";
$scope.selectedContact.opt_numbers = ""; $scope.selectedContact.opt_numbers = "";
$scope.selectedContact.avatar = "";
$scope.removeContact($scope.selectedContact); $scope.removeContact($scope.selectedContact);
$scope.$apply(function () { $scope.$apply(function () {
$scope.messages = []; $scope.messages = [];
@ -424,6 +425,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
if ($scope.selectedContact.nav === undefined) { if ($scope.selectedContact.nav === undefined) {
$scope.selectedContact.label = urlPhoneNumber; $scope.selectedContact.label = urlPhoneNumber;
$scope.selectedContact.nav = urlPhoneNumber; $scope.selectedContact.nav = urlPhoneNumber;
$scope.selectedContact.avatar = "";
} }
$scope.fetchConversation(null); $scope.fetchConversation(null);
changeSelectedConversation($("a[mailbox-navigation='" + urlPhoneNumber + "']")); changeSelectedConversation($("a[mailbox-navigation='" + urlPhoneNumber + "']"));

18
templates/main.php
View File

@ -46,11 +46,19 @@ use \OCA\OcSms\Lib\CountryCodes;
</div> </div>
<div id="app-content"> <div id="app-content">
<div id="app-content-header" ng-show="selectedContact.label !== undefined && selectedContact.label !== ''"> <div id="app-content-header" ng-show="selectedContact.label !== undefined && selectedContact.label !== ''"
<div id="ocsms-phone-label">{{ selectedContact.label }} </div> ng-style="{'background-color': (selectedContact.label | peerColor)}">
<div id="ocsms-conversation-removal" class="icon-delete svn delete action" ng-click="removeConversation();"></div> <div id="ocsms-contact-avatar">
<div id="ocsms-phone-opt-number">{{ selectedContact.opt_numbers }}</div> <img class="ocsms-plavatar" data-ng-src="data:image/png;base64,{{ selectedContact.avatar }}" ng-show="contact.avatar !== undefined" />
<div id="ocsms-phone-msg-nb">{{ messages.length }} message(s) shown. {{ totalMessageCount }} message(s) stored in database.</div> </div>
<div id="ocsms-contact-details">
<div id="ocsms-phone-label">{{ selectedContact.label }} </div>
<div id="ocsms-phone-opt-number">{{ selectedContact.opt_numbers }}</div>
<div id="ocsms-phone-msg-nb">{{ messages.length }} message(s) shown. {{ totalMessageCount }} message(s) stored in database.</div>
</div>
<div id="ocsms-contact-actions">
<div id="ocsms-conversation-removal" class="icon-delete svn delete action" ng-click="removeConversation();"></div>
</div>
</div> </div>
<div id="app-content-wrapper"> <div id="app-content-wrapper">