Skip to content

Commit 8286615

Browse files
author
Olivier Giulieri
committed
Cleanup.
1 parent 39b40c2 commit 8286615

File tree

5 files changed

+8
-17
lines changed

5 files changed

+8
-17
lines changed

js/many.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Evol.ViewMany = Backbone.View.extend({
3333
'click .pagination>li': 'click_pagination',
3434
'click .evol-field-label .glyphicon-wrench': 'click_customize',
3535
'change .list-sel': 'click_selection',
36-
'change [data-id="cbxAll"]': 'check_all'
36+
'change [data-id="cbxAll"]': 'click_checkall'
3737
},
3838

3939
initialize: function (opts) {
@@ -247,7 +247,7 @@ Evol.ViewMany = Backbone.View.extend({
247247
}
248248
},
249249

250-
check_all: function (evt) {
250+
click_checkall: function (evt) {
251251
var isChecked=this.$('[data-id="cbxAll"]').prop('checked');
252252
//this.$('.list-sel:checked').not('[data-id="cbxAll"]');
253253
this.$('.list-sel').prop('checked', isChecked);

js/one-wizard.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,11 @@ Evol.ViewOne.Wizard = Evol.ViewOne.extend({
106106
},
107107

108108
_renderButtons: function (h) {
109-
//var css=Evol.UI.getSizeCSS(this.options.size);
110109
h.push(Evol.UI.html.clearer,
111110
'<div class="evo-wiz-buttons">',
112111
Evol.UI.input.button('prev', Evol.i18n.prev, 'btn-default disabled'),
113112
Evol.UI.input.button('next', Evol.i18n.next, 'btn-primary'),
114-
Evol.UI.input.button('finish', Evol.i18n.finish, 'btn-primary'),
113+
Evol.UI.input.button('finish', Evol.i18n.finish, 'btn-default'),
115114
'</div>');
116115
return this;
117116
},

js/one.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,13 +266,12 @@ Evol.ViewOne = Backbone.View.extend({
266266
},
267267

268268
_renderButtons: function (h, mode) {
269-
var css=Evol.UI.getSizeCSS(this.options.size);
270269
h.push(Evol.UI.html.clearer,
271270
'<div class="evol-buttons">',
272-
Evol.UI.input.button('cancel', Evol.i18n.Cancel, 'btn-default'+css),
273-
Evol.UI.input.button('save', Evol.i18n.Save, 'btn-primary'+css));
271+
Evol.UI.input.button('cancel', Evol.i18n.Cancel, 'btn-default'),
272+
Evol.UI.input.button('save', Evol.i18n.Save, 'btn-primary'));
274273
if (this.model && this.model.isNew() && this.options.button_addAnother && mode!=='json') {
275-
h.push(Evol.UI.input.button('save-add', Evol.i18n.SaveAdd, 'btn-default'+css));
274+
h.push(Evol.UI.input.button('save-add', Evol.i18n.SaveAdd, 'btn-default'));
276275
}
277276
h.push('</div>');
278277
},

js/ui.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -299,15 +299,6 @@ Evol.UI = {
299299
},
300300

301301
// --- Misc. ---
302-
getSizeCSS: function(size){
303-
switch(size){
304-
case 'S':
305-
return ' input-sm';
306-
case 'L':
307-
return ' input-lg';
308-
}
309-
return '';
310-
},
311302
/*
312303
// get w/ automatic create if not in DOM
313304
getOrCreate: function (fID,$holder) {

less/header.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
}
7070

7171
}
72+
7273
.evo-head-links,
7374
.evo-head-links2{
7475
display: block;
@@ -169,6 +170,7 @@
169170
padding-top:10px;
170171
}
171172
}
173+
172174
// --- footer ---
173175
.footer{
174176
text-align: center;

0 commit comments

Comments
 (0)