diff --git a/static/js/deleteItemsDialog.js b/static/js/deleteItemsDialog.js index 0b4c679..6fbc0eb 100644 --- a/static/js/deleteItemsDialog.js +++ b/static/js/deleteItemsDialog.js @@ -13,9 +13,11 @@ oml.ui.deleteItemsDialog = function() { that = oml.ui.confirmDialog({ buttons: [ Ox.Button({ + style: 'squared', title: Ox._('No, Keep {0}', [itemsName]) }), Ox.Button({ + style: 'squared', title: Ox._('Yes, Delete {0}', [itemsName]) }) ], diff --git a/static/js/deleteListDialog.js b/static/js/deleteListDialog.js index c12a529..216f953 100644 --- a/static/js/deleteListDialog.js +++ b/static/js/deleteListDialog.js @@ -7,9 +7,11 @@ oml.ui.deleteListDialog = function() { that = oml.ui.confirmDialog({ buttons: [ Ox.Button({ + style: 'squared', title: Ox._('No, Keep List') }), Ox.Button({ + style: 'squared', title: Ox._('Yes, Delete List') }) ], diff --git a/static/js/errorDialog.js b/static/js/errorDialog.js index 20eac27..8a2f1fa 100644 --- a/static/js/errorDialog.js +++ b/static/js/errorDialog.js @@ -21,6 +21,7 @@ oml.ui.errorDialog = function() { function getButtons() { return (ui.enableDebugMenu ? [ Ox.Button({ + style: 'squared', title: Ox._('View Error Logs...') }) .bindEvent({ @@ -33,6 +34,7 @@ oml.ui.errorDialog = function() { ] : []).concat([ Ox.Button({ id: 'close', + style: 'squared', title: Ox._('Close') }) .bindEvent({ diff --git a/static/js/findDialog.js b/static/js/findDialog.js index 393f2cf..944eeab 100644 --- a/static/js/findDialog.js +++ b/static/js/findDialog.js @@ -8,6 +8,7 @@ oml.ui.findDialog = function() { buttons: [ Ox.Button({ id: 'done', + style: 'squared', title: Ox._('Done') }) .bindEvent({ @@ -33,6 +34,7 @@ oml.ui.findDialog = function() { }), $updateCheckbox = Ox.Checkbox({ + style: 'squared', title: Ox._('Update Results in the Background'), value: oml.user.ui.updateResults }) diff --git a/static/js/listDialog.js b/static/js/listDialog.js index 42554f9..fcdfa6f 100644 --- a/static/js/listDialog.js +++ b/static/js/listDialog.js @@ -9,6 +9,7 @@ oml.ui.listDialog = function() { buttons: [].concat(list && !Ox.endsWith(list, ':') ? [ Ox.Button({ id: 'duplicate', + style: 'squared', title: Ox._('Duplicate List...') }) .bindEvent({ @@ -20,6 +21,7 @@ oml.ui.listDialog = function() { ] : []).concat(Ox.startsWith(list, ':') && list != '' ? [ Ox.Button({ id: 'delete', + style: 'squared', title: Ox._('Delete List...') }) .bindEvent({ @@ -32,6 +34,7 @@ oml.ui.listDialog = function() { {}, Ox.Button({ id: 'done', + style: 'squared', title: Ox._('Done') }) .bindEvent({ diff --git a/static/js/namesDialog.js b/static/js/namesDialog.js index f41897b..a11572c 100644 --- a/static/js/namesDialog.js +++ b/static/js/namesDialog.js @@ -9,6 +9,7 @@ oml.ui.namesDialog = function() { changeOnKeypress: true, clear: true, placeholder: Ox._('Find'), + style: 'squared', width: 192 }) .css({float: 'right', margin: '4px'}) @@ -110,6 +111,7 @@ oml.ui.namesDialog = function() { that = Ox.Dialog({ buttons: [ Ox.Button({ + style: 'squared', title: Ox._('Sort Titles...') }).bindEvent({ click: function() { @@ -123,6 +125,7 @@ oml.ui.namesDialog = function() { $findButton, Ox.Button({ title: Ox._('Done'), + style: 'squared', width: 48 }).bindEvent({ click: function() { diff --git a/static/js/peersPanel.js b/static/js/peersPanel.js index 3cb3739..76b0cd6 100644 --- a/static/js/peersPanel.js +++ b/static/js/peersPanel.js @@ -189,6 +189,7 @@ oml.ui.peersPanel = function() { readonly: true, label: Ox._('Your Public Key'), labelWidth: 128, + style: 'squared', value: oml.user.id, width: 480 }) @@ -201,6 +202,7 @@ oml.ui.peersPanel = function() { readonly: true, label: Ox._('Download Link'), labelWidth: 128, + style: 'squared', value: 'https://openmedialibrary.com/#download', width: 480 }) @@ -223,6 +225,7 @@ oml.ui.peersPanel = function() { $nickname = Ox.Input({ label: Ox._('Nickname'), labelWidth: 128, + style: 'squared', value: user.nickname, width: 480 }) @@ -253,6 +256,7 @@ oml.ui.peersPanel = function() { $id = Ox.Input({ label: Ox._('Public Key'), labelWidth: 128, + style: 'squared', width: 480 }) .bindEvent({ @@ -292,6 +296,7 @@ oml.ui.peersPanel = function() { readonly: true, label: Ox._('Username'), labelWidth: 128, + style: 'squared', value: user.username, width: 480 }) @@ -304,6 +309,7 @@ oml.ui.peersPanel = function() { readonly: true, label: Ox._('Public Key'), labelWidth: 128, + style: 'squared', value: user.id, width: 480 }) @@ -316,6 +322,7 @@ oml.ui.peersPanel = function() { readonly: true, label: Ox._('Contact'), labelWidth: 128, + style: 'squared', value: user.contact || '', width: 480 }) @@ -328,9 +335,10 @@ oml.ui.peersPanel = function() { Ox.Label({ textAlign: 'center', + style: 'squared', title: user.peered ? Ox._('Remove Peer') - : user.pending == 'received' ? Ox._('Peering Request') - : user.pending == 'sent' ? Ox._('Cancel Request') + : user.pending == 'received' ? Ox._('Accept Peering Request') + : user.pending == 'sent' ? Ox._('Cancel Peering Request') : Ox._('Send Peering Request'), width: 480 }) @@ -343,6 +351,7 @@ oml.ui.peersPanel = function() { label: Ox._('Message'), labelWidth: 128, placeholder: Ox._('none'), + style: 'squared', width: 480 }) .css({ @@ -357,6 +366,7 @@ oml.ui.peersPanel = function() { : ['send'] ).map(function(id, index) { return Ox.Button({ + style: 'squared', title: Ox.getObjectById(buttons, id).title }) .css({ diff --git a/static/js/resetUIDialog.js b/static/js/resetUIDialog.js index 94e9a14..7fcb312 100644 --- a/static/js/resetUIDialog.js +++ b/static/js/resetUIDialog.js @@ -5,9 +5,11 @@ oml.ui.resetUIDialog = function(data) { var that = oml.ui.confirmDialog({ buttons: [ Ox.Button({ + style: 'squared', title: Ox._('No, Don\'t Reset') }), Ox.Button({ + style: 'squared', title: Ox._('Yes, Reset') }) ], diff --git a/static/js/titlesDialog.js b/static/js/titlesDialog.js index 643d343..6b738d5 100644 --- a/static/js/titlesDialog.js +++ b/static/js/titlesDialog.js @@ -9,6 +9,7 @@ oml.ui.titlesDialog = function() { changeOnKeypress: true, clear: true, placeholder: Ox._('Find'), + style: 'squared', width: 192 }) .css({float: 'right', margin: '4px'}) @@ -94,6 +95,7 @@ oml.ui.titlesDialog = function() { $findButton = Ox.Button({ disabled: true, + style: 'squared', title: Ox._('Find'), width: 48 }).bindEvent({ @@ -116,6 +118,7 @@ oml.ui.titlesDialog = function() { that = Ox.Dialog({ buttons: [ Ox.Button({ + style: 'squared', title: Ox._('Sort Names...') }).bindEvent({ click: function() { @@ -128,6 +131,7 @@ oml.ui.titlesDialog = function() { {}, $findButton, Ox.Button({ + style: 'squared', title: Ox._('Done'), width: 48 }).bindEvent({ diff --git a/static/js/welcomeDialog.js b/static/js/welcomeDialog.js index 5f55b14..9ca168b 100644 --- a/static/js/welcomeDialog.js +++ b/static/js/welcomeDialog.js @@ -6,6 +6,7 @@ oml.ui.welcomeDialog = function() { buttons: [ Ox.Button({ id: 'close', + style: 'squared', title: Ox._('Close') }) .bindEvent({ @@ -15,8 +16,8 @@ oml.ui.welcomeDialog = function() { }) ], content: 'Welcome! To get started, you may want to set your ' - + 'library path, import some media, start your node, chose a ' - + 'username and add a few peers.', + + 'library path, import some media, choose a username ' + + 'and add a few peers.', title: Ox._('Welcome to Open Media Library') });