• R/O
  • HTTP
  • SSH
  • HTTPS

zephyr: Commit

This repository is for zephyr, which is implemented for a GUI of Eos.


Commit MetaInfo

Revision7b4936cb0371e207b454e570a5e27435baf7f0af (tree)
Time2016-02-27 17:29:31
Authorhimetani_cafe <fumifumi@yasu...>
Commiterhimetani_cafe

Log Message

Modify command directive html to be more cool

Change Summary

Incremental Difference

--- a/front-end/app/scripts/directives/Command.ts
+++ b/front-end/app/scripts/directives/Command.ts
@@ -92,6 +92,7 @@ namespace app.directives {
9292 });
9393
9494 this.WebSocket.on('console', function(msg) {
95+ console.log(msg);
9596 var messages = msg.split('\n');
9697 if(messages[0].substr(0,6) === 'Usage:') {
9798 controller.messages = msg.split('\n');
--- a/front-end/app/style.scss
+++ b/front-end/app/style.scss
@@ -14,6 +14,7 @@ $panel-bg: #eee;
1414
1515 .console-body {
1616 background-color: white;
17+ padding: 20px;
1718 height: 100%;
1819 }
1920
@@ -24,6 +25,26 @@ $panel-bg: #eee;
2425 .command {
2526 padding:5px;
2627 }
28+
29+.panel-title {
30+ font-family: 'Open Sans';
31+}
32+
33+.open-sans {
34+ font-family: 'Open Sans';
35+}
36+
37+.btn {
38+ font-family: 'Open Sans';
39+}
40+
41+label {
42+ font-family: 'Open Sans';
43+}
44+
45+.page-header {
46+ color: black;
47+}
2748 // Import libs
2849 // --------------------
2950 @import "../node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
--- a/front-end/app/templates/command.html
+++ b/front-end/app/templates/command.html
@@ -1,54 +1,69 @@
11 <div class="command">
2-<uib-accordion-group heading="{{ctrl.heading}}" is-open="ctrl.isOpen" panel-class="panel-primary">
3- <uib-accordion-heading>
4- <h4 class="panel-title">
5- [{{ctrl.index}}: {{ctrl.name}}]
6- <button class="pull-right"
7- ng-click="ctrl.removeMySelf(ctrl.index)">
8- <span class="glyphicon glyphicon-remove"></span>
9- </button>
2+<uib-accordion-group heading="{{ctrl.heading}}" is-open="ctrl.isOpen" panel-class="panel-success">
3+<uib-accordion-heading>
4+<h1 class="panel-title">
5+ [{{ctrl.index}}]: {{ctrl.name}}
6+ <button class="pull-right"
7+ ng-click="ctrl.removeMySelf(ctrl.index)">
8+ <span class="glyphicon glyphicon-remove"></span>
9+ </button>
1010 </h4>
1111 </uib-accordion-heading>
12- <div class="row">
13- <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
14- <code>
15- <form class="form-horizontal" ng-submit="ctrl.submit()">
16- <ul class="list-inline">
17- <li>
18- <label class="control-label">
19- workspace
20- </label>
21- <select class="form-control"
22- ng-options="dir.name for dir in ctrl.dirs"
23- ng-model="ctrl.workspace"
24- ng-change="ctrl.reloadFiles()"
25- required>
26- </select>
27- </li>
28- </ul>
29-
30- <option info="o" files="ctrl.files" ng-repeat="o in ctrl.options"></option>
31-
32- <button type="submit" class="btn btn-default">
33- Execute
34- </button>
35-
36- <button type="button" ng-click="ctrl.debug()" class="btn btn-default">
37- Debug
38- </button>
12+ <form class="form-horizontal" ng-submit="ctrl.submit()">
13+ <div class="container">
14+ <div class="row">
15+ <h4 class='open-sans'>
16+ Action
17+ </h4>
18+ <button type="submit" class="btn btn-default">
19+ Execute
20+ </button>
21+ <button type="button" class="btn btn-default">
22+ Stop
23+ </button>
24+ <button type="button" class="btn btn-default"
25+ ng-click="ctrl.help()">
26+ Help
27+ </button>
28+ <hr align="left" style="width: 90%; height: 1px; background-color:#5cb85c;" />
29+ </div>
30+ <div class="row">
31+ <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
32+ <h4 class="open-sans">
33+ Parameters
34+ </h4>
35+ <code>
36+ <ul class="list-inline">
37+ <li>
38+ <label>
39+ workspace
40+ </label>
41+ <select class="form-control"
42+ ng-options="dir.name for dir in ctrl.dirs"
43+ ng-model="ctrl.workspace"
44+ ng-change="ctrl.reloadFiles()"
45+ required>
46+ </select>
47+ </li>
48+ </ul>
3949
40- </form>
41- </code>
42- </div>
43- <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
44- <h4>Message from console</h4>
45- <button type="button" class="btn btn-default" ng-click="ctrl.help()">show help</button>
46- <div class="panel-info">
47- <div class="panel-body console-body">
48- <p ng-repeat="msg in ctrl.messages track by $index">{{msg}}</p>
50+ <option info="o" files="ctrl.files" ng-repeat="o in ctrl.options"></option>
51+ </code>
52+ </div>
53+ <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
54+ <h4 class="open-sans">Message from console</h4>
55+ <div class="panel pull-left">
56+ <div class="panel-body console-body">
57+ <p ng-repeat="msg in ctrl.messages track by $index">{{msg}}</p>
58+ </div>
59+ </div>
4960 </div>
61+ <hr align="left" style="width: 90%; height: 1px; background-color:#5cb85c;" />
62+ <button type="submit" class="btn btn-default">
63+ Execute
64+ </button>
5065 </div>
5166 </div>
52- </div>
67+ </form>
5368 </uib-accordion-group>
5469 </div>
--- a/front-end/app/templates/header-menu.html
+++ b/front-end/app/templates/header-menu.html
@@ -1,4 +1,4 @@
1-<nav class="nav navbar navbar-static-top navbar-inverse">
1+<nav class="nav navbar navbar-default navbar-static-top">
22 <div class="navbar-header">
33 <a class="navbar-brand" href="">Zephyr</a>
44 </div>
--- a/front-end/dist/bundle.js
+++ b/front-end/dist/bundle.js
@@ -41209,6 +41209,7 @@
4120941209 controller.isOpen = false;
4121041210 });
4121141211 this.WebSocket.on('console', function (msg) {
41212+ console.log(msg);
4121241213 var messages = msg.split('\n');
4121341214 if (messages[0].substr(0, 6) === 'Usage:') {
4121441215 controller.messages = msg.split('\n');
@@ -41849,6 +41850,7 @@
4184941850 controller.isOpen = false;
4185041851 });
4185141852 this.WebSocket.on('console', function (msg) {
41853+ console.log(msg);
4185241854 var messages = msg.split('\n');
4185341855 if (messages[0].substr(0, 6) === 'Usage:') {
4185441856 controller.messages = msg.split('\n');
@@ -42489,6 +42491,7 @@
4248942491 controller.isOpen = false;
4249042492 });
4249142493 this.WebSocket.on('console', function (msg) {
42494+ console.log(msg);
4249242495 var messages = msg.split('\n');
4249342496 if (messages[0].substr(0, 6) === 'Usage:') {
4249442497 controller.messages = msg.split('\n');
@@ -43129,6 +43132,7 @@
4312943132 controller.isOpen = false;
4313043133 });
4313143134 this.WebSocket.on('console', function (msg) {
43135+ console.log(msg);
4313243136 var messages = msg.split('\n');
4313343137 if (messages[0].substr(0, 6) === 'Usage:') {
4313443138 controller.messages = msg.split('\n');
@@ -43769,6 +43773,7 @@
4376943773 controller.isOpen = false;
4377043774 });
4377143775 this.WebSocket.on('console', function (msg) {
43776+ console.log(msg);
4377243777 var messages = msg.split('\n');
4377343778 if (messages[0].substr(0, 6) === 'Usage:') {
4377443779 controller.messages = msg.split('\n');
@@ -44409,6 +44414,7 @@
4440944414 controller.isOpen = false;
4441044415 });
4441144416 this.WebSocket.on('console', function (msg) {
44417+ console.log(msg);
4441244418 var messages = msg.split('\n');
4441344419 if (messages[0].substr(0, 6) === 'Usage:') {
4441444420 controller.messages = msg.split('\n');
@@ -45049,6 +45055,7 @@
4504945055 controller.isOpen = false;
4505045056 });
4505145057 this.WebSocket.on('console', function (msg) {
45058+ console.log(msg);
4505245059 var messages = msg.split('\n');
4505345060 if (messages[0].substr(0, 6) === 'Usage:') {
4505445061 controller.messages = msg.split('\n');
@@ -45689,6 +45696,7 @@
4568945696 controller.isOpen = false;
4569045697 });
4569145698 this.WebSocket.on('console', function (msg) {
45699+ console.log(msg);
4569245700 var messages = msg.split('\n');
4569345701 if (messages[0].substr(0, 6) === 'Usage:') {
4569445702 controller.messages = msg.split('\n');
@@ -46329,6 +46337,7 @@
4632946337 controller.isOpen = false;
4633046338 });
4633146339 this.WebSocket.on('console', function (msg) {
46340+ console.log(msg);
4633246341 var messages = msg.split('\n');
4633346342 if (messages[0].substr(0, 6) === 'Usage:') {
4633446343 controller.messages = msg.split('\n');
@@ -46969,6 +46978,7 @@
4696946978 controller.isOpen = false;
4697046979 });
4697146980 this.WebSocket.on('console', function (msg) {
46981+ console.log(msg);
4697246982 var messages = msg.split('\n');
4697346983 if (messages[0].substr(0, 6) === 'Usage:') {
4697446984 controller.messages = msg.split('\n');
@@ -47609,6 +47619,7 @@
4760947619 controller.isOpen = false;
4761047620 });
4761147621 this.WebSocket.on('console', function (msg) {
47622+ console.log(msg);
4761247623 var messages = msg.split('\n');
4761347624 if (messages[0].substr(0, 6) === 'Usage:') {
4761447625 controller.messages = msg.split('\n');
@@ -48249,6 +48260,7 @@
4824948260 controller.isOpen = false;
4825048261 });
4825148262 this.WebSocket.on('console', function (msg) {
48263+ console.log(msg);
4825248264 var messages = msg.split('\n');
4825348265 if (messages[0].substr(0, 6) === 'Usage:') {
4825448266 controller.messages = msg.split('\n');
@@ -48889,6 +48901,7 @@
4888948901 controller.isOpen = false;
4889048902 });
4889148903 this.WebSocket.on('console', function (msg) {
48904+ console.log(msg);
4889248905 var messages = msg.split('\n');
4889348906 if (messages[0].substr(0, 6) === 'Usage:') {
4889448907 controller.messages = msg.split('\n');
@@ -49529,6 +49542,7 @@
4952949542 controller.isOpen = false;
4953049543 });
4953149544 this.WebSocket.on('console', function (msg) {
49545+ console.log(msg);
4953249546 var messages = msg.split('\n');
4953349547 if (messages[0].substr(0, 6) === 'Usage:') {
4953449548 controller.messages = msg.split('\n');
--- a/front-end/dist/css/style.css
+++ b/front-end/dist/css/style.css
@@ -10,6 +10,7 @@
1010
1111 .console-body {
1212 background-color: white;
13+ padding: 20px;
1314 height: 100%; }
1415
1516 .console-body p {
@@ -18,6 +19,21 @@
1819 .command {
1920 padding: 5px; }
2021
22+.panel-title {
23+ font-family: 'Open Sans'; }
24+
25+.open-sans {
26+ font-family: 'Open Sans'; }
27+
28+.btn {
29+ font-family: 'Open Sans'; }
30+
31+label {
32+ font-family: 'Open Sans'; }
33+
34+.page-header {
35+ color: black; }
36+
2137 /*!
2238 * Bootstrap v3.3.6 (http://getbootstrap.com)
2339 * Copyright 2011-2015 Twitter, Inc.
--- a/front-end/dist/templates/command.html
+++ b/front-end/dist/templates/command.html
@@ -1,54 +1,69 @@
11 <div class="command">
2-<uib-accordion-group heading="{{ctrl.heading}}" is-open="ctrl.isOpen" panel-class="panel-primary">
3- <uib-accordion-heading>
4- <h4 class="panel-title">
5- [{{ctrl.index}}: {{ctrl.name}}]
6- <button class="pull-right"
7- ng-click="ctrl.removeMySelf(ctrl.index)">
8- <span class="glyphicon glyphicon-remove"></span>
9- </button>
2+<uib-accordion-group heading="{{ctrl.heading}}" is-open="ctrl.isOpen" panel-class="panel-success">
3+<uib-accordion-heading>
4+<h1 class="panel-title">
5+ [{{ctrl.index}}]: {{ctrl.name}}
6+ <button class="pull-right"
7+ ng-click="ctrl.removeMySelf(ctrl.index)">
8+ <span class="glyphicon glyphicon-remove"></span>
9+ </button>
1010 </h4>
1111 </uib-accordion-heading>
12- <div class="row">
13- <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
14- <code>
15- <form class="form-horizontal" ng-submit="ctrl.submit()">
16- <ul class="list-inline">
17- <li>
18- <label class="control-label">
19- workspace
20- </label>
21- <select class="form-control"
22- ng-options="dir.name for dir in ctrl.dirs"
23- ng-model="ctrl.workspace"
24- ng-change="ctrl.reloadFiles()"
25- required>
26- </select>
27- </li>
28- </ul>
29-
30- <option info="o" files="ctrl.files" ng-repeat="o in ctrl.options"></option>
31-
32- <button type="submit" class="btn btn-default">
33- Execute
34- </button>
35-
36- <button type="button" ng-click="ctrl.debug()" class="btn btn-default">
37- Debug
38- </button>
12+ <form class="form-horizontal" ng-submit="ctrl.submit()">
13+ <div class="container">
14+ <div class="row">
15+ <h4 class='open-sans'>
16+ Action
17+ </h4>
18+ <button type="submit" class="btn btn-default">
19+ Execute
20+ </button>
21+ <button type="button" class="btn btn-default">
22+ Stop
23+ </button>
24+ <button type="button" class="btn btn-default"
25+ ng-click="ctrl.help()">
26+ Help
27+ </button>
28+ <hr align="left" style="width: 90%; height: 1px; background-color:#5cb85c;" />
29+ </div>
30+ <div class="row">
31+ <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
32+ <h4 class="open-sans">
33+ Parameters
34+ </h4>
35+ <code>
36+ <ul class="list-inline">
37+ <li>
38+ <label>
39+ workspace
40+ </label>
41+ <select class="form-control"
42+ ng-options="dir.name for dir in ctrl.dirs"
43+ ng-model="ctrl.workspace"
44+ ng-change="ctrl.reloadFiles()"
45+ required>
46+ </select>
47+ </li>
48+ </ul>
3949
40- </form>
41- </code>
42- </div>
43- <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
44- <h4>Message from console</h4>
45- <button type="button" class="btn btn-default" ng-click="ctrl.help()">show help</button>
46- <div class="panel-info">
47- <div class="panel-body console-body">
48- <p ng-repeat="msg in ctrl.messages track by $index">{{msg}}</p>
50+ <option info="o" files="ctrl.files" ng-repeat="o in ctrl.options"></option>
51+ </code>
52+ </div>
53+ <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
54+ <h4 class="open-sans">Message from console</h4>
55+ <div class="panel pull-left">
56+ <div class="panel-body console-body">
57+ <p ng-repeat="msg in ctrl.messages track by $index">{{msg}}</p>
58+ </div>
59+ </div>
4960 </div>
61+ <hr align="left" style="width: 90%; height: 1px; background-color:#5cb85c;" />
62+ <button type="submit" class="btn btn-default">
63+ Execute
64+ </button>
5065 </div>
5166 </div>
52- </div>
67+ </form>
5368 </uib-accordion-group>
5469 </div>
--- a/front-end/dist/templates/header-menu.html
+++ b/front-end/dist/templates/header-menu.html
@@ -1,4 +1,4 @@
1-<nav class="nav navbar navbar-static-top navbar-inverse">
1+<nav class="nav navbar navbar-default navbar-static-top">
22 <div class="navbar-header">
33 <a class="navbar-brand" href="">Zephyr</a>
44 </div>
Show on old repository browser