Skip to content

Commit c9f7811

Browse files
bbannonbbannon
authored
Merge branch 'craigk5n:master' into newLanguages
2 parents 8f0119d + 8e9c5ef commit c9f7811

File tree

6 files changed

+46
-254
lines changed

6 files changed

+46
-254
lines changed

‎access.php

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -183,18 +183,20 @@
183183
<option value="__default__"'
184184
. ( $guser == '__default__' ? $selected : '' )
185185
. '>' . $defConfigStr . '</option>';
186-
for( $i = 0, $cnt = count( $userlist ); $i < $cnt; $i++ ) {
186+
187+
foreach ( $userlist as $i ) {
187188
echo '
188-
<option value="' . $userlist[$i]['cal_login'] . '"'
189-
. ( $guser == $userlist[$i]['cal_login'] ? $selected : '' )
190-
. '>' . $userlist[$i]['cal_fullname'] . '</option>';
189+
<option value="' . $i['cal_login'] .
190+
( $guser === $i['cal_login'] ? '" selected>' : '">' ) .
191+
$i['cal_fullname'] . '</option>';
191192
}
192-
for( $i = 0, $cnt = count( $nonuserlist ); $i < $cnt; $i++ ) {
193+
194+
foreach ( $nonuserlist as $i ) {
193195
echo '
194-
<option value="' . $nonuserlist[$i]['cal_login'] . '"'
195-
. ( $guser == $nonuserlist[$i]['cal_login'] ? $selected : '' )
196-
. '>' . $nonuserlist[$i]['cal_fullname'] . ' '
197-
. ( $nonuserlist[$i]['cal_is_public'] == 'Y' ? '*' : '' ) . '</option>';
196+
<option value="' . $i['cal_login'] .
197+
( $guser === $i['cal_login'] ? '" selected>' : '">' ) .
198+
$i['cal_fullname'] . ' ' .
199+
( $i['cal_is_public'] === 'Y' ? '*' : '' ) . '</option>';
198200
}
199201

200202
echo $goStr;
@@ -294,14 +296,15 @@
294296
. ( $otheruser == '__default__' ? $selected : '' )
295297
. '>' . $defConfigStr . '</option>';
296298

297-
for( $i = 0, $cnt = count( $userlist ); $i < $cnt; $i++ ) {
298-
if( $userlist[$i]['cal_login'] != $guser )
299+
foreach ( $userlist as $i ) {
300+
if ( $i['cal_login'] !== $guser )
299301
echo '
300-
<option value="' . $userlist[$i]['cal_login'] . '"'
301-
. ( ! empty( $otheruser ) && $otheruser == $userlist[$i]['cal_login']
302-
? $selected : '' )
303-
. '>' . $userlist[$i]['cal_fullname'] . '</option>';
302+
<option value="' . $i['cal_login'] .
303+
( ! empty ( $otheruser ) && $otheruser === $i['cal_login']
304+
? '" selected>' : '">' ) .
305+
$i['cal_fullname'] . '</option>';
304306
}
307+
305308
echo $goStr;
306309
}
307310
}
@@ -475,4 +478,4 @@ function get_list_of_users( $user ) {
475478
return $u;
476479
}
477480

478-
?>
481+
?>

‎includes/css/styles.css

Lines changed: 21 additions & 232 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ html {
1313
/* These are to prevent some 'spam site' complaints. */
1414
background-color: #FFFFFE;
1515
color: #000001;
16-
color-scheme: dark light;
1716
hanging-punctuation: first last;
1817
}
1918
*,
@@ -148,6 +147,12 @@ ul a {
148147
border-left: 1px solid var(--tablebg);
149148
vertical-align:top;
150149
}
150+
.main th.empty {
151+
width:1%;
152+
border-top: 1px solid var(--tablebg);
153+
border-left: 1px solid var(--tablebg);
154+
vertical-align:top;
155+
}
151156
.minical td.weekend,
152157
#editentry th.weekend {
153158
background-color: var(--weekendbg);
@@ -178,11 +183,16 @@ ul a {
178183
#cat, #day dl.desc {
179184
display:none;
180185
}
186+
181187
td.weekcell {
182188
background-color: var(--weeknumber);
183189
font-size:.625rem;
184190
text-decoration:none;
191+
width: 1%;
192+
text-align: center;
193+
vertical-align: middle;
185194
}
195+
186196
img {
187197
max-inline-size: 100%;
188198
block-size: auto;
@@ -288,11 +298,12 @@ a#programname {
288298
}
289299
.entry {
290300
color: var(--myevents);
301+
font-size: 0.75em;
291302
}
292303
.entry,
293304
.layerentry {
294305
padding-right:.1875rem;
295-
/*font-size:.75rem;*/
306+
font-size:.75rem;
296307
text-decoration:none;
297308
}
298309
.layerentry {
@@ -801,6 +812,13 @@ tr.highlight td {
801812
padding-left:.1875rem;
802813
vertical-align:top;
803814
}
815+
th.day_glance_time {
816+
width: 5% !important;
817+
height:2.5rem;
818+
border-top:1px solid var(--tablebg);
819+
border-left:1px solid var(--tablebg);
820+
vertical-align:middle;
821+
}
804822
#day .glance td {
805823
width:86%;
806824
height:2.5rem;
@@ -929,8 +947,7 @@ tr.highlight td {
929947
font-size:.75rem;
930948
}
931949
#viewl .main td,
932-
#contentMonth .main td,
933-
#month .main td {
950+
#month .main td, #Month #month_main td {
934951
height:6.0rem;
935952
font-size:.75rem;
936953
vertical-align:top;
@@ -970,175 +987,6 @@ table#prevmonth {
970987
margin:0 .25rem;
971988
border:0;
972989
}
973-
#combo div.headerinfo, #month2 div.headerinfo {
974-
margin:.9375rem;
975-
border:1px solid #000;
976-
padding:.625rem;
977-
background-color:#FFF;
978-
color:#000;
979-
}
980-
#combo div.headerinfo .username, #month2 div.headerinfo .username {
981-
font-weight:bold;
982-
font-size:16pt;
983-
}
984-
#combo div.headerinfo #categoryselection, #month2 div.headerinfo #categoryselection {
985-
padding-left:1.875rem;
986-
font-weight:normal;
987-
font-size:12pt;
988-
}
989-
#combo div.headerinfo #selectedcategories, #month2 div.headerinfo #selectedcategories {
990-
font-weight:normal;
991-
font-size:12pt;
992-
}
993-
#combo #categorylist, #month2 #categorylist {
994-
border:1px solid #CCC;
995-
background-color:#FFA;
996-
}
997-
#contentMonth #monthstatus {
998-
margin-left:1.25rem;
999-
}
1000-
#month2 td.displayYear { font-size: 1.2rem !important; }
1001-
#contentMonth .monthtitle,
1002-
#contentYear .yeartitle,
1003-
#contentDay .daytitle {
1004-
margin:0 0 0 .3125rem;
1005-
padding:0;
1006-
font-size:18pt;
1007-
text-align:center;
1008-
}
1009-
#combo #contentMonth #month_main, #month2 #contentMonth #month_main {
1010-
margin-top: 10px;
1011-
}
1012-
#combo #contentMonth #month_main td, #month2 #contentMonth #month_main td {
1013-
height:90px;
1014-
}
1015-
#combo .event, #month2 .event {
1016-
margin-top:.0625rem;
1017-
overflow:hidden;
1018-
}
1019-
#combo #contentMonth .eventname, #month2 #contentMonth .eventname {
1020-
vertical-align: top;
1021-
}
1022-
#combo #contentMonth .event, #month2 #contentMonth .event {
1023-
vertical-align: middle;
1024-
}
1025-
#contentYear #year_main,
1026-
#contentYear .monthblock {
1027-
background-color: #FFF;
1028-
border: 0;
1029-
}
1030-
#contentYear .monthtable {
1031-
margin-bottom: 10px;
1032-
border-right: 1px solid;
1033-
border-bottom: 1px solid;
1034-
}
1035-
#contentYear .empty {
1036-
background-color: #E0E0E0;
1037-
}
1038-
#contentYear th {
1039-
font-size: 70%;
1040-
padding: 2px;
1041-
}
1042-
#contentYear .dom {
1043-
font-size: 70%;
1044-
text-align: center;
1045-
}
1046-
#contentAgenda #agendastatus {
1047-
margin-left:1.25rem;
1048-
}
1049-
#contentAgenda td {
1050-
background-color:#E0E0E0;
1051-
font-size:10pt;
1052-
}
1053-
#contentAgenda td.even {
1054-
background-color:#FFFFFF;
1055-
}
1056-
#contentDay #daystatus {
1057-
margin-left:1.25rem;
1058-
}
1059-
#contentDay .timeofday {
1060-
float:right;
1061-
margin-right:.125rem;
1062-
font-size:.5625rem;
1063-
}
1064-
#contentDay #daydiv {
1065-
height:25rem;
1066-
scrollTop:400;
1067-
overflow:auto;
1068-
}
1069-
#contentDay #dayuntimed {
1070-
background-color:#FFFFFF;
1071-
color: var(--myevents);
1072-
margin-top:.25rem;
1073-
margin-bottom:.25rem;
1074-
margin-left:3.125rem;
1075-
border:1px solid;
1076-
border-color:#A0A0A0 #E0E0E0 #E0E0E0 #A0A0A0;
1077-
font-size:.625rem;
1078-
}
1079-
#contentDay .daytimedevent {
1080-
width:15.625rem;
1081-
background-color: var(--haseventsbg);
1082-
color: var(--myevents);
1083-
border:1px solid;
1084-
border-color:#E0E0E0 #A0A0A0 #A0A0A0 #E0E0E0;
1085-
font-size:.625rem;
1086-
}
1087-
#contentDay #dayinnerdiv {
1088-
position:relative;
1089-
height:75rem;
1090-
}
1091-
#contentDay .hourblockleft {
1092-
position:absolute;
1093-
left:0;
1094-
width:3.125rem;
1095-
height:3.125rem;
1096-
margin:0;
1097-
border:1px solid #E0E0E0;
1098-
padding:0;
1099-
}
1100-
#contentDay .hourblockright {
1101-
position:absolute;
1102-
left:3.125rem;
1103-
width:100%;
1104-
height:3.125rem;
1105-
margin:0;
1106-
border-right:1px solid #E0E0E0;
1107-
border-left:1px solid #E0E0E0;
1108-
padding:0;
1109-
background-image:url( images/hour_in_day.gif );
1110-
/*overflow:auto;*/
1111-
}
1112-
#combo #contentTasks #tasktable th {
1113-
background-color: #000080;
1114-
border: 2px outset #000060;
1115-
color: #ffffff;
1116-
font-size: 1.0rem;
1117-
padding: 4px;
1118-
padding-left: 20px;
1119-
}
1120-
#combo #contentTasks #tasktable td.odd {
1121-
background-color: #C0C0C0;
1122-
border: 2px outset #C0C0C0;
1123-
color: #000000;
1124-
font-size: 1.0rem;
1125-
padding: 4px;
1126-
}
1127-
#combo #contentTasks #tasktable td.even {
1128-
background-color: #D8D8D8;
1129-
border: 2px outset #D8D8D8;
1130-
color: #000000;
1131-
font-size: 1.0rem;
1132-
padding: 4px;
1133-
}
1134-
#combo #viewEventDiv table, #month2 #viewEventDiv table {
1135-
padding: 10px;
1136-
margin: 10px;
1137-
}
1138-
#combo #taskAddDiv .fakebutton,
1139-
#combo #quickAddDiv .fakebutton, #month2 #quickAddDiv .fakebutton {
1140-
padding: 0;
1141-
}
1142990
.dateselIcon {
1143991
cursor: pointer;
1144992
margin-left: 5px;
@@ -1424,65 +1272,6 @@ table#prevmonth {
14241272
background-color:#a0a0a0;
14251273
border:2px #c0c0c0 outset;
14261274
}
1427-
#combo #nextmonth,
1428-
#combo #refresh,
1429-
#combo #nextyear,
1430-
#combo #nextday,
1431-
#combo #nextmonthdayview,
1432-
#month2 #nextmonth,
1433-
#month2 #refresh,
1434-
#month2 #nextyear,
1435-
#month2 #nextday,
1436-
#month2 #nextmonthdayview {
1437-
margin-right:.1875rem;
1438-
}
1439-
#month2 #nextmonth, #month2 #prevmonth { font-size: 0.7rem; }
1440-
#combo .monthnavlinks td, #month2 .monthnavlinks td {
1441-
background-color: #e0e0e0;
1442-
border: 2px #e0e0e0 outset;
1443-
font-size: .80rem;
1444-
}
1445-
#combo .monthnavlinks .currentMonthLink, #month2 .monthnavlinks .currentMonthLink {
1446-
background-color: #c0c0c0;
1447-
}
1448-
#combo #quickAddDiv, #month2 #quickAddDiv {
1449-
border:1px solid;
1450-
border-color:#e0e0e0 #808080 #808080 #e0e0e0;
1451-
background-color:#ffffff;
1452-
padding: 5px;
1453-
}
1454-
#combo #viewEventDiv, #month2 #viewEventDiv {
1455-
border:1px solid;
1456-
border-color:#e0e0e0 #808080 #808080 #e0e0e0;
1457-
background-color:#ffffff;
1458-
}
1459-
#combo .event, #month2 .event {
1460-
/*background-color: #a00;*/
1461-
}
1462-
#combo #contentMonth div.event, #month2 #contentMonth div.event {
1463-
margin-bottom: 2px;
1464-
padding-left: 2px;
1465-
}
1466-
#combo #contentMonth div.event img, #month2 #contentMonth div.event img {
1467-
float: left;
1468-
}
1469-
#combo .participant, #month2 .participant {
1470-
font-size: 80%;
1471-
background-color: #d0d0d0;
1472-
border: 1px solid #b0b0b0;
1473-
padding: 2px;
1474-
}
1475-
#combo #quickAddDiv #quickAddParticipantList .partX,
1476-
#month2 #quickAddDiv #quickAddParticipantList .partX {
1477-
padding: 0;
1478-
cursor:pointer;
1479-
}
1480-
#combo #quickAddDiv #quickAddParticipantList .partX img,
1481-
#month2 #quickAddDiv #quickAddParticipantList .partX img {
1482-
vertical-align: top;
1483-
margin-top: 3px;
1484-
margin-left: 2px;
1485-
}
14861275
.eventattachment {
14871276
background-color: var(--cellbg);
14881277
border:1px solid var(--tablebg);

‎includes/functions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4801,7 +4801,7 @@ function print_day_at_a_glance ( $date, $user, $can_add = 0 ) {
48014801
<table class="main glance">'
48024802
. ( empty ( $hour_arr[9999] ) ? '' : '
48034803
<tr>
4804-
<th class="empty">&nbsp;</th>
4804+
<th class="day_glance_time">&nbsp;XXX</th>
48054805
<td class="hasevents">' . $hour_arr[9999] . '</td>
48064806
</tr>' );
48074807

‎includes/js/edit_entry.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
load_user_categories();
66
?>
7-
var bydayAr = bymonthdayAr = bysetposAr = [];
7+
var bydayAr = [], bymonthdayAr = [], bysetposAr = [];
88

99
var byday_labels = ['SU','MO','TU','WE','TH','FR','SA'];
1010
var byday_names = [

0 commit comments

Comments
 (0)