Skip to content

Commit

Permalink
Version 1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@int13h
int13h committed Aug 21, 2013
1 parent 9ac0842 commit 706aaf5
Show file tree
Hide file tree
Showing 10 changed files with 362 additions and 183 deletions.
45 changes: 38 additions & 7 deletions .css/cal.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ font-weight:bold;
.cog {
width:30px;
text-align:center;
padding:2px 0px 2px 0px;
padding:4px 0px 4px 0px;
background-color:#e9e9e9;
}
.cog:hover {
img.lr:hover {
cursor:pointer;
background-color:#fff;
opacity:.6;
}
.month {
background-color:#000;
Expand Down Expand Up @@ -107,10 +107,11 @@ font-weight:normal;
font-size:10px;
font-weight:bold;
color:#666;
margin-top:-2px;
border-bottom:2pt solid #c9c9c9;
background-color:#f4f4f4;
padding:3px;
border:1pt solid #000;
border-left:none;
border-right:none;
background-color:#e9e9e9;
padding:9px 0px 9px 0px;
}
.dt_content {
text-align:right;
Expand All @@ -131,3 +132,33 @@ font-size:10px;
text-align:center;
vertical-align:middle;
}
.dt_reset,.dt_update {
float:right;
font-size:11px;
font-weight:normal;
text-align:center;
margin-right:5px;
border:1pt solid #c9c9c9;
border-radius:2px;
width:65px;
padding:2px;
background-color:#fafafa;
color:#666;
}
.dt_update {
background-color:#000;
color:#fff;
}
.dt_reset {
background-color:#000;
color:#fff;
}
.dt_reset:hover,.dt_update:hover {
cursor:pointer;
text-decoration:underline;
}
.dt_error{
display:none;
color:#cc0000;
padding-right:20px;
}
Binary file added .css/lr.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .css/pi.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .css/po.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
117 changes: 68 additions & 49 deletions .css/squert.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,19 @@ overflow-y:scroll;
table {
empty-cells:show;
}
div.timeline {
margin-left:10px;
margin-bottom:5px;
color:#737373;
font-size:11px;
}
span.tl {
font-weight:bold;
}
span.fl {
font-weight:bold;
margin-left:20px;
}
div.lr {
}
div.content-left {
Expand Down Expand Up @@ -69,14 +82,21 @@ width:100%;
float:left;
text-align:left;
padding-bottom:10px;
padding-left:5px;
clear:right;
padding-top:5px;
}
span.ec_label {
font-weight:bold;
text-decoration:underline;
padding-left:5px;
clear:right;
}
div.event_cont {
width:100%
img.pop {
margin-left:5px;
margin-top:3px
}
img.pop:hover {
opacity:.5;
cursor:pointer;
}
div.value {
font-size:11px;
Expand Down Expand Up @@ -116,6 +136,21 @@ width:100%;
height:100%;
float:left;
clear:right;
color:#666;
font-size:11px;
}
div.h_box_o {
padding:10px;
position:fixed;
top:150px;
left:240px;
height:510px;
width:920px;
background-color:#f4f4f4;
border-radius:3px;
border:1pt solid #000;
opacity:.9;
z-index:70;
}
span.h_item{
font-size:11px;
Expand All @@ -127,7 +162,6 @@ margin-bottom:5px;
margin-right:2px;
display:inline-block;
}

div.cat_box {
position:fixed;
bottom:0px;
Expand Down Expand Up @@ -171,7 +205,7 @@ font-weight:normal;
font-size:9px;
margin-left:5px;
}
div.cm_top {
div.cm_top,div.fltr_top {
float:left;
padding:10px;
position:fixed;
Expand All @@ -180,13 +214,7 @@ color:#fff;
width:900px;
text-align:right;
}
div.cm_tbl {
overflow:auto;
margin-top:50px;
padding:10px;
height:430px;
}
div.cat_msg {
div.cat_msg,div.fltr_box {
position:fixed;
top:150px;
left:240px;
Expand All @@ -198,6 +226,12 @@ border:1pt solid #000;
display:none;
z-index:30;
}
div.cm_tbl,div.fltr_tbl {
overflow:auto;
margin-top:50px;
padding:10px;
height:430px;
}
div.tof {
font-weight:bold;
text-align:center;
Expand Down Expand Up @@ -637,6 +671,7 @@ div.b_tray {
text-align:left;
float:left;
margin-top:4px;
width:200px;
}
.loader {
margin-left:15px;
Expand All @@ -647,10 +682,9 @@ padding-left:10px;
vertical-align:middle;
}
div.b_class {
text-align:left;
text-align:center;
float:left;
margin-top:4px;
margin-right:10px;
}
span.class_msg {
color:#000;
Expand Down Expand Up @@ -1042,28 +1076,22 @@ background-color:#e9e9e9;
color:gray;
width:40px;
}

table.padded {
border:1pt solid #c9c9c9;
border-bottom:none;
border:2pt solid #c9c9c9;
display:none;
}

tr.h_row {
background-color:#FFFFE0;
}

tr.f_row:hover {
background-color:#f4f4f4;
}

td.f_row {
border-bottom:1pt solid gray;
background-color:#c4c4c4;
font-size:12px;
padding:10px;
}

.sensor_show {
font-weight:400;
text-align:center;
Expand All @@ -1081,7 +1109,7 @@ width:50px;
border:1pt solid #185FAB;
}

.filter_show, .menu {
.button {
font-weight:400;
text-align:center;
border-radius:2px;
Expand All @@ -1094,6 +1122,8 @@ padding:2px;
background-color:#185FAB;
color:#ffffff;
height:13px;
width:60px;
border:1pt solid #185FAB;
}

.menu_rt {
Expand All @@ -1107,21 +1137,9 @@ color:#ffffff;
width:25px;
border: 1pt solid #cc0000;
}

.filter_show {
width:50px;
border:1pt solid #185FAB;
}

.menu {
width:95px;
border:1pt solid #185FAB;
}

.sensor_show:hover, .filter_show:hover, .menu:hover {
.sensor_show:hover,.button:hover {
background-color:#2C77C7;
}

.filter_edit,.filter_update,.filter_remove {
float:right;
font-weight:400;
Expand All @@ -1134,39 +1152,40 @@ width:40px;
cursor:pointer;
padding:5px 0;
}

.filter_edit {
background-color:#e9e9e9;
color:#000;
border:1pt solid #c9c9c9;
}

.filter_update {
background-color:green;
color:#fff;
margin-left:10px;
}

div.cat_msg_add:hover,.filter_close:hover,.filter_new:hover,.filter_refresh:hover,.filter_edit:hover,.filter_update:hover,.filter_remove:hover {
div.cat_msg_add:hover,.filter_help:hover,.cat_close,.filter_close:hover,.filter_new:hover,.filter_refresh:hover,.filter_edit:hover,.filter_update:hover,.filter_remove:hover {
background-color:#fff;
color:#000;
cursor:pointer;
}

.filter_new,.filter_refresh,.filter_help,.filter_close {
background-color:#888888;
color:#fff;
font-size:12px;
.filter_new,.filter_refresh,.filter_help,.filter_close,.cat_close {
background-color:#e9e9e9;
color:#000;
border:1pt solid #c9c9c9;
font-size:11px;
font-weight:400;
text-align:center;
border-radius:3px;
border-radius:2px;
width:20px;
height: 15px;
padding:0 3px;
float: right;
margin-left: 2px;
margin-right: 2px;
}

.cat_close {
margin-top:3px;
margin-left: 10px;
}
div.filter_fields {
width:50%;
font-weight:normal;
Expand Down Expand Up @@ -1219,7 +1238,7 @@ border-radius:5px;
background-color:#fff;
color:#000;
font-size:13px;
max-width:900px;
max-width:850px;
max-height:600px;
}

Expand All @@ -1246,7 +1265,7 @@ display:none;
}

span.links:hover,span.links_enabled:hover {
color:#fff;
color:#000;
cursor:pointer;
text-decoration:underline;
}
Expand Down
6 changes: 0 additions & 6 deletions .inc/session.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,11 @@ function sInt() {
if (!isset($_SESSION['sUser'])) { sInt(); } else { $sUser = $_SESSION['sUser'];}
if (!isset($_SESSION['sEmail'])) { sInt(); } else { $sEmail = $_SESSION['sEmail'];}
if (!isset($_SESSION['sType'])) { sInt(); } else { $sType = $_SESSION['sType'];}
if (!isset($_SESSION['sTime'])) { sInt(); } else { $sTime = $_SESSION['sTime'];}
if (!isset($_SESSION['sTab'])) { sInt(); } else { $sTab = $_SESSION['sTab'];}
if (!isset($_REQUEST['id'])) { $id = 0; } else { $id = $_REQUEST['id'];}

// Kill the session if the ids dont match.
if ($id != $_SESSION['id']) {
sKill();
}

// Kill the session if timeout is exceeded.
if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > $sTime)) {
sKill();
}
?>
Loading

0 comments on commit 706aaf5

Please sign in to comment.