chef-server-webui 0.9.18 → 0.10.0.beta.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (68) hide show
  1. data/README.rdoc +0 -4
  2. data/Rakefile +10 -0
  3. data/app/controllers/application.rb +34 -6
  4. data/app/controllers/cookbooks.rb +125 -35
  5. data/app/controllers/environments.rb +235 -0
  6. data/app/controllers/nodes.rb +26 -19
  7. data/app/controllers/roles.rb +37 -44
  8. data/app/controllers/search.rb +13 -13
  9. data/app/helpers/application_helper.rb +34 -0
  10. data/app/views/cookbooks/_cookbook_content.html.haml +7 -0
  11. data/app/views/cookbooks/index.html.haml +22 -7
  12. data/app/views/cookbooks/show.html.haml +8 -50
  13. data/app/views/environments/_form.html.erb +91 -0
  14. data/app/views/environments/_navigation.html.haml +9 -0
  15. data/app/views/environments/_version_selector.html.erb +8 -0
  16. data/app/views/environments/edit.html.erb +17 -0
  17. data/app/views/environments/index.html.haml +26 -0
  18. data/app/views/environments/new.html.erb +17 -0
  19. data/app/views/environments/show.html.haml +31 -0
  20. data/app/views/layout/application.html.haml +22 -13
  21. data/app/views/layout/login.html.haml +2 -2
  22. data/app/views/nodes/_form.html.erb +69 -0
  23. data/app/views/nodes/index.html.haml +6 -2
  24. data/app/views/nodes/show.html.haml +4 -1
  25. data/app/views/roles/_form.html.erb +92 -0
  26. data/app/views/roles/_run_lists.html.erb +26 -0
  27. data/app/views/roles/edit.html.haml +1 -1
  28. data/app/views/roles/new.html.haml +1 -1
  29. data/app/views/roles/show.html.haml +10 -7
  30. data/app/views/status/index.html.haml +2 -1
  31. data/bin/chef-server-webui +1 -0
  32. data/config/router.rb +14 -8
  33. data/lib/chef-server-webui/version.rb +1 -1
  34. data/public/javascripts/chef.js +206 -49
  35. data/public/javascripts/cookbook_constraint_ctrl.js +191 -0
  36. data/public/javascripts/cookbook_versions.js +75 -0
  37. data/public/javascripts/jquery-1.4.4.min.js +167 -0
  38. data/public/javascripts/jquery.suggest.js +250 -0
  39. data/public/stylesheets/base.css +30 -24
  40. data/public/stylesheets/chef.css +212 -45
  41. data/public/stylesheets/jquery.suggest.css +28 -0
  42. data/public/stylesheets/jsonedit_main.css +26 -10
  43. data/public/stylesheets/themes/djime-cerulean/style.css +31 -18
  44. metadata +22 -29
  45. data/app/controllers/cookbook_attributes.rb +0 -41
  46. data/app/controllers/cookbook_definitions.rb +0 -41
  47. data/app/controllers/cookbook_files.rb +0 -39
  48. data/app/controllers/cookbook_libraries.rb +0 -41
  49. data/app/controllers/cookbook_recipes.rb +0 -40
  50. data/app/controllers/cookbook_templates.rb +0 -57
  51. data/app/helpers/cookbook_attributes_helper.rb +0 -7
  52. data/app/helpers/cookbook_definitions_helper.rb +0 -8
  53. data/app/helpers/cookbook_files_helper.rb +0 -8
  54. data/app/helpers/cookbook_libraries_helper.rb +0 -7
  55. data/app/helpers/cookbook_recipes_helper.rb +0 -8
  56. data/app/helpers/cookbook_templates_helper.rb +0 -8
  57. data/app/helpers/exceptions_helper.rb +0 -6
  58. data/app/helpers/global_helpers.rb +0 -39
  59. data/app/helpers/nodes_helper.rb +0 -43
  60. data/app/helpers/openid_consumer_helper.rb +0 -8
  61. data/app/helpers/openid_register_helper.rb +0 -8
  62. data/app/helpers/openid_server_helper.rb +0 -6
  63. data/app/helpers/openid_server_helpers.rb +0 -32
  64. data/app/helpers/roles_helper.rb +0 -5
  65. data/app/helpers/search_entries_helper.rb +0 -8
  66. data/app/helpers/search_helper.rb +0 -44
  67. data/app/views/nodes/_form.html.haml +0 -52
  68. data/app/views/roles/_form.html.haml +0 -52
@@ -0,0 +1,28 @@
1
+ .ac_results {
2
+ width: 152px;
3
+ border: 1px solid gray;
4
+ background-color: white;
5
+ padding: 0;
6
+ margin: 0;
7
+ list-style: none;
8
+ position: absolute;
9
+ z-index: 10000;
10
+ display: none;
11
+ }
12
+
13
+ .ac_results li {
14
+ padding: 2px 5px;
15
+ white-space: nowrap;
16
+ color: #101010;
17
+ text-align: left;
18
+ }
19
+
20
+ .ac_over {
21
+ cursor: pointer;
22
+ background-color: #F0F0B8;
23
+ }
24
+
25
+ .ac_match {
26
+ text-decoration: underline;
27
+ color: black;
28
+ }
@@ -40,7 +40,8 @@
40
40
  }
41
41
  #treecontainer div, #treecontainer a{
42
42
  color: #000000;
43
- font: 12px Arial;
43
+ font-size: 12px;
44
+ font-family:"Helvetica Neue",Helvetica,Arial,"Bitstream Vera Sans",sans-serif;
44
45
  text-decoration: none;
45
46
  padding-left: 2px;
46
47
  padding-right: 2px;
@@ -63,7 +64,8 @@
63
64
  }
64
65
  #tabcontainer #console #log{
65
66
  color:#FF0000;
66
- font: 12px Arial;
67
+ font-size: 12px;
68
+ font-family:"Helvetica Neue",Helvetica,Arial,"Bitstream Vera Sans",sans-serif;
67
69
  padding:2px;
68
70
  }
69
71
  #tabcontainer #console #bar{
@@ -71,7 +73,8 @@
71
73
  _background-image:url(../images/jsonedit/cross.gif);
72
74
  background-position: right;
73
75
  background-repeat:no-repeat;
74
- font: 12px Arial;
76
+ font-size: 12px;
77
+ font-family:"Helvetica Neue",Helvetica,Arial,"Bitstream Vera Sans",sans-serif;
75
78
  padding:2px;
76
79
  background-color:#F0F0F0;
77
80
  }
@@ -95,7 +98,8 @@ ul.tablayout {
95
98
  background: url(../images/jsonedit/pixel.gif) bottom left repeat-x;
96
99
  margin:0pt;
97
100
  padding:0pt;
98
- font: 12px Arial, Verdana
101
+ font-size: 12px;
102
+ font-family:"Helvetica Neue",Helvetica,Arial,"Bitstream Vera Sans",sans-serif;
99
103
  }
100
104
  ul.tablayout li {
101
105
  margin: 0 2px 0 0;
@@ -144,7 +148,10 @@ ul.tablayout a.active {
144
148
  border-top: 0;
145
149
  padding: 8px 8px 0 8px;
146
150
  }
147
- .tab{font: 12px Arial;}
151
+ .tab{
152
+ font-size: 12px;
153
+ font-family:"Helvetica Neue",Helvetica,Arial,"Bitstream Vera Sans",sans-serif;
154
+ }
148
155
  .tabn{
149
156
  clear: left;
150
157
  border: 1px solid #ccc;
@@ -153,7 +160,10 @@ ul.tablayout a.active {
153
160
  margin-bottom:8px;
154
161
  background-color:#f0f0f0;
155
162
  }
156
- .tabn{font: 12px Arial;}
163
+ .tabn{
164
+ font-size: 12px;
165
+ font-family:"Helvetica Neue",Helvetica,Arial,"Bitstream Vera Sans",sans-serif;
166
+ }
157
167
 
158
168
 
159
169
  .tab h2{margin: 0 0 20px 0;}
@@ -235,9 +245,13 @@ ul.tablayout a.active {
235
245
  .tab textarea{
236
246
  /*border: 1px solid;*/
237
247
  width: 99%;
238
- font:10px monospace;
248
+ font-size:13px;
249
+ font-family:"Consolas","Lucida Console",Courier,monospace;
250
+ }
251
+ .tab select{
252
+ font-size: 12px;
253
+ font-family:"Helvetica Neue",Helvetica,Arial,"Bitstream Vera Sans",sans-serif;
239
254
  }
240
- .tab select{font:12px arial;}
241
255
  .tab .icanhastable td{text-align: right;}
242
256
  .tab .icanhastable{
243
257
  border: 0px;
@@ -251,13 +265,15 @@ ul.tablayout a.active {
251
265
  #tab2 #jsonpath{
252
266
  text-align: left;
253
267
  margin-left: 4px;
254
- font: 10px Arial;
268
+ font-size: 12px;
269
+ font-family:"Helvetica Neue",Helvetica,Arial,"Bitstream Vera Sans",sans-serif;
255
270
  letter-spacing:1px;
256
271
  }
257
272
  #tab2 #jsonmode{
258
273
  text-align: left;
259
274
  margin-left: 4px;
260
- font: 11px Arial;
275
+ font-size: 11px;
276
+ font-family:"Helvetica Neue",Helvetica,Arial,"Bitstream Vera Sans",sans-serif;
261
277
  letter-spacing:1px;
262
278
  }
263
279
  #tab1 .icanhastable td{text-align: left;}
@@ -23,7 +23,7 @@ a:link, a:visited, a:hover, a:active, h1, h2, h3 { color: #007BA7; }
23
23
 
24
24
  body {
25
25
  color: #222;
26
- background: #C2C8D1;
26
+ background: #F4F4F6;
27
27
  font-family: "Helvetica Neue",Helvetica,Arial,"Bitstream Vera Sans",sans-serif;
28
28
  }
29
29
 
@@ -50,12 +50,6 @@ hr {
50
50
 
51
51
  /* @end */
52
52
 
53
- #user-navigation {
54
- top: auto;
55
- bottom: 5px;
56
- right: 25px;
57
- }
58
-
59
53
  #main .block .content {
60
54
  background: #F7F7F8;
61
55
  padding-top: 1px;
@@ -85,14 +79,14 @@ hr {
85
79
  background-color: #005573;
86
80
  }
87
81
 
88
- #main-navigation ul li a:hover {
89
- background-color: #001C26;
82
+ #main-navigation ul li a:hover {
83
+ background-color: #102E41;
90
84
  }
91
85
 
92
- #main-navigation ul li.active a {
93
- background-color: #C2C8D1;
94
- background: -webkit-gradient(linear, left top, left bottom, from(#C2C8D1), to(#C2C8D1), color-stop(0.5, #F7F7F8), color-stop(0.5, #F7F7F8));
95
-
86
+ #main-navigation ul li.active a, #main-navigation ul li.active a:visited {
87
+ background: #F4F4F6;
88
+ color: #102E41;
89
+ font-weight: bold;
96
90
  }
97
91
 
98
92
  /* @end */
@@ -140,16 +134,13 @@ hr {
140
134
 
141
135
  /* @end */
142
136
 
143
- #main-navigation ul li a:link, #main-navigation ul li a:visited, #main-navigation ul li a:hover, #main-navigation ul li a:active,
137
+ #main-navigation ul li a:visited, #main-navigation ul li a:hover,
144
138
  .secondary-navigation ul li a:link, .secondary-navigation ul li a:visited, .secondary-navigation ul li a:hover, .secondary-navigation ul li a:active,
145
139
  #user-navigation ul li a:link, #user-navigation ul li a:visited, #user-navigation ul li a:hover, #user-navigation ul li a:active {
146
140
  text-decoration: none;
147
141
  color: #F7F7F8;
148
142
  }
149
143
 
150
- #main-navigation ul li.active a:link, #main-navigation ul li.active a:visited, #main-navigation ul li.active a:hover, #main-navigation ul li.active a:active {
151
- color: #001C26;
152
- }
153
144
 
154
145
  #footer .block {
155
146
  color: #F7F7F8;
@@ -211,6 +202,12 @@ hr {
211
202
  font-size: .9em;
212
203
  }
213
204
 
205
+ .form .inline_error_message {
206
+ color: #FF0000;
207
+ font-weight: bold;
208
+ padding-left:5px;
209
+ }
210
+
214
211
  /* @group Flash messages */
215
212
 
216
213
  .flash .message {
@@ -267,7 +264,7 @@ ul.list li .item .avatar {
267
264
 
268
265
  /* rounded borders */
269
266
 
270
- #main, #main-navigation, #main-navigation li, #main-navigation li a, .secondary-navigation, #main .block, #sidebar .block, #sidebar h3, ul.list li,
267
+ #main, #main-navigation, #main-navigation li, #main-navigation li a, .secondary-navigation, #main .block, #sidebar .block, #sidebar h3, ul.list li,
271
268
  #footer .block, .form input.button, #box .block, #box .block h2 {
272
269
  -moz-border-radius-topleft: 4px;
273
270
  -webkit-border-top-left-radius: 4px;
@@ -280,6 +277,22 @@ ul.list li .item .avatar {
280
277
  -webkit-border-top-left-radius: 4px;
281
278
  }
282
279
 
280
+ .table th.first#CookbookVersionConstraints{
281
+ width:30%;
282
+ }
283
+
284
+ .table th.operator#CookbookVersionConstraints{
285
+ width:15%;
286
+ }
287
+
288
+ .table th.version#CookbookVersionConstraints{
289
+ width:20%;
290
+ }
291
+
292
+ .table th.last#CookbookVersionConstraints{
293
+ width:40%;
294
+ }
295
+
283
296
  .table th.last {
284
297
  -moz-border-radius-topright: 4px;
285
298
  -webkit-border-top-right-radius: 4px;
metadata CHANGED
@@ -1,8 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chef-server-webui
3
3
  version: !ruby/object:Gem::Version
4
- prerelease:
5
- version: 0.9.18
4
+ prerelease: 7
5
+ version: 0.10.0.beta.0
6
6
  platform: ruby
7
7
  authors:
8
8
  - Opscode
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2011-06-29 00:00:00 -07:00
13
+ date: 2011-03-28 00:00:00 -07:00
14
14
  default_executable:
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
@@ -154,15 +154,10 @@ files:
154
154
  - lib/chef-server-webui.rb
155
155
  - app/controllers/application.rb
156
156
  - app/controllers/clients.rb
157
- - app/controllers/cookbook_attributes.rb
158
- - app/controllers/cookbook_definitions.rb
159
- - app/controllers/cookbook_files.rb
160
- - app/controllers/cookbook_libraries.rb
161
- - app/controllers/cookbook_recipes.rb
162
- - app/controllers/cookbook_templates.rb
163
157
  - app/controllers/cookbooks.rb
164
158
  - app/controllers/databag_items.rb
165
159
  - app/controllers/databags.rb
160
+ - app/controllers/environments.rb
166
161
  - app/controllers/exceptions.rb
167
162
  - app/controllers/main.rb
168
163
  - app/controllers/nodes.rb
@@ -173,22 +168,6 @@ files:
173
168
  - app/controllers/status.rb
174
169
  - app/controllers/users.rb
175
170
  - app/helpers/application_helper.rb
176
- - app/helpers/cookbook_attributes_helper.rb
177
- - app/helpers/cookbook_definitions_helper.rb
178
- - app/helpers/cookbook_files_helper.rb
179
- - app/helpers/cookbook_libraries_helper.rb
180
- - app/helpers/cookbook_recipes_helper.rb
181
- - app/helpers/cookbook_templates_helper.rb
182
- - app/helpers/exceptions_helper.rb
183
- - app/helpers/global_helpers.rb
184
- - app/helpers/nodes_helper.rb
185
- - app/helpers/openid_consumer_helper.rb
186
- - app/helpers/openid_register_helper.rb
187
- - app/helpers/openid_server_helper.rb
188
- - app/helpers/openid_server_helpers.rb
189
- - app/helpers/roles_helper.rb
190
- - app/helpers/search_entries_helper.rb
191
- - app/helpers/search_helper.rb
192
171
  - app/helpers/status_helper.rb
193
172
  - app/views/clients/_form.html.haml
194
173
  - app/views/clients/_navigation.html.haml
@@ -196,6 +175,7 @@ files:
196
175
  - app/views/clients/index.html.haml
197
176
  - app/views/clients/new.html.haml
198
177
  - app/views/clients/show.html.haml
178
+ - app/views/cookbooks/_cookbook_content.html.haml
199
179
  - app/views/cookbooks/index.html.haml
200
180
  - app/views/cookbooks/show.html.haml
201
181
  - app/views/databag_items/_form.html.haml
@@ -211,6 +191,13 @@ files:
211
191
  - app/views/databags/index.html.haml
212
192
  - app/views/databags/new.html.haml
213
193
  - app/views/databags/show.html.haml
194
+ - app/views/environments/_form.html.erb
195
+ - app/views/environments/_navigation.html.haml
196
+ - app/views/environments/_version_selector.html.erb
197
+ - app/views/environments/edit.html.erb
198
+ - app/views/environments/index.html.haml
199
+ - app/views/environments/new.html.erb
200
+ - app/views/environments/show.html.haml
214
201
  - app/views/exceptions/admin_access_required.html.haml
215
202
  - app/views/exceptions/bad_request.json.erb
216
203
  - app/views/exceptions/internal_server_error.html.erb
@@ -222,7 +209,7 @@ files:
222
209
  - app/views/layout/login.html.haml
223
210
  - app/views/main/index.html.erb
224
211
  - app/views/nodes/_action.html.haml
225
- - app/views/nodes/_form.html.haml
212
+ - app/views/nodes/_form.html.erb
226
213
  - app/views/nodes/_navigation.html.haml
227
214
  - app/views/nodes/_resource.html.haml
228
215
  - app/views/nodes/edit.html.haml
@@ -234,8 +221,9 @@ files:
234
221
  - app/views/openid_login/index.html.haml
235
222
  - app/views/openid_register/index.html.haml
236
223
  - app/views/openid_register/show.html.haml
237
- - app/views/roles/_form.html.haml
224
+ - app/views/roles/_form.html.erb
238
225
  - app/views/roles/_navigation.html.haml
226
+ - app/views/roles/_run_lists.html.erb
239
227
  - app/views/roles/edit.html.haml
240
228
  - app/views/roles/index.html.haml
241
229
  - app/views/roles/new.html.haml
@@ -306,14 +294,18 @@ files:
306
294
  - public/images/treeBuilderImages/Thumbs.db
307
295
  - public/images/treeBuilderImages/vertLine.gif
308
296
  - public/javascripts/chef.js
297
+ - public/javascripts/cookbook_constraint_ctrl.js
298
+ - public/javascripts/cookbook_versions.js
309
299
  - public/javascripts/drop_down_menu.js
310
300
  - public/javascripts/jquery-1.3.2.min.js
301
+ - public/javascripts/jquery-1.4.4.min.js
311
302
  - public/javascripts/jquery-ui-1.7.1.custom.min.js
312
303
  - public/javascripts/jquery.editinline.js
313
304
  - public/javascripts/jquery.jeditable.mini.js
314
305
  - public/javascripts/jquery.livequery.js
315
306
  - public/javascripts/jquery.localscroll.js
316
307
  - public/javascripts/jquery.scrollTo.js
308
+ - public/javascripts/jquery.suggest.js
317
309
  - public/javascripts/jquery.tools.min.js
318
310
  - public/javascripts/jquery.treeTable.min.js
319
311
  - public/javascripts/json.js
@@ -338,6 +330,7 @@ files:
338
330
  - public/stylesheets/images/ui-icons_cd0a0a_256x240.png
339
331
  - public/stylesheets/images/ui-icons_ffffff_256x240.png
340
332
  - public/stylesheets/jquery-ui-1.7.1.custom.css
333
+ - public/stylesheets/jquery.suggest.css
341
334
  - public/stylesheets/jquery.treeTable.css
342
335
  - public/stylesheets/jsonedit_main.css
343
336
  - public/stylesheets/themes/bec/style.css
@@ -366,9 +359,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
366
359
  required_rubygems_version: !ruby/object:Gem::Requirement
367
360
  none: false
368
361
  requirements:
369
- - - ">="
362
+ - - ">"
370
363
  - !ruby/object:Gem::Version
371
- version: "0"
364
+ version: 1.3.1
372
365
  requirements: []
373
366
 
374
367
  rubyforge_project:
@@ -1,41 +0,0 @@
1
- #
2
- # Author:: Adam Jacob (<adam@opscode.com>)
3
- # Author:: Christopher Brown (<cb@opscode.com>)
4
- # Copyright:: Copyright (c) 2008 Opscode, Inc.
5
- # License:: Apache License, Version 2.0
6
- #
7
- # Licensed under the Apache License, Version 2.0 (the "License");
8
- # you may not use this file except in compliance with the License.
9
- # You may obtain a copy of the License at
10
- #
11
- # http://www.apache.org/licenses/LICENSE-2.0
12
- #
13
- # Unless required by applicable law or agreed to in writing, software
14
- # distributed under the License is distributed on an "AS IS" BASIS,
15
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16
- # See the License for the specific language governing permissions and
17
- # limitations under the License.
18
- #
19
-
20
- require 'chef' / 'mixin' / 'checksum'
21
-
22
- class CookbookAttributes < Application
23
-
24
- provides :html
25
-
26
- before :login_required
27
-
28
- include Chef::Mixin::Checksum
29
-
30
- def load_cookbook_attributes()
31
- @attribute_files = load_cookbook_segment(params[:cookbook_id], :attributes)
32
- end
33
-
34
- def index
35
- load_cookbook_attributes()
36
- render
37
- end
38
-
39
- end
40
-
41
-
@@ -1,41 +0,0 @@
1
- #
2
- # Author:: Adam Jacob (<adam@opscode.com>)
3
- # Author:: Christopher Brown (<cb@opscode.com>)
4
- # Copyright:: Copyright (c) 2008 Opscode, Inc.
5
- # License:: Apache License, Version 2.0
6
- #
7
- # Licensed under the Apache License, Version 2.0 (the "License");
8
- # you may not use this file except in compliance with the License.
9
- # You may obtain a copy of the License at
10
- #
11
- # http://www.apache.org/licenses/LICENSE-2.0
12
- #
13
- # Unless required by applicable law or agreed to in writing, software
14
- # distributed under the License is distributed on an "AS IS" BASIS,
15
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16
- # See the License for the specific language governing permissions and
17
- # limitations under the License.
18
- #
19
-
20
- require 'chef' / 'mixin' / 'checksum'
21
-
22
- class CookbookDefinitions < Application
23
-
24
- provides :html
25
-
26
- before :login_required
27
-
28
- include Chef::Mixin::Checksum
29
-
30
- def load_cookbook_definitions()
31
- @definition_files = load_cookbook_segment(params[:cookbook_id], :definitions)
32
- end
33
-
34
- def index
35
- load_cookbook_definitions()
36
- render
37
- end
38
-
39
- end
40
-
41
-