Merge pull request #15 from elementrem/devlab_0.8.47

Devlab 0.8.47 - merge Master release
elementrem · Oct 7, 2016 · 76159da · 76159da
2 parents c14e457 + 0d528cd
commit 76159da
Show file tree

Hide file tree

Showing 26 changed files with 714 additions and 1,067 deletions.
diff --git a/README.md b/README.md
@@ -21,9 +21,9 @@
 The paths which store your wallets database and node are different:     
 
 The wallet (Mist) stores its data at:   
-- Mac: ~/Library/Application Support/Elementrem_Mist   
-- Windows: %APPDATA%\Roaming\Elementrem_Mist   
-- Linux: ~/.config/Elementrem_Mist   
+- Mac: ~/Library/Application Support/Elementrem Wallet  
+- Windows: %APPDATA%\Roaming\Elementrem Wallet  
+- Linux: ~/.config/Elementrem Wallet  
 
 The nodes data is stored at:    
 - Mac: ~/Library/Elementrem   

diff --git a/Wallet-README.txt b/Wallet-README.txt
@@ -19,9 +19,9 @@ http://www.elementrem.org/
 The paths which store your wallets database and node are different:
 
 The wallet (Mist) stores its data at:
-- Mac: ~/Library/Application Support/Elementrem_Mist
-- Windows: %APPDATA%\Roaming\Elementrem_Mist
-- Linux: ~/.config/Elementrem_Mist
+- Mac: ~/Library/Application Support/Elementrem Wallet
+- Windows: %APPDATA%\Roaming\Elementrem Wallet
+- Linux: ~/.config/Elementrem Wallet
 
 The nodes data is stored at:
 - Mac: ~/Library/Elementrem

diff --git a/gulpfile.js b/gulpfile.js
@@ -45,20 +45,20 @@ else
 var type = 'mist';
 var filenameLowercase = 'mist';
 var filenameUppercase = 'Mist';
-var applicationName = 'Mist';
+var applicationName = 'Mist'; 
 var electronVersion = require('electron-prebuilt/package.json').version;
-var geleVersion = '1.4.15';
+var geleVersion = '1.4.16';
 var nodeUrls = {
     'mac-x64': {
-        url: 'https://github.com/elementrem/go-elementrem/releases/download/v1.4.15/mac-osx-gele-1.4.15-186aaec.zip',
+        url: 'https://github.com/elementrem/go-elementrem/releases/download/v1.4.16/mac-osx-gele-1.4.16-3a5f91c.zip',
         ext: 'zip'
     },
     'linux-x64': {
-        url: 'https://github.com/elementrem/go-elementrem/releases/download/v1.4.15/linux-64bit-gele-1.4.15-186aaec.zip',
+        url: 'https://github.com/elementrem/go-elementrem/releases/download/v1.4.16/linux-64bit-gele-1.4.16-3a5f91c.zip',
         ext: 'zip',
     },
     'win-x64': {
-        url: 'https://github.com/elementrem/go-elementrem/releases/download/v1.4.15/windows-64bit-gele-1.4.15-186aaec.zip',
+        url: 'https://github.com/elementrem/go-elementrem/releases/download/v1.4.16/windows-64bit-gele-1.4.16-3a5f91c.zip',
         ext: 'zip',
     },
 };
@@ -395,9 +395,10 @@ gulp.task('build-dist', ['copy-i18n'], function(cb) {
     console.log('Bundling platforms: ', options.platform);
 
     var appPackageJson = _.extend({}, packJson, {
-        productName: 'Elementrem_Mist',
+        name: applicationName.replace(/\s/, ''),
+        productName: applicationName,
         description: applicationName,
-        homepage: "https://github.com/elementrem/",       
+        homepage: "https://github.com/elementrem/mist",       
         build: {
             appId: "com.elementrem.mist." + type,
             "category": "public.app-category.productivity",
@@ -425,11 +426,6 @@ gulp.task('build-dist', ['copy-i18n'], function(cb) {
                     "y": 142,
                     "type": "file"
                 }]
-            },
-            linux: {
-                target: [
-                    "deb"
-                ]
             }
         },
         directories: {
@@ -583,3 +579,4 @@ gulp.task('test-wallet', function() {
 
 
 gulp.task('default', ['mist']);
+
diff --git a/interface/client/appStart.js b/interface/client/appStart.js
@@ -12,7 +12,6 @@ The init function of Mist
 mistInit = function(){
     console.info('Initialise Mist');
 
-
     Tabs.onceSynced.then(function() {
         if (0 <= location.search.indexOf('reset-tabs')) {
             console.info('Resetting UI tabs');
@@ -22,15 +21,14 @@ mistInit = function(){
 
         if(!Tabs.findOne('browser')) {
             console.debug('Insert tabs');
-    
+
             Tabs.insert({
                 _id: 'browser',
                 url: 'https://elementrem.org',
                 position: 0
             });
         }
 
-
         Tabs.upsert({_id: 'wallet'}, {
             url: 'https://elementrem.org',
             position: 1,
@@ -55,7 +53,8 @@ Meteor.startup(function(){
     EleAccounts.init();
     EleBlocks.init();
 
-	mistInit();
+    mistInit();
+
     console.debug('Setting language');
 
     // SET default language

diff --git a/interface/client/lib/signatures.js b/interface/client/lib/signatures.js
@@ -4650,7 +4650,7 @@ window.SIGNATURES = {
 		"TokenSale(uint256,uint256)"
 	],
 	"0x7b1a4909": [
-		"transferEle(address,uint256)"
+		"transferELE(address,uint256)"
 	],
 	"0xf29d2f28": [
 		"setTokenHolder(address)"

diff --git a/interface/client/styles/popupWindows.import.less b/interface/client/styles/popupWindows.import.less
@@ -576,10 +576,7 @@
 	}
 }
 
+
 body.app-blur .popup-windows.connect-account .cards-container .switch-card ul::after {
 	background: -webkit-linear-gradient(top, rgba(246, 246, 246, 0), rgba(246, 246, 246, 1));
 }
-
-html.linux code {
-	background-color: rgba(245, 244, 242, 0.2);
-}
diff --git a/interface/client/templates/index.js b/interface/client/templates/index.js
@@ -21,36 +21,13 @@ Template.body.helpers({
         if(_.isEmpty(location.hash)) {
             $('title').text('Mist');
             return 'layout_main';
-        }
-        if(~location.hash.indexOf('#loadingWindow')) {
-            return 'popupWindows_loadingWindow';
-        }
-        if(~location.hash.indexOf('#updateAvailable')) {
-            return 'popupWindows_updateAvailable';
-        }
-        if(~location.hash.indexOf('#splashScreen')) {
-            return 'popupWindows_splashScreen';
-        }
-        if(~location.hash.indexOf('#onboardingScreen')) {
-            return 'popupWindows_onboardingScreen';
-        }
-        if(~location.hash.indexOf('#importAccount')) {
-            return 'popupWindows_importAccount';
-        }
-        if(~location.hash.indexOf('#about')) {
-            return 'popupWindows_about';
-        }
-        if(location.hash === '#requestAccount') {
-            // $('title').text(TAPi18n.__('mist.popupWindows.requestAccount.title')
-            return 'popupWindows_requestAccount';
-        }
-        if(location.hash === '#unlockMasterPassword') {
-            // $('title').text(TAPi18n.__('mist.popupWindows.requestAccount.title')
-            return 'popupWindows_unlockMasterPassword';
-        }
-        if(location.hash === '#sendTransactionConfirmation') {
-            // $('title').text(TAPi18n.__('mist.popupWindows.requestAccount.title')
-            return 'popupWindows_sendTransactionConfirmation';
+        } else {
+            var renderWindow = location.hash.match(/#([a-zA-Z]*)_?/);
+
+            if (renderWindow.length>0)
+                return 'popupWindows_' + renderWindow[1];
+            else 
+                return false;
         }
     }
 });
@@ -65,4 +42,4 @@ Template.body.events({
    'dragover body > *, drop body > *': function(e){
         e.preventDefault();
     },
-});*/
+});*/
diff --git a/interface/client/templates/popupWindows/connectAccount.js b/interface/client/templates/popupWindows/connectAccount.js
@@ -74,7 +74,7 @@ Template['popupWindows_connectAccount'].helpers({
     @return {Number}
     */
     'accountNumber': function(){
-        var accounts = _.pluck(EthAccounts.find().fetch(), 'address');
+        var accounts = _.pluck(EleAccounts.find().fetch(), 'address');
 
         return _.intersection(accounts, TemplateVar.get('accounts')).length;
     },
@@ -85,7 +85,7 @@ Template['popupWindows_connectAccount'].helpers({
     @return {Array}
     */
     'selectedAccounts': function() {
-        var accounts = _.pluck(EthAccounts.find().fetch(), 'address');
+        var accounts = _.pluck(EleAccounts.find().fetch(), 'address');
         return _.intersection(accounts, TemplateVar.get('accounts'));
     },
     /**

diff --git a/interface/client/templates/popupWindows/sendTransactionConfirmation.html b/interface/client/templates/popupWindows/sendTransactionConfirmation.html
@@ -12,7 +12,7 @@ <h1>{{i18n "mist.popupWindows.sendTransactionConfirmation.title.createContract"}
                     {{/if}}
                 {{/if}}
 
-				<div class="container">
+                <div class="container">
                 <div class="transaction-parties">
                     <div>
                         {{#if TemplateVar.get "fromIsContract"}}
@@ -34,6 +34,7 @@ <h1>{{i18n "mist.popupWindows.sendTransactionConfirmation.title.createContract"}
                             </div>
                         {{/if}}
                     </div>
+
                     <div>
                         {{#if to}}
                             {{#if TemplateVar.get "toIsContract"}}
@@ -43,7 +44,7 @@ <h1>{{i18n "mist.popupWindows.sendTransactionConfirmation.title.createContract"}
                             {{/if}}
                             {{> dapp_identicon identity=to class="dapp-large"}}
                             <br>
-                            <span class="simptip-position-bottom simptip-movable" data-tooltip="{{to}}">{{shortenAddress to}}</span>
+                            <a href="http://www.elementrem.net/addr/{{to}}#code" class="simptip-position-bottom simptip-movable" data-tooltip="{{to}}" target="_blank">{{shortenAddress to}}</a>
                         {{else}}
                             <i class="circle-icon icon-doc"></i>
                             <br>
@@ -52,7 +53,6 @@ <h1>{{i18n "mist.popupWindows.sendTransactionConfirmation.title.createContract"}
                     </div>
                 </div>
 
-
                 {{#if transactionInvalid}}
                     <p class="info dapp-error"> {{{i18n "mist.popupWindows.sendTransactionConfirmation.estimatedGasError"}}} </p>
                 {{else}}
@@ -62,7 +62,7 @@ <h1>{{i18n "mist.popupWindows.sendTransactionConfirmation.title.createContract"}
 
                     {{#unless to}}
                         <p class="info">{{{i18n "mist.popupWindows.sendTransactionConfirmation.contractCreationInfo"}}}</p>
-                    {{/unless}}				
+                    {{/unless}}
                 {{/if}}
 
                 {{#if data}}
@@ -148,11 +148,11 @@ <h2>{{i18n "mist.popupWindows.sendTransactionConfirmation.unlocking"}}</h2>
                         <button class="cancel" type="button">{{i18n "buttons.cancel"}}</button>
                         <button class="ok dapp-primary-button" type="submit">{{i18n "mist.popupWindows.sendTransactionConfirmation.buttons.sendTransaction"}}</button>
                     </div>
-
+                
                 {{/if}}
-				</footer>
+                </footer>
             {{/with}}
-
+            
         </form>
     </div>
-</template>
+</template>
diff --git a/interface/client/templates/popupWindows/splashScreen.js b/interface/client/templates/popupWindows/splashScreen.js
@@ -37,8 +37,6 @@ Template['popupWindows_splashScreen'].onCreated(function(){
 
 
     ipc.on('uiAction_nodeStatus', function(e, status, errorTag) {
-        console.trace('Node status', status, errorTag);
-
         switch (status) {
             case 'starting':
                 TemplateVar.set(template, 'text', TAPi18n.__('mist.startScreen.nodeStarting'));

diff --git a/interface/i18n/mist.en.i18n.json b/interface/i18n/mist.en.i18n.json
@@ -2,9 +2,10 @@
     "mist": {
         "applicationMenu": {
             "app": {
-                "checkForUpdates": "Check for updates...",
                 "label": "__app__",
                 "about": "About __app__",
+                "checkForUpdates": "Check for updates...",
+                "services": "Services",
                 "hide": "Hide __app__",
                 "hideOthers": "Hide Others",
                 "showAll": "Show All",
@@ -21,7 +22,12 @@
             },
             "view": {
                 "label": "View",
-                "fullscreen": "Toggle Fullscreen"
+                "fullscreen": "Toggle Fullscreen",
+                "languages": "Change language",
+                "default": "Default",
+                "langCodes" : {
+                    "en": "English"
+                }
             },
             "accounts": {
                 "label": "Accounts",
@@ -221,7 +227,7 @@
                     "nodeNotStartedYet": "Wait a few more seconds until your node is fully started and try again",
                     "unknownFile": "File not recognised.",
                     "wrongPassword": "Wrong password.",
-                    "importFailed": "Couldn't import the file got: __error__"
+                    "importFailed": "Couldn't import the file, got: __error__"
                 }
             }
         }

diff --git a/main.js b/main.js
@@ -1,5 +1,7 @@
 "use strict";
 
+if(require('electron-squirrel-startup')) return;
+
 global._ = require('./modules/utils/underscore');
 
 const Q = require('bluebird');
@@ -11,6 +13,7 @@ const fs = require('fs');
 const electron = require('electron');
 const app = electron.app;
 const dialog = electron.dialog;
+const shell = electron.shell;
 const timesync = require("os-timesync");
 const syncMinimongo = require('./modules/syncMinimongo.js');
 const ipc = electron.ipcMain;
@@ -42,10 +45,8 @@ const log = logger.create('main');
 if (Settings.inAutoTestMode) {
     log.info('AUTOMATED TESTING');
 }
-log.info(`Running in production mode: ${Settings.inProductionMode}`);
-
-
 
+log.info(`Running in production mode: ${Settings.inProductionMode}`);
 
 if ('http' === Settings.rpcMode) {
     log.warn('Connecting to a node via HTTP instead of IPC. This is less secure!!!!'.toUpperCase());
@@ -457,7 +458,8 @@ var startMainWindow = function() {
     sortedTabs.applySimpleSort('position', false);
 
     let refreshMenu = function() {
-		clearTimeout(global._refreshMenuFromTabsTimer);
+        clearTimeout(global._refreshMenuFromTabsTimer);
+
         global._refreshMenuFromTabsTimer = setTimeout(function() {
             log.debug('Refresh menu with tabs');