Skip to content

Commit

Permalink
Databases management changed. To add new database to framework add ne…
Browse files Browse the repository at this point in the history
…w module to db folder and register it in db_modules module.

Added support for mysql. Needs testing.
  • Loading branch information
jam-py committed Aug 3, 2015
1 parent 0c3d073 commit 5c20448
Show file tree
Hide file tree
Showing 46 changed files with 3,334 additions and 3,433 deletions.
7 changes: 1 addition & 6 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ To creating a new project:
3. Run server.py and in the browser input http://127.0.0.1:8080/admin.html
in the adress bar. Select your language and specify the project params.

Development process
Run the server.py and the in the browser adress bar input 127.0.0.1:8080 to run
the project and 127.0.0.1:8080/admin.html to work in Administrator.
To imply the changes made in Administrator press F5 to see them in the project.

Please try Demo project in the demo directory.
There is a demo project in the demo directory.


2 changes: 1 addition & 1 deletion demo/admin.html
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
<span id="error-info" class="code_error pull-left"></span>
<button type="button" id="cancel-btn" class="btn pull-right"><i class="icon-remove"></i> Cancel<small class="muted">&nbsp;[Esc]</small></button>
<button type="button" id="ok-btn" class="btn pull-right"><i class="icon-ok"></i> OK<small class="muted">&nbsp;[Ctrl+S]</small></button>
<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>
<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>
</div>
</div>

Expand Down
Binary file modified demo/admin.sqlite
Binary file not shown.
50 changes: 12 additions & 38 deletions demo/css/jam.css
Original file line number Diff line number Diff line change
Expand Up @@ -186,48 +186,29 @@ h4.title {
margin: 6px 0;
}

/*
.form-horizontal .control-group {
margin-bottom: 10px;
margin-top: 10px;
}
.input-button {
padding: 4px 6px
}
.pager {
padding: 4px;
}
*/

.template {
display: none;
}

/*
.item-btn {
margin: 1px 1px;
width: 100px;
}
.item-btn-with-hint {
margin: 1px 1px;
width: 144px;
}
*/

.inline {
display:inline;
}

.modal.fade {
-webkit-transition: opacity 0.1s linear;
-moz-transition: opacity 0.1s linear;
-o-transition: opacity 0.1s linear;
transition: opacity 0.1s linear;
-webkit-transition: opacity 0.4s linear;
-moz-transition: opacity 0.4s linear;
-o-transition: opacity 0.4s linear;
transition: opacity 0.4s linear;
}

.modal-backdrop,
.modal-backdrop.fade.in{
opacity: 0.2;
filter: alpha(opacity=20);
background: #fff;
}


.inner-table {
outline: none;
}
Expand Down Expand Up @@ -265,13 +246,6 @@ h4.title {
background-color: #b4e3fa;
}

.modal-backdrop,
.modal-backdrop.fade.in{
opacity: 0.2;
filter: alpha(opacity=20);
background: #fff;
}

.table th{
color:#7F7F7F;
}
Expand Down
Binary file modified demo/demo.sqlite
Binary file not shown.
8 changes: 1 addition & 7 deletions demo/index.html
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
<!DOCTYPE html>
<html lang="__$_lang_$__">
<head>
<head>
<meta charset="utf-8">
<title>Demo</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="icon" href="/img/j.png" type="image/png">

<link href="/css/bootstrap.css" rel="stylesheet">
<!--
<link href="/css/bootstrap_flatly.css" rel="stylesheet">
-->
<link href="/css/bootstrap-responsive.css" rel="stylesheet">
<link href="/css/bootstrap-modal.css" rel="stylesheet">
<link href="/css/datepicker.css" rel="stylesheet">
<link href="/css/jam.css" rel="stylesheet">
<!--
<link href="/css/flatly.css" rel="stylesheet">
-->
</head>

<body>
Expand Down
Loading

0 comments on commit 5c20448

Please sign in to comment.