1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-03 17:59:28 +02:00

Small fixes to Basic Mode.

This commit is contained in:
Gunther Brunner 2014-05-15 17:26:47 +09:00
parent 1bab43fed3
commit fd42bd9697
8 changed files with 16 additions and 5 deletions

View file

@ -6,6 +6,7 @@
"angular-route": "~1.3.0-beta.8", "angular-route": "~1.3.0-beta.8",
"angular-sanitize": "~1.3.0-beta.8", "angular-sanitize": "~1.3.0-beta.8",
"angular-animate": "~1.3.0-beta.8", "angular-animate": "~1.3.0-beta.8",
"angular-touch": "~1.3.0-beta.8",
"se7en-bootstrap-3": "git@ghe.amb.ca.local:stf/se7en-bootstrap-3.git#7a90ef40be7e944afae38e195dc4a74ec34cc258", "se7en-bootstrap-3": "git@ghe.amb.ca.local:stf/se7en-bootstrap-3.git#7a90ef40be7e944afae38e195dc4a74ec34cc258",
"socket.io-client": "~0.9.16", "socket.io-client": "~0.9.16",
"lodash": "~2.4.1", "lodash": "~2.4.1",

View file

@ -1,12 +1,13 @@
require('angular') require('angular')
require('angular-route') require('angular-route')
require('angular-touch')
require('angular-gettext') require('angular-gettext')
require('ng-file-upload') require('ng-file-upload')
angular.module('app', [ angular.module('app', [
'ngRoute', 'ngRoute',
'ngTouch',
'gettext', 'gettext',
'angularFileUpload', 'angularFileUpload',
require('./layout').name, require('./layout').name,

View file

@ -1,5 +1,5 @@
div(ng-if='$root.basicMode') div(ng-if='$root.basicMode')
div(style='width: 320px; height: 540px;') div(style='width: 320px; height: 482px;')
.remote-control .remote-control
div(ng-include='"control-panes/device-control/device-control.jade"').fill-height div(ng-include='"control-panes/device-control/device-control.jade"').fill-height

View file

@ -10,6 +10,13 @@ device-screen {
position: relative; position: relative;
display: block; display: block;
overflow: hidden; overflow: hidden;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
} }
device-screen canvas { device-screen canvas {

View file

@ -2,7 +2,7 @@
.as-cell.fill-height .as-cell.fill-height
.as-table.fill-height .as-table.fill-height
.stf-vnc-navbar.as-row .stf-vnc-navbar.as-row(ng-if='!$root.basicMode')
.pull-right .pull-right
button(ng-click='control.identify()', tooltip='Find Device', tooltip-placement='bottom').btn.btn-sm.btn-info-outline button(ng-click='control.identify()', tooltip='Find Device', tooltip-placement='bottom').btn.btn-sm.btn-info-outline

View file

@ -17,7 +17,7 @@
.btn-group .btn-group
button(type='button', ng-model='$root.platform', btn-radio="'web'", translate).btn.btn-sm.btn-default-outline Web button(type='button', ng-model='$root.platform', btn-radio="'web'", translate).btn.btn-sm.btn-default-outline Web
button(type='button', ng-model='$root.platform', btn-radio="'native'", translate).btn.btn-sm.btn-default-outline Native button(type='button', ng-model='$root.platform', btn-radio="'native'", translate).btn.btn-sm.btn-default-outline Native
li li(ng-if='!$root.basicMode')
a(ng-href='/#!/help') a(ng-href='/#!/help')
i.fa.fa-question-circle i.fa.fa-question-circle
| {{ !$root.basicMode ? "Help" : '' | translate }} | {{ "Help" | translate }}

View file

@ -2,6 +2,7 @@ doctype html
html html
head head
meta(charset='utf-8') meta(charset='utf-8')
meta(name='viewport', content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui')
title STF title STF
body(ng-app='app', ng-cloak).bg-1.fill-height body(ng-app='app', ng-cloak).bg-1.fill-height
div(ng-controller='LayoutCtrl').fill-height div(ng-controller='LayoutCtrl').fill-height

View file

@ -53,6 +53,7 @@ module.exports = {
, { test: /\.html/, loader: 'html-loader' } , { test: /\.html/, loader: 'html-loader' }
, { test: /angular\.js/, loader: 'exports?angular'} , { test: /angular\.js/, loader: 'exports?angular'}
, { test: /angular-route\.js/, loader: 'imports?angular=angular'} , { test: /angular-route\.js/, loader: 'imports?angular=angular'}
, { test: /angular-touch\.js/, loader: 'imports?angular=angular'}
, { test: /angular-animate\.js/, loader: 'imports?angular=angular'} , { test: /angular-animate\.js/, loader: 'imports?angular=angular'}
, { test: /angular-growl\.js/, loader: 'imports?angular=angular'} , { test: /angular-growl\.js/, loader: 'imports?angular=angular'}
, { test: /oboe-browser\.js/, loader: 'imports?define=>false!exports?oboe'} , { test: /oboe-browser\.js/, loader: 'imports?define=>false!exports?oboe'}