From 9d57e36e09d1e7807f3d48cff985c2c8830555c2 Mon Sep 17 00:00:00 2001 From: Gunther Brunner Date: Fri, 23 May 2014 19:26:54 +0900 Subject: [PATCH] Fixed accordion bug in upload. Now hide by default the activities. Removed input dashboard. --- .../control-panes/dashboard/dashboard.jade | 7 +++--- res/app/control-panes/dashboard/index.js | 1 - .../control-panes/dashboard/input/index.js | 11 ---------- .../dashboard/input/input-controller.js | 3 --- .../dashboard/input/input-spec.js | 17 -------------- .../control-panes/dashboard/input/input.css | 3 --- .../control-panes/dashboard/input/input.jade | 22 ------------------- .../dashboard/upload/upload-controller.js | 3 +++ .../control-panes/dashboard/upload/upload.css | 7 +++--- .../dashboard/upload/upload.jade | 2 +- 10 files changed, 12 insertions(+), 64 deletions(-) delete mode 100644 res/app/control-panes/dashboard/input/index.js delete mode 100644 res/app/control-panes/dashboard/input/input-controller.js delete mode 100644 res/app/control-panes/dashboard/input/input-spec.js delete mode 100644 res/app/control-panes/dashboard/input/input.css delete mode 100644 res/app/control-panes/dashboard/input/input.jade diff --git a/res/app/control-panes/dashboard/dashboard.jade b/res/app/control-panes/dashboard/dashboard.jade index 094bc492..073617ed 100644 --- a/res/app/control-panes/dashboard/dashboard.jade +++ b/res/app/control-panes/dashboard/dashboard.jade @@ -3,7 +3,9 @@ div(ng-include='"control-panes/dashboard/navigation/navigation.jade"') //.col-md-6(ng-if='$root.platform == "web"') 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"') .row .col-md-6(ng-if='$root.platform == "native"') @@ -13,5 +15,4 @@ .row .col-md-6 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"') + diff --git a/res/app/control-panes/dashboard/index.js b/res/app/control-panes/dashboard/index.js index 7eb235f1..fb45bffc 100644 --- a/res/app/control-panes/dashboard/index.js +++ b/res/app/control-panes/dashboard/index.js @@ -1,7 +1,6 @@ module.exports = angular.module('stf.dashboard', [ require('./navigation/index').name, require('./browser/index').name, - require('./input/index').name, require('./shell/index').name, require('./upload/index').name, require('./apps/index').name, diff --git a/res/app/control-panes/dashboard/input/index.js b/res/app/control-panes/dashboard/input/index.js deleted file mode 100644 index 96ddc890..00000000 --- a/res/app/control-panes/dashboard/input/index.js +++ /dev/null @@ -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')) diff --git a/res/app/control-panes/dashboard/input/input-controller.js b/res/app/control-panes/dashboard/input/input-controller.js deleted file mode 100644 index 7a51866f..00000000 --- a/res/app/control-panes/dashboard/input/input-controller.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = function InputCtrl($scope) { - -} diff --git a/res/app/control-panes/dashboard/input/input-spec.js b/res/app/control-panes/dashboard/input/input-spec.js deleted file mode 100644 index c134c22e..00000000 --- a/res/app/control-panes/dashboard/input/input-spec.js +++ /dev/null @@ -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); - - })); - -}); \ No newline at end of file diff --git a/res/app/control-panes/dashboard/input/input.css b/res/app/control-panes/dashboard/input/input.css deleted file mode 100644 index 9d95a16d..00000000 --- a/res/app/control-panes/dashboard/input/input.css +++ /dev/null @@ -1,3 +0,0 @@ -.stf-input { - -} \ No newline at end of file diff --git a/res/app/control-panes/dashboard/input/input.jade b/res/app/control-panes/dashboard/input/input.jade deleted file mode 100644 index 711cd3cd..00000000 --- a/res/app/control-panes/dashboard/input/input.jade +++ /dev/null @@ -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 - diff --git a/res/app/control-panes/dashboard/upload/upload-controller.js b/res/app/control-panes/dashboard/upload/upload-controller.js index d3f0d71b..5dad0791 100644 --- a/res/app/control-panes/dashboard/upload/upload-controller.js +++ b/res/app/control-panes/dashboard/upload/upload-controller.js @@ -115,6 +115,7 @@ module.exports = function UploadCtrl( }) .then(function (installResult) { $scope.$apply(function () { + $scope.accordionOpen = false installResult.manifest = options.manifest $scope.treeData = installResult.manifest $scope.installation = installResult @@ -167,6 +168,8 @@ module.exports = function UploadCtrl( return progress } + $scope.accordionOpen = true + // // $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 ee91f221..d0adb227 100644 --- a/res/app/control-panes/dashboard/upload/upload.css +++ b/res/app/control-panes/dashboard/upload/upload.css @@ -21,8 +21,8 @@ .stf-upload .drop-area { text-align: center; color: #b7b7b7; - padding: 10px; - border: 2px #e8e8e8 dashed; + padding-top: 10px; + border: 2px transparent dashed; border-radius: 2px; /*background-color: #f6f6f6;*/ cursor: pointer; @@ -43,7 +43,8 @@ .stf-upload .drop-area-text { /*border-top: 1px solid #e2e2e2;*/ /*opacity: 0;*/ - font-size: 16px; + font-size: 14px; + font-weight: 300; /*transition: opacity 0.25s ease-in-out;*/ } diff --git a/res/app/control-panes/dashboard/upload/upload.jade b/res/app/control-panes/dashboard/upload/upload.jade index 2ec51f5e..0e91708c 100644 --- a/res/app/control-panes/dashboard/upload/upload.jade +++ b/res/app/control-panes/dashboard/upload/upload.jade @@ -49,7 +49,7 @@ .upload-status(ng-if='upload || installation') accordion(close-others='false').pointer - accordion-group(is-open='true') + accordion-group(is-open='accordionOpen') accordion-heading.pointer i.fa.fa-file-o span {{installation.manifest.package || "App" }}