diff --git a/res/app/control-panes/dashboard/upload/upload-controller.js b/res/app/control-panes/dashboard/upload/upload-controller.js index 7234af78..3cfddf01 100644 --- a/res/app/control-panes/dashboard/upload/upload-controller.js +++ b/res/app/control-panes/dashboard/upload/upload-controller.js @@ -1,4 +1,4 @@ -module.exports = function UploadCtrl($scope, $rootScope, SettingsService) { +module.exports = function UploadCtrl($scope, $rootScope, SettingsService, gettext) { $scope.installation = null @@ -25,6 +25,16 @@ module.exports = function UploadCtrl($scope, $rootScope, SettingsService) { }) }) } + + $scope.progressMessage = function (code) { + return { + 'pushing_app': gettext('Pushing app...'), + 'installing_app': gettext('Installing app...'), + 'launching_app': gettext('Launching activity...'), + 'success': gettext('Installation complete'), + 'fail': gettext('Installation failed') + }[code] + } // // $scope.installEnabled = true // SettingsService.bind($scope, { diff --git a/res/app/control-panes/dashboard/upload/upload.css b/res/app/control-panes/dashboard/upload/upload.css index 9dd00941..e16e9784 100644 --- a/res/app/control-panes/dashboard/upload/upload.css +++ b/res/app/control-panes/dashboard/upload/upload.css @@ -19,5 +19,28 @@ } .stf-upload .drop-area { + text-align: center; + color: #b7b7b7; + /*height: 100px;*/ + padding: 10px; + border: 3px #ccc dashed; + /*color: #aaa;*/ + border-radius: 3px; + background-color: #f6f6f6; + cursor: pointer; +} + +.stf-upload .drop-area .drop-area-text { + /*min-height: 130px;*/ + font-size: 18px; +} + +.stf-upload .dragover { + /*color: #157afb !important;*/ + border-color: #157afb !important; +} + +.stf-upload .upload-status { + margin-top: 15px; } \ No newline at end of file diff --git a/res/app/control-panes/dashboard/upload/upload.jade b/res/app/control-panes/dashboard/upload/upload.jade index e6c8c74f..963e9a38 100644 --- a/res/app/control-panes/dashboard/upload/upload.jade +++ b/res/app/control-panes/dashboard/upload/upload.jade @@ -12,28 +12,27 @@ .widget-content.padded - .input-group.form-inline - input(type=text, ng-model='url', ng-enter='$root.install(url)', placeholder='http://...').form-control + //.input-group.form-inline + input(type=text, ng-model='remoteUrl', ng-enter='$root.install(remoteUrl)', placeholder='http://...').form-control span.input-group-btn - button.btn.btn-primary-outline(ng-click='$root.install(url)', tooltip='Upload From Link') + button.btn.btn-primary-outline(ng-click='$root.install(remoteUrl)', tooltip='Upload From Link', ng-disabled='!remoteUrl') i.fa.fa-upload - .drop-area(ng-file-drop='$root.install($files)') - i.fa.fa-2x.fa-upload.drop-area-icon - p.drop-area-text Drop here + .drop-area(ng-file-drop='$root.install($files)').file-input.btn-file + input(type='file', ng-file-select='$root.install($files)') - .drop-area-buttons - .btn.btn-primary-outline.file-input.btn-file.btn-sm - i.fa.fa-file - span Choose File - input(type='file', ng-file-select='$root.install($files)') + i.fa.fa-2x.fa-download.drop-area-icon + p.drop-area-text Drop file to upload, or from link - button.btn.btn-primary-outline.btn-sm - i.fa.fa-link - span Use Link + .col-md-10.col-md-offset-1 + .input-group.form-inline + input(type=text, ng-model='remoteUrl', ng-enter='$root.install(remoteUrl)', placeholder='http://...').form-control + span.input-group-btn + button.btn.btn-primary-outline(ng-click='$root.install(remoteUrl)', tooltip='Upload From Link', ng-disabled='!remoteUrl') + i.fa.fa-upload - div(ng-if='installation') + .upload-status(ng-if='installation') p - strong {{ installation.lastData }} + strong {{ progressMessage(installation.lastData) }} span ({{installation.progress}}%) progressbar(max='100', value='installation.progress', ng-if='!installation.settled') diff --git a/res/common/lang/po/stf.pot b/res/common/lang/po/stf.pot index 8808ac19..3d2dcfa3 100644 --- a/res/common/lang/po/stf.pot +++ b/res/common/lang/po/stf.pot @@ -3,21 +3,51 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/resources/resources.html +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/screenshots/screenshots.html +msgid "" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/input/input.html +msgid "Aa" +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/device-list/device-list-controller.js msgid "Absent" msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/resources/resources.html +msgid "Add" +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/control-panes/control-panes-controller.js msgid "Advanced" msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/input/input.html +msgid "Advanced Input" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/logs/logs.html +msgid "App" +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/device-list/device-list-controller.js msgid "Available" msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/device-control/device-control.html +msgid "Back" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/browser/browser.html +msgid "Browser" +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/device-list/device-list-controller.js msgid "Busy" @@ -28,6 +58,17 @@ msgstr "" msgid "CPU" msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html +msgid "Carrier" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/logs/logs.html +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/run-js/run-js.html +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/navigation/navigation.html +#: /Users/a12907/STF/stf/tmp/html/app/components/stf/common-ui/clear-button/clear-button.html +msgid "Clear" +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/components/stf/socket/socket-state/socket-state-directive.js msgid "Connected successfully." @@ -38,16 +79,54 @@ msgstr "" msgid "Connecting..." msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/menu/menu.html +msgid "Control" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/resources/resources.html +msgid "Cookies" +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/control-panes/control-panes-controller.js msgid "Dashboard" msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/resources/resources.html +msgid "Delete" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html +msgid "Details" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/inspect/inspect.html +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/logs/logs.html +msgid "Device" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/settings/settings.html +msgid "Device Port" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html +#: /Users/a12907/STF/stf/tmp/html/app/menu/menu.html +msgid "Devices" +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/components/stf/socket/socket-state/socket-state-directive.js msgid "Disconnected.
Socket connection was lost, try again reloading the page." msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/resources/resources.html +msgid "Domain" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/settings/notifications/notifications.html +msgid "Enable notifications" +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/components/stf/socket/socket-state/socket-state-directive.js msgid "Error while connecting." @@ -63,26 +142,191 @@ msgstr "" msgid "Error." msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/settings/settings.html +msgid "Example: 3000" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/components/stf/common-ui/filter-button/filter-button.html +msgid "Filter" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/logs/logs.html +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/resources/resources.html +msgid "Get" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/navigation/navigation.html +msgid "Go Back" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/navigation/navigation.html +msgid "Go Forward" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/screenshots/screenshots.html +msgid "H" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/menu/menu.html +msgid "Help" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/screenshots/screenshots.html +msgid "High" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/device-control/device-control.html +msgid "Home" +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/control-panes/control-panes-controller.js msgid "Inspect" msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/inspect/inspect.html +msgid "Inspect Device" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/inspect/inspect.html +msgid "Inspecting is currently only supported in WebView" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/inspect/inspect.html +msgid "Inspector" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/device-control/device-control.html +msgid "Just control device" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/input/input.html +msgid "Keyboard Input" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/screenshots/screenshots.html +msgid "L" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/settings/language/language.html +msgid "Language" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/logs/logs.html +msgid "Level" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/settings/local/local-settings.html +msgid "Local Settings" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html +msgid "Location" +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/control-panes/control-panes-controller.js msgid "Logs" msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/screenshots/screenshots.html +msgid "Low" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/screenshots/screenshots.html +msgid "M" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/input/input.html +msgid "Media" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/screenshots/screenshots.html +msgid "Medium" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/device-control/device-control.html +msgid "Menu" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html +msgid "Model" +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/device-list/device-list-controller.js msgid "N/A" msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/resources/resources.html +msgid "Name" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/menu/menu.html +msgid "Native" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/navigation/navigation.html +msgid "Navigation" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/resources/resources.html +msgid "No cookies to show" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html +msgid "No devices connected" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/screenshots/screenshots.html +msgid "No screenshots taken" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/inspect/inspect.html +msgid "Nothing to inspect" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/settings/notifications/notifications.html +msgid "Notifications" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html +msgid "OS" +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/device-list/device-list-controller.js msgid "Offline" msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/navigation/navigation.html +msgid "Open" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/screenshots/screenshots.html +msgid "Original" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/input/input.html +msgid "Other Keys" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/logs/logs.html +msgid "PID" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/screenshots/screenshots.html +msgid "Pageshot" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/resources/resources.html +msgid "Path" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/input/input.html +msgid "Power Button" +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/device-list/device-list-controller.js msgid "Preparing" @@ -93,6 +337,10 @@ msgstr "" msgid "Present" msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html +msgid "Product" +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/device-list/device-list-controller.js msgid "Ready" @@ -108,16 +356,168 @@ msgstr "" msgid "Reconnecting..." msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/shell/shell.html +msgid "Reference" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/components/stf/common-ui/refresh-page/refresh-page.html +msgid "Refresh" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/browser/browser.html +msgid "Relaunch" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/browser/browser.html +msgid "Relaunch the browser" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html +msgid "Release Date" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/navigation/navigation.html +msgid "Reload" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/browser/browser.html +msgid "Reset" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/settings/local/local-settings.html +msgid "Reset Settings" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/browser/browser.html +msgid "Reset all browser settings" +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/control-panes/control-panes-controller.js msgid "Resources" msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/run-js/run-js.html +msgid "Run" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/shell/shell.html +msgid "Run Command" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/run-js/run-js.html +msgid "Run JavaScript" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/run-js/run-js.html +msgid "Save..." +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/settings/local/local-settings.html +msgid "Saved to: {{savedTo}}" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html +msgid "Screen" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/screenshots/screenshots.html +msgid "Screenshot" +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/control-panes/control-panes-controller.js msgid "Screenshots" msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/resources/resources.html +msgid "Secure" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/resources/resources.html +msgid "Set" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/resources/resources.html +msgid "Set Cookie" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/menu/menu.html +msgid "Settings" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/shell/shell.html +msgid "Shell" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/input/input.html +msgid "Special Keys" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html +msgid "Start Using" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/logs/logs.html +msgid "Start/Stop Logging" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html +msgid "Status" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/logs/logs.html +msgid "Stop" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html +msgid "Stop Using" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/input/input.html +msgid "Switch Charset" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/logs/logs.html +msgid "TID" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/logs/logs.html +msgid "Tag" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/screenshots/screenshots.html +msgid "Take Pageshot (Needs WebView running)" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/screenshots/screenshots.html +msgid "Take Screenshot" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/settings/settings.html +msgid "Target IP / Hostname" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/settings/settings.html +msgid "Target Port" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/settings/settings.html +msgid "Target host (detect if blank)" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/logs/logs.html +msgid "Text" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/logs/logs.html +msgid "Time" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/input/input.html +msgid "Types text. Only ASCII characters are supported." +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/device-list/device-list-controller.js msgid "Unauthorized" @@ -128,12 +528,41 @@ msgstr "" msgid "Unknown" msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/upload/upload.html +msgid "Upload" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/usb/usb.html +msgid "Usb speed" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/device-list/device-list-controller.js msgid "Use" msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html +msgid "User" +msgstr "" + #: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/device-list/device-list-controller.js msgid "Using" msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/resources/resources.html +msgid "Value" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/device-control/device-control.html +msgid "View device" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/input/input.html +msgid "Volume" +msgstr "" + +#: /Users/a12907/STF/stf/tmp/html/app/menu/menu.html +msgid "Web" +msgstr ""