yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-04 10:19:30 +02:00
Code Issues Releases Wiki Activity

- Adding data folder for external data.

Browse source 
- Adding Layout Controller.
- Start adding STF 1 layout
- Refactored graphics to a common repository.
- Added all bower/npm dependencies needed for now.
This commit is contained in:
Gunther Brunner 2014-03-11 18:43:53 +09:00
parent 5bba97de78
commit a3870f93e9
15 changed files with 96 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

28
bower.json
View file

@ -1,15 +1,29 @@
{ {
"name": "stf", "name": "stf",
"version": "0.0.0", "version": "0.1.0",
"dependencies": { "dependencies": {
"angular": "~1.2.14", "angular": "~1.3.0-beta.2",
"angular-route": "~1.2.14", "angular-route": "~1.3.0-beta.2",
"requirejs": "~2.1.10",
"se7en-bootstrap-3": "git@ghe.amb.ca.local:stf/se7en-bootstrap-3.git", "se7en-bootstrap-3": "git@ghe.amb.ca.local:stf/se7en-bootstrap-3.git",
"socket.io-client": "~0.9.16", "socket.io-client": "~0.9.16",
"lodash": "~2.4.1", "lodash": "~2.4.1",
"oboe": "~1.14.0", "oboe": "~1.14.2",
"fa-borderlayout": "git@ghe.amb.ca.local:gunther-brunner/fa-borderlayout.git" "fa-borderlayout": "git@ghe.amb.ca.local:gunther-brunner/fa-borderlayout.git",
"Snap.svg": "~0.2.0",
"angular-localForage": "~0.0.2",
"ng-table": "~0.3.1",
"angular-ui-bootstrap": "~0.10.0",
"jquery.terminal": "~0.8.4",
"stf-site": "git@ghe.amb.ca.local:stf/stf-site.git",
"angular-gettext": "~0.2.5",
"angular-ui-ace": "~0.1.0",
"ui-bootstrap-alerts": "~0.1.5",
"angular-sanitize": "~1.2.14",
"requirejs": "~2.1.11",
"stf-graphics": "git@ghe.amb.ca.local:stf/stf-graphics.git"
}, },
"private": true "private": true,
"resolutions": {
"angular": "~1.3.0-beta.2"
}
} }

1
lib/roles/app.js
View file

@ -41,6 +41,7 @@ module.exports = function(options) {
app.use(cors()) app.use(cors())
app.use('/static/bower_components', express.static(pathutil.resource('bower_components'))) app.use('/static/bower_components', express.static(pathutil.resource('bower_components')))
app.use('/static/data', express.static(pathutil.resource('data')))
app.use('/static', express.static(pathutil.resource('app'))) app.use('/static', express.static(pathutil.resource('app')))
if (!options.disableWatch) { if (!options.disableWatch) {

1
lib/roles/auth/ldap.js
View file

@ -29,6 +29,7 @@ module.exports = function(options) {
app.use(express.csrf()) app.use(express.csrf())
app.use(validator()) app.use(validator())
app.use('/static/bower_components', express.static(pathutil.resource('bower_components'))) app.use('/static/bower_components', express.static(pathutil.resource('bower_components')))
app.use('/static/data', express.static(pathutil.resource('data')))
app.use('/static', express.static(pathutil.resource('auth-ldap'))) app.use('/static', express.static(pathutil.resource('auth-ldap')))
app.use(function(req, res, next) { app.use(function(req, res, next) {

1
lib/roles/auth/mock.js
View file

@ -28,6 +28,7 @@ module.exports = function(options) {
app.use(express.csrf()) app.use(express.csrf())
app.use(validator()) app.use(validator())
app.use('/static/bower_components', express.static(pathutil.resource('bower_components'))) app.use('/static/bower_components', express.static(pathutil.resource('bower_components')))
app.use('/static/data', express.static(pathutil.resource('data')))
app.use('/static', express.static(pathutil.resource('auth-mock'))) app.use('/static', express.static(pathutil.resource('auth-mock')))
app.use(function(req, res, next) { app.use(function(req, res, next) {

20
res/app/app.js
View file

@ -1,26 +1,14 @@
require('angular') require('angular')
require('angular-route') require('angular-route')
require('style!raw!se7en-bootstrap-3/build/stylesheets/bootstrap.min.css') require('angular-gettext')
require('style!raw!se7en-bootstrap-3/build/stylesheets/se7en-font.css')
require('style!raw!se7en-bootstrap-3/build/stylesheets/style.css')
require('style!raw!se7en-bootstrap-3/build/stylesheets/font-awesome.min.css')
// Temporary here:
require('fa-borderlayout')
require('fa-borderlayout/build-0.3.1/borderLayout.css')
require('fa-borderlayout/build-0.3.1/stf-style.css')
angular.module('app', [ angular.module('app', [
'ngRoute', 'ngRoute',
'gettext',
require('./layout').name,
require('./device-list').name, require('./device-list').name,
require('./device-control').name, require('./device-control').name
'fa.directive.borderLayout'
]) ])
.config(['$routeProvider', '$locationProvider', .config(['$routeProvider', '$locationProvider',
function ($routeProvider, $locationProvider) { function ($routeProvider, $locationProvider) {

21
res/app/layout/index.js Normal file
View file

@ -0,0 +1,21 @@
require('style!raw!se7en-bootstrap-3/build/stylesheets/bootstrap.min.css')
require('style!raw!se7en-bootstrap-3/build/stylesheets/se7en-font.css')
require('style!raw!se7en-bootstrap-3/build/stylesheets/style.css')
require('style!raw!se7en-bootstrap-3/build/stylesheets/font-awesome.min.css')
// Temporary here:
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('style!raw!./stf-styles.css')
require('./small.css')
module.exports = angular.module('layout', [
'fa.directive.borderLayout'
])
.controller('LayoutCtrl', require('./layout-controller'))

3
res/app/layout/layout-controller.js Normal file
View file

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

2
res/app/layout/stf-styles.css
View file

@ -350,7 +350,7 @@ svg {
} }
.stf-logo { .stf-logo {
background: url("../img/favicon128.png") no-repeat 0 0; background: url("../../data/images/favicon128.png") no-repeat 0 0;
width: 32px; width: 32px;
height: 32px; height: 32px;
float: left; float: left;

33
res/app/views/index.jade
View file

@ -3,6 +3,35 @@ html
head head
meta(charset='utf-8') meta(charset='utf-8')
title STF title STF
body(ng-app='app', ng-cloak) body(ng-app='app', ng-cloak).bg-1.fill-height
div(ng-view) div(ng-controller='LayoutCtrl').fill-height
div(pane).fill-height
.pane-top-bar(pane, pane-anchor='north', pane-size='46px', pane-min='46px', pane-max='46px', pane-handle='')
.navbar
.container-fluid.stf-top-bar
a.stf-logo(href="/") STF2
ul.nav.stf-nav
li(ng-cloak)
a(href='/#/control')
span.fa.fa-mobile
| {{"Control"|translate}}
a(href='/#/devices')
span.fa.fa-sitemap
| {{"Devices"|translate}}
a(href='/#/settings')
span.fa.fa-gears
| {{"Settings"|translate}}
ul.nav.stf-nav.stf-feedback.pull-right(ng-cloak)
li.stf-nav-web-native-button
.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="'native'", translate).btn.btn-sm.btn-default-outline Native
li
a(ng-href='/#/help')
i.fa.fa-question-circle
| {{"Help"|translate}}
div(pane, pane-anchor='center').fill-height
div(ng-view).fill-height
//div(ng-view)
script(src='/static/build/bundle.js') script(src='/static/build/bundle.js')

2
res/auth-ldap/views/index.jade
View file

@ -6,4 +6,4 @@ html
include partials/styles include partials/styles
body(ng-cloak) body(ng-cloak)
div(ng-view) div(ng-view)
script(src='/static/lib/requirejs/require.js', data-main='static/scripts/main.js') script(src='/static/bower_components/requirejs/require.js', data-main='static/scripts/main.js')

2
res/auth-ldap/views/partials/signin.jade
View file

@ -1,7 +1,7 @@
.login2 .login2
.login-wrapper .login-wrapper
a(href='./') a(href='./')
img(width='128', height='128', src='/static/images/logo-128.png', title='STF') img(width='128', height='128', src='/static/bower_components/stf-graphics/logo/exports/STF-128.png', title='STF')
form(name='signin', novalidate, ng-submit='submit()') form(name='signin', novalidate, ng-submit='submit()')
.alert.alert-danger(ng-show='error') .alert.alert-danger(ng-show='error')

8
res/auth-ldap/views/partials/styles.jade
View file

@ -1,6 +1,6 @@
link(href='http://fonts.googleapis.com/css?family=Lato:100,300,400,700', media='all', rel='stylesheet', type='text/css') link(href='http://fonts.googleapis.com/css?family=Lato:100,300,400,700', media='all', rel='stylesheet', type='text/css')
link(rel='stylesheet', href='/static/lib/se7en-bootstrap-3/build/stylesheets/bootstrap.min.css') link(rel='stylesheet', href='/static/bower_components/se7en-bootstrap-3/build/stylesheets/bootstrap.min.css')
link(rel='stylesheet', href='/static/lib/se7en-bootstrap-3/build/stylesheets/se7en-font.css') link(rel='stylesheet', href='/static/bower_components/se7en-bootstrap-3/build/stylesheets/se7en-font.css')
link(rel='stylesheet', href='/static/lib/se7en-bootstrap-3/build/stylesheets/style.css') link(rel='stylesheet', href='/static/bower_components/se7en-bootstrap-3/build/stylesheets/style.css')
link(rel='stylesheet', href='/static/lib/se7en-bootstrap-3/build/stylesheets/font-awesome.min.css') link(rel='stylesheet', href='/static/bower_components/se7en-bootstrap-3/build/stylesheets/font-awesome.min.css')
link(rel='stylesheet', href='/static/styles/login.css') link(rel='stylesheet', href='/static/styles/login.css')

2
res/auth-mock/views/index.jade
View file

@ -6,4 +6,4 @@ html
include partials/styles include partials/styles
body(ng-cloak) body(ng-cloak)
div(ng-view) div(ng-view)
script(src='/static/lib/requirejs/require.js', data-main='static/scripts/main.js') script(src='/static/bower_components/requirejs/require.js', data-main='static/scripts/main.js')

2
res/auth-mock/views/partials/signin.jade
View file

@ -1,7 +1,7 @@
.login2 .login2
.login-wrapper .login-wrapper
a(href='./') a(href='./')
img(width='128', height='128', src='/static/images/logo-128.png', title='STF') img(width='128', height='128', src='/static/bower_components/stf-graphics/logo/exports/STF-128.png', title='STF')
form(name='signin', novalidate, ng-submit='submit()') form(name='signin', novalidate, ng-submit='submit()')
.alert.alert-danger(ng-show='error') .alert.alert-danger(ng-show='error')

8
res/auth-mock/views/partials/styles.jade
View file

@ -1,6 +1,6 @@
link(href='http://fonts.googleapis.com/css?family=Lato:100,300,400,700', media='all', rel='stylesheet', type='text/css') link(href='http://fonts.googleapis.com/css?family=Lato:100,300,400,700', media='all', rel='stylesheet', type='text/css')
link(rel='stylesheet', href='/static/lib/se7en-bootstrap-3/build/stylesheets/bootstrap.min.css') link(rel='stylesheet', href='/static/bower_components/se7en-bootstrap-3/build/stylesheets/bootstrap.min.css')
link(rel='stylesheet', href='/static/lib/se7en-bootstrap-3/build/stylesheets/se7en-font.css') link(rel='stylesheet', href='/static/bower_components/se7en-bootstrap-3/build/stylesheets/se7en-font.css')
link(rel='stylesheet', href='/static/lib/se7en-bootstrap-3/build/stylesheets/style.css') link(rel='stylesheet', href='/static/bower_components/se7en-bootstrap-3/build/stylesheets/style.css')
link(rel='stylesheet', href='/static/lib/se7en-bootstrap-3/build/stylesheets/font-awesome.min.css') link(rel='stylesheet', href='/static/bower_components/se7en-bootstrap-3/build/stylesheets/font-awesome.min.css')
link(rel='stylesheet', href='/static/styles/login.css') link(rel='stylesheet', href='/static/styles/login.css')