[OPENMEETINGS-1671] header size is reduced
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/c452a462 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c452a462 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c452a462 Branch: refs/heads/3.3.x Commit: c452a462e704c7617f5520b74335ed8f17a82c55 Parents: 7b5cd39 Author: Maxim Solodovnik <solomax...@gmail.com> Authored: Thu Sep 14 10:50:46 2017 +0700 Committer: Maxim Solodovnik <solomax...@gmail.com> Committed: Thu Sep 14 10:50:46 2017 +0700 ---------------------------------------------------------------------- .../org/apache/openmeetings/web/admin/admin.js | 10 +++++++ .../org/apache/openmeetings/web/common/main.js | 19 +----------- .../org/apache/openmeetings/web/pages/om-ga.js | 19 +----------- .../web/room/activities/activities.js | 19 +----------- .../org/apache/openmeetings/web/room/room.js | 19 +----------- .../openmeetings/web/room/sidebar/upload.js | 19 +----------- .../openmeetings/web/room/swf-functions.js | 19 +----------- .../web/user/calendar/calendar-functions.js | 22 +------------- .../apache/openmeetings/web/user/chat/chat.js | 19 +----------- .../openmeetings/web/util/user-multi-choice.js | 20 +------------ .../main/webapp/js/openmeetings_functions.js | 31 +------------------- 11 files changed, 20 insertions(+), 196 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c452a462/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js new file mode 100644 index 0000000..85a4f8b --- /dev/null +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js @@ -0,0 +1,10 @@ +/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ +function adminPanelInit() { + if (typeof extAdminPanelInit === 'function') { + extAdminPanelInit(); + } + let f = $('#adminForm'), t = $('#adminTable') + , h = $(window).height() - 5; + f.height(h - f.position().top); + t.height(h - t.position().top); +} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c452a462/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js index 9c87baf..1e20c77 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js @@ -1,21 +1,4 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ +/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ Wicket.BrowserInfo.collectExtraInfo = function(info) { var l = window.location; info.codebase = l.origin + l.pathname; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c452a462/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js index a3226af..43b33e3 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js @@ -1,21 +1,4 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ +/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ (function(i,s,o,g,r,a,m){ i['GoogleAnalyticsObject']=r; i[r]=i[r]||function(){ http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c452a462/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js index fd8162d..7bf6281 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js @@ -1,21 +1,4 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ +/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ var Activities = function() { var closedHeight = "20px", openedHeight = "345px"; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c452a462/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js index aa81d89..8b4c25a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js @@ -1,21 +1,4 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ +/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ function setRoomSizes() { var sb = $(".room.sidebar.left") , w = $(window).width() - sb.width() - 8 http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c452a462/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/upload.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/upload.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/upload.js index 8c3688b..e6bd354 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/upload.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/upload.js @@ -1,21 +1,4 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ +/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ function bindUpload(markupId, hiddenId) { var fi = $('#' + markupId + ' .fileinput'); if (!fi.eventAdded) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c452a462/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js index 90f952e..bf30645 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js @@ -1,21 +1,4 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ +/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ var labels function initSwf(_options) { var options = $.extend({ http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c452a462/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js index 86ec265..825f4c7 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js @@ -1,24 +1,4 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -/** - * @author Sebastien Briquet - */ +/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ function getCalendarHeight() { return $(window).height() - $('#${markupId}').position().top - 20; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c452a462/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js index 0c0c417..61404a4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js @@ -1,21 +1,4 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ +/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ var Chat = function() { var chatTabs , tabTemplate = "<li><a href='#{href}'>#{label}</a></li>" http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c452a462/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/user-multi-choice.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/user-multi-choice.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/user-multi-choice.js index de43cb3..3c7cee6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/user-multi-choice.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/user-multi-choice.js @@ -1,25 +1,7 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ +/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ function formatOmUser(user) { return "<span class='user " + (user.contact ? "external" : "internal") + "' >" + user.text + "</span>"; } - function escapeOmUserMarkup(m) { return m; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c452a462/openmeetings-web/src/main/webapp/js/openmeetings_functions.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/js/openmeetings_functions.js b/openmeetings-web/src/main/webapp/js/openmeetings_functions.js index 09b3fc5..0fc5a70 100644 --- a/openmeetings-web/src/main/webapp/js/openmeetings_functions.js +++ b/openmeetings-web/src/main/webapp/js/openmeetings_functions.js @@ -1,52 +1,24 @@ -/* - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you 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. - -*/ -/* - * Functions to be included in the HTML wrapper, - * see the templates dir (*.vm) for the include statements - * - */ - +/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ function getBrowserInfo() { //alert(navigator.userAgent); document.getElementById("lzapp").getBrowserInfoCallback(navigator.userAgent); } - function getBrowserLang() { //alert(navigator.userAgent); document.getElementById("lzapp").getBrowserLangCallback(navigator.language); } - function redirectToUrl(url) { //alert(navigator.userAgent); window.location = url; document.getElementById("lzapp").redirectToUrlCallback("ok"); } - function loadingComplete() { document.getElementById("swfloading").style.display = 'none'; var lzApp = document.getElementById("lzappContainer"); lzApp.style.width = '100%'; lzApp.style.height = '100%'; } - function getTimeZoneOffsetMinutes() { var rightNow = new Date(), std_time_offset = -rightNow.getTimezoneOffset(); for (var i = 0; i < 12; ++i) { @@ -58,7 +30,6 @@ function getTimeZoneOffsetMinutes() { } return std_time_offset; } - function getTimeZoneOffset() { document.getElementById("lzapp").getTimeZoneOffsetCallback(getTimeZoneOffsetMinutes()/60); }
