Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replaces small "Throbber" icon with a full page loading overlay. #299

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added images/loading.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
107 changes: 46 additions & 61 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,83 +6,71 @@
-->
<html>
<head>
<title>WWW SQL Designer</title>
<meta name="viewport" content="initial-scale=1,maximum-scale=1" />
<meta charset="utf-8" />
<link rel="stylesheet" title="material-inspired" href="styles/material-inspired.css" media="all" />
<link rel="alternate stylesheet" title="original" href="styles/original.css" media="all" />
<!--[if IE 6]><link rel="stylesheet" type="text/css" href="styles/ie6.css" /><![endif]-->
<!--[if IE 7]><link rel="stylesheet" type="text/css" href="styles/ie7.css" /><![endif]-->
<link rel="stylesheet" href="styles/print.css" type="text/css" media="print" />
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/dropbox.js/0.10.2/dropbox.min.js"></script>
<title>WWW SQL Designer</title>
<meta name="viewport" content="initial-scale=1,maximum-scale=1" />
<meta charset="utf-8" />
<link rel="stylesheet" title="material-inspired" href="styles/material-inspired.css" media="all" />
<link rel="alternate stylesheet" title="original" href="styles/original.css" media="all" />
<!--[if IE 6]><link rel="stylesheet" type="text/css" href="styles/ie6.css" /><![endif]-->
<!--[if IE 7]><link rel="stylesheet" type="text/css" href="styles/ie7.css" /><![endif]-->
<link rel="stylesheet" href="styles/print.css" type="text/css" media="print" />
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/dropbox.js/0.10.2/dropbox.min.js"></script>

<script src="js/oz.js"></script>
<script src="js/config.js"></script>
<script src="js/globals.js"></script>
<script src="js/visual.js"></script>
<script src="js/row.js"></script>
<script src="js/table.js"></script>
<script src="js/relation.js"></script>
<script src="js/key.js"></script>
<script src="js/rubberband.js"></script>
<script src="js/map.js"></script>
<script src="js/toggle.js"></script>
<script src="js/io.js"></script>
<script src="js/tablemanager.js"></script>
<script src="js/rowmanager.js"></script>
<script src="js/keymanager.js"></script>
<script src="js/window.js"></script>
<script src="js/options.js"></script>
<script src="js/wwwsqldesigner.js"></script>
<script src="js/oz.js"></script>
<script src="js/config.js"></script>
<script src="js/globals.js"></script>
<script src="js/visual.js"></script>
<script src="js/row.js"></script>
<script src="js/table.js"></script>
<script src="js/relation.js"></script>
<script src="js/key.js"></script>
<script src="js/rubberband.js"></script>
<script src="js/map.js"></script>
<script src="js/toggle.js"></script>
<script src="js/io.js"></script>
<script src="js/tablemanager.js"></script>
<script src="js/rowmanager.js"></script>
<script src="js/keymanager.js"></script>
<script src="js/window.js"></script>
<script src="js/options.js"></script>
<script src="js/wwwsqldesigner.js"></script>
</head>

<body>
<div id="area"></div>

<div id="controls">
<div id="bar">
<div id="toggle"></div>
<input type="button" id="saveload" />

<hr/>

<input type="button" id="addtable" />
<input type="button" id="edittable" />
<input type="button" id="tablekeys" />
<input type="button" id="removetable" />
<input type="button" id="aligntables" />
<input type="button" id="cleartables" />

<hr/>

<input type="button" id="addrow" />
<input type="button" id="editrow" />
<input type="button" id="uprow" class="small" /><input type="button" id="downrow" class="small"/>
<input type="button" id="foreigncreate" />
<input type="button" id="foreignconnect" />
<input type="button" id="foreigndisconnect" />
<input type="button" id="removerow" />

<hr/>

<input type="button" id="options" />
<a href="https://github.com/ondras/wwwsqldesigner/wiki" target="_blank"><input type="button" id="docs" value="" /></a>
</div>

<div id="rubberband"></div>

<div id="minimap"></div>

<div id="background"></div>

<div id="window">
<div id="windowtitle"><img id="throbber" src="images/throbber.gif" alt="" title=""/></div>
<div id="windowtitle"></div>
<div id="windowcontent"></div>
<input type="button" id="windowok" />
<input type="button" id="windowcancel" />
</div>
</div> <!-- #controls -->

<div id="opts">
<table>
<tbody>
Expand All @@ -96,15 +84,15 @@
</tr>
<tr>
<td>
* <label id="db" for="optiondb"></label>
* <label id="db" for="optiondb"></label>
</td>
<td>
<select id="optiondb"><option></option></select>
</td>
</tr>
<tr>
<td>
<label id="snap" for="optionsnap"></label>
<label id="snap" for="optionsnap"></label>
</td>
<td>
<input type="text" size="4" id="optionsnap" />
Expand All @@ -113,7 +101,7 @@
</tr>
<tr>
<td>
<label id="pattern" for="optionpattern"></label>
<label id="pattern" for="optionpattern"></label>
</td>
<td>
<input type="text" size="6" id="optionpattern" />
Expand All @@ -130,44 +118,41 @@
</tr>
<tr>
<td>
<label id="hide" for="optionhide"></label>
<label id="hide" for="optionhide"></label>
</td>
<td>
<input type="checkbox" id="optionhide" />
</td>
</tr>
<tr>
<td>
* <label id="vector" for="optionvector"></label>
* <label id="vector" for="optionvector"></label>
</td>
<td>
<input type="checkbox" id="optionvector" />
</td>
</tr>
<tr>
<td>
* <label id="showsize" for="optionshowsize"></label>
* <label id="showsize" for="optionshowsize"></label>
</td>
<td>
<input type="checkbox" id="optionshowsize" />
</td>
</tr>
<tr>
<td>
* <label id="showtype" for="optionshowtype"></label>
* <label id="showtype" for="optionshowtype"></label>
</td>
<td>
<input type="checkbox" id="optionshowtype" />
</td>
</tr>
</tbody>
</table>

<hr />

* <span class="small" id="optionsnotice"></span>
</div>

<div id="io">
<table>
<tbody>
Expand All @@ -176,7 +161,7 @@
<fieldset>
<legend id="client"></legend>
<div id="singlerow">
<input type="button" id="clientsave" />
<input type="button" id="clientsave" />
<input type="button" id="clientload" />
</div>
<div id="singlerow">
Expand All @@ -198,11 +183,11 @@
<legend id="server"></legend>
<label for="backend" id="backendlabel"></label> <select id="backend"><option></option></select>
<hr/>
<input type="button" id="serversave" />
<input type="button" id="quicksave" />
<input type="button" id="serverload" />
<input type="button" id="serverlist" />
<input type="button" id="serverimport" />
<input type="button" id="serversave" />
<input type="button" id="quicksave" />
<input type="button" id="serverload" />
<input type="button" id="serverlist" />
<input type="button" id="serverimport" />
</fieldset>
</td>
</tr>
Expand All @@ -217,10 +202,9 @@
</tbody>
</table>
</div>

<div id="keys">
<fieldset>
<legend id="keyslistlabel"></legend>
<legend id="keyslistlabel"></legend>
<select id="keyslist"><option></option></select>
<input type="button" id="keyadd" />
<input type="button" id="keyremove" />
Expand Down Expand Up @@ -261,7 +245,6 @@
</table>
</fieldset>
</div>

<div id="table">
<table>
<tbody>
Expand All @@ -275,7 +258,7 @@
</tr>
<tr>
<td>
<label id="tablecommentlabel" for="tablecomment"></label>
<label id="tablecommentlabel" for="tablecomment"></label>
</td>
<td>
<textarea rows="5" cols="40" id="tablecomment"></textarea>
Expand All @@ -284,7 +267,9 @@
</tbody>
</table>
</div>

<div id="loading">
<img src="images/loading.gif" alt="" />
</div>
<script type="text/javascript">
var d = new SQL.Designer();
</script>
Expand Down
36 changes: 29 additions & 7 deletions styles/material-inspired.css
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,9 @@ label {
opacity: 0.7;
}

label, input, select {
label,
input,
select {
vertical-align: middle;
}

Expand Down Expand Up @@ -416,7 +418,8 @@ label, input, select {
overflow: hidden;
}

#tablename, #tablecomment {
#tablename,
#tablecomment {
margin-bottom: 10px;
}

Expand Down Expand Up @@ -445,14 +448,31 @@ label, input, select {
color: #FF4081;
}

#windowok, #windowcancel {
#windowok,
#windowcancel {
float: right;
}

#windowok:hover, #windowcancel:hover {
#windowok:hover,
#windowcancel:hover {
background-color: #f2f2f2;
}

#loading {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
background: rgba(255,255,255,0.6);
}
#loading img {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%,-50%);
}

#throbber {
position: absolute;
top: 2px;
Expand Down Expand Up @@ -578,18 +598,20 @@ label, input, select {
box-shadow: 0 0 2px rgba(0, 0, 0, .12), 0 2px 2px rgba(0, 0, 0, .2);
}

#keyleft, #keyright {
#keyleft,
#keyright {
height: auto;
line-height: normal;
box-shadow: none;
padding: 3px;
box-shadow: 0 0 2px rgba(0, 0, 0, .12), 0 2px 2px rgba(0, 0, 0, .2);
}

#keyfields, #keyavail {
#keyfields,
#keyavail {
height: auto;
background-image: none;
font-size: small;
border: 1px solid rgba(0, 0, 0, .26);
padding: 0px;
}
}
15 changes: 15 additions & 0 deletions styles/original.css
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,21 @@ label, input, select {
vertical-align: middle;
}

#loading {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
background: rgba(255,255,255,0.6);
}
#loading img {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%,-50%);
}

#throbber {
position: absolute;
top: 2px;
Expand Down