Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# EditorConfig is awesome: http://EditorConfig.org

root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true

[*.py]
indent_style = space
indent_size = 4

[*.{html,js}]
indent_style = space
indent_size = 2
35 changes: 19 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,29 @@
"angular-material": "1.0.9",
"angular-messages": "1.5.7",
"angular-ui-router": "1.0.0-alpha.5",
"highcharts": "^4.2.5",
"highcharts": "~4.2.5",
"highcharts-ng": "0.0.11",
"material-design-icons": "^2.2.3",
"ng-annotate-webpack-plugin": "^0.1.2"
"material-design-icons": "~2.2.3",
"ng-annotate-webpack-plugin": "~0.1.2",
"ng-annotate": "~1.0.2"
},
"devDependencies": {
"angular-mocks": "^1.5.6",
"babel": "^6.3.13",
"babel-core": "^6.3.13",
"babel-eslint": "^5.0.0-beta6",
"angular-mocks": "~1.5.6",
"babel": "~6.3.13",
"babel-core": "~6.3.13",
"babel-eslint": "~5.0.0-beta6",
"babel-loader": "5.3.2",
"babel-runtime": "6.3.13",
"eslint": "^1.10.3",
"eslint-config-airbnb": "^2.1.0",
"eslint-loader": "^1.1.1",
"eslint-plugin-react": "^3.11.3",
"jasmine": "^2.4.1",
"karma": "^0.13.22",
"karma-chrome-launcher": "^1.0.1",
"karma-jasmine": "^1.0.2",
"karma-webpack": "^1.7.0"
"eslint": "~1.10.3",
"eslint-config-airbnb": "~2.1.0",
"eslint-loader": "~1.1.1",
"eslint-plugin-react": "~3.11.3",
"jasmine": "~2.4.1",
"karma": "~0.13.22",
"karma-chrome-launcher": "~1.0.1",
"karma-jasmine": "~1.0.2",
"karma-webpack": "~1.7.0",
"webpack": "~1.4.0",
"ng-cache-loader": "0.0.23"
}
}
30 changes: 16 additions & 14 deletions scheduler/frontend/login/login-modal.template.html
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
<md-dialog aria-label="Login Modal" ng-cloak id="login-modal">
<md-toolbar>
<div class="md-toolbar-tools">
<h2>Login</h2>
<span flex></span>
<md-button class="md-icon-button" ng-click="vm.cancel()">
<md-icon class="material-icons" aria-label="Close dialog">close_black_18x18</md-icon>
</md-button>
</div>
</md-toolbar>
<md-toolbar>
<div class="md-toolbar-tools">
<h2>Login</h2>
<span flex></span>
<md-button class="md-icon-button" ng-click="vm.cancel()">
<md-icon class="material-icons" aria-label="Close dialog">close_black_18x18</md-icon>
</md-button>
</div>
</md-toolbar>
<form ng-submit="vm.doLogin()">
<md-dialog-content>
<div class="md-dialog-content">
<md-input-container class="md-block">
<label>Username</label>
<input type="text" required ng-model="vm.username" />
<input type="text" required ng-model="vm.username"/>
</md-input-container>
<md-input-container class="md-block">
<label>Password</label>
<input type="password" required ng-model="vm.password" />
<input type="password" required ng-model="vm.password"/>
</md-input-container>
</div>
</md-dialog-content>
<md-dialog-actions layout="row">
<md-button ng-click="vm.cancel()">
Cancel
Cancel
</md-button>
<md-button ng-click="vm.doLogin()" style="margin-right:20px;">
<md-button type="submit" style="margin-right:20px;">
Login
</md-button>
</md-dialog-actions>
</md-dialog>
</form>
</md-dialog>
Loading