Wao-commits

Download

wao-commits@list.forge.codelutin.com

July 2014

3 participants
82 discussions

r2138 - trunk/wao-persistence/src/main/java/fr/ifremer/wao
by bleny＠users.forge.codelutin.com 09 Jul '14

09 Jul '14

Author: bleny Date: 2014-07-09 14:21:01 +0200 (Wed, 09 Jul 2014) New Revision: 2138 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2138 Log: refs #5375 fix issue after defining applicationconfig app name Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java 2014-07-09 10:20:30 UTC (rev 2137) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java 2014-07-09 12:21:01 UTC (rev 2138) @@ -41,9 +41,16 @@ protected ApplicationConfig applicationConfig; public WaoApplicationConfig() { + applicationConfig = new ApplicationConfig(); + + // to allow using wao.config.path environment variable + applicationConfig.setAppName("wao"); + + // XXX brendan 09/07/14 need to fix encoding whe using setAppName + applicationConfig.setEncoding("UTF-8"); + applicationConfig.loadDefaultOptions(WaoApplicationConfigOption.values()); - applicationConfig.setAppName("wao"); applicationConfig.setConfigFileName("wao.properties"); try { applicationConfig.parse();

1 0

r2137 - trunk/wao-persistence/src/main/java/fr/ifremer/wao
by bleny＠users.forge.codelutin.com 09 Jul '14

09 Jul '14

Author: bleny Date: 2014-07-09 12:20:30 +0200 (Wed, 09 Jul 2014) New Revision: 2137 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2137 Log: fixes #5375 allow to define path to configuration Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java 2014-07-09 08:51:55 UTC (rev 2136) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java 2014-07-09 10:20:30 UTC (rev 2137) @@ -43,6 +43,7 @@ public WaoApplicationConfig() { applicationConfig = new ApplicationConfig(); applicationConfig.loadDefaultOptions(WaoApplicationConfigOption.values()); + applicationConfig.setAppName("wao"); applicationConfig.setConfigFileName("wao.properties"); try { applicationConfig.parse();

1 0

r2136 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com 09 Jul '14

09 Jul '14

Author: bleny Date: 2014-07-09 10:51:55 +0200 (Wed, 09 Jul 2014) New Revision: 2136 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2136 Log: more precision when computing filter values in synthesis Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-07-08 11:45:32 UTC (rev 2135) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-07-09 08:51:55 UTC (rev 2136) @@ -73,6 +73,8 @@ ContactsFilter newFilter = contactsService.newContactFilter(authenticatedWaoUser); + newFilter.setFilterOnObservationBeginDate(true); + return newFilter; }

1 0

r2135 - in trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1: . css js js/locales
by bleny＠users.forge.codelutin.com 08 Jul '14

08 Jul '14

Author: bleny Date: 2014-07-08 13:45:32 +0200 (Tue, 08 Jul 2014) New Revision: 2135 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2135 Log: header for ignored files Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/LICENSE trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/css/bootstrap-datetimepicker.css trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/css/bootstrap-datetimepicker.min.css trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.min.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ar.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.bg.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ca.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.cs.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.da.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.de.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ee.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.el.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.es.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fi.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fr.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.he.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.hr.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.hu.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.id.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.is.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.it.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ja.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ko.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.lt.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.lv.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ms.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.nb.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.nl.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.no.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pl.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pt-BR.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pt.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ro.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.rs-latin.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.rs.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ru.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sk.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sl.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sv.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sw.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.th.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.tr.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ua.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.uk.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.zh-CN.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.zh-TW.js Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/LICENSE =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/LICENSE 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/LICENSE 2014-07-08 11:45:32 UTC (rev 2135) @@ -199,3 +199,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/css/bootstrap-datetimepicker.css =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/css/bootstrap-datetimepicker.css 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/css/bootstrap-datetimepicker.css 2014-07-08 11:45:32 UTC (rev 2135) @@ -412,3 +412,6 @@ width: 14px; height: 14px; } + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/css/bootstrap-datetimepicker.min.css =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/css/bootstrap-datetimepicker.min.css 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/css/bootstrap-datetimepicker.min.css 2014-07-08 11:45:32 UTC (rev 2135) @@ -6,4 +6,6 @@ * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * - */.datetimepicker{padding:4px;margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;direction:ltr}.datetimepicker-inline{width:220px}.datetimepicker.datetimepicker-rtl{direction:rtl}.datetimepicker.datetimepicker-rtl table tr td span{float:right}.datetimepicker-dropdown,.datetimepicker-dropdown-left{top:0;left:0}[class*=" datetimepicker-dropdown"]:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,0.2);position:absolute}[class*=" datetimepicker-dropdown"]:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute}[class*=" datetimepicker-dropdown-top"]:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #ccc;border-top-color:rgba(0,0,0,0.2);border-bottom:0}[class*=" datetimepicker-dropdown-top"]:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-top:6px solid #fff;border-bottom:0}.datetimepicker-dropdown-bottom-left:before{top:-7px;right:6px}.datetimepicker-dropdown-bottom-left:after{top:-6px;right:7px}.datetimepicker-dropdown-bottom-right:before{top:-7px;left:6px}.datetimepicker-dropdown-bottom-right:after{top:-6px;left:7px}.datetimepicker-dropdown-top-left:before{bottom:-7px;right:6px}.datetimepicker-dropdown-top-left:after{bottom:-6px;right:7px}.datetimepicker-dropdown-top-right:before{bottom:-7px;left:6px}.datetimepicker-dropdown-top-right:after{bottom:-6px;left:7px}.datetimepicker>div{display:none}.datetimepicker.minutes div.datetimepicker-minutes{display:block}.datetimepicker.hours div.datetimepicker-hours{display:block}.datetimepicker.days div.datetimepicker-days{display:block}.datetimepicker.months div.datetimepicker-months{display:block}.datetimepicker.years div.datetimepicker-years{display:block}.datetimepicker table{margin:0}.datetimepicker td,.datetimepicker th{text-align:center;width:20px;height:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0}.table-striped .datetimepicker table tr td,.table-striped .datetimepicker table tr th{background-color:transparent}.datetimepicker table tr td.minute:hover{background:#eee;cursor:pointer}.datetimepicker table tr td.hour:hover{background:#eee;cursor:pointer}.datetimepicker table tr td.day:hover{background:#eee;cursor:pointer}.datetimepicker table tr td.old,.datetimepicker table tr td.new{color:#999}.datetimepicker table tr td.disabled,.datetimepicker table tr td.disabled:hover{background:0;color:#999;cursor:default}.datetimepicker table tr td.today,.datetimepicker table tr td.today:hover,.datetimepicker table tr td.today.disabled,.datetimepicker table tr td.today.disabled:hover{background-color:#fde19a;background-image:-moz-linear-gradient(top,#fdd49a,#fdf59a);background-image:-ms-linear-gradient(top,#fdd49a,#fdf59a);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdd49a),to(#fdf59a));background-image:-webkit-linear-gradient(top,#fdd49a,#fdf59a);background-image:-o-linear-gradient(top,#fdd49a,#fdf59a);background-image:linear-gradient(top,#fdd49a,#fdf59a);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a',endColorstr='#fdf59a',GradientType=0);border-color:#fdf59a #fdf59a #fbed50;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.datetimepicker table tr td.today:hover,.datetimepicker table tr td.today:hover:hover,.datetimepicker table tr td.today.disabled:hover,.datetimepicker table tr td.today.disabled:hover:hover,.datetimepicker table tr td.today:active,.datetimepicker table tr td.today:hover:active,.datetimepicker table tr td.today.disabled:active,.datetimepicker table tr td.today.disabled:hover:active,.datetimepicker table tr td.today.active,.datetimepicker table tr td.today:hover.active,.datetimepicker table tr td.today.disabled.active,.datetimepicker table tr td.today.disabled:hover.active,.datetimepicker table tr td.today.disabled,.datetimepicker table tr td.today:hover.disabled,.datetimepicker table tr td.today.disabled.disabled,.datetimepicker table tr td.today.disabled:hover.disabled,.datetimepicker table tr td.today[disabled],.datetimepicker table tr td.today:hover[disabled],.datetimepicker table tr td.today.disabled[disabled],.datetimepicker table tr td.today.disabled:hover[disabled]{background-color:#fdf59a}.datetimepicker table tr td.today:active,.datetimepicker table tr td.today:hover:active,.datetimepicker table tr td.today.disabled:active,.datetimepicker table tr td.today.disabled:hover:active,.datetimepicker table tr td.today.active,.datetimepicker table tr td.today:hover.active,.datetimepicker table tr td.today.disabled.active,.datetimepicker table tr td.today.disabled:hover.active{background-color:#fbf069}.datetimepicker table tr td.active,.datetimepicker table tr td.active:hover,.datetimepicker table tr td.active.disabled,.datetimepicker table tr td.active.disabled:hover{background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-ms-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(top,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc',endColorstr='#0044cc',GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.datetimepicker table tr td.active:hover,.datetimepicker table tr td.active:hover:hover,.datetimepicker table tr td.active.disabled:hover,.datetimepicker table tr td.active.disabled:hover:hover,.datetimepicker table tr td.active:active,.datetimepicker table tr td.active:hover:active,.datetimepicker table tr td.active.disabled:active,.datetimepicker table tr td.active.disabled:hover:active,.datetimepicker table tr td.active.active,.datetimepicker table tr td.active:hover.active,.datetimepicker table tr td.active.disabled.active,.datetimepicker table tr td.active.disabled:hover.active,.datetimepicker table tr td.active.disabled,.datetimepicker table tr td.active:hover.disabled,.datetimepicker table tr td.active.disabled.disabled,.datetimepicker table tr td.active.disabled:hover.disabled,.datetimepicker table tr td.active[disabled],.datetimepicker table tr td.active:hover[disabled],.datetimepicker table tr td.active.disabled[disabled],.datetimepicker table tr td.active.disabled:hover[disabled]{background-color:#04c}.datetimepicker table tr td.active:active,.datetimepicker table tr td.active:hover:active,.datetimepicker table tr td.active.disabled:active,.datetimepicker table tr td.active.disabled:hover:active,.datetimepicker table tr td.active.active,.datetimepicker table tr td.active:hover.active,.datetimepicker table tr td.active.disabled.active,.datetimepicker table tr td.active.disabled:hover.active{background-color:#039}.datetimepicker table tr td span{display:block;width:23%;height:54px;line-height:54px;float:left;margin:1%;cursor:pointer;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.datetimepicker .datetimepicker-hours span{height:26px;line-height:26px}.datetimepicker .datetimepicker-hours table tr td span.hour_am,.datetimepicker .datetimepicker-hours table tr td span.hour_pm{width:14.6%}.datetimepicker .datetimepicker-hours fieldset legend,.datetimepicker .datetimepicker-minutes fieldset legend{margin-bottom:inherit;line-height:30px}.datetimepicker .datetimepicker-minutes span{height:26px;line-height:26px}.datetimepicker table tr td span:hover{background:#eee}.datetimepicker table tr td span.disabled,.datetimepicker table tr td span.disabled:hover{background:0;color:#999;cursor:default}.datetimepicker table tr td span.active,.datetimepicker table tr td span.active:hover,.datetimepicker table tr td span.active.disabled,.datetimepicker table tr td span.active.disabled:hover{background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-ms-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(top,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc',endColorstr='#0044cc',GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.datetimepicker table tr td span.active:hover,.datetimepicker table tr td span.active:hover:hover,.datetimepicker table tr td span.active.disabled:hover,.datetimepicker table tr td span.active.disabled:hover:hover,.datetimepicker table tr td span.active:active,.datetimepicker table tr td span.active:hover:active,.datetimepicker table tr td span.active.disabled:active,.datetimepicker table tr td span.active.disabled:hover:active,.datetimepicker table tr td span.active.active,.datetimepicker table tr td span.active:hover.active,.datetimepicker table tr td span.active.disabled.active,.datetimepicker table tr td span.active.disabled:hover.active,.datetimepicker table tr td span.active.disabled,.datetimepicker table tr td span.active:hover.disabled,.datetimepicker table tr td span.active.disabled.disabled,.datetimepicker table tr td span.active.disabled:hover.disabled,.datetimepicker table tr td span.active[disabled],.datetimepicker table tr td span.active:hover[disabled],.datetimepicker table tr td span.active.disabled[disabled],.datetimepicker table tr td span.active.disabled:hover[disabled]{background-color:#04c}.datetimepicker table tr td span.active:active,.datetimepicker table tr td span.active:hover:active,.datetimepicker table tr td span.active.disabled:active,.datetimepicker table tr td span.active.disabled:hover:active,.datetimepicker table tr td span.active.active,.datetimepicker table tr td span.active:hover.active,.datetimepicker table tr td span.active.disabled.active,.datetimepicker table tr td span.active.disabled:hover.active{background-color:#039}.datetimepicker table tr td span.old{color:#999}.datetimepicker th.switch{width:145px}.datetimepicker thead tr:first-child th,.datetimepicker tfoot tr:first-child th{cursor:pointer}.datetimepicker thead tr:first-child th:hover,.datetimepicker tfoot tr:first-child th:hover{background:#eee}.input-append.date .add-on i,.input-prepend.date .add-on i,.input-group.date .input-group-addon span{cursor:pointer;width:14px;height:14px} \ No newline at end of file + */.datetimepicker{padding:4px;margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;direction:ltr}.datetimepicker-inline{width:220px}.datetimepicker.datetimepicker-rtl{direction:rtl}.datetimepicker.datetimepicker-rtl table tr td span{float:right}.datetimepicker-dropdown,.datetimepicker-dropdown-left{top:0;left:0}[class*=" datetimepicker-dropdown"]:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,0.2);position:absolute}[class*=" datetimepicker-dropdown"]:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute}[class*=" datetimepicker-dropdown-top"]:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #ccc;border-top-color:rgba(0,0,0,0.2);border-bottom:0}[class*=" datetimepicker-dropdown-top"]:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-top:6px solid #fff;border-bottom:0}.datetimepicker-dropdown-bottom-left:before{top:-7px;right:6px}.datetimepicker-dropdown-bottom-left:after{top:-6px;right:7px}.datetimepicker-dropdown-bottom-right:before{top:-7px;left:6px}.datetimepicker-dropdown-bottom-right:after{top:-6px;left:7px}.datetimepicker-dropdown-top-left:before{bottom:-7px;right:6px}.datetimepicker-dropdown-top-left:after{bottom:-6px;right:7px}.datetimepicker-dropdown-top-right:before{bottom:-7px;left:6px}.datetimepicker-dropdown-top-right:after{bottom:-6px;left:7px}.datetimepicker>div{display:none}.datetimepicker.minutes div.datetimepicker-minutes{display:block}.datetimepicker.hours div.datetimepicker-hours{display:block}.datetimepicker.days div.datetimepicker-days{display:block}.datetimepicker.months div.datetimepicker-months{display:block}.datetimepicker.years div.datetimepicker-years{display:block}.datetimepicker table{margin:0}.datetimepicker td,.datetimepicker th{text-align:center;width:20px;height:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0}.table-striped .datetimepicker table tr td,.table-striped .datetimepicker table tr th{background-color:transparent}.datetimepicker table tr td.minute:hover{background:#eee;cursor:pointer}.datetimepicker table tr td.hour:hover{background:#eee;cursor:pointer}.datetimepicker table tr td.day:hover{background:#eee;cursor:pointer}.datetimepicker table tr td.old,.datetimepicker table tr td.new{color:#999}.datetimepicker table tr td.disabled,.datetimepicker table tr td.disabled:hover{background:0;color:#999;cursor:default}.datetimepicker table tr td.today,.datetimepicker table tr td.today:hover,.datetimepicker table tr td.today.disabled,.datetimepicker table tr td.today.disabled:hover{background-color:#fde19a;background-image:-moz-linear-gradient(top,#fdd49a,#fdf59a);background-image:-ms-linear-gradient(top,#fdd49a,#fdf59a);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdd49a),to(#fdf59a));background-image:-webkit-linear-gradient(top,#fdd49a,#fdf59a);background-image:-o-linear-gradient(top,#fdd49a,#fdf59a);background-image:linear-gradient(top,#fdd49a,#fdf59a);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a',endColorstr='#fdf59a',GradientType=0);border-color:#fdf59a #fdf59a #fbed50;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.datetimepicker table tr td.today:hover,.datetimepicker table tr td.today:hover:hover,.datetimepicker table tr td.today.disabled:hover,.datetimepicker table tr td.today.disabled:hover:hover,.datetimepicker table tr td.today:active,.datetimepicker table tr td.today:hover:active,.datetimepicker table tr td.today.disabled:active,.datetimepicker table tr td.today.disabled:hover:active,.datetimepicker table tr td.today.active,.datetimepicker table tr td.today:hover.active,.datetimepicker table tr td.today.disabled.active,.datetimepicker table tr td.today.disabled:hover.active,.datetimepicker table tr td.today.disabled,.datetimepicker table tr td.today:hover.disabled,.datetimepicker table tr td.today.disabled.disabled,.datetimepicker table tr td.today.disabled:hover.disabled,.datetimepicker table tr td.today[disabled],.datetimepicker table tr td.today:hover[disabled],.datetimepicker table tr td.today.disabled[disabled],.datetimepicker table tr td.today.disabled:hover[disabled]{background-color:#fdf59a}.datetimepicker table tr td.today:active,.datetimepicker table tr td.today:hover:active,.datetimepicker table tr td.today.disabled:active,.datetimepicker table tr td.today.disabled:hover:active,.datetimepicker table tr td.today.active,.datetimepicker table tr td.today:hover.active,.datetimepicker table tr td.today.disabled.active,.datetimepicker table tr td.today.disabled:hover.active{background-color:#fbf069}.datetimepicker table tr td.active,.datetimepicker table tr td.active:hover,.datetimepicker table tr td.active.disabled,.datetimepicker table tr td.active.disabled:hover{background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-ms-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(top,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc',endColorstr='#0044cc',GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.datetimepicker table tr td.active:hover,.datetimepicker table tr td.active:hover:hover,.datetimepicker table tr td.active.disabled:hover,.datetimepicker table tr td.active.disabled:hover:hover,.datetimepicker table tr td.active:active,.datetimepicker table tr td.active:hover:active,.datetimepicker table tr td.active.disabled:active,.datetimepicker table tr td.active.disabled:hover:active,.datetimepicker table tr td.active.active,.datetimepicker table tr td.active:hover.active,.datetimepicker table tr td.active.disabled.active,.datetimepicker table tr td.active.disabled:hover.active,.datetimepicker table tr td.active.disabled,.datetimepicker table tr td.active:hover.disabled,.datetimepicker table tr td.active.disabled.disabled,.datetimepicker table tr td.active.disabled:hover.disabled,.datetimepicker table tr td.active[disabled],.datetimepicker table tr td.active:hover[disabled],.datetimepicker table tr td.active.disabled[disabled],.datetimepicker table tr td.active.disabled:hover[disabled]{background-color:#04c}.datetimepicker table tr td.active:active,.datetimepicker table tr td.active:hover:active,.datetimepicker table tr td.active.disabled:active,.datetimepicker table tr td.active.disabled:hover:active,.datetimepicker table tr td.active.active,.datetimepicker table tr td.active:hover.active,.datetimepicker table tr td.active.disabled.active,.datetimepicker table tr td.active.disabled:hover.active{background-color:#039}.datetimepicker table tr td span{display:block;width:23%;height:54px;line-height:54px;float:left;margin:1%;cursor:pointer;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.datetimepicker .datetimepicker-hours span{height:26px;line-height:26px}.datetimepicker .datetimepicker-hours table tr td span.hour_am,.datetimepicker .datetimepicker-hours table tr td span.hour_pm{width:14.6%}.datetimepicker .datetimepicker-hours fieldset legend,.datetimepicker .datetimepicker-minutes fieldset legend{margin-bottom:inherit;line-height:30px}.datetimepicker .datetimepicker-minutes span{height:26px;line-height:26px}.datetimepicker table tr td span:hover{background:#eee}.datetimepicker table tr td span.disabled,.datetimepicker table tr td span.disabled:hover{background:0;color:#999;cursor:default}.datetimepicker table tr td span.active,.datetimepicker table tr td span.active:hover,.datetimepicker table tr td span.active.disabled,.datetimepicker table tr td span.active.disabled:hover{background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-ms-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(top,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc',endColorstr='#0044cc',GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.datetimepicker table tr td span.active:hover,.datetimepicker table tr td span.active:hover:hover,.datetimepicker table tr td span.active.disabled:hover,.datetimepicker table tr td span.active.disabled:hover:hover,.datetimepicker table tr td span.active:active,.datetimepicker table tr td span.active:hover:active,.datetimepicker table tr td span.active.disabled:active,.datetimepicker table tr td span.active.disabled:hover:active,.datetimepicker table tr td span.active.active,.datetimepicker table tr td span.active:hover.active,.datetimepicker table tr td span.active.disabled.active,.datetimepicker table tr td span.active.disabled:hover.active,.datetimepicker table tr td span.active.disabled,.datetimepicker table tr td span.active:hover.disabled,.datetimepicker table tr td span.active.disabled.disabled,.datetimepicker table tr td span.active.disabled:hover.disabled,.datetimepicker table tr td span.active[disabled],.datetimepicker table tr td span.active:hover[disabled],.datetimepicker table tr td span.active.disabled[disabled],.datetimepicker table tr td span.active.disabled:hover[disabled]{background-color:#04c}.datetimepicker table tr td span.active:active,.datetimepicker table tr td span.active:hover:active,.datetimepicker table tr td span.active.disabled:active,.datetimepicker table tr td span.active.disabled:hover:active,.datetimepicker table tr td span.active.active,.datetimepicker table tr td span.active:hover.active,.datetimepicker table tr td span.active.disabled.active,.datetimepicker table tr td span.active.disabled:hover.active{background-color:#039}.datetimepicker table tr td span.old{color:#999}.datetimepicker th.switch{width:145px}.datetimepicker thead tr:first-child th,.datetimepicker tfoot tr:first-child th{cursor:pointer}.datetimepicker thead tr:first-child th:hover,.datetimepicker tfoot tr:first-child th:hover{background:#eee}.input-append.date .add-on i,.input-prepend.date .add-on i,.input-group.date .input-group-addon span{cursor:pointer;width:14px;height:14px} + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -1726,3 +1726,6 @@ }); }(window.jQuery); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.min.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.min.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.min.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -1 +1,3 @@ -!function(c){function f(){return new Date(Date.UTC.apply(Date,arguments))}function a(){var g=new Date();return f(g.getUTCFullYear(),g.getUTCMonth(),g.getUTCDate(),g.getUTCHours(),g.getUTCMinutes(),g.getUTCSeconds(),0)}var e=function(h,g){var i=this;this.element=c(h);this.container=g.container||"body";this.language=g.language||this.element.data("date-language")||"en";this.language=this.language in d?this.language:"en";this.isRTL=d[this.language].rtl||false;this.formatType=g.formatType||this.element.data("format-type")||"standard";this.format=b.parseFormat(g.format||this.element.data("date-format")||d[this.language].format||b.getDefaultFormat(this.formatType,"input"),this.formatType);this.isInline=false;this.isVisible=false;this.isInput=this.element.is("input");this.bootcssVer=this.isInput?(this.element.is(".form-control")?3:2):(this.bootcssVer=this.element.is(".input-group")?3:2);this.component=this.element.is(".date")?(this.bootcssVer==3?this.element.find(".input-group-addon .glyphicon-th, .input-group-addon .glyphicon-time, .input-group-addon .glyphicon-calendar").parent():this.element.find(".add-on .icon-th, .add-on .icon-time, .add-on .icon-calendar").parent()):false;this.componentReset=this.element.is(".date")?(this.bootcssVer==3?this.element.find(".input-group-addon .glyphicon-remove").parent():this.element.find(".add-on .icon-remove").parent()):false;this.hasInput=this.component&&this.element.find("input").length;if(this.component&&this.component.length===0){this.component=false}this.linkField=g.linkField||this.element.data("link-field")||false;this.linkFormat=b.parseFormat(g.linkFormat||this.element.data("link-format")||b.getDefaultFormat(this.formatType,"link"),this.formatType);this.minuteStep=g.minuteStep||this.element.data("minute-step")||5;this.pickerPosition=g.pickerPosition||this.element.data("picker-position")||"bottom-right";this.showMeridian=g.showMeridian||this.element.data("show-meridian")||false;this.initialDate=g.initialDate||new Date();this._attachEvents();this.formatViewType="datetime";if("formatViewType" in g){this.formatViewType=g.formatViewType}else{if("formatViewType" in this.element.data()){this.formatViewType=this.element.data("formatViewType")}}this.minView=0;if("minView" in g){this.minView=g.minView}else{if("minView" in this.element.data()){this.minView=this.element.data("min-view")}}this.minView=b.convertViewMode(this.minView);this.maxView=b.modes.length-1;if("maxView" in g){this.maxView=g.maxView}else{if("maxView" in this.element.data()){this.maxView=this.element.data("max-view")}}this.maxView=b.convertViewMode(this.maxView);this.wheelViewModeNavigation=false;if("wheelViewModeNavigation" in g){this.wheelViewModeNavigation=g.wheelViewModeNavigation}else{if("wheelViewModeNavigation" in this.element.data()){this.wheelViewModeNavigation=this.element.data("view-mode-wheel-navigation")}}this.wheelViewModeNavigationInverseDirection=false;if("wheelViewModeNavigationInverseDirection" in g){this.wheelViewModeNavigationInverseDirection=g.wheelViewModeNavigationInverseDirection}else{if("wheelViewModeNavigationInverseDirection" in this.element.data()){this.wheelViewModeNavigationInverseDirection=this.element.data("view-mode-wheel-navigation-inverse-dir")}}this.wheelViewModeNavigationDelay=100;if("wheelViewModeNavigationDelay" in g){this.wheelViewModeNavigationDelay=g.wheelViewModeNavigationDelay}else{if("wheelViewModeNavigationDelay" in this.element.data()){this.wheelViewModeNavigationDelay=this.element.data("view-mode-wheel-navigation-delay")}}this.startViewMode=2;if("startView" in g){this.startViewMode=g.startView}else{if("startView" in this.element.data()){this.startViewMode=this.element.data("start-view")}}this.startViewMode=b.convertViewMode(this.startViewMode);this.viewMode=this.startViewMode;this.viewSelect=this.minView;if("viewSelect" in g){this.viewSelect=g.viewSelect}else{if("viewSelect" in this.element.data()){this.viewSelect=this.element.data("view-select")}}this.viewSelect=b.convertViewMode(this.viewSelect);this.forceParse=true;if("forceParse" in g){this.forceParse=g.forceParse}else{if("dateForceParse" in this.element.data()){this.forceParse=this.element.data("date-force-parse")}}this.picker=c((this.bootcssVer==3)?b.templateV3:b.template).appendTo(this.isInline?this.element:this.container).on({click:c.proxy(this.click,this),mousedown:c.proxy(this.mousedown,this)});if(this.wheelViewModeNavigation){if(c.fn.mousewheel){this.picker.on({mousewheel:c.proxy(this.mousewheel,this)})}else{console.log("Mouse Wheel event is not supported. Please include the jQuery Mouse Wheel plugin before enabling this option")}}if(this.isInline){this.picker.addClass("datetimepicker-inline")}else{this.picker.addClass("datetimepicker-dropdown-"+this.pickerPosition+" dropdown-menu")}if(this.isRTL){this.picker.addClass("datetimepicker-rtl");if(this.bootcssVer==3){this.picker.find(".prev span, .next span").toggleClass("glyphicon-arrow-left glyphicon-arrow-right")}else{this.picker.find(".prev i, .next i").toggleClass("icon-arrow-left icon-arrow-right")}}c(document).on("mousedown",function(j){if(c(j.target).closest(".datetimepicker").length===0){i.hide()}});this.autoclose=false;if("autoclose" in g){this.autoclose=g.autoclose}else{if("dateAutoclose" in this.element.data()){this.autoclose=this.element.data("date-autoclose")}}this.keyboardNavigation=true;if("keyboardNavigation" in g){this.keyboardNavigation=g.keyboardNavigation}else{if("dateKeyboardNavigation" in this.element.data()){this.keyboardNavigation=this.element.data("date-keyboard-navigation")}}this.todayBtn=(g.todayBtn||this.element.data("date-today-btn")||false);this.todayHighlight=(g.todayHighlight||this.element.data("date-today-highlight")||false);this.weekStart=((g.weekStart||this.element.data("date-weekstart")||d[this.language].weekStart||0)%7);this.weekEnd=((this.weekStart+6)%7);this.startDate=-Infinity;this.endDate=Infinity;this.daysOfWeekDisabled=[];this.setStartDate(g.startDate||this.element.data("date-startdate"));this.setEndDate(g.endDate||this.element.data("date-enddate"));this.setDaysOfWeekDisabled(g.daysOfWeekDisabled||this.element.data("date-days-of-week-disabled"));this.fillDow();this.fillMonths();this.update();this.showMode();if(this.isInline){this.show()}};e.prototype={constructor:e,_events:[],_attachEvents:function(){this._detachEvents();if(this.isInput){this._events=[[this.element,{focus:c.proxy(this.show,this),keyup:c.proxy(this.update,this),keydown:c.proxy(this.keydown,this)}]]}else{if(this.component&&this.hasInput){this._events=[[this.element.find("input"),{focus:c.proxy(this.show,this),keyup:c.proxy(this.update,this),keydown:c.proxy(this.keydown,this)}],[this.component,{click:c.proxy(this.show,this)}]];if(this.componentReset){this._events.push([this.componentReset,{click:c.proxy(this.reset,this)}])}}else{if(this.element.is("div")){this.isInline=true}else{this._events=[[this.element,{click:c.proxy(this.show,this)}]]}}}for(var g=0,h,j;g<this._events.length;g++){h=this._events[g][0];j=this._events[g][1];h.on(j)}},_detachEvents:function(){for(var g=0,h,j;g<this._events.length;g++){h=this._events[g][0];j=this._events[g][1];h.off(j)}this._events=[]},show:function(g){this.picker.show();this.height=this.component?this.component.outerHeight():this.element.outerHeight();if(this.forceParse){this.update()}this.place();c(window).on("resize",c.proxy(this.place,this));if(g){g.stopPropagation();g.preventDefault()}this.isVisible=true;this.element.trigger({type:"show",date:this.date})},hide:function(g){if(!this.isVisible){return}if(this.isInline){return}this.picker.hide();c(window).off("resize",this.place);this.viewMode=this.startViewMode;this.showMode();if(!this.isInput){c(document).off("mousedown",this.hide)}if(this.forceParse&&(this.isInput&&this.element.val()||this.hasInput&&this.element.find("input").val())){this.setValue()}this.isVisible=false;this.element.trigger({type:"hide",date:this.date})},remove:function(){this._detachEvents();this.picker.remove();delete this.picker;delete this.element.data().datetimepicker},getDate:function(){var g=this.getUTCDate();return new Date(g.getTime()+(g.getTimezoneOffset()*60000))},getUTCDate:function(){return this.date},setDate:function(g){this.setUTCDate(new Date(g.getTime()-(g.getTimezoneOffset()*60000)))},setUTCDate:function(g){if(g>=this.startDate&&g<=this.endDate){this.date=g;this.setValue();this.viewDate=this.date;this.fill()}else{this.element.trigger({type:"outOfRange",date:g,startDate:this.startDate,endDate:this.endDate})}},setFormat:function(h){this.format=b.parseFormat(h,this.formatType);var g;if(this.isInput){g=this.element}else{if(this.component){g=this.element.find("input")}}if(g&&g.val()){this.setValue()}},setValue:function(){var g=this.getFormattedDate();if(!this.isInput){if(this.component){this.element.find("input").val(g)}this.element.data("date",g)}else{this.element.val(g)}if(this.linkField){c("#"+this.linkField).val(this.getFormattedDate(this.linkFormat))}},getFormattedDate:function(g){if(g==undefined){g=this.format}return b.formatDate(this.date,g,this.language,this.formatType)},setStartDate:function(g){this.startDate=g||-Infinity;if(this.startDate!==-Infinity){this.startDate=b.parseDate(this.startDate,this.format,this.language,this.formatType)}this.update();this.updateNavArrows()},setEndDate:function(g){this.endDate=g||Infinity;if(this.endDate!==Infinity){this.endDate=b.parseDate(this.endDate,this.format,this.language,this.formatType)}this.update();this.updateNavArrows()},setDaysOfWeekDisabled:function(g){this.daysOfWeekDisabled=g||[];if(!c.isArray(this.daysOfWeekDisabled)){this.daysOfWeekDisabled=this.daysOfWeekDisabled.split(/,\s*/)}this.daysOfWeekDisabled=c.map(this.daysOfWeekDisabled,function(h){return parseInt(h,10)});this.update();this.updateNavArrows()},place:function(){if(this.isInline){return}var g=0;c("div").each(function(){var m=parseInt(c(this).css("zIndex"),10);if(m>g){g=m}});var l=g+10;var k,j,i,h;if(this.container instanceof c){h=this.container.offset()}else{h=c(this.container).offset()}if(this.component){k=this.component.offset();i=k.left;if(this.pickerPosition=="bottom-left"||this.pickerPosition=="top-left"){i+=this.component.outerWidth()-this.picker.outerWidth()}}else{k=this.element.offset();i=k.left}if(i+220>document.body.clientWidth){i=document.body.clientWidth-220}if(this.pickerPosition=="top-left"||this.pickerPosition=="top-right"){j=k.top-this.picker.outerHeight()}else{j=k.top+this.height}j=j-h.top;i=i-h.left;this.picker.css({top:j,left:i,zIndex:l})},update:function(){var g,h=false;if(arguments&&arguments.length&&(typeof arguments[0]==="string"||arguments[0] instanceof Date)){g=arguments[0];h=true}else{g=(this.isInput?this.element.val():this.element.find("input").val())||this.element.data("date")||this.initialDate;if(typeof g=="string"||g instanceof String){g=g.replace(/^\s+|\s+$/g,"")}}if(!g){g=new Date();h=false}this.date=b.parseDate(g,this.format,this.language,this.formatType);if(h){this.setValue()}if(this.date<this.startDate){this.viewDate=new Date(this.startDate)}else{if(this.date>this.endDate){this.viewDate=new Date(this.endDate)}else{this.viewDate=new Date(this.date)}}this.fill()},fillDow:function(){var g=this.weekStart,h="<tr>";while(g<this.weekStart+7){h+='<th class="dow">'+d[this.language].daysMin[(g++)%7]+"</th>"}h+="</tr>";this.picker.find(".datetimepicker-days thead").append(h)},fillMonths:function(){var h="",g=0;while(g<12){h+='<span class="month">'+d[this.language].monthsShort[g++]+"</span>"}this.picker.find(".datetimepicker-months td").html(h)},fill:function(){if(this.date==null||this.viewDate==null){return}var E=new Date(this.viewDate),q=E.getUTCFullYear(),F=E.getUTCMonth(),j=E.getUTCDate(),z=E.getUTCHours(),u=E.getUTCMinutes(),v=this.startDate!==-Infinity?this.startDate.getUTCFullYear():-Infinity,A=this.startDate!==-Infinity?this.startDate.getUTCMonth():-Infinity,l=this.endDate!==Infinity?this.endDate.getUTCFullYear():Infinity,w=this.endDate!==Infinity?this.endDate.getUTCMonth():Infinity,n=(new f(this.date.getUTCFullYear(),this.date.getUTCMonth(),this.date.getUTCDate())).valueOf(),D=new Date();this.picker.find(".datetimepicker-days thead th:eq(1)").text(d[this.language].months[F]+" "+q);if(this.formatViewType=="time"){var B=z%12?z%12:12;var h=(B<10?"0":"")+B;var m=(u<10?"0":"")+u;var H=d[this.language].meridiem[z<12?0:1];this.picker.find(".datetimepicker-hours thead th:eq(1)").text(h+":"+m+" "+(H?H.toUpperCase():""));this.picker.find(".datetimepicker-minutes thead th:eq(1)").text(h+":"+m+" "+(H?H.toUpperCase():""))}else{this.picker.find(".datetimepicker-hours thead th:eq(1)").text(j+" "+d[this.language].months[F]+" "+q);this.picker.find(".datetimepicker-minutes thead th:eq(1)").text(j+" "+d[this.language].months[F]+" "+q)}this.picker.find("tfoot th.today").text(d[this.language].today).toggle(this.todayBtn!==false);this.updateNavArrows();this.fillMonths();var I=f(q,F-1,28,0,0,0,0),y=b.getDaysInMonth(I.getUTCFullYear(),I.getUTCMonth());I.setUTCDate(y);I.setUTCDate(y-(I.getUTCDay()-this.weekStart+7)%7);var g=new Date(I);g.setUTCDate(g.getUTCDate()+42);g=g.valueOf();var o=[];var r;while(I.valueOf()<g){if(I.getUTCDay()==this.weekStart){o.push("<tr>")}r="";if(I.getUTCFullYear()<q||(I.getUTCFullYear()==q&&I.getUTCMonth()<F)){r+=" old"}else{if(I.getUTCFullYear()>q||(I.getUTCFullYear()==q&&I.getUTCMonth()>F)){r+=" new"}}if(this.todayHighlight&&I.getUTCFullYear()==D.getFullYear()&&I.getUTCMonth()==D.getMonth()&&I.getUTCDate()==D.getDate()){r+=" today"}if(I.valueOf()==n){r+=" active"}if((I.valueOf()+86400000)<=this.startDate||I.valueOf()>this.endDate||c.inArray(I.getUTCDay(),this.daysOfWeekDisabled)!==-1){r+=" disabled"}o.push('<td class="day'+r+'">'+I.getUTCDate()+"</td>");if(I.getUTCDay()==this.weekEnd){o.push("</tr>")}I.setUTCDate(I.getUTCDate()+1)}this.picker.find(".datetimepicker-days tbody").empty().append(o.join(""));o=[];var s="",C="",p="";for(var x=0;x<24;x++){var t=f(q,F,j,x);r="";if((t.valueOf()+3600000)<=this.startDate||t.valueOf()>this.endDate){r+=" disabled"}else{if(z==x){r+=" active"}}if(this.showMeridian&&d[this.language].meridiem.length==2){C=(x<12?d[this.language].meridiem[0]:d[this.language].meridiem[1]);if(C!=p){if(p!=""){o.push("</fieldset>")}o.push('<fieldset class="hour"><legend>'+C.toUpperCase()+"</legend>")}p=C;s=(x%12?x%12:12);o.push('<span class="hour'+r+" hour_"+(x<12?"am":"pm")+'">'+s+"</span>");if(x==23){o.push("</fieldset>")}}else{s=x+":00";o.push('<span class="hour'+r+'">'+s+"</span>")}}this.picker.find(".datetimepicker-hours td").html(o.join(""));o=[];s="",C="",p="";for(var x=0;x<60;x+=this.minuteStep){var t=f(q,F,j,z,x,0);r="";if(t.valueOf()<this.startDate||t.valueOf()>this.endDate){r+=" disabled"}else{if(Math.floor(u/this.minuteStep)==Math.floor(x/this.minuteStep)){r+=" active"}}if(this.showMeridian&&d[this.language].meridiem.length==2){C=(z<12?d[this.language].meridiem[0]:d[this.language].meridiem[1]);if(C!=p){if(p!=""){o.push("</fieldset>")}o.push('<fieldset class="minute"><legend>'+C.toUpperCase()+"</legend>")}p=C;s=(z%12?z%12:12);o.push('<span class="minute'+r+'">'+s+":"+(x<10?"0"+x:x)+"</span>");if(x==59){o.push("</fieldset>")}}else{s=x+":00";o.push('<span class="minute'+r+'">'+z+":"+(x<10?"0"+x:x)+"</span>")}}this.picker.find(".datetimepicker-minutes td").html(o.join(""));var J=this.date.getUTCFullYear();var k=this.picker.find(".datetimepicker-months").find("th:eq(1)").text(q).end().find("span").removeClass("active");if(J==q){k.eq(this.date.getUTCMonth()).addClass("active")}if(q<v||q>l){k.addClass("disabled")}if(q==v){k.slice(0,A).addClass("disabled")}if(q==l){k.slice(w+1).addClass("disabled")}o="";q=parseInt(q/10,10)*10;var G=this.picker.find(".datetimepicker-years").find("th:eq(1)").text(q+"-"+(q+9)).end().find("td");q-=1;for(var x=-1;x<11;x++){o+='<span class="year'+(x==-1||x==10?" old":"")+(J==q?" active":"")+(q<v||q>l?" disabled":"")+'">'+q+"</span>";q+=1}G.html(o);this.place()},updateNavArrows:function(){var k=new Date(this.viewDate),i=k.getUTCFullYear(),j=k.getUTCMonth(),h=k.getUTCDate(),g=k.getUTCHours();switch(this.viewMode){case 0:if(this.startDate!==-Infinity&&i<=this.startDate.getUTCFullYear()&&j<=this.startDate.getUTCMonth()&&h<=this.startDate.getUTCDate()&&g<=this.startDate.getUTCHours()){this.picker.find(".prev").css({visibility:"hidden"})}else{this.picker.find(".prev").css({visibility:"visible"})}if(this.endDate!==Infinity&&i>=this.endDate.getUTCFullYear()&&j>=this.endDate.getUTCMonth()&&h>=this.endDate.getUTCDate()&&g>=this.endDate.getUTCHours()){this.picker.find(".next").css({visibility:"hidden"})}else{this.picker.find(".next").css({visibility:"visible"})}break;case 1:if(this.startDate!==-Infinity&&i<=this.startDate.getUTCFullYear()&&j<=this.startDate.getUTCMonth()&&h<=this.startDate.getUTCDate()){this.picker.find(".prev").css({visibility:"hidden"})}else{this.picker.find(".prev").css({visibility:"visible"})}if(this.endDate!==Infinity&&i>=this.endDate.getUTCFullYear()&&j>=this.endDate.getUTCMonth()&&h>=this.endDate.getUTCDate()){this.picker.find(".next").css({visibility:"hidden"})}else{this.picker.find(".next").css({visibility:"visible"})}break;case 2:if(this.startDate!==-Infinity&&i<=this.startDate.getUTCFullYear()&&j<=this.startDate.getUTCMonth()){this.picker.find(".prev").css({visibility:"hidden"})}else{this.picker.find(".prev").css({visibility:"visible"})}if(this.endDate!==Infinity&&i>=this.endDate.getUTCFullYear()&&j>=this.endDate.getUTCMonth()){this.picker.find(".next").css({visibility:"hidden"})}else{this.picker.find(".next").css({visibility:"visible"})}break;case 3:case 4:if(this.startDate!==-Infinity&&i<=this.startDate.getUTCFullYear()){this.picker.find(".prev").css({visibility:"hidden"})}else{this.picker.find(".prev").css({visibility:"visible"})}if(this.endDate!==Infinity&&i>=this.endDate.getUTCFullYear()){this.picker.find(".next").css({visibility:"hidden"})}else{this.picker.find(".next").css({visibility:"visible"})}break}},mousewheel:function(h){h.preventDefault();h.stopPropagation();if(this.wheelPause){return}this.wheelPause=true;var g=h.originalEvent;var j=g.wheelDelta;var i=j>0?1:(j===0)?0:-1;if(this.wheelViewModeNavigationInverseDirection){i=-i}this.showMode(i);setTimeout(c.proxy(function(){this.wheelPause=false},this),this.wheelViewModeNavigationDelay)},click:function(k){k.stopPropagation();k.preventDefault();var l=c(k.target).closest("span, td, th, legend");if(l.length==1){if(l.is(".disabled")){this.element.trigger({type:"outOfRange",date:this.viewDate,startDate:this.startDate,endDate:this.endDate});return}switch(l[0].nodeName.toLowerCase()){case"th":switch(l[0].className){case"switch":this.showMode(1);break;case"prev":case"next":var g=b.modes[this.viewMode].navStep*(l[0].className=="prev"?-1:1);switch(this.viewMode){case 0:this.viewDate=this.moveHour(this.viewDate,g);break;case 1:this.viewDate=this.moveDate(this.viewDate,g);break;case 2:this.viewDate=this.moveMonth(this.viewDate,g);break;case 3:case 4:this.viewDate=this.moveYear(this.viewDate,g);break}this.fill();break;case"today":var h=new Date();h=f(h.getFullYear(),h.getMonth(),h.getDate(),h.getHours(),h.getMinutes(),h.getSeconds(),0);if(h<this.startDate){h=this.startDate}else{if(h>this.endDate){h=this.endDate}}this.viewMode=this.startViewMode;this.showMode(0);this._setDate(h);this.fill();if(this.autoclose){this.hide()}break}break;case"span":if(!l.is(".disabled")){var n=this.viewDate.getUTCFullYear(),m=this.viewDate.getUTCMonth(),o=this.viewDate.getUTCDate(),p=this.viewDate.getUTCHours(),i=this.viewDate.getUTCMinutes(),q=this.viewDate.getUTCSeconds();if(l.is(".month")){this.viewDate.setUTCDate(1);m=l.parent().find("span").index(l);o=this.viewDate.getUTCDate();this.viewDate.setUTCMonth(m);this.element.trigger({type:"changeMonth",date:this.viewDate});if(this.viewSelect>=3){this._setDate(f(n,m,o,p,i,q,0))}}else{if(l.is(".year")){this.viewDate.setUTCDate(1);n=parseInt(l.text(),10)||0;this.viewDate.setUTCFullYear(n);this.element.trigger({type:"changeYear",date:this.viewDate});if(this.viewSelect>=4){this._setDate(f(n,m,o,p,i,q,0))}}else{if(l.is(".hour")){p=parseInt(l.text(),10)||0;if(l.hasClass("hour_am")||l.hasClass("hour_pm")){if(p==12&&l.hasClass("hour_am")){p=0}else{if(p!=12&&l.hasClass("hour_pm")){p+=12}}}this.viewDate.setUTCHours(p);this.element.trigger({type:"changeHour",date:this.viewDate});if(this.viewSelect>=1){this._setDate(f(n,m,o,p,i,q,0))}}else{if(l.is(".minute")){i=parseInt(l.text().substr(l.text().indexOf(":")+1),10)||0;this.viewDate.setUTCMinutes(i);this.element.trigger({type:"changeMinute",date:this.viewDate});if(this.viewSelect>=0){this._setDate(f(n,m,o,p,i,q,0))}}}}}if(this.viewMode!=0){var j=this.viewMode;this.showMode(-1);this.fill();if(j==this.viewMode&&this.autoclose){this.hide()}}else{this.fill();if(this.autoclose){this.hide()}}}break;case"td":if(l.is(".day")&&!l.is(".disabled")){var o=parseInt(l.text(),10)||1;var n=this.viewDate.getUTCFullYear(),m=this.viewDate.getUTCMonth(),p=this.viewDate.getUTCHours(),i=this.viewDate.getUTCMinutes(),q=this.viewDate.getUTCSeconds();if(l.is(".old")){if(m===0){m=11;n-=1}else{m-=1}}else{if(l.is(".new")){if(m==11){m=0;n+=1}else{m+=1}}}this.viewDate.setUTCFullYear(n);this.viewDate.setUTCMonth(m,o);this.element.trigger({type:"changeDay",date:this.viewDate});if(this.viewSelect>=2){this._setDate(f(n,m,o,p,i,q,0))}}var j=this.viewMode;this.showMode(-1);this.fill();if(j==this.viewMode&&this.autoclose){this.hide()}break}}},_setDate:function(g,i){if(!i||i=="date"){this.date=g}if(!i||i=="view"){this.viewDate=g}this.fill();this.setValue();var h;if(this.isInput){h=this.element}else{if(this.component){h=this.element.find("input")}}if(h){h.change();if(this.autoclose&&(!i||i=="date")){}}this.element.trigger({type:"changeDate",date:this.date})},moveMinute:function(h,g){if(!g){return h}var i=new Date(h.valueOf());i.setUTCMinutes(i.getUTCMinutes()+(g*this.minuteStep));return i},moveHour:function(h,g){if(!g){return h}var i=new Date(h.valueOf());i.setUTCHours(i.getUTCHours()+g);return i},moveDate:function(h,g){if(!g){return h}var i=new Date(h.valueOf());i.setUTCDate(i.getUTCDate()+g);return i},moveMonth:function(g,h){if(!h){return g}var l=new Date(g.valueOf()),p=l.getUTCDate(),m=l.getUTCMonth(),k=Math.abs(h),o,n;h=h>0?1:-1;if(k==1){n=h==-1?function(){return l.getUTCMonth()==m}:function(){return l.getUTCMonth()!=o};o=m+h;l.setUTCMonth(o);if(o<0||o>11){o=(o+12)%12}}else{for(var j=0;j<k;j++){l=this.moveMonth(l,h)}o=l.getUTCMonth();l.setUTCDate(p);n=function(){return o!=l.getUTCMonth()}}while(n()){l.setUTCDate(--p);l.setUTCMonth(o)}return l},moveYear:function(h,g){return this.moveMonth(h,g*12)},dateWithinRange:function(g){return g>=this.startDate&&g<=this.endDate},keydown:function(k){if(this.picker.is(":not(:visible)")){if(k.keyCode==27){this.show()}return}var m=false,h,n,l,o,g;switch(k.keyCode){case 27:this.hide();k.preventDefault();break;case 37:case 39:if(!this.keyboardNavigation){break}h=k.keyCode==37?-1:1;viewMode=this.viewMode;if(k.ctrlKey){viewMode+=2}else{if(k.shiftKey){viewMode+=1}}if(viewMode==4){o=this.moveYear(this.date,h);g=this.moveYear(this.viewDate,h)}else{if(viewMode==3){o=this.moveMonth(this.date,h);g=this.moveMonth(this.viewDate,h)}else{if(viewMode==2){o=this.moveDate(this.date,h);g=this.moveDate(this.viewDate,h)}else{if(viewMode==1){o=this.moveHour(this.date,h);g=this.moveHour(this.viewDate,h)}else{if(viewMode==0){o=this.moveMinute(this.date,h);g=this.moveMinute(this.viewDate,h)}}}}}if(this.dateWithinRange(o)){this.date=o;this.viewDate=g;this.setValue();this.update();k.preventDefault();m=true}break;case 38:case 40:if(!this.keyboardNavigation){break}h=k.keyCode==38?-1:1;viewMode=this.viewMode;if(k.ctrlKey){viewMode+=2}else{if(k.shiftKey){viewMode+=1}}if(viewMode==4){o=this.moveYear(this.date,h);g=this.moveYear(this.viewDate,h)}else{if(viewMode==3){o=this.moveMonth(this.date,h);g=this.moveMonth(this.viewDate,h)}else{if(viewMode==2){o=this.moveDate(this.date,h*7);g=this.moveDate(this.viewDate,h*7)}else{if(viewMode==1){if(this.showMeridian){o=this.moveHour(this.date,h*6);g=this.moveHour(this.viewDate,h*6)}else{o=this.moveHour(this.date,h*4);g=this.moveHour(this.viewDate,h*4)}}else{if(viewMode==0){o=this.moveMinute(this.date,h*4);g=this.moveMinute(this.viewDate,h*4)}}}}}if(this.dateWithinRange(o)){this.date=o;this.viewDate=g;this.setValue();this.update();k.preventDefault();m=true}break;case 13:if(this.viewMode!=0){var j=this.viewMode;this.showMode(-1);this.fill();if(j==this.viewMode&&this.autoclose){this.hide()}}else{this.fill();if(this.autoclose){this.hide()}}k.preventDefault();break;case 9:this.hide();break}if(m){var i;if(this.isInput){i=this.element}else{if(this.component){i=this.element.find("input")}}if(i){i.change()}this.element.trigger({type:"changeDate",date:this.date})}},showMode:function(g){if(g){var h=Math.max(0,Math.min(b.modes.length-1,this.viewMode+g));if(h>=this.minView&&h<=this.maxView){this.element.trigger({type:"changeMode",date:this.viewDate,oldViewMode:this.viewMode,newViewMode:h});this.viewMode=h}}this.picker.find(">div").hide().filter(".datetimepicker-"+b.modes[this.viewMode].clsName).css("display","block");this.updateNavArrows()},reset:function(g){this._setDate(null,"date")}};c.fn.datetimepicker=function(i){var g=Array.apply(null,arguments);g.shift();var h;this.each(function(){var l=c(this),k=l.data("datetimepicker"),j=typeof i=="object"&&i;if(!k){l.data("datetimepicker",(k=new e(this,c.extend({},c.fn.datetimepicker.defaults,j))))}if(typeof i=="string"&&typeof k[i]=="function"){h=k[i].apply(k,g);if(h!==undefined){return false}}});if(h!==undefined){return h}else{return this}};c.fn.datetimepicker.defaults={};c.fn.datetimepicker.Constructor=e;var d=c.fn.datetimepicker.dates={en:{days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],daysShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat","Sun"],daysMin:["Su","Mo","Tu","We","Th","Fr","Sa","Su"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],monthsShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],meridiem:["am","pm"],suffix:["st","nd","rd","th"],today:"Today"}};var b={modes:[{clsName:"minutes",navFnc:"Hours",navStep:1},{clsName:"hours",navFnc:"Date",navStep:1},{clsName:"days",navFnc:"Month",navStep:1},{clsName:"months",navFnc:"FullYear",navStep:1},{clsName:"years",navFnc:"FullYear",navStep:10}],isLeapYear:function(g){return(((g%4===0)&&(g%100!==0))||(g%400===0))},getDaysInMonth:function(g,h){return[31,(b.isLeapYear(g)?29:28),31,30,31,30,31,31,30,31,30,31][h]},getDefaultFormat:function(g,h){if(g=="standard"){if(h=="input"){return"yyyy-mm-dd hh:ii"}else{return"yyyy-mm-dd hh:ii:ss"}}else{if(g=="php"){if(h=="input"){return"Y-m-d H:i"}else{return"Y-m-d H:i:s"}}else{throw new Error("Invalid format type.")}}},validParts:function(g){if(g=="standard"){return/hh?|HH?|p|P|ii?|ss?|dd?|DD?|mm?|MM?|yy(?:yy)?/g}else{if(g=="php"){return/[dDjlNwzFmMnStyYaABgGhHis]/g}else{throw new Error("Invalid format type.")}}},nonpunctuation:/[^ -\/:-@\[-`{-~\t\n\rTZ]+/g,parseFormat:function(j,h){var g=j.replace(this.validParts(h),"\0").split("\0"),i=j.match(this.validParts(h));if(!g||!g.length||!i||i.length==0){throw new Error("Invalid date format.")}return{separators:g,parts:i}},parseDate:function(l,u,o,r){if(l instanceof Date){var w=new Date(l.valueOf()-l.getTimezoneOffset()*60000);w.setMilliseconds(0);return w}if(/^\d{4}\-\d{1,2}\-\d{1,2}$/.test(l)){u=this.parseFormat("yyyy-mm-dd",r)}if(/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}$/.test(l)){u=this.parseFormat("yyyy-mm-dd hh:ii",r)}if(/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}\:\d{1,2}[Z]{0,1}$/.test(l)){u=this.parseFormat("yyyy-mm-dd hh:ii:ss",r)}if(/^[-+]\d+[dmwy]([\s,]+[-+]\d+[dmwy])*$/.test(l)){var x=/([-+]\d+)([dmwy])/,m=l.match(/([-+]\d+)([dmwy])/g),g,k;l=new Date();for(var n=0;n<m.length;n++){g=x.exec(m[n]);k=parseInt(g[1]);switch(g[2]){case"d":l.setUTCDate(l.getUTCDate()+k);break;case"m":l=e.prototype.moveMonth.call(e.prototype,l,k);break;case"w":l.setUTCDate(l.getUTCDate()+k*7);break;case"y":l=e.prototype.moveYear.call(e.prototype,l,k);break}}return f(l.getUTCFullYear(),l.getUTCMonth(),l.getUTCDate(),l.getUTCHours(),l.getUTCMinutes(),l.getUTCSeconds(),0)}var m=l&&l.match(this.nonpunctuation)||[],l=new Date(0,0,0,0,0,0,0),q={},t=["hh","h","ii","i","ss","s","yyyy","yy","M","MM","m","mm","D","DD","d","dd","H","HH","p","P"],v={hh:function(s,i){return s.setUTCHours(i)},h:function(s,i){return s.setUTCHours(i)},HH:function(s,i){return s.setUTCHours(i==12?0:i)},H:function(s,i){return s.setUTCHours(i==12?0:i)},ii:function(s,i){return s.setUTCMinutes(i)},i:function(s,i){return s.setUTCMinutes(i)},ss:function(s,i){return s.setUTCSeconds(i)},s:function(s,i){return s.setUTCSeconds(i)},yyyy:function(s,i){return s.setUTCFullYear(i)},yy:function(s,i){return s.setUTCFullYear(2000+i)},m:function(s,i){i-=1;while(i<0){i+=12}i%=12;s.setUTCMonth(i);while(s.getUTCMonth()!=i){if(isNaN(s.getUTCMonth())){return s}else{s.setUTCDate(s.getUTCDate()-1)}}return s},d:function(s,i){return s.setUTCDate(i)},p:function(s,i){return s.setUTCHours(i==1?s.getUTCHours()+12:s.getUTCHours())}},j,p,g;v.M=v.MM=v.mm=v.m;v.dd=v.d;v.P=v.p;l=f(l.getFullYear(),l.getMonth(),l.getDate(),l.getHours(),l.getMinutes(),l.getSeconds());if(m.length==u.parts.length){for(var n=0,h=u.parts.length;n<h;n++){j=parseInt(m[n],10);g=u.parts[n];if(isNaN(j)){switch(g){case"MM":p=c(d[o].months).filter(function(){var i=this.slice(0,m[n].length),s=m[n].slice(0,i.length);return i==s});j=c.inArray(p[0],d[o].months)+1;break;case"M":p=c(d[o].monthsShort).filter(function(){var i=this.slice(0,m[n].length),s=m[n].slice(0,i.length);return i.toLowerCase()==s.toLowerCase()});j=c.inArray(p[0],d[o].monthsShort)+1;break;case"p":case"P":j=c.inArray(m[n].toLowerCase(),d[o].meridiem);break}}q[g]=j}for(var n=0,y;n<t.length;n++){y=t[n];if(y in q&&!isNaN(q[y])){v[y](l,q[y])}}}return l},formatDate:function(g,m,o,k){if(g==null){return""}var n;if(k=="standard"){n={yy:g.getUTCFullYear().toString().substring(2),yyyy:g.getUTCFullYear(),m:g.getUTCMonth()+1,M:d[o].monthsShort[g.getUTCMonth()],MM:d[o].months[g.getUTCMonth()],d:g.getUTCDate(),D:d[o].daysShort[g.getUTCDay()],DD:d[o].days[g.getUTCDay()],p:(d[o].meridiem.length==2?d[o].meridiem[g.getUTCHours()<12?0:1]:""),h:g.getUTCHours(),i:g.getUTCMinutes(),s:g.getUTCSeconds()};if(d[o].meridiem.length==2){n.H=(n.h%12==0?12:n.h%12)}else{n.H=n.h}n.HH=(n.H<10?"0":"")+n.H;n.P=n.p.toUpperCase();n.hh=(n.h<10?"0":"")+n.h;n.ii=(n.i<10?"0":"")+n.i;n.ss=(n.s<10?"0":"")+n.s;n.dd=(n.d<10?"0":"")+n.d;n.mm=(n.m<10?"0":"")+n.m}else{if(k=="php"){n={y:g.getUTCFullYear().toString().substring(2),Y:g.getUTCFullYear(),F:d[o].months[g.getUTCMonth()],M:d[o].monthsShort[g.getUTCMonth()],n:g.getUTCMonth()+1,t:b.getDaysInMonth(g.getUTCFullYear(),g.getUTCMonth()),j:g.getUTCDate(),l:d[o].days[g.getUTCDay()],D:d[o].daysShort[g.getUTCDay()],w:g.getUTCDay(),N:(g.getUTCDay()==0?7:g.getUTCDay()),S:(g.getUTCDate()%10<=d[o].suffix.length?d[o].suffix[g.getUTCDate()%10-1]:""),a:(d[o].meridiem.length==2?d[o].meridiem[g.getUTCHours()<12?0:1]:""),g:(g.getUTCHours()%12==0?12:g.getUTCHours()%12),G:g.getUTCHours(),i:g.getUTCMinutes(),s:g.getUTCSeconds()};n.m=(n.n<10?"0":"")+n.n;n.d=(n.j<10?"0":"")+n.j;n.A=n.a.toString().toUpperCase();n.h=(n.g<10?"0":"")+n.g;n.H=(n.G<10?"0":"")+n.G;n.i=(n.i<10?"0":"")+n.i;n.s=(n.s<10?"0":"")+n.s}else{throw new Error("Invalid format type.")}}var g=[],l=c.extend([],m.separators);for(var j=0,h=m.parts.length;j<h;j++){if(l.length){g.push(l.shift())}g.push(n[m.parts[j]])}if(l.length){g.push(l.shift())}return g.join("")},convertViewMode:function(g){switch(g){case 4:case"decade":g=4;break;case 3:case"year":g=3;break;case 2:case"month":g=2;break;case 1:case"day":g=1;break;case 0:case"hour":g=0;break}return g},headTemplate:'<thead><tr><th class="prev"><i class="icon-arrow-left"/></th><th colspan="5" class="switch"></th><th class="next"><i class="icon-arrow-right"/></th></tr></thead>',headTemplateV3:'<thead><tr><th class="prev"><span class="glyphicon glyphicon-arrow-left"></span> </th><th colspan="5" class="switch"></th><th class="next"><span class="glyphicon glyphicon-arrow-right"></span> </th></tr></thead>',contTemplate:'<tbody><tr><td colspan="7"></td></tr></tbody>',footTemplate:'<tfoot><tr><th colspan="7" class="today"></th></tr></tfoot>'};b.template='<div class="datetimepicker"><div class="datetimepicker-minutes"><table class=" table-condensed">'+b.headTemplate+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-hours"><table class=" table-condensed">'+b.headTemplate+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-days"><table class=" table-condensed">'+b.headTemplate+"<tbody></tbody>"+b.footTemplate+'</table></div><div class="datetimepicker-months"><table class="table-condensed">'+b.headTemplate+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-years"><table class="table-condensed">'+b.headTemplate+b.contTemplate+b.footTemplate+"</table></div></div>";b.templateV3='<div class="datetimepicker"><div class="datetimepicker-minutes"><table class=" table-condensed">'+b.headTemplateV3+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-hours"><table class=" table-condensed">'+b.headTemplateV3+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-days"><table class=" table-condensed">'+b.headTemplateV3+"<tbody></tbody>"+b.footTemplate+'</table></div><div class="datetimepicker-months"><table class="table-condensed">'+b.headTemplateV3+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-years"><table class="table-condensed">'+b.headTemplateV3+b.contTemplate+b.footTemplate+"</table></div></div>";c.fn.datetimepicker.DPGlobal=b;c.fn.datetimepicker.noConflict=function(){c.fn.datetimepicker=old;return this};c(document).on("focus.datetimepicker.data-api click.datetimepicker.data-api",'[data-provide="datetimepicker"]',function(h){var g=c(this);if(g.data("datetimepicker")){return}h.preventDefault();g.datetimepicker("show")});c(function(){c('[data-provide="datetimepicker-inline"]').datetimepicker()})}(window.jQuery); \ No newline at end of file +!function(c){function f(){return new Date(Date.UTC.apply(Date,arguments))}function a(){var g=new Date();return f(g.getUTCFullYear(),g.getUTCMonth(),g.getUTCDate(),g.getUTCHours(),g.getUTCMinutes(),g.getUTCSeconds(),0)}var e=function(h,g){var i=this;this.element=c(h);this.container=g.container||"body";this.language=g.language||this.element.data("date-language")||"en";this.language=this.language in d?this.language:"en";this.isRTL=d[this.language].rtl||false;this.formatType=g.formatType||this.element.data("format-type")||"standard";this.format=b.parseFormat(g.format||this.element.data("date-format")||d[this.language].format||b.getDefaultFormat(this.formatType,"input"),this.formatType);this.isInline=false;this.isVisible=false;this.isInput=this.element.is("input");this.bootcssVer=this.isInput?(this.element.is(".form-control")?3:2):(this.bootcssVer=this.element.is(".input-group")?3:2);this.component=this.element.is(".date")?(this.bootcssVer==3?this.element.find(".input-group-addon .glyphicon-th, .input-group-addon .glyphicon-time, .input-group-addon .glyphicon-calendar").parent():this.element.find(".add-on .icon-th, .add-on .icon-time, .add-on .icon-calendar").parent()):false;this.componentReset=this.element.is(".date")?(this.bootcssVer==3?this.element.find(".input-group-addon .glyphicon-remove").parent():this.element.find(".add-on .icon-remove").parent()):false;this.hasInput=this.component&&this.element.find("input").length;if(this.component&&this.component.length===0){this.component=false}this.linkField=g.linkField||this.element.data("link-field")||false;this.linkFormat=b.parseFormat(g.linkFormat||this.element.data("link-format")||b.getDefaultFormat(this.formatType,"link"),this.formatType);this.minuteStep=g.minuteStep||this.element.data("minute-step")||5;this.pickerPosition=g.pickerPosition||this.element.data("picker-position")||"bottom-right";this.showMeridian=g.showMeridian||this.element.data("show-meridian")||false;this.initialDate=g.initialDate||new Date();this._attachEvents();this.formatViewType="datetime";if("formatViewType" in g){this.formatViewType=g.formatViewType}else{if("formatViewType" in this.element.data()){this.formatViewType=this.element.data("formatViewType")}}this.minView=0;if("minView" in g){this.minView=g.minView}else{if("minView" in this.element.data()){this.minView=this.element.data("min-view")}}this.minView=b.convertViewMode(this.minView);this.maxView=b.modes.length-1;if("maxView" in g){this.maxView=g.maxView}else{if("maxView" in this.element.data()){this.maxView=this.element.data("max-view")}}this.maxView=b.convertViewMode(this.maxView);this.wheelViewModeNavigation=false;if("wheelViewModeNavigation" in g){this.wheelViewModeNavigation=g.wheelViewModeNavigation}else{if("wheelViewModeNavigation" in this.element.data()){this.wheelViewModeNavigation=this.element.data("view-mode-wheel-navigation")}}this.wheelViewModeNavigationInverseDirection=false;if("wheelViewModeNavigationInverseDirection" in g){this.wheelViewModeNavigationInverseDirection=g.wheelViewModeNavigationInverseDirection}else{if("wheelViewModeNavigationInverseDirection" in this.element.data()){this.wheelViewModeNavigationInverseDirection=this.element.data("view-mode-wheel-navigation-inverse-dir")}}this.wheelViewModeNavigationDelay=100;if("wheelViewModeNavigationDelay" in g){this.wheelViewModeNavigationDelay=g.wheelViewModeNavigationDelay}else{if("wheelViewModeNavigationDelay" in this.element.data()){this.wheelViewModeNavigationDelay=this.element.data("view-mode-wheel-navigation-delay")}}this.startViewMode=2;if("startView" in g){this.startViewMode=g.startView}else{if("startView" in this.element.data()){this.startViewMode=this.element.data("start-view")}}this.startViewMode=b.convertViewMode(this.startViewMode);this.viewMode=this.startViewMode;this.viewSelect=this.minView;if("viewSelect" in g){this.viewSelect=g.viewSelect}else{if("viewSelect" in this.element.data()){this.viewSelect=this.element.data("view-select")}}this.viewSelect=b.convertViewMode(this.viewSelect);this.forceParse=true;if("forceParse" in g){this.forceParse=g.forceParse}else{if("dateForceParse" in this.element.data()){this.forceParse=this.element.data("date-force-parse")}}this.picker=c((this.bootcssVer==3)?b.templateV3:b.template).appendTo(this.isInline?this.element:this.container).on({click:c.proxy(this.click,this),mousedown:c.proxy(this.mousedown,this)});if(this.wheelViewModeNavigation){if(c.fn.mousewheel){this.picker.on({mousewheel:c.proxy(this.mousewheel,this)})}else{console.log("Mouse Wheel event is not supported. Please include the jQuery Mouse Wheel plugin before enabling this option")}}if(this.isInline){this.picker.addClass("datetimepicker-inline")}else{this.picker.addClass("datetimepicker-dropdown-"+this.pickerPosition+" dropdown-menu")}if(this.isRTL){this.picker.addClass("datetimepicker-rtl");if(this.bootcssVer==3){this.picker.find(".prev span, .next span").toggleClass("glyphicon-arrow-left glyphicon-arrow-right")}else{this.picker.find(".prev i, .next i").toggleClass("icon-arrow-left icon-arrow-right")}}c(document).on("mousedown",function(j){if(c(j.target).closest(".datetimepicker").length===0){i.hide()}});this.autoclose=false;if("autoclose" in g){this.autoclose=g.autoclose}else{if("dateAutoclose" in this.element.data()){this.autoclose=this.element.data("date-autoclose")}}this.keyboardNavigation=true;if("keyboardNavigation" in g){this.keyboardNavigation=g.keyboardNavigation}else{if("dateKeyboardNavigation" in this.element.data()){this.keyboardNavigation=this.element.data("date-keyboard-navigation")}}this.todayBtn=(g.todayBtn||this.element.data("date-today-btn")||false);this.todayHighlight=(g.todayHighlight||this.element.data("date-today-highlight")||false);this.weekStart=((g.weekStart||this.element.data("date-weekstart")||d[this.language].weekStart||0)%7);this.weekEnd=((this.weekStart+6)%7);this.startDate=-Infinity;this.endDate=Infinity;this.daysOfWeekDisabled=[];this.setStartDate(g.startDate||this.element.data("date-startdate"));this.setEndDate(g.endDate||this.element.data("date-enddate"));this.setDaysOfWeekDisabled(g.daysOfWeekDisabled||this.element.data("date-days-of-week-disabled"));this.fillDow();this.fillMonths();this.update();this.showMode();if(this.isInline){this.show()}};e.prototype={constructor:e,_events:[],_attachEvents:function(){this._detachEvents();if(this.isInput){this._events=[[this.element,{focus:c.proxy(this.show,this),keyup:c.proxy(this.update,this),keydown:c.proxy(this.keydown,this)}]]}else{if(this.component&&this.hasInput){this._events=[[this.element.find("input"),{focus:c.proxy(this.show,this),keyup:c.proxy(this.update,this),keydown:c.proxy(this.keydown,this)}],[this.component,{click:c.proxy(this.show,this)}]];if(this.componentReset){this._events.push([this.componentReset,{click:c.proxy(this.reset,this)}])}}else{if(this.element.is("div")){this.isInline=true}else{this._events=[[this.element,{click:c.proxy(this.show,this)}]]}}}for(var g=0,h,j;g<this._events.length;g++){h=this._events[g][0];j=this._events[g][1];h.on(j)}},_detachEvents:function(){for(var g=0,h,j;g<this._events.length;g++){h=this._events[g][0];j=this._events[g][1];h.off(j)}this._events=[]},show:function(g){this.picker.show();this.height=this.component?this.component.outerHeight():this.element.outerHeight();if(this.forceParse){this.update()}this.place();c(window).on("resize",c.proxy(this.place,this));if(g){g.stopPropagation();g.preventDefault()}this.isVisible=true;this.element.trigger({type:"show",date:this.date})},hide:function(g){if(!this.isVisible){return}if(this.isInline){return}this.picker.hide();c(window).off("resize",this.place);this.viewMode=this.startViewMode;this.showMode();if(!this.isInput){c(document).off("mousedown",this.hide)}if(this.forceParse&&(this.isInput&&this.element.val()||this.hasInput&&this.element.find("input").val())){this.setValue()}this.isVisible=false;this.element.trigger({type:"hide",date:this.date})},remove:function(){this._detachEvents();this.picker.remove();delete this.picker;delete this.element.data().datetimepicker},getDate:function(){var g=this.getUTCDate();return new Date(g.getTime()+(g.getTimezoneOffset()*60000))},getUTCDate:function(){return this.date},setDate:function(g){this.setUTCDate(new Date(g.getTime()-(g.getTimezoneOffset()*60000)))},setUTCDate:function(g){if(g>=this.startDate&&g<=this.endDate){this.date=g;this.setValue();this.viewDate=this.date;this.fill()}else{this.element.trigger({type:"outOfRange",date:g,startDate:this.startDate,endDate:this.endDate})}},setFormat:function(h){this.format=b.parseFormat(h,this.formatType);var g;if(this.isInput){g=this.element}else{if(this.component){g=this.element.find("input")}}if(g&&g.val()){this.setValue()}},setValue:function(){var g=this.getFormattedDate();if(!this.isInput){if(this.component){this.element.find("input").val(g)}this.element.data("date",g)}else{this.element.val(g)}if(this.linkField){c("#"+this.linkField).val(this.getFormattedDate(this.linkFormat))}},getFormattedDate:function(g){if(g==undefined){g=this.format}return b.formatDate(this.date,g,this.language,this.formatType)},setStartDate:function(g){this.startDate=g||-Infinity;if(this.startDate!==-Infinity){this.startDate=b.parseDate(this.startDate,this.format,this.language,this.formatType)}this.update();this.updateNavArrows()},setEndDate:function(g){this.endDate=g||Infinity;if(this.endDate!==Infinity){this.endDate=b.parseDate(this.endDate,this.format,this.language,this.formatType)}this.update();this.updateNavArrows()},setDaysOfWeekDisabled:function(g){this.daysOfWeekDisabled=g||[];if(!c.isArray(this.daysOfWeekDisabled)){this.daysOfWeekDisabled=this.daysOfWeekDisabled.split(/,\s*/)}this.daysOfWeekDisabled=c.map(this.daysOfWeekDisabled,function(h){return parseInt(h,10)});this.update();this.updateNavArrows()},place:function(){if(this.isInline){return}var g=0;c("div").each(function(){var m=parseInt(c(this).css("zIndex"),10);if(m>g){g=m}});var l=g+10;var k,j,i,h;if(this.container instanceof c){h=this.container.offset()}else{h=c(this.container).offset()}if(this.component){k=this.component.offset();i=k.left;if(this.pickerPosition=="bottom-left"||this.pickerPosition=="top-left"){i+=this.component.outerWidth()-this.picker.outerWidth()}}else{k=this.element.offset();i=k.left}if(i+220>document.body.clientWidth){i=document.body.clientWidth-220}if(this.pickerPosition=="top-left"||this.pickerPosition=="top-right"){j=k.top-this.picker.outerHeight()}else{j=k.top+this.height}j=j-h.top;i=i-h.left;this.picker.css({top:j,left:i,zIndex:l})},update:function(){var g,h=false;if(arguments&&arguments.length&&(typeof arguments[0]==="string"||arguments[0] instanceof Date)){g=arguments[0];h=true}else{g=(this.isInput?this.element.val():this.element.find("input").val())||this.element.data("date")||this.initialDate;if(typeof g=="string"||g instanceof String){g=g.replace(/^\s+|\s+$/g,"")}}if(!g){g=new Date();h=false}this.date=b.parseDate(g,this.format,this.language,this.formatType);if(h){this.setValue()}if(this.date<this.startDate){this.viewDate=new Date(this.startDate)}else{if(this.date>this.endDate){this.viewDate=new Date(this.endDate)}else{this.viewDate=new Date(this.date)}}this.fill()},fillDow:function(){var g=this.weekStart,h="<tr>";while(g<this.weekStart+7){h+='<th class="dow">'+d[this.language].daysMin[(g++)%7]+"</th>"}h+="</tr>";this.picker.find(".datetimepicker-days thead").append(h)},fillMonths:function(){var h="",g=0;while(g<12){h+='<span class="month">'+d[this.language].monthsShort[g++]+"</span>"}this.picker.find(".datetimepicker-months td").html(h)},fill:function(){if(this.date==null||this.viewDate==null){return}var E=new Date(this.viewDate),q=E.getUTCFullYear(),F=E.getUTCMonth(),j=E.getUTCDate(),z=E.getUTCHours(),u=E.getUTCMinutes(),v=this.startDate!==-Infinity?this.startDate.getUTCFullYear():-Infinity,A=this.startDate!==-Infinity?this.startDate.getUTCMonth():-Infinity,l=this.endDate!==Infinity?this.endDate.getUTCFullYear():Infinity,w=this.endDate!==Infinity?this.endDate.getUTCMonth():Infinity,n=(new f(this.date.getUTCFullYear(),this.date.getUTCMonth(),this.date.getUTCDate())).valueOf(),D=new Date();this.picker.find(".datetimepicker-days thead th:eq(1)").text(d[this.language].months[F]+" "+q);if(this.formatViewType=="time"){var B=z%12?z%12:12;var h=(B<10?"0":"")+B;var m=(u<10?"0":"")+u;var H=d[this.language].meridiem[z<12?0:1];this.picker.find(".datetimepicker-hours thead th:eq(1)").text(h+":"+m+" "+(H?H.toUpperCase():""));this.picker.find(".datetimepicker-minutes thead th:eq(1)").text(h+":"+m+" "+(H?H.toUpperCase():""))}else{this.picker.find(".datetimepicker-hours thead th:eq(1)").text(j+" "+d[this.language].months[F]+" "+q);this.picker.find(".datetimepicker-minutes thead th:eq(1)").text(j+" "+d[this.language].months[F]+" "+q)}this.picker.find("tfoot th.today").text(d[this.language].today).toggle(this.todayBtn!==false);this.updateNavArrows();this.fillMonths();var I=f(q,F-1,28,0,0,0,0),y=b.getDaysInMonth(I.getUTCFullYear(),I.getUTCMonth());I.setUTCDate(y);I.setUTCDate(y-(I.getUTCDay()-this.weekStart+7)%7);var g=new Date(I);g.setUTCDate(g.getUTCDate()+42);g=g.valueOf();var o=[];var r;while(I.valueOf()<g){if(I.getUTCDay()==this.weekStart){o.push("<tr>")}r="";if(I.getUTCFullYear()<q||(I.getUTCFullYear()==q&&I.getUTCMonth()<F)){r+=" old"}else{if(I.getUTCFullYear()>q||(I.getUTCFullYear()==q&&I.getUTCMonth()>F)){r+=" new"}}if(this.todayHighlight&&I.getUTCFullYear()==D.getFullYear()&&I.getUTCMonth()==D.getMonth()&&I.getUTCDate()==D.getDate()){r+=" today"}if(I.valueOf()==n){r+=" active"}if((I.valueOf()+86400000)<=this.startDate||I.valueOf()>this.endDate||c.inArray(I.getUTCDay(),this.daysOfWeekDisabled)!==-1){r+=" disabled"}o.push('<td class="day'+r+'">'+I.getUTCDate()+"</td>");if(I.getUTCDay()==this.weekEnd){o.push("</tr>")}I.setUTCDate(I.getUTCDate()+1)}this.picker.find(".datetimepicker-days tbody").empty().append(o.join(""));o=[];var s="",C="",p="";for(var x=0;x<24;x++){var t=f(q,F,j,x);r="";if((t.valueOf()+3600000)<=this.startDate||t.valueOf()>this.endDate){r+=" disabled"}else{if(z==x){r+=" active"}}if(this.showMeridian&&d[this.language].meridiem.length==2){C=(x<12?d[this.language].meridiem[0]:d[this.language].meridiem[1]);if(C!=p){if(p!=""){o.push("</fieldset>")}o.push('<fieldset class="hour"><legend>'+C.toUpperCase()+"</legend>")}p=C;s=(x%12?x%12:12);o.push('<span class="hour'+r+" hour_"+(x<12?"am":"pm")+'">'+s+"</span>");if(x==23){o.push("</fieldset>")}}else{s=x+":00";o.push('<span class="hour'+r+'">'+s+"</span>")}}this.picker.find(".datetimepicker-hours td").html(o.join(""));o=[];s="",C="",p="";for(var x=0;x<60;x+=this.minuteStep){var t=f(q,F,j,z,x,0);r="";if(t.valueOf()<this.startDate||t.valueOf()>this.endDate){r+=" disabled"}else{if(Math.floor(u/this.minuteStep)==Math.floor(x/this.minuteStep)){r+=" active"}}if(this.showMeridian&&d[this.language].meridiem.length==2){C=(z<12?d[this.language].meridiem[0]:d[this.language].meridiem[1]);if(C!=p){if(p!=""){o.push("</fieldset>")}o.push('<fieldset class="minute"><legend>'+C.toUpperCase()+"</legend>")}p=C;s=(z%12?z%12:12);o.push('<span class="minute'+r+'">'+s+":"+(x<10?"0"+x:x)+"</span>");if(x==59){o.push("</fieldset>")}}else{s=x+":00";o.push('<span class="minute'+r+'">'+z+":"+(x<10?"0"+x:x)+"</span>")}}this.picker.find(".datetimepicker-minutes td").html(o.join(""));var J=this.date.getUTCFullYear();var k=this.picker.find(".datetimepicker-months").find("th:eq(1)").text(q).end().find("span").removeClass("active");if(J==q){k.eq(this.date.getUTCMonth()).addClass("active")}if(q<v||q>l){k.addClass("disabled")}if(q==v){k.slice(0,A).addClass("disabled")}if(q==l){k.slice(w+1).addClass("disabled")}o="";q=parseInt(q/10,10)*10;var G=this.picker.find(".datetimepicker-years").find("th:eq(1)").text(q+"-"+(q+9)).end().find("td");q-=1;for(var x=-1;x<11;x++){o+='<span class="year'+(x==-1||x==10?" old":"")+(J==q?" active":"")+(q<v||q>l?" disabled":"")+'">'+q+"</span>";q+=1}G.html(o);this.place()},updateNavArrows:function(){var k=new Date(this.viewDate),i=k.getUTCFullYear(),j=k.getUTCMonth(),h=k.getUTCDate(),g=k.getUTCHours();switch(this.viewMode){case 0:if(this.startDate!==-Infinity&&i<=this.startDate.getUTCFullYear()&&j<=this.startDate.getUTCMonth()&&h<=this.startDate.getUTCDate()&&g<=this.startDate.getUTCHours()){this.picker.find(".prev").css({visibility:"hidden"})}else{this.picker.find(".prev").css({visibility:"visible"})}if(this.endDate!==Infinity&&i>=this.endDate.getUTCFullYear()&&j>=this.endDate.getUTCMonth()&&h>=this.endDate.getUTCDate()&&g>=this.endDate.getUTCHours()){this.picker.find(".next").css({visibility:"hidden"})}else{this.picker.find(".next").css({visibility:"visible"})}break;case 1:if(this.startDate!==-Infinity&&i<=this.startDate.getUTCFullYear()&&j<=this.startDate.getUTCMonth()&&h<=this.startDate.getUTCDate()){this.picker.find(".prev").css({visibility:"hidden"})}else{this.picker.find(".prev").css({visibility:"visible"})}if(this.endDate!==Infinity&&i>=this.endDate.getUTCFullYear()&&j>=this.endDate.getUTCMonth()&&h>=this.endDate.getUTCDate()){this.picker.find(".next").css({visibility:"hidden"})}else{this.picker.find(".next").css({visibility:"visible"})}break;case 2:if(this.startDate!==-Infinity&&i<=this.startDate.getUTCFullYear()&&j<=this.startDate.getUTCMonth()){this.picker.find(".prev").css({visibility:"hidden"})}else{this.picker.find(".prev").css({visibility:"visible"})}if(this.endDate!==Infinity&&i>=this.endDate.getUTCFullYear()&&j>=this.endDate.getUTCMonth()){this.picker.find(".next").css({visibility:"hidden"})}else{this.picker.find(".next").css({visibility:"visible"})}break;case 3:case 4:if(this.startDate!==-Infinity&&i<=this.startDate.getUTCFullYear()){this.picker.find(".prev").css({visibility:"hidden"})}else{this.picker.find(".prev").css({visibility:"visible"})}if(this.endDate!==Infinity&&i>=this.endDate.getUTCFullYear()){this.picker.find(".next").css({visibility:"hidden"})}else{this.picker.find(".next").css({visibility:"visible"})}break}},mousewheel:function(h){h.preventDefault();h.stopPropagation();if(this.wheelPause){return}this.wheelPause=true;var g=h.originalEvent;var j=g.wheelDelta;var i=j>0?1:(j===0)?0:-1;if(this.wheelViewModeNavigationInverseDirection){i=-i}this.showMode(i);setTimeout(c.proxy(function(){this.wheelPause=false},this),this.wheelViewModeNavigationDelay)},click:function(k){k.stopPropagation();k.preventDefault();var l=c(k.target).closest("span, td, th, legend");if(l.length==1){if(l.is(".disabled")){this.element.trigger({type:"outOfRange",date:this.viewDate,startDate:this.startDate,endDate:this.endDate});return}switch(l[0].nodeName.toLowerCase()){case"th":switch(l[0].className){case"switch":this.showMode(1);break;case"prev":case"next":var g=b.modes[this.viewMode].navStep*(l[0].className=="prev"?-1:1);switch(this.viewMode){case 0:this.viewDate=this.moveHour(this.viewDate,g);break;case 1:this.viewDate=this.moveDate(this.viewDate,g);break;case 2:this.viewDate=this.moveMonth(this.viewDate,g);break;case 3:case 4:this.viewDate=this.moveYear(this.viewDate,g);break}this.fill();break;case"today":var h=new Date();h=f(h.getFullYear(),h.getMonth(),h.getDate(),h.getHours(),h.getMinutes(),h.getSeconds(),0);if(h<this.startDate){h=this.startDate}else{if(h>this.endDate){h=this.endDate}}this.viewMode=this.startViewMode;this.showMode(0);this._setDate(h);this.fill();if(this.autoclose){this.hide()}break}break;case"span":if(!l.is(".disabled")){var n=this.viewDate.getUTCFullYear(),m=this.viewDate.getUTCMonth(),o=this.viewDate.getUTCDate(),p=this.viewDate.getUTCHours(),i=this.viewDate.getUTCMinutes(),q=this.viewDate.getUTCSeconds();if(l.is(".month")){this.viewDate.setUTCDate(1);m=l.parent().find("span").index(l);o=this.viewDate.getUTCDate();this.viewDate.setUTCMonth(m);this.element.trigger({type:"changeMonth",date:this.viewDate});if(this.viewSelect>=3){this._setDate(f(n,m,o,p,i,q,0))}}else{if(l.is(".year")){this.viewDate.setUTCDate(1);n=parseInt(l.text(),10)||0;this.viewDate.setUTCFullYear(n);this.element.trigger({type:"changeYear",date:this.viewDate});if(this.viewSelect>=4){this._setDate(f(n,m,o,p,i,q,0))}}else{if(l.is(".hour")){p=parseInt(l.text(),10)||0;if(l.hasClass("hour_am")||l.hasClass("hour_pm")){if(p==12&&l.hasClass("hour_am")){p=0}else{if(p!=12&&l.hasClass("hour_pm")){p+=12}}}this.viewDate.setUTCHours(p);this.element.trigger({type:"changeHour",date:this.viewDate});if(this.viewSelect>=1){this._setDate(f(n,m,o,p,i,q,0))}}else{if(l.is(".minute")){i=parseInt(l.text().substr(l.text().indexOf(":")+1),10)||0;this.viewDate.setUTCMinutes(i);this.element.trigger({type:"changeMinute",date:this.viewDate});if(this.viewSelect>=0){this._setDate(f(n,m,o,p,i,q,0))}}}}}if(this.viewMode!=0){var j=this.viewMode;this.showMode(-1);this.fill();if(j==this.viewMode&&this.autoclose){this.hide()}}else{this.fill();if(this.autoclose){this.hide()}}}break;case"td":if(l.is(".day")&&!l.is(".disabled")){var o=parseInt(l.text(),10)||1;var n=this.viewDate.getUTCFullYear(),m=this.viewDate.getUTCMonth(),p=this.viewDate.getUTCHours(),i=this.viewDate.getUTCMinutes(),q=this.viewDate.getUTCSeconds();if(l.is(".old")){if(m===0){m=11;n-=1}else{m-=1}}else{if(l.is(".new")){if(m==11){m=0;n+=1}else{m+=1}}}this.viewDate.setUTCFullYear(n);this.viewDate.setUTCMonth(m,o);this.element.trigger({type:"changeDay",date:this.viewDate});if(this.viewSelect>=2){this._setDate(f(n,m,o,p,i,q,0))}}var j=this.viewMode;this.showMode(-1);this.fill();if(j==this.viewMode&&this.autoclose){this.hide()}break}}},_setDate:function(g,i){if(!i||i=="date"){this.date=g}if(!i||i=="view"){this.viewDate=g}this.fill();this.setValue();var h;if(this.isInput){h=this.element}else{if(this.component){h=this.element.find("input")}}if(h){h.change();if(this.autoclose&&(!i||i=="date")){}}this.element.trigger({type:"changeDate",date:this.date})},moveMinute:function(h,g){if(!g){return h}var i=new Date(h.valueOf());i.setUTCMinutes(i.getUTCMinutes()+(g*this.minuteStep));return i},moveHour:function(h,g){if(!g){return h}var i=new Date(h.valueOf());i.setUTCHours(i.getUTCHours()+g);return i},moveDate:function(h,g){if(!g){return h}var i=new Date(h.valueOf());i.setUTCDate(i.getUTCDate()+g);return i},moveMonth:function(g,h){if(!h){return g}var l=new Date(g.valueOf()),p=l.getUTCDate(),m=l.getUTCMonth(),k=Math.abs(h),o,n;h=h>0?1:-1;if(k==1){n=h==-1?function(){return l.getUTCMonth()==m}:function(){return l.getUTCMonth()!=o};o=m+h;l.setUTCMonth(o);if(o<0||o>11){o=(o+12)%12}}else{for(var j=0;j<k;j++){l=this.moveMonth(l,h)}o=l.getUTCMonth();l.setUTCDate(p);n=function(){return o!=l.getUTCMonth()}}while(n()){l.setUTCDate(--p);l.setUTCMonth(o)}return l},moveYear:function(h,g){return this.moveMonth(h,g*12)},dateWithinRange:function(g){return g>=this.startDate&&g<=this.endDate},keydown:function(k){if(this.picker.is(":not(:visible)")){if(k.keyCode==27){this.show()}return}var m=false,h,n,l,o,g;switch(k.keyCode){case 27:this.hide();k.preventDefault();break;case 37:case 39:if(!this.keyboardNavigation){break}h=k.keyCode==37?-1:1;viewMode=this.viewMode;if(k.ctrlKey){viewMode+=2}else{if(k.shiftKey){viewMode+=1}}if(viewMode==4){o=this.moveYear(this.date,h);g=this.moveYear(this.viewDate,h)}else{if(viewMode==3){o=this.moveMonth(this.date,h);g=this.moveMonth(this.viewDate,h)}else{if(viewMode==2){o=this.moveDate(this.date,h);g=this.moveDate(this.viewDate,h)}else{if(viewMode==1){o=this.moveHour(this.date,h);g=this.moveHour(this.viewDate,h)}else{if(viewMode==0){o=this.moveMinute(this.date,h);g=this.moveMinute(this.viewDate,h)}}}}}if(this.dateWithinRange(o)){this.date=o;this.viewDate=g;this.setValue();this.update();k.preventDefault();m=true}break;case 38:case 40:if(!this.keyboardNavigation){break}h=k.keyCode==38?-1:1;viewMode=this.viewMode;if(k.ctrlKey){viewMode+=2}else{if(k.shiftKey){viewMode+=1}}if(viewMode==4){o=this.moveYear(this.date,h);g=this.moveYear(this.viewDate,h)}else{if(viewMode==3){o=this.moveMonth(this.date,h);g=this.moveMonth(this.viewDate,h)}else{if(viewMode==2){o=this.moveDate(this.date,h*7);g=this.moveDate(this.viewDate,h*7)}else{if(viewMode==1){if(this.showMeridian){o=this.moveHour(this.date,h*6);g=this.moveHour(this.viewDate,h*6)}else{o=this.moveHour(this.date,h*4);g=this.moveHour(this.viewDate,h*4)}}else{if(viewMode==0){o=this.moveMinute(this.date,h*4);g=this.moveMinute(this.viewDate,h*4)}}}}}if(this.dateWithinRange(o)){this.date=o;this.viewDate=g;this.setValue();this.update();k.preventDefault();m=true}break;case 13:if(this.viewMode!=0){var j=this.viewMode;this.showMode(-1);this.fill();if(j==this.viewMode&&this.autoclose){this.hide()}}else{this.fill();if(this.autoclose){this.hide()}}k.preventDefault();break;case 9:this.hide();break}if(m){var i;if(this.isInput){i=this.element}else{if(this.component){i=this.element.find("input")}}if(i){i.change()}this.element.trigger({type:"changeDate",date:this.date})}},showMode:function(g){if(g){var h=Math.max(0,Math.min(b.modes.length-1,this.viewMode+g));if(h>=this.minView&&h<=this.maxView){this.element.trigger({type:"changeMode",date:this.viewDate,oldViewMode:this.viewMode,newViewMode:h});this.viewMode=h}}this.picker.find(">div").hide().filter(".datetimepicker-"+b.modes[this.viewMode].clsName).css("display","block");this.updateNavArrows()},reset:function(g){this._setDate(null,"date")}};c.fn.datetimepicker=function(i){var g=Array.apply(null,arguments);g.shift();var h;this.each(function(){var l=c(this),k=l.data("datetimepicker"),j=typeof i=="object"&&i;if(!k){l.data("datetimepicker",(k=new e(this,c.extend({},c.fn.datetimepicker.defaults,j))))}if(typeof i=="string"&&typeof k[i]=="function"){h=k[i].apply(k,g);if(h!==undefined){return false}}});if(h!==undefined){return h}else{return this}};c.fn.datetimepicker.defaults={};c.fn.datetimepicker.Constructor=e;var d=c.fn.datetimepicker.dates={en:{days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],daysShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat","Sun"],daysMin:["Su","Mo","Tu","We","Th","Fr","Sa","Su"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],monthsShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],meridiem:["am","pm"],suffix:["st","nd","rd","th"],today:"Today"}};var b={modes:[{clsName:"minutes",navFnc:"Hours",navStep:1},{clsName:"hours",navFnc:"Date",navStep:1},{clsName:"days",navFnc:"Month",navStep:1},{clsName:"months",navFnc:"FullYear",navStep:1},{clsName:"years",navFnc:"FullYear",navStep:10}],isLeapYear:function(g){return(((g%4===0)&&(g%100!==0))||(g%400===0))},getDaysInMonth:function(g,h){return[31,(b.isLeapYear(g)?29:28),31,30,31,30,31,31,30,31,30,31][h]},getDefaultFormat:function(g,h){if(g=="standard"){if(h=="input"){return"yyyy-mm-dd hh:ii"}else{return"yyyy-mm-dd hh:ii:ss"}}else{if(g=="php"){if(h=="input"){return"Y-m-d H:i"}else{return"Y-m-d H:i:s"}}else{throw new Error("Invalid format type.")}}},validParts:function(g){if(g=="standard"){return/hh?|HH?|p|P|ii?|ss?|dd?|DD?|mm?|MM?|yy(?:yy)?/g}else{if(g=="php"){return/[dDjlNwzFmMnStyYaABgGhHis]/g}else{throw new Error("Invalid format type.")}}},nonpunctuation:/[^ -\/:-@\[-`{-~\t\n\rTZ]+/g,parseFormat:function(j,h){var g=j.replace(this.validParts(h),"\0").split("\0"),i=j.match(this.validParts(h));if(!g||!g.length||!i||i.length==0){throw new Error("Invalid date format.")}return{separators:g,parts:i}},parseDate:function(l,u,o,r){if(l instanceof Date){var w=new Date(l.valueOf()-l.getTimezoneOffset()*60000);w.setMilliseconds(0);return w}if(/^\d{4}\-\d{1,2}\-\d{1,2}$/.test(l)){u=this.parseFormat("yyyy-mm-dd",r)}if(/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}$/.test(l)){u=this.parseFormat("yyyy-mm-dd hh:ii",r)}if(/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}\:\d{1,2}[Z]{0,1}$/.test(l)){u=this.parseFormat("yyyy-mm-dd hh:ii:ss",r)}if(/^[-+]\d+[dmwy]([\s,]+[-+]\d+[dmwy])*$/.test(l)){var x=/([-+]\d+)([dmwy])/,m=l.match(/([-+]\d+)([dmwy])/g),g,k;l=new Date();for(var n=0;n<m.length;n++){g=x.exec(m[n]);k=parseInt(g[1]);switch(g[2]){case"d":l.setUTCDate(l.getUTCDate()+k);break;case"m":l=e.prototype.moveMonth.call(e.prototype,l,k);break;case"w":l.setUTCDate(l.getUTCDate()+k*7);break;case"y":l=e.prototype.moveYear.call(e.prototype,l,k);break}}return f(l.getUTCFullYear(),l.getUTCMonth(),l.getUTCDate(),l.getUTCHours(),l.getUTCMinutes(),l.getUTCSeconds(),0)}var m=l&&l.match(this.nonpunctuation)||[],l=new Date(0,0,0,0,0,0,0),q={},t=["hh","h","ii","i","ss","s","yyyy","yy","M","MM","m","mm","D","DD","d","dd","H","HH","p","P"],v={hh:function(s,i){return s.setUTCHours(i)},h:function(s,i){return s.setUTCHours(i)},HH:function(s,i){return s.setUTCHours(i==12?0:i)},H:function(s,i){return s.setUTCHours(i==12?0:i)},ii:function(s,i){return s.setUTCMinutes(i)},i:function(s,i){return s.setUTCMinutes(i)},ss:function(s,i){return s.setUTCSeconds(i)},s:function(s,i){return s.setUTCSeconds(i)},yyyy:function(s,i){return s.setUTCFullYear(i)},yy:function(s,i){return s.setUTCFullYear(2000+i)},m:function(s,i){i-=1;while(i<0){i+=12}i%=12;s.setUTCMonth(i);while(s.getUTCMonth()!=i){if(isNaN(s.getUTCMonth())){return s}else{s.setUTCDate(s.getUTCDate()-1)}}return s},d:function(s,i){return s.setUTCDate(i)},p:function(s,i){return s.setUTCHours(i==1?s.getUTCHours()+12:s.getUTCHours())}},j,p,g;v.M=v.MM=v.mm=v.m;v.dd=v.d;v.P=v.p;l=f(l.getFullYear(),l.getMonth(),l.getDate(),l.getHours(),l.getMinutes(),l.getSeconds());if(m.length==u.parts.length){for(var n=0,h=u.parts.length;n<h;n++){j=parseInt(m[n],10);g=u.parts[n];if(isNaN(j)){switch(g){case"MM":p=c(d[o].months).filter(function(){var i=this.slice(0,m[n].length),s=m[n].slice(0,i.length);return i==s});j=c.inArray(p[0],d[o].months)+1;break;case"M":p=c(d[o].monthsShort).filter(function(){var i=this.slice(0,m[n].length),s=m[n].slice(0,i.length);return i.toLowerCase()==s.toLowerCase()});j=c.inArray(p[0],d[o].monthsShort)+1;break;case"p":case"P":j=c.inArray(m[n].toLowerCase(),d[o].meridiem);break}}q[g]=j}for(var n=0,y;n<t.length;n++){y=t[n];if(y in q&&!isNaN(q[y])){v[y](l,q[y])}}}return l},formatDate:function(g,m,o,k){if(g==null){return""}var n;if(k=="standard"){n={yy:g.getUTCFullYear().toString().substring(2),yyyy:g.getUTCFullYear(),m:g.getUTCMonth()+1,M:d[o].monthsShort[g.getUTCMonth()],MM:d[o].months[g.getUTCMonth()],d:g.getUTCDate(),D:d[o].daysShort[g.getUTCDay()],DD:d[o].days[g.getUTCDay()],p:(d[o].meridiem.length==2?d[o].meridiem[g.getUTCHours()<12?0:1]:""),h:g.getUTCHours(),i:g.getUTCMinutes(),s:g.getUTCSeconds()};if(d[o].meridiem.length==2){n.H=(n.h%12==0?12:n.h%12)}else{n.H=n.h}n.HH=(n.H<10?"0":"")+n.H;n.P=n.p.toUpperCase();n.hh=(n.h<10?"0":"")+n.h;n.ii=(n.i<10?"0":"")+n.i;n.ss=(n.s<10?"0":"")+n.s;n.dd=(n.d<10?"0":"")+n.d;n.mm=(n.m<10?"0":"")+n.m}else{if(k=="php"){n={y:g.getUTCFullYear().toString().substring(2),Y:g.getUTCFullYear(),F:d[o].months[g.getUTCMonth()],M:d[o].monthsShort[g.getUTCMonth()],n:g.getUTCMonth()+1,t:b.getDaysInMonth(g.getUTCFullYear(),g.getUTCMonth()),j:g.getUTCDate(),l:d[o].days[g.getUTCDay()],D:d[o].daysShort[g.getUTCDay()],w:g.getUTCDay(),N:(g.getUTCDay()==0?7:g.getUTCDay()),S:(g.getUTCDate()%10<=d[o].suffix.length?d[o].suffix[g.getUTCDate()%10-1]:""),a:(d[o].meridiem.length==2?d[o].meridiem[g.getUTCHours()<12?0:1]:""),g:(g.getUTCHours()%12==0?12:g.getUTCHours()%12),G:g.getUTCHours(),i:g.getUTCMinutes(),s:g.getUTCSeconds()};n.m=(n.n<10?"0":"")+n.n;n.d=(n.j<10?"0":"")+n.j;n.A=n.a.toString().toUpperCase();n.h=(n.g<10?"0":"")+n.g;n.H=(n.G<10?"0":"")+n.G;n.i=(n.i<10?"0":"")+n.i;n.s=(n.s<10?"0":"")+n.s}else{throw new Error("Invalid format type.")}}var g=[],l=c.extend([],m.separators);for(var j=0,h=m.parts.length;j<h;j++){if(l.length){g.push(l.shift())}g.push(n[m.parts[j]])}if(l.length){g.push(l.shift())}return g.join("")},convertViewMode:function(g){switch(g){case 4:case"decade":g=4;break;case 3:case"year":g=3;break;case 2:case"month":g=2;break;case 1:case"day":g=1;break;case 0:case"hour":g=0;break}return g},headTemplate:'<thead><tr><th class="prev"><i class="icon-arrow-left"/></th><th colspan="5" class="switch"></th><th class="next"><i class="icon-arrow-right"/></th></tr></thead>',headTemplateV3:'<thead><tr><th class="prev"><span class="glyphicon glyphicon-arrow-left"></span> </th><th colspan="5" class="switch"></th><th class="next"><span class="glyphicon glyphicon-arrow-right"></span> </th></tr></thead>',contTemplate:'<tbody><tr><td colspan="7"></td></tr></tbody>',footTemplate:'<tfoot><tr><th colspan="7" class="today"></th></tr></tfoot>'};b.template='<div class="datetimepicker"><div class="datetimepicker-minutes"><table class=" table-condensed">'+b.headTemplate+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-hours"><table class=" table-condensed">'+b.headTemplate+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-days"><table class=" table-condensed">'+b.headTemplate+"<tbody></tbody>"+b.footTemplate+'</table></div><div class="datetimepicker-months"><table class="table-condensed">'+b.headTemplate+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-years"><table class="table-condensed">'+b.headTemplate+b.contTemplate+b.footTemplate+"</table></div></div>";b.templateV3='<div class="datetimepicker"><div class="datetimepicker-minutes"><table class=" table-condensed">'+b.headTemplateV3+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-hours"><table class=" table-condensed">'+b.headTemplateV3+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-days"><table class=" table-condensed">'+b.headTemplateV3+"<tbody></tbody>"+b.footTemplate+'</table></div><div class="datetimepicker-months"><table class="table-condensed">'+b.headTemplateV3+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-years"><table class="table-condensed">'+b.headTemplateV3+b.contTemplate+b.footTemplate+"</table></div></div>";c.fn.datetimepicker.DPGlobal=b;c.fn.datetimepicker.noConflict=function(){c.fn.datetimepicker=old;return this};c(document).on("focus.datetimepicker.data-api click.datetimepicker.data-api",'[data-provide="datetimepicker"]',function(h){var g=c(this);if(g.data("datetimepicker")){return}h.preventDefault();g.datetimepicker("show")});c(function(){c('[data-provide="datetimepicker-inline"]').datetimepicker()})}(window.jQuery); + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ar.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ar.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ar.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -15,3 +15,6 @@ rtl: true }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.bg.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.bg.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.bg.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -14,3 +14,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ca.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ca.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ca.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -14,3 +14,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.cs.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.cs.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.cs.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -17,3 +17,6 @@ format: "dd.mm.yyyy" }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.da.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.da.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.da.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -13,4 +13,6 @@ suffix: [], meridiem: [] }; -}(jQuery)); \ No newline at end of file +}(jQuery)); + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.de.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.de.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.de.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -16,3 +16,6 @@ format: "dd.mm.yyyy" }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ee.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ee.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ee.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -15,4 +15,6 @@ weekStart: 1, format: "dd.mm.yyyy hh:ii" }; -}(jQuery)); \ No newline at end of file +}(jQuery)); + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.el.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.el.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.el.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -12,4 +12,6 @@ suffix: [], meridiem: [] }; -}(jQuery)); \ No newline at end of file +}(jQuery)); + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.es.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.es.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.es.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -14,3 +14,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fi.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fi.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fi.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -14,3 +14,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fr.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fr.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fr.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -16,3 +16,6 @@ format: "dd/mm/yyyy" }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.he.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.he.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.he.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -15,3 +15,6 @@ rtl: true }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.hr.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.hr.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.hr.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -13,3 +13,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.hu.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.hu.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.hu.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -15,3 +15,6 @@ weekStart: 1 }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.id.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.id.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.id.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -13,3 +13,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.is.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.is.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.is.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -14,3 +14,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.it.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.it.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.it.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -16,3 +16,6 @@ format: "dd/mm/yyyy hh:ii:ss" }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ja.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ja.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ja.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -14,3 +14,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ko.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ko.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ko.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -15,3 +15,6 @@ today: "오늘", }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.lt.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.lt.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.lt.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -16,3 +16,6 @@ weekStart: 1 }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.lv.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.lv.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.lv.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -15,4 +15,6 @@ meridiem: [], weekStart: 1 }; -}(jQuery)); \ No newline at end of file +}(jQuery)); + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ms.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ms.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ms.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -14,3 +14,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.nb.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.nb.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.nb.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -13,4 +13,6 @@ suffix: [], meridiem: [] }; -}(jQuery)); \ No newline at end of file +}(jQuery)); + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.nl.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.nl.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.nl.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -14,3 +14,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.no.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.no.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.no.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -14,3 +14,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pl.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pl.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pl.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -15,3 +15,6 @@ weekStart: 1 }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pt-BR.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pt-BR.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pt-BR.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -15,3 +15,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pt.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pt.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pt.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -15,3 +15,6 @@ today: "Hoje" }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ro.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ro.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ro.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -15,3 +15,6 @@ weekStart: 1 }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.rs-latin.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.rs-latin.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.rs-latin.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -14,3 +14,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.rs.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.rs.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.rs.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -14,3 +14,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ru.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ru.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ru.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -13,4 +13,6 @@ suffix: [], meridiem: [] }; -}(jQuery)); \ No newline at end of file +}(jQuery)); + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sk.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sk.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sk.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -15,3 +15,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sl.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sl.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sl.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -14,3 +14,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sv.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sv.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sv.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -14,3 +14,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sw.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sw.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sw.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -15,3 +15,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.th.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.th.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.th.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -14,3 +14,6 @@ meridiem: [] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.tr.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.tr.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.tr.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -15,3 +15,6 @@ }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ua.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ua.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ua.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -13,3 +13,6 @@ weekStart: 1 }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.uk.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.uk.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.uk.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -13,4 +13,6 @@ suffix: [], meridiem: [] }; -}(jQuery)); \ No newline at end of file +}(jQuery)); + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.zh-CN.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.zh-CN.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.zh-CN.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -14,3 +14,6 @@ meridiem: ["上午", "下午"] }; }(jQuery)); + + +/* %%Ignore-License */ Modified: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.zh-TW.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.zh-TW.js 2014-07-08 11:37:07 UTC (rev 2134) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.zh-TW.js 2014-07-08 11:45:32 UTC (rev 2135) @@ -14,3 +14,6 @@ meridiem: ["上午", "下午"] }; }(jQuery)); + + +/* %%Ignore-License */

1 0

r2134 - in trunk/wao-web/src/main/webapp: . WEB-INF/content WEB-INF/decorators bootstrap-datetimepicker-2.3.1 bootstrap-datetimepicker-2.3.1/css bootstrap-datetimepicker-2.3.1/js bootstrap-datetimepicker-2.3.1/js/locales
by bleny＠users.forge.codelutin.com 08 Jul '14

08 Jul '14

Author: bleny Date: 2014-07-08 13:37:07 +0200 (Tue, 08 Jul 2014) New Revision: 2134 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2134 Log: fixes #5396 add date picker for contact form Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/LICENSE trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/css/ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/css/bootstrap-datetimepicker.css trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/css/bootstrap-datetimepicker.min.css trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.min.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ar.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.bg.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ca.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.cs.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.da.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.de.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ee.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.el.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.es.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fi.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fr.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.he.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.hr.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.hu.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.id.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.is.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.it.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ja.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ko.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.lt.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.lv.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ms.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.nb.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.nl.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.no.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pl.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pt-BR.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pt.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ro.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.rs-latin.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.rs.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ru.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sk.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sl.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sv.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sw.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.th.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.tr.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ua.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.uk.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.zh-CN.js trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.zh-TW.js Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-07-08 09:31:46 UTC (rev 2133) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-07-08 11:37:07 UTC (rev 2134) @@ -69,6 +69,29 @@ </s:if> + $('input.date').datetimepicker({ + minView: 2, + <s:if test="\"fr-FR\".equals(locale.toLanguageTag())"> + language: 'fr', + format: 'dd/mm/yyyy' + </s:if> + <s:else> + language: 'en', + format: 'yyyy-mm-dd' + </s:else> + }); + + $('input.date-time').datetimepicker({ + <s:if test="\"fr-FR\".equals(locale.toLanguageTag())"> + language: 'fr', + format: 'dd/mm/yyyy hh:ii' + </s:if> + <s:else> + language: 'en', + format: 'yyyy-mm-dd hh:ii' + </s:else> + }); + $('#delete-contact-link').click(function (e) { if ( ! confirm("<s:text name="wao.ui.action.deleteContact.confirm"/>")) { e.preventDefault(); @@ -224,12 +247,14 @@ <s:textfield name="updateContactCommand.contact.observationBeginDate" label="%{getText('wao.ui.field.Contact.beginDate')}" placeholder="%{getDateTimePlaceholder()}" - disabled="%{!#editObservationReport}"/> + disabled="%{!#editObservationReport}" + cssClass="date-time"/> <s:textfield name="updateContactCommand.contact.observationEndDate" label="%{getText('wao.ui.field.Contact.endDate')}" placeholder="%{getDateTimePlaceholder()}" - disabled="%{!#editObservationReport}"/> + disabled="%{!#editObservationReport}" + cssClass="date-time"/> <s:select name="updateContactCommand.contact.contactState" label="%{getText('wao.ui.field.Contact.contactState')}" @@ -294,7 +319,8 @@ <s:textfield name="updateContactCommand.contact.dataInputDate" label="%{getText('wao.ui.field.Contact.dataInputDate')}" placeholder="%{getDatePlaceholder()}" - disabled="%{!#editObservationReport}"/> + disabled="%{!#editObservationReport}" + cssClass="date"/> <s:if test="updateContactCommand.contact.obsProgram.obsMer"> @@ -307,7 +333,8 @@ <s:textfield name="updateContactCommand.contact.restitution" label="%{getText('wao.ui.field.Contact.restitution')}" placeholder="%{getDatePlaceholder()}" - disabled="%{!#editObservationReport}"/> + disabled="%{!#editObservationReport}" + cssClass="date"/> </s:if> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-07-08 09:31:46 UTC (rev 2133) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-07-08 11:37:07 UTC (rev 2134) @@ -37,6 +37,8 @@ <script src="<s:url value="/bootstrap-2.3.1/bootstrap-popover.js" />"></script> <script src="<s:url value="/spin.js-2.0.0/spin.js" />"></script> <script src="<s:url value="/spin.js-2.0.0/jquery.spin.js" />"></script> + <script src="<s:url value="/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.min.js" />"></script> + <script src="<s:url value="/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fr.js" />"></script> <script src="<s:url value="/wao.js" />"></script> <script src="<s:url value='/endpoints-js.jsp'/>"></script> <link rel="stylesheet" type="text/css" href="<s:url value="/select2-3.4.5/select2.css" />" /> @@ -44,6 +46,7 @@ <link rel="stylesheet" type="text/css" href="<s:url value="/wao.css" />" media="all" /> <link rel="stylesheet" type="text/css" href="<s:url value="/wao-screen.css" />" media="screen"> <link rel="stylesheet" type="text/css" href="<s:url value="/css/font-awesome.min.css" />" media="screen"> + <link rel="stylesheet" type="text/css" href="<s:url value="/bootstrap-datetimepicker-2.3.1/css/bootstrap-datetimepicker.min.css" />" media="screen"> <decorator:head /> </head> Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/LICENSE =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/LICENSE (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/LICENSE 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2012 Sebastien MALOT + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/css/bootstrap-datetimepicker.css =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/css/bootstrap-datetimepicker.css (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/css/bootstrap-datetimepicker.css 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,414 @@ +/*! + * Datetimepicker for Bootstrap + * + * Copyright 2012 Stefan Petre + * Improvements by Andrew Rowls + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + */ +.datetimepicker { + padding: 4px; + margin-top: 1px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + direction: ltr; +} + +.datetimepicker-inline { + width: 220px; +} + +.datetimepicker.datetimepicker-rtl { + direction: rtl; +} + +.datetimepicker.datetimepicker-rtl table tr td span { + float: right; +} + +.datetimepicker-dropdown, .datetimepicker-dropdown-left { + top: 0; + left: 0; +} + +[class*=" datetimepicker-dropdown"]:before { + content: ''; + display: inline-block; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #cccccc; + border-bottom-color: rgba(0, 0, 0, 0.2); + position: absolute; +} + +[class*=" datetimepicker-dropdown"]:after { + content: ''; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid #ffffff; + position: absolute; +} + +[class*=" datetimepicker-dropdown-top"]:before { + content: ''; + display: inline-block; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-top: 7px solid #cccccc; + border-top-color: rgba(0, 0, 0, 0.2); + border-bottom: 0; +} + +[class*=" datetimepicker-dropdown-top"]:after { + content: ''; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-top: 6px solid #ffffff; + border-bottom: 0; +} + +.datetimepicker-dropdown-bottom-left:before { + top: -7px; + right: 6px; +} + +.datetimepicker-dropdown-bottom-left:after { + top: -6px; + right: 7px; +} + +.datetimepicker-dropdown-bottom-right:before { + top: -7px; + left: 6px; +} + +.datetimepicker-dropdown-bottom-right:after { + top: -6px; + left: 7px; +} + +.datetimepicker-dropdown-top-left:before { + bottom: -7px; + right: 6px; +} + +.datetimepicker-dropdown-top-left:after { + bottom: -6px; + right: 7px; +} + +.datetimepicker-dropdown-top-right:before { + bottom: -7px; + left: 6px; +} + +.datetimepicker-dropdown-top-right:after { + bottom: -6px; + left: 7px; +} + +.datetimepicker > div { + display: none; +} + +.datetimepicker.minutes div.datetimepicker-minutes { + display: block; +} + +.datetimepicker.hours div.datetimepicker-hours { + display: block; +} + +.datetimepicker.days div.datetimepicker-days { + display: block; +} + +.datetimepicker.months div.datetimepicker-months { + display: block; +} + +.datetimepicker.years div.datetimepicker-years { + display: block; +} + +.datetimepicker table { + margin: 0; +} + +.datetimepicker td, +.datetimepicker th { + text-align: center; + width: 20px; + height: 20px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + border: none; +} + +.table-striped .datetimepicker table tr td, +.table-striped .datetimepicker table tr th { + background-color: transparent; +} + +.datetimepicker table tr td.minute:hover { + background: #eeeeee; + cursor: pointer; +} + +.datetimepicker table tr td.hour:hover { + background: #eeeeee; + cursor: pointer; +} + +.datetimepicker table tr td.day:hover { + background: #eeeeee; + cursor: pointer; +} + +.datetimepicker table tr td.old, +.datetimepicker table tr td.new { + color: #999999; +} + +.datetimepicker table tr td.disabled, +.datetimepicker table tr td.disabled:hover { + background: none; + color: #999999; + cursor: default; +} + +.datetimepicker table tr td.today, +.datetimepicker table tr td.today:hover, +.datetimepicker table tr td.today.disabled, +.datetimepicker table tr td.today.disabled:hover { + background-color: #fde19a; + background-image: -moz-linear-gradient(top, #fdd49a, #fdf59a); + background-image: -ms-linear-gradient(top, #fdd49a, #fdf59a); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a)); + background-image: -webkit-linear-gradient(top, #fdd49a, #fdf59a); + background-image: -o-linear-gradient(top, #fdd49a, #fdf59a); + background-image: linear-gradient(top, #fdd49a, #fdf59a); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0); + border-color: #fdf59a #fdf59a #fbed50; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); +} + +.datetimepicker table tr td.today:hover, +.datetimepicker table tr td.today:hover:hover, +.datetimepicker table tr td.today.disabled:hover, +.datetimepicker table tr td.today.disabled:hover:hover, +.datetimepicker table tr td.today:active, +.datetimepicker table tr td.today:hover:active, +.datetimepicker table tr td.today.disabled:active, +.datetimepicker table tr td.today.disabled:hover:active, +.datetimepicker table tr td.today.active, +.datetimepicker table tr td.today:hover.active, +.datetimepicker table tr td.today.disabled.active, +.datetimepicker table tr td.today.disabled:hover.active, +.datetimepicker table tr td.today.disabled, +.datetimepicker table tr td.today:hover.disabled, +.datetimepicker table tr td.today.disabled.disabled, +.datetimepicker table tr td.today.disabled:hover.disabled, +.datetimepicker table tr td.today[disabled], +.datetimepicker table tr td.today:hover[disabled], +.datetimepicker table tr td.today.disabled[disabled], +.datetimepicker table tr td.today.disabled:hover[disabled] { + background-color: #fdf59a; +} + +.datetimepicker table tr td.today:active, +.datetimepicker table tr td.today:hover:active, +.datetimepicker table tr td.today.disabled:active, +.datetimepicker table tr td.today.disabled:hover:active, +.datetimepicker table tr td.today.active, +.datetimepicker table tr td.today:hover.active, +.datetimepicker table tr td.today.disabled.active, +.datetimepicker table tr td.today.disabled:hover.active { + background-color: #fbf069; +} + +.datetimepicker table tr td.active, +.datetimepicker table tr td.active:hover, +.datetimepicker table tr td.active.disabled, +.datetimepicker table tr td.active.disabled:hover { + background-color: #006dcc; + background-image: -moz-linear-gradient(top, #0088cc, #0044cc); + background-image: -ms-linear-gradient(top, #0088cc, #0044cc); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); + background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); + background-image: -o-linear-gradient(top, #0088cc, #0044cc); + background-image: linear-gradient(top, #0088cc, #0044cc); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0); + border-color: #0044cc #0044cc #002a80; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} + +.datetimepicker table tr td.active:hover, +.datetimepicker table tr td.active:hover:hover, +.datetimepicker table tr td.active.disabled:hover, +.datetimepicker table tr td.active.disabled:hover:hover, +.datetimepicker table tr td.active:active, +.datetimepicker table tr td.active:hover:active, +.datetimepicker table tr td.active.disabled:active, +.datetimepicker table tr td.active.disabled:hover:active, +.datetimepicker table tr td.active.active, +.datetimepicker table tr td.active:hover.active, +.datetimepicker table tr td.active.disabled.active, +.datetimepicker table tr td.active.disabled:hover.active, +.datetimepicker table tr td.active.disabled, +.datetimepicker table tr td.active:hover.disabled, +.datetimepicker table tr td.active.disabled.disabled, +.datetimepicker table tr td.active.disabled:hover.disabled, +.datetimepicker table tr td.active[disabled], +.datetimepicker table tr td.active:hover[disabled], +.datetimepicker table tr td.active.disabled[disabled], +.datetimepicker table tr td.active.disabled:hover[disabled] { + background-color: #0044cc; +} + +.datetimepicker table tr td.active:active, +.datetimepicker table tr td.active:hover:active, +.datetimepicker table tr td.active.disabled:active, +.datetimepicker table tr td.active.disabled:hover:active, +.datetimepicker table tr td.active.active, +.datetimepicker table tr td.active:hover.active, +.datetimepicker table tr td.active.disabled.active, +.datetimepicker table tr td.active.disabled:hover.active { + background-color: #003399; +} + +.datetimepicker table tr td span { + display: block; + width: 23%; + height: 54px; + line-height: 54px; + float: left; + margin: 1%; + cursor: pointer; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} + +.datetimepicker .datetimepicker-hours span { + height: 26px; + line-height: 26px; +} + +.datetimepicker .datetimepicker-hours table tr td span.hour_am, +.datetimepicker .datetimepicker-hours table tr td span.hour_pm { + width: 14.6%; +} + +.datetimepicker .datetimepicker-hours fieldset legend, +.datetimepicker .datetimepicker-minutes fieldset legend { + margin-bottom: inherit; + line-height: 30px; +} + +.datetimepicker .datetimepicker-minutes span { + height: 26px; + line-height: 26px; +} + +.datetimepicker table tr td span:hover { + background: #eeeeee; +} + +.datetimepicker table tr td span.disabled, +.datetimepicker table tr td span.disabled:hover { + background: none; + color: #999999; + cursor: default; +} + +.datetimepicker table tr td span.active, +.datetimepicker table tr td span.active:hover, +.datetimepicker table tr td span.active.disabled, +.datetimepicker table tr td span.active.disabled:hover { + background-color: #006dcc; + background-image: -moz-linear-gradient(top, #0088cc, #0044cc); + background-image: -ms-linear-gradient(top, #0088cc, #0044cc); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); + background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); + background-image: -o-linear-gradient(top, #0088cc, #0044cc); + background-image: linear-gradient(top, #0088cc, #0044cc); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0); + border-color: #0044cc #0044cc #002a80; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} + +.datetimepicker table tr td span.active:hover, +.datetimepicker table tr td span.active:hover:hover, +.datetimepicker table tr td span.active.disabled:hover, +.datetimepicker table tr td span.active.disabled:hover:hover, +.datetimepicker table tr td span.active:active, +.datetimepicker table tr td span.active:hover:active, +.datetimepicker table tr td span.active.disabled:active, +.datetimepicker table tr td span.active.disabled:hover:active, +.datetimepicker table tr td span.active.active, +.datetimepicker table tr td span.active:hover.active, +.datetimepicker table tr td span.active.disabled.active, +.datetimepicker table tr td span.active.disabled:hover.active, +.datetimepicker table tr td span.active.disabled, +.datetimepicker table tr td span.active:hover.disabled, +.datetimepicker table tr td span.active.disabled.disabled, +.datetimepicker table tr td span.active.disabled:hover.disabled, +.datetimepicker table tr td span.active[disabled], +.datetimepicker table tr td span.active:hover[disabled], +.datetimepicker table tr td span.active.disabled[disabled], +.datetimepicker table tr td span.active.disabled:hover[disabled] { + background-color: #0044cc; +} + +.datetimepicker table tr td span.active:active, +.datetimepicker table tr td span.active:hover:active, +.datetimepicker table tr td span.active.disabled:active, +.datetimepicker table tr td span.active.disabled:hover:active, +.datetimepicker table tr td span.active.active, +.datetimepicker table tr td span.active:hover.active, +.datetimepicker table tr td span.active.disabled.active, +.datetimepicker table tr td span.active.disabled:hover.active { + background-color: #003399; +} + +.datetimepicker table tr td span.old { + color: #999999; +} + +.datetimepicker th.switch { + width: 145px; +} + +.datetimepicker thead tr:first-child th, +.datetimepicker tfoot tr:first-child th { + cursor: pointer; +} + +.datetimepicker thead tr:first-child th:hover, +.datetimepicker tfoot tr:first-child th:hover { + background: #eeeeee; +} + +.input-append.date .add-on i, +.input-prepend.date .add-on i, +.input-group.date .input-group-addon span { + cursor: pointer; + width: 14px; + height: 14px; +} Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/css/bootstrap-datetimepicker.min.css =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/css/bootstrap-datetimepicker.min.css (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/css/bootstrap-datetimepicker.min.css 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,9 @@ +/*! + * Datetimepicker for Bootstrap + * + * Copyright 2012 Stefan Petre + * Improvements by Andrew Rowls + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + */.datetimepicker{padding:4px;margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;direction:ltr}.datetimepicker-inline{width:220px}.datetimepicker.datetimepicker-rtl{direction:rtl}.datetimepicker.datetimepicker-rtl table tr td span{float:right}.datetimepicker-dropdown,.datetimepicker-dropdown-left{top:0;left:0}[class*=" datetimepicker-dropdown"]:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,0.2);position:absolute}[class*=" datetimepicker-dropdown"]:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute}[class*=" datetimepicker-dropdown-top"]:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #ccc;border-top-color:rgba(0,0,0,0.2);border-bottom:0}[class*=" datetimepicker-dropdown-top"]:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-top:6px solid #fff;border-bottom:0}.datetimepicker-dropdown-bottom-left:before{top:-7px;right:6px}.datetimepicker-dropdown-bottom-left:after{top:-6px;right:7px}.datetimepicker-dropdown-bottom-right:before{top:-7px;left:6px}.datetimepicker-dropdown-bottom-right:after{top:-6px;left:7px}.datetimepicker-dropdown-top-left:before{bottom:-7px;right:6px}.datetimepicker-dropdown-top-left:after{bottom:-6px;right:7px}.datetimepicker-dropdown-top-right:before{bottom:-7px;left:6px}.datetimepicker-dropdown-top-right:after{bottom:-6px;left:7px}.datetimepicker>div{display:none}.datetimepicker.minutes div.datetimepicker-minutes{display:block}.datetimepicker.hours div.datetimepicker-hours{display:block}.datetimepicker.days div.datetimepicker-days{display:block}.datetimepicker.months div.datetimepicker-months{display:block}.datetimepicker.years div.datetimepicker-years{display:block}.datetimepicker table{margin:0}.datetimepicker td,.datetimepicker th{text-align:center;width:20px;height:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0}.table-striped .datetimepicker table tr td,.table-striped .datetimepicker table tr th{background-color:transparent}.datetimepicker table tr td.minute:hover{background:#eee;cursor:pointer}.datetimepicker table tr td.hour:hover{background:#eee;cursor:pointer}.datetimepicker table tr td.day:hover{background:#eee;cursor:pointer}.datetimepicker table tr td.old,.datetimepicker table tr td.new{color:#999}.datetimepicker table tr td.disabled,.datetimepicker table tr td.disabled:hover{background:0;color:#999;cursor:default}.datetimepicker table tr td.today,.datetimepicker table tr td.today:hover,.datetimepicker table tr td.today.disabled,.datetimepicker table tr td.today.disabled:hover{background-color:#fde19a;background-image:-moz-linear-gradient(top,#fdd49a,#fdf59a);background-image:-ms-linear-gradient(top,#fdd49a,#fdf59a);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdd49a),to(#fdf59a));background-image:-webkit-linear-gradient(top,#fdd49a,#fdf59a);background-image:-o-linear-gradient(top,#fdd49a,#fdf59a);background-image:linear-gradient(top,#fdd49a,#fdf59a);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a',endColorstr='#fdf59a',GradientType=0);border-color:#fdf59a #fdf59a #fbed50;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.datetimepicker table tr td.today:hover,.datetimepicker table tr td.today:hover:hover,.datetimepicker table tr td.today.disabled:hover,.datetimepicker table tr td.today.disabled:hover:hover,.datetimepicker table tr td.today:active,.datetimepicker table tr td.today:hover:active,.datetimepicker table tr td.today.disabled:active,.datetimepicker table tr td.today.disabled:hover:active,.datetimepicker table tr td.today.active,.datetimepicker table tr td.today:hover.active,.datetimepicker table tr td.today.disabled.active,.datetimepicker table tr td.today.disabled:hover.active,.datetimepicker table tr td.today.disabled,.datetimepicker table tr td.today:hover.disabled,.datetimepicker table tr td.today.disabled.disabled,.datetimepicker table tr td.today.disabled:hover.disabled,.datetimepicker table tr td.today[disabled],.datetimepicker table tr td.today:hover[disabled],.datetimepicker table tr td.today.disabled[disabled],.datetimepicker table tr td.today.disabled:hover[disabled]{background-color:#fdf59a}.datetimepicker table tr td.today:active,.datetimepicker table tr td.today:hover:active,.datetimepicker table tr td.today.disabled:active,.datetimepicker table tr td.today.disabled:hover:active,.datetimepicker table tr td.today.active,.datetimepicker table tr td.today:hover.active,.datetimepicker table tr td.today.disabled.active,.datetimepicker table tr td.today.disabled:hover.active{background-color:#fbf069}.datetimepicker table tr td.active,.datetimepicker table tr td.active:hover,.datetimepicker table tr td.active.disabled,.datetimepicker table tr td.active.disabled:hover{background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-ms-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(top,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc',endColorstr='#0044cc',GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.datetimepicker table tr td.active:hover,.datetimepicker table tr td.active:hover:hover,.datetimepicker table tr td.active.disabled:hover,.datetimepicker table tr td.active.disabled:hover:hover,.datetimepicker table tr td.active:active,.datetimepicker table tr td.active:hover:active,.datetimepicker table tr td.active.disabled:active,.datetimepicker table tr td.active.disabled:hover:active,.datetimepicker table tr td.active.active,.datetimepicker table tr td.active:hover.active,.datetimepicker table tr td.active.disabled.active,.datetimepicker table tr td.active.disabled:hover.active,.datetimepicker table tr td.active.disabled,.datetimepicker table tr td.active:hover.disabled,.datetimepicker table tr td.active.disabled.disabled,.datetimepicker table tr td.active.disabled:hover.disabled,.datetimepicker table tr td.active[disabled],.datetimepicker table tr td.active:hover[disabled],.datetimepicker table tr td.active.disabled[disabled],.datetimepicker table tr td.active.disabled:hover[disabled]{background-color:#04c}.datetimepicker table tr td.active:active,.datetimepicker table tr td.active:hover:active,.datetimepicker table tr td.active.disabled:active,.datetimepicker table tr td.active.disabled:hover:active,.datetimepicker table tr td.active.active,.datetimepicker table tr td.active:hover.active,.datetimepicker table tr td.active.disabled.active,.datetimepicker table tr td.active.disabled:hover.active{background-color:#039}.datetimepicker table tr td span{display:block;width:23%;height:54px;line-height:54px;float:left;margin:1%;cursor:pointer;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.datetimepicker .datetimepicker-hours span{height:26px;line-height:26px}.datetimepicker .datetimepicker-hours table tr td span.hour_am,.datetimepicker .datetimepicker-hours table tr td span.hour_pm{width:14.6%}.datetimepicker .datetimepicker-hours fieldset legend,.datetimepicker .datetimepicker-minutes fieldset legend{margin-bottom:inherit;line-height:30px}.datetimepicker .datetimepicker-minutes span{height:26px;line-height:26px}.datetimepicker table tr td span:hover{background:#eee}.datetimepicker table tr td span.disabled,.datetimepicker table tr td span.disabled:hover{background:0;color:#999;cursor:default}.datetimepicker table tr td span.active,.datetimepicker table tr td span.active:hover,.datetimepicker table tr td span.active.disabled,.datetimepicker table tr td span.active.disabled:hover{background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-ms-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(top,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc',endColorstr='#0044cc',GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.datetimepicker table tr td span.active:hover,.datetimepicker table tr td span.active:hover:hover,.datetimepicker table tr td span.active.disabled:hover,.datetimepicker table tr td span.active.disabled:hover:hover,.datetimepicker table tr td span.active:active,.datetimepicker table tr td span.active:hover:active,.datetimepicker table tr td span.active.disabled:active,.datetimepicker table tr td span.active.disabled:hover:active,.datetimepicker table tr td span.active.active,.datetimepicker table tr td span.active:hover.active,.datetimepicker table tr td span.active.disabled.active,.datetimepicker table tr td span.active.disabled:hover.active,.datetimepicker table tr td span.active.disabled,.datetimepicker table tr td span.active:hover.disabled,.datetimepicker table tr td span.active.disabled.disabled,.datetimepicker table tr td span.active.disabled:hover.disabled,.datetimepicker table tr td span.active[disabled],.datetimepicker table tr td span.active:hover[disabled],.datetimepicker table tr td span.active.disabled[disabled],.datetimepicker table tr td span.active.disabled:hover[disabled]{background-color:#04c}.datetimepicker table tr td span.active:active,.datetimepicker table tr td span.active:hover:active,.datetimepicker table tr td span.active.disabled:active,.datetimepicker table tr td span.active.disabled:hover:active,.datetimepicker table tr td span.active.active,.datetimepicker table tr td span.active:hover.active,.datetimepicker table tr td span.active.disabled.active,.datetimepicker table tr td span.active.disabled:hover.active{background-color:#039}.datetimepicker table tr td span.old{color:#999}.datetimepicker th.switch{width:145px}.datetimepicker thead tr:first-child th,.datetimepicker tfoot tr:first-child th{cursor:pointer}.datetimepicker thead tr:first-child th:hover,.datetimepicker tfoot tr:first-child th:hover{background:#eee}.input-append.date .add-on i,.input-prepend.date .add-on i,.input-group.date .input-group-addon span{cursor:pointer;width:14px;height:14px} \ No newline at end of file Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,1728 @@ +/* ========================================================= + * bootstrap-datetimepicker.js + * ========================================================= + * Copyright 2012 Stefan Petre + * Improvements by Andrew Rowls + * Improvements by Sébastien Malot + * Improvements by Yun Lai + * Project URL : http://www.malot.fr/bootstrap-datetimepicker + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================= */ + +/* + * Improvement by CuGBabyBeaR @ 2013-09-12 + * + * Make it work in bootstrap v3 + */ + +!function ($) { + + function UTCDate() { + return new Date(Date.UTC.apply(Date, arguments)); + } + + function UTCToday() { + var today = new Date(); + return UTCDate(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate(), today.getUTCHours(), today.getUTCMinutes(), today.getUTCSeconds(), 0); + } + + // Picker object + + var Datetimepicker = function (element, options) { + var that = this; + + this.element = $(element); + + // add container for single page application + // when page switch the datetimepicker div will be removed also. + this.container = options.container || 'body'; + + this.language = options.language || this.element.data('date-language') || "en"; + this.language = this.language in dates ? this.language : "en"; + this.isRTL = dates[this.language].rtl || false; + this.formatType = options.formatType || this.element.data('format-type') || 'standard'; + this.format = DPGlobal.parseFormat(options.format || this.element.data('date-format') || dates[this.language].format || DPGlobal.getDefaultFormat(this.formatType, 'input'), this.formatType); + this.isInline = false; + this.isVisible = false; + this.isInput = this.element.is('input'); + + + this.bootcssVer = this.isInput ? (this.element.is('.form-control') ? 3 : 2) : ( this.bootcssVer = this.element.is('.input-group') ? 3 : 2 ); + + this.component = this.element.is('.date') ? ( this.bootcssVer == 3 ? this.element.find('.input-group-addon .glyphicon-th, .input-group-addon .glyphicon-time, .input-group-addon .glyphicon-calendar').parent() : this.element.find('.add-on .icon-th, .add-on .icon-time, .add-on .icon-calendar').parent()) : false; + this.componentReset = this.element.is('.date') ? ( this.bootcssVer == 3 ? this.element.find('.input-group-addon .glyphicon-remove').parent() : this.element.find('.add-on .icon-remove').parent()) : false; + this.hasInput = this.component && this.element.find('input').length; + if (this.component && this.component.length === 0) { + this.component = false; + } + this.linkField = options.linkField || this.element.data('link-field') || false; + this.linkFormat = DPGlobal.parseFormat(options.linkFormat || this.element.data('link-format') || DPGlobal.getDefaultFormat(this.formatType, 'link'), this.formatType); + this.minuteStep = options.minuteStep || this.element.data('minute-step') || 5; + this.pickerPosition = options.pickerPosition || this.element.data('picker-position') || 'bottom-right'; + this.showMeridian = options.showMeridian || this.element.data('show-meridian') || false; + this.initialDate = options.initialDate || new Date(); + + this._attachEvents(); + + this.formatViewType = "datetime"; + if ('formatViewType' in options) { + this.formatViewType = options.formatViewType; + } else if ('formatViewType' in this.element.data()) { + this.formatViewType = this.element.data('formatViewType'); + } + + this.minView = 0; + if ('minView' in options) { + this.minView = options.minView; + } else if ('minView' in this.element.data()) { + this.minView = this.element.data('min-view'); + } + this.minView = DPGlobal.convertViewMode(this.minView); + + this.maxView = DPGlobal.modes.length - 1; + if ('maxView' in options) { + this.maxView = options.maxView; + } else if ('maxView' in this.element.data()) { + this.maxView = this.element.data('max-view'); + } + this.maxView = DPGlobal.convertViewMode(this.maxView); + + this.wheelViewModeNavigation = false; + if ('wheelViewModeNavigation' in options) { + this.wheelViewModeNavigation = options.wheelViewModeNavigation; + } else if ('wheelViewModeNavigation' in this.element.data()) { + this.wheelViewModeNavigation = this.element.data('view-mode-wheel-navigation'); + } + + this.wheelViewModeNavigationInverseDirection = false; + + if ('wheelViewModeNavigationInverseDirection' in options) { + this.wheelViewModeNavigationInverseDirection = options.wheelViewModeNavigationInverseDirection; + } else if ('wheelViewModeNavigationInverseDirection' in this.element.data()) { + this.wheelViewModeNavigationInverseDirection = this.element.data('view-mode-wheel-navigation-inverse-dir'); + } + + this.wheelViewModeNavigationDelay = 100; + if ('wheelViewModeNavigationDelay' in options) { + this.wheelViewModeNavigationDelay = options.wheelViewModeNavigationDelay; + } else if ('wheelViewModeNavigationDelay' in this.element.data()) { + this.wheelViewModeNavigationDelay = this.element.data('view-mode-wheel-navigation-delay'); + } + + this.startViewMode = 2; + if ('startView' in options) { + this.startViewMode = options.startView; + } else if ('startView' in this.element.data()) { + this.startViewMode = this.element.data('start-view'); + } + this.startViewMode = DPGlobal.convertViewMode(this.startViewMode); + this.viewMode = this.startViewMode; + + this.viewSelect = this.minView; + if ('viewSelect' in options) { + this.viewSelect = options.viewSelect; + } else if ('viewSelect' in this.element.data()) { + this.viewSelect = this.element.data('view-select'); + } + this.viewSelect = DPGlobal.convertViewMode(this.viewSelect); + + this.forceParse = true; + if ('forceParse' in options) { + this.forceParse = options.forceParse; + } else if ('dateForceParse' in this.element.data()) { + this.forceParse = this.element.data('date-force-parse'); + } + + this.picker = $((this.bootcssVer == 3) ? DPGlobal.templateV3 : DPGlobal.template) + .appendTo(this.isInline ? this.element : this.container) // 'body') + .on({ + click: $.proxy(this.click, this), + mousedown: $.proxy(this.mousedown, this) + }); + + if (this.wheelViewModeNavigation) { + if ($.fn.mousewheel) { + this.picker.on({mousewheel: $.proxy(this.mousewheel, this)}); + } else { + console.log("Mouse Wheel event is not supported. Please include the jQuery Mouse Wheel plugin before enabling this option"); + } + } + + if (this.isInline) { + this.picker.addClass('datetimepicker-inline'); + } else { + this.picker.addClass('datetimepicker-dropdown-' + this.pickerPosition + ' dropdown-menu'); + } + if (this.isRTL) { + this.picker.addClass('datetimepicker-rtl'); + if (this.bootcssVer == 3) { + this.picker.find('.prev span, .next span') + .toggleClass('glyphicon-arrow-left glyphicon-arrow-right'); + } else { + this.picker.find('.prev i, .next i') + .toggleClass('icon-arrow-left icon-arrow-right'); + } + ; + + } + $(document).on('mousedown', function (e) { + // Clicked outside the datetimepicker, hide it + if ($(e.target).closest('.datetimepicker').length === 0) { + that.hide(); + } + }); + + this.autoclose = false; + if ('autoclose' in options) { + this.autoclose = options.autoclose; + } else if ('dateAutoclose' in this.element.data()) { + this.autoclose = this.element.data('date-autoclose'); + } + + this.keyboardNavigation = true; + if ('keyboardNavigation' in options) { + this.keyboardNavigation = options.keyboardNavigation; + } else if ('dateKeyboardNavigation' in this.element.data()) { + this.keyboardNavigation = this.element.data('date-keyboard-navigation'); + } + + this.todayBtn = (options.todayBtn || this.element.data('date-today-btn') || false); + this.todayHighlight = (options.todayHighlight || this.element.data('date-today-highlight') || false); + + this.weekStart = ((options.weekStart || this.element.data('date-weekstart') || dates[this.language].weekStart || 0) % 7); + this.weekEnd = ((this.weekStart + 6) % 7); + this.startDate = -Infinity; + this.endDate = Infinity; + this.daysOfWeekDisabled = []; + this.setStartDate(options.startDate || this.element.data('date-startdate')); + this.setEndDate(options.endDate || this.element.data('date-enddate')); + this.setDaysOfWeekDisabled(options.daysOfWeekDisabled || this.element.data('date-days-of-week-disabled')); + this.fillDow(); + this.fillMonths(); + this.update(); + this.showMode(); + + if (this.isInline) { + this.show(); + } + }; + + Datetimepicker.prototype = { + constructor: Datetimepicker, + + _events: [], + _attachEvents: function () { + this._detachEvents(); + if (this.isInput) { // single input + this._events = [ + [this.element, { + focus: $.proxy(this.show, this), + keyup: $.proxy(this.update, this), + keydown: $.proxy(this.keydown, this) + }] + ]; + } + else if (this.component && this.hasInput) { // component: input + button + this._events = [ + // For components that are not readonly, allow keyboard nav + [this.element.find('input'), { + focus: $.proxy(this.show, this), + keyup: $.proxy(this.update, this), + keydown: $.proxy(this.keydown, this) + }], + [this.component, { + click: $.proxy(this.show, this) + }] + ]; + if (this.componentReset) { + this._events.push([ + this.componentReset, + {click: $.proxy(this.reset, this)} + ]); + } + } + else if (this.element.is('div')) { // inline datetimepicker + this.isInline = true; + } + else { + this._events = [ + [this.element, { + click: $.proxy(this.show, this) + }] + ]; + } + for (var i = 0, el, ev; i < this._events.length; i++) { + el = this._events[i][0]; + ev = this._events[i][1]; + el.on(ev); + } + }, + + _detachEvents: function () { + for (var i = 0, el, ev; i < this._events.length; i++) { + el = this._events[i][0]; + ev = this._events[i][1]; + el.off(ev); + } + this._events = []; + }, + + show: function (e) { + this.picker.show(); + this.height = this.component ? this.component.outerHeight() : this.element.outerHeight(); + if (this.forceParse) { + this.update(); + } + this.place(); + $(window).on('resize', $.proxy(this.place, this)); + if (e) { + e.stopPropagation(); + e.preventDefault(); + } + this.isVisible = true; + this.element.trigger({ + type: 'show', + date: this.date + }); + }, + + hide: function (e) { + if (!this.isVisible) return; + if (this.isInline) return; + this.picker.hide(); + $(window).off('resize', this.place); + this.viewMode = this.startViewMode; + this.showMode(); + if (!this.isInput) { + $(document).off('mousedown', this.hide); + } + + if ( + this.forceParse && + ( + this.isInput && this.element.val() || + this.hasInput && this.element.find('input').val() + ) + ) + this.setValue(); + this.isVisible = false; + this.element.trigger({ + type: 'hide', + date: this.date + }); + }, + + remove: function () { + this._detachEvents(); + this.picker.remove(); + delete this.picker; + delete this.element.data().datetimepicker; + }, + + getDate: function () { + var d = this.getUTCDate(); + return new Date(d.getTime() + (d.getTimezoneOffset() * 60000)); + }, + + getUTCDate: function () { + return this.date; + }, + + setDate: function (d) { + this.setUTCDate(new Date(d.getTime() - (d.getTimezoneOffset() * 60000))); + }, + + setUTCDate: function (d) { + if (d >= this.startDate && d <= this.endDate) { + this.date = d; + this.setValue(); + this.viewDate = this.date; + this.fill(); + } else { + this.element.trigger({ + type: 'outOfRange', + date: d, + startDate: this.startDate, + endDate: this.endDate + }); + } + }, + + setFormat: function (format) { + this.format = DPGlobal.parseFormat(format, this.formatType); + var element; + if (this.isInput) { + element = this.element; + } else if (this.component) { + element = this.element.find('input'); + } + if (element && element.val()) { + this.setValue(); + } + }, + + setValue: function () { + var formatted = this.getFormattedDate(); + if (!this.isInput) { + if (this.component) { + this.element.find('input').val(formatted); + } + this.element.data('date', formatted); + } else { + this.element.val(formatted); + } + if (this.linkField) { + $('#' + this.linkField).val(this.getFormattedDate(this.linkFormat)); + } + }, + + getFormattedDate: function (format) { + if (format == undefined) format = this.format; + return DPGlobal.formatDate(this.date, format, this.language, this.formatType); + }, + + setStartDate: function (startDate) { + this.startDate = startDate || -Infinity; + if (this.startDate !== -Infinity) { + this.startDate = DPGlobal.parseDate(this.startDate, this.format, this.language, this.formatType); + } + this.update(); + this.updateNavArrows(); + }, + + setEndDate: function (endDate) { + this.endDate = endDate || Infinity; + if (this.endDate !== Infinity) { + this.endDate = DPGlobal.parseDate(this.endDate, this.format, this.language, this.formatType); + } + this.update(); + this.updateNavArrows(); + }, + + setDaysOfWeekDisabled: function (daysOfWeekDisabled) { + this.daysOfWeekDisabled = daysOfWeekDisabled || []; + if (!$.isArray(this.daysOfWeekDisabled)) { + this.daysOfWeekDisabled = this.daysOfWeekDisabled.split(/,\s*/); + } + this.daysOfWeekDisabled = $.map(this.daysOfWeekDisabled, function (d) { + return parseInt(d, 10); + }); + this.update(); + this.updateNavArrows(); + }, + + place: function () { + if (this.isInline) return; + + var index_highest = 0; + $('div').each(function () { + var index_current = parseInt($(this).css("zIndex"), 10); + if (index_current > index_highest) { + index_highest = index_current; + } + }); + var zIndex = index_highest + 10; + + var offset, top, left, containerOffset; + if (this.container instanceof $) { + containerOffset = this.container.offset(); + } else { + containerOffset = $(this.container).offset(); + } + + if (this.component) { + offset = this.component.offset(); + left = offset.left; + if (this.pickerPosition == 'bottom-left' || this.pickerPosition == 'top-left') { + left += this.component.outerWidth() - this.picker.outerWidth(); + } + } else { + offset = this.element.offset(); + left = offset.left; + } + + if(left+220 > document.body.clientWidth){ + left = document.body.clientWidth-220; + } + + if (this.pickerPosition == 'top-left' || this.pickerPosition == 'top-right') { + top = offset.top - this.picker.outerHeight(); + } else { + top = offset.top + this.height; + } + + top = top - containerOffset.top; + left = left - containerOffset.left; + + this.picker.css({ + top: top, + left: left, + zIndex: zIndex + }); + }, + + update: function () { + var date, fromArgs = false; + if (arguments && arguments.length && (typeof arguments[0] === 'string' || arguments[0] instanceof Date)) { + date = arguments[0]; + fromArgs = true; + } else { + date = (this.isInput ? this.element.val() : this.element.find('input').val()) || this.element.data('date') || this.initialDate; + if (typeof date == 'string' || date instanceof String) { + date = date.replace(/^\s+|\s+$/g,''); + } + } + + if (!date) { + date = new Date(); + fromArgs = false; + } + + this.date = DPGlobal.parseDate(date, this.format, this.language, this.formatType); + + if (fromArgs) this.setValue(); + + if (this.date < this.startDate) { + this.viewDate = new Date(this.startDate); + } else if (this.date > this.endDate) { + this.viewDate = new Date(this.endDate); + } else { + this.viewDate = new Date(this.date); + } + this.fill(); + }, + + fillDow: function () { + var dowCnt = this.weekStart, + html = '<tr>'; + while (dowCnt < this.weekStart + 7) { + html += '<th class="dow">' + dates[this.language].daysMin[(dowCnt++) % 7] + '</th>'; + } + html += '</tr>'; + this.picker.find('.datetimepicker-days thead').append(html); + }, + + fillMonths: function () { + var html = '', + i = 0; + while (i < 12) { + html += '<span class="month">' + dates[this.language].monthsShort[i++] + '</span>'; + } + this.picker.find('.datetimepicker-months td').html(html); + }, + + fill: function () { + if (this.date == null || this.viewDate == null) { + return; + } + var d = new Date(this.viewDate), + year = d.getUTCFullYear(), + month = d.getUTCMonth(), + dayMonth = d.getUTCDate(), + hours = d.getUTCHours(), + minutes = d.getUTCMinutes(), + startYear = this.startDate !== -Infinity ? this.startDate.getUTCFullYear() : -Infinity, + startMonth = this.startDate !== -Infinity ? this.startDate.getUTCMonth() : -Infinity, + endYear = this.endDate !== Infinity ? this.endDate.getUTCFullYear() : Infinity, + endMonth = this.endDate !== Infinity ? this.endDate.getUTCMonth() : Infinity, + currentDate = (new UTCDate(this.date.getUTCFullYear(), this.date.getUTCMonth(), this.date.getUTCDate())).valueOf(), + today = new Date(); + this.picker.find('.datetimepicker-days thead th:eq(1)') + .text(dates[this.language].months[month] + ' ' + year); + if (this.formatViewType == "time") { + var hourConverted = hours % 12 ? hours % 12 : 12; + var hoursDisplay = (hourConverted < 10 ? '0' : '') + hourConverted; + var minutesDisplay = (minutes < 10 ? '0' : '') + minutes; + var meridianDisplay = dates[this.language].meridiem[hours < 12 ? 0 : 1]; + this.picker.find('.datetimepicker-hours thead th:eq(1)') + .text(hoursDisplay + ':' + minutesDisplay + ' ' + (meridianDisplay ? meridianDisplay.toUpperCase() : '')); + this.picker.find('.datetimepicker-minutes thead th:eq(1)') + .text(hoursDisplay + ':' + minutesDisplay + ' ' + (meridianDisplay ? meridianDisplay.toUpperCase() : '')); + } else { + this.picker.find('.datetimepicker-hours thead th:eq(1)') + .text(dayMonth + ' ' + dates[this.language].months[month] + ' ' + year); + this.picker.find('.datetimepicker-minutes thead th:eq(1)') + .text(dayMonth + ' ' + dates[this.language].months[month] + ' ' + year); + } + this.picker.find('tfoot th.today') + .text(dates[this.language].today) + .toggle(this.todayBtn !== false); + this.updateNavArrows(); + this.fillMonths(); + /*var prevMonth = UTCDate(year, month, 0,0,0,0,0); + prevMonth.setUTCDate(prevMonth.getDate() - (prevMonth.getUTCDay() - this.weekStart + 7)%7);*/ + var prevMonth = UTCDate(year, month - 1, 28, 0, 0, 0, 0), + day = DPGlobal.getDaysInMonth(prevMonth.getUTCFullYear(), prevMonth.getUTCMonth()); + prevMonth.setUTCDate(day); + prevMonth.setUTCDate(day - (prevMonth.getUTCDay() - this.weekStart + 7) % 7); + var nextMonth = new Date(prevMonth); + nextMonth.setUTCDate(nextMonth.getUTCDate() + 42); + nextMonth = nextMonth.valueOf(); + var html = []; + var clsName; + while (prevMonth.valueOf() < nextMonth) { + if (prevMonth.getUTCDay() == this.weekStart) { + html.push('<tr>'); + } + clsName = ''; + if (prevMonth.getUTCFullYear() < year || (prevMonth.getUTCFullYear() == year && prevMonth.getUTCMonth() < month)) { + clsName += ' old'; + } else if (prevMonth.getUTCFullYear() > year || (prevMonth.getUTCFullYear() == year && prevMonth.getUTCMonth() > month)) { + clsName += ' new'; + } + // Compare internal UTC date with local today, not UTC today + if (this.todayHighlight && + prevMonth.getUTCFullYear() == today.getFullYear() && + prevMonth.getUTCMonth() == today.getMonth() && + prevMonth.getUTCDate() == today.getDate()) { + clsName += ' today'; + } + if (prevMonth.valueOf() == currentDate) { + clsName += ' active'; + } + if ((prevMonth.valueOf() + 86400000) <= this.startDate || prevMonth.valueOf() > this.endDate || + $.inArray(prevMonth.getUTCDay(), this.daysOfWeekDisabled) !== -1) { + clsName += ' disabled'; + } + html.push('<td class="day' + clsName + '">' + prevMonth.getUTCDate() + '</td>'); + if (prevMonth.getUTCDay() == this.weekEnd) { + html.push('</tr>'); + } + prevMonth.setUTCDate(prevMonth.getUTCDate() + 1); + } + this.picker.find('.datetimepicker-days tbody').empty().append(html.join('')); + + html = []; + var txt = '', meridian = '', meridianOld = ''; + for (var i = 0; i < 24; i++) { + var actual = UTCDate(year, month, dayMonth, i); + clsName = ''; + // We want the previous hour for the startDate + if ((actual.valueOf() + 3600000) <= this.startDate || actual.valueOf() > this.endDate) { + clsName += ' disabled'; + } else if (hours == i) { + clsName += ' active'; + } + if (this.showMeridian && dates[this.language].meridiem.length == 2) { + meridian = (i < 12 ? dates[this.language].meridiem[0] : dates[this.language].meridiem[1]); + if (meridian != meridianOld) { + if (meridianOld != '') { + html.push('</fieldset>'); + } + html.push('<fieldset class="hour"><legend>' + meridian.toUpperCase() + '</legend>'); + } + meridianOld = meridian; + txt = (i % 12 ? i % 12 : 12); + html.push('<span class="hour' + clsName + ' hour_' + (i < 12 ? 'am' : 'pm') + '">' + txt + '</span>'); + if (i == 23) { + html.push('</fieldset>'); + } + } else { + txt = i + ':00'; + html.push('<span class="hour' + clsName + '">' + txt + '</span>'); + } + } + this.picker.find('.datetimepicker-hours td').html(html.join('')); + + html = []; + txt = '', meridian = '', meridianOld = ''; + for (var i = 0; i < 60; i += this.minuteStep) { + var actual = UTCDate(year, month, dayMonth, hours, i, 0); + clsName = ''; + if (actual.valueOf() < this.startDate || actual.valueOf() > this.endDate) { + clsName += ' disabled'; + } else if (Math.floor(minutes / this.minuteStep) == Math.floor(i / this.minuteStep)) { + clsName += ' active'; + } + if (this.showMeridian && dates[this.language].meridiem.length == 2) { + meridian = (hours < 12 ? dates[this.language].meridiem[0] : dates[this.language].meridiem[1]); + if (meridian != meridianOld) { + if (meridianOld != '') { + html.push('</fieldset>'); + } + html.push('<fieldset class="minute"><legend>' + meridian.toUpperCase() + '</legend>'); + } + meridianOld = meridian; + txt = (hours % 12 ? hours % 12 : 12); + //html.push('<span class="minute'+clsName+' minute_'+(hours<12?'am':'pm')+'">'+txt+'</span>'); + html.push('<span class="minute' + clsName + '">' + txt + ':' + (i < 10 ? '0' + i : i) + '</span>'); + if (i == 59) { + html.push('</fieldset>'); + } + } else { + txt = i + ':00'; + //html.push('<span class="hour'+clsName+'">'+txt+'</span>'); + html.push('<span class="minute' + clsName + '">' + hours + ':' + (i < 10 ? '0' + i : i) + '</span>'); + } + } + this.picker.find('.datetimepicker-minutes td').html(html.join('')); + + var currentYear = this.date.getUTCFullYear(); + var months = this.picker.find('.datetimepicker-months') + .find('th:eq(1)') + .text(year) + .end() + .find('span').removeClass('active'); + if (currentYear == year) { + months.eq(this.date.getUTCMonth()).addClass('active'); + } + if (year < startYear || year > endYear) { + months.addClass('disabled'); + } + if (year == startYear) { + months.slice(0, startMonth).addClass('disabled'); + } + if (year == endYear) { + months.slice(endMonth + 1).addClass('disabled'); + } + + html = ''; + year = parseInt(year / 10, 10) * 10; + var yearCont = this.picker.find('.datetimepicker-years') + .find('th:eq(1)') + .text(year + '-' + (year + 9)) + .end() + .find('td'); + year -= 1; + for (var i = -1; i < 11; i++) { + html += '<span class="year' + (i == -1 || i == 10 ? ' old' : '') + (currentYear == year ? ' active' : '') + (year < startYear || year > endYear ? ' disabled' : '') + '">' + year + '</span>'; + year += 1; + } + yearCont.html(html); + this.place(); + }, + + updateNavArrows: function () { + var d = new Date(this.viewDate), + year = d.getUTCFullYear(), + month = d.getUTCMonth(), + day = d.getUTCDate(), + hour = d.getUTCHours(); + switch (this.viewMode) { + case 0: + if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear() + && month <= this.startDate.getUTCMonth() + && day <= this.startDate.getUTCDate() + && hour <= this.startDate.getUTCHours()) { + this.picker.find('.prev').css({visibility: 'hidden'}); + } else { + this.picker.find('.prev').css({visibility: 'visible'}); + } + if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear() + && month >= this.endDate.getUTCMonth() + && day >= this.endDate.getUTCDate() + && hour >= this.endDate.getUTCHours()) { + this.picker.find('.next').css({visibility: 'hidden'}); + } else { + this.picker.find('.next').css({visibility: 'visible'}); + } + break; + case 1: + if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear() + && month <= this.startDate.getUTCMonth() + && day <= this.startDate.getUTCDate()) { + this.picker.find('.prev').css({visibility: 'hidden'}); + } else { + this.picker.find('.prev').css({visibility: 'visible'}); + } + if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear() + && month >= this.endDate.getUTCMonth() + && day >= this.endDate.getUTCDate()) { + this.picker.find('.next').css({visibility: 'hidden'}); + } else { + this.picker.find('.next').css({visibility: 'visible'}); + } + break; + case 2: + if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear() + && month <= this.startDate.getUTCMonth()) { + this.picker.find('.prev').css({visibility: 'hidden'}); + } else { + this.picker.find('.prev').css({visibility: 'visible'}); + } + if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear() + && month >= this.endDate.getUTCMonth()) { + this.picker.find('.next').css({visibility: 'hidden'}); + } else { + this.picker.find('.next').css({visibility: 'visible'}); + } + break; + case 3: + case 4: + if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear()) { + this.picker.find('.prev').css({visibility: 'hidden'}); + } else { + this.picker.find('.prev').css({visibility: 'visible'}); + } + if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear()) { + this.picker.find('.next').css({visibility: 'hidden'}); + } else { + this.picker.find('.next').css({visibility: 'visible'}); + } + break; + } + }, + + mousewheel: function (e) { + + e.preventDefault(); + e.stopPropagation(); + + if (this.wheelPause) { + return; + } + + this.wheelPause = true; + + var originalEvent = e.originalEvent; + + var delta = originalEvent.wheelDelta; + + var mode = delta > 0 ? 1 : (delta === 0) ? 0 : -1; + + if (this.wheelViewModeNavigationInverseDirection) { + mode = -mode; + } + + this.showMode(mode); + + setTimeout($.proxy(function () { + + this.wheelPause = false + + }, this), this.wheelViewModeNavigationDelay); + + }, + + click: function (e) { + e.stopPropagation(); + e.preventDefault(); + var target = $(e.target).closest('span, td, th, legend'); + if (target.length == 1) { + if (target.is('.disabled')) { + this.element.trigger({ + type: 'outOfRange', + date: this.viewDate, + startDate: this.startDate, + endDate: this.endDate + }); + return; + } + switch (target[0].nodeName.toLowerCase()) { + case 'th': + switch (target[0].className) { + case 'switch': + this.showMode(1); + break; + case 'prev': + case 'next': + var dir = DPGlobal.modes[this.viewMode].navStep * (target[0].className == 'prev' ? -1 : 1); + switch (this.viewMode) { + case 0: + this.viewDate = this.moveHour(this.viewDate, dir); + break; + case 1: + this.viewDate = this.moveDate(this.viewDate, dir); + break; + case 2: + this.viewDate = this.moveMonth(this.viewDate, dir); + break; + case 3: + case 4: + this.viewDate = this.moveYear(this.viewDate, dir); + break; + } + this.fill(); + break; + case 'today': + var date = new Date(); + date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), 0); + + // Respect startDate and endDate. + if (date < this.startDate) date = this.startDate; + else if (date > this.endDate) date = this.endDate; + + this.viewMode = this.startViewMode; + this.showMode(0); + this._setDate(date); + this.fill(); + if (this.autoclose) { + this.hide(); + } + break; + } + break; + case 'span': + if (!target.is('.disabled')) { + var year = this.viewDate.getUTCFullYear(), + month = this.viewDate.getUTCMonth(), + day = this.viewDate.getUTCDate(), + hours = this.viewDate.getUTCHours(), + minutes = this.viewDate.getUTCMinutes(), + seconds = this.viewDate.getUTCSeconds(); + + if (target.is('.month')) { + this.viewDate.setUTCDate(1); + month = target.parent().find('span').index(target); + day = this.viewDate.getUTCDate(); + this.viewDate.setUTCMonth(month); + this.element.trigger({ + type: 'changeMonth', + date: this.viewDate + }); + if (this.viewSelect >= 3) { + this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0)); + } + } else if (target.is('.year')) { + this.viewDate.setUTCDate(1); + year = parseInt(target.text(), 10) || 0; + this.viewDate.setUTCFullYear(year); + this.element.trigger({ + type: 'changeYear', + date: this.viewDate + }); + if (this.viewSelect >= 4) { + this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0)); + } + } else if (target.is('.hour')) { + hours = parseInt(target.text(), 10) || 0; + if (target.hasClass('hour_am') || target.hasClass('hour_pm')) { + if (hours == 12 && target.hasClass('hour_am')) { + hours = 0; + } else if (hours != 12 && target.hasClass('hour_pm')) { + hours += 12; + } + } + this.viewDate.setUTCHours(hours); + this.element.trigger({ + type: 'changeHour', + date: this.viewDate + }); + if (this.viewSelect >= 1) { + this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0)); + } + } else if (target.is('.minute')) { + minutes = parseInt(target.text().substr(target.text().indexOf(':') + 1), 10) || 0; + this.viewDate.setUTCMinutes(minutes); + this.element.trigger({ + type: 'changeMinute', + date: this.viewDate + }); + if (this.viewSelect >= 0) { + this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0)); + } + } + if (this.viewMode != 0) { + var oldViewMode = this.viewMode; + this.showMode(-1); + this.fill(); + if (oldViewMode == this.viewMode && this.autoclose) { + this.hide(); + } + } else { + this.fill(); + if (this.autoclose) { + this.hide(); + } + } + } + break; + case 'td': + if (target.is('.day') && !target.is('.disabled')) { + var day = parseInt(target.text(), 10) || 1; + var year = this.viewDate.getUTCFullYear(), + month = this.viewDate.getUTCMonth(), + hours = this.viewDate.getUTCHours(), + minutes = this.viewDate.getUTCMinutes(), + seconds = this.viewDate.getUTCSeconds(); + if (target.is('.old')) { + if (month === 0) { + month = 11; + year -= 1; + } else { + month -= 1; + } + } else if (target.is('.new')) { + if (month == 11) { + month = 0; + year += 1; + } else { + month += 1; + } + } + this.viewDate.setUTCFullYear(year); + this.viewDate.setUTCMonth(month, day); + this.element.trigger({ + type: 'changeDay', + date: this.viewDate + }); + if (this.viewSelect >= 2) { + this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0)); + } + } + var oldViewMode = this.viewMode; + this.showMode(-1); + this.fill(); + if (oldViewMode == this.viewMode && this.autoclose) { + this.hide(); + } + break; + } + } + }, + + _setDate: function (date, which) { + if (!which || which == 'date') + this.date = date; + if (!which || which == 'view') + this.viewDate = date; + this.fill(); + this.setValue(); + var element; + if (this.isInput) { + element = this.element; + } else if (this.component) { + element = this.element.find('input'); + } + if (element) { + element.change(); + if (this.autoclose && (!which || which == 'date')) { + //this.hide(); + } + } + this.element.trigger({ + type: 'changeDate', + date: this.date + }); + }, + + moveMinute: function (date, dir) { + if (!dir) return date; + var new_date = new Date(date.valueOf()); + //dir = dir > 0 ? 1 : -1; + new_date.setUTCMinutes(new_date.getUTCMinutes() + (dir * this.minuteStep)); + return new_date; + }, + + moveHour: function (date, dir) { + if (!dir) return date; + var new_date = new Date(date.valueOf()); + //dir = dir > 0 ? 1 : -1; + new_date.setUTCHours(new_date.getUTCHours() + dir); + return new_date; + }, + + moveDate: function (date, dir) { + if (!dir) return date; + var new_date = new Date(date.valueOf()); + //dir = dir > 0 ? 1 : -1; + new_date.setUTCDate(new_date.getUTCDate() + dir); + return new_date; + }, + + moveMonth: function (date, dir) { + if (!dir) return date; + var new_date = new Date(date.valueOf()), + day = new_date.getUTCDate(), + month = new_date.getUTCMonth(), + mag = Math.abs(dir), + new_month, test; + dir = dir > 0 ? 1 : -1; + if (mag == 1) { + test = dir == -1 + // If going back one month, make sure month is not current month + // (eg, Mar 31 -> Feb 31 == Feb 28, not Mar 02) + ? function () { + return new_date.getUTCMonth() == month; + } + // If going forward one month, make sure month is as expected + // (eg, Jan 31 -> Feb 31 == Feb 28, not Mar 02) + : function () { + return new_date.getUTCMonth() != new_month; + }; + new_month = month + dir; + new_date.setUTCMonth(new_month); + // Dec -> Jan (12) or Jan -> Dec (-1) -- limit expected date to 0-11 + if (new_month < 0 || new_month > 11) + new_month = (new_month + 12) % 12; + } else { + // For magnitudes >1, move one month at a time... + for (var i = 0; i < mag; i++) + // ...which might decrease the day (eg, Jan 31 to Feb 28, etc)... + new_date = this.moveMonth(new_date, dir); + // ...then reset the day, keeping it in the new month + new_month = new_date.getUTCMonth(); + new_date.setUTCDate(day); + test = function () { + return new_month != new_date.getUTCMonth(); + }; + } + // Common date-resetting loop -- if date is beyond end of month, make it + // end of month + while (test()) { + new_date.setUTCDate(--day); + new_date.setUTCMonth(new_month); + } + return new_date; + }, + + moveYear: function (date, dir) { + return this.moveMonth(date, dir * 12); + }, + + dateWithinRange: function (date) { + return date >= this.startDate && date <= this.endDate; + }, + + keydown: function (e) { + if (this.picker.is(':not(:visible)')) { + if (e.keyCode == 27) // allow escape to hide and re-show picker + this.show(); + return; + } + var dateChanged = false, + dir, day, month, + newDate, newViewDate; + switch (e.keyCode) { + case 27: // escape + this.hide(); + e.preventDefault(); + break; + case 37: // left + case 39: // right + if (!this.keyboardNavigation) break; + dir = e.keyCode == 37 ? -1 : 1; + viewMode = this.viewMode; + if (e.ctrlKey) { + viewMode += 2; + } else if (e.shiftKey) { + viewMode += 1; + } + if (viewMode == 4) { + newDate = this.moveYear(this.date, dir); + newViewDate = this.moveYear(this.viewDate, dir); + } else if (viewMode == 3) { + newDate = this.moveMonth(this.date, dir); + newViewDate = this.moveMonth(this.viewDate, dir); + } else if (viewMode == 2) { + newDate = this.moveDate(this.date, dir); + newViewDate = this.moveDate(this.viewDate, dir); + } else if (viewMode == 1) { + newDate = this.moveHour(this.date, dir); + newViewDate = this.moveHour(this.viewDate, dir); + } else if (viewMode == 0) { + newDate = this.moveMinute(this.date, dir); + newViewDate = this.moveMinute(this.viewDate, dir); + } + if (this.dateWithinRange(newDate)) { + this.date = newDate; + this.viewDate = newViewDate; + this.setValue(); + this.update(); + e.preventDefault(); + dateChanged = true; + } + break; + case 38: // up + case 40: // down + if (!this.keyboardNavigation) break; + dir = e.keyCode == 38 ? -1 : 1; + viewMode = this.viewMode; + if (e.ctrlKey) { + viewMode += 2; + } else if (e.shiftKey) { + viewMode += 1; + } + if (viewMode == 4) { + newDate = this.moveYear(this.date, dir); + newViewDate = this.moveYear(this.viewDate, dir); + } else if (viewMode == 3) { + newDate = this.moveMonth(this.date, dir); + newViewDate = this.moveMonth(this.viewDate, dir); + } else if (viewMode == 2) { + newDate = this.moveDate(this.date, dir * 7); + newViewDate = this.moveDate(this.viewDate, dir * 7); + } else if (viewMode == 1) { + if (this.showMeridian) { + newDate = this.moveHour(this.date, dir * 6); + newViewDate = this.moveHour(this.viewDate, dir * 6); + } else { + newDate = this.moveHour(this.date, dir * 4); + newViewDate = this.moveHour(this.viewDate, dir * 4); + } + } else if (viewMode == 0) { + newDate = this.moveMinute(this.date, dir * 4); + newViewDate = this.moveMinute(this.viewDate, dir * 4); + } + if (this.dateWithinRange(newDate)) { + this.date = newDate; + this.viewDate = newViewDate; + this.setValue(); + this.update(); + e.preventDefault(); + dateChanged = true; + } + break; + case 13: // enter + if (this.viewMode != 0) { + var oldViewMode = this.viewMode; + this.showMode(-1); + this.fill(); + if (oldViewMode == this.viewMode && this.autoclose) { + this.hide(); + } + } else { + this.fill(); + if (this.autoclose) { + this.hide(); + } + } + e.preventDefault(); + break; + case 9: // tab + this.hide(); + break; + } + if (dateChanged) { + var element; + if (this.isInput) { + element = this.element; + } else if (this.component) { + element = this.element.find('input'); + } + if (element) { + element.change(); + } + this.element.trigger({ + type: 'changeDate', + date: this.date + }); + } + }, + + showMode: function (dir) { + if (dir) { + var newViewMode = Math.max(0, Math.min(DPGlobal.modes.length - 1, this.viewMode + dir)); + if (newViewMode >= this.minView && newViewMode <= this.maxView) { + this.element.trigger({ + type: 'changeMode', + date: this.viewDate, + oldViewMode: this.viewMode, + newViewMode: newViewMode + }); + + this.viewMode = newViewMode; + } + } + /* + vitalets: fixing bug of very special conditions: + jquery 1.7.1 + webkit + show inline datetimepicker in bootstrap popover. + Method show() does not set display css correctly and datetimepicker is not shown. + Changed to .css('display', 'block') solve the problem. + See https://github.com/vitalets/x-editable/issues/37 + + In jquery 1.7.2+ everything works fine. + */ + //this.picker.find('>div').hide().filter('.datetimepicker-'+DPGlobal.modes[this.viewMode].clsName).show(); + this.picker.find('>div').hide().filter('.datetimepicker-' + DPGlobal.modes[this.viewMode].clsName).css('display', 'block'); + this.updateNavArrows(); + }, + + reset: function (e) { + this._setDate(null, 'date'); + } + }; + + $.fn.datetimepicker = function (option) { + var args = Array.apply(null, arguments); + args.shift(); + var internal_return; + this.each(function () { + var $this = $(this), + data = $this.data('datetimepicker'), + options = typeof option == 'object' && option; + if (!data) { + $this.data('datetimepicker', (data = new Datetimepicker(this, $.extend({}, $.fn.datetimepicker.defaults, options)))); + } + if (typeof option == 'string' && typeof data[option] == 'function') { + internal_return = data[option].apply(data, args); + if (internal_return !== undefined) { + return false; + } + } + }); + if (internal_return !== undefined) + return internal_return; + else + return this; + }; + + $.fn.datetimepicker.defaults = { + }; + $.fn.datetimepicker.Constructor = Datetimepicker; + var dates = $.fn.datetimepicker.dates = { + en: { + days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"], + daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"], + daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"], + months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"], + monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], + meridiem: ["am", "pm"], + suffix: ["st", "nd", "rd", "th"], + today: "Today" + } + }; + + var DPGlobal = { + modes: [ + { + clsName: 'minutes', + navFnc: 'Hours', + navStep: 1 + }, + { + clsName: 'hours', + navFnc: 'Date', + navStep: 1 + }, + { + clsName: 'days', + navFnc: 'Month', + navStep: 1 + }, + { + clsName: 'months', + navFnc: 'FullYear', + navStep: 1 + }, + { + clsName: 'years', + navFnc: 'FullYear', + navStep: 10 + } + ], + isLeapYear: function (year) { + return (((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0)) + }, + getDaysInMonth: function (year, month) { + return [31, (DPGlobal.isLeapYear(year) ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month] + }, + getDefaultFormat: function (type, field) { + if (type == "standard") { + if (field == 'input') + return 'yyyy-mm-dd hh:ii'; + else + return 'yyyy-mm-dd hh:ii:ss'; + } else if (type == "php") { + if (field == 'input') + return 'Y-m-d H:i'; + else + return 'Y-m-d H:i:s'; + } else { + throw new Error("Invalid format type."); + } + }, + validParts: function (type) { + if (type == "standard") { + return /hh?|HH?|p|P|ii?|ss?|dd?|DD?|mm?|MM?|yy(?:yy)?/g; + } else if (type == "php") { + return /[dDjlNwzFmMnStyYaABgGhHis]/g; + } else { + throw new Error("Invalid format type."); + } + }, + nonpunctuation: /[^ -\/:-@\[-`{-~\t\n\rTZ]+/g, + parseFormat: function (format, type) { + // IE treats \0 as a string end in inputs (truncating the value), + // so it's a bad format delimiter, anyway + var separators = format.replace(this.validParts(type), '\0').split('\0'), + parts = format.match(this.validParts(type)); + if (!separators || !separators.length || !parts || parts.length == 0) { + throw new Error("Invalid date format."); + } + return {separators: separators, parts: parts}; + }, + parseDate: function (date, format, language, type) { + if (date instanceof Date) { + var dateUTC = new Date(date.valueOf() - date.getTimezoneOffset() * 60000); + dateUTC.setMilliseconds(0); + return dateUTC; + } + if (/^\d{4}\-\d{1,2}\-\d{1,2}$/.test(date)) { + format = this.parseFormat('yyyy-mm-dd', type); + } + if (/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}$/.test(date)) { + format = this.parseFormat('yyyy-mm-dd hh:ii', type); + } + if (/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}\:\d{1,2}[Z]{0,1}$/.test(date)) { + format = this.parseFormat('yyyy-mm-dd hh:ii:ss', type); + } + if (/^[-+]\d+[dmwy]([\s,]+[-+]\d+[dmwy])*$/.test(date)) { + var part_re = /([-+]\d+)([dmwy])/, + parts = date.match(/([-+]\d+)([dmwy])/g), + part, dir; + date = new Date(); + for (var i = 0; i < parts.length; i++) { + part = part_re.exec(parts[i]); + dir = parseInt(part[1]); + switch (part[2]) { + case 'd': + date.setUTCDate(date.getUTCDate() + dir); + break; + case 'm': + date = Datetimepicker.prototype.moveMonth.call(Datetimepicker.prototype, date, dir); + break; + case 'w': + date.setUTCDate(date.getUTCDate() + dir * 7); + break; + case 'y': + date = Datetimepicker.prototype.moveYear.call(Datetimepicker.prototype, date, dir); + break; + } + } + return UTCDate(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds(), 0); + } + var parts = date && date.match(this.nonpunctuation) || [], + date = new Date(0, 0, 0, 0, 0, 0, 0), + parsed = {}, + setters_order = ['hh', 'h', 'ii', 'i', 'ss', 's', 'yyyy', 'yy', 'M', 'MM', 'm', 'mm', 'D', 'DD', 'd', 'dd', 'H', 'HH', 'p', 'P'], + setters_map = { + hh: function (d, v) { + return d.setUTCHours(v); + }, + h: function (d, v) { + return d.setUTCHours(v); + }, + HH: function (d, v) { + return d.setUTCHours(v == 12 ? 0 : v); + }, + H: function (d, v) { + return d.setUTCHours(v == 12 ? 0 : v); + }, + ii: function (d, v) { + return d.setUTCMinutes(v); + }, + i: function (d, v) { + return d.setUTCMinutes(v); + }, + ss: function (d, v) { + return d.setUTCSeconds(v); + }, + s: function (d, v) { + return d.setUTCSeconds(v); + }, + yyyy: function (d, v) { + return d.setUTCFullYear(v); + }, + yy: function (d, v) { + return d.setUTCFullYear(2000 + v); + }, + m: function (d, v) { + v -= 1; + while (v < 0) v += 12; + v %= 12; + d.setUTCMonth(v); + while (d.getUTCMonth() != v) + if (isNaN(d.getUTCMonth())) + return d; + else + d.setUTCDate(d.getUTCDate() - 1); + return d; + }, + d: function (d, v) { + return d.setUTCDate(v); + }, + p: function (d, v) { + return d.setUTCHours(v == 1 ? d.getUTCHours() + 12 : d.getUTCHours()); + } + }, + val, filtered, part; + setters_map['M'] = setters_map['MM'] = setters_map['mm'] = setters_map['m']; + setters_map['dd'] = setters_map['d']; + setters_map['P'] = setters_map['p']; + date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds()); + if (parts.length == format.parts.length) { + for (var i = 0, cnt = format.parts.length; i < cnt; i++) { + val = parseInt(parts[i], 10); + part = format.parts[i]; + if (isNaN(val)) { + switch (part) { + case 'MM': + filtered = $(dates[language].months).filter(function () { + var m = this.slice(0, parts[i].length), + p = parts[i].slice(0, m.length); + return m == p; + }); + val = $.inArray(filtered[0], dates[language].months) + 1; + break; + case 'M': + filtered = $(dates[language].monthsShort).filter(function () { + var m = this.slice(0, parts[i].length), + p = parts[i].slice(0, m.length); + return m.toLowerCase() == p.toLowerCase(); + }); + val = $.inArray(filtered[0], dates[language].monthsShort) + 1; + break; + case 'p': + case 'P': + val = $.inArray(parts[i].toLowerCase(), dates[language].meridiem); + break; + } + } + parsed[part] = val; + } + for (var i = 0, s; i < setters_order.length; i++) { + s = setters_order[i]; + if (s in parsed && !isNaN(parsed[s])) + setters_map[s](date, parsed[s]) + } + } + return date; + }, + formatDate: function (date, format, language, type) { + if (date == null) { + return ''; + } + var val; + if (type == 'standard') { + val = { + // year + yy: date.getUTCFullYear().toString().substring(2), + yyyy: date.getUTCFullYear(), + // month + m: date.getUTCMonth() + 1, + M: dates[language].monthsShort[date.getUTCMonth()], + MM: dates[language].months[date.getUTCMonth()], + // day + d: date.getUTCDate(), + D: dates[language].daysShort[date.getUTCDay()], + DD: dates[language].days[date.getUTCDay()], + p: (dates[language].meridiem.length == 2 ? dates[language].meridiem[date.getUTCHours() < 12 ? 0 : 1] : ''), + // hour + h: date.getUTCHours(), + // minute + i: date.getUTCMinutes(), + // second + s: date.getUTCSeconds() + }; + + if (dates[language].meridiem.length == 2) { + val.H = (val.h % 12 == 0 ? 12 : val.h % 12); + } + else { + val.H = val.h; + } + val.HH = (val.H < 10 ? '0' : '') + val.H; + val.P = val.p.toUpperCase(); + val.hh = (val.h < 10 ? '0' : '') + val.h; + val.ii = (val.i < 10 ? '0' : '') + val.i; + val.ss = (val.s < 10 ? '0' : '') + val.s; + val.dd = (val.d < 10 ? '0' : '') + val.d; + val.mm = (val.m < 10 ? '0' : '') + val.m; + } else if (type == 'php') { + // php format + val = { + // year + y: date.getUTCFullYear().toString().substring(2), + Y: date.getUTCFullYear(), + // month + F: dates[language].months[date.getUTCMonth()], + M: dates[language].monthsShort[date.getUTCMonth()], + n: date.getUTCMonth() + 1, + t: DPGlobal.getDaysInMonth(date.getUTCFullYear(), date.getUTCMonth()), + // day + j: date.getUTCDate(), + l: dates[language].days[date.getUTCDay()], + D: dates[language].daysShort[date.getUTCDay()], + w: date.getUTCDay(), // 0 -> 6 + N: (date.getUTCDay() == 0 ? 7 : date.getUTCDay()), // 1 -> 7 + S: (date.getUTCDate() % 10 <= dates[language].suffix.length ? dates[language].suffix[date.getUTCDate() % 10 - 1] : ''), + // hour + a: (dates[language].meridiem.length == 2 ? dates[language].meridiem[date.getUTCHours() < 12 ? 0 : 1] : ''), + g: (date.getUTCHours() % 12 == 0 ? 12 : date.getUTCHours() % 12), + G: date.getUTCHours(), + // minute + i: date.getUTCMinutes(), + // second + s: date.getUTCSeconds() + }; + val.m = (val.n < 10 ? '0' : '') + val.n; + val.d = (val.j < 10 ? '0' : '') + val.j; + val.A = val.a.toString().toUpperCase(); + val.h = (val.g < 10 ? '0' : '') + val.g; + val.H = (val.G < 10 ? '0' : '') + val.G; + val.i = (val.i < 10 ? '0' : '') + val.i; + val.s = (val.s < 10 ? '0' : '') + val.s; + } else { + throw new Error("Invalid format type."); + } + var date = [], + seps = $.extend([], format.separators); + for (var i = 0, cnt = format.parts.length; i < cnt; i++) { + if (seps.length) { + date.push(seps.shift()); + } + date.push(val[format.parts[i]]); + } + if (seps.length) { + date.push(seps.shift()); + } + return date.join(''); + }, + convertViewMode: function (viewMode) { + switch (viewMode) { + case 4: + case 'decade': + viewMode = 4; + break; + case 3: + case 'year': + viewMode = 3; + break; + case 2: + case 'month': + viewMode = 2; + break; + case 1: + case 'day': + viewMode = 1; + break; + case 0: + case 'hour': + viewMode = 0; + break; + } + + return viewMode; + }, + headTemplate: '<thead>' + + '<tr>' + + '<th class="prev"><i class="icon-arrow-left"/></th>' + + '<th colspan="5" class="switch"></th>' + + '<th class="next"><i class="icon-arrow-right"/></th>' + + '</tr>' + + '</thead>', + headTemplateV3: '<thead>' + + '<tr>' + + '<th class="prev"><span class="glyphicon glyphicon-arrow-left"></span> </th>' + + '<th colspan="5" class="switch"></th>' + + '<th class="next"><span class="glyphicon glyphicon-arrow-right"></span> </th>' + + '</tr>' + + '</thead>', + contTemplate: '<tbody><tr><td colspan="7"></td></tr></tbody>', + footTemplate: '<tfoot><tr><th colspan="7" class="today"></th></tr></tfoot>' + }; + DPGlobal.template = '<div class="datetimepicker">' + + '<div class="datetimepicker-minutes">' + + '<table class=" table-condensed">' + + DPGlobal.headTemplate + + DPGlobal.contTemplate + + DPGlobal.footTemplate + + '</table>' + + '</div>' + + '<div class="datetimepicker-hours">' + + '<table class=" table-condensed">' + + DPGlobal.headTemplate + + DPGlobal.contTemplate + + DPGlobal.footTemplate + + '</table>' + + '</div>' + + '<div class="datetimepicker-days">' + + '<table class=" table-condensed">' + + DPGlobal.headTemplate + + '<tbody></tbody>' + + DPGlobal.footTemplate + + '</table>' + + '</div>' + + '<div class="datetimepicker-months">' + + '<table class="table-condensed">' + + DPGlobal.headTemplate + + DPGlobal.contTemplate + + DPGlobal.footTemplate + + '</table>' + + '</div>' + + '<div class="datetimepicker-years">' + + '<table class="table-condensed">' + + DPGlobal.headTemplate + + DPGlobal.contTemplate + + DPGlobal.footTemplate + + '</table>' + + '</div>' + + '</div>'; + DPGlobal.templateV3 = '<div class="datetimepicker">' + + '<div class="datetimepicker-minutes">' + + '<table class=" table-condensed">' + + DPGlobal.headTemplateV3 + + DPGlobal.contTemplate + + DPGlobal.footTemplate + + '</table>' + + '</div>' + + '<div class="datetimepicker-hours">' + + '<table class=" table-condensed">' + + DPGlobal.headTemplateV3 + + DPGlobal.contTemplate + + DPGlobal.footTemplate + + '</table>' + + '</div>' + + '<div class="datetimepicker-days">' + + '<table class=" table-condensed">' + + DPGlobal.headTemplateV3 + + '<tbody></tbody>' + + DPGlobal.footTemplate + + '</table>' + + '</div>' + + '<div class="datetimepicker-months">' + + '<table class="table-condensed">' + + DPGlobal.headTemplateV3 + + DPGlobal.contTemplate + + DPGlobal.footTemplate + + '</table>' + + '</div>' + + '<div class="datetimepicker-years">' + + '<table class="table-condensed">' + + DPGlobal.headTemplateV3 + + DPGlobal.contTemplate + + DPGlobal.footTemplate + + '</table>' + + '</div>' + + '</div>'; + $.fn.datetimepicker.DPGlobal = DPGlobal; + + /* DATETIMEPICKER NO CONFLICT + * =================== */ + + $.fn.datetimepicker.noConflict = function () { + $.fn.datetimepicker = old; + return this; + }; + + /* DATETIMEPICKER DATA-API + * ================== */ + + $(document).on( + 'focus.datetimepicker.data-api click.datetimepicker.data-api', + '[data-provide="datetimepicker"]', + function (e) { + var $this = $(this); + if ($this.data('datetimepicker')) return; + e.preventDefault(); + // component click requires us to explicitly show it + $this.datetimepicker('show'); + } + ); + $(function () { + $('[data-provide="datetimepicker-inline"]').datetimepicker(); + }); + +}(window.jQuery); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.min.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.min.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.min.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1 @@ +!function(c){function f(){return new Date(Date.UTC.apply(Date,arguments))}function a(){var g=new Date();return f(g.getUTCFullYear(),g.getUTCMonth(),g.getUTCDate(),g.getUTCHours(),g.getUTCMinutes(),g.getUTCSeconds(),0)}var e=function(h,g){var i=this;this.element=c(h);this.container=g.container||"body";this.language=g.language||this.element.data("date-language")||"en";this.language=this.language in d?this.language:"en";this.isRTL=d[this.language].rtl||false;this.formatType=g.formatType||this.element.data("format-type")||"standard";this.format=b.parseFormat(g.format||this.element.data("date-format")||d[this.language].format||b.getDefaultFormat(this.formatType,"input"),this.formatType);this.isInline=false;this.isVisible=false;this.isInput=this.element.is("input");this.bootcssVer=this.isInput?(this.element.is(".form-control")?3:2):(this.bootcssVer=this.element.is(".input-group")?3:2);this.component=this.element.is(".date")?(this.bootcssVer==3?this.element.find(".input-group-addon .glyphicon-th, .input-group-addon .glyphicon-time, .input-group-addon .glyphicon-calendar").parent():this.element.find(".add-on .icon-th, .add-on .icon-time, .add-on .icon-calendar").parent()):false;this.componentReset=this.element.is(".date")?(this.bootcssVer==3?this.element.find(".input-group-addon .glyphicon-remove").parent():this.element.find(".add-on .icon-remove").parent()):false;this.hasInput=this.component&&this.element.find("input").length;if(this.component&&this.component.length===0){this.component=false}this.linkField=g.linkField||this.element.data("link-field")||false;this.linkFormat=b.parseFormat(g.linkFormat||this.element.data("link-format")||b.getDefaultFormat(this.formatType,"link"),this.formatType);this.minuteStep=g.minuteStep||this.element.data("minute-step")||5;this.pickerPosition=g.pickerPosition||this.element.data("picker-position")||"bottom-right";this.showMeridian=g.showMeridian||this.element.data("show-meridian")||false;this.initialDate=g.initialDate||new Date();this._attachEvents();this.formatViewType="datetime";if("formatViewType" in g){this.formatViewType=g.formatViewType}else{if("formatViewType" in this.element.data()){this.formatViewType=this.element.data("formatViewType")}}this.minView=0;if("minView" in g){this.minView=g.minView}else{if("minView" in this.element.data()){this.minView=this.element.data("min-view")}}this.minView=b.convertViewMode(this.minView);this.maxView=b.modes.length-1;if("maxView" in g){this.maxView=g.maxView}else{if("maxView" in this.element.data()){this.maxView=this.element.data("max-view")}}this.maxView=b.convertViewMode(this.maxView);this.wheelViewModeNavigation=false;if("wheelViewModeNavigation" in g){this.wheelViewModeNavigation=g.wheelViewModeNavigation}else{if("wheelViewModeNavigation" in this.element.data()){this.wheelViewModeNavigation=this.element.data("view-mode-wheel-navigation")}}this.wheelViewModeNavigationInverseDirection=false;if("wheelViewModeNavigationInverseDirection" in g){this.wheelViewModeNavigationInverseDirection=g.wheelViewModeNavigationInverseDirection}else{if("wheelViewModeNavigationInverseDirection" in this.element.data()){this.wheelViewModeNavigationInverseDirection=this.element.data("view-mode-wheel-navigation-inverse-dir")}}this.wheelViewModeNavigationDelay=100;if("wheelViewModeNavigationDelay" in g){this.wheelViewModeNavigationDelay=g.wheelViewModeNavigationDelay}else{if("wheelViewModeNavigationDelay" in this.element.data()){this.wheelViewModeNavigationDelay=this.element.data("view-mode-wheel-navigation-delay")}}this.startViewMode=2;if("startView" in g){this.startViewMode=g.startView}else{if("startView" in this.element.data()){this.startViewMode=this.element.data("start-view")}}this.startViewMode=b.convertViewMode(this.startViewMode);this.viewMode=this.startViewMode;this.viewSelect=this.minView;if("viewSelect" in g){this.viewSelect=g.viewSelect}else{if("viewSelect" in this.element.data()){this.viewSelect=this.element.data("view-select")}}this.viewSelect=b.convertViewMode(this.viewSelect);this.forceParse=true;if("forceParse" in g){this.forceParse=g.forceParse}else{if("dateForceParse" in this.element.data()){this.forceParse=this.element.data("date-force-parse")}}this.picker=c((this.bootcssVer==3)?b.templateV3:b.template).appendTo(this.isInline?this.element:this.container).on({click:c.proxy(this.click,this),mousedown:c.proxy(this.mousedown,this)});if(this.wheelViewModeNavigation){if(c.fn.mousewheel){this.picker.on({mousewheel:c.proxy(this.mousewheel,this)})}else{console.log("Mouse Wheel event is not supported. Please include the jQuery Mouse Wheel plugin before enabling this option")}}if(this.isInline){this.picker.addClass("datetimepicker-inline")}else{this.picker.addClass("datetimepicker-dropdown-"+this.pickerPosition+" dropdown-menu")}if(this.isRTL){this.picker.addClass("datetimepicker-rtl");if(this.bootcssVer==3){this.picker.find(".prev span, .next span").toggleClass("glyphicon-arrow-left glyphicon-arrow-right")}else{this.picker.find(".prev i, .next i").toggleClass("icon-arrow-left icon-arrow-right")}}c(document).on("mousedown",function(j){if(c(j.target).closest(".datetimepicker").length===0){i.hide()}});this.autoclose=false;if("autoclose" in g){this.autoclose=g.autoclose}else{if("dateAutoclose" in this.element.data()){this.autoclose=this.element.data("date-autoclose")}}this.keyboardNavigation=true;if("keyboardNavigation" in g){this.keyboardNavigation=g.keyboardNavigation}else{if("dateKeyboardNavigation" in this.element.data()){this.keyboardNavigation=this.element.data("date-keyboard-navigation")}}this.todayBtn=(g.todayBtn||this.element.data("date-today-btn")||false);this.todayHighlight=(g.todayHighlight||this.element.data("date-today-highlight")||false);this.weekStart=((g.weekStart||this.element.data("date-weekstart")||d[this.language].weekStart||0)%7);this.weekEnd=((this.weekStart+6)%7);this.startDate=-Infinity;this.endDate=Infinity;this.daysOfWeekDisabled=[];this.setStartDate(g.startDate||this.element.data("date-startdate"));this.setEndDate(g.endDate||this.element.data("date-enddate"));this.setDaysOfWeekDisabled(g.daysOfWeekDisabled||this.element.data("date-days-of-week-disabled"));this.fillDow();this.fillMonths();this.update();this.showMode();if(this.isInline){this.show()}};e.prototype={constructor:e,_events:[],_attachEvents:function(){this._detachEvents();if(this.isInput){this._events=[[this.element,{focus:c.proxy(this.show,this),keyup:c.proxy(this.update,this),keydown:c.proxy(this.keydown,this)}]]}else{if(this.component&&this.hasInput){this._events=[[this.element.find("input"),{focus:c.proxy(this.show,this),keyup:c.proxy(this.update,this),keydown:c.proxy(this.keydown,this)}],[this.component,{click:c.proxy(this.show,this)}]];if(this.componentReset){this._events.push([this.componentReset,{click:c.proxy(this.reset,this)}])}}else{if(this.element.is("div")){this.isInline=true}else{this._events=[[this.element,{click:c.proxy(this.show,this)}]]}}}for(var g=0,h,j;g<this._events.length;g++){h=this._events[g][0];j=this._events[g][1];h.on(j)}},_detachEvents:function(){for(var g=0,h,j;g<this._events.length;g++){h=this._events[g][0];j=this._events[g][1];h.off(j)}this._events=[]},show:function(g){this.picker.show();this.height=this.component?this.component.outerHeight():this.element.outerHeight();if(this.forceParse){this.update()}this.place();c(window).on("resize",c.proxy(this.place,this));if(g){g.stopPropagation();g.preventDefault()}this.isVisible=true;this.element.trigger({type:"show",date:this.date})},hide:function(g){if(!this.isVisible){return}if(this.isInline){return}this.picker.hide();c(window).off("resize",this.place);this.viewMode=this.startViewMode;this.showMode();if(!this.isInput){c(document).off("mousedown",this.hide)}if(this.forceParse&&(this.isInput&&this.element.val()||this.hasInput&&this.element.find("input").val())){this.setValue()}this.isVisible=false;this.element.trigger({type:"hide",date:this.date})},remove:function(){this._detachEvents();this.picker.remove();delete this.picker;delete this.element.data().datetimepicker},getDate:function(){var g=this.getUTCDate();return new Date(g.getTime()+(g.getTimezoneOffset()*60000))},getUTCDate:function(){return this.date},setDate:function(g){this.setUTCDate(new Date(g.getTime()-(g.getTimezoneOffset()*60000)))},setUTCDate:function(g){if(g>=this.startDate&&g<=this.endDate){this.date=g;this.setValue();this.viewDate=this.date;this.fill()}else{this.element.trigger({type:"outOfRange",date:g,startDate:this.startDate,endDate:this.endDate})}},setFormat:function(h){this.format=b.parseFormat(h,this.formatType);var g;if(this.isInput){g=this.element}else{if(this.component){g=this.element.find("input")}}if(g&&g.val()){this.setValue()}},setValue:function(){var g=this.getFormattedDate();if(!this.isInput){if(this.component){this.element.find("input").val(g)}this.element.data("date",g)}else{this.element.val(g)}if(this.linkField){c("#"+this.linkField).val(this.getFormattedDate(this.linkFormat))}},getFormattedDate:function(g){if(g==undefined){g=this.format}return b.formatDate(this.date,g,this.language,this.formatType)},setStartDate:function(g){this.startDate=g||-Infinity;if(this.startDate!==-Infinity){this.startDate=b.parseDate(this.startDate,this.format,this.language,this.formatType)}this.update();this.updateNavArrows()},setEndDate:function(g){this.endDate=g||Infinity;if(this.endDate!==Infinity){this.endDate=b.parseDate(this.endDate,this.format,this.language,this.formatType)}this.update();this.updateNavArrows()},setDaysOfWeekDisabled:function(g){this.daysOfWeekDisabled=g||[];if(!c.isArray(this.daysOfWeekDisabled)){this.daysOfWeekDisabled=this.daysOfWeekDisabled.split(/,\s*/)}this.daysOfWeekDisabled=c.map(this.daysOfWeekDisabled,function(h){return parseInt(h,10)});this.update();this.updateNavArrows()},place:function(){if(this.isInline){return}var g=0;c("div").each(function(){var m=parseInt(c(this).css("zIndex"),10);if(m>g){g=m}});var l=g+10;var k,j,i,h;if(this.container instanceof c){h=this.container.offset()}else{h=c(this.container).offset()}if(this.component){k=this.component.offset();i=k.left;if(this.pickerPosition=="bottom-left"||this.pickerPosition=="top-left"){i+=this.component.outerWidth()-this.picker.outerWidth()}}else{k=this.element.offset();i=k.left}if(i+220>document.body.clientWidth){i=document.body.clientWidth-220}if(this.pickerPosition=="top-left"||this.pickerPosition=="top-right"){j=k.top-this.picker.outerHeight()}else{j=k.top+this.height}j=j-h.top;i=i-h.left;this.picker.css({top:j,left:i,zIndex:l})},update:function(){var g,h=false;if(arguments&&arguments.length&&(typeof arguments[0]==="string"||arguments[0] instanceof Date)){g=arguments[0];h=true}else{g=(this.isInput?this.element.val():this.element.find("input").val())||this.element.data("date")||this.initialDate;if(typeof g=="string"||g instanceof String){g=g.replace(/^\s+|\s+$/g,"")}}if(!g){g=new Date();h=false}this.date=b.parseDate(g,this.format,this.language,this.formatType);if(h){this.setValue()}if(this.date<this.startDate){this.viewDate=new Date(this.startDate)}else{if(this.date>this.endDate){this.viewDate=new Date(this.endDate)}else{this.viewDate=new Date(this.date)}}this.fill()},fillDow:function(){var g=this.weekStart,h="<tr>";while(g<this.weekStart+7){h+='<th class="dow">'+d[this.language].daysMin[(g++)%7]+"</th>"}h+="</tr>";this.picker.find(".datetimepicker-days thead").append(h)},fillMonths:function(){var h="",g=0;while(g<12){h+='<span class="month">'+d[this.language].monthsShort[g++]+"</span>"}this.picker.find(".datetimepicker-months td").html(h)},fill:function(){if(this.date==null||this.viewDate==null){return}var E=new Date(this.viewDate),q=E.getUTCFullYear(),F=E.getUTCMonth(),j=E.getUTCDate(),z=E.getUTCHours(),u=E.getUTCMinutes(),v=this.startDate!==-Infinity?this.startDate.getUTCFullYear():-Infinity,A=this.startDate!==-Infinity?this.startDate.getUTCMonth():-Infinity,l=this.endDate!==Infinity?this.endDate.getUTCFullYear():Infinity,w=this.endDate!==Infinity?this.endDate.getUTCMonth():Infinity,n=(new f(this.date.getUTCFullYear(),this.date.getUTCMonth(),this.date.getUTCDate())).valueOf(),D=new Date();this.picker.find(".datetimepicker-days thead th:eq(1)").text(d[this.language].months[F]+" "+q);if(this.formatViewType=="time"){var B=z%12?z%12:12;var h=(B<10?"0":"")+B;var m=(u<10?"0":"")+u;var H=d[this.language].meridiem[z<12?0:1];this.picker.find(".datetimepicker-hours thead th:eq(1)").text(h+":"+m+" "+(H?H.toUpperCase():""));this.picker.find(".datetimepicker-minutes thead th:eq(1)").text(h+":"+m+" "+(H?H.toUpperCase():""))}else{this.picker.find(".datetimepicker-hours thead th:eq(1)").text(j+" "+d[this.language].months[F]+" "+q);this.picker.find(".datetimepicker-minutes thead th:eq(1)").text(j+" "+d[this.language].months[F]+" "+q)}this.picker.find("tfoot th.today").text(d[this.language].today).toggle(this.todayBtn!==false);this.updateNavArrows();this.fillMonths();var I=f(q,F-1,28,0,0,0,0),y=b.getDaysInMonth(I.getUTCFullYear(),I.getUTCMonth());I.setUTCDate(y);I.setUTCDate(y-(I.getUTCDay()-this.weekStart+7)%7);var g=new Date(I);g.setUTCDate(g.getUTCDate()+42);g=g.valueOf();var o=[];var r;while(I.valueOf()<g){if(I.getUTCDay()==this.weekStart){o.push("<tr>")}r="";if(I.getUTCFullYear()<q||(I.getUTCFullYear()==q&&I.getUTCMonth()<F)){r+=" old"}else{if(I.getUTCFullYear()>q||(I.getUTCFullYear()==q&&I.getUTCMonth()>F)){r+=" new"}}if(this.todayHighlight&&I.getUTCFullYear()==D.getFullYear()&&I.getUTCMonth()==D.getMonth()&&I.getUTCDate()==D.getDate()){r+=" today"}if(I.valueOf()==n){r+=" active"}if((I.valueOf()+86400000)<=this.startDate||I.valueOf()>this.endDate||c.inArray(I.getUTCDay(),this.daysOfWeekDisabled)!==-1){r+=" disabled"}o.push('<td class="day'+r+'">'+I.getUTCDate()+"</td>");if(I.getUTCDay()==this.weekEnd){o.push("</tr>")}I.setUTCDate(I.getUTCDate()+1)}this.picker.find(".datetimepicker-days tbody").empty().append(o.join(""));o=[];var s="",C="",p="";for(var x=0;x<24;x++){var t=f(q,F,j,x);r="";if((t.valueOf()+3600000)<=this.startDate||t.valueOf()>this.endDate){r+=" disabled"}else{if(z==x){r+=" active"}}if(this.showMeridian&&d[this.language].meridiem.length==2){C=(x<12?d[this.language].meridiem[0]:d[this.language].meridiem[1]);if(C!=p){if(p!=""){o.push("</fieldset>")}o.push('<fieldset class="hour"><legend>'+C.toUpperCase()+"</legend>")}p=C;s=(x%12?x%12:12);o.push('<span class="hour'+r+" hour_"+(x<12?"am":"pm")+'">'+s+"</span>");if(x==23){o.push("</fieldset>")}}else{s=x+":00";o.push('<span class="hour'+r+'">'+s+"</span>")}}this.picker.find(".datetimepicker-hours td").html(o.join(""));o=[];s="",C="",p="";for(var x=0;x<60;x+=this.minuteStep){var t=f(q,F,j,z,x,0);r="";if(t.valueOf()<this.startDate||t.valueOf()>this.endDate){r+=" disabled"}else{if(Math.floor(u/this.minuteStep)==Math.floor(x/this.minuteStep)){r+=" active"}}if(this.showMeridian&&d[this.language].meridiem.length==2){C=(z<12?d[this.language].meridiem[0]:d[this.language].meridiem[1]);if(C!=p){if(p!=""){o.push("</fieldset>")}o.push('<fieldset class="minute"><legend>'+C.toUpperCase()+"</legend>")}p=C;s=(z%12?z%12:12);o.push('<span class="minute'+r+'">'+s+":"+(x<10?"0"+x:x)+"</span>");if(x==59){o.push("</fieldset>")}}else{s=x+":00";o.push('<span class="minute'+r+'">'+z+":"+(x<10?"0"+x:x)+"</span>")}}this.picker.find(".datetimepicker-minutes td").html(o.join(""));var J=this.date.getUTCFullYear();var k=this.picker.find(".datetimepicker-months").find("th:eq(1)").text(q).end().find("span").removeClass("active");if(J==q){k.eq(this.date.getUTCMonth()).addClass("active")}if(q<v||q>l){k.addClass("disabled")}if(q==v){k.slice(0,A).addClass("disabled")}if(q==l){k.slice(w+1).addClass("disabled")}o="";q=parseInt(q/10,10)*10;var G=this.picker.find(".datetimepicker-years").find("th:eq(1)").text(q+"-"+(q+9)).end().find("td");q-=1;for(var x=-1;x<11;x++){o+='<span class="year'+(x==-1||x==10?" old":"")+(J==q?" active":"")+(q<v||q>l?" disabled":"")+'">'+q+"</span>";q+=1}G.html(o);this.place()},updateNavArrows:function(){var k=new Date(this.viewDate),i=k.getUTCFullYear(),j=k.getUTCMonth(),h=k.getUTCDate(),g=k.getUTCHours();switch(this.viewMode){case 0:if(this.startDate!==-Infinity&&i<=this.startDate.getUTCFullYear()&&j<=this.startDate.getUTCMonth()&&h<=this.startDate.getUTCDate()&&g<=this.startDate.getUTCHours()){this.picker.find(".prev").css({visibility:"hidden"})}else{this.picker.find(".prev").css({visibility:"visible"})}if(this.endDate!==Infinity&&i>=this.endDate.getUTCFullYear()&&j>=this.endDate.getUTCMonth()&&h>=this.endDate.getUTCDate()&&g>=this.endDate.getUTCHours()){this.picker.find(".next").css({visibility:"hidden"})}else{this.picker.find(".next").css({visibility:"visible"})}break;case 1:if(this.startDate!==-Infinity&&i<=this.startDate.getUTCFullYear()&&j<=this.startDate.getUTCMonth()&&h<=this.startDate.getUTCDate()){this.picker.find(".prev").css({visibility:"hidden"})}else{this.picker.find(".prev").css({visibility:"visible"})}if(this.endDate!==Infinity&&i>=this.endDate.getUTCFullYear()&&j>=this.endDate.getUTCMonth()&&h>=this.endDate.getUTCDate()){this.picker.find(".next").css({visibility:"hidden"})}else{this.picker.find(".next").css({visibility:"visible"})}break;case 2:if(this.startDate!==-Infinity&&i<=this.startDate.getUTCFullYear()&&j<=this.startDate.getUTCMonth()){this.picker.find(".prev").css({visibility:"hidden"})}else{this.picker.find(".prev").css({visibility:"visible"})}if(this.endDate!==Infinity&&i>=this.endDate.getUTCFullYear()&&j>=this.endDate.getUTCMonth()){this.picker.find(".next").css({visibility:"hidden"})}else{this.picker.find(".next").css({visibility:"visible"})}break;case 3:case 4:if(this.startDate!==-Infinity&&i<=this.startDate.getUTCFullYear()){this.picker.find(".prev").css({visibility:"hidden"})}else{this.picker.find(".prev").css({visibility:"visible"})}if(this.endDate!==Infinity&&i>=this.endDate.getUTCFullYear()){this.picker.find(".next").css({visibility:"hidden"})}else{this.picker.find(".next").css({visibility:"visible"})}break}},mousewheel:function(h){h.preventDefault();h.stopPropagation();if(this.wheelPause){return}this.wheelPause=true;var g=h.originalEvent;var j=g.wheelDelta;var i=j>0?1:(j===0)?0:-1;if(this.wheelViewModeNavigationInverseDirection){i=-i}this.showMode(i);setTimeout(c.proxy(function(){this.wheelPause=false},this),this.wheelViewModeNavigationDelay)},click:function(k){k.stopPropagation();k.preventDefault();var l=c(k.target).closest("span, td, th, legend");if(l.length==1){if(l.is(".disabled")){this.element.trigger({type:"outOfRange",date:this.viewDate,startDate:this.startDate,endDate:this.endDate});return}switch(l[0].nodeName.toLowerCase()){case"th":switch(l[0].className){case"switch":this.showMode(1);break;case"prev":case"next":var g=b.modes[this.viewMode].navStep*(l[0].className=="prev"?-1:1);switch(this.viewMode){case 0:this.viewDate=this.moveHour(this.viewDate,g);break;case 1:this.viewDate=this.moveDate(this.viewDate,g);break;case 2:this.viewDate=this.moveMonth(this.viewDate,g);break;case 3:case 4:this.viewDate=this.moveYear(this.viewDate,g);break}this.fill();break;case"today":var h=new Date();h=f(h.getFullYear(),h.getMonth(),h.getDate(),h.getHours(),h.getMinutes(),h.getSeconds(),0);if(h<this.startDate){h=this.startDate}else{if(h>this.endDate){h=this.endDate}}this.viewMode=this.startViewMode;this.showMode(0);this._setDate(h);this.fill();if(this.autoclose){this.hide()}break}break;case"span":if(!l.is(".disabled")){var n=this.viewDate.getUTCFullYear(),m=this.viewDate.getUTCMonth(),o=this.viewDate.getUTCDate(),p=this.viewDate.getUTCHours(),i=this.viewDate.getUTCMinutes(),q=this.viewDate.getUTCSeconds();if(l.is(".month")){this.viewDate.setUTCDate(1);m=l.parent().find("span").index(l);o=this.viewDate.getUTCDate();this.viewDate.setUTCMonth(m);this.element.trigger({type:"changeMonth",date:this.viewDate});if(this.viewSelect>=3){this._setDate(f(n,m,o,p,i,q,0))}}else{if(l.is(".year")){this.viewDate.setUTCDate(1);n=parseInt(l.text(),10)||0;this.viewDate.setUTCFullYear(n);this.element.trigger({type:"changeYear",date:this.viewDate});if(this.viewSelect>=4){this._setDate(f(n,m,o,p,i,q,0))}}else{if(l.is(".hour")){p=parseInt(l.text(),10)||0;if(l.hasClass("hour_am")||l.hasClass("hour_pm")){if(p==12&&l.hasClass("hour_am")){p=0}else{if(p!=12&&l.hasClass("hour_pm")){p+=12}}}this.viewDate.setUTCHours(p);this.element.trigger({type:"changeHour",date:this.viewDate});if(this.viewSelect>=1){this._setDate(f(n,m,o,p,i,q,0))}}else{if(l.is(".minute")){i=parseInt(l.text().substr(l.text().indexOf(":")+1),10)||0;this.viewDate.setUTCMinutes(i);this.element.trigger({type:"changeMinute",date:this.viewDate});if(this.viewSelect>=0){this._setDate(f(n,m,o,p,i,q,0))}}}}}if(this.viewMode!=0){var j=this.viewMode;this.showMode(-1);this.fill();if(j==this.viewMode&&this.autoclose){this.hide()}}else{this.fill();if(this.autoclose){this.hide()}}}break;case"td":if(l.is(".day")&&!l.is(".disabled")){var o=parseInt(l.text(),10)||1;var n=this.viewDate.getUTCFullYear(),m=this.viewDate.getUTCMonth(),p=this.viewDate.getUTCHours(),i=this.viewDate.getUTCMinutes(),q=this.viewDate.getUTCSeconds();if(l.is(".old")){if(m===0){m=11;n-=1}else{m-=1}}else{if(l.is(".new")){if(m==11){m=0;n+=1}else{m+=1}}}this.viewDate.setUTCFullYear(n);this.viewDate.setUTCMonth(m,o);this.element.trigger({type:"changeDay",date:this.viewDate});if(this.viewSelect>=2){this._setDate(f(n,m,o,p,i,q,0))}}var j=this.viewMode;this.showMode(-1);this.fill();if(j==this.viewMode&&this.autoclose){this.hide()}break}}},_setDate:function(g,i){if(!i||i=="date"){this.date=g}if(!i||i=="view"){this.viewDate=g}this.fill();this.setValue();var h;if(this.isInput){h=this.element}else{if(this.component){h=this.element.find("input")}}if(h){h.change();if(this.autoclose&&(!i||i=="date")){}}this.element.trigger({type:"changeDate",date:this.date})},moveMinute:function(h,g){if(!g){return h}var i=new Date(h.valueOf());i.setUTCMinutes(i.getUTCMinutes()+(g*this.minuteStep));return i},moveHour:function(h,g){if(!g){return h}var i=new Date(h.valueOf());i.setUTCHours(i.getUTCHours()+g);return i},moveDate:function(h,g){if(!g){return h}var i=new Date(h.valueOf());i.setUTCDate(i.getUTCDate()+g);return i},moveMonth:function(g,h){if(!h){return g}var l=new Date(g.valueOf()),p=l.getUTCDate(),m=l.getUTCMonth(),k=Math.abs(h),o,n;h=h>0?1:-1;if(k==1){n=h==-1?function(){return l.getUTCMonth()==m}:function(){return l.getUTCMonth()!=o};o=m+h;l.setUTCMonth(o);if(o<0||o>11){o=(o+12)%12}}else{for(var j=0;j<k;j++){l=this.moveMonth(l,h)}o=l.getUTCMonth();l.setUTCDate(p);n=function(){return o!=l.getUTCMonth()}}while(n()){l.setUTCDate(--p);l.setUTCMonth(o)}return l},moveYear:function(h,g){return this.moveMonth(h,g*12)},dateWithinRange:function(g){return g>=this.startDate&&g<=this.endDate},keydown:function(k){if(this.picker.is(":not(:visible)")){if(k.keyCode==27){this.show()}return}var m=false,h,n,l,o,g;switch(k.keyCode){case 27:this.hide();k.preventDefault();break;case 37:case 39:if(!this.keyboardNavigation){break}h=k.keyCode==37?-1:1;viewMode=this.viewMode;if(k.ctrlKey){viewMode+=2}else{if(k.shiftKey){viewMode+=1}}if(viewMode==4){o=this.moveYear(this.date,h);g=this.moveYear(this.viewDate,h)}else{if(viewMode==3){o=this.moveMonth(this.date,h);g=this.moveMonth(this.viewDate,h)}else{if(viewMode==2){o=this.moveDate(this.date,h);g=this.moveDate(this.viewDate,h)}else{if(viewMode==1){o=this.moveHour(this.date,h);g=this.moveHour(this.viewDate,h)}else{if(viewMode==0){o=this.moveMinute(this.date,h);g=this.moveMinute(this.viewDate,h)}}}}}if(this.dateWithinRange(o)){this.date=o;this.viewDate=g;this.setValue();this.update();k.preventDefault();m=true}break;case 38:case 40:if(!this.keyboardNavigation){break}h=k.keyCode==38?-1:1;viewMode=this.viewMode;if(k.ctrlKey){viewMode+=2}else{if(k.shiftKey){viewMode+=1}}if(viewMode==4){o=this.moveYear(this.date,h);g=this.moveYear(this.viewDate,h)}else{if(viewMode==3){o=this.moveMonth(this.date,h);g=this.moveMonth(this.viewDate,h)}else{if(viewMode==2){o=this.moveDate(this.date,h*7);g=this.moveDate(this.viewDate,h*7)}else{if(viewMode==1){if(this.showMeridian){o=this.moveHour(this.date,h*6);g=this.moveHour(this.viewDate,h*6)}else{o=this.moveHour(this.date,h*4);g=this.moveHour(this.viewDate,h*4)}}else{if(viewMode==0){o=this.moveMinute(this.date,h*4);g=this.moveMinute(this.viewDate,h*4)}}}}}if(this.dateWithinRange(o)){this.date=o;this.viewDate=g;this.setValue();this.update();k.preventDefault();m=true}break;case 13:if(this.viewMode!=0){var j=this.viewMode;this.showMode(-1);this.fill();if(j==this.viewMode&&this.autoclose){this.hide()}}else{this.fill();if(this.autoclose){this.hide()}}k.preventDefault();break;case 9:this.hide();break}if(m){var i;if(this.isInput){i=this.element}else{if(this.component){i=this.element.find("input")}}if(i){i.change()}this.element.trigger({type:"changeDate",date:this.date})}},showMode:function(g){if(g){var h=Math.max(0,Math.min(b.modes.length-1,this.viewMode+g));if(h>=this.minView&&h<=this.maxView){this.element.trigger({type:"changeMode",date:this.viewDate,oldViewMode:this.viewMode,newViewMode:h});this.viewMode=h}}this.picker.find(">div").hide().filter(".datetimepicker-"+b.modes[this.viewMode].clsName).css("display","block");this.updateNavArrows()},reset:function(g){this._setDate(null,"date")}};c.fn.datetimepicker=function(i){var g=Array.apply(null,arguments);g.shift();var h;this.each(function(){var l=c(this),k=l.data("datetimepicker"),j=typeof i=="object"&&i;if(!k){l.data("datetimepicker",(k=new e(this,c.extend({},c.fn.datetimepicker.defaults,j))))}if(typeof i=="string"&&typeof k[i]=="function"){h=k[i].apply(k,g);if(h!==undefined){return false}}});if(h!==undefined){return h}else{return this}};c.fn.datetimepicker.defaults={};c.fn.datetimepicker.Constructor=e;var d=c.fn.datetimepicker.dates={en:{days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],daysShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat","Sun"],daysMin:["Su","Mo","Tu","We","Th","Fr","Sa","Su"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],monthsShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],meridiem:["am","pm"],suffix:["st","nd","rd","th"],today:"Today"}};var b={modes:[{clsName:"minutes",navFnc:"Hours",navStep:1},{clsName:"hours",navFnc:"Date",navStep:1},{clsName:"days",navFnc:"Month",navStep:1},{clsName:"months",navFnc:"FullYear",navStep:1},{clsName:"years",navFnc:"FullYear",navStep:10}],isLeapYear:function(g){return(((g%4===0)&&(g%100!==0))||(g%400===0))},getDaysInMonth:function(g,h){return[31,(b.isLeapYear(g)?29:28),31,30,31,30,31,31,30,31,30,31][h]},getDefaultFormat:function(g,h){if(g=="standard"){if(h=="input"){return"yyyy-mm-dd hh:ii"}else{return"yyyy-mm-dd hh:ii:ss"}}else{if(g=="php"){if(h=="input"){return"Y-m-d H:i"}else{return"Y-m-d H:i:s"}}else{throw new Error("Invalid format type.")}}},validParts:function(g){if(g=="standard"){return/hh?|HH?|p|P|ii?|ss?|dd?|DD?|mm?|MM?|yy(?:yy)?/g}else{if(g=="php"){return/[dDjlNwzFmMnStyYaABgGhHis]/g}else{throw new Error("Invalid format type.")}}},nonpunctuation:/[^ -\/:-@\[-`{-~\t\n\rTZ]+/g,parseFormat:function(j,h){var g=j.replace(this.validParts(h),"\0").split("\0"),i=j.match(this.validParts(h));if(!g||!g.length||!i||i.length==0){throw new Error("Invalid date format.")}return{separators:g,parts:i}},parseDate:function(l,u,o,r){if(l instanceof Date){var w=new Date(l.valueOf()-l.getTimezoneOffset()*60000);w.setMilliseconds(0);return w}if(/^\d{4}\-\d{1,2}\-\d{1,2}$/.test(l)){u=this.parseFormat("yyyy-mm-dd",r)}if(/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}$/.test(l)){u=this.parseFormat("yyyy-mm-dd hh:ii",r)}if(/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}\:\d{1,2}[Z]{0,1}$/.test(l)){u=this.parseFormat("yyyy-mm-dd hh:ii:ss",r)}if(/^[-+]\d+[dmwy]([\s,]+[-+]\d+[dmwy])*$/.test(l)){var x=/([-+]\d+)([dmwy])/,m=l.match(/([-+]\d+)([dmwy])/g),g,k;l=new Date();for(var n=0;n<m.length;n++){g=x.exec(m[n]);k=parseInt(g[1]);switch(g[2]){case"d":l.setUTCDate(l.getUTCDate()+k);break;case"m":l=e.prototype.moveMonth.call(e.prototype,l,k);break;case"w":l.setUTCDate(l.getUTCDate()+k*7);break;case"y":l=e.prototype.moveYear.call(e.prototype,l,k);break}}return f(l.getUTCFullYear(),l.getUTCMonth(),l.getUTCDate(),l.getUTCHours(),l.getUTCMinutes(),l.getUTCSeconds(),0)}var m=l&&l.match(this.nonpunctuation)||[],l=new Date(0,0,0,0,0,0,0),q={},t=["hh","h","ii","i","ss","s","yyyy","yy","M","MM","m","mm","D","DD","d","dd","H","HH","p","P"],v={hh:function(s,i){return s.setUTCHours(i)},h:function(s,i){return s.setUTCHours(i)},HH:function(s,i){return s.setUTCHours(i==12?0:i)},H:function(s,i){return s.setUTCHours(i==12?0:i)},ii:function(s,i){return s.setUTCMinutes(i)},i:function(s,i){return s.setUTCMinutes(i)},ss:function(s,i){return s.setUTCSeconds(i)},s:function(s,i){return s.setUTCSeconds(i)},yyyy:function(s,i){return s.setUTCFullYear(i)},yy:function(s,i){return s.setUTCFullYear(2000+i)},m:function(s,i){i-=1;while(i<0){i+=12}i%=12;s.setUTCMonth(i);while(s.getUTCMonth()!=i){if(isNaN(s.getUTCMonth())){return s}else{s.setUTCDate(s.getUTCDate()-1)}}return s},d:function(s,i){return s.setUTCDate(i)},p:function(s,i){return s.setUTCHours(i==1?s.getUTCHours()+12:s.getUTCHours())}},j,p,g;v.M=v.MM=v.mm=v.m;v.dd=v.d;v.P=v.p;l=f(l.getFullYear(),l.getMonth(),l.getDate(),l.getHours(),l.getMinutes(),l.getSeconds());if(m.length==u.parts.length){for(var n=0,h=u.parts.length;n<h;n++){j=parseInt(m[n],10);g=u.parts[n];if(isNaN(j)){switch(g){case"MM":p=c(d[o].months).filter(function(){var i=this.slice(0,m[n].length),s=m[n].slice(0,i.length);return i==s});j=c.inArray(p[0],d[o].months)+1;break;case"M":p=c(d[o].monthsShort).filter(function(){var i=this.slice(0,m[n].length),s=m[n].slice(0,i.length);return i.toLowerCase()==s.toLowerCase()});j=c.inArray(p[0],d[o].monthsShort)+1;break;case"p":case"P":j=c.inArray(m[n].toLowerCase(),d[o].meridiem);break}}q[g]=j}for(var n=0,y;n<t.length;n++){y=t[n];if(y in q&&!isNaN(q[y])){v[y](l,q[y])}}}return l},formatDate:function(g,m,o,k){if(g==null){return""}var n;if(k=="standard"){n={yy:g.getUTCFullYear().toString().substring(2),yyyy:g.getUTCFullYear(),m:g.getUTCMonth()+1,M:d[o].monthsShort[g.getUTCMonth()],MM:d[o].months[g.getUTCMonth()],d:g.getUTCDate(),D:d[o].daysShort[g.getUTCDay()],DD:d[o].days[g.getUTCDay()],p:(d[o].meridiem.length==2?d[o].meridiem[g.getUTCHours()<12?0:1]:""),h:g.getUTCHours(),i:g.getUTCMinutes(),s:g.getUTCSeconds()};if(d[o].meridiem.length==2){n.H=(n.h%12==0?12:n.h%12)}else{n.H=n.h}n.HH=(n.H<10?"0":"")+n.H;n.P=n.p.toUpperCase();n.hh=(n.h<10?"0":"")+n.h;n.ii=(n.i<10?"0":"")+n.i;n.ss=(n.s<10?"0":"")+n.s;n.dd=(n.d<10?"0":"")+n.d;n.mm=(n.m<10?"0":"")+n.m}else{if(k=="php"){n={y:g.getUTCFullYear().toString().substring(2),Y:g.getUTCFullYear(),F:d[o].months[g.getUTCMonth()],M:d[o].monthsShort[g.getUTCMonth()],n:g.getUTCMonth()+1,t:b.getDaysInMonth(g.getUTCFullYear(),g.getUTCMonth()),j:g.getUTCDate(),l:d[o].days[g.getUTCDay()],D:d[o].daysShort[g.getUTCDay()],w:g.getUTCDay(),N:(g.getUTCDay()==0?7:g.getUTCDay()),S:(g.getUTCDate()%10<=d[o].suffix.length?d[o].suffix[g.getUTCDate()%10-1]:""),a:(d[o].meridiem.length==2?d[o].meridiem[g.getUTCHours()<12?0:1]:""),g:(g.getUTCHours()%12==0?12:g.getUTCHours()%12),G:g.getUTCHours(),i:g.getUTCMinutes(),s:g.getUTCSeconds()};n.m=(n.n<10?"0":"")+n.n;n.d=(n.j<10?"0":"")+n.j;n.A=n.a.toString().toUpperCase();n.h=(n.g<10?"0":"")+n.g;n.H=(n.G<10?"0":"")+n.G;n.i=(n.i<10?"0":"")+n.i;n.s=(n.s<10?"0":"")+n.s}else{throw new Error("Invalid format type.")}}var g=[],l=c.extend([],m.separators);for(var j=0,h=m.parts.length;j<h;j++){if(l.length){g.push(l.shift())}g.push(n[m.parts[j]])}if(l.length){g.push(l.shift())}return g.join("")},convertViewMode:function(g){switch(g){case 4:case"decade":g=4;break;case 3:case"year":g=3;break;case 2:case"month":g=2;break;case 1:case"day":g=1;break;case 0:case"hour":g=0;break}return g},headTemplate:'<thead><tr><th class="prev"><i class="icon-arrow-left"/></th><th colspan="5" class="switch"></th><th class="next"><i class="icon-arrow-right"/></th></tr></thead>',headTemplateV3:'<thead><tr><th class="prev"><span class="glyphicon glyphicon-arrow-left"></span> </th><th colspan="5" class="switch"></th><th class="next"><span class="glyphicon glyphicon-arrow-right"></span> </th></tr></thead>',contTemplate:'<tbody><tr><td colspan="7"></td></tr></tbody>',footTemplate:'<tfoot><tr><th colspan="7" class="today"></th></tr></tfoot>'};b.template='<div class="datetimepicker"><div class="datetimepicker-minutes"><table class=" table-condensed">'+b.headTemplate+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-hours"><table class=" table-condensed">'+b.headTemplate+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-days"><table class=" table-condensed">'+b.headTemplate+"<tbody></tbody>"+b.footTemplate+'</table></div><div class="datetimepicker-months"><table class="table-condensed">'+b.headTemplate+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-years"><table class="table-condensed">'+b.headTemplate+b.contTemplate+b.footTemplate+"</table></div></div>";b.templateV3='<div class="datetimepicker"><div class="datetimepicker-minutes"><table class=" table-condensed">'+b.headTemplateV3+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-hours"><table class=" table-condensed">'+b.headTemplateV3+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-days"><table class=" table-condensed">'+b.headTemplateV3+"<tbody></tbody>"+b.footTemplate+'</table></div><div class="datetimepicker-months"><table class="table-condensed">'+b.headTemplateV3+b.contTemplate+b.footTemplate+'</table></div><div class="datetimepicker-years"><table class="table-condensed">'+b.headTemplateV3+b.contTemplate+b.footTemplate+"</table></div></div>";c.fn.datetimepicker.DPGlobal=b;c.fn.datetimepicker.noConflict=function(){c.fn.datetimepicker=old;return this};c(document).on("focus.datetimepicker.data-api click.datetimepicker.data-api",'[data-provide="datetimepicker"]',function(h){var g=c(this);if(g.data("datetimepicker")){return}h.preventDefault();g.datetimepicker("show")});c(function(){c('[data-provide="datetimepicker-inline"]').datetimepicker()})}(window.jQuery); \ No newline at end of file Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ar.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ar.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ar.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,17 @@ +/** +* Arabic translation for bootstrap-datetimepicker +* Ala' Mohammad <amohammad(a)birzeit.ecu> +*/ +;(function($){ + $.fn.datetimepicker.dates['ar'] = { + days: ["الأحد", "الاثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت", "الأحد"], + daysShort: ["أحد", "اثنين", "ثلاثاء", "أربعاء", "خميس", "جمعة", "سبت", "أحد"], + daysMin: ["أح", "إث", "ث", "أر", "خ", "ج", "س", "أح"], + months: ["يناير", "فبراير", "مارس", "أبريل", "مايو", "يونيو", "يوليو", "أغسطس", "سبتمبر", "أكتوبر", "نوفمبر", "ديسمبر"], + monthsShort: ["يناير", "فبراير", "مارس", "أبريل", "مايو", "يونيو", "يوليو", "أغسطس", "سبتمبر", "أكتوبر", "نوفمبر", "ديسمبر"], + today: "هذا اليوم", + suffix: [], + meridiem: [], + rtl: true + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.bg.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.bg.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.bg.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Bulgarian translation for bootstrap-datetimepicker + * Apostol Apostolov <apostol.s.apostolov(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['bg'] = { + days: ["Неделя", "Понеделник", "Вторник", "Сряда", "Четвъртък", "Петък", "Събота", "Неделя"], + daysShort: ["Нед", "Пон", "Вто", "Сря", "Чет", "Пет", "Съб", "Нед"], + daysMin: ["Н", "П", "В", "С", "Ч", "П", "С", "Н"], + months: ["Януари", "Февруари", "Март", "Април", "Май", "Юни", "Юли", "Август", "Септември", "Октомври", "Ноември", "Декември"], + monthsShort: ["Ян", "Фев", "Мар", "Апр", "Май", "Юни", "Юли", "Авг", "Сеп", "Окт", "Ное", "Дек"], + today: "днес", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ca.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ca.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ca.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Catalan translation for bootstrap-datetimepicker + * J. Garcia <jogaco.en(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['ca'] = { + days: ["Diumenge", "Dilluns", "Dimarts", "Dimecres", "Dijous", "Divendres", "Dissabte", "Diumenge"], + daysShort: ["Diu", "Dil", "Dmt", "Dmc", "Dij", "Div", "Dis", "Diu"], + daysMin: ["dg", "dl", "dt", "dc", "dj", "dv", "ds", "dg"], + months: ["Gener", "Febrer", "Març", "Abril", "Maig", "Juny", "Juliol", "Agost", "Setembre", "Octubre", "Novembre", "Desembre"], + monthsShort: ["Gen", "Feb", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Oct", "Nov", "Des"], + today: "Avui", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.cs.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.cs.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.cs.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,19 @@ +/** + * Czech translation for bootstrap-datetimepicker + * Matěj Koubík <matej(a)koubik.name> + * Fixes by Michal Remiš <michal.remis(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['cs'] = { + days: ["Neděle", "Pondělí", "Úterý", "Středa", "Čtvrtek", "Pátek", "Sobota", "Neděle"], + daysShort: ["Ned", "Pon", "Úte", "Stř", "Čtv", "Pát", "Sob", "Ned"], + daysMin: ["Ne", "Po", "Út", "St", "Čt", "Pá", "So", "Ne"], + months: ["Leden", "Únor", "Březen", "Duben", "Květen", "Červen", "Červenec", "Srpen", "Září", "Říjen", "Listopad", "Prosinec"], + monthsShort: ["Led", "Úno", "Bře", "Dub", "Kvě", "Čer", "Čnc", "Srp", "Zář", "Říj", "Lis", "Pro"], + today: "Dnes", + suffix: [], + meridiem: [], + weekStart: 1, + format: "dd.mm.yyyy" + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.da.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.da.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.da.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Danish translation for bootstrap-datetimepicker + * Christian Pedersen <http://github.com/chripede> + */ +;(function($){ + $.fn.datetimepicker.dates['da'] = { + days: ["Søndag", "Mandag", "Tirsdag", "Onsdag", "Torsdag", "Fredag", "Lørdag", "Søndag"], + daysShort: ["Søn", "Man", "Tir", "Ons", "Tor", "Fre", "Lør", "Søn"], + daysMin: ["Sø", "Ma", "Ti", "On", "To", "Fr", "Lø", "Sø"], + months: ["Januar", "Februar", "Marts", "April", "Maj", "Juni", "Juli", "August", "September", "Oktober", "November", "December"], + monthsShort: ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"], + today: "I Dag", + suffix: [], + meridiem: [] + }; +}(jQuery)); \ No newline at end of file Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.de.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.de.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.de.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,18 @@ +/** + * German translation for bootstrap-datetimepicker + * Sam Zurcher <sam(a)orelias.ch> + */ +;(function($){ + $.fn.datetimepicker.dates['de'] = { + days: ["Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag"], + daysShort: ["Son", "Mon", "Die", "Mit", "Don", "Fre", "Sam", "Son"], + daysMin: ["So", "Mo", "Di", "Mi", "Do", "Fr", "Sa", "So"], + months: ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"], + monthsShort: ["Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"], + today: "Heute", + suffix: [], + meridiem: [], + weekStart: 1, + format: "dd.mm.yyyy" + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ee.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ee.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ee.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,18 @@ +/** + * Estonian translation for bootstrap-datetimepicker + * Rene Korss <http://rene.korss.ee> + */ +;(function($){ + $.fn.datetimepicker.dates['ee'] = { + days: ["Pühapäev", "Esmaspäev", "Teisipäev", "Kolmapäev", "Neljapäev", "Reede", "Laupäev", "Pühapäev"], + daysShort: ["P", "E", "T", "K", "N", "R", "L", "P"], + daysMin: ["P", "E", "T", "K", "N", "R", "L", "P"], + months: ["Jaanuar", "Veebruar", "Märts", "Aprill", "Mai", "Juuni", "Juuli", "August", "September", "Oktoober", "November", "Detsember"], + monthsShort: ["Jaan", "Veebr", "Märts", "Apr", "Mai", "Juuni", "Juuli", "Aug", "Sept", "Okt", "Nov", "Dets"], + today: "Täna", + suffix: [], + meridiem: [], + weekStart: 1, + format: "dd.mm.yyyy hh:ii" + }; +}(jQuery)); \ No newline at end of file Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.el.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.el.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.el.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,15 @@ +/** +* Greek translation for bootstrap-datetimepicker +*/ +;(function($){ + $.fn.datetimepicker.dates['el'] = { + days: ["Κυριακή", "Δευτέρα", "Τρίτη", "Τετάρτη", "Πέμπτη", "Παρασκευή", "Σάββατο", "Κυριακή"], + daysShort: ["Κυρ", "Δευ", "Τρι", "Τετ", "Πεμ", "Παρ", "Σαβ", "Κυρ"], + daysMin: ["Κυ", "Δε", "Τρ", "Τε", "Πε", "Πα", "Σα", "Κυ"], + months: ["Ιανουάριος", "Φεβρουάριος", "Μάρτιος", "Απρίλιος", "Μάιος", "Ιούνιος", "Ιούλιος", "Αύγουστος", "Σεπτέμβριος", "Οκτώβριος", "Νοέμβριος", "Δεκέμβριος"], + monthsShort: ["Ιαν", "Φεβ", "Μαρ", "Απρ", "Μάι", "Ιουν", "Ιουλ", "Αυγ", "Σεπ", "Οκτ", "Νοε", "Δεκ"], + today: "Σήμερα", + suffix: [], + meridiem: [] + }; +}(jQuery)); \ No newline at end of file Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.es.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.es.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.es.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Spanish translation for bootstrap-datetimepicker + * Bruno Bonamin <bruno.bonamin(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['es'] = { + days: ["Domingo", "Lunes", "Martes", "Miércoles", "Jueves", "Viernes", "Sábado", "Domingo"], + daysShort: ["Dom", "Lun", "Mar", "Mié", "Jue", "Vie", "Sáb", "Dom"], + daysMin: ["Do", "Lu", "Ma", "Mi", "Ju", "Vi", "Sa", "Do"], + months: ["Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre"], + monthsShort: ["Ene", "Feb", "Mar", "Abr", "May", "Jun", "Jul", "Ago", "Sep", "Oct", "Nov", "Dic"], + today: "Hoy", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fi.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fi.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fi.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Finnish translation for bootstrap-datetimepicker + * Jaakko Salonen <https://github.com/jsalonen> + */ +;(function($){ + $.fn.datetimepicker.dates['fi'] = { + days: ["sunnuntai", "maanantai", "tiistai", "keskiviikko", "torstai", "perjantai", "lauantai", "sunnuntai"], + daysShort: ["sun", "maa", "tii", "kes", "tor", "per", "lau", "sun"], + daysMin: ["su", "ma", "ti", "ke", "to", "pe", "la", "su"], + months: ["tammikuu", "helmikuu", "maaliskuu", "huhtikuu", "toukokuu", "kesäkuu", "heinäkuu", "elokuu", "syyskuu", "lokakuu", "marraskuu", "joulukuu"], + monthsShort: ["tam", "hel", "maa", "huh", "tou", "kes", "hei", "elo", "syy", "lok", "mar", "jou"], + today: "tänään", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fr.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fr.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fr.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,18 @@ +/** + * French translation for bootstrap-datetimepicker + * Nico Mollet <nico.mollet(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['fr'] = { + days: ["Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi", "Dimanche"], + daysShort: ["Dim", "Lun", "Mar", "Mer", "Jeu", "Ven", "Sam", "Dim"], + daysMin: ["D", "L", "Ma", "Me", "J", "V", "S", "D"], + months: ["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"], + monthsShort: ["Jan", "Fev", "Mar", "Avr", "Mai", "Jui", "Jul", "Aou", "Sep", "Oct", "Nov", "Dec"], + today: "Aujourd'hui", + suffix: [], + meridiem: ["am", "pm"], + weekStart: 1, + format: "dd/mm/yyyy" + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.he.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.he.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.he.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,17 @@ +/** + * Hebrew translation for bootstrap-datetimepicker + * Sagie Maoz <sagie(a)maoz.info> + */ +;(function($){ + $.fn.datetimepicker.dates['he'] = { + days: ["ראשון", "שני", "שלישי", "רביעי", "חמישי", "שישי", "שבת", "ראשון"], + daysShort: ["א", "ב", "ג", "ד", "ה", "ו", "ש", "א"], + daysMin: ["א", "ב", "ג", "ד", "ה", "ו", "ש", "א"], + months: ["ינואר", "פברואר", "מרץ", "אפריל", "מאי", "יוני", "יולי", "אוגוסט", "ספטמבר", "אוקטובר", "נובמבר", "דצמבר"], + monthsShort: ["ינו", "פבר", "מרץ", "אפר", "מאי", "יונ", "יול", "אוג", "ספט", "אוק", "נוב", "דצמ"], + today: "היום", + suffix: [], + meridiem: [], + rtl: true + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.hr.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.hr.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.hr.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,15 @@ +/** + * Croatian localisation + */ +;(function($){ + $.fn.datetimepicker.dates['hr'] = { + days: ["Nedjelja", "Ponedjelja", "Utorak", "Srijeda", "Četrtak", "Petak", "Subota", "Nedjelja"], + daysShort: ["Ned", "Pon", "Uto", "Srr", "Čet", "Pet", "Sub", "Ned"], + daysMin: ["Ne", "Po", "Ut", "Sr", "Če", "Pe", "Su", "Ne"], + months: ["Siječanj", "Veljača", "Ožujak", "Travanj", "Svibanj", "Lipanj", "Srpanj", "Kolovoz", "Rujan", "Listopad", "Studeni", "Prosinac"], + monthsShort: ["Sije", "Velj", "Ožu", "Tra", "Svi", "Lip", "Jul", "Kol", "Ruj", "Lis", "Stu", "Pro"], + today: "Danas", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.hu.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.hu.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.hu.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,17 @@ +/** + * Hungarian translation for bootstrap-datetimepicker + * darevish <http://github.com/darevish> + */ +;(function($){ + $.fn.datetimepicker.dates['hu'] = { + days: ["Vasárnap", "Hétfő", "Kedd", "Szerda", "Csütörtök", "Péntek", "Szombat", "Vasárnap"], + daysShort: ["Vas", "Hét", "Ked", "Sze", "Csü", "Pén", "Szo", "Vas"], + daysMin: ["V", "H", "K", "Sze", "Cs", "P", "Szo", "V"], + months: ["Január", "Február", "Március", "Április", "Május", "Június", "Július", "Augusztus", "Szeptember", "Október", "November", "December"], + monthsShort: ["Jan", "Feb", "Már", "Ápr", "Máj", "Jún", "Júl", "Aug", "Sze", "Okt", "Nov", "Dec"], + today: "Ma", + suffix: [], + meridiem: [], + weekStart: 1 + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.id.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.id.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.id.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,15 @@ +/** + * Bahasa translation for bootstrap-datetimepicker + * Azwar Akbar <azwar.akbar(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['id'] = { + days: ["Minggu", "Senin", "Selasa", "Rabu", "Kamis", "Jumat", "Sabtu", "Minggu"], + daysShort: ["Mgu", "Sen", "Sel", "Rab", "Kam", "Jum", "Sab", "Mgu"], + daysMin: ["Mg", "Sn", "Sl", "Ra", "Ka", "Ju", "Sa", "Mg"], + months: ["Januari", "Februari", "Maret", "April", "Mei", "Juni", "Juli", "Agustus", "September", "Oktober", "November", "Desember"], + monthsShort: ["Jan", "Feb", "Mar", "Apr", "Mei", "Jun", "Jul", "Ags", "Sep", "Okt", "Nov", "Des"], + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.is.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.is.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.is.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Icelandic translation for bootstrap-datetimepicker + * Hinrik Örn Sigurðsson <hinrik.sig(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['is'] = { + days: ["Sunnudagur", "Mánudagur", "Þriðjudagur", "Miðvikudagur", "Fimmtudagur", "Föstudagur", "Laugardagur", "Sunnudagur"], + daysShort: ["Sun", "Mán", "Þri", "Mið", "Fim", "Fös", "Lau", "Sun"], + daysMin: ["Su", "Má", "Þr", "Mi", "Fi", "Fö", "La", "Su"], + months: ["Janúar", "Febrúar", "Mars", "Apríl", "Maí", "Júní", "Júlí", "Ágúst", "September", "Október", "Nóvember", "Desember"], + monthsShort: ["Jan", "Feb", "Mar", "Apr", "Maí", "Jún", "Júl", "Ágú", "Sep", "Okt", "Nóv", "Des"], + today: "Í Dag", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.it.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.it.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.it.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,18 @@ +/** + * Italian translation for bootstrap-datetimepicker + * Enrico Rubboli <rubboli(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['it'] = { + days: ["Domenica", "Lunedi", "Martedi", "Mercoledi", "Giovedi", "Venerdi", "Sabato", "Domenica"], + daysShort: ["Dom", "Lun", "Mar", "Mer", "Gio", "Ven", "Sab", "Dom"], + daysMin: ["Do", "Lu", "Ma", "Me", "Gi", "Ve", "Sa", "Do"], + months: ["Gennaio", "Febbraio", "Marzo", "Aprile", "Maggio", "Giugno", "Luglio", "Agosto", "Settembre", "Ottobre", "Novembre", "Dicembre"], + monthsShort: ["Gen", "Feb", "Mar", "Apr", "Mag", "Giu", "Lug", "Ago", "Set", "Ott", "Nov", "Dic"], + today: "Oggi", + suffix: [], + meridiem: [], + weekStart: 1, + format: "dd/mm/yyyy hh:ii:ss" + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ja.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ja.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ja.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Japanese translation for bootstrap-datetimepicker + * Norio Suzuki <https://github.com/suzuki/> + */ +;(function($){ + $.fn.datetimepicker.dates['ja'] = { + days: ["日曜", "月曜", "火曜", "水曜", "木曜", "金曜", "土曜", "日曜"], + daysShort: ["日", "月", "火", "水", "木", "金", "土", "日"], + daysMin: ["日", "月", "火", "水", "木", "金", "土", "日"], + months: ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"], + monthsShort: ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"], + today: "今日", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ko.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ko.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ko.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,17 @@ +/** + * Korean translation for bootstrap-datetimepicker + * Gu Youn <http://github.com/guyoun> + * Baekjoon Choi <http://github.com/Baekjoon> + */ +;(function($){ + $.fn.datetimepicker.dates['ko'] = { + days: ["일요일", "월요일", "화요일", "수요일", "목요일", "금요일", "토요일", "일요일"], + daysShort: ["일", "월", "화", "수", "목", "금", "토", "일"], + daysMin: ["일", "월", "화", "수", "목", "금", "토", "일"], + months: ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"], + monthsShort: ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"], + suffix: [], + meridiem: ["오전", "오후"], + today: "오늘", + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.lt.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.lt.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.lt.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,18 @@ +/** + * Lithuanian translation for bootstrap-datetimepicker + * Šarūnas Gliebus <ssharunas(a)yahoo.co.uk> + */ + +;(function($){ + $.fn.datetimepicker.dates['lt'] = { + days: ["Sekmadienis", "Pirmadienis", "Antradienis", "Trečiadienis", "Ketvirtadienis", "Penktadienis", "Šeštadienis", "Sekmadienis"], + daysShort: ["S", "Pr", "A", "T", "K", "Pn", "Š", "S"], + daysMin: ["Sk", "Pr", "An", "Tr", "Ke", "Pn", "Št", "Sk"], + months: ["Sausis", "Vasaris", "Kovas", "Balandis", "Gegužė", "Birželis", "Liepa", "Rugpjūtis", "Rugsėjis", "Spalis", "Lapkritis", "Gruodis"], + monthsShort: ["Sau", "Vas", "Kov", "Bal", "Geg", "Bir", "Lie", "Rugp", "Rugs", "Spa", "Lap", "Gru"], + today: "Šiandien", + suffix: [], + meridiem: [], + weekStart: 1 + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.lv.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.lv.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.lv.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,18 @@ +/** + * Latvian translation for bootstrap-datetimepicker + * Artis Avotins <artis(a)apit.lv> + */ + +;(function($){ + $.fn.datetimepicker.dates['lv'] = { + days: ["Svētdiena", "Pirmdiena", "Otrdiena", "Trešdiena", "Ceturtdiena", "Piektdiena", "Sestdiena", "Svētdiena"], + daysShort: ["Sv", "P", "O", "T", "C", "Pk", "S", "Sv"], + daysMin: ["Sv", "Pr", "Ot", "Tr", "Ce", "Pk", "St", "Sv"], + months: ["Janvāris", "Februāris", "Marts", "Aprīlis", "Maijs", "Jūnijs", "Jūlijs", "Augusts", "Septembris", "Oktobris", "Novembris", "Decembris"], + monthsShort: ["Jan", "Feb", "Mar", "Apr", "Mai", "Jūn", "Jūl", "Aug", "Sep", "Okt", "Nov", "Dec."], + today: "Šodien", + suffix: [], + meridiem: [], + weekStart: 1 + }; +}(jQuery)); \ No newline at end of file Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ms.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ms.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ms.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Malay translation for bootstrap-datetimepicker + * Ateman Faiz <noorulfaiz(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['ms'] = { + days: ["Ahad", "Isnin", "Selasa", "Rabu", "Khamis", "Jumaat", "Sabtu", "Ahad"], + daysShort: ["Aha", "Isn", "Sel", "Rab", "Kha", "Jum", "Sab", "Aha"], + daysMin: ["Ah", "Is", "Se", "Ra", "Kh", "Ju", "Sa", "Ah"], + months: ["Januari", "Februari", "Mac", "April", "Mei", "Jun", "Julai", "Ogos", "September", "Oktober", "November", "Disember"], + monthsShort: ["Jan", "Feb", "Mar", "Apr", "Mei", "Jun", "Jul", "Ogo", "Sep", "Okt", "Nov", "Dis"], + today: "Hari Ini", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.nb.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.nb.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.nb.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Norwegian (bokmål) translation for bootstrap-datetimepicker + * Fredrik Sundmyhr <http://github.com/fsundmyhr> + */ +;(function($){ + $.fn.datetimepicker.dates['nb'] = { + days: ["Søndag", "Mandag", "Tirsdag", "Onsdag", "Torsdag", "Fredag", "Lørdag", "Søndag"], + daysShort: ["Søn", "Man", "Tir", "Ons", "Tor", "Fre", "Lør", "Søn"], + daysMin: ["Sø", "Ma", "Ti", "On", "To", "Fr", "Lø", "Sø"], + months: ["Januar", "Februar", "Mars", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Desember"], + monthsShort: ["Jan", "Feb", "Mar", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des"], + today: "I Dag", + suffix: [], + meridiem: [] + }; +}(jQuery)); \ No newline at end of file Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.nl.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.nl.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.nl.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Dutch translation for bootstrap-datetimepicker + * Reinier Goltstein <mrgoltstein(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['nl'] = { + days: ["Zondag", "Maandag", "Dinsdag", "Woensdag", "Donderdag", "Vrijdag", "Zaterdag", "Zondag"], + daysShort: ["Zo", "Ma", "Di", "Wo", "Do", "Vr", "Za", "Zo"], + daysMin: ["Zo", "Ma", "Di", "Wo", "Do", "Vr", "Za", "Zo"], + months: ["Januari", "Februari", "Maart", "April", "Mei", "Juni", "Juli", "Augustus", "September", "Oktober", "November", "December"], + monthsShort: ["Jan", "Feb", "Mrt", "Apr", "Mei", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"], + today: "Vandaag", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.no.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.no.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.no.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Norwegian translation for bootstrap-datetimepicker + * Rune Warhuus <rune(a)dinkdonkd.no> + */ +;(function($){ + $.fn.datetimepicker.dates['no'] = { + days: ["Søndag", "Mandag", "Tirsdag", "Onsdag", "Torsdag", "Fredag", "Lørdag", "Søndag"], + daysShort: ["Søn", "Man", "Tir", "Ons", "Tor", "Fre", "Lør", "Søn"], + daysMin: ["Sø", "Ma", "Ti", "On", "To", "Fr", "Lø", "Sø"], + months: ["Januar", "Februar", "Mars", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Desember"], + monthsShort: ["Jan", "Feb", "Mar", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des"], + today: "I Dag", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pl.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pl.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pl.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,17 @@ +/** + * Polish translation for bootstrap-datetimepicker + * Robert <rtpm(a)gazeta.pl> + */ +;(function($){ +$.fn.datetimepicker.dates['pl'] = { + days: ["Niedziela", "Poniedziałek", "Wtorek", "Środa", "Czwartek", "Piątek", "Sobota", "Niedziela"], + daysShort: ["Nie", "Pn", "Wt", "Śr", "Czw", "Pt", "So", "Nie"], + daysMin: ["N", "Pn", "Wt", "Śr", "Cz", "Pt", "So", "N"], + months: ["Styczeń", "Luty", "Marzec", "Kwiecień", "Maj", "Czerwiec", "Lipiec", "Sierpień", "Wrzesień", "Październik", "Listopad", "Grudzień"], + monthsShort: ["Sty", "Lu", "Mar", "Kw", "Maj", "Cze", "Lip", "Sie", "Wrz", "Pa", "Lis", "Gru"], + today: "Dzisiaj", + suffix: [], + meridiem: [], + weekStart: 1 +}; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pt-BR.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pt-BR.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pt-BR.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,17 @@ +/** + * Brazilian translation for bootstrap-datetimepicker + * Cauan Cabral <cauan(a)radig.com.br> + */ +;(function($){ + $.fn.datetimepicker.dates['pt-BR'] = { + format: 'dd/mm/yyyy', + days: ["Domingo", "Segunda", "Terça", "Quarta", "Quinta", "Sexta", "Sábado", "Domingo"], + daysShort: ["Dom", "Seg", "Ter", "Qua", "Qui", "Sex", "Sáb", "Dom"], + daysMin: ["Do", "Se", "Te", "Qu", "Qu", "Se", "Sa", "Do"], + months: ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"], + monthsShort: ["Jan", "Fev", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Out", "Nov", "Dez"], + today: "Hoje", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pt.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pt.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.pt.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,17 @@ +/** + * Portuguese translation for bootstrap-datetimepicker + * Original code: Cauan Cabral <cauan(a)radig.com.br> + * Tiago Melo <tiago.blackcode(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['pt'] = { + days: ["Domingo", "Segunda", "Terça", "Quarta", "Quinta", "Sexta", "Sábado", "Domingo"], + daysShort: ["Dom", "Seg", "Ter", "Qua", "Qui", "Sex", "Sáb", "Dom"], + daysMin: ["Do", "Se", "Te", "Qu", "Qu", "Se", "Sa", "Do"], + months: ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"], + monthsShort: ["Jan", "Fev", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Out", "Nov", "Dez"], + suffix: [], + meridiem: ["am","pm"], + today: "Hoje" + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ro.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ro.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ro.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,17 @@ +/** + * Romanian translation for bootstrap-datetimepicker + * Cristian Vasile <cristi.mie(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['ro'] = { + days: ["Duminică", "Luni", "Marţi", "Miercuri", "Joi", "Vineri", "Sâmbătă", "Duminică"], + daysShort: ["Dum", "Lun", "Mar", "Mie", "Joi", "Vin", "Sâm", "Dum"], + daysMin: ["Du", "Lu", "Ma", "Mi", "Jo", "Vi", "Sâ", "Du"], + months: ["Ianuarie", "Februarie", "Martie", "Aprilie", "Mai", "Iunie", "Iulie", "August", "Septembrie", "Octombrie", "Noiembrie", "Decembrie"], + monthsShort: ["Ian", "Feb", "Mar", "Apr", "Mai", "Iun", "Iul", "Aug", "Sep", "Oct", "Nov", "Dec"], + today: "Astăzi", + suffix: [], + meridiem: [], + weekStart: 1 + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.rs-latin.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.rs-latin.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.rs-latin.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Serbian latin translation for bootstrap-datetimepicker + * Bojan Milosavlević <milboj(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['rs'] = { + days: ["Nedelja","Ponedeljak", "Utorak", "Sreda", "Četvrtak", "Petak", "Subota", "Nedelja"], + daysShort: ["Ned", "Pon", "Uto", "Sre", "Čet", "Pet", "Sub", "Ned"], + daysMin: ["N", "Po", "U", "Sr", "Č", "Pe", "Su", "N"], + months: ["Januar", "Februar", "Mart", "April", "Maj", "Jun", "Jul", "Avgust", "Septembar", "Oktobar", "Novembar", "Decembar"], + monthsShort: ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Avg", "Sep", "Okt", "Nov", "Dec"], + today: "Danas", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.rs.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.rs.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.rs.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Serbian cyrillic translation for bootstrap-datetimepicker + * Bojan Milosavlević <milboj(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['rs'] = { + days: ["Недеља","Понедељак", "Уторак", "Среда", "Четвртак", "Петак", "Субота", "Недеља"], + daysShort: ["Нед", "Пон", "Уто", "Сре", "Чет", "Пет", "Суб", "Нед"], + daysMin: ["Н", "По", "У", "Ср", "Ч", "Пе", "Су", "Н"], + months: ["Јануар", "Фебруар", "Март", "Април", "Мај", "Јун", "Јул", "Август", "Септембар", "Октобар", "Новембар", "Децембар"], + monthsShort: ["Јан", "Феб", "Мар", "Апр", "Мај", "Јун", "Јул", "Авг", "Сеп", "Окт", "Нов", "Дец"], + today: "Данас", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ru.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ru.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ru.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Russian translation for bootstrap-datetimepicker + * Victor Taranenko <darwin(a)snowdale.com> + */ +;(function($){ + $.fn.datetimepicker.dates['ru'] = { + days: ["Воскресенье", "Понедельник", "Вторник", "Среда", "Четверг", "Пятница", "Суббота", "Воскресенье"], + daysShort: ["Вск", "Пнд", "Втр", "Срд", "Чтв", "Птн", "Суб", "Вск"], + daysMin: ["Вс", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб", "Вс"], + months: ["Январь", "Февраль", "Март", "Апрель", "Май", "Июнь", "Июль", "Август", "Сентябрь", "Октябрь", "Ноябрь", "Декабрь"], + monthsShort: ["Янв", "Фев", "Мар", "Апр", "Май", "Июн", "Июл", "Авг", "Сен", "Окт", "Ноя", "Дек"], + today: "Сегодня", + suffix: [], + meridiem: [] + }; +}(jQuery)); \ No newline at end of file Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sk.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sk.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sk.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,17 @@ +/** + * Slovak translation for bootstrap-datetimepicker + * Marek Lichtner <marek(a)licht.sk> + * Fixes by Michal Remiš <michal.remis(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates["sk"] = { + days: ["Nedeľa", "Pondelok", "Utorok", "Streda", "Štvrtok", "Piatok", "Sobota", "Nedeľa"], + daysShort: ["Ned", "Pon", "Uto", "Str", "Štv", "Pia", "Sob", "Ned"], + daysMin: ["Ne", "Po", "Ut", "St", "Št", "Pia", "So", "Ne"], + months: ["Január", "Február", "Marec", "Apríl", "Máj", "Jún", "Júl", "August", "September", "Október", "November", "December"], + monthsShort: ["Jan", "Feb", "Mar", "Apr", "Máj", "Jún", "Júl", "Aug", "Sep", "Okt", "Nov", "Dec"], + today: "Dnes", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sl.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sl.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sl.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Slovene translation for bootstrap-datetimepicker + * Gregor Rudolf <gregor.rudolf(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['sl'] = { + days: ["Nedelja", "Ponedeljek", "Torek", "Sreda", "Četrtek", "Petek", "Sobota", "Nedelja"], + daysShort: ["Ned", "Pon", "Tor", "Sre", "Čet", "Pet", "Sob", "Ned"], + daysMin: ["Ne", "Po", "To", "Sr", "Če", "Pe", "So", "Ne"], + months: ["Januar", "Februar", "Marec", "April", "Maj", "Junij", "Julij", "Avgust", "September", "Oktober", "November", "December"], + monthsShort: ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Avg", "Sep", "Okt", "Nov", "Dec"], + today: "Danes", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sv.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sv.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sv.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Swedish translation for bootstrap-datetimepicker + * Patrik Ragnarsson <patrik(a)starkast.net> + */ +;(function($){ + $.fn.datetimepicker.dates['sv'] = { + days: ["Söndag", "Måndag", "Tisdag", "Onsdag", "Torsdag", "Fredag", "Lördag", "Söndag"], + daysShort: ["Sön", "Mån", "Tis", "Ons", "Tor", "Fre", "Lör", "Sön"], + daysMin: ["Sö", "Må", "Ti", "On", "To", "Fr", "Lö", "Sö"], + months: ["Januari", "Februari", "Mars", "April", "Maj", "Juni", "Juli", "Augusti", "September", "Oktober", "November", "December"], + monthsShort: ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"], + today: "I Dag", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sw.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sw.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.sw.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,17 @@ +/** + * Swahili translation for bootstrap-datetimepicker + * Edwin Mugendi <https://github.com/edwinmugendi> + * Source: http://scriptsource.org/cms/scripts/page.php?item_id=entry_detail&uid=xnfaq… + */ +;(function($){ + $.fn.datetimepicker.dates['sw'] = { + days: ["Jumapili", "Jumatatu", "Jumanne", "Jumatano", "Alhamisi", "Ijumaa", "Jumamosi", "Jumapili"], + daysShort: ["J2", "J3", "J4", "J5", "Alh", "Ij", "J1", "J2"], + daysMin: ["2", "3", "4", "5", "A", "I", "1", "2"], + months: ["Januari", "Februari", "Machi", "Aprili", "Mei", "Juni", "Julai", "Agosti", "Septemba", "Oktoba", "Novemba", "Desemba"], + monthsShort: ["Jan", "Feb", "Mac", "Apr", "Mei", "Jun", "Jul", "Ago", "Sep", "Okt", "Nov", "Des"], + today: "Leo", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.th.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.th.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.th.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Thai translation for bootstrap-datetimepicker + * Suchau Jiraprapot <seroz24(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['th'] = { + days: ["อาทิตย์", "จันทร์", "อังคาร", "พุธ", "พฤหัส", "ศุกร์", "เสาร์", "อาทิตย์"], + daysShort: ["อา", "จ", "อ", "พ", "พฤ", "ศ", "ส", "อา"], + daysMin: ["อา", "จ", "อ", "พ", "พฤ", "ศ", "ส", "อา"], + months: ["มกราคม", "กุมภาพันธ์", "มีนาคม", "เมษายน", "พฤษภาคม", "มิถุนายน", "กรกฎาคม", "สิงหาคม", "กันยายน", "ตุลาคม", "พฤศจิกายน", "ธันวาคม"], + monthsShort: ["ม.ค.", "ก.พ.", "มี.ค.", "เม.ย.", "พ.ค.", "มิ.ย.", "ก.ค.", "ส.ค.", "ก.ย.", "ต.ค.", "พ.ย.", "ธ.ค."], + today: "วันนี้", + suffix: [], + meridiem: [] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.tr.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.tr.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.tr.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,17 @@ +/** + * Turkish translation for bootstrap-datetimepicker + * Serkan Algur <kaisercrazy_2(a)hotmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['tr'] = { + days: ["Pazar", "Pazartesi", "Salı", "Çarşamba", "Perşembe", "Cuma", "Cumartesi", "Pazar"], + daysShort: ["Pz", "Pzt", "Sal", "Çrş", "Prş", "Cu", "Cts", "Pz"], + daysMin: ["Pz", "Pzt", "Sa", "Çr", "Pr", "Cu", "Ct", "Pz"], + months: ["Ocak", "Şubat", "Mart", "Nisan", "Mayıs", "Haziran", "Temmuz", "Ağustos", "Eylül", "Ekim", "Kasım", "Aralık"], + monthsShort: ["Oca", "Şub", "Mar", "Nis", "May", "Haz", "Tem", "Ağu", "Eyl", "Eki", "Kas", "Ara"], + today: "Bugün", + suffix: [], + meridiem: [] + }; +}(jQuery)); + Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ua.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ua.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.ua.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,15 @@ +/** + * Ukrainian translation for bootstrap-datepicker + * Igor Polynets + */ +;(function($){ + $.fn.datetimepicker.dates['ua'] = { + days: ["Неділя", "Понеділок", "Вівторок", "Середа", "Четверг", "П'ятниця", "Субота", "Неділя"], + daysShort: ["Нед", "Пнд", "Втр", "Срд", "Чтв", "Птн", "Суб", "Нед"], + daysMin: ["Нд", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб", "Нд"], + months: ["Cічень", "Лютий", "Березень", "Квітень", "Травень", "Червень", "Липень", "Серпень", "Вересень", "Жовтень", "Листопад", "Грудень"], + monthsShort: ["Січ", "Лют", "Бер", "Квт", "Трв", "Чер", "Лип", "Сер", "Вер", "Жов", "Лис", "Грд"], + today: "Сьогодні", + weekStart: 1 + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.uk.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.uk.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.uk.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Ukrainian translation for bootstrap-datetimepicker + * Andrey Vityuk <andrey [dot] vityuk [at] gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['uk'] = { + days: ["Неділя", "Понеділок", "Вівторок", "Середа", "Четвер", "П'ятниця", "Субота", "Неділя"], + daysShort: ["Нед", "Пнд", "Втр", "Срд", "Чтв", "Птн", "Суб", "Нед"], + daysMin: ["Нд", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб", "Нд"], + months: ["Січень", "Лютий", "Березень", "Квітень", "Травень", "Червень", "Липень", "Серпень", "Вересень", "Жовтень", "Листопад", "Грудень"], + monthsShort: ["Січ", "Лют", "Бер", "Кві", "Тра", "Чер", "Лип", "Сер", "Вер", "Жов", "Лис", "Гру"], + today: "Сьогодні", + suffix: [], + meridiem: [] + }; +}(jQuery)); \ No newline at end of file Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.zh-CN.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.zh-CN.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.zh-CN.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Simplified Chinese translation for bootstrap-datetimepicker + * Yuan Cheung <advanimal(a)gmail.com> + */ +;(function($){ + $.fn.datetimepicker.dates['zh-CN'] = { + days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"], + daysShort: ["周日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"], + daysMin: ["日", "一", "二", "三", "四", "五", "六", "日"], + months: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], + monthsShort: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], + today: "今日", + suffix: [], + meridiem: ["上午", "下午"] + }; +}(jQuery)); Added: trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.zh-TW.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.zh-TW.js (rev 0) +++ trunk/wao-web/src/main/webapp/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.zh-TW.js 2014-07-08 11:37:07 UTC (rev 2134) @@ -0,0 +1,16 @@ +/** + * Traditional Chinese translation for bootstrap-datetimepicker + * Rung-Sheng Jang <daniel(a)i-trend.co.cc> + */ +;(function($){ + $.fn.datetimepicker.dates['zh-TW'] = { + days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"], + daysShort: ["周日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"], + daysMin: ["日", "一", "二", "三", "四", "五", "六", "日"], + months: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], + monthsShort: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], + today: "今天", + suffix: [], + meridiem: ["上午", "下午"] + }; +}(jQuery));

1 0

08 Jul '14

Author: bleny Date: 2014-07-08 11:31:46 +0200 (Tue, 08 Jul 2014) New Revision: 2133 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2133 Log: make wao compatible with jdk6 and tomcat6 in branch Modified: branches/wao-4.0-jdk6/pom.xml branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserRole.java branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/ObsMerFixtures.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatDetails.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlan.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanBuilder.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/Synthesis.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatGroupImportModel.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactStateMotivesImportModel.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/FishingZoneImportModel.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCodesImportModel.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialDivisionImportModel.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialLocationImportModel.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictNamesFormatter.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictParserFormatter.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/I18nAbleParserFormatter.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/LocationTypeParserFormatter.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionsParser.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/MammalsObservationEmail.java branches/wao-4.0-jdk6/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java branches/wao-4.0-jdk6/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/converter/BooleanSetConverter.java branches/wao-4.0-jdk6/wao-web/src/main/webapp/WEB-INF/web.xml Modified: branches/wao-4.0-jdk6/pom.xml =================================================================== --- branches/wao-4.0-jdk6/pom.xml 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/pom.xml 2014-07-08 09:31:46 UTC (rev 2133) @@ -133,7 +133,7 @@ <i18n.bundleOutputName>wao</i18n.bundleOutputName>  - <javaVersion>1.7</javaVersion> + <javaVersion>1.6</javaVersion>  <maven.compiler.source>${javaVersion}</maven.compiler.source>  Modified: branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -137,7 +137,7 @@ } public static <T extends Enum> Collection<Integer> toOrdinals(Collection<T> enums) { - List<Integer> ordinals = new LinkedList<>(); + List<Integer> ordinals = new LinkedList<Integer>(); for (Enum anEnum : enums) { ordinals.add(anEnum.ordinal()); } Modified: branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java =================================================================== --- branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -175,7 +175,7 @@ @Override public List<WaoUser> getAllObservers() { - List<WaoUser> allObservers = new LinkedList<>(); + List<WaoUser> allObservers = new LinkedList<WaoUser>(); if (getMainObserver() != null) { allObservers.add(getMainObserver()); } Modified: branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java =================================================================== --- branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -134,7 +134,7 @@ } public static List<ContactState> getAllowedStates(ObsProgram obsProgram) { - List<ContactState> allowedStates = new ArrayList<>(); + List<ContactState> allowedStates = new ArrayList<ContactState>(); for (ContactState contactState : values()) { if (contactState.isAllowed(obsProgram)) { allowedStates.add(contactState); Modified: branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java =================================================================== --- branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -219,7 +219,7 @@ query.addEquals(Contact.PROPERTY_STATE, ContactState.OBSERVATION_DONE.ordinal()); List<Contact> contacts = findAll(query.getHql(), query.getHqlParameters()); - SortedMap<Date, Integer> actualObservationsMyMonths = new TreeMap<>(); + SortedMap<Date, Integer> actualObservationsMyMonths = new TreeMap<Date, Integer>(); Range<Date> range = Range.between(periodFromMonth, periodToMonth); for (Contact contact : contacts) { @@ -271,7 +271,7 @@ // [ARC EN CIEL, 2009_0200, 2010-01-17 00:00:00.0] // [ARC EN CIEL, 2009_0200, 2010-02-13 00:00:00.0] - Map<Boat, LinkedHashMap<String, List<Date>>> data = new HashMap<>(); + Map<Boat, LinkedHashMap<String, List<Date>>> data = new HashMap<Boat, LinkedHashMap<String, List<Date>>>(); for (Object[] row : boardingsByBoat) { Boat boat = (Boat) row[0]; @@ -280,7 +280,7 @@ LinkedHashMap<String, List<Date>> value = data.get(boat); if (value == null) { - value = new LinkedHashMap<>(); + value = new LinkedHashMap<String, List<Date>>(); data.put(boat, value); } @@ -307,9 +307,9 @@ List<Object[]> findAll = findAll(hql, hqlAndParametersBuilder.getHqlParameters()); - Map<String, Long> countByCompany = new LinkedHashMap<>(); + Map<String, Long> countByCompany = new LinkedHashMap<String, Long>(); for (Object[] row : findAll) { - countByCompany.put((String) row[0], (long) row[1]); + countByCompany.put((String) row[0], (Long) row[1]); } return countByCompany; @@ -333,7 +333,7 @@ Map<String, Long> countContactsWithComplianceByCompany = countByCompany(hqlAndParametersBuilder); - Map<String, Double> complianceBoardingIndicator = new LinkedHashMap<>(); + Map<String, Double> complianceBoardingIndicator = new LinkedHashMap<String, Double>(); for (Map.Entry<String, Long> entry : countContactsByCompany.entrySet()) { String companyId = entry.getKey(); @@ -361,17 +361,17 @@ List<Object[]> rows = findAll(hql, hqlAndParametersBuilder.getHqlParameters()); - Map<String, Map<ContactState, Long>> contactStatesStatistics = new LinkedHashMap<>(); + Map<String, Map<ContactState, Long>> contactStatesStatistics = new LinkedHashMap<String, Map<ContactState, Long>>(); for (Object[] row : rows) { String companyId = (String) row[0]; - int contactStateOrdinal = (int) row[1]; + int contactStateOrdinal = (Integer) row[1]; Long count = (Long) row[2]; Map<ContactState, Long> companyStatistics = contactStatesStatistics.get(companyId); if (companyStatistics == null) { - companyStatistics = new TreeMap<>(); + companyStatistics = new TreeMap<ContactState, Long>(); for (ContactState aContactState : ContactState.getAllowedStates(filter.getSampleRowFilter().getObsProgram())) { companyStatistics.put(aContactState, 0L); } @@ -402,7 +402,7 @@ new Supplier<List<Pair<Date, Date>>>() { @Override public List<Pair<Date, Date>> get() { - return new LinkedList<>(); + return new LinkedList<Pair<Date, Date>>(); } } ); Modified: branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -87,7 +87,7 @@ */ @Override public String getSectors() { - Set<String> sectorNames = new LinkedHashSet<>(); + Set<String> sectorNames = new LinkedHashSet<String>(); for (FishingZone fishingZone : getFishingZone()) { sectorNames.add(fishingZone.getSectorName()); } @@ -177,7 +177,7 @@ setdCF5Code(null); } else { String[] splitCodes = codes.split(separatorRegex); - Set<DCF5Code> dcfFives = new HashSet<>(splitCodes.length); + Set<DCF5Code> dcfFives = new HashSet<DCF5Code>(splitCodes.length); for (String code : splitCodes) { String[] codeParts = code.split("_"); DCF5Code dcfFive = new DCF5CodeImpl(); Modified: branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java =================================================================== --- branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -114,9 +114,9 @@ Collection<TerrestrialLocation> newTerrestrialLocations = newRow.getTerrestrialLocations(); // Lists for boats by status - List<String> removedTerrestrialLocations = new ArrayList<>(); - List<String> keptTerrestrialLocations = new ArrayList<>(); - List<String> addedTerrestrialLocations = new ArrayList<>(); + List<String> removedTerrestrialLocations = new ArrayList<String>(); + List<String> keptTerrestrialLocations = new ArrayList<String>(); + List<String> addedTerrestrialLocations = new ArrayList<String>(); // filling the three lists for (TerrestrialLocation oldTerrestrialLocation : oldTerrestrialLocations) { @@ -157,9 +157,9 @@ Collection<TerrestrialLocation> newTerrestrialLocations = newRow.getTerrestrialLocations(); // Lists for boats by status - List<String> removedTerrestrialLocations = new ArrayList<>(); - List<String> keptTerrestrialLocations = new ArrayList<>(); - List<String> addedTerrestrialLocations = new ArrayList<>(); + List<String> removedTerrestrialLocations = new ArrayList<String>(); + List<String> keptTerrestrialLocations = new ArrayList<String>(); + List<String> addedTerrestrialLocations = new ArrayList<String>(); // filling the three lists for (TerrestrialLocation oldTerrestrialLocation : oldTerrestrialLocations) { @@ -316,9 +316,9 @@ Collection<ElligibleBoat> newEligibleBoats = newRow.getElligibleBoat(); // Lists for boats by status - List<String> noLongerEligibleBoats = new ArrayList<>(); - List<String> stillEligibleBoats = new ArrayList<>(); - List<String> newlyEligibleBoats = new ArrayList<>(); + List<String> noLongerEligibleBoats = new ArrayList<String>(); + List<String> stillEligibleBoats = new ArrayList<String>(); + List<String> newlyEligibleBoats = new ArrayList<String>(); // filling the three lists for (ElligibleBoat eligibleBoat : newEligibleBoats) { @@ -366,9 +366,9 @@ Collection<FishingZone> newFishingZones = newRow.getFishingZone(); // Lists for boats by status - List<String> removedZones = new ArrayList<>(); - List<String> keptZones = new ArrayList<>(); - List<String> addedZones = new ArrayList<>(); + List<String> removedZones = new ArrayList<String>(); + List<String> keptZones = new ArrayList<String>(); + List<String> addedZones = new ArrayList<String>(); // filling the three lists for (FishingZone oldFishingZone : oldFishingZones) { @@ -424,8 +424,8 @@ newObservers = Collections.emptyList(); } - List<String> removedObservers = new LinkedList<>(); - List<String> addedObservers = new LinkedList<>(); + List<String> removedObservers = new LinkedList<String>(); + List<String> addedObservers = new LinkedList<String>(); for (WaoUser oldObserver : oldObservers) { if ( ! newObservers.contains(oldObserver)) { Modified: branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java =================================================================== --- branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -177,7 +177,7 @@ + "group by sm.periodDate " + "order by sm.periodDate"; - Map<String, Object> hqlParameters = new HashMap<>(sampleRowsQuery.getHqlParameters()); + Map<String, Object> hqlParameters = new HashMap<String, Object>(sampleRowsQuery.getHqlParameters()); hqlParameters.put("periodFromMonth2", periodFromMonth); hqlParameters.put("periodToMonth2", periodToMonth); @@ -187,7 +187,7 @@ List<Object[]> result = findAll(hql, hqlParameters); - SortedMap<Date, Integer> expectedObservationsByMonths = new TreeMap<>(); + SortedMap<Date, Integer> expectedObservationsByMonths = new TreeMap<Date, Integer>(); for (Object[] line : result) { Date month = (Date)line[0]; int expectedValue = ((Long) line[1]).intValue(); Modified: branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserRole.java =================================================================== --- branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserRole.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserRole.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -79,7 +79,7 @@ * @return roles that the user can affect */ public static List<UserRole> getAllowedRoles(ObsProgram obsProgram, UserRole userRole) { - List<UserRole> allowedRoles = new ArrayList<>(); + List<UserRole> allowedRoles = new ArrayList<UserRole>(); allowedRoles.add(UserRole.COORDINATOR); allowedRoles.add(UserRole.OBSERVER); if (userRole.equals(UserRole.ADMIN)) { Modified: branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java =================================================================== --- branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -74,7 +74,7 @@ @Override public List<UserProfile> getUserProfile(ObsProgram obsProgram) { - List<UserProfile> userProfiles = new ArrayList<>(); + List<UserProfile> userProfiles = new ArrayList<UserProfile>(); if (getUserProfile() != null) { for (UserProfile userProfile : getUserProfile()) { if (userProfile.getObsProgram().equals(obsProgram)) { Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/ObsMerFixtures.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/ObsMerFixtures.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/ObsMerFixtures.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -50,11 +50,11 @@ protected WaoServiceContext serviceContext; - protected Map<String, Company> companies = new HashMap<>(); + protected Map<String, Company> companies = new HashMap<String, Company>(); - protected Map<String, WaoUser> waoUsers = new HashMap<>(); + protected Map<String, WaoUser> waoUsers = new HashMap<String, WaoUser>(); - protected Map<String, UserProfile> userProfiles = new HashMap<>(); + protected Map<String, UserProfile> userProfiles = new HashMap<String, UserProfile>(); public ObsMerFixtures(WaoServiceContext serviceContext) { this.serviceContext = serviceContext; @@ -76,21 +76,18 @@ protected UserProfile getUserProfile(String userRole) { UserProfile userProfile = userProfiles.get(userRole); if (userProfile == null) { - switch (userRole) { - case "admin": - userProfile = new UserProfileImpl(); - userProfile.setUserRole(UserRole.ADMIN); - userProfile.setObsProgram(ObsProgram.OBSMER); - userProfile.setCanWrite(true); - break; - case "jmichmuche": - userProfile = new UserProfileImpl(); - userProfile.setUserRole(UserRole.COORDINATOR); - userProfile.setObsProgram(ObsProgram.OBSMER); - userProfile.setCanWrite(true); - break; - default: - throw new IllegalArgumentException("Don't know userRole: " + userRole); + if ("admin".equals(userRole)) { + userProfile = new UserProfileImpl(); + userProfile.setUserRole(UserRole.ADMIN); + userProfile.setObsProgram(ObsProgram.OBSMER); + userProfile.setCanWrite(true); + } else if ("jmichmuche".equals(userRole)) { + userProfile = new UserProfileImpl(); + userProfile.setUserRole(UserRole.COORDINATOR); + userProfile.setObsProgram(ObsProgram.OBSMER); + userProfile.setCanWrite(true); + } else { + throw new IllegalArgumentException("Don't know userRole: " + userRole); } UserProfileTopiaDao userProfileDao = serviceContext.getPersistenceContext().getUserProfileDao(); userProfileDao.create(userProfile); @@ -103,26 +100,21 @@ protected WaoUser getWaoUser(String login) { WaoUser waoUser = waoUsers.get(login); if (waoUser == null) { - - switch (login) { - case "admin": - waoUser = new WaoUserImpl(); - waoUser.setCompany(ifremer()); - waoUser.setLogin(login); - waoUser.setActive(true); - waoUser.addUserProfile(getUserProfile("admin")); - break; - case "jmichmuche": - waoUser = new WaoUserImpl(); - waoUser.setCompany(ifremer()); - waoUser.setLogin(login); - waoUser.setActive(true); - waoUser.addUserProfile(getUserProfile("jmichmuche")); - break; - default: - throw new IllegalArgumentException("Don't know user: " + login); + if ("admin".equals(login)) { + waoUser = new WaoUserImpl(); + waoUser.setCompany(ifremer()); + waoUser.setLogin(login); + waoUser.setActive(true); + waoUser.addUserProfile(getUserProfile("admin")); + } else if ("jmichmuche".equals(login)) { + waoUser = new WaoUserImpl(); + waoUser.setCompany(ifremer()); + waoUser.setLogin(login); + waoUser.setActive(true); + waoUser.addUserProfile(getUserProfile("jmichmuche")); + } else { + throw new IllegalArgumentException("Don't know user: " + login); } - WaoUserTopiaDao waoUserDao = serviceContext.getPersistenceContext().getWaoUserDao(); waoUserDao.create(waoUser); serviceContext.getPersistenceContext().commit(); Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatDetails.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatDetails.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatDetails.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -71,7 +71,7 @@ } public List<SampleRow> getElligibleForSampleRows() { - List<SampleRow> elligibleForSampleRows = new LinkedList<>(); + List<SampleRow> elligibleForSampleRows = new LinkedList<SampleRow>(); for (ElligibleBoat elligibleBoat : boatInfos.getBoat().getElligibleBoat()) { SampleRow sampleRow = elligibleBoat.getSampleRow(); if (boatInfos.getCompany().equals(sampleRow.getCompany()) && sampleRow.getObsProgram().equals(obsProgram)) { @@ -84,7 +84,7 @@ } public Set<String> getExpiredSampleRowIds() { - Set<String> expiredSampleRowIds = new HashSet<>(); + Set<String> expiredSampleRowIds = new HashSet<String>(); for (SampleRow sampleRow : getElligibleForSampleRows()) { if (sampleRow.isExpired(now)) { expiredSampleRowIds.add(sampleRow.getTopiaId()); Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -50,17 +50,17 @@ protected SampleRowsFilterValues elligibleForSampleRowsFilterValues; - protected SortedSet<FilterOption> shipOwners = new TreeSet<>(); + protected SortedSet<FilterOption> shipOwners = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> districts = new TreeSet<>(); + protected SortedSet<FilterOption> districts = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> portsOfRegistry = new TreeSet<>(); + protected SortedSet<FilterOption> portsOfRegistry = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> fleets = new TreeSet<>(); + protected SortedSet<FilterOption> fleets = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> boats = new TreeSet<>(); + protected SortedSet<FilterOption> boats = new TreeSet<FilterOption>(); - protected Set<String> boatIds = new HashSet<>(); + protected Set<String> boatIds = new HashSet<String>(); public BoatsFilterValues(Locale locale, ObsProgram obsProgram, Optional<String> optionalCompanyId) { super(locale); Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -135,7 +135,7 @@ // Pour le profesionnel, on restreint d'office à la liste des bateaux qu'il peut voir Collection<String> canReadBoatsTopiaIds = authenticatedWaoUser.getWaoUser().getCanReadBoatsTopiaIds(); if (CollectionUtils.isNotEmpty(canReadBoatsTopiaIds)) { - boatsFilter.setBoatIds(new HashSet<>(canReadBoatsTopiaIds)); + boatsFilter.setBoatIds(new HashSet<String>(canReadBoatsTopiaIds)); } } Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -58,29 +58,29 @@ protected SampleRowsFilterValues sampleRowsFilterValues; - protected SortedSet<FilterOption> boatRegistrationCodes = new TreeSet<>(); + protected SortedSet<FilterOption> boatRegistrationCodes = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> contactStates = new TreeSet<>(); + protected SortedSet<FilterOption> contactStates = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> dataReliabilities = new TreeSet<>(); + protected SortedSet<FilterOption> dataReliabilities = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> actualSamplingStrategies = new TreeSet<>(); + protected SortedSet<FilterOption> actualSamplingStrategies = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> observationTypes = new TreeSet<>(); + protected SortedSet<FilterOption> observationTypes = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> observedDataControls = new TreeSet<>(); + protected SortedSet<FilterOption> observedDataControls = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> observers = new TreeSet<>(); + protected SortedSet<FilterOption> observers = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> terrestrialLocations = new TreeSet<>(); + protected SortedSet<FilterOption> terrestrialLocations = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> contactStateMotives = new TreeSet<>(); + protected SortedSet<FilterOption> contactStateMotives = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> companyAcceptations = new TreeSet<>(); + protected SortedSet<FilterOption> companyAcceptations = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> programAcceptations = new TreeSet<>(); + protected SortedSet<FilterOption> programAcceptations = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> completeSamplings = new TreeSet<>(); + protected SortedSet<FilterOption> completeSamplings = new TreeSet<FilterOption>(); public ContactsFilterValues(Locale locale, ObsProgram obsProgram, Optional<String> optionalCompanyId) { super(locale); Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -125,7 +125,7 @@ // Pour le profesionnel, on restreint d'office à la liste des contacts portant sur les bateaux qu'il peut voir Collection<String> canReadBoatsTopiaIds = authenticatedWaoUser.getWaoUser().getCanReadBoatsTopiaIds(); if (CollectionUtils.isNotEmpty(canReadBoatsTopiaIds)) { - newContactsFilter.getBoatFilter().setBoatIds(new HashSet<>(canReadBoatsTopiaIds)); + newContactsFilter.getBoatFilter().setBoatIds(new HashSet<String>(canReadBoatsTopiaIds)); } } @@ -480,7 +480,7 @@ updateContactCommand.getContact().setMainObserver(mainObserver); List<WaoUser> secondaryObservers = getWaoUserDao().forTopiaIdIn(updateContactCommand.getSecondaryObserverIds()).findAll(); - updateContactCommand.getContact().setSecondaryObservers(new HashSet<>(secondaryObservers)); + updateContactCommand.getContact().setSecondaryObservers(new HashSet<WaoUser>(secondaryObservers)); String terrestrialLocationId = updateContactCommand.getTerrestrialLocationId(); if (StringUtils.isBlank(terrestrialLocationId)) { @@ -1042,7 +1042,7 @@ // try to pre-fill some field for user-experience // let's try to find a recent similar contact - Map<String, Object> properties = new HashMap<>(); + Map<String, Object> properties = new HashMap<String, Object>(); properties.put(Contact.PROPERTY_OBS_PROGRAM_ORDINAL, newContact.getObsProgram().ordinal()); properties.put(Contact.PROPERTY_SAMPLE_ROW, sampleRow); properties.put(Contact.PROPERTY_MAIN_OBSERVER, observer); Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -147,14 +147,14 @@ SampleRowsFilter sampleRowsFilter) { this.sampleRowsFilter = sampleRowsFilter; this.sampleRowsFilterValues = new SampleRowsFilterValues(locale, ObsProgram.OBSMER, optionalCompanyId); - this.sampleRowIds = new HashSet<>(); - this.facadeMap = new TreeMap<>(); + this.sampleRowIds = new HashSet<String>(); + this.facadeMap = new TreeMap<String, FacadeContext>(); this.observationTimesInDaysTotalExpected = new MutableDouble(); this.observationTimesInDaysTotalReal = new MutableLong(); this.observationTimesInDaysTotalEstimated = new MutableLong(); - this.totalExpectedForMonths = new TreeMap<>(); - this.totalRealForMonths = new TreeMap<>(); - this.totalEstimatedForMonths = new TreeMap<>(); + this.totalExpectedForMonths = new TreeMap<Date, MutableInt>(); + this.totalRealForMonths = new TreeMap<Date, MutableInt>(); + this.totalEstimatedForMonths = new TreeMap<Date, MutableInt>(); PeriodDates periodDates = new PeriodDates(sampleRowsFilter.getPeriodFrom(), sampleRowsFilter.getPeriodTo()); @@ -209,7 +209,7 @@ public ObsMerSamplingPlan toPlan() { // Get facade parts - Collection<SamplingPlan.SamplingPlanFacadePart> facadeParts = new ArrayList<>(); + Collection<SamplingPlan.SamplingPlanFacadePart> facadeParts = new ArrayList<SamplingPlan.SamplingPlanFacadePart>(); for (FacadeContext facadeContext : facadeMap.values()) { SamplingPlan.SamplingPlanFacadePart facadePart = facadeContext.toBean(); facadeParts.add(facadePart); @@ -223,7 +223,7 @@ }).immutableSortedCopy(facadeParts); // Get statistics - Map<Date, ObsMerSamplingPlan.SamplingPlanStatistics> statisticsMap = new TreeMap<>(); + Map<Date, ObsMerSamplingPlan.SamplingPlanStatistics> statisticsMap = new TreeMap<Date, ObsMerSamplingPlan.SamplingPlanStatistics>(); for (Date month : months) { MutableInt totalExpected = totalExpectedForMonths.get(month); @@ -251,7 +251,7 @@ } protected Map<Date, ObsMerSamplingPlan.SamplingPlanStatistics> computeNbTidesPerMonth(SampleRow sampleRow) { - Map<Date, ObsMerSamplingPlan.SamplingPlanStatistics> result = new TreeMap<>(); + Map<Date, ObsMerSamplingPlan.SamplingPlanStatistics> result = new TreeMap<Date, ObsMerSamplingPlan.SamplingPlanStatistics>(); for (Date month : months) { Integer expectedTidesValue = SampleRows.getExpectedTidesValue(sampleRow, month); if (expectedTidesValue != null) { @@ -297,7 +297,7 @@ protected FacadeContext(String facade) { this.facade = facade; - this.sectorMap = new TreeMap<>(); + this.sectorMap = new TreeMap<String, SectorContext>(); } protected SectorContext getOrAddSectorContext(String sectors) { @@ -314,7 +314,7 @@ protected SamplingPlan.SamplingPlanFacadePart toBean() { // get sector parts - Collection<SamplingPlan.SamplingPlanSectorPart> sectorParts = new ArrayList<>(); + Collection<SamplingPlan.SamplingPlanSectorPart> sectorParts = new ArrayList<SamplingPlan.SamplingPlanSectorPart>(); for (SectorContext sectorContext : sectorMap.values()) { SamplingPlan.SamplingPlanSectorPart sectorPart = sectorContext.toBean(); sectorParts.add(sectorPart); @@ -339,7 +339,7 @@ protected SectorContext(String sectors) { this.sectors = sectors; - this.rows = new ArrayList<>(); + this.rows = new ArrayList<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart>(); } protected ObsMerSamplingPlan.SamplingPlanSampleRowPart addSampleRow(Locale locale, Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -228,7 +228,7 @@ ObsMerSamplingPlan samplingPlan = getSamplingPlan(authenticatedWaoUser, filter); Collection<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart> sampleRows = - new LinkedHashSet<>(); + new LinkedHashSet<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart>(); for (SamplingPlan.SamplingPlanFacadePart facade : samplingPlan) { for (SamplingPlan.SamplingPlanSectorPart<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart> sector : facade) { for (ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart obsMerSampleRowPart : sector) { Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlan.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlan.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlan.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -50,7 +50,7 @@ public ObsVenteSamplingPlanSampleRowPart(Locale locale, Map<Date, SamplingPlanStatistics> nbTidesPerMonth, SampleRow sampleRow, long sampleRowContactCounts) { super(locale, nbTidesPerMonth, sampleRow, sampleRowContactCounts); terrestrialLocationInfos = sampleRow.getTerrestrialLocationInfos(); - terrestrialLocationNamesAndDescriptions = new LinkedHashMap<>(); + terrestrialLocationNamesAndDescriptions = new LinkedHashMap<String, String>(); if (CollectionUtils.isNotEmpty(sampleRow.getTerrestrialLocations())) { for (TerrestrialLocation terrestrialLocation : sampleRow.getTerrestrialLocations()) { String key = terrestrialLocation.getDistrictName(); Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanBuilder.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanBuilder.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanBuilder.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -118,11 +118,11 @@ SampleRowsFilter sampleRowsFilter) { this.sampleRowsFilter = sampleRowsFilter; this.sampleRowsFilterValues = new SampleRowsFilterValues(locale, ObsProgram.OBSVENTE, optionalCompanyId); - this.sampleRowIds = new HashSet<>(); - this.facadeMap = new TreeMap<>(); - this.totalExpectedForMonths = new TreeMap<>(); - this.totalRealForMonths = new TreeMap<>(); - this.totalEstimatedForMonths = new TreeMap<>(); + this.sampleRowIds = new HashSet<String>(); + this.facadeMap = new TreeMap<String, FacadeContext>(); + this.totalExpectedForMonths = new TreeMap<Date, MutableInt>(); + this.totalRealForMonths = new TreeMap<Date, MutableInt>(); + this.totalEstimatedForMonths = new TreeMap<Date, MutableInt>(); PeriodDates periodDates = new PeriodDates(sampleRowsFilter.getPeriodFrom(), sampleRowsFilter.getPeriodTo()); @@ -165,7 +165,7 @@ public ObsVenteSamplingPlan toPlan() { // Get facade parts - Collection<SamplingPlan.SamplingPlanFacadePart> facadeParts = new ArrayList<>(); + Collection<SamplingPlan.SamplingPlanFacadePart> facadeParts = new ArrayList<SamplingPlan.SamplingPlanFacadePart>(); for (FacadeContext facadeContext : facadeMap.values()) { SamplingPlan.SamplingPlanFacadePart facadePart = facadeContext.toBean(); facadeParts.add(facadePart); @@ -179,7 +179,7 @@ }).immutableSortedCopy(facadeParts); // Get statistics - Map<Date, ObsMerSamplingPlan.SamplingPlanStatistics> statisticsMap = new TreeMap<>(); + Map<Date, ObsMerSamplingPlan.SamplingPlanStatistics> statisticsMap = new TreeMap<Date, ObsMerSamplingPlan.SamplingPlanStatistics>(); for (Date month : months) { MutableInt totalExpected = totalExpectedForMonths.get(month); @@ -204,7 +204,7 @@ } protected Map<Date, ObsMerSamplingPlan.SamplingPlanStatistics> computeNbTidesPerMonth(SampleRow sampleRow) { - Map<Date, ObsMerSamplingPlan.SamplingPlanStatistics> result = new TreeMap<>(); + Map<Date, ObsMerSamplingPlan.SamplingPlanStatistics> result = new TreeMap<Date, ObsMerSamplingPlan.SamplingPlanStatistics>(); for (Date month : months) { Integer expectedTidesValue = SampleRows.getExpectedTidesValue(sampleRow, month); if (expectedTidesValue != null) { @@ -250,7 +250,7 @@ protected FacadeContext(String facade) { this.facade = facade; - this.sectorMap = new TreeMap<>(); + this.sectorMap = new TreeMap<String, SectorContext>(); } protected SectorContext getOrAddSectorContext(String sectors) { @@ -267,7 +267,7 @@ protected SamplingPlan.SamplingPlanFacadePart toBean() { // get sector parts - Collection<SamplingPlan.SamplingPlanSectorPart> sectorParts = new ArrayList<>(); + Collection<SamplingPlan.SamplingPlanSectorPart> sectorParts = new ArrayList<SamplingPlan.SamplingPlanSectorPart>(); for (SectorContext sectorContext : sectorMap.values()) { SamplingPlan.SamplingPlanSectorPart sectorPart = sectorContext.toBean(); sectorParts.add(sectorPart); @@ -292,7 +292,7 @@ protected SectorContext(String sectors) { this.sectors = sectors; - this.rows = new ArrayList<>(); + this.rows = new ArrayList<ObsVenteSamplingPlan.ObsVenteSamplingPlanSampleRowPart>(); } protected ObsMerSamplingPlan.SamplingPlanSampleRowPart addSampleRow(Locale locale, Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -48,25 +48,25 @@ protected Optional<String> optionalCompanyId; - protected SortedSet<FilterOption> fishingZoneFacadeNames = new TreeSet<>(); + protected SortedSet<FilterOption> fishingZoneFacadeNames = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> fishingZoneSectorNames = new TreeSet<>(); + protected SortedSet<FilterOption> fishingZoneSectorNames = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> sampleRowCodes = new TreeSet<>(); + protected SortedSet<FilterOption> sampleRowCodes = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> programNames = new TreeSet<>(); + protected SortedSet<FilterOption> programNames = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> companies = new TreeSet<>(); + protected SortedSet<FilterOption> companies = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> samplingStrategies = new TreeSet<>(); + protected SortedSet<FilterOption> samplingStrategies = new TreeSet<FilterOption>(); - protected SortedSet<FilterOption> terrestrialDistricts = new TreeSet<>(); + protected SortedSet<FilterOption> terrestrialDistricts = new TreeSet<FilterOption>(); /** Values are the code and the label i18n key. */ - protected SortedSet<FilterOption> fishingGearDcfs = new TreeSet<>(); + protected SortedSet<FilterOption> fishingGearDcfs = new TreeSet<FilterOption>(); /** Values are the code and the label i18n key. */ - protected SortedSet<FilterOption> targetSpeciesDcfs = new TreeSet<>(); + protected SortedSet<FilterOption> targetSpeciesDcfs = new TreeSet<FilterOption>(); public SampleRowsFilterValues(Locale locale, ObsProgram obsProgram, Optional<String> optionalCompanyId) { super(locale); Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -407,7 +407,7 @@ professionOther = sampleRow.getProfession().getOther(); professionLibelle = sampleRow.getProfession().getLibelle(); professionSpecies = sampleRow.getProfession().getSpecies(); - dcf5CodesAndDescriptions = new LinkedHashMap<>(); + dcf5CodesAndDescriptions = new LinkedHashMap<String, String>(); for (DCF5Code dcf5Code : sampleRow.getdCF5Code()) { String key = dcf5Code.getCode(); String description = dcf5Code.getFishingGearCode() + " - " + WaoUtils.l(locale, dcf5Code.getFishingGearDCF()); @@ -434,7 +434,7 @@ // compute sampleRowPeriod // TODO brendan 15/04/14 use treeset - List<SampleMonth> sampleMonth = new ArrayList<>(sampleRow.getSampleMonth()); + List<SampleMonth> sampleMonth = new ArrayList<SampleMonth>(sampleRow.getSampleMonth()); firstSampleMonthDate = sampleMonth.get(0).getPeriodDate(); lastSampleMonthDate = sampleMonth.get(sampleMonth.size() - 1).getPeriodDate(); Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -300,7 +300,7 @@ updateSampleRowCommand.setCreation(false); - Set<Boat> elligibleBoats = new HashSet<>(); + Set<Boat> elligibleBoats = new HashSet<Boat>(); for (ElligibleBoat elligibleBoat : sampleRow.getElligibleBoat()) { boolean boatIsElligibleForUser = authenticatedWaoUser.isAdmin() && elligibleBoat.isGlobalActive() || @@ -406,7 +406,7 @@ SampleMonthTopiaDao sampleMonthDao = getSampleMonthDao(); - Set<SampleMonth> sampleMonthsToRemove = new HashSet<>(sampleRow.getSampleMonth()); + Set<SampleMonth> sampleMonthsToRemove = new HashSet<SampleMonth>(sampleRow.getSampleMonth()); Map<String, Integer> expectedObservationsByMonths = updateSampleRowCommand.getExpectedObservationsByMonths(); for (Map.Entry<String, Integer> entry : expectedObservationsByMonths.entrySet()) { Date month; Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/Synthesis.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/Synthesis.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/Synthesis.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -46,7 +46,7 @@ protected int validBoardingsCount; - protected Map<String, CompanySynthesis> companySyntheses = new HashMap<>(); + protected Map<String, CompanySynthesis> companySyntheses = new HashMap<String, CompanySynthesis>(); protected Set<String> sampleRowIds; @@ -145,7 +145,7 @@ companySynthesis.getCompanyName(), companySynthesis); } - return new LinkedHashSet<>(companySynthesesOrderedByName.values()); + return new LinkedHashSet<CompanySynthesis>(companySynthesesOrderedByName.values()); } public boolean isEmpty() { Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -89,7 +89,7 @@ synthesis = new Synthesis(); - Set<String> sampleRowIds = new HashSet<>(); + Set<String> sampleRowIds = new HashSet<String>(); filter.setFilterOnObservationBeginDate(true); setExpectedVsActualObservationsByMonthsBarChartData(synthesis, filter); @@ -287,7 +287,7 @@ Map<Boat, LinkedHashMap<String, List<Date>>> data = dao.getBoardingBoats(filter); - Map<Integer, Integer> mapBoarding = new TreeMap<>(); + Map<Integer, Integer> mapBoarding = new TreeMap<Integer, Integer>(); // Prepare map which contains for each entry the number of boardings // for the key and the number of boats for the value. Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -55,7 +55,7 @@ protected String mainObserverId; - protected Set<String> secondaryObserverIds = new HashSet<>(); + protected Set<String> secondaryObserverIds = new HashSet<String>(); protected String terrestrialLocationId; Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -73,7 +73,7 @@ public Map<String, Integer> getExpectedObservationsByMonths() { if (expectedObservationsByMonths == null) { - expectedObservationsByMonths = new LinkedHashMap<>(); + expectedObservationsByMonths = new LinkedHashMap<String, Integer>(); Date periodBegin = sampleRow.getPeriodBegin(); Date periodEnd = sampleRow.getPeriodEnd(); for (Date month : new PeriodDates(periodBegin, periodEnd).getMonths()) { Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -121,7 +121,7 @@ protected static final Map<ObsProgram, List<String>> PER_PROGRAM_REFERENTIAL; static { - Map<ObsProgram, List<String>> perProgramReferential = new HashMap<>(); + Map<ObsProgram, List<String>> perProgramReferential = new HashMap<ObsProgram, List<String>>(); perProgramReferential.put(ObsProgram.OBSMER, Arrays.asList( FishingZone.class.getName(), @@ -577,13 +577,15 @@ TerrestrialLocationTopiaDao dao = getPersistenceContext().getTerrestrialLocationDao(); - Map<String, Object> properties = new HashMap<>(); + Map<String, Object> properties = new HashMap<String, Object>(); // we are looking for ports only properties.put(TerrestrialLocation.PROPERTY_LOCATION_TYPE_ORDINAL, LocationType.PORT.ordinal()); // ports in a specific region - properties.put(TerrestrialLocation.PROPERTY_REGION_IFREMER_CODE, region.getRegionIfremerCode()); + if (region != null) { + properties.put(TerrestrialLocation.PROPERTY_REGION_IFREMER_CODE, region.getRegionIfremerCode()); + } // run query List<TerrestrialLocation> ports = dao.forProperties(properties).findAll(); @@ -752,7 +754,7 @@ List<FishingGearDCF> fishingGearDCFs = fishingGearDCFDao.findAll(); List<TargetSpeciesDCF> targetSpeciesDCFs = targetSpeciesDCFDao.findAll(); - Set<Pair<FishingGearDCF, TargetSpeciesDCF>> pairs = new HashSet<>(); + Set<Pair<FishingGearDCF, TargetSpeciesDCF>> pairs = new HashSet<Pair<FishingGearDCF, TargetSpeciesDCF>>(); for (FishingGearDCF fishingGearDCF : fishingGearDCFs) { for (TargetSpeciesDCF targetSpeciesDCF : targetSpeciesDCFs) { @@ -766,7 +768,7 @@ FishingGearDCF fishingGearDCF = pair.getLeft(); TargetSpeciesDCF targetSpeciesDCF = pair.getRight(); - Map<String, Object> properties = new HashMap<>(); + Map<String, Object> properties = new HashMap<String, Object>(); properties.put(DCF5Code.PROPERTY_FISHING_GEAR_DCF, fishingGearDCF); properties.put(DCF5Code.PROPERTY_TARGET_SPECIES_DCF, targetSpeciesDCF); @@ -836,7 +838,7 @@ */ public List<ReferentialState> getReferentialStates(ObsProgram obsProgram) { - List<ReferentialState> referentialStates = new LinkedList<>(); + List<ReferentialState> referentialStates = new LinkedList<ReferentialState>(); for (String entityClassFqn : PER_PROGRAM_REFERENTIAL.get(obsProgram)) { @@ -917,11 +919,11 @@ FleetTopiaDao fleetDao = getPersistenceContext().getFleetDao(); // load data that will be linked to the boat - Map<String, ShipOwner> shipOwners = new HashMap<>(); + Map<String, ShipOwner> shipOwners = new HashMap<String, ShipOwner>(); for (ShipOwner shipOwner : shipOwnerDao.findAll()) { shipOwners.put(shipOwner.getCode(), shipOwner); } - Map<String, Fleet> fleets = new HashMap<>(); + Map<String, Fleet> fleets = new HashMap<String, Fleet>(); for (Fleet fleet : fleetDao.findAll()) { fleets.put(fleet.getCode(), fleet); } @@ -995,7 +997,7 @@ BoatTopiaDao boatDao = getPersistenceContext().getBoatDao(); BoatGroupTopiaDao boatGroupDao = getPersistenceContext().getBoatGroupDao(); - Map<String, BoatGroup> boatGroups = new HashMap<>(); + Map<String, BoatGroup> boatGroups = new HashMap<String, BoatGroup>(); for (BoatGroup boatGroup : boatGroupDao.findAll()) { boatGroups.put(boatGroup.getCode(), boatGroup); } @@ -1044,7 +1046,7 @@ Iterable<String> splitImmatriculations = BOAT_IMMATRICULATIONS_SPLITTER.split(joinedImmatriculations); - Set<Integer> immatriculations = new HashSet<>(); + Set<Integer> immatriculations = new HashSet<Integer>(); for (String splitImmatriculation : splitImmatriculations) { if (StringUtils.isNotBlank(splitImmatriculation)) { immatriculations.add(Integer.parseInt(splitImmatriculation)); @@ -1057,7 +1059,7 @@ for (Boat boat : boats) { immatriculations.remove(boat.getImmatriculation()); } - Set<String> immatriculationStrings = new HashSet<>(); + Set<String> immatriculationStrings = new HashSet<String>(); for (Integer immatriculation : immatriculations) { immatriculationStrings.add(String.valueOf(immatriculation)); } @@ -1075,7 +1077,7 @@ */ public Set<DCF5Code> getDcf5Codes(String joinedDcf5Codes) throws UnknownFishingGearDcfCodeException, UnknownTargetSpeciesDcfCodeException { - Set<DCF5Code> dcf5Codes = new HashSet<>(); + Set<DCF5Code> dcf5Codes = new HashSet<DCF5Code>(); DCF5CodeTopiaDao dao = getDCF5CodeDao(); @@ -1103,7 +1105,7 @@ } } - Map<String, Object> properties = new HashMap<>(); + Map<String, Object> properties = new HashMap<String, Object>(); properties.put(DCF5Code.PROPERTY_FISHING_GEAR_DCF, fishingGearDCF); properties.put(DCF5Code.PROPERTY_TARGET_SPECIES_DCF, targetSpeciesDCF); @@ -1134,7 +1136,7 @@ public List<TerrestrialLocation> getTerrestrialLocationInDistricts(Collection<TerrestrialLocation> terrestrialDistricts) { - Set districtCodes = new HashSet(); + Set<String> districtCodes = new HashSet(); for (TerrestrialLocation terrestrialDistrict : terrestrialDistricts) { Preconditions.checkArgument(terrestrialDistrict.isDistrict()); districtCodes.add(terrestrialDistrict.getDistrictCode()); Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -163,7 +163,7 @@ waoUser.clearCanReadBoats(); if (waoUser.hasUserRole(UserRole.PROFESSIONAL, obsProgram)) { - Set<Boat> boatsFromImmatriculations = new HashSet<>(getReferentialService().getBoatsFromImmatriculations(updateWaoUserCommand.getCanReadBoats())); + Set<Boat> boatsFromImmatriculations = new HashSet<Boat>(getReferentialService().getBoatsFromImmatriculations(updateWaoUserCommand.getCanReadBoats())); waoUser.setCanReadBoats(boatsFromImmatriculations); } Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatGroupImportModel.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatGroupImportModel.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatGroupImportModel.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -47,7 +47,7 @@ } protected void buildModel() { - modelBuilder = new ModelBuilder<>(); + modelBuilder = new ModelBuilder<Boat>(); modelBuilder.newColumnForImportExport( "NAVIRE_IMMATRICULATION", Boat.PROPERTY_IMMATRICULATION, Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -78,7 +78,7 @@ } protected void buildModel() { - modelBuilder = new ModelBuilder<>(); + modelBuilder = new ModelBuilder<Boat>(); modelBuilder.newColumnForImportExport( "NAVIRE_IMMATRICULATION", Boat.PROPERTY_IMMATRICULATION, Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -138,7 +138,7 @@ } protected ModelBuilder<Contact> getModel() { - ModelBuilder<Contact> modelBuilder = new ModelBuilder<>(); + ModelBuilder<Contact> modelBuilder = new ModelBuilder<Contact>(); modelBuilder.newColumnForImportExport("CONTACT_ID", Contact.PROPERTY_TOPIA_ID); modelBuilder.newColumnForImportExport("CONTACT_DATE_CREATION", Contact.PROPERTY_CREATION_DATE, Common.DAY_TIME); modelBuilder.newColumnForImportExport("CONTACT_OBSERVATEUR_PRINCIPAL", Contact.PROPERTY_MAIN_OBSERVER, new UserParserFormatter(locale, waoUsers)); @@ -151,7 +151,7 @@ new ValueFormatter<List<WaoUser>>() { @Override public String format(List<WaoUser> value) { - List<String> fullNames = new LinkedList<>(); + List<String> fullNames = new LinkedList<String>(); for (WaoUser waoUser : value) { fullNames.add(waoUser.getFullName()); } @@ -170,7 +170,7 @@ }, new CompanyParserFormatter(locale, null) ); - modelBuilder.newColumnForImportExport("CONTACT_ETAT", "contactState", new I18nAbleParserFormatter<>(locale, ContactState.getAllowedStates(obsProgram))); + modelBuilder.newColumnForImportExport("CONTACT_ETAT", "contactState", new I18nAbleParserFormatter<ContactState>(locale, ContactState.getAllowedStates(obsProgram))); modelBuilder.newColumnForImportExport("CONTACT_DEBUT_OBSERVATION", Contact.PROPERTY_OBSERVATION_BEGIN_DATE, Common.DAY_TIME); modelBuilder.newColumnForImportExport("CONTACT_FIN_OBSERVATION", Contact.PROPERTY_OBSERVATION_END_DATE, Common.DAY_TIME); modelBuilder.newColumnForImportExport("CONTACT_SAISIE_DONNEES", Contact.PROPERTY_DATA_INPUT_DATE, Common.DAY); @@ -193,7 +193,7 @@ if (obsProgram.isObsMer()) { modelBuilder.newColumnForImportExport("CONTACT_QUALITE_DONNEE", "dataReliability", - new I18nAbleParserFormatter<>(locale, DataReliability.values())); + new I18nAbleParserFormatter<DataReliability>(locale, DataReliability.values())); modelBuilder.newColumnForImportExport("CONTACT_OBSERVATION_MAMMIFERE", Contact.PROPERTY_MAMMALS_OBSERVATION, Common.BOOLEAN); modelBuilder.newColumnForImportExport("CONTACT_CAPTURE_ACCIDENTELLE", Contact.PROPERTY_MAMMALS_CAPTURE, Common.BOOLEAN); modelBuilder.newIgnoredColumn("CONTACT_CAPTURE_ACCIDENTELLE_DETAILS"); @@ -213,10 +213,10 @@ }); modelBuilder.newColumnForImportExport("CONTACT_TRANSMISSION_RESTITUTION", Contact.PROPERTY_RESTITUTION, Common.DAY); - Set<ObservedDataControl> observedDataControlsValues = new HashSet<>(); + Set<ObservedDataControl> observedDataControlsValues = new HashSet<ObservedDataControl>(); Collections.addAll(observedDataControlsValues, ObservedDataControl.values()); observedDataControlsValues.add(null); - I18nAbleParserFormatter<ObservedDataControl> valueParserFormatter = new I18nAbleParserFormatter<>(locale, observedDataControlsValues); + I18nAbleParserFormatter<ObservedDataControl> valueParserFormatter = new I18nAbleParserFormatter<ObservedDataControl>(locale, observedDataControlsValues); valueParserFormatter.setAcceptNullValues(true); modelBuilder.newColumnForImportExport("CONTACT_DONNEES_ALLEGRO_VALIDEES", Contact.PROPERTY_OBSERVED_DATA_CONTROL, valueParserFormatter); @@ -228,14 +228,14 @@ modelBuilder.newColumnForImportExport("CONTACT_ECHANTILLONNAGE_COMPLET", Contact.PROPERTY_COMPLETE_SAMPLING, Common.BOOLEAN); // terrestrial location - Set<LocationType> locationTypes = new HashSet<>(); + Set<LocationType> locationTypes = new HashSet<LocationType>(); locationTypes.add(LocationType.PORT); locationTypes.add(LocationType.AUCTION); locationTypes.add(null); I18nAbleParserFormatter<LocationType> locationTypeParserFormatter = - new I18nAbleParserFormatter<>(locale, locationTypes); + new I18nAbleParserFormatter<LocationType>(locale, locationTypes); locationTypeParserFormatter.setAcceptNullValues(true); - ValueGetterSetter<Contact, LocationType> locationTypeGetter = new Common.ValueSaver<>(); + ValueGetterSetter<Contact, LocationType> locationTypeGetter = new Common.ValueSaver<Contact, LocationType>(); modelBuilder.newMandatoryColumn( "CONTACT_LIEU_TYPE", locationTypeParserFormatter, @@ -318,12 +318,12 @@ @Override public TerrestrialLocation parse(String code) throws ParseException { if (indexedLocations == null) { - indexedLocations = new HashMap<>(); + indexedLocations = new HashMap<LocationType, Map<String, TerrestrialLocation>>(); for (TerrestrialLocation terrestrialLocation : terrestrialLocations) { LocationType locationType = terrestrialLocation.getLocationType(); Map<String, TerrestrialLocation> locationsForType = indexedLocations.get(locationType); if (locationsForType == null) { - locationsForType = new HashMap<>(); + locationsForType = new HashMap<String, TerrestrialLocation>(); } locationsForType.put(terrestrialLocation.getCode(), terrestrialLocation); indexedLocations.put(locationType, locationsForType); Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactStateMotivesImportModel.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactStateMotivesImportModel.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactStateMotivesImportModel.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -64,7 +64,7 @@ } protected void buildModel() { - modelBuilder = new ModelBuilder<>(); + modelBuilder = new ModelBuilder<ContactStateMotif>(); modelBuilder.newMandatoryColumn( "MOTIF_CODE", ContactStateMotif.PROPERTY_CODE); modelBuilder.newMandatoryColumn( Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/FishingZoneImportModel.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/FishingZoneImportModel.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/FishingZoneImportModel.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -62,7 +62,7 @@ @Override public Iterable<ImportableColumn<FishingZone, Object>> getColumnsForImport() { - ModelBuilder<FishingZone> modelBuilder = new ModelBuilder<>(); + ModelBuilder<FishingZone> modelBuilder = new ModelBuilder<FishingZone>(); modelBuilder.newMandatoryColumn("PECHE_DIVISION", FishingZone.PROPERTY_DISTRICT_CODE); modelBuilder.newMandatoryColumn("PECHE_ZONE", FishingZone.PROPERTY_SECTOR_NAME); modelBuilder.newMandatoryColumn("PECHE_FACADE", FishingZone.PROPERTY_FACADE_NAME); Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -191,7 +191,7 @@ protected void buildModel() { - modelBuilder = new ModelBuilder<>(); + modelBuilder = new ModelBuilder<SampleRow>(); modelBuilder.newColumnForImportExport("PLAN_CODE", SampleRow.PROPERTY_CODE, new SampleRowCodeParserFormatter(locale, obsProgram)); modelBuilder.newColumnForImportExport("SOCIETE_NOM", SampleRow.PROPERTY_COMPANY, new CompanyParserFormatter(locale, companies)); @@ -228,7 +228,7 @@ } if (obsProgram == ObsProgram.OBSVENTE) { - modelBuilder.newColumnForImportExport("PLAN_STRATEGIE", "samplingStrategy", new I18nAbleParserFormatter<>(locale, SamplingStrategy.values())); + modelBuilder.newColumnForImportExport("PLAN_STRATEGIE", "samplingStrategy", new I18nAbleParserFormatter<SamplingStrategy>(locale, SamplingStrategy.values())); modelBuilder.newColumnForImportExport("PLAN_LIEU_CODE", SampleRow.PROPERTY_TERRESTRIAL_LOCATIONS, new DistrictsParserFormatter(locale, terrestrialDistricts)); modelBuilder.newColumnForExport("PLAN_LIEU_NOM", SampleRow.PROPERTY_TERRESTRIAL_LOCATIONS, new DistrictNamesFormatter()); modelBuilder.newIgnoredColumn("PLAN_LIEU_NOM"); Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCodesImportModel.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCodesImportModel.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCodesImportModel.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -63,7 +63,7 @@ } protected void buildModel() { - modelBuilder = new ModelBuilder<>(); + modelBuilder = new ModelBuilder<RawObsDebCode>(); modelBuilder.newMandatoryColumn("CODE", RawObsDebCode.PROPERTY_CODE); modelBuilder.newMandatoryColumn("NOM", RawObsDebCode.PROPERTY_LABEL); modelBuilder.newMandatoryColumn("REGION_IFREMER", Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialDivisionImportModel.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialDivisionImportModel.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialDivisionImportModel.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -72,7 +72,7 @@ @Override public Iterable<ImportableColumn<TerrestrialDivision, Object>> getColumnsForImport() { - ModelBuilder<TerrestrialDivision> modelBuilder = new ModelBuilder<>(); + ModelBuilder<TerrestrialDivision> modelBuilder = new ModelBuilder<TerrestrialDivision>(); modelBuilder.newMandatoryColumn( "ID_STRATE", Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialLocationImportModel.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialLocationImportModel.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialLocationImportModel.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -80,7 +80,7 @@ @Override public Iterable<ImportableColumn<TerrestrialLocation, Object>> getColumnsForImport() { - ModelBuilder<TerrestrialLocation> modelBuilder = new ModelBuilder<>(); + ModelBuilder<TerrestrialLocation> modelBuilder = new ModelBuilder<TerrestrialLocation>(); modelBuilder.newMandatoryColumn("TLIEU_COD", new ValueParser<LocationType>() { Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictNamesFormatter.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictNamesFormatter.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictNamesFormatter.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -35,7 +35,7 @@ @Override public String format(Collection<TerrestrialLocation> terrestrialLocations) { - List<String> districtNames = new LinkedList<>(); + List<String> districtNames = new LinkedList<String>(); if (terrestrialLocations != null) { for (TerrestrialLocation terrestrialLocation : terrestrialLocations) { districtNames.add(terrestrialLocation.getDistrictName()); Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictParserFormatter.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictParserFormatter.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictParserFormatter.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -44,7 +44,7 @@ public DistrictParserFormatter(Locale locale, List<TerrestrialLocation> districts) { this.locale = locale; if (districts != null) { - indexedDistricts = new HashMap<>(); + indexedDistricts = new HashMap<String, TerrestrialLocation>(); for (TerrestrialLocation district : districts) { if ( ! district.isDistrict()) { throw new IllegalArgumentException(); Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -51,7 +51,7 @@ @Override public String format(Collection<TerrestrialLocation> districts) { - List<String> districtCodes = new LinkedList<>(); + List<String> districtCodes = new LinkedList<String>(); if (districts != null) { for (TerrestrialLocation district : districts) { districtCodes.add(district.getDistrictCode()); @@ -64,7 +64,7 @@ @Override public Collection<TerrestrialLocation> parse(String value) throws ParseException { if (indexedDistricts == null) { - indexedDistricts = new HashMap<>(); + indexedDistricts = new HashMap<String, TerrestrialLocation>(); for (TerrestrialLocation district : districts) { // XXX brendan 28/02/14 on utilise pas Maps.uniqueIndex car la clé peut être null (quartier maritime « Hors France ») if (!district.isDistrict()) { @@ -77,7 +77,7 @@ throw new IllegalArgumentException(I18n.l(locale, "wao.import.contact.failure.districtMissing")); } String[] districtCodes = StringUtils.split(value, ','); - Collection<TerrestrialLocation> districts = new LinkedList<>(); + Collection<TerrestrialLocation> districts = new LinkedList<TerrestrialLocation>(); for (String districtCode : districtCodes) { TerrestrialLocation district = indexedDistricts.get(districtCode.trim()); if (district == null) { Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -56,7 +56,7 @@ @Override public String format(Set<FishingZone> fishingZones) { - List<String> districtCodes = new LinkedList<>(); + List<String> districtCodes = new LinkedList<String>(); for (FishingZone fishingZone : fishingZones) { districtCodes.add(fishingZone.getDistrictCode()); } @@ -68,7 +68,7 @@ if (indexedFishingZones == null) { indexedFishingZones = Maps.uniqueIndex(fishingZones, FishingZones.getDistrictCode()); } - Set<FishingZone> fishingZones = new HashSet<>(); + Set<FishingZone> fishingZones = new HashSet<FishingZone>(); if (StringUtils.isBlank(districtCodes)) { throw new IllegalArgumentException(I18n.l(locale, "wao.import.sampleRow.failure.fishingZoneMissing")); } else { Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/I18nAbleParserFormatter.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/I18nAbleParserFormatter.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/I18nAbleParserFormatter.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -42,9 +42,9 @@ */ public class I18nAbleParserFormatter<E extends I18nAble> implements ValueParserFormatter<E> { - protected Map<E, String> toStrings = new HashMap<>(); + protected Map<E, String> toStrings = new HashMap<E, String>(); - protected Map<String, E> fromString = new HashMap<>(); + protected Map<String, E> fromString = new HashMap<String, E>(); protected final Locale locale; Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/LocationTypeParserFormatter.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/LocationTypeParserFormatter.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/LocationTypeParserFormatter.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -56,7 +56,7 @@ @Override public LocationType parse(String value) throws ParseException { if (fromStrings == null) { - fromStrings = new HashMap<>(); + fromStrings = new HashMap<String, LocationType>(); fromStrings.put(LocationType.PORT.toString(), LocationType.PORT); fromStrings.put(LocationType.AUCTION.toString(), LocationType.AUCTION); } Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionsParser.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionsParser.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionsParser.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -56,7 +56,7 @@ } String[] regionCodes = value.split(","); - List<TerrestrialLocation> regions = new LinkedList<>(); + List<TerrestrialLocation> regions = new LinkedList<TerrestrialLocation>(); for (String regionCode : regionCodes) { if ( ! regionCode.isEmpty()) { TerrestrialLocation region = Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -64,7 +64,7 @@ @Override public Set<WaoUser> parse(String value) throws ParseException { String[] logins = StringUtils.split(value, SEPARATOR); - Set<WaoUser> users = new HashSet<>(); + Set<WaoUser> users = new HashSet<WaoUser>(); for (String login : logins) { String trimmedLogin = login.trim(); WaoUser user = indexedWaoUsers.get(trimmedLogin); Modified: branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/MammalsObservationEmail.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/MammalsObservationEmail.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/MammalsObservationEmail.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -78,7 +78,7 @@ public String getFacadeNames() { - List<String> facadesNames = new ArrayList<>(); + List<String> facadesNames = new ArrayList<String>(); for (FishingZone fishingZone : getSampleRow().getFishingZone()) { facadesNames.add(fishingZone.getSectorName() + " (" + fishingZone.getFacadeName() + ")"); } Modified: branches/wao-4.0-jdk6/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -175,7 +175,7 @@ protected WaoTopiaApplicationContext newWaoTopiaApplicationContext(String context) { - Map<String, String> hibernateH2Config = new HashMap<>(); + Map<String, String> hibernateH2Config = new HashMap<String, String>(); hibernateH2Config.putAll(getApplicationConfig().getTopiaProperties()); Modified: branches/wao-4.0-jdk6/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java =================================================================== --- branches/wao-4.0-jdk6/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -169,7 +169,7 @@ SampleRow sampleRow = serviceContext.getPersistenceContext().getSampleRowDao().forCodeEquals("2010_M0011").findUnique(); - Map<Date, ObsMerSamplingPlan.SamplingPlanStatistics> oldStats = new HashMap<>(); + Map<Date, ObsMerSamplingPlan.SamplingPlanStatistics> oldStats = new HashMap<Date, ObsMerSamplingPlan.SamplingPlanStatistics>(); for (SampleMonth sampleMonth : sampleRow.getSampleMonth()) { ObsMerSamplingPlan.SamplingPlanStatistics stats = new ObsMerSamplingPlan.SamplingPlanStatistics( Modified: branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java =================================================================== --- branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -59,11 +59,11 @@ protected Cache<ContactsFilter, Synthesis> synthesesCache; - protected Set<String> dirtySampleRowIds = new HashSet<>(); + protected Set<String> dirtySampleRowIds = new HashSet<String>(); - protected Set<String> dirtyBoatIds = new HashSet<>(); + protected Set<String> dirtyBoatIds = new HashSet<String>(); - protected Set<String> dirtyContactIds = new HashSet<>(); + protected Set<String> dirtyContactIds = new HashSet<String>(); protected boolean invalidateAllSampleRows = false; @@ -143,14 +143,14 @@ samplingPlansCache.invalidateAll(); synthesesCache.invalidateAll(); } else { - Set<SamplingPlanCacheKey> samplingPlansCacheKeysToInvalidate = new HashSet<>(); + Set<SamplingPlanCacheKey> samplingPlansCacheKeysToInvalidate = new HashSet<SamplingPlanCacheKey>(); for (Map.Entry<SamplingPlanCacheKey, SamplingPlan> entry : samplingPlansCache.asMap().entrySet()) { if (CollectionUtils.containsAny(entry.getValue().getSampleRowIds(), dirtySampleRowIds)) { samplingPlansCacheKeysToInvalidate.add(entry.getKey()); } } samplingPlansCache.invalidateAll(samplingPlansCacheKeysToInvalidate); - Set<ContactsFilter> synthesesCacheKeysToInvalidate = new HashSet<>(); + Set<ContactsFilter> synthesesCacheKeysToInvalidate = new HashSet<ContactsFilter>(); for (Map.Entry<ContactsFilter, Synthesis> entry : synthesesCache.asMap().entrySet()) { if (CollectionUtils.containsAny(entry.getValue().getSampleRowIds(), dirtySampleRowIds)) { synthesesCacheKeysToInvalidate.add(entry.getKey()); @@ -161,7 +161,7 @@ if (invalidateAllBoats || dirtyBoatIds.size() > 20) { boatsFilterValuesCache.invalidateAll(); } else { - Set<BoatsFilterValuesCacheKey> boatsFilterValuesCacheKeysToInvalidate = new HashSet<>(); + Set<BoatsFilterValuesCacheKey> boatsFilterValuesCacheKeysToInvalidate = new HashSet<BoatsFilterValuesCacheKey>(); for (Map.Entry<BoatsFilterValuesCacheKey, BoatsFilterValues> entry : boatsFilterValuesCache.asMap().entrySet()) { if (CollectionUtils.containsAny(entry.getValue().getBoatIds(), dirtyBoatIds)) { boatsFilterValuesCacheKeysToInvalidate.add(entry.getKey()); Modified: branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java =================================================================== --- branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -208,7 +208,7 @@ } public Map<String, String> getDcf5CodesAndDescriptions(SampleRow sampleRow) { - Map<String, String> dcf5CodesAndDescriptions = new LinkedHashMap<>(); + Map<String, String> dcf5CodesAndDescriptions = new LinkedHashMap<String, String>(); for (DCF5Code dcf5Code : sampleRow.getdCF5Code()) { String key = dcf5Code.getCode(); String description = dcf5Code.getFishingGearCode() + " - " + WaoUtils.l(getLocale(), dcf5Code.getFishingGearDCF()); Modified: branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java =================================================================== --- branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -214,38 +214,38 @@ List<WaoUser> waoUsers = waoUsersService.getActiveWaoUsers(Optional.of(updateContactCommand.getContact().getSampleRow().getCompany().getTopiaId())); Set<WaoUser> sortedWaoUsers = Sets.newTreeSet(WaoUsers.fullNameComparator()); sortedWaoUsers.addAll(waoUsers); - observers = new LinkedHashMap<>(); + observers = new LinkedHashMap<String, String>(); for (WaoUser waoUser : sortedWaoUsers) { observers.put(waoUser.getTopiaId(), waoUser.getFullName()); } - contactStates = new EnumMap<>(ContactState.class); + contactStates = new EnumMap<ContactState, String>(ContactState.class); for (ContactState contactState : ContactState.getAllowedStates(getAuthenticatedWaoUser().getObsProgram())) { contactStates.put(contactState, WaoUtils.l(getLocale(), contactState)); } - contactStateMotives = new TreeMap<>(); + contactStateMotives = new TreeMap<String, String>(); for (ContactStateMotif contactStateMotif : referentialService.getAllContactStateMotifs(null)) { contactStateMotives.put(contactStateMotif.getTopiaId(), contactStateMotif.getName()); } - observedDataControls = new EnumMap<>(ObservedDataControl.class); + observedDataControls = new EnumMap<ObservedDataControl, String>(ObservedDataControl.class); for (ObservedDataControl observedDataControl : ObservedDataControl.values()) { observedDataControls.put(observedDataControl, WaoUtils.l(getLocale(), observedDataControl)); } - dataReliabilities = new EnumMap<>(DataReliability.class); + dataReliabilities = new EnumMap<DataReliability, String>(DataReliability.class); for (DataReliability dataReliability : DataReliability.values()) { dataReliabilities.put(dataReliability, WaoUtils.l(getLocale(), dataReliability)); } - samplingStrategies = new EnumMap<>(SamplingStrategy.class); + samplingStrategies = new EnumMap<SamplingStrategy, String>(SamplingStrategy.class); for (SamplingStrategy samplingStrategy : SamplingStrategy.values()) { samplingStrategies.put(samplingStrategy, WaoUtils.l(getLocale(), samplingStrategy)); } - terrestrialLocations = new LinkedHashMap<>(); + terrestrialLocations = new LinkedHashMap<String, String>(); List<TerrestrialLocation> terrestrialLocationInDistricts = referentialService.getTerrestrialLocationInDistricts(updateContactCommand.getContact().getSampleRow().getTerrestrialLocations()); - Set<TerrestrialLocation> sortedTerrestrialLocations = new TreeSet<>(TerrestrialLocations.nameComparator()); + Set<TerrestrialLocation> sortedTerrestrialLocations = new TreeSet<TerrestrialLocation>(TerrestrialLocations.nameComparator()); sortedTerrestrialLocations.addAll(terrestrialLocationInDistricts); for (TerrestrialLocation terrestrialLocation : sortedTerrestrialLocations) { terrestrialLocations.put(terrestrialLocation.getTopiaId(), terrestrialLocation.getDescription()); Modified: branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java =================================================================== --- branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -110,7 +110,7 @@ userProfileId = Iterables.getOnlyElement(waoUser.getUserProfile()).getTopiaId(); } else { userProfileAsked = true; - userProfiles = new HashMap<>(); + userProfiles = new HashMap<String, String>(); for (UserProfile userProfile : waoUser.getUserProfile()) { String label = t(userProfile.getUserRole().getI18nKey()); label += " " + t(userProfile.getObsProgram().getI18nKey()); Modified: branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/converter/BooleanSetConverter.java =================================================================== --- branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/converter/BooleanSetConverter.java 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-web/src/main/java/fr/ifremer/wao/web/converter/BooleanSetConverter.java 2014-07-08 09:31:46 UTC (rev 2133) @@ -42,7 +42,7 @@ @Override public Set<Boolean> convertFromString(Map map, String[] strings, Class aClass) { - Set<Boolean> result = new HashSet<>(); + Set<Boolean> result = new HashSet<Boolean>(); if (strings.length > 0) { @@ -74,7 +74,7 @@ if (o instanceof Set) { Set<Boolean> booleans = (Set<Boolean>) o; - Set<String> strings = new HashSet<>(); + Set<String> strings = new HashSet<String>(); for (Boolean aBoolean : booleans) { String string; if (aBoolean == null) { Modified: branches/wao-4.0-jdk6/wao-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/wao-4.0-jdk6/wao-web/src/main/webapp/WEB-INF/web.xml 2014-07-08 09:29:24 UTC (rev 2132) +++ branches/wao-4.0-jdk6/wao-web/src/main/webapp/WEB-INF/web.xml 2014-07-08 09:31:46 UTC (rev 2133) @@ -32,23 +32,24 @@ <session-timeout>600</session-timeout> </session-config> +   - <filter> - <filter-name>ExpiresFilter</filter-name> - <filter-class>org.apache.catalina.filters.ExpiresFilter</filter-class> - <init-param> - <param-name>ExpiresByType image</param-name> - <param-value>access plus 10 minutes</param-value> - </init-param> - <init-param> - <param-name>ExpiresByType text/css</param-name> - <param-value>access plus 10 minutes</param-value> - </init-param> - <init-param> - <param-name>ExpiresByType application/javascript</param-name> - <param-value>access plus 10 minutes</param-value> - </init-param> - </filter> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  <filter> <filter-name>struts-prepare</filter-name> @@ -85,10 +86,12 @@ <listener-class>fr.ifremer.wao.web.WaoApplicationListener</listener-class> </listener> - <filter-mapping> - <filter-name>ExpiresFilter</filter-name> - <url-pattern>/*</url-pattern> - <dispatcher>REQUEST</dispatcher> - </filter-mapping> +  +  +  +  +  +  + </web-app>

1 0

r2132 - in branches: . wao-4.0-jdk6
by bleny＠users.forge.codelutin.com 08 Jul '14

08 Jul '14

Author: bleny Date: 2014-07-08 11:29:24 +0200 (Tue, 08 Jul 2014) New Revision: 2132 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2132 Log: creating branch for jdk1.6 and tomcat6 compatibility Added: branches/wao-4.0-jdk6/ Property changes on: branches/wao-4.0-jdk6 ___________________________________________________________________ Added: svn:ignore + *.idea *.iml target atlassian-ide-plugin.xml Added: svn:mergeinfo + /branches/wao-4.0-obsvente:2075-2085

1 0

[ANN] - Wao 4.0.1 released
by codelutin.com Release Notification 07 Jul '14

07 Jul '14

The Wao team is pleased to announce the wao-4.0.1 release! Application pour le suivi contractuels d'observations scientifiques de la pêche Documentation of the project can be found here: http://doc.codelutin.com/wao Changes ------- Changes in this version include: Fixed Bugs: o Obsmer : contact en refus ou refus définitif, impossible de valider le contact car ne prend pas le motif sélectionné Issue: 5388. Thanks to Vincent BADTS. Resolved by bleny. o Perte identifiant dans le mail automatique vers guichet (harmonie(a)ifremer.fr) pour ajout portefeuille Issue: 5378. Thanks to Vincent BADTS. Resolved by bleny. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/wao/files * wao-4.0.1.war - http://forge.codelutin.com/attachments/download/2026 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

r2131 - in trunk: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com 07 Jul '14

07 Jul '14

Author: maven-release Date: 2014-07-07 17:48:11 +0200 (Mon, 07 Jul 2014) New Revision: 2131 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2131 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-persistence/pom.xml trunk/wao-services/pom.xml trunk/wao-web/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-07 15:48:04 UTC (rev 2130) +++ trunk/pom.xml 2014-07-07 15:48:11 UTC (rev 2131) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.1</version> + <version>4.0.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0.1</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.1</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.1</url> + <connection>scm:svn:http://svn.codelutin.com/wao/trunk</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/trunk</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/trunk</url> </scm> <properties> Modified: trunk/wao-persistence/pom.xml =================================================================== --- trunk/wao-persistence/pom.xml 2014-07-07 15:48:04 UTC (rev 2130) +++ trunk/wao-persistence/pom.xml 2014-07-07 15:48:11 UTC (rev 2131) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.1</version> + <version>4.0.2-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-07-07 15:48:04 UTC (rev 2130) +++ trunk/wao-services/pom.xml 2014-07-07 15:48:11 UTC (rev 2131) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.1</version> + <version>4.0.2-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-07-07 15:48:04 UTC (rev 2130) +++ trunk/wao-web/pom.xml 2014-07-07 15:48:11 UTC (rev 2131) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.1</version> + <version>4.0.2-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2130 - in tags: . wao-4.0.1
by maven-release＠users.forge.codelutin.com 07 Jul '14

07 Jul '14

Author: maven-release Date: 2014-07-07 17:48:04 +0200 (Mon, 07 Jul 2014) New Revision: 2130 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2130 Log: [maven-release-plugin] copy for tag wao-4.0.1 Added: tags/wao-4.0.1/ Property changes on: tags/wao-4.0.1 ___________________________________________________________________ Added: svn:ignore + *.idea *.iml target atlassian-ide-plugin.xml Added: svn:mergeinfo + /branches/wao-4.0-obsvente:2075-2085

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →