1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-06 03:50:04 +02:00

Fixed accordion bug in upload.

Now hide by default the activities.
Removed input dashboard.
This commit is contained in:
Gunther Brunner 2014-05-23 19:26:54 +09:00
parent ff2d59ce08
commit 9d57e36e09
10 changed files with 12 additions and 64 deletions

View file

@ -3,7 +3,9 @@
div(ng-include='"control-panes/dashboard/navigation/navigation.jade"') div(ng-include='"control-panes/dashboard/navigation/navigation.jade"')
//.col-md-6(ng-if='$root.platform == "web"') //.col-md-6(ng-if='$root.platform == "web"')
div(ng-include='"control-panes/dashboard/browser/browser.jade"') div(ng-include='"control-panes/dashboard/browser/browser.jade"')
.col-md-6 .col-md-6(ng-if='$root.platform == "native"')
div(ng-include='"control-panes/dashboard/apps/apps.jade"')
//.col-md-6
div(ng-include='"control-panes/dashboard/input/input.jade"') div(ng-include='"control-panes/dashboard/input/input.jade"')
.row .row
.col-md-6(ng-if='$root.platform == "native"') .col-md-6(ng-if='$root.platform == "native"')
@ -13,5 +15,4 @@
.row .row
.col-md-6 .col-md-6
div(ng-include='"control-panes/dashboard/clipboard/clipboard.jade"') div(ng-include='"control-panes/dashboard/clipboard/clipboard.jade"')
.col-md-6(ng-if='$root.platform == "native"')
div(ng-include='"control-panes/dashboard/apps/apps.jade"')

View file

@ -1,7 +1,6 @@
module.exports = angular.module('stf.dashboard', [ module.exports = angular.module('stf.dashboard', [
require('./navigation/index').name, require('./navigation/index').name,
require('./browser/index').name, require('./browser/index').name,
require('./input/index').name,
require('./shell/index').name, require('./shell/index').name,
require('./upload/index').name, require('./upload/index').name,
require('./apps/index').name, require('./apps/index').name,

View file

@ -1,11 +0,0 @@
require('./input.css')
module.exports = angular.module('stf.input', [
])
.run(["$templateCache", function ($templateCache) {
$templateCache.put('control-panes/dashboard/input/input.jade',
require('./input.jade')
)
}])
.controller('InputCtrl', require('./input-controller'))

View file

@ -1,3 +0,0 @@
module.exports = function InputCtrl($scope) {
}

View file

@ -1,17 +0,0 @@
describe('InputCtrl', function () {
beforeEach(module('stf.input'));
var scope, ctrl;
beforeEach(inject(function ($rootScope, $controller) {
scope = $rootScope.$new();
ctrl = $controller('InputCtrl', {$scope: scope});
}));
it('should ...', inject(function () {
expect(1).toEqual(1);
}));
});

View file

@ -1,3 +0,0 @@
.stf-input {
}

View file

@ -1,22 +0,0 @@
.widget-container.fluid-height
.heading
i.fa.fa-gear
span(translate) Keyboard Input
button(title='{{"Switch Charset"|translate}}', ng-click='press("KEYCODE_SWITCH_CHARSET")').btn.btn-sm.btn-primary-outline.pull-right
span(translate) Aa
button(tooltip='{{"Power Button"|translate}}', ng-click='press("KEYCODE_POWER")').btn.btn-sm.btn-danger-outline.pull-right
i.fa.fa-power-off
.widget-content.padded
.button-spacer
.input-group.form-inline
textarea.form-control(rows='1', ng-model='textType', ng-keydown='textTypeKeydown($event)'
ng-focus='$parent.textTypeIsFocused = true', ng-blur='$parent.textTypeIsFocused = false',
title='{{"Types text. Only ASCII characters are supported."|translate}}')
span.input-group-btn
button(title='{{"Type text"|translate', type='button', ng-click='type(textType)', ng-disabled='!textType').btn.btn-primary-outline
i.fa.fa-keyboard-o
.button-spacer

View file

@ -115,6 +115,7 @@ module.exports = function UploadCtrl(
}) })
.then(function (installResult) { .then(function (installResult) {
$scope.$apply(function () { $scope.$apply(function () {
$scope.accordionOpen = false
installResult.manifest = options.manifest installResult.manifest = options.manifest
$scope.treeData = installResult.manifest $scope.treeData = installResult.manifest
$scope.installation = installResult $scope.installation = installResult
@ -167,6 +168,8 @@ module.exports = function UploadCtrl(
return progress return progress
} }
$scope.accordionOpen = true
// //
// $scope.installEnabled = true // $scope.installEnabled = true
// SettingsService.bind($scope, { // SettingsService.bind($scope, {

View file

@ -21,8 +21,8 @@
.stf-upload .drop-area { .stf-upload .drop-area {
text-align: center; text-align: center;
color: #b7b7b7; color: #b7b7b7;
padding: 10px; padding-top: 10px;
border: 2px #e8e8e8 dashed; border: 2px transparent dashed;
border-radius: 2px; border-radius: 2px;
/*background-color: #f6f6f6;*/ /*background-color: #f6f6f6;*/
cursor: pointer; cursor: pointer;
@ -43,7 +43,8 @@
.stf-upload .drop-area-text { .stf-upload .drop-area-text {
/*border-top: 1px solid #e2e2e2;*/ /*border-top: 1px solid #e2e2e2;*/
/*opacity: 0;*/ /*opacity: 0;*/
font-size: 16px; font-size: 14px;
font-weight: 300;
/*transition: opacity 0.25s ease-in-out;*/ /*transition: opacity 0.25s ease-in-out;*/
} }

View file

@ -49,7 +49,7 @@
.upload-status(ng-if='upload || installation') .upload-status(ng-if='upload || installation')
accordion(close-others='false').pointer accordion(close-others='false').pointer
accordion-group(is-open='true') accordion-group(is-open='accordionOpen')
accordion-heading.pointer accordion-heading.pointer
i.fa.fa-file-o i.fa.fa-file-o
span {{installation.manifest.package || "App" }} span {{installation.manifest.package || "App" }}