From 2e89ca896624d0e52f4f08c5e2b7f23d65ad6af0 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 5 Apr 2014 02:09:49 +0400 Subject: [PATCH] - Version on the options page - New embedding options (not implemented yet) --- chrome_point_plus/css/point-plus.css | 27 ++++++++++++++++++--------- chrome_point_plus/js/options.js | 16 +++++++++++++++- chrome_point_plus/js/point-plus.js | 8 -------- chrome_point_plus/manifest.json | 2 +- chrome_point_plus/options.html | 21 ++++++++++++++++++++- 5 files changed, 54 insertions(+), 20 deletions(-) diff --git a/chrome_point_plus/css/point-plus.css b/chrome_point_plus/css/point-plus.css index cba8a5a..d3adbb3 100644 --- a/chrome_point_plus/css/point-plus.css +++ b/chrome_point_plus/css/point-plus.css @@ -82,6 +82,7 @@ div#markItUpText-input { margin: 0 5px 0 0; padding: 10px; border-radius: 0 0 15px 15px; + display: flex; } .pp-options .usual #panel button.button { background-color: #C8C8C8; @@ -104,15 +105,6 @@ div#markItUpText-input { position:relative; top:1px; } -/* -.pp-options .usual div#tabs-content div { - padding: 3px 0 0 0; - margin-top: -15px; - clear: left; - font: 10pt Georgia; - color: #FFF; -} -*/ .pp-options .usual div a { color: #000; @@ -146,3 +138,20 @@ div#markItUpText-input { color: #BBB; } +/* Panel */ +.pp-options .left, .pp-options .right { + width: 50%; +} + +.pp-options .left { + float: left; +} + +.pp-options .right { + float: right; +} + +.pp-options #pp-version { + margin-top: 6px; + text-align: right; +} \ No newline at end of file diff --git a/chrome_point_plus/js/options.js b/chrome_point_plus/js/options.js index 353de77..95b4213 100644 --- a/chrome_point_plus/js/options.js +++ b/chrome_point_plus/js/options.js @@ -147,7 +147,21 @@ function pp_restore_options() { if (options.option_ws_feeds_blogs == true) { document.getElementById('option-ws-feeds-blogs').checked = true; } + + // Showing version + document.getElementById('pp-version').innerHTML = 'Point+ ' + getVersion() + ' by @skobkin-ru'; }); + + } document.addEventListener('DOMContentLoaded', pp_restore_options); -document.querySelector('#save').addEventListener('click', pp_save_options); \ No newline at end of file +document.querySelector('#save').addEventListener('click', pp_save_options); + +// Getting version from manifest.json +function getVersion() { + var xhr = new XMLHttpRequest(); + xhr.open('GET', chrome.extension.getURL('manifest.json'), false); + xhr.send(null); + var manifest = JSON.parse(xhr.responseText); + return manifest.version; +} \ No newline at end of file diff --git a/chrome_point_plus/js/point-plus.js b/chrome_point_plus/js/point-plus.js index a558e41..7dfcee6 100644 --- a/chrome_point_plus/js/point-plus.js +++ b/chrome_point_plus/js/point-plus.js @@ -325,14 +325,6 @@ function escapeHtml(text) { .replace(/\n/g, "
"); } -function getVersion() { - var xhr = new XMLHttpRequest(); - xhr.open('GET', chrome.extension.getURL('manifest.json'), false); - xhr.send(null); - var manifest = JSON.parse(xhr.responseText); - return manifest.version; -} - // Monts for Date.getMonth() var months = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', diff --git a/chrome_point_plus/manifest.json b/chrome_point_plus/manifest.json index e94c9e8..fa70b4f 100644 --- a/chrome_point_plus/manifest.json +++ b/chrome_point_plus/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Point+", - "version": "1.6", + "version": "1.7", "author": "Alexey Skobkin", "homepage_url": "https://bitbucket.org/skobkin/chrome_point_plus", "description": "More features for point.im", diff --git a/chrome_point_plus/options.html b/chrome_point_plus/options.html index c6fe055..06d8e17 100644 --- a/chrome_point_plus/options.html +++ b/chrome_point_plus/options.html @@ -37,6 +37,18 @@
+ +
+ + +
+ +
+ +
+ +
+
@@ -107,7 +119,14 @@
- + +
+ +
+ +
+
+