diff --git a/interface/client/collections.js b/interface/client/collections.js index 1dd2bba55..3c6e13dcd 100644 --- a/interface/client/collections.js +++ b/interface/client/collections.js @@ -4,13 +4,14 @@ */ + // BROWSER RELATED // Contains the accounts Tabs = new Mongo.Collection('tabs', {connection: null}); -pers = new PersistentMinimongo2(Tabs, 'Mist'); -if(typeof syncMinimongo !== 'undefined') - syncMinimongo(Tabs); +if (typeof window.mist.syncMinimongo !== 'undefined') { + window.mist.syncMinimongo.frontendSync(Tabs); +} // Contains the address book diff --git a/interface/client/lib/thirdParty.js b/interface/client/lib/thirdParty.js index d900cedca..225b81883 100644 --- a/interface/client/lib/thirdParty.js +++ b/interface/client/lib/thirdParty.js @@ -1,5 +1,3 @@ - - // set spinner options Meteor.Spinner.options = { lines: 12, // The number of lines to draw diff --git a/interface/client/mistAPIBackend.js b/interface/client/mistAPIBackend.js index 0d4f0327d..90fdc9311 100644 --- a/interface/client/mistAPIBackend.js +++ b/interface/client/mistAPIBackend.js @@ -31,7 +31,7 @@ mistAPIBackend = function(event) { var webview = this.webview; var arg = event.args[0]; - console.trace('mistAPIBackend event', event); + // console.trace('mistAPIBackend event', event); if(event.channel === 'setWebviewId') { Tabs.update(template.data._id, {$set:{ diff --git a/interface/client/styles/browserbar.import.less b/interface/client/styles/browserbar.import.less index 2d28d3f47..5ee693911 100644 --- a/interface/client/styles/browserbar.import.less +++ b/interface/client/styles/browserbar.import.less @@ -32,92 +32,22 @@ // ANIMATION transition: height 0.25s, box-shadow 0.5s; - &.show-bar { - height: @gridHeight * 20; - box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25); - - .url-input { - opacity: 0.9; - transition-duration: 0.3s; - transition-delay: 0.1s; - transform: translateX(0) translateZ(0); - } - - .url-breadcrumb { - opacity: 0; - visibility: hidden; - transition-duration: 0.3s; - transition-delay: 0.1s; - transform: translateX(20px) translateZ(0); - word-spacing: -5px; - } - - &:after { - display: block; - position: absolute; - left: 5%; - top: 28px; - width: 20px; - height: 20px; - margin-left: -10px; - content: "◢◣"; - color: @colorGrayDark; - font-size: 50%; - letter-spacing: -2px; - transition: left .5s ease-in-out; - } - } - - &.dapp-info { - button.dapp-info { - color: @colorGrayDark; - } - - div.dapp-info { - display: flex; - } - } - - &.accounts { - button.accounts { - color: @colorGrayDark; - } - button.dapp-info { - color: @colorLink; - } - - div.accounts { - display: flex; - } - - &:after { - left: 95%; - } - } - - &.url { - &:after { - left: 50%; - } - div.url { - display: flex; - } - } - - > button { + > .dapp-info, > button { + color: #6691c2; position: relative; padding-left: 0; margin-top: 1px; max-width: 33%; - height: @gridHeight; + height: 21px; font-family: @sourceSansPro; font-size: @fontSizeSmall; font-weight: 500; - line-height: @gridHeight; + line-height: 21px; white-space: nowrap; + margin-top: -1px; &.has-icon { - padding-left: @gridWidth*0.75; + padding-left: @gridWidth * 0.84; } &:focus { @@ -128,27 +58,36 @@ .dapp-shorten-text; } - .dapp-identicon { - margin-top: -2px; - } - .app-icon { position: absolute; - top: 1px; + top: 0; left: 0; - width: 16px; - height: 16px; - border-radius: 8px; + width: 21px; + height: 21px; + border-radius: 50%; + -webkit-user-drag: none; + user-drag: none; } - .icon-key { - display: block; - float: right; - top: 3px; - margin-left: 4px; - position: relative; + .connect-button { + float: left; + margin-right: 8px; + text-transform: uppercase; + } + .connect-button, .dapp-info span { + line-height: 21px; + display: inline-block; } + span.no-accounts { + background-image: url(/images/anonymous-icon.png); + background-size: cover; + background-position: 50%; + width: 21px; + height: 21px; + display: inline-block; + border-radius: 50%; + } } > form { @@ -203,7 +142,6 @@ color: @colorLinkBlur; } } - } div.dapp-info, @@ -279,8 +217,8 @@ } .app-bar { - margin-left: @gridWidth * 1; - margin-right: 0; + margin-left: @gridWidth /2; + margin-right: @gridWidth /2; } } @@ -392,7 +330,7 @@ .browser-bar .accounts { width: 0; text-overflow: clip; - padding-left: @gridWidth * 0.5; + padding-left: @gridWidth * 0.75; } } diff --git a/interface/client/styles/menu.import.less b/interface/client/styles/menu.import.less index ab3ceb7cd..ee620d1d7 100644 --- a/interface/client/styles/menu.import.less +++ b/interface/client/styles/menu.import.less @@ -129,10 +129,43 @@ aside.sidebar { // text-align: left; // } } + + + // Remove tab button + button.main { + img { + transition: 180ms linear opacity; + } + } + + &:not(.browser):not(.wallet) header:hover { + button.main img { + opacity: 0; + } + button.remove-tab { + opacity: 1; + } + } + button.remove-tab { + box-sizing: border-box; + position: absolute; + padding: 6px 8px 0px 2px; + transition: 180ms linear opacity; + left: 8px; + opacity: 0; + top: 0; + color: @colorLinkBlur; + height: @gridHeight*2; + z-index: 2; + &:focus { + border: none; + } + } + button.slide-out { position: absolute; right: @gridHeight/2; - top: @gridHeight/1.5; + top: @gridHeight/1.75; width: 30px; height: 20px; background: url('icons/expand-icon.png') no-repeat center; @@ -289,4 +322,10 @@ aside.sidebar { margin: @gridHeight/2 @gridWidth/4; } } -} \ No newline at end of file +} + +// Remove tab button related code +aside.full-tabs button.remove-tab { + display: none; +} + diff --git a/interface/client/styles/popupWindows.import.less b/interface/client/styles/popupWindows.import.less index 1d7bc5ba0..f018ceb77 100644 --- a/interface/client/styles/popupWindows.import.less +++ b/interface/client/styles/popupWindows.import.less @@ -1,178 +1,354 @@ -.popup-windows { - text-align: center; - - a, button { - color: @colorLinkActive; - } - - a:focus { - color: @colorLinkFocus; - } - - img.left-overlay { - position: relative; - top: -40px; - left: -132%; - width: 255%; - } - - &.update-available { - .text { - text-align: left; - } - - h1 { - font-size: 200%; - margin-bottom: 20px; - - &.no-upate { - font-size: 180%; - } - } - } - - &.tx-info { - - .transaction-parties { - display : flex; - flex-direction: row; - align-items: center; - justify-content: center; +@-webkit-keyframes slideInLeft { + from { + transform: translate3d(50%, 0, 0) rotate(45deg); + opacity: 0; + } + to { + transform: translate3d(0, 0, 0); + opacity: 1; + } +} - > div { - // flex: 1 1 auto; - color: @colorTextSecondary; - } +@-webkit-keyframes slideInRight { + from { + transform: translate3d(-50%, 0, 0) rotate(-45deg); + opacity: 0; + } + to { + transform: none; + opacity: 1; + } +} - // addresses - > div:nth-child(odd) { - position: relative; - padding: 0 @defaultMargin*3; - font-weight: 400; - } - > div:nth-child(1) { - .overlap-icon { - right: 32px; - } - } - > div:nth-child(3) { - .overlap-icon { - left: 32px; - } - } - // amount - > div.amount { - position: relative; - margin-top: -30px; - height: 40px; - font-size: 1.5em; - color: darken(@colorTextSecondary, 8%); - border-bottom: 1px solid @colorTextSecondary; +@-webkit-keyframes fadeIn { + from { + opacity: 0; + } + to { + opacity: 1; + } +} - &:after { - content: ''; - position: absolute; - bottom: -5px; - right: 0; - border: 5px solid @colorTextSecondary; - border-color: transparent @colorTextSecondary @colorTextSecondary transparent; - .rotate(-45deg); - } - - .unit { - font-size: 0.6em; - font-weight: 400; - } - .execute-function { - display: block; - position: absolute; - bottom: -30px; - left: 0; - right: 0; - font-size: 0.6em; - text-align: center; - font-weight: 600; - } - } - } - - table, - .data, - .info { - width: 420px; - margin: @defaultMargin*2 auto; - } - table { - - td:nth-child(1) { - text-align: left; - } - td:nth-child(2) { - text-align: right; - font-weight: 400; - } - } - - .overlap-icon { - position: absolute; - top: 20px; - font-size: 20px; - } - .circle-icon { - display: inline-block; - background-color: @colorGrayLight; - .border-radius(50%); - font-size: 33px; - padding: @defaultMargin; - - // + span { - // display: inline-block; - // } - } - - .provided-gas { - display: inline; - width: 70px; - padding: 0; - margin: 0; - color: @colorLink; - background-color: transparent; - border: 0; - text-align: right; - border-bottom: 1px dotted @colorLink; - - &:focus { - outline: 0; - } - } - - input[type="password"] { - width: @gridWidth * 12; - } +.popup-windows { + text-align: center; + a, + button { + color: @colorLinkActive; + } + a:focus { + color: @colorLinkFocus; + } + img.left-overlay { + position: relative; + top: -40px; + left: -132%; + width: 255%; + } + &.update-available { + .text { + text-align: left; + } + h1 { + font-size: 200%; + margin-bottom: 20px; + &.no-update { + font-size: 180%; + } + } + } + &.tx-info { + .transaction-parties { + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + > div { + // flex: 1 1 auto; + color: @colorTextSecondary; + } + // addresses + > div:nth-child(odd) { + position: relative; + padding: 0 @defaultMargin*3; + font-weight: 400; + } + > div:nth-child(1) { + .overlap-icon { + right: 32px; + } + } + > div:nth-child(3) { + .overlap-icon { + left: 32px; + } + } + // amount + > div.amount { + position: relative; + margin-top: -30px; + height: 40px; + font-size: 1.5em; + color: darken(@colorTextSecondary, 8%); + border-bottom: 1px solid @colorTextSecondary; + &:after { + content: ''; + position: absolute; + bottom: -5px; + right: 0; + border: 5px solid @colorTextSecondary; + border-color: transparent @colorTextSecondary @colorTextSecondary transparent; + .rotate(-45deg); + } + .unit { + font-size: 0.6em; + font-weight: 400; + } + .execute-function { + display: block; + position: absolute; + bottom: -30px; + left: 0; + right: 0; + font-size: 0.6em; + text-align: center; + font-weight: 600; + } + } + } + table, + .data, + .info { + width: 420px; + margin: @defaultMargin*2 auto; + } + table { + td:nth-child(1) { + text-align: left; + } + td:nth-child(2) { + text-align: right; + font-weight: 400; + } + } + .overlap-icon { + position: absolute; + top: 20px; + font-size: 20px; + } + .circle-icon { + display: inline-block; + background-color: @colorGrayLight; + .border-radius(50%); + font-size: 33px; + padding: @defaultMargin; + // + span { + // display: inline-block; + // } + } + .provided-gas { + display: inline; + width: 70px; + padding: 0; + margin: 0; + color: @colorLink; + background-color: transparent; + border: 0; + text-align: right; + border-bottom: 1px dotted @colorLink; + &:focus { + outline: 0; + } + } + input[type="password"] { + width: @gridWidth * 12; + } + .data, + .info { + text-align: left; + padding: 0 @defaultMargin/2; + } + .data { + font-size: 0.9em; + pre { + margin: 0 -@defaultMargin; + overflow: auto; + height: 90px; + background-color: @colorGrayLight; //lighten(@colorGray, 10%); + color: @colorTextPrimary; + span.zero { + color: fadeout(@colorTextSecondary, 30%); + } + span.function { + font-weight: 600; + } + } + } + } + &.request-account { + h1 { + margin-bottom: 20px; + } + .fields-container { - .data, - .info { - text-align: left; - padding: 0 @defaultMargin/2; - } - .data { - font-size: 0.9em; - - pre { - margin: 0 -@defaultMargin; - overflow: auto; - height: 90px; - background-color: @colorGrayLight;//lighten(@colorGray, 10%); - color: @colorTextPrimary; + } + .show-password-container { + width: 300px; + margin: 0 auto 0; + padding: 12px 0 0; + text-align: left; + input[type=checkbox] { + margin-left: 16px; + } + label { + position: relative; + top: -7px; + left: 6px; + opacity: 0.9; + font-size: 14px; + } + } + } + &.connect-account { + text-align: left; + box-sizing: border-box; + margin: 0 auto; + padding: 0 60px; + form { + display: -webkit-flex; + display: flex; + flex-direction: column; + align-content: space-between; + height: 100vh; - span.zero { - color: fadeout(@colorTextSecondary, 30%); - } - span.function { - font-weight: 600; - } - } - } + > * { + flex: 0; + } + } + p strong { + font-weight: 400; + } + .account-dapp-user-container { + display: -webkit-flex; + display: flex; + height: 64px; + justify-content: center; + align-items: center; + margin: 30px 0 15px; + flex: 0 64px; + } + .account-dapp-user { + margin: 0 5px; + position: relative; + width: 120px; + height: 64px; + & > * { + position: absolute; + top: 0; + display: inline-block; + width: 64px; + height: 64px; + border-radius: 50%; + &.is-empty { + background-color: #6E6C6F; + border-radius: 50%; + i { + color: #fff; + display: block; + text-align: center; + line-height: 64px; + font-size: 2.8em; + } + } + &.no-account { + background-image: url(/images/anonymous-icon.png); + background-size: cover; + background-position: 50%; + } + } + .user-icon, + .simptip-position-left { + z-index: 2; + left: 0; + animation: .7s cubic-bezier(0, 0, 0.13, 1) slideInLeft; + &:first-child {left: 0px;} + &:nth-of-type(2) { left: 5px; } + &:nth-of-type(3) { left: 10px; } + &:nth-of-type(4) { left: 15px; } + &:nth-of-type(5) { left: 20px; } + &:nth-of-type(6) { left: 25px; } + } + .app-icon { + z-index: 1; + left: 55px; + animation: .7s cubic-bezier(0, 0, 0.13, 1) slideInRight; + } + } + .dapp-account-list { + flex-grow: 5; + position: relative; + overflow: auto; + padding: 0; + margin: 0; + &::after { + position: absolute; + // content: ''; + display: block; + bottom: 0; + width: 100%; + height: 25px; + pointer-events: none; + background: -webkit-linear-gradient(top, rgba(241, 241, 241, 0), rgba(241, 241, 241, 1)); + } + li:last-child { + margin-bottom: 25px; + } + } + .create-account-icon { + background-color: @colorLinkActive; + box-shadow: none; + &:after { + color: #fff; + content: '+'; + display: block; + text-align: center; + line-height: 32px; + font-size: 1.7em; + font-weight: 400; + } + } + .checkbox-container { + display: flex; + flex: 0 50px; + padding: 1em 0; + input { + margin-right: 6px; + } + label { + color: @colorLinkActive; + font-weight: 500; + } + } + .dapp-modal-buttons { + flex: 0 62px; + } + .dapp-modal-buttons, + .dapp-modal-buttons button:last-of-type { + margin-right: 0; + } + span.account-address, + span.dapp-url { + animation: .9s cubic-bezier(0.74, 0, 1, 0.29) fadeIn; + display: inline-block; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + width: 100px; + font-size: 14px; + color: #AEAEAE; + } + } +} - } -} \ No newline at end of file +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)); +} diff --git a/interface/client/templates/index.js b/interface/client/templates/index.js index b519ea28f..370d5d25b 100644 --- a/interface/client/templates/index.js +++ b/interface/client/templates/index.js @@ -52,6 +52,9 @@ Template.body.helpers({ // $('title').text(TAPi18n.__('mist.popupWindows.requestAccount.title') return 'popupWindows_sendTransactionConfirmation'; } + if (location.hash === '#connectAccount') { + return 'popupWindows_connectAccount'; + } } }); diff --git a/interface/client/templates/layout/browserBar.html b/interface/client/templates/layout/browserBar.html index eb014c780..fd22d4d60 100644 --- a/interface/client/templates/layout/browserBar.html +++ b/interface/client/templates/layout/browserBar.html @@ -5,15 +5,15 @@
- + {{name}} +
- +
{{breadcrumb}}
@@ -23,32 +23,13 @@ {{> dapp_identicon identity=address class="dapp-tiny"}} {{else}} - {{i18n "mist.browserBar.buttons.noAccounts"}} + + {{i18n 'mist.browserBar.buttons.connect'}} + + {{/each}} - - - - -
- {{> layout_browserBar_dappInfo}} -
- -
- {{> layout_browserBar_network}} -
- -
- {{> layout_browserBar_accounts}} -
- - {{#if isBrowser}} - - {{else}} - - {{/if}} - {{/with}} \ No newline at end of file diff --git a/interface/client/templates/layout/browserBar.js b/interface/client/templates/layout/browserBar.js index 9eb30aaf7..617f9339c 100644 --- a/interface/client/templates/layout/browserBar.js +++ b/interface/client/templates/layout/browserBar.js @@ -26,24 +26,19 @@ Template['layout_browserBar'].helpers({ 'breadcrumb': function(){ if(!this || !this.url) return; - - var pattern = /([^\:]*)\:\/\/([^\/]*)\/([^\?\.]*)/ - var search = this.url.match(pattern); - - if(!search) + try { + var url = new URL(this.url); + } + catch(e){ return; - - var urlObject = { - url: search[0], - protocol: search[1], - domain: search[2].split("."), - folders: search[3].split("/"), } - - var breadcrumb = "" + urlObject.domain.join(".") + " ▸ " + urlObject.folders.join(" ▸ "); - + var pathname = _.reject(url.pathname.replace(/\/$/g, '').split("/"), function(el) { + return el == ''; + }); + var breadcrumb = _.flatten(["" + url.host + " ", pathname]).join(" ▸ "); return new Spacebars.SafeString(breadcrumb); }, + /** Returns the current dapp @@ -142,28 +137,34 @@ Template['layout_browserBar'].events({ Tabs.remove(tabId); LocalStore.set('selectedTab', 'browser'); }, - /* - Show the app bar + /** + Show connect account popup - @event click app-bar > button, click .app-bar > form + @event click .app-bar > button.accounts' */ - 'click .app-bar > button, click .app-bar > form': function(e, template){ - // prevent the slide in, when the url is clicked - if($(e.target).hasClass('url-input')) - return; + 'click .app-bar > button.accounts': function(e, template) { + mist.requestAccount(function(e, addresses){ + var tabId; - template.$('.app-bar').toggleClass('show-bar'); - }, - /* - Hide the app bar + mist.syncMinimongo.frontendSync(Tabs); + + tabId = LocalStore.get('selectedTab'); - @event mouseleave .app-bar + // set new permissions + Tabs.update(tabId, {$set: { + 'permissions.accounts': addresses + }}); + + // Helpers.getWebview(tabId).reload(); + }); + }, + /* + Hide the app bar on input blur + + @event blur */ - 'mouseleave .app-bar': function(e, template){ - var timeoutId = setTimeout(function(){ - template.$('.app-bar').removeClass('show-bar'); - }, 1000); - TemplateVar.set('timeoutId', timeoutId); + 'blur .app-bar > form.url .url-input': function(e, template) { + template.$('.app-bar').removeClass('show-bar'); }, /* Stop hiding the app bar @@ -174,19 +175,6 @@ Template['layout_browserBar'].events({ clearTimeout(TemplateVar.get('timeoutId')); }, /* - Show the sections - - @event click button.accounts, click button.dapp-info, click form.url - */ - 'click button.accounts, click button.dapp-info, click form.url': function(e, template){ - var className = $(e.currentTarget).attr('class'); - - if(TemplateVar.get('browserBarTab') !== className) - template.$('.app-bar').addClass('show-bar'); - - TemplateVar.set('browserBarTab', className); - }, - /* Focus the input @event click form.url @@ -226,8 +214,5 @@ Template['layout_browserBar'].events({ redirect: url }}); LocalStore.set('selectedTab', foundTab); - - // hide the app-bar - template.$('.app-bar').removeClass('show-bar'); } }); diff --git a/interface/client/templates/layout/browserBar_accounts.html b/interface/client/templates/layout/browserBar_accounts.html deleted file mode 100644 index 3589ba606..000000000 --- a/interface/client/templates/layout/browserBar_accounts.html +++ /dev/null @@ -1,32 +0,0 @@ - \ No newline at end of file diff --git a/interface/client/templates/layout/browserBar_accounts.js b/interface/client/templates/layout/browserBar_accounts.js deleted file mode 100644 index 88fd30d4f..000000000 --- a/interface/client/templates/layout/browserBar_accounts.js +++ /dev/null @@ -1,146 +0,0 @@ -/** -Template Controllers - -@module Templates -*/ - - -/** -The browserBar keyinfo template - -@class [template] layout_browserBar_accounts -@constructor -*/ - -/** -Checks whether the given address has permission for the current tab. - -method hasPermission -*/ -var hasPermission = function(tab, address) { - return (tab && - tab.permissions && - tab.permissions.accounts && - _.contains(tab.permissions.accounts, address)); -}; - - -Template['layout_browserBar_accounts'].onCreated(function(){ - this.autorun(function(){ - // make reeactive to the tab change - var tab = Tabs.findOne(LocalStore.get('selectedTab'), {fields: {'permissions.accounts': 1}}), - accounts = (tab.permissions && tab.permissions.accounts) ? tab.permissions.accounts : []; - - TemplateVar.set('accounts', accounts); - }); -}); - - -Template['layout_browserBar_accounts'].helpers({ - /** - Return "selected" if the current account is allowed in that dapp. - - @method selected - @return {String} "selected" - */ - 'selected': function(){ - return (_.contains(TemplateVar.get('accounts'), this.address)) ? 'selected' : ''; - // return hasPermission(this.address) ? 'selected' : ''; - }, - /** - Return the number of accounts this tab has permission for. - - @method accountNumber - @return {Number} - */ - 'accountNumber': function(){ - var accounts = _.pluck(EthAccounts.find().fetch(), 'address'); - - return _.intersection(accounts, TemplateVar.get('accounts')).length; - - // var tab = Tabs.findOne(LocalStore.get('selectedTab')); - // return (tab && - // tab.permissions && - // tab.permissions.accounts) ? tab.permissions.accounts.length : 0; - } -}); - - -Template['layout_browserBar_accounts'].events({ - /** - Create account - - @event click button.create-account - */ - 'click button.create-account': function(e, template){ - mist.requestAccount(function(e, address){ - console.debug('Got new account', address); - - var tabId = LocalStore.get('selectedTab'), - accounts = TemplateVar.get(template, 'accounts'); - - accounts.push(address); - - TemplateVar.set(template, 'accounts', accounts); - - // set new permissions - Tabs.update(tabId, {$set: { - 'permissions.accounts': accounts - }}); - - // reload the webview - Helpers.getWebview(tabId).reload(); - - // hide the sidebar - $('.app-bar').removeClass('show-bar'); - }); - }, - /** - Select the accounts available for this dapp. - - @event click .dapp-account-list button - */ - 'click .dapp-account-list button': function(e, template) { - var accounts = TemplateVar.get('accounts'); - - if(!_.contains(accounts, this.address)) - accounts.push(this.address); - else - accounts = _.without(accounts, this.address); - - TemplateVar.set(template, 'accounts', accounts); - // var tabId = LocalStore.get('selectedTab'); - - - // if(!hasPermission(this.address)) { - // Tabs.update(tabId, {$addToSet: { - // 'permissions.accounts': this.address - // }}); - // } else { - // Tabs.update(tabId, {$pull: { - // 'permissions.accounts': this.address - // }}); - // } - }, - /** - Confirm or cancel the accounts available for this dapp and reload the dapp. - - @event click button.confirm, click button.cancel - */ - 'click button.confirm, click button.cancel': function(e) { - var tabId = LocalStore.get('selectedTab'), - accounts = ($(e.currentTarget).hasClass('confirm')) ? TemplateVar.get('accounts') : [], - tab = Tabs.findOne(tabId, {fields: {'permissions.accounts': 1}}); - - // set new permissions - Tabs.update(tabId, {$set: { - 'permissions.accounts': accounts - }}); - - // reload the webview - Helpers.getWebview(tabId).reload(); - - // hide the sidebar - $('.app-bar').removeClass('show-bar'); - } -}); diff --git a/interface/client/templates/layout/browserBar_dappInfo.html b/interface/client/templates/layout/browserBar_dappInfo.html deleted file mode 100644 index 218f6eb53..000000000 --- a/interface/client/templates/layout/browserBar_dappInfo.html +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/interface/client/templates/layout/browserBar_network.html b/interface/client/templates/layout/browserBar_network.html deleted file mode 100644 index 2b151ac01..000000000 --- a/interface/client/templates/layout/browserBar_network.html +++ /dev/null @@ -1,6 +0,0 @@ - \ No newline at end of file diff --git a/interface/client/templates/layout/browserBar_network.js b/interface/client/templates/layout/browserBar_network.js deleted file mode 100644 index c4b37a8ba..000000000 --- a/interface/client/templates/layout/browserBar_network.js +++ /dev/null @@ -1,27 +0,0 @@ -/** -Template Controllers - -@module Templates -*/ - - -/** -The browserBar network template - -@class [template] layout_browserBar_network -@constructor -*/ - - - -Template['layout_browserBar_network'].helpers({ - /** - Return the number current block - - @method block - @return {String} - */ - // 'block': function(){ - // return EthAccounts.latest; - // } -}); diff --git a/interface/client/templates/layout/sidebar.html b/interface/client/templates/layout/sidebar.html index c6edb963a..2369ff642 100644 --- a/interface/client/templates/layout/sidebar.html +++ b/interface/client/templates/layout/sidebar.html @@ -3,22 +3,28 @@