diff --git a/Google Chrome/ahoy.js b/Google Chrome/ahoy.js index b538f31..0e5d07b 100644 --- a/Google Chrome/ahoy.js +++ b/Google Chrome/ahoy.js @@ -3,8 +3,8 @@ var Ahoy = function() { /** * CONFIGS */ - //this.api_url = "http://46.101.64.62"; - this.api_url = "http://ahoy.app:8000"; + this.api_url = "http://46.101.64.62"; + //this.api_url = "http://ahoy.app:8000"; /** * DEFAULTS @@ -210,6 +210,11 @@ Ahoy.prototype.after_update = function( details ) { // Make sure the plugins fetch for new information when it's installed/updated this.update_site_list(); this.update_proxy(); + console.log(details); + if( (details.reason === "update" && details.previousVersion !== chrome.app.getDetails().version) || details.reason === "install" ) { + chrome.tabs.create({'url': chrome.extension.getURL('views/release_notes.html'), 'selected': true}); + } + }; @@ -280,7 +285,7 @@ Ahoy.prototype.event_sites_updated = function( e ) { // Update the local storage chrome.storage.sync.set( { "sites_list": e.detail.sites } ); - + this.sites_list = e.detail.sites; // Setup the callback filters diff --git a/Google Chrome/icons/128x128.png b/Google Chrome/icons/128x128.png index b7bf360..f61213f 100644 Binary files a/Google Chrome/icons/128x128.png and b/Google Chrome/icons/128x128.png differ diff --git a/Google Chrome/icons/16x16.png b/Google Chrome/icons/16x16.png index ec069dc..ff7bfb7 100644 Binary files a/Google Chrome/icons/16x16.png and b/Google Chrome/icons/16x16.png differ diff --git a/Google Chrome/icons/48x48.png b/Google Chrome/icons/48x48.png index c99b2b5..d1cc4a8 100644 Binary files a/Google Chrome/icons/48x48.png and b/Google Chrome/icons/48x48.png differ diff --git a/Google Chrome/img/cravo.png b/Google Chrome/img/cravo.png new file mode 100644 index 0000000..872c07a Binary files /dev/null and b/Google Chrome/img/cravo.png differ diff --git a/Google Chrome/img/cravo_curto.png b/Google Chrome/img/cravo_curto.png new file mode 100644 index 0000000..456d1bc Binary files /dev/null and b/Google Chrome/img/cravo_curto.png differ diff --git a/Google Chrome/views/popup.html b/Google Chrome/views/popup.html index 1a7fe97..40ab46e 100644 --- a/Google Chrome/views/popup.html +++ b/Google Chrome/views/popup.html @@ -6,15 +6,24 @@ - + -

Ahoy!

-
A utilizar o proxy xxx.xxx.xxx.xxx
+
+

Ahoy!

+
+
Ligado a xxx.xxx.xxx.xxx
-
- Forçar Novo Proxy - Actualizar Lista de Sites +
+ + +
+ + diff --git a/Google Chrome/views/popup.js b/Google Chrome/views/popup.js new file mode 100644 index 0000000..511d0e7 --- /dev/null +++ b/Google Chrome/views/popup.js @@ -0,0 +1,53 @@ +$(document).ready( function() { + + $('#ahoy-version').text("v" + chrome.app.getDetails().version); + + chrome.storage.sync.get( [ "proxy_addr" ], function( result) { + $("#proxyaddr").text( result.proxy_addr ); + } ) + + + $("#forcarProxy").click( function() { + if($(this).attr('disabled')) { // HERE + return false; + }; + + chrome.extension.getBackgroundPage().ahoy.update_proxy( true ); + $(this).attr('disabled', ""); + + $(".info").hide(); + $(".waiting").show(); + + setTimeout( function() { + + $("#proxyaddr").text( chrome.extension.getBackgroundPage().ahoy.proxy_addr ); + $("#forcarProxy").attr('disabled', false); + + $(".info").show(); + $(".waiting").hide(); + + }, 2000 ); + + }); + + $("#listaSites").click( function() { + if($(this).attr('disabled')) { // HERE + return false; + }; + + chrome.extension.getBackgroundPage().ahoy.update_site_list(); + $(this).attr('disabled', ""); + + $(".waiting").show(); + + setTimeout( function() { + + $("#listaSites").attr('disabled', false); + + $(".waiting").hide(); + + }, 1000 ); + + }); + +}); \ No newline at end of file diff --git a/Google Chrome/views/release_notes.html b/Google Chrome/views/release_notes.html new file mode 100644 index 0000000..cb117e4 --- /dev/null +++ b/Google Chrome/views/release_notes.html @@ -0,0 +1 @@ +

Changelog

\ No newline at end of file diff --git a/Google Chrome/views/style.css b/Google Chrome/views/style.css index 85193bb..9bdc05d 100644 --- a/Google Chrome/views/style.css +++ b/Google Chrome/views/style.css @@ -2,8 +2,23 @@ body { font-family: Arial; text-align: center; width: 300px; + min-height: 300px; + background: url("../img/cravo_curto.png") no-repeat; + background-position: right bottom; + background-size: 100px; + margin: 0px; } +header { + background: #219d55; + color: white; + padding: 10px; +} + +header h1 { + margin: 0; + padding 0; +} h1 { font-size: 20px; @@ -12,7 +27,42 @@ h1 { } .info { - margin: 10px; + margin: 15px 0; + font-weight: bold; + text-transform: uppercase; + font-size: 15px; +} + +.buttons button { + -moz-outline:0 none; + outline:0 none; + display: block; + margin: 5px auto; +} + +.buttons button { + position: relative; + vertical-align: top; + width: 200px; + height: 30px; + padding: 0; + font-size: 15px; + color: white; + text-align: center; + text-shadow: 0 1px 2px rgba(0, 0, 0, 0.25); + background: #27ae60; + border: 0; + border-bottom: 2px solid #219d55; + cursor: pointer; + -webkit-box-shadow: inset 0 -2px #219d55; + box-shadow: inset 0 -2px #219d55; +} + +.buttons button:active { + top: 1px; + outline: none; + -webkit-box-shadow: none; + box-shadow: none; } .waiting { display: none; margin: 10px; } @@ -30,4 +80,18 @@ h1 { a:visited { color: blue; +} + +footer { + position: absolute; + bottom: 5px; + color: gray; + width: 100%; + font-size: 10px; +} + +footer a { + text-decoration: none; + color: gray !important; + font-weight: bold; } \ No newline at end of file