Skip to content

Commit cecfe71

Browse files
author
Olivier Giulieri
committed
Bug fix + small CSS changes.
1 parent a53f78d commit cecfe71

9 files changed

Lines changed: 56 additions & 65 deletions

File tree

‎dist/css/demo.css‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,8 @@ body {
203203
font-size: 15px !important;
204204
font-weight: 300;
205205
}
206-
h1,
207-
h2,
208-
h3:not.panel-title,
209-
h4 {
210-
color: #0099cc !important;
206+
.mt20 {
207+
margin-top: 20px;
211208
}
212209
.evo-title > h1,
213210
.evo-title2 > h1 {
@@ -269,6 +266,7 @@ h4 {
269266
.title2 {
270267
font-size: smaller;
271268
font-weight: normal;
269+
color: #b3e5fc;
272270
}
273271
/* demo badge view*/
274272
[data-eid="todo"] .evol-badges-body > .panel,

‎dist/css/evolutility.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,9 @@ label {
196196
text-align: left;
197197
}
198198
}
199+
.evol-mini-label > div > label {
200+
margin-top: 5px;
201+
}
199202
.evol-mini-content {
200203
float: left;
201204
width: 75%;

‎dist/css/evolutility.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/evolutility.js‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,26 +1609,27 @@ Evol.ViewOne = Backbone.View.extend({
16091609
_.each(this.getFields(), function (f) {
16101610
$f = that.$(prefix + f.id);
16111611
defaultVal = f.defaultvalue || '';
1612-
switch(f.type) {
1613-
case ft.bool:
1614-
$f.prop('checked', defaultVal?'checked':false);
1615-
break;
1616-
case ft.list:
1617-
$f.select2('val', null);
1618-
break;
1619-
case ft.pix:
1620-
//var newPix=(defaultVal)?('<img src="'+iconsPath+defaultVal+'" class="img-thumbnail">'):('<p class="">'+Evol.i18n.nopix+'</p>');
1621-
var newPix='<p class="">'+Evol.i18n.nopix+'</p>';
1622-
$f.val('')
1623-
.prev().remove();
1624-
$f.before(newPix);
1625-
break;
1626-
default:
1627-
if(f.readonly){
1628-
$f.html(defaultVal);
1629-
}else{
1612+
1613+
if(f.readonly){
1614+
$f.html(defaultVal);
1615+
}else{
1616+
switch(f.type) {
1617+
case ft.bool:
1618+
$f.prop('checked', defaultVal?'checked':false);
1619+
break;
1620+
case ft.list:
1621+
$f.select2('val', null);
1622+
break;
1623+
case ft.pix:
1624+
//var newPix=(defaultVal)?('<img src="'+iconsPath+defaultVal+'" class="img-thumbnail">'):('<p class="">'+Evol.i18n.nopix+'</p>');
1625+
var newPix='<p>'+Evol.i18n.nopix+'</p>';
1626+
$f.val('')
1627+
.prev().remove();
1628+
$f.before(newPix);
1629+
break;
1630+
default:
16301631
$f.val(defaultVal);
1631-
}
1632+
}
16321633
}
16331634
});
16341635
if(subCollecs){

‎dist/evolutility.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎doc/views.html‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ <h1>Views</h1>
7373

7474
<a name="one"></a>
7575
<p class="evo-h-gap">&nbsp;</p>
76-
<p>&nbsp;</p>
7776
<section id="views-one">
7877
<h2>Evol.ViewOne</h2>
7978

@@ -87,7 +86,6 @@ <h2>Evol.ViewOne</h2>
8786

8887
<a name="one-view"></a>
8988
<p class="evo-h-gap">&nbsp;</p>
90-
<p>&nbsp;</p>
9189
<h3><i class="glyphicon glyphicon-file"></i>&nbsp;View</h3>
9290
<p>Shows all fields for viewing (read only). Fields are grouped in panels and tabs.</p>
9391
<code>new Evol.ViewOne.Edit(myConfig);</code>
@@ -99,7 +97,6 @@ <h3><i class="glyphicon glyphicon-file"></i>&nbsp;View</h3>
9997

10098
<a name="one-edit"></a>
10199
<p class="evo-h-gap">&nbsp;</p>
102-
<p>&nbsp;</p>
103100
<h3><i class="glyphicon glyphicon-th"></i>&nbsp;Edit</h3>
104101
<p>Shows all fields for edition. Fields are grouped in panels and tabs.</p>
105102
<code>
@@ -112,7 +109,6 @@ <h3><i class="glyphicon glyphicon-th"></i>&nbsp;Edit</h3>
112109

113110
<a name="one-mini"></a>
114111
<p class="evo-h-gap">&nbsp;</p>
115-
<p>&nbsp;</p>
116112
<h3><i class="glyphicon glyphicon-th-large"></i>&nbsp;Mini (quick-edit)</h3>
117113
<p>Only shows important fields (required or showing as a column in grids) in one panel.</p>
118114
<code>
@@ -124,7 +120,6 @@ <h3><i class="glyphicon glyphicon-th-large"></i>&nbsp;Mini (quick-edit)</h3>
124120

125121
<a name="one-json"></a>
126122
<p class="evo-h-gap">&nbsp;</p>
127-
<p>&nbsp;</p>
128123
<h3><i class="glyphicon glyphicon-barcode"></i>&nbsp;JSON</h3>
129124
<p>JSON representation of the data.</p>
130125
<code>
@@ -138,7 +133,6 @@ <h3><i class="glyphicon glyphicon-barcode"></i>&nbsp;JSON</h3>
138133

139134
<a name="many"></a>
140135
<p class="evo-h-gap">&nbsp;</p>
141-
<p>&nbsp;</p>
142136
<section id="views-many">
143137

144138

@@ -152,7 +146,6 @@ <h2>Evol.ViewMany</h2>
152146
</p>
153147
<a name="many-list"></a>
154148
<p class="evo-h-gap">&nbsp;</p>
155-
<p>&nbsp;</p>
156149
<h3><i class="glyphicon glyphicon-th-list"></i>&nbsp;List</h3>
157150
<p>Gives a tabular view of a collection.</p>
158151
<code>
@@ -163,7 +156,6 @@ <h3><i class="glyphicon glyphicon-th-list"></i>&nbsp;List</h3>
163156

164157
<a name="many-badges"></a>
165158
<p class="evo-h-gap">&nbsp;</p>
166-
<p>&nbsp;</p>
167159
<h3><i class="glyphicon glyphicon-th-large"></i>&nbsp;Badges</h3>
168160
<p>Shows records side by side as badges.</p>
169161
<code>
@@ -175,7 +167,6 @@ <h3><i class="glyphicon glyphicon-th-large"></i>&nbsp;Badges</h3>
175167

176168
<a name="many-charts"></a>
177169
<p class="evo-h-gap">&nbsp;</p>
178-
<p>&nbsp;</p>
179170
<h3><i class="glyphicon glyphicon-stats"></i>&nbsp;Charts</h3>
180171
<p>Draws charts about the collection.</p>
181172
<code>
@@ -189,7 +180,6 @@ <h3><i class="glyphicon glyphicon-stats"></i>&nbsp;Charts</h3>
189180

190181
<a name="action"></a>
191182
<p class="evo-h-gap">&nbsp;</p>
192-
<p>&nbsp;</p>
193183
<section id="views-action">
194184

195185
<h2>Evol.ViewAction</h2>
@@ -203,7 +193,6 @@ <h2>Evol.ViewAction</h2>
203193

204194
<a name="action-filter"></a>
205195
<p class="evo-h-gap">&nbsp;</p>
206-
<p>&nbsp;</p>
207196
<h3><i class="glyphicon glyphicon-filter"></i>&nbsp;Filter</h3>
208197
<p>Filter collection.</p>
209198
<code>
@@ -217,7 +206,6 @@ <h3><i class="glyphicon glyphicon-filter"></i>&nbsp;Filter</h3>
217206

218207
<a name="action-export"></a>
219208
<p class="evo-h-gap">&nbsp;</p>
220-
<p>&nbsp;</p>
221209
<h3><i class="glyphicon glyphicon-cloud-download"></i>&nbsp;Export</h3>
222210
<p>Export in different data formats.</p>
223211
<code>
@@ -235,7 +223,6 @@ <h3><i class="glyphicon glyphicon-cloud-download"></i>&nbsp;Export</h3>
235223

236224
<a name="methods"></a>
237225
<p class="evo-h-gap">&nbsp;</p>
238-
<p>&nbsp;</p>
239226
<section>
240227
<h2>Methods</h2>
241228
<p></p>
@@ -264,7 +251,6 @@ <h3>Evol.ViewMany</h3>
264251

265252
<a name="options"></a>
266253
<p class="evo-h-gap">&nbsp;</p>
267-
<p>&nbsp;</p>
268254
<section>
269255
<h2>Options</h2>
270256

@@ -290,7 +276,6 @@ <h3>Evol.ViewMany</h3>
290276

291277
<a name="events"></a>
292278
<p class="evo-h-gap">&nbsp;</p>
293-
<p>&nbsp;</p>
294279
<section>
295280

296281

0 commit comments

Comments
 (0)