sw2at-ui 0.0.14 → 0.0.15

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a521e7106db4371edd442ed6cdaeac92593bddd0
4
- data.tar.gz: 27b261b4316c5827f566fefe3cbe4ee3bb5728c8
3
+ metadata.gz: 8e0a8b35a11c5588f17d1349f77c8466f67bbdd2
4
+ data.tar.gz: 68a958aaf317ad17653e8585576c3722151881b7
5
5
  SHA512:
6
- metadata.gz: a1045965a0bc19f739f1dcc325da72d78a3f0f21dd9937bb0ac5096ab8cb78a569203fd7c13308fd6ada6e48711f5d7b6deeebf0d75bb31a363012485d001aff
7
- data.tar.gz: 1c7cd5184fb233916c52c85809ac2da1325868c4f8b603d6b7ac41afc761352bbb079bb01c905c0934c0f21aa27028b95a0b269f1fa4d763ded8b1717529bfeb
6
+ metadata.gz: a7b6b22de0aec8cd9500b0db6103d8883409661c74a9b53f09eb03ca25e308fef10aa33614b4bb6afaf0088fdcd75479285c0d4da7fa1d4de13a464b65a42de5
7
+ data.tar.gz: 8912bc850c1431d80af7accd5efb393c160de3e21c90af9b4914ae2bcbe9e39d94c793634ae5ab8e5bbfab4d41c442462f1e8fe531080c4d3cfb4c9f70820b7c
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.0.14
1
+ 0.0.15
@@ -1,18 +1,23 @@
1
1
  angular.module("SWAT").factory "GlobalControl", ($cookies)->
2
2
  class GlobalControl
3
+
3
4
  constructor: ->
5
+ @COOKIE_KEY = 'MainMenuStatus'
6
+ @COOKIE_OPTS = { path: '/swat' }
7
+ @OPENED = 'opened'
8
+ @CLOSED = 'closed'
4
9
  @initStatus()
5
10
  @setReloader(->{})
6
11
 
7
12
  initStatus: ->
8
- status = $cookies.get('MainMenuStatus') || 'closed';
9
- @setStatus(status)
13
+ status = $cookies.get(@COOKIE_KEY, @COOKIE_OPTS);
14
+ @setStatus(status || @CLOSED)
10
15
 
11
16
  toggle: ->
12
- @setStatus(if @status == 'closed' then 'opened' else 'closed')
17
+ @setStatus(if @status == @CLOSED then @OPENED else @CLOSED)
13
18
 
14
19
  setStatus: (value)->
15
- $cookies.put('MainMenuStatus', value);
20
+ $cookies.put(@COOKIE_KEY, value, @COOKIE_OPTS);
16
21
  @status = value
17
22
 
18
23
  setReloader: (func)->
@@ -63,8 +63,37 @@
63
63
  }
64
64
 
65
65
  }
66
+ }
66
67
 
68
+ #swat, #confirmation-modal {
67
69
 
68
- }
70
+ .btn {
71
+ border: none;
72
+ font-weight: bold;
73
+ margin-right: 10px;
74
+
75
+ background-color: $greenBtnBg;
76
+ color: $greenBtnColor;
77
+ &:hover {
78
+ background-color: $greenBtnBgHover;
79
+ }
80
+
81
+ &.grey {
82
+ background-color: rgb(212, 209, 210);
83
+ color: #7f807d;
84
+ &:hover {
85
+ background-color: rgb(188, 186, 186);
86
+ }
87
+ }
88
+
89
+ &.red {
90
+ background-color: #F29FA4;
91
+ color: #AE4659;
92
+ &:hover {
93
+ background-color: #FAB9BD;
94
+ }
95
+ }
96
+ }
69
97
 
98
+ }
70
99
 
@@ -9,40 +9,52 @@
9
9
  #confirmation-modal {
10
10
 
11
11
  margin: 50px;
12
- border: 1px solid rgb(219, 217, 217);
12
+ border: none;
13
13
  border-radius: 1px;
14
14
  box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
15
15
 
16
16
  .modal-title {
17
17
  padding: 10px;
18
18
  margin: 0;
19
- color: rgb(209, 66, 66);
20
- background-color: rgb(242, 206, 206);
19
+ color: #F2EEEE;
20
+ background-color: #B83737;
21
21
  text-align: center;
22
22
  }
23
23
 
24
24
  .modal-body {
25
- padding: 20px;
26
25
  background: #f0f0f0;
27
26
  display: inline-block;
28
27
  width: 100%;
28
+ padding: 0;
29
29
 
30
30
  .message {
31
+ padding: 20px;
31
32
  display: inline-block;
32
- margin: 0 0px 15px 0;
33
- font-size: 19px;
34
- color: rgb(88, 81, 81);
33
+ margin: 0 0 30px 0;
34
+ font-size: 15px;
35
+ color: #585151;
35
36
  width: 100%;
36
37
  }
37
38
 
38
39
  .confirmation-modal-footer {
40
+ display: block;
41
+ width: 100%;
42
+ border-top: 1px solid rgba(190, 190, 190, 0.28);
43
+ padding: 12px;
44
+ background-color: rgb(236, 236, 236);
45
+
46
+ .controls {
47
+ text-align: right;
48
+ }
49
+
39
50
  button {
40
- width: 200px;
51
+ display: inline-block;
52
+ width: 110px;
53
+ margin-left: 10px;
41
54
  &.yes {
42
- float: left;
55
+
43
56
  }
44
57
  &.no {
45
- float: right;
46
58
  }
47
59
  }
48
60
  }
@@ -13,17 +13,6 @@ html, body {
13
13
 
14
14
  .controls {
15
15
  float: right;
16
- .btn {
17
-
18
-
19
- background-color: $greenBtnBg;
20
- color: $greenBtnColor;
21
- font-weight: bold;
22
- margin-right: 10px;
23
- &:hover {
24
- background-color: $greenBtnBgHover;
25
- }
26
- }
27
16
  }
28
17
 
29
18
  #container {
@@ -9,5 +9,5 @@
9
9
  .confirmation-modal-footer
10
10
  span.loader ng-if="waitingAction"
11
11
  .controls ng-if="!waitingAction"
12
- button.btn.btn-success.yes ng-click="ok()" ng-disabled="waitingAction" Yes
13
- button.btn.btn-default.no ng-click="cancel()" ng-disabled="waitingAction" No
12
+ button.btn.yes.red ng-click="ok()" ng-disabled="waitingAction" Yes
13
+ button.btn.no.grey ng-click="cancel()" ng-disabled="waitingAction" No
@@ -4,7 +4,7 @@ h3.heading
4
4
 
5
5
  .action-bar(class=object)
6
6
  custom-dropdown(model="clean.#{object}.name" options="consoleData.#{objects}")
7
- button.btn.action.btn-danger(ng-disabled="helpers.isEmpty(clean.#{object}.name)" ng-click="remove('#{object}')")
7
+ button.btn.action.red(ng-disabled="helpers.isEmpty(clean.#{object}.name)" ng-click="remove('#{object}')")
8
8
  | Remove revisions by #{ object }
9
9
 
10
10
  .in(id="#{objects}-stats")
data/sw2at-ui.gemspec CHANGED
@@ -2,11 +2,11 @@
2
2
  # DO NOT EDIT THIS FILE DIRECTLY
3
3
  # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4
4
  # -*- encoding: utf-8 -*-
5
- # stub: sw2at-ui 0.0.14 ruby lib
5
+ # stub: sw2at-ui 0.0.15 ruby lib
6
6
 
7
7
  Gem::Specification.new do |s|
8
8
  s.name = "sw2at-ui"
9
- s.version = "0.0.14"
9
+ s.version = "0.0.15"
10
10
 
11
11
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
12
12
  s.require_paths = ["lib"]
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sw2at-ui
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.14
4
+ version: 0.0.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - Vitaly Tarasenko