From 80d5a5b92f5b4b09bbcef9bb0b34a9fda02e2d66 Mon Sep 17 00:00:00 2001 From: erqan Date: Sat, 10 Sep 2016 18:14:08 +0300 Subject: [PATCH] adding modal warning field --- css/style.css | 16 ++++++++++++++++ home.html | 4 ++++ js/interface_common.js | 13 +++++++++---- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/css/style.css b/css/style.css index 4655c31..a00f75c 100644 --- a/css/style.css +++ b/css/style.css @@ -1577,6 +1577,22 @@ ol.toptrends-list { font-weight: bold; } +.modal-warn { + display: none; + background: #fffbc3; + font-size: 0.8em; + padding: 10px; + border: 3px solid #fff; +} + +.modal-warn-close { + float:right; + font-size: 1.2em; + color: #e34f42; + cursor: pointer; + margin: -8px; +} + .modal-wrapper .modal-content { background: #fff; overflow-y: auto; diff --git a/home.html b/home.html index 61b8af6..46d05ce 100644 --- a/home.html +++ b/home.html @@ -422,6 +422,10 @@ < + diff --git a/js/interface_common.js b/js/interface_common.js index 9cf222b..15352fe 100644 --- a/js/interface_common.js +++ b/js/interface_common.js @@ -57,6 +57,10 @@ function openModal(modal) { if (modal.title) modal.self.find('.modal-header h3').html(modal.title); + if (modal.warn) + modal.self.find('.modal-warn') + .show() + .find('.warn-text').html(modal.warn); if (modal.content) modal.content = modal.self.find('.modal-content') .append(modal.content); @@ -610,12 +614,11 @@ function openFollowersModal(peerAlias) { var modal = openModal({ classAdd: 'followers-modal', content: twister.tmpl.followersList.clone(true), - title: title + title: title, + warn: txtAlert }); appendFollowersToElem(modal.content.find('ol'), followers); - - alertPopup({txtMessage: txtAlert}); } function appendFollowersToElem(list, followers) { @@ -1537,7 +1540,7 @@ function postExpandFunction(e, postLi) { var originalLi = $('
  • ', {class: 'module post original'}).appendTo(itemOl) .append(originalPost); - setPostImagePreview(postExpandedContent, originalPost.find('a[rel="nofollow"]')); + setPostImagePreview(postExpandedContent, originalPost.find('a[rel^="nofollow"]')); postExpandedContent.slideDown('fast'); @@ -2517,6 +2520,8 @@ function initInterfaceCommon() { $('.modal-back').on('click', function() {history.back();}); + $('.modal-warn-close').on('click', function() {$(this).closest('.modal-warn').hide()}); + $('.prompt-close').on('click', closePrompt); $('button.follow').on('click', clickFollow);