Revision e0d90534

b/snf-cyclades-app/synnefo/ui/new_ui/ui/javascripts/okeanos-ember.js
121 121
  	icon: "snf-pc-outline"
122 122
  },
123 123
  {
124
  	destination: "nets",
125
  	title: "Network",
124
    destination: "networks",
125
    title: "Network",
126 126
  	icon: "snf-network-outline"
127 127

  
128 128
  },
......
156 156
  	title: "SSh Keys",
157 157
  	icon: "snf-key-outline"
158 158
  }],
159

  
159 160
  userActions: [{
160 161
    description:'start',
161 162
    'snf-components':['vms'],
......
164 165
  },
165 166
  {
166 167
    description:'destroyElement',
167
    'snf-components': ['vms', 'nets'],
168
    'snf-components': ['vms', 'networks'],
168 169
    'enabled-status': ['all'],
169 170
    action: 'is this a function?',
170 171
  },
......
176 177
  },
177 178
  {
178 179
    description:'add machine',
179
    'snf-components': ['nets'],
180
    'snf-components': ['networks'],
180 181
    'enabled-status': ['active'],
181 182
    action: 'is this a function?'
182 183
  },
183 184
  {
184 185
    description:'action for all',
185
    'snf-components': ['vms', 'nets'],
186
    'snf-components': ['vms', 'networks'],
186 187
    'enabled-status': ['all'],
187 188
    action: 'is this a function?'
188 189
}]
......
222 223
	}
223 224
});
224 225

  
226

  
225 227
Synnefo.VmsRoute = Synnefo.SectionsRoute.extend({
226 228
	modelName: 'vm'
227 229
});
228 230

  
229
Synnefo.NetsRoute = Synnefo.SectionsRoute.extend({
231
Synnefo.NetworksRoute = Synnefo.SectionsRoute.extend({
230 232
	modelName: 'network'
231 233
});
232 234

  
......
299 301
});
300 302

  
301 303

  
302
Synnefo.NetsController = Synnefo.ElemsController.extend({
303
	type: 'nets'
304
Synnefo.NetworksController = Synnefo.ElemsController.extend({
305
	type: 'networks'
304 306
});
305 307

  
306 308
Synnefo.VolumesController = Synnefo.ElemsController.extend({
......
346 348
	needs: ['vms']
347 349
});
348 350

  
349
Synnefo.NetController = Synnefo.ElemController.extend({
350
	needs: ['nets']
351
Synnefo.NetworkController = Synnefo.ElemController.extend({
352
	needs: ['networks']
351 353
});
352 354

  
353 355
Synnefo.VolumeController = Synnefo.ElemController.extend({
......
469 471
		switch(btnType){
470 472
			case 'vms':
471 473
				return msg + 'Machine';
472
			case 'nets':
474
			case 'networks':
473 475
				return msg + 'Network';
474 476
			case 'volumes':
475 477
				return msg + 'Volume';
......
480 482
		}
481 483
	}.property(),
482 484
		click: function (e) {
483
			console.log('clicked create new');
484
			console.log($('.wizard').length);
485 485
	        e.preventDefault();
486
	        var wizardID = '#'+ this.get('type').substring(0, type.length - 1)+'-wizard'
486 487
	        $('.overlay-area-custom').fadeIn(100);
487 488
	        $('body').addClass('with-overlay');
488

  
489
			$('#vm-wizard').foundation('reveal', 'open');
490
	        $('#vm-wizard').fadeIn('slow');
489
	        $(wizardID).fadeIn('slow');
491 490
		}
492 491
});
493 492

  
b/snf-cyclades-app/synnefo/ui/new_ui/ui/javascripts/okeanos-ember/ember-all.js
33 33
	}
34 34
});
35 35

  
36

  
36 37
Synnefo.VmsRoute = Synnefo.SectionsRoute.extend({
37 38
	modelName: 'vm'
38 39
});
39 40

  
40
Synnefo.NetsRoute = Synnefo.SectionsRoute.extend({
41
Synnefo.NetworksRoute = Synnefo.SectionsRoute.extend({
41 42
	modelName: 'network'
42 43
});
43 44

  
......
110 111
});
111 112

  
112 113

  
113
Synnefo.NetsController = Synnefo.ElemsController.extend({
114
	type: 'nets'
114
Synnefo.NetworksController = Synnefo.ElemsController.extend({
115
	type: 'networks'
115 116
});
116 117

  
117 118
Synnefo.VolumesController = Synnefo.ElemsController.extend({
......
157 158
	needs: ['vms']
158 159
});
159 160

  
160
Synnefo.NetController = Synnefo.ElemController.extend({
161
	needs: ['nets']
161
Synnefo.NetworkController = Synnefo.ElemController.extend({
162
	needs: ['networks']
162 163
});
163 164

  
164 165
Synnefo.VolumeController = Synnefo.ElemController.extend({
......
280 281
		switch(btnType){
281 282
			case 'vms':
282 283
				return msg + 'Machine';
283
			case 'nets':
284
			case 'networks':
284 285
				return msg + 'Network';
285 286
			case 'volumes':
286 287
				return msg + 'Volume';
......
291 292
		}
292 293
	}.property(),
293 294
		click: function (e) {
294
			console.log('clicked create new');
295
			console.log($('.wizard').length);
296 295
	        e.preventDefault();
296
	        var wizardID = '#'+ this.get('type').substring(0, type.length - 1)+'-wizard'
297 297
	        $('.overlay-area-custom').fadeIn(100);
298 298
	        $('body').addClass('with-overlay');
299

  
300
			$('#vm-wizard').foundation('reveal', 'open');
301
	        $('#vm-wizard').fadeIn('slow');
299
	        $(wizardID).fadeIn('slow');
302 300
		}
303 301
});
304 302

  
b/snf-cyclades-app/synnefo/ui/new_ui/ui/javascripts/okeanos-ember/obj.js
114 114
  	icon: "snf-pc-outline"
115 115
  },
116 116
  {
117
  	destination: "nets",
118
  	title: "Network",
117
    destination: "networks",
118
    title: "Network",
119 119
  	icon: "snf-network-outline"
120 120

  
121 121
  },
......
149 149
  	title: "SSh Keys",
150 150
  	icon: "snf-key-outline"
151 151
  }],
152

  
152 153
  userActions: [{
153 154
    description:'start',
154 155
    'snf-components':['vms'],
......
157 158
  },
158 159
  {
159 160
    description:'destroyElement',
160
    'snf-components': ['vms', 'nets'],
161
    'snf-components': ['vms', 'networks'],
161 162
    'enabled-status': ['all'],
162 163
    action: 'is this a function?',
163 164
  },
......
169 170
  },
170 171
  {
171 172
    description:'add machine',
172
    'snf-components': ['nets'],
173
    'snf-components': ['networks'],
173 174
    'enabled-status': ['active'],
174 175
    action: 'is this a function?'
175 176
  },
176 177
  {
177 178
    description:'action for all',
178
    'snf-components': ['vms', 'nets'],
179
    'snf-components': ['vms', 'networks'],
179 180
    'enabled-status': ['all'],
180 181
    action: 'is this a function?'
181 182
}]

Also available in: Unified diff