From 5676f7e1e83a706f82db371dd2a11b51a5ea690f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C4=93teris=20Caune?= Date: Tue, 24 May 2016 13:55:51 +0300 Subject: [PATCH] Usage instructions in "My Checks" page --- static/css/my_checks.css | 8 +++ static/css/my_checks_desktop.css | 20 ++----- static/js/checks.js | 19 +++++-- templates/front/my_checks.html | 78 ++++++++++++++++++++++++++ templates/front/my_checks_desktop.html | 30 +++------- templates/front/snippets/bash.html | 1 + templates/front/snippets/bash.txt | 1 + 7 files changed, 115 insertions(+), 42 deletions(-) diff --git a/static/css/my_checks.css b/static/css/my_checks.css index 6f0827ab..496e36c5 100644 --- a/static/css/my_checks.css +++ b/static/css/my_checks.css @@ -61,3 +61,11 @@ background-color: #eee; color: #555; } + +#show-usage-modal .modal-dialog { + width: 1100px; +} + +#show-usage-modal .tab-content { + margin-top: 15px; +} \ No newline at end of file diff --git a/static/css/my_checks_desktop.css b/static/css/my_checks_desktop.css index 32045ed0..8a3976d5 100644 --- a/static/css/my_checks_desktop.css +++ b/static/css/my_checks_desktop.css @@ -39,11 +39,6 @@ table.table tr > th.th-name { border: 1px dotted #AAA; } -.url-cell { - font-size: small; - position: relative; -} - #checks-table > tbody > tr > th.th-period { padding-left: 15px; } @@ -79,18 +74,11 @@ tr:hover .check-menu { white-space: nowrap; } -#checks-table .placeholder, #checks-table .my-checks-url.off, #checks-table .my-checks-email.off { +.my-checks-url { font-family: "Lucida Console", Monaco, monospace; font-size: 11.7px; - height: 0; - overflow: hidden; + position: relative; + line-height: 36px; + color: #333; } -#checks-table .selectable { - font-family: "Lucida Console", Monaco, monospace; - font-size: 11.7px; - width: 100%; - border: 0; - cursor: text; - background: transparent; -} diff --git a/static/js/checks.js b/static/js/checks.js index c1fc75aa..3b6c64c4 100644 --- a/static/js/checks.js +++ b/static/js/checks.js @@ -139,11 +139,6 @@ $(function () { $(".my-checks-email").removeClass("off"); }); - $(".selectable").click(function() { - $(this).tooltip("hide"); - this.select(); - }); - $("#my-checks-tags button").click(function() { // .active has not been updated yet by bootstrap code, // so cannot use it @@ -181,4 +176,18 @@ $(function () { }); + $(".my-checks-url").click(function(e) { + var a = e.target; + var url = a.getAttribute("href"); + var email = a.getAttribute("data-email"); + + $(".ex", "#show-usage-modal").text(url); + $(".em", "#show-usage-modal").text(email); + + $(a).tooltip("hide"); + $("#show-usage-modal").modal("show"); + + return false; + }); + }); diff --git a/templates/front/my_checks.html b/templates/front/my_checks.html index b8ab2263..9e32b422 100644 --- a/templates/front/my_checks.html +++ b/templates/front/my_checks.html @@ -196,6 +196,84 @@ + + {% endblock %} diff --git a/templates/front/my_checks_desktop.html b/templates/front/my_checks_desktop.html index 827c7a18..703c123c 100644 --- a/templates/front/my_checks_desktop.html +++ b/templates/front/my_checks_desktop.html @@ -4,10 +4,7 @@ Name - - URL - Email - + Ping URL Period
Grace @@ -42,23 +39,14 @@ -
{{ check.url }}
-
- -
-
- -
+ + {{ check.url }} + 
# using curl:
+# (make sure it is installed on your system!)
 curl --retry 3 {{ ping_url }}
 
 # using wget:
diff --git a/templates/front/snippets/bash.txt b/templates/front/snippets/bash.txt
index cdca954f..934d7f91 100644
--- a/templates/front/snippets/bash.txt
+++ b/templates/front/snippets/bash.txt
@@ -1,4 +1,5 @@
 # using curl:
+# (make sure it is installed on your system!)
 curl --retry 3 PING_URL
 
 # using wget: