Skip to content

Commit a784221

Browse files
evoluteurevoluteur
committed
Moved "ui-models" directory to the project's root.
1 parent bf3e930 commit a784221

18 files changed

+25
-30
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
node_modules
22
bower_components
33
js/dependencies.js
4-
js/ui-models/doc/
54
dist/dependencies.js
65
js/models
76
*-nogit

‎Gruntfile.js‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ module.exports = function (grunt) {
103103
},
104104
src: [
105105
//"demo/demo.js",
106-
//"js/ui-models/apps/todo.js",
107-
"js/ui-models/apps/todo.data.js",
108-
//"js/ui-models/apps/contacts.js",
109-
"js/ui-models/apps/contacts.data.js",
110-
//"js/ui-models/apps/winecellar.js",
111-
"js/ui-models/apps/winecellar.data.js",
112-
//"js/ui-models/apps/comics.js",
113-
"js/ui-models/apps/comics.data.js"
106+
//"ui-models/todo.js",
107+
"ui-models/todo.data.js",
108+
//"ui-models/contacts.js",
109+
"ui-models/contacts.data.js",
110+
//"ui-models/winecellar.js",
111+
"ui-models/winecellar.data.js",
112+
//"ui-models/comics.js",
113+
"ui-models/comics.data.js"
114114
],
115115
dest: 'demo/demo-data.js'
116116
}
@@ -167,11 +167,7 @@ module.exports = function (grunt) {
167167
'js/toolbar.js',
168168

169169
// --- ui models ---
170-
'js/ui-models/apps/*.js',
171-
'js/ui-models/test/*.js',
172-
173-
// --- testing stuff ---
174-
'!*-nogit.js'
170+
'ui-models/*.js'
175171

176172
]
177173
},

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,10 +283,10 @@ var uiModels_comics = {
283283
See [UI-Model documentation](http://evoluteur.github.io/evolutility/doc/ui-model.html) for the UI vocabulary available (structure of UI-models or metamodel).
284284

285285
UI-Models for the demo apps:
286-
[To Do list](http://github.com/evoluteur/evolutility/blob/master/js/ui-models/apps/todo.js),
287-
[AddressBook](http://github.com/evoluteur/evolutility/blob/master/js/ui-models/apps/contacts.js),
288-
[Wine Cellar](http://github.com/evoluteur/evolutility/blob/master/js/ui-models/apps/winecellar.js),
289-
[Graphic Novels](http://github.com/evoluteur/evolutility/blob/master/js/ui-models/apps/comics.js).
286+
[To Do list](http://github.com/evoluteur/evolutility/blob/master/ui-models/todo.js),
287+
[AddressBook](http://github.com/evoluteur/evolutility/blob/master/ui-models/contacts.js),
288+
[Wine Cellar](http://github.com/evoluteur/evolutility/blob/master/ui-models/winecellar.js),
289+
[Graphic Novels](http://github.com/evoluteur/evolutility/blob/master/ui-models/comics.js).
290290

291291
With Evolutility, a single UI-model defines a full single page applications (SPA) to view, edit, filter and export a Backbone.js model or collection.
292292

‎demo/custom-app.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<script src="../dist/evolutility.min.js" type="text/javascript"></script>
1717
<script src="demo.js" type="text/javascript"></script>
1818
<script src="demo-data.min.js" type="text/javascript"></script>
19-
<script src="../js/ui-models/apps/todo.js" type="text/javascript"></script>
19+
<script src="../ui-models/todo.js" type="text/javascript"></script>
2020

2121
<title id="headTitle">Evolutility Demo</title>
2222
</head>

‎demo/index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
<script src="demo.js" type="text/javascript"></script>
1616
<script src="demo-data.min.js" type="text/javascript"></script>
17-
<script src="../js/ui-models/apps/contacts.js" type="text/javascript"></script>
18-
<script src="../js/ui-models/apps/todo.js" type="text/javascript"></script>
19-
<script src="../js/ui-models/apps/winecellar.js" type="text/javascript"></script>
20-
<script src="../js/ui-models/apps/comics.js" type="text/javascript"></script>
17+
<script src="../ui-models/contacts.js" type="text/javascript"></script>
18+
<script src="../ui-models/todo.js" type="text/javascript"></script>
19+
<script src="../ui-models/winecellar.js" type="text/javascript"></script>
20+
<script src="../ui-models/comics.js" type="text/javascript"></script>
2121
<script src="../dist/dependencies.min.js" type="text/javascript"></script>
2222
<script src="../dist/evolutility.js" type="text/javascript"></script>
2323

‎demo/test.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
<script src="../dist/dependencies.min.js" type="text/javascript"></script>
1515
<script src="demo.js" type="text/javascript"></script>
16-
<script src="../js/ui-models/apps/test.data.js" type="text/javascript"></script>
17-
<script src="../js/ui-models/apps/test.js" type="text/javascript"></script>
16+
<script src="../ui-models/test.data.js" type="text/javascript"></script>
17+
<script src="../ui-models/test.js" type="text/javascript"></script>
1818
<script src="../dist/evolutility.js" type="text/javascript"></script>
1919

2020
<title id="headTitle">Test :: Evolutility</title>

‎doc/ui-model.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ <h1>Sample UI-model</h1>
694694

695695
<p>See below the UI-model for the "todo app" in <a href="../demo/index.html#todo">Evolutility demo</a>.</p>
696696

697-
<iframe style="width:100%;height:300px" src="../js/ui-models/apps/todo.js"></iframe>
697+
<iframe style="width:100%;height:300px" src="../ui-models/todo.js"></iframe>
698698

699699

700700
</section>

‎index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515

1616
<script src="demo/demo.js" type="text/javascript"></script>
1717
<script src="demo/demo-data.min.js" type="text/javascript"></script>
18-
<script src="js/ui-models/apps/contacts.js" type="text/javascript"></script>
19-
<script src="js/ui-models/apps/todo.js" type="text/javascript"></script>
20-
<script src="js/ui-models/apps/winecellar.js" type="text/javascript"></script>
21-
<script src="js/ui-models/apps/comics.js" type="text/javascript"></script>
18+
<script src="ui-models/contacts.js" type="text/javascript"></script>
19+
<script src="ui-models/todo.js" type="text/javascript"></script>
20+
<script src="ui-models/winecellar.js" type="text/javascript"></script>
21+
<script src="ui-models/comics.js" type="text/javascript"></script>
2222
<script src="dist/dependencies.min.js" type="text/javascript"></script>
2323
<script src="dist/evolutility.min.js" type="text/javascript"></script>
2424
</head>

‎js/ui-models/apps/comics.data.js‎ renamed to ‎ui-models/comics.data.js‎

File renamed without changes.

‎js/ui-models/apps/comics.js‎ renamed to ‎ui-models/comics.js‎

File renamed without changes.

0 commit comments

Comments
 (0)