Permalink
Browse files

1

  • Loading branch information...
1 parent b567216 commit 3dc45feb63f727d317ffcda97903737fc615277b @int13h committed May 25, 2011
Showing with 35 additions and 36 deletions.
  1. +8 −15 .css/squert.css
  2. +1 −0 .css/tabs.css
  3. +1 −0 .gitignore
  4. +1 −1 .inc/map.php
  5. +10 −8 .inc/settings.php
  6. +6 −10 .inc/squert.php
  7. +1 −0 CHANGELOG.md
  8. +7 −2 p-login.php
View
@@ -1,23 +1,24 @@
-div, td, th, h2, h3, h4 {font-family: verdana,sans-serif; font-size: x-small; voice-family: "\"}\""; voice-family: inherit; font-size: small; color: #333;}
+div, td, th {font-family: verdana,sans-serif; font-size: x-small; voice-family: "\"}\""; voice-family: inherit; font-size: small; color: #333;}
body {background: #d8d8d8; font-family: verdana, trebuchet ms, helvetica, sans; color: #000000; padding: 1em 20px 3em 20px; margin: 0;}
div {font-size: .7em;}
html {overflow-y: scroll;}
table {empty-cells: show;}
-th.sort {background: #c9c9c9; color: #000000; padding: 8px 5px 8px 5px;cursor: pointer; font-size: 10px;text-align: left;}
-th.sorttable_nosort {background: #c9c9c9; border: none; color: #000000; padding: 0px 5px 8px 0px;}
+th.sort {background: #000000; color: #ffffff; padding: 8px 5px 8px 5px;cursor: pointer; font-size: 10px;text-align: left;}
+th.tros {background: #000000; color: #ffffff; padding: 8px 5px 8px 5px; font-size: 10px;text-align: left; border-bottom: 1pt solid gray;}
+th.sorttable_nosort {background: #000000; border: none; color: #ffffff; padding: 0px 5px 8px 0px;}
td.sort {background: transparent; border: 1pt solid #c4c4c4; border-top: none; border-right: none; color: #000000; padding: 3px 5px 3px 5px; font-size: 10px;}
td.sort:hover {background: #e9e9e9; text-decoration: underline; cursor:pointer;}
td.tros {background: transparent; border: 1pt solid #c4c4c4; border-top: none; border-right: none; color: #000000; padding: 3px 5px 3px 5px; font-size: 10px;}
-td.cmenu {margin: 0;background-color: #f4f4f4;padding: 2px 10px 2px 10px;font-size: 11px; border-bottom: 1pt dotted #c4c4c4;}
+td.cmenu {margin: 0;background-color: #fafafa;padding: 2px 10px 2px 10px;font-size: 11px; border-bottom: 1pt dotted #c4c4c4;}
td.cmenu:hover {background: #e9e9e9;text-decoration: underline; cursor:pointer;}
-td.unemc {margin: 0;background-color: #f4f4f4;padding: 2px 10px 2px 10px;font-size: 11px; border-bottom: 1pt dotted #c4c4c4;}
+td.unemc {margin: 0;background-color: #fafafa;padding: 2px 10px 2px 10px;font-size: 11px; border-bottom: 1pt dotted #c4c4c4;}
tr.lines:hover {background: #e9e9e9;}
-tr.lines {background: #f4f4f4;}
+tr.lines {background: #fafafa;}
td.msg {padding: 5px; background: #e9e9e9; font-size: .8em; color: #000000;}
@@ -50,15 +51,7 @@ td.datafill {font-family: verdana;font-size: 11px;text-align: center;background-
td.dataleft {font-family: verdana;font-size: 11px;background-color: #f4f4f4;border: 1pt solid black;border-bottom:none;}
.input {font-size: 10px; border: 1pt solid #c4c4c4; background: #f4f4f4;}
-.rb {
- background: #c9c9c9;
- color: #000000;
- border: 1pt solid gray;
- font-size: 12px;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- width: 75;
-}
+.rb {background: #c9c9c9; color: #000000; border: 1pt solid #545454; font-size: 10px; -webkit-border-radius: 5px; -moz-border-radius: 5px;}
.rb:hover {background: #FFFFFF;}
.round {-webkit-border-radius: 5px;-moz-border-radius: 5px;}
.round_top {-moz-border-radius-topright: 4px;-moz-border-radius-topleft: 4px;-webkit-border-top-right-radius: 4px;-webkit-border-top-left-radius: 4px;}
View
@@ -79,6 +79,7 @@ div.page{
background: #000000;
color: #f4f4f4;
border-bottom: none;
+ font-weight: bold;
-moz-border-radius-topright: 5px;
-moz-border-radius-topleft: 5px;
-webkit-border-top-left-radius: 5px;
View
@@ -1 +1,2 @@
config.php
+images
View
@@ -101,7 +101,7 @@ function doWorld($sccQuery,$dccQuery) {
\r<tr>
\r<td style=\"font-size: .8em;\" align=center colspan=2><b>Event Distribution by Country</b></td>
\r</tr><tr>
- \r<td align=center colspan=2><canvas class=round style=\"border: 1pt solid gray;\" id=\"wm1\" width=\"980\" height=\"500\">[No canvas support]></canvas></td>
+ \r<td align=center colspan=2><canvas class=round style=\"border: 1pt solid gray;\" id=\"wm1\" width=\"950\" height=\"500\">[No canvas support]></canvas></td>
\r</tr>
\r</table>
\r</center>";
View
@@ -27,20 +27,22 @@ function getUser() {
\r<td class=tros width=20%>$sEmail</td>
\r<td class=tros width=20%>$sType</td>
\r<td class=tros width=20%>$sTime</td>
+ \r<td class=tros width=20%><a href=\"#\">edit</a></td>
\r</tr>";
}
?>
<form id=options method=post action=".inc/settings.php">
-<table class=table width=100% cellpadding=1 cellspacing=0>
-<tr><td colspan=4 style="background: #000000; color: #ffffff; padding: 5px; font-weight: bold;">
-User Account(s)
-</td></tr>
+<table width=100% cellpadding=1 cellspacing=0 style="border: 1pt solid gray;">
+<thead>
+<tr><th class=tros colspan=5><h3>User Account(s)</h3></th></tr>
<tr>
-<th class=sort width=20%>Username</td>
-<th class=sort width=20%>Email</td>
-<th class=sort width=20%>Account Type</td>
-<th class=sort width=20%>Session Timeout</td>
+<th class=sort width=20%>Username</th>
+<th class=sort width=20%>Email</th>
+<th class=sort width=20%>Account Type</th>
+<th class=sort width=20%>Session Timeout</th>
+<th class=sort width=20%>Modify</th>
</tr>
+</thead>
<?php getUser();?>
</table>
View
@@ -692,11 +692,7 @@ function getFilter($index,$theString,$theStatus,$theSID) {
<form id=squert method=post action="p-query.php?id=<?php echo $id;?>">
-<center>
-<iframe id=settings name=settings src=.inc/settings.php?qp=$qp width=970 height=200 frameborder=0 scrolling=no style="display: none;"></iframe>
-</center>
-
-<table width=100% id=controls border=0 align=center cellpadding=1 cellspacing=0">
+<table width=100% id=controls border=0 align=center cellpadding=1 cellspacing=0>
<tr>
<td align=right colspan=2 style="padding-left: 20px; font-size: 10px;"><b>WHERE: </b><?php qButtons('wType');?>
<?php
@@ -829,12 +825,12 @@ function getFilter($index,$theString,$theStatus,$theSID) {
<br>
-<table cellpadding=0 cellspacing=0 id=divContext style="background: #f4f4f4;border: 1pt solid gray; border-collapse: collapse; display: none; position: absolute;">
+<table cellpadding=0 cellspacing=0 id=divContext style="background: #fafafa; border: 1pt solid gray; border-collapse: collapse; display: none; position: absolute;">
<tr>
-<td style="font-size: 10px; background: #c4c4c4; color: #000000; padding: 5px 5px 2px 10px; border-bottom: 1pt solid gray;"><b>Actions</b></td>
-<td align=right style="font-size: 10px; background: #c4c4c4; color: #000000; padding: 5px 5px 2px 10px; border-bottom: 1pt solid gray;">
-<input class=rb style="border: 1pt solid gray; font-size: .8em; font-family: verdana; width: 30px;" id=cmtop type=button onClick="CloseContext(); self.scrollTo(0,0);" value=up>
-<input class=rb style="border: 1pt solid gray; font-size: .8em; font-family: verdana; width: 30px;" type=button value=X onClick="CloseContext()"></td></tr>
+<td style="font-size: 10px; background: #000000; color: #ffffff; padding: 7px 5px 7px 10px; border-bottom: 1pt solid gray;"><b>Actions</b></td>
+<td align=right style="font-size: 10px; background: #000000; color: #ffffff; padding: 7px 5px 7px 10px; border-bottom: 1pt solid gray;">
+<input class=rb style="font-size: .8em; font-family: verdana; width: 30px;" id=cmtop type=button onClick="CloseContext(); self.scrollTo(0,0);" value=up>
+<input class=rb style="font-size: .8em; font-family: verdana; width: 30px;" type=button value=X onClick="CloseContext()"></td></tr>
</td>
</tr>
<tr>
View
@@ -1,6 +1,7 @@
# Squert 0.9.0
* tabbed interface
+* AND clause now accepts more than one object
* CSS/JS fixes and cleanup
View
@@ -151,8 +151,12 @@ function cleanUp($string) {
font-size: .7em;
margin: 0 auto;
width: 450px;
- text-align: right;
color: #545454;
+ padding-left: 10px;
+}
+.cp span {
+ float: right;
+ padding-right: 10px;
}
</style>
</head>
@@ -171,7 +175,8 @@ function cleanUp($string) {
<tr><td class=boxes>
<input id=logmein name=logmein class=rb type=submit name=login value=submit><br><br></td>
<td class=err><?php echo $err;?></td></tr>
-</table><div class=cp>&copy;2011 Paul Halliday</div>
+</table>
+<div class=cp>Version 0.9.0<span>&copy;2011 Paul Halliday</span></div>
</form>
<script type="text/javascript">document.credcheck.<?php echo $focus;?>.focus();</script>
</body>

0 comments on commit 3dc45fe

Please sign in to comment.