From a83c494d47dcea1ad5b8274c5c7bee20e6e44dbf Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Tue, 23 Jun 2015 17:58:44 +0000 Subject: [PATCH] Add basic icon to delete conversation --- css/style.css | 15 +++++++++++++++ js/public/app.js | 7 +++++++ templates/main.php | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/css/style.css b/css/style.css index 21b8a84..137a4a2 100644 --- a/css/style.css +++ b/css/style.css @@ -71,15 +71,30 @@ #ocsms-phone-label { font-weight: bold; color: #555; + float: left; } #ocsms-phone-opt-number { color: #999; padding-left: 15px; + float: left; + width: 100%; } #ocsms-phone-msg-nb { color: #555; + float: left; + width: 100%; +} + +#ocsms-conversation-removal { + display: none; + float: left; + margin-left: 25px; +} + +#ocsms-conversation-removal:hover { + cursor: pointer; } #ocsms-empty-conversation { diff --git a/js/public/app.js b/js/public/app.js index 5088309..3274a01 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -99,6 +99,9 @@ var refreshConversation = function() { } setMessageCountInfo(jsondata); + if ($('#ocsms-conversation-removal').is(':hidden')) { + $('#ocsms-conversation-removal').show(); + } if ($('#app-content-header').is(':hidden')) { $('#app-content-header').show(); @@ -234,6 +237,10 @@ function fetchConversation(phoneNumber) { $('#app-content-header').show(); } + if ($('#ocsms-conversation-removal').is(':hidden')) { + $('#ocsms-conversation-removal').show(); + } + $('#app-content-wrapper').html(conversationBuf); $('#app-content').scrollTop(1E10); diff --git a/templates/main.php b/templates/main.php index 74ac434..3eafc27 100644 --- a/templates/main.php +++ b/templates/main.php @@ -31,7 +31,7 @@ use \OCA\OcSms\Lib\CountryCodes;