Skip to content

Commit 5c20448

Browse files
committed
Databases management changed. To add new database to framework add new module to db folder and register it in db_modules module.
Added support for mysql. Needs testing.
1 parent 0c3d073 commit 5c20448

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+3334
-3433
lines changed

INSTALL

+1-6
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ To creating a new project:
2626
3. Run server.py and in the browser input http://127.0.0.1:8080/admin.html
2727
in the adress bar. Select your language and specify the project params.
2828

29-
Development process
30-
Run the server.py and the in the browser adress bar input 127.0.0.1:8080 to run
31-
the project and 127.0.0.1:8080/admin.html to work in Administrator.
32-
To imply the changes made in Administrator press F5 to see them in the project.
33-
34-
Please try Demo project in the demo directory.
29+
There is a demo project in the demo directory.
3530

3631

demo/admin.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
<span id="error-info" class="code_error pull-left"></span>
226226
<button type="button" id="cancel-btn" class="btn pull-right"><i class="icon-remove"></i> Cancel<small class="muted">&nbsp;[Esc]</small></button>
227227
<button type="button" id="ok-btn" class="btn pull-right"><i class="icon-ok"></i> OK<small class="muted">&nbsp;[Ctrl+S]</small></button>
228-
<button type="button" id="find-btn" class="btn pull-right"><i class="icon-search"></i> Find in project<small class="muted">&nbsp;[Shift+F]</small></button>
228+
<button type="button" id="find-btn" class="btn pull-right"><i class="icon-search"></i> Find in project<small class="muted">&nbsp;[Alt+F]</small></button>
229229
</div>
230230
</div>
231231

demo/admin.sqlite

18 KB
Binary file not shown.

demo/css/jam.css

+12-38
Original file line numberDiff line numberDiff line change
@@ -186,48 +186,29 @@ h4.title {
186186
margin: 6px 0;
187187
}
188188

189-
/*
190-
.form-horizontal .control-group {
191-
margin-bottom: 10px;
192-
margin-top: 10px;
193-
}
194-
195-
.input-button {
196-
padding: 4px 6px
197-
}
198-
199-
.pager {
200-
padding: 4px;
201-
}
202-
*/
203-
204189
.template {
205190
display: none;
206191
}
207192

208-
/*
209-
.item-btn {
210-
margin: 1px 1px;
211-
width: 100px;
212-
}
213-
214-
.item-btn-with-hint {
215-
margin: 1px 1px;
216-
width: 144px;
217-
}
218-
*/
219-
220193
.inline {
221194
display:inline;
222195
}
223196

224197
.modal.fade {
225-
-webkit-transition: opacity 0.1s linear;
226-
-moz-transition: opacity 0.1s linear;
227-
-o-transition: opacity 0.1s linear;
228-
transition: opacity 0.1s linear;
198+
-webkit-transition: opacity 0.4s linear;
199+
-moz-transition: opacity 0.4s linear;
200+
-o-transition: opacity 0.4s linear;
201+
transition: opacity 0.4s linear;
202+
}
203+
204+
.modal-backdrop,
205+
.modal-backdrop.fade.in{
206+
opacity: 0.2;
207+
filter: alpha(opacity=20);
208+
background: #fff;
229209
}
230210

211+
231212
.inner-table {
232213
outline: none;
233214
}
@@ -265,13 +246,6 @@ h4.title {
265246
background-color: #b4e3fa;
266247
}
267248

268-
.modal-backdrop,
269-
.modal-backdrop.fade.in{
270-
opacity: 0.2;
271-
filter: alpha(opacity=20);
272-
background: #fff;
273-
}
274-
275249
.table th{
276250
color:#7F7F7F;
277251
}

demo/demo.sqlite

0 Bytes
Binary file not shown.

demo/index.html

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
11
<!DOCTYPE html>
22
<html lang="__$_lang_$__">
3-
<head>
3+
<head>
44
<meta charset="utf-8">
55
<title>Demo</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<link rel="icon" href="/img/j.png" type="image/png">
88

99
<link href="/css/bootstrap.css" rel="stylesheet">
10-
<!--
11-
<link href="/css/bootstrap_flatly.css" rel="stylesheet">
12-
-->
1310
<link href="/css/bootstrap-responsive.css" rel="stylesheet">
1411
<link href="/css/bootstrap-modal.css" rel="stylesheet">
1512
<link href="/css/datepicker.css" rel="stylesheet">
1613
<link href="/css/jam.css" rel="stylesheet">
17-
<!--
18-
<link href="/css/flatly.css" rel="stylesheet">
19-
-->
2014
</head>
2115

2216
<body>

0 commit comments

Comments
 (0)