• R/O
  • SSH
  • HTTPS

opengion: Commit


Commit MetaInfo

Revision1608 (tree)
Time2018-07-06 16:41:59
Authortakahashi_m

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/opengionV5/uap/webapps/gf/doc/RELEASE-NOTES.txt (revision 1607)
+++ trunk/opengionV5/uap/webapps/gf/doc/RELEASE-NOTES.txt (revision 1608)
@@ -1,7 +1,17 @@
1-5.10.1.0 (2018/06/29)
1+5.10.1.1 (2018/07/13)
2+ [iframe化対応]
3+ frameでQUERYとRESULTを切っていますが、これをiframe出来るようにします。
4+ 具体的にはヘッダのフレームサイズ変更ボタン、検索時の高さ自動調整について対応しておきます。
5+ RESLUT部分をさらに二つに分けるようなパターンの場合はGridレイアウトとする必要があるため、
6+ optionにiframe,cssとして配置しておきます。
7+ jsp/common/default.js
8+ jsp/common/queryScript.js
9+ jsp/common/option/iframe.css
10+
11+5.10.1.0 (2018/06/29)
212 [FAQと新着画面]
313 FAQと新着情報の画面でリッチテキストを利用可能とします。
4- 同時に、リッチテキストを実際の画面で使う上で考慮不足だった箇所の対応をします。
14+ 同時に、リッチテキストを実際の画面で使う上で考慮不足だった箇所の対応を入れておきます。
515 (主にクリアボタンとエラー画面からの戻る場合の対応)
616 plugin.column.Editor_RICHTEXT#Editor_RICHTEXT( final DBColumn clm )
717 plugin.column.Editor_RICHTEXT#createCLEditorSc(String id)
--- trunk/opengionV5/uap/webapps/gf/src/script/common/default.css (revision 1607)
+++ trunk/opengionV5/uap/webapps/gf/src/script/common/default.css (revision 1608)
@@ -904,24 +904,24 @@
904904 border-top: 1px solid #000;
905905 position: absolute;
906906 left: 0px;
907- top: 0px;
907+ top: 0px;
908908 padding: 0px;
909-}
909+}
910910 div.color-picker ul {
911- list-style: none;
912- padding: 0px;
913- margin: 0px;
914- float: left;
915-}
916-div.color-picker ul li {
917- display: block;
918- width: 15px;
919- height: 15px;
911+ list-style: none;
912+ padding: 0px;
913+ margin: 0px;
914+ float: left;
915+}
916+div.color-picker ul li {
917+ display: block;
918+ width: 15px;
919+ height: 15px;
920920 border-right: 1px solid #000;
921- border-bottom: 1px solid #000;
922- margin: 0px;
923- float: left;
924- cursor: pointer;
921+ border-bottom: 1px solid #000;
922+ margin: 0px;
923+ float: left;
924+ cursor: pointer;
925925 }
926926
927927
@@ -997,238 +997,238 @@
997997 .colNo_YL { color: black ; background-color: yellow ; }
998998
999999 /* 5.6.5.2 (2013/06/21) ClockPicker */
1000-#CP_hourcont {
1001-padding: 0px;
1002-position:absolute;
1003-border:1px dashed #bbbbbb;
1004-background-color:#dddddd;
1005-display:none;
1006-}
1007-
1008-#CP_minutecont {
1009-background-color:#dddddd;
1010-padding: 0px;
1011-position:absolute;
1012-width:45px;
1013-border: 1px dashed #cccccc;
1014-display:none;
1015-}
1016-
1017-.floatleft {
1018-float:left;
1019-}
1020-
1021-.CP_hour {
1022-padding:1px;
1023-font-family: Arial, Helvetica, sans-serif;
1024-font-size:11px;
1025-white-space:nowrap;
1026-cursor:pointer;
1027-width:35px;
1028-margin:1px;
1029-background-color:#eeeeee;
1030-}
1031-
1032-.CP_minute {
1033-padding:1px;
1034-background-color:#eeeeee;
1035-font-family: Arial, Helvetica, sans-serif;
1036-font-size:11px;
1037-white-space:nowrap;
1038-cursor:pointer;
1039-width:auto;
1040-margin:1px;
1041-}
1042-
1043-.CP_over {
1044-background-color:#ffffff;
1000+#CP_hourcont {
1001+padding: 0px;
1002+position:absolute;
1003+border:1px dashed #bbbbbb;
1004+background-color:#dddddd;
1005+display:none;
10451006 }
10461007
1008+#CP_minutecont {
1009+background-color:#dddddd;
1010+padding: 0px;
1011+position:absolute;
1012+width:45px;
1013+border: 1px dashed #cccccc;
1014+display:none;
1015+}
10471016
1017+.floatleft {
1018+float:left;
1019+}
1020+
1021+.CP_hour {
1022+padding:1px;
1023+font-family: Arial, Helvetica, sans-serif;
1024+font-size:11px;
1025+white-space:nowrap;
1026+cursor:pointer;
1027+width:35px;
1028+margin:1px;
1029+background-color:#eeeeee;
1030+}
1031+
1032+.CP_minute {
1033+padding:1px;
1034+background-color:#eeeeee;
1035+font-family: Arial, Helvetica, sans-serif;
1036+font-size:11px;
1037+white-space:nowrap;
1038+cursor:pointer;
1039+width:auto;
1040+margin:1px;
1041+}
1042+
1043+.CP_over {
1044+background-color:#ffffff;
1045+}
1046+
1047+
10481048 /* カレンダーピッカー用 5.8.9.0 (2015/08/07) */
1049-.gldp-default {
1050- position: absolute;
1051- font-family: 'helvetica';
1052-}
1053-
1054-/* Core style for every cell */
1055-.gldp-default .core {
1056- box-sizing: border-box;
1057- -webkit-box-sizing: border-box;
1058- -moz-box-sizing: border-box;
1059- position: relative;
1060- float: left;
1061- padding: 0;
1062- margin: 0;
1063- font-size: 14px;
1064- text-align: center;
1065- cursor: pointer;
1066- color: #222;
1067- background: #ffffff;
1068- background: -moz-linear-gradient(top, #ffffff 0%, #dadada 98%, #ffffff 99%, #dadada 100%);
1069- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(98%,#dadada), color-stop(99%,#ffffff), color-stop(100%,#dadada));
1070- background: -webkit-linear-gradient(top, #ffffff 0%,#dadada 98%,#ffffff 99%,#dadada 100%);
1071- background: -o-linear-gradient(top, #ffffff 0%,#dadada 98%,#ffffff 99%,#dadada 100%);
1072- background: -ms-linear-gradient(top, #ffffff 0%,#dadada 98%,#ffffff 99%,#dadada 100%);
1073- background: linear-gradient(to bottom, #ffffff 0%,#dadada 98%,#ffffff 99%,#dadada 100%);
1074- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#dadada',GradientType=0 );
1075-}
1076-
1077-/* Cell border */
1078-.gldp-default .border {
1079- border-style: solid;
1080- border-width: 0;
1081- border-color: #888;
1082-}
1083-
1049+.gldp-default {
1050+ position: absolute;
1051+ font-family: 'helvetica';
1052+}
1053+
1054+/* Core style for every cell */
1055+.gldp-default .core {
1056+ box-sizing: border-box;
1057+ -webkit-box-sizing: border-box;
1058+ -moz-box-sizing: border-box;
1059+ position: relative;
1060+ float: left;
1061+ padding: 0;
1062+ margin: 0;
1063+ font-size: 14px;
1064+ text-align: center;
1065+ cursor: pointer;
1066+ color: #222;
1067+ background: #ffffff;
1068+ background: -moz-linear-gradient(top, #ffffff 0%, #dadada 98%, #ffffff 99%, #dadada 100%);
1069+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(98%,#dadada), color-stop(99%,#ffffff), color-stop(100%,#dadada));
1070+ background: -webkit-linear-gradient(top, #ffffff 0%,#dadada 98%,#ffffff 99%,#dadada 100%);
1071+ background: -o-linear-gradient(top, #ffffff 0%,#dadada 98%,#ffffff 99%,#dadada 100%);
1072+ background: -ms-linear-gradient(top, #ffffff 0%,#dadada 98%,#ffffff 99%,#dadada 100%);
1073+ background: linear-gradient(to bottom, #ffffff 0%,#dadada 98%,#ffffff 99%,#dadada 100%);
1074+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#dadada',GradientType=0 );
1075+}
1076+
1077+/* Cell border */
1078+.gldp-default .border {
1079+ border-style: solid;
1080+ border-width: 0;
1081+ border-color: #888;
1082+}
1083+
10841084 /* Month/Year text and select */
1085-/* 5.9.6.1 16px->15px*/
1086-.gldp-default .monyear,
1087-.gldp-default .monyear select {
1088- font-size: 15px !important;
1089- font-weight: bold;
1090- text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.75);
1091-}
1092-
1093-/* Month/Year text */
1094-.gldp-default .monyear span {
1095- margin: 0 5px 0 5px;
1096-}
1097-
1098-/* Prev/Next arrows */
1099-.gldp-default .prev-arrow,
1100-.gldp-default .next-arrow {
1101- color: #222;
1102- text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.75);
1103-}
1104-
1105-.gldp-default .prev-arrow:active,
1106-.gldp-default .next-arrow:active {
1107- color: #f00;
1108-}
1109-
1110-.gldp-default .prev-arrow-off,
1111-.gldp-default .next-arrow-off {
1112- color: #222;
1113- opacity: 0.15;
1114-}
1115-
1116-/* Days of the week */
1117-.gldp-default .dow {
1118- color: #fff;
1119- font-weight: bold;
1120- cursor: wait !important;
1121- background: #ff0000;
1122- background: -moz-linear-gradient(top, #ff0000 0%, #ffcccc 1%, #ff0000 2%, #aa0000 98%, #dd4444 99%, #880000 100%);
1123- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff0000), color-stop(1%,#dd4444), color-stop(2%,#ff0000), color-stop(98%,#aa0000), color-stop(99%,#ffcccc), color-stop(100%,#880000));
1124- background: -webkit-linear-gradient(top, #ff0000 0%,#ffcccc 1%,#ff0000 2%,#aa0000 98%,#dd4444 99%,#880000 100%);
1125- background: -o-linear-gradient(top, #ff0000 0%,#ffcccc 1%,#ff0000 2%,#aa0000 98%,#dd4444 99%,#880000 100%);
1126- background: -ms-linear-gradient(top, #ff0000 0%,#ffcccc 1%,#ff0000 2%,#aa0000 98%,#dd4444 99%,#880000 100%);
1127- background: linear-gradient(to bottom, #ff0000 0%,#ffcccc 1%,#ff0000 2%,#aa0000 98%,#dd4444 99%,#880000 100%);
1128- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff0000', endColorstr='#880000',GradientType=0 );
1129-}
1130-
1131-/* Weekdays */
1132-.gldp-default .mon,
1133-.gldp-default .tue,
1134-.gldp-default .wed,
1135-.gldp-default .thu,
1136-.gldp-default .fri {
1137- font-weight: bold;
1138- text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.75);
1139-}
1140-
1141-/* Weekend days */
1142-.gldp-default .sat,
1143-.gldp-default .sun {
1144- color: #3858a8;
1145- font-weight: bold;
1146- text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.75);
1147-}
1148-
1149-/* Selectable days that are outside of current month being shown */
1150-.gldp-default .outday {
1151- color: #666 !important;
1152-}
1153-
1154-/* Hover */
1155-.gldp-default .mon:hover,
1156-.gldp-default .tue:hover,
1157-.gldp-default .wed:hover,
1158-.gldp-default .thu:hover,
1159-.gldp-default .fri:hover,
1160-.gldp-default .sat:hover,
1161-.gldp-default .sun:hover {
1162- background: #fcfff4;
1163- background: -moz-linear-gradient(top, #fcfff4 0%, #e9e9ce 100%);
1164- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fcfff4), color-stop(100%,#e9e9ce));
1165- background: -webkit-linear-gradient(top, #fcfff4 0%,#e9e9ce 100%);
1166- background: -o-linear-gradient(top, #fcfff4 0%,#e9e9ce 100%);
1167- background: -ms-linear-gradient(top, #fcfff4 0%,#e9e9ce 100%);
1168- background: linear-gradient(to bottom, #fcfff4 0%,#e9e9ce 100%);
1169- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fcfff4', endColorstr='#e9e9ce',GradientType=0 );
1170-}
1171-
1172-/* Non-Selectable days */
1173-.gldp-default .noday {
1174- color: #444;
1175- font-weight: normal;
1176- cursor: wait !important;
1177- background: #aaaaaa;
1178- background: -moz-linear-gradient(top, #aaaaaa 0%, #8a8a8a 98%, #aaaaaa 99%, #8a8a8a 100%);
1179- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#aaaaaa), color-stop(98%,#8a8a8a), color-stop(99%,#aaaaaa), color-stop(100%,#8a8a8a)); /* Chrome,Safari4+ */
1180- background: -webkit-linear-gradient(top, #aaaaaa 0%,#8a8a8a 98%,#aaaaaa 99%,#8a8a8a 100%);
1181- background: -o-linear-gradient(top, #aaaaaa 0%,#8a8a8a 98%,#aaaaaa 99%,#8a8a8a 100%);
1182- background: -ms-linear-gradient(top, #aaaaaa 0%,#8a8a8a 98%,#aaaaaa 99%,#8a8a8a 100%);
1183- background: linear-gradient(to bottom, #aaaaaa 0%,#8a8a8a 98%,#aaaaaa 99%,#8a8a8a 100%);
1184- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#aaaaaa', endColorstr='#8a8a8a',GradientType=0 );
1185-}
1186-
1187-/* Currently selected day */
1188-.gldp-default .selected {
1189- color: #fff;
1190- font-weight: bold;
1191- border-color: #c00;
1192- background: #e8bf88;
1193- background: -moz-linear-gradient(top, #e8bf88 0%, #ffc19d 1%, #fd8642 2%, #ab2412 98%, #ef753f 99%, #ef753f 100%);
1194- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e8bf88), color-stop(1%,#ffc19d), color-stop(2%,#fd8642), color-stop(98%,#ab2412), color-stop(99%,#ef753f), color-stop(100%,#ef753f));
1195- background: -webkit-linear-gradient(top, #e8bf88 0%,#ffc19d 1%,#fd8642 2%,#ab2412 98%,#ef753f 99%,#ef753f 100%);
1196- background: -o-linear-gradient(top, #e8bf88 0%,#ffc19d 1%,#fd8642 2%,#ab2412 98%,#ef753f 99%,#ef753f 100%);
1197- background: -ms-linear-gradient(top, #e8bf88 0%,#ffc19d 1%,#fd8642 2%,#ab2412 98%,#ef753f 99%,#ef753f 100%);
1198- background: linear-gradient(to bottom, #e8bf88 0%,#ffc19d 1%,#fd8642 2%,#ab2412 98%,#ef753f 99%,#ef753f 100%);
1199- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e8bf88', endColorstr='#ef753f',GradientType=0 );
1200-}
1201-
1202-/* Today */
1203-.gldp-default .today {
1204- color: #fff;
1205- font-weight: bold;
1206- border-color: #00c;
1207- background: #88bfe8;
1208- background: -moz-linear-gradient(top, #88bfe8 0%, #9dc1ff 1%, #4286fd 2%, #0124ab 98%, #3775ef 99%, #3775ef 100%);
1209- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#88bfe8), color-stop(1%,#9dc1ff), color-stop(2%,#4286fd), color-stop(98%,#0124ab), color-stop(99%,#3775ef), color-stop(100%,#3775ef));
1210- background: -webkit-linear-gradient(top, #88bfe8 0%,#9dc1ff 1%,#4286fd 2%,#0124ab 98%,#3775ef 99%,#3775ef 100%);
1211- background: -o-linear-gradient(top, #88bfe8 0%,#9dc1ff 1%,#4286fd 2%,#0124ab 98%,#3775ef 99%,#3775ef 100%);
1212- background: -ms-linear-gradient(top, #88bfe8 0%,#9dc1ff 1%,#4286fd 2%,#0124ab 98%,#3775ef 99%,#3775ef 100%);
1213- background: linear-gradient(to bottom, #88bfe8 0%,#9dc1ff 1%,#4286fd 2%,#0124ab 98%,#3775ef 99%,#3775ef 100%);
1214- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#88bfe8', endColorstr='#3775ef',GradientType=0 );
1215-}
1216-
1217-/* Special */
1218-.gldp-default .special {
1219- color: #fff;
1220- font-weight: bold;
1221- border-color: #0c0;
1222- background: #88e888;
1223- background: -moz-linear-gradient(top, #88e888 0%, #9dff9d 1%, #42fd42 2%, #01ab01 98%, #37ef37 99%, #37ef37 100%);
1224- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#88e888), color-stop(1%,#9dff9d), color-stop(2%,#42fd42), color-stop(98%,#01ab01), color-stop(99%,#37ef37), color-stop(100%,#37ef37));
1225- background: -webkit-linear-gradient(top, #88e888 0%,#9dff9d 1%,#42fd42 2%,#01ab01 98%,#37ef37 99%,#37ef37 100%);
1226- background: -o-linear-gradient(top, #88e888 0%,#9dff9d 1%,#42fd42 2%,#01ab01 98%,#37ef37 99%,#37ef37 100%);
1227- background: -ms-linear-gradient(top, #88e888 0%,#9dff9d 1%,#42fd42 2%,#01ab01 98%,#37ef37 99%,#37ef37 100%);
1228- background: linear-gradient(to bottom, #88e888 0%,#9dff9d 1%,#42fd42 2%,#01ab01 98%,#37ef37 99%,#37ef37 100%);
1229- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#88e888', endColorstr='#37ef37',GradientType=0 );
1085+/* 5.9.6.1 16px->15px*/
1086+.gldp-default .monyear,
1087+.gldp-default .monyear select {
1088+ font-size: 15px !important;
1089+ font-weight: bold;
1090+ text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.75);
12301091 }
12311092
1093+/* Month/Year text */
1094+.gldp-default .monyear span {
1095+ margin: 0 5px 0 5px;
1096+}
1097+
1098+/* Prev/Next arrows */
1099+.gldp-default .prev-arrow,
1100+.gldp-default .next-arrow {
1101+ color: #222;
1102+ text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.75);
1103+}
1104+
1105+.gldp-default .prev-arrow:active,
1106+.gldp-default .next-arrow:active {
1107+ color: #f00;
1108+}
1109+
1110+.gldp-default .prev-arrow-off,
1111+.gldp-default .next-arrow-off {
1112+ color: #222;
1113+ opacity: 0.15;
1114+}
1115+
1116+/* Days of the week */
1117+.gldp-default .dow {
1118+ color: #fff;
1119+ font-weight: bold;
1120+ cursor: wait !important;
1121+ background: #ff0000;
1122+ background: -moz-linear-gradient(top, #ff0000 0%, #ffcccc 1%, #ff0000 2%, #aa0000 98%, #dd4444 99%, #880000 100%);
1123+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff0000), color-stop(1%,#dd4444), color-stop(2%,#ff0000), color-stop(98%,#aa0000), color-stop(99%,#ffcccc), color-stop(100%,#880000));
1124+ background: -webkit-linear-gradient(top, #ff0000 0%,#ffcccc 1%,#ff0000 2%,#aa0000 98%,#dd4444 99%,#880000 100%);
1125+ background: -o-linear-gradient(top, #ff0000 0%,#ffcccc 1%,#ff0000 2%,#aa0000 98%,#dd4444 99%,#880000 100%);
1126+ background: -ms-linear-gradient(top, #ff0000 0%,#ffcccc 1%,#ff0000 2%,#aa0000 98%,#dd4444 99%,#880000 100%);
1127+ background: linear-gradient(to bottom, #ff0000 0%,#ffcccc 1%,#ff0000 2%,#aa0000 98%,#dd4444 99%,#880000 100%);
1128+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff0000', endColorstr='#880000',GradientType=0 );
1129+}
1130+
1131+/* Weekdays */
1132+.gldp-default .mon,
1133+.gldp-default .tue,
1134+.gldp-default .wed,
1135+.gldp-default .thu,
1136+.gldp-default .fri {
1137+ font-weight: bold;
1138+ text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.75);
1139+}
1140+
1141+/* Weekend days */
1142+.gldp-default .sat,
1143+.gldp-default .sun {
1144+ color: #3858a8;
1145+ font-weight: bold;
1146+ text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.75);
1147+}
1148+
1149+/* Selectable days that are outside of current month being shown */
1150+.gldp-default .outday {
1151+ color: #666 !important;
1152+}
1153+
1154+/* Hover */
1155+.gldp-default .mon:hover,
1156+.gldp-default .tue:hover,
1157+.gldp-default .wed:hover,
1158+.gldp-default .thu:hover,
1159+.gldp-default .fri:hover,
1160+.gldp-default .sat:hover,
1161+.gldp-default .sun:hover {
1162+ background: #fcfff4;
1163+ background: -moz-linear-gradient(top, #fcfff4 0%, #e9e9ce 100%);
1164+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fcfff4), color-stop(100%,#e9e9ce));
1165+ background: -webkit-linear-gradient(top, #fcfff4 0%,#e9e9ce 100%);
1166+ background: -o-linear-gradient(top, #fcfff4 0%,#e9e9ce 100%);
1167+ background: -ms-linear-gradient(top, #fcfff4 0%,#e9e9ce 100%);
1168+ background: linear-gradient(to bottom, #fcfff4 0%,#e9e9ce 100%);
1169+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fcfff4', endColorstr='#e9e9ce',GradientType=0 );
1170+}
1171+
1172+/* Non-Selectable days */
1173+.gldp-default .noday {
1174+ color: #444;
1175+ font-weight: normal;
1176+ cursor: wait !important;
1177+ background: #aaaaaa;
1178+ background: -moz-linear-gradient(top, #aaaaaa 0%, #8a8a8a 98%, #aaaaaa 99%, #8a8a8a 100%);
1179+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#aaaaaa), color-stop(98%,#8a8a8a), color-stop(99%,#aaaaaa), color-stop(100%,#8a8a8a)); /* Chrome,Safari4+ */
1180+ background: -webkit-linear-gradient(top, #aaaaaa 0%,#8a8a8a 98%,#aaaaaa 99%,#8a8a8a 100%);
1181+ background: -o-linear-gradient(top, #aaaaaa 0%,#8a8a8a 98%,#aaaaaa 99%,#8a8a8a 100%);
1182+ background: -ms-linear-gradient(top, #aaaaaa 0%,#8a8a8a 98%,#aaaaaa 99%,#8a8a8a 100%);
1183+ background: linear-gradient(to bottom, #aaaaaa 0%,#8a8a8a 98%,#aaaaaa 99%,#8a8a8a 100%);
1184+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#aaaaaa', endColorstr='#8a8a8a',GradientType=0 );
1185+}
1186+
1187+/* Currently selected day */
1188+.gldp-default .selected {
1189+ color: #fff;
1190+ font-weight: bold;
1191+ border-color: #c00;
1192+ background: #e8bf88;
1193+ background: -moz-linear-gradient(top, #e8bf88 0%, #ffc19d 1%, #fd8642 2%, #ab2412 98%, #ef753f 99%, #ef753f 100%);
1194+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e8bf88), color-stop(1%,#ffc19d), color-stop(2%,#fd8642), color-stop(98%,#ab2412), color-stop(99%,#ef753f), color-stop(100%,#ef753f));
1195+ background: -webkit-linear-gradient(top, #e8bf88 0%,#ffc19d 1%,#fd8642 2%,#ab2412 98%,#ef753f 99%,#ef753f 100%);
1196+ background: -o-linear-gradient(top, #e8bf88 0%,#ffc19d 1%,#fd8642 2%,#ab2412 98%,#ef753f 99%,#ef753f 100%);
1197+ background: -ms-linear-gradient(top, #e8bf88 0%,#ffc19d 1%,#fd8642 2%,#ab2412 98%,#ef753f 99%,#ef753f 100%);
1198+ background: linear-gradient(to bottom, #e8bf88 0%,#ffc19d 1%,#fd8642 2%,#ab2412 98%,#ef753f 99%,#ef753f 100%);
1199+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e8bf88', endColorstr='#ef753f',GradientType=0 );
1200+}
1201+
1202+/* Today */
1203+.gldp-default .today {
1204+ color: #fff;
1205+ font-weight: bold;
1206+ border-color: #00c;
1207+ background: #88bfe8;
1208+ background: -moz-linear-gradient(top, #88bfe8 0%, #9dc1ff 1%, #4286fd 2%, #0124ab 98%, #3775ef 99%, #3775ef 100%);
1209+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#88bfe8), color-stop(1%,#9dc1ff), color-stop(2%,#4286fd), color-stop(98%,#0124ab), color-stop(99%,#3775ef), color-stop(100%,#3775ef));
1210+ background: -webkit-linear-gradient(top, #88bfe8 0%,#9dc1ff 1%,#4286fd 2%,#0124ab 98%,#3775ef 99%,#3775ef 100%);
1211+ background: -o-linear-gradient(top, #88bfe8 0%,#9dc1ff 1%,#4286fd 2%,#0124ab 98%,#3775ef 99%,#3775ef 100%);
1212+ background: -ms-linear-gradient(top, #88bfe8 0%,#9dc1ff 1%,#4286fd 2%,#0124ab 98%,#3775ef 99%,#3775ef 100%);
1213+ background: linear-gradient(to bottom, #88bfe8 0%,#9dc1ff 1%,#4286fd 2%,#0124ab 98%,#3775ef 99%,#3775ef 100%);
1214+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#88bfe8', endColorstr='#3775ef',GradientType=0 );
1215+}
1216+
1217+/* Special */
1218+.gldp-default .special {
1219+ color: #fff;
1220+ font-weight: bold;
1221+ border-color: #0c0;
1222+ background: #88e888;
1223+ background: -moz-linear-gradient(top, #88e888 0%, #9dff9d 1%, #42fd42 2%, #01ab01 98%, #37ef37 99%, #37ef37 100%);
1224+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#88e888), color-stop(1%,#9dff9d), color-stop(2%,#42fd42), color-stop(98%,#01ab01), color-stop(99%,#37ef37), color-stop(100%,#37ef37));
1225+ background: -webkit-linear-gradient(top, #88e888 0%,#9dff9d 1%,#42fd42 2%,#01ab01 98%,#37ef37 99%,#37ef37 100%);
1226+ background: -o-linear-gradient(top, #88e888 0%,#9dff9d 1%,#42fd42 2%,#01ab01 98%,#37ef37 99%,#37ef37 100%);
1227+ background: -ms-linear-gradient(top, #88e888 0%,#9dff9d 1%,#42fd42 2%,#01ab01 98%,#37ef37 99%,#37ef37 100%);
1228+ background: linear-gradient(to bottom, #88e888 0%,#9dff9d 1%,#42fd42 2%,#01ab01 98%,#37ef37 99%,#37ef37 100%);
1229+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#88e888', endColorstr='#37ef37',GradientType=0 );
1230+}
1231+
12321232 /* 5.9.1.2 (2015/10/23) */
12331233 /* (237,109,61) (246,173,73)*/
12341234 #float_menu #menu_head{
@@ -1240,12 +1240,12 @@
12401240 text-align:left;
12411241 color:#460e44;
12421242 zoom:1;
1243-}
1243+}
12441244
12451245 #float_menu #menu_body{
12461246 background:rgb(187,200,230); /* IE7 */
12471247 filter: alpha(opacity=95); /* IE7 */
1248- background-color:rgba(187,200,230,0.95);
1248+ background-color:rgba(187,200,230,0.95);
12491249 max-height:90%;
12501250 zoom:1;
12511251 }
@@ -1256,4 +1256,10 @@
12561256 background-image: url('../image/help.png');
12571257 background-repeat: no-repeat;
12581258 background-position: right center;
1259+}
1260+
1261+/* frameをiframeに置換用 5.10.1.1 (2018/07/13) */
1262+.HYBS_IFRAME{
1263+ display:block;
1264+ width:calc(100% - 4px);
12591265 }
\ No newline at end of file
--- trunk/opengionV5/uap/webapps/gf/src/script/common/default.js (revision 1607)
+++ trunk/opengionV5/uap/webapps/gf/src/script/common/default.js (revision 1608)
@@ -426,9 +426,15 @@
426426 * 4.3.6.0 (2009/04/01) 3つ以上フレームが存在する場合でも自動調整できるように対応
427427 * 5.1.4.0 (2010/03/01) 横スクロールが出る場合及びFireFoxに対しての自動調整対応
428428 * 5.5.3.4 (2012/06/19) 上下分割で、下部の左右分割時(3フレームと認識)の処理に対応。
429+ * 5.10.1.1 (2018/07/13) frameをiframeに置換した場合の対応。
430+ *
429431 */
430432 function adjustFrameHeight() {
431433 var oFramesets , subFrmObj , oFrames , tempRows , endMarkObj , i , sw , cw , isFF , margin ;
434+
435+ // frameをiframeに置換した場合の処理 5.10.1.1 (2018/07/13) ADD
436+ adjustFrameHeight_iframe();
437+
432438 oFramesets = parent.document.getElementsByName( "SUB_FRAME" );
433439 if( oFramesets == null ) { return; }
434440
@@ -457,7 +463,7 @@
457463 cw = oFrames[i].document.documentElement.clientWidth;
458464 isFF = ( /a/[-1]=='a' );
459465 margin = 5;
460- if( isFF || sw != cw ) { margin += 14; }
466+ if( isFF || sw != cw ) { margin += 14;}
461467 tempRows = tempRows + ( endMarkObj.offsetTop + endMarkObj.parentNode.offsetTop + margin ) + ",";
462468 // tempRows = tempRows + ( oFrames[i].document.documentElement.scrollHeight + margin ) + ",";
463469 }
@@ -469,10 +475,10 @@
469475
470476 /*
471477 * これは、フレームを左右分割した場合に、右側フレームのサイズを自動調整します。
472- *
478+ *
473479 * 実行したいJSP画面で、呼び出してください。
474480 * 基本的には、Type5:一覧検索登録 パターンで使用します。
475- *
481+ *
476482 * 5.5.3.4 (2012/06/19) Adjust Frame Width.(Option)
477483 */
478484 function adjustFrameWidth() {
@@ -677,7 +683,7 @@
677683 atsrc = $(trg).attr("src");
678684 if(atsrc.indexOf( imgA ) >= 0){
679685 $(trg).attr("src",atsrc.replace( imgA, imgB ));
680- }
686+ }
681687 else{
682688 $(trg).attr('src',atsrc.replace( imgB ,imgA ));
683689 }
@@ -790,17 +796,32 @@
790796 // }
791797
792798 // Ver 3.8.9.2 (2007/07/13) setTimeout 100 -> 200 ms
793-function makeInputMenu(id) {
799+// Ver 5.9.18.1 (2017/03/06) makeInputMenuの繰り返し対応(2回目ではtextが生成されていない場合の考慮)
800+//function makeInputMenu(id) { // 2017/03/06 DEL
801+function makeInputMenu(id,cnt){ // 2017/03/06 ADD 引数にcntを追加
794802 var text , sel , tid , w , dim , dim2 ;
795803
796804 text = document.getElementById(id);
797805 sel = document.getElementById(id+".sel");
798806
807+ // 2017/03/06 ADD cnt(setTimeout回数)の設定
808+ if(cnt == undefined){
809+ // cnt未設定(初回呼び出し)の場合は0を設定
810+ cnt = 0;
811+ }else{
812+ // 2回目以降はインクリメント
813+ cnt ++;
814+ }
815+
799816 // var tid;
800817 //if( text.offsetWidth == 0 ) {
801- if( !text.setSel ) {
818+ //if( !text.setSel) { 2017/03/06 DEL
819+ // 2017/03/06 ADD textのオフセット情報が取得できない場合はmakeInputMenu処理を遅延して、
820+ // 再実行する。(10回を限度とする)
821+ if( (!text.setSel || text.offsetWidth == 0) && cnt < 10) {
802822 text.setSel = true;
803- tid = setTimeout( "makeInputMenu('" + id + "')",200 ); // 100 -> 200 ms
823+ //tid = setTimeout( "makeInputMenu('" + id + "')",200 ); // 100 -> 200 ms // 2017/03/06 DEL
824+ tid = setTimeout( "makeInputMenu('" + id + "'," + cnt + ")",200 ); // 2017/03/06 ADD cntを引数に追加
804825 return ;
805826 }
806827 // 2009/06/09 - Comment Out
@@ -807,7 +828,7 @@
807828 //clearTimeout( tid );
808829
809830 // w = text.offsetWidth - 15 + "px";
810- w = text.offsetWidth - 18 + "px"; // 2011/12/07 -3px
831+ w = text.offsetWidth - 18 + "px"; // 2011/12/07 -3px
811832 sel.style.position = "absolute"; // JyunBAN ga Jyuyo
812833 sel.style.width = text.offsetWidth + "px";
813834 sel.style.height = text.offsetHeight + "px";
@@ -831,7 +852,7 @@
831852 /* 5.2.1.0 (2010/10/01) */
832853 /* height,width は、px 単位が付いているものとして扱う */
833854 /* 5.5.1.5 (2012/04/12) [0]が_RENEWなら[1]をRENEWで呼び出し */
834-/* 5.9.9.0 (2016/06/03) iframe対応(parent) */
855+/* 5.9.9.0 (2016/06/03) iframe対応(parent) */
835856 /* Revision: $Id$ */
836857 /************************************************************************************/
837858 function rtnPopup( rtnValue ) {
@@ -895,7 +916,7 @@
895916 return caret_position;
896917 }
897918
898- // 5.2.1.0 (2010/10/01)
919+ // 5.2.1.0 (2010/10/01)
899920 height = "600px" ;
900921 width = "900px" ;
901922
@@ -903,7 +924,7 @@
903924 // if( p_width != null && p_width.length() > 0 ) { width = p_width; }
904925 if( p_height != null ) { height = p_height; }
905926 if( p_width != null ) { width = p_width; }
906-
927+
907928 // 5.8.3.0 (2014/01/09) height,width の "px" 処理の修正
908929 height = p_height ? parseInt(p_height, 10) + "px" : "600px" ;
909930 width = p_width ? parseInt(p_width , 10) + "px" : "900px" ;
@@ -960,7 +981,7 @@
960981
961982 if( p_append == "true" ){ // 5.8.5.0 (2015/02/16)
962983 var caret_position = getCaretPositionIE(tmp[k]);
963- tmp[k].value = tmp[k].value.substring(0,caret_position) + ret_val[j] + tmp[k].value.substring(caret_position,tmp[k].value.length);
984+ tmp[k].value = tmp[k].value.substring(0,caret_position) + ret_val[j] + tmp[k].value.substring(caret_position,tmp[k].value.length);
964985 }
965986 else{
966987 tmp[k].value = ret_val[j];
@@ -977,7 +998,7 @@
977998
978999 if( p_append == "true" ){ // 5.8.5.0 (2015/02/16)
9791000 var caret_position = getCaretPositionIE(tmp);
980- tmp.value = tmp.value.substring(0,caret_position) + ret_val[j] + tmp.value.substring(caret_position,tmp.value.length);
1001+ tmp.value = tmp.value.substring(0,caret_position) + ret_val[j] + tmp.value.substring(caret_position,tmp.value.length);
9811002 }
9821003 else{
9831004 tmp.value = ret_val[j];
@@ -992,12 +1013,12 @@
9921013 }
9931014 }
9941015 }
995-
1016+
9961017 // 5.5.3.0
9971018 for( i=0; i<changes_obj.length; i++){
9981019 $(changes_obj[i]).change();
9991020 }
1000-
1021+
10011022 // 5.5.1.5 (2012/04/12) 先頭が_RENEWの場合は[1]をRENEW付きでcall
10021023 if( ret_val != null && ret_val[0] == '_RENEW' ){
10031024 if(ret_val[1].indexOf('?') > 0 ){
@@ -1072,3 +1093,40 @@
10721093 }
10731094 return cpdata ;
10741095 }
1096+
1097+/*
1098+ * 5.10.1.1 (2018/07/13) frameのiframe置換対応。
1099+ */
1100+function adjustFrameHeight_iframe(){
1101+ // 親のiframe
1102+ var list = $('iframe.HYBS_IFRAME',parent.document);
1103+
1104+ // 親にiframeが存在しない場合は、何もしない
1105+ if(list.length < 1){
1106+ return;
1107+ }
1108+
1109+ // 親の高さ
1110+ var height = parent.document.documentElement.clientHeight;
1111+ var queryHeight = 0;
1112+ // query部分の自動調整は、justFrameHeightと同様の処理。
1113+ var sw = document.documentElement.scrollWidth;
1114+ var cw = document.documentElement.clientWidth;
1115+ var isFF = ( /a/[-1]=='a' );
1116+ $(list).each(function(idx, obj){
1117+ if(idx != list.length - 1){
1118+ var endMarkObj = $('#END_MARKER', $(obj).contents());
1119+ var trg = endMarkObj[0];
1120+ var margin = 5;
1121+ if( isFF || sw != cw ) { margin += 14; }
1122+ var tempRow = trg.offsetTop + trg.parentNode.offsetTop + margin;
1123+ $(obj).height(tempRow);
1124+ // クエリー部の高さを加算(スクロールを表示させないため、余分に8pxを加算)
1125+ queryHeight = queryHeight + tempRow + 8;
1126+ }else{
1127+ // 最後のiframeは高さを計算して、設定。
1128+ // 非表示にしないため、min-heightを設定。
1129+ $(obj).css('height','calc(100% - ' + queryHeight + 'px)' ).css('min-height','100px');
1130+ }
1131+ });
1132+}
\ No newline at end of file
--- trunk/opengionV5/uap/webapps/gf/src/script/common/option/iframe.css (nonexistent)
+++ trunk/opengionV5/uap/webapps/gf/src/script/common/option/iframe.css (revision 1608)
@@ -0,0 +1,61 @@
1+/*
2+ * iframe
3+ * frameをiframeに置換して、
4+ * resultを2つに分ける場合のcss
5+ * 5.10.1.1 (2018/07/13) ADD
6+*/
7+/* RESULTを分割用 */
8+.HYBS_IFRAME_RESULT{
9+ width:calc(100% - 4px);
10+ height:100%;
11+}
12+
13+/* RESULTを水平分割用 */
14+.HYBD_IFRAME_RESULT_HORIZON{
15+ display: grid;
16+ display: -ms-grid;
17+ grid-template-columns: 1fr;
18+ -ms-grid-columns: 1fr;
19+ grid-template-rows: minmax(200px, 50%) minmax(200px, 1fr);
20+ -ms-grid-rows: minmax(200px, 50%) minmax(200px, 1fr);
21+ height: calc(100% - 4px);
22+}
23+
24+.HYBS_IFRAME_RESULT_UP{
25+ grid-column: 1;
26+ grid-row: 1;
27+ -ms-grid-column: 1;
28+ -ms-grid-row: 1;
29+}
30+
31+.HYBS_IFRAME_RESULT_DOWN{
32+ grid-column: 1;
33+ grid-row: 2;
34+ -ms-grid-column: 1;
35+ -ms-grid-row: 2;
36+}
37+
38+/* RESULTを垂直分割用 */
39+.HYBD_IFRAME_RESULT_VERTICAL{
40+ display: grid;
41+ display: -ms-grid;
42+ grid-template-columns: minmax(300px, 50%) minmax(300px, 1fr);
43+ -ms-grid-columns: minmax(300px, 50%) minmax(300px, 1fr);
44+ grid-template-rows: 1fr;
45+ -ms-grid-rows: 1fr;
46+ height: calc(100% - 4px);
47+}
48+
49+.HYBS_IFRAME_RESULT_LEFT{
50+ grid-column: 1;
51+ grid-row: 1;
52+ -ms-grid-column: 1;
53+ -ms-gird-row: 1;
54+}
55+
56+.HYBS_IFRAME_RESULT_RIGHT{
57+ grid-column: 2;
58+ grid-row: 1;
59+ -ms-grid-column: 2;
60+ -ms-grid-row: 1;
61+}
\ No newline at end of file
--- trunk/opengionV5/uap/webapps/gf/src/script/common/queryScript.js (revision 1607)
+++ trunk/opengionV5/uap/webapps/gf/src/script/common/queryScript.js (revision 1608)
@@ -141,9 +141,61 @@
141141 }
142142 }
143143
144+/*
145+ * 5.10.1.1 (2018/07/13) frameのiframe変換対応。
146+ * 3色ボタンの右上クリック時の動作。
147+ * query部の表示、非表示の切り替えを行う。
148+ */
149+function toggleSubFrame_Iframe( tdx ){
150+ var queryHeight,queryIframe,old_height;
151+ queryIframe = $('iframe[name=QUERY]', parent.document);
152+
153+ // 親にname=QUERYのiframeが存在しない場合、何もしない
154+ if(queryIframe.length < 1){
155+ return;
156+ }
157+
158+ if(toggleRow){
159+ // queryの表示をもとに戻す
160+ toggleRow = false;
161+ old_height = Number($(queryIframe).attr('old_height'));
162+ queryIframe.height(old_height);
163+ queryHeight = old_height;
164+
165+ if( tdx != null ) {
166+ if( tdx.className.length == 0 ) { tdx.style.backgroundColor = "Green"; }
167+ else { tdx.className = "toggleSub"; }
168+ }
169+ }else{
170+ // queryのheader部のみ表示
171+ toggleRow = true;
172+ var tbl = $(queryIframe).contents().find('#QUERY_TBL')[0];
173+ // メニューテーブルの高さを計算
174+ queryHeight = tbl.offsetTop + tbl.offsetHeight + tbl.parentNode.offsetTop;
175+ // 元の高さを保持
176+// old_height = queryIframe.height();
177+ $(queryIframe).attr('old_height',queryIframe.height());
178+ // クエリー部をメニューテーブルのみ表示する高さに設定
179+ queryIframe.height(queryHeight);
180+
181+ // クラス設定はframeと同様
182+ if( tdx != null ) {
183+ if( tdx.className.length == 0 ) { tdx.style.backgroundColor = "Gray"; }
184+ else { tdx.className = "toggleOff"; }
185+ }
186+ }
187+
188+ // result部の自動調整
189+ var result = $('iframe[name=RESULT]', parent.document);
190+ $(result).css('height','calc(100% - ' + queryHeight + 'px - 8px)');
191+}
192+
144193 function toggleSubFrame( tdx ) {
145194 var sSubFrameNM , oSubFrame , oFramesets , tbl , orgRows , tempRows , i ;
146195
196+ // frameをiframeに置換した場合の処理 5.10.1.1 (2018/07/13) ADD
197+ toggleSubFrame_Iframe( tdx );
198+
147199 sSubFrameNM = "SUB_FRAME";
148200 oSubFrame = parent.document.getElementById(sSubFrameNM); //IE,Opera
149201 if(!oSubFrame) {
Show on old repository browser