diff --git a/res/app/control-panes/dashboard/navigation/navigation.jade b/res/app/control-panes/dashboard/navigation/navigation.jade index 5500f77c..699a8be8 100644 --- a/res/app/control-panes/dashboard/navigation/navigation.jade +++ b/res/app/control-panes/dashboard/navigation/navigation.jade @@ -2,7 +2,7 @@ .heading i.fa.fa-globe span(translate) Navigation - span(ng-controller='NavigationCtrl') + span i.fa.fa-refresh.pull-right(ng-click='refresh()', title='{{"Reload"|translate}}', ng-if='$root.browser == "webview"') i.fa.fa-step-forward.pull-right(ng-click='forward()', title='{{"Go Forward"|translate}}', ng-if='$root.browser == "webview"') i.fa.fa-step-backward.pull-right(ng-click='back()', title='{{"Go Back"|translate}}', ng-if='$root.browser == "webview"') @@ -12,7 +12,7 @@ input(type='text', placeholder='http://...', autocomplete='off', ng-model='textURL', typeahead='url for url in urlHistory | filter:$viewValue').form-control .input-group-btn - button(ng-click='openURL()', ng-disabled='!textURL').btn.btn-primary-outline(translate) Open + button(ng-click='openURL()', ng-disabled='!textURL', translate).btn.btn-primary-outline Open button(type='button', ng-disabled='!hasHistory()').btn.btn-primary-outline.dropdown-toggle span.caret ul.dropdown-menu @@ -20,4 +20,4 @@ a(ng-click='insertURL(url)').btn-link {{url}} li.divider li - a(ng-click='clearHistory()', type='button').btn-link(translate) Clear + a(ng-click='clearHistory()', type='button', translate).btn-link Clear diff --git a/res/app/layout/index.js b/res/app/layout/index.js index 3881196f..49a09dc7 100644 --- a/res/app/layout/index.js +++ b/res/app/layout/index.js @@ -3,16 +3,15 @@ require('se7en-bootstrap-3/build/stylesheets/se7en-font.css') require('se7en-bootstrap-3/build/stylesheets/style.css') require('se7en-bootstrap-3/build/stylesheets/font-awesome.min.css') - require('fa-borderlayout') require('fa-borderlayout/build-0.3.1/borderLayout.css') require('fa-borderlayout/build-0.3.1/stf-style.css') - require('./cursor.css') require('./stf-se7en.css') -require('./stf-styles.css') require('./small.css') +require('./stf-styles.css') + module.exports = angular.module('layout', [ 'fa.directive.borderLayout', diff --git a/res/app/layout/stf-styles.css b/res/app/layout/stf-styles.css index 4e4307e6..59b15004 100644 --- a/res/app/layout/stf-styles.css +++ b/res/app/layout/stf-styles.css @@ -310,8 +310,9 @@ svg { /* For se7en bootstrap */ -.btn [class^="fa"], .btn[class*="fa"] { - margin-right: 0; +.btn [class^="fa"], +.btn [class*="fa"] { + margin-right: 0 !important; } /*.btn [class^="fa"]+span i,*/ diff --git a/res/common/lang/po/stf.pot b/res/common/lang/po/stf.pot index 1270a98e..8808ac19 100644 --- a/res/common/lang/po/stf.pot +++ b/res/common/lang/po/stf.pot @@ -3,224 +3,137 @@ 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 -msgid "" -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/res/build/bundle.js +#: /Users/a12907/STF/stf/res/app/control-panes/control-panes-controller.js +msgid "Advanced" +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/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/device-list/device-list-controller.js msgid "Busy" msgstr "" -#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html -msgid "Carrier" -msgstr "" - -#: /Users/a12907/STF/stf/tmp/html/app/components/stf/common-ui/clear-button/clear-button.html -msgid "Clear" +#: /Users/a12907/STF/stf/res/build/bundle.js +#: /Users/a12907/STF/stf/res/app/control-panes/control-panes-controller.js +msgid "CPU" 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." 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 "Connecting..." msgstr "" -#: /Users/a12907/STF/stf/tmp/html/app/menu/menu.html -msgid "Control" -msgstr "" - -#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html -msgid "Details" -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" +#: /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/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/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." 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 reconnecting." 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." msgstr "" -#: /Users/a12907/STF/stf/tmp/html/app/settings/settings.html -msgid "Example: 3000" +#: /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/components/stf/common-ui/filter-button/filter-button.html -msgid "Filter" -msgstr "" - -#: /Users/a12907/STF/stf/tmp/html/app/menu/menu.html -msgid "Help" -msgstr "" - -#: /Users/a12907/STF/stf/tmp/html/app/settings/language/language.html -msgid "Language" -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/tmp/html/app/device-list/device-list.html -msgid "Model" +#: /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/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/menu/menu.html -msgid "Native" -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/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/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/device-list/device-list-controller.js msgid "Preparing" msgstr "" +#: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/device-list/device-list-controller.js 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" 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 "Reconnected successfully." 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 "Reconnecting..." msgstr "" -#: /Users/a12907/STF/stf/tmp/html/app/components/stf/common-ui/refresh-page/refresh-page.html -msgid "Refresh" +#: /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/device-list/device-list.html -msgid "Release Date" -msgstr "" - -#: /Users/a12907/STF/stf/tmp/html/app/settings/local/local-settings.html -msgid "Reset Settings" -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/menu/menu.html -msgid "Settings" -msgstr "" - -#: /Users/a12907/STF/stf/tmp/html/app/control-panes/shell/shell.html -msgid "Shell" -msgstr "" - -#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html -msgid "Start Using" -msgstr "" - -#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html -msgid "Status" -msgstr "" - -#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html -msgid "Stop Using" -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)" +#: /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/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/device-list/device-list-controller.js msgid "Unauthorized" msgstr "" +#: /Users/a12907/STF/stf/res/build/bundle.js #: /Users/a12907/STF/stf/res/app/device-list/device-list-controller.js msgid "Unknown" 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/menu/menu.html -msgid "Web" -msgstr ""