Author: solomax
Date: Wed Jan 25 04:32:55 2017
New Revision: 1780136
URL: http://svn.apache.org/viewvc?rev=1780136&view=rev
Log:
[OPENMEETINGS-1542] busy status is improved
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme-rtl.css
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/images/ajax-loader.gif
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme-rtl.css
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
openmeetings/application/trunk/openmeetings-web/src/main/webapp/images/ajax-loader.gif
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html?rev=1780136&r1=1780135&r2=1780136&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
Wed Jan 25 04:32:55 2017
@@ -22,10 +22,10 @@
<wicket:head>
<script type="text/javascript">
function showBusyIndicator() {
- $('#busy_indicator').show();
+ $('#busy-indicator').show();
}
function hideBusyIndicator() {
- $('#busy_indicator').hide();
+ $('#busy-indicator').hide();
}
</script>
</wicket:head>
@@ -49,7 +49,7 @@
id="reportBug"><a target="_blank"
href="https://issues.apache.org/jira/browse/OPENMEETINGS";><wicket:message
key="284"/></a></span><span><a
wicket:id="about"><wicket:message
key="1549"/></a></span>
</div>
- <div id="busy_indicator"
class="ui-widget-header"><span><wicket:message key="1554"/></span></div>
+ <div id="busy-indicator"></div>
<div wicket:id="menu"></div>
</div>
<div wicket:id="dev" id="devMenu"/>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html?rev=1780136&r1=1780135&r2=1780136&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
Wed Jan 25 04:32:55 2017
@@ -9,7 +9,7 @@
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
@@ -22,10 +22,10 @@
<wicket:head>
<script type="text/javascript">
function showBusyIndicator() {
- $('#busy_indicator').show();
+ $('#busy-indicator').show();
}
function hideBusyIndicator() {
- $('#busy_indicator').hide();
+ $('#busy-indicator').hide();
}
</script>
</wicket:head>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html?rev=1780136&r1=1780135&r2=1780136&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
Wed Jan 25 04:32:55 2017
@@ -20,6 +20,7 @@
-->
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
+ <div id="busy-indicator"></div>
<div class="tabs" wicket:id="tabs"></div>
<wicket:fragment wicket:id="user-panel">
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css?rev=1780136&r1=1780135&r2=1780136&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
Wed Jan 25 04:32:55 2017
@@ -16,6 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
+.room.sidebar #busy-indicator {
+ margin: 8px;
+}
.room.container {
width: 100%;
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme-rtl.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme-rtl.css?rev=1780136&r1=1780135&r2=1780136&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme-rtl.css
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme-rtl.css
Wed Jan 25 04:32:55 2017
@@ -34,7 +34,7 @@
#topLinks span:last-child {
border-left: none;
}
-#busy_indicator {
+#busy-indicator {
right: initial !important;
left: 0 !important;
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css?rev=1780136&r1=1780135&r2=1780136&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css
Wed Jan 25 04:32:55 2017
@@ -47,29 +47,18 @@ html, body {
#topLinks span:last-child {
border-right: none;
}
-#busy_indicator {
+#busy-indicator {
display: none;
z-index: 1000;
- width: 200px;
- font-weight: bold;
- text-align: center;
- font-size: 1em;
- color: #FF0000;
+ width: 30px;
height: 30px;
border: 0;
position: absolute;
right: 0;
margin: 2px;
-}
-#busy_indicator span {
- vertical-align: sub;
- padding-left: 25px;
- line-height: 22px;
background-image: url(../images/ajax-loader.gif);
background-repeat: no-repeat;
- background-size: 20px 20px;
- height: 20px;
- display: inline-block;
+ background-size: 28px 28px;
}
.clickable {
cursor: pointer;
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/images/ajax-loader.gif
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/images/ajax-loader.gif?rev=1780136&r1=1780135&r2=1780136&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html?rev=1780136&r1=1780135&r2=1780136&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
Wed Jan 25 04:32:55 2017
@@ -22,10 +22,10 @@
<wicket:head>
<script type="text/javascript">
function showBusyIndicator() {
- $('#busy_indicator').show();
+ $('#busy-indicator').show();
}
function hideBusyIndicator() {
- $('#busy_indicator').hide();
+ $('#busy-indicator').hide();
}
</script>
</wicket:head>
@@ -49,7 +49,7 @@
id="reportBug"><a target="_blank"
href="https://issues.apache.org/jira/browse/OPENMEETINGS";><wicket:message
key="284"/></a></span><span><a
wicket:id="about"><wicket:message
key="1549"/></a></span>
</div>
- <div id="busy_indicator"
class="ui-widget-header"><span><wicket:message key="1554"/></span></div>
+ <div id="busy-indicator"></div>
<div wicket:id="menu"></div>
</div>
<div wicket:id="dev" id="devMenu"/>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html?rev=1780136&r1=1780135&r2=1780136&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
Wed Jan 25 04:32:55 2017
@@ -9,7 +9,7 @@
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
@@ -22,10 +22,10 @@
<wicket:head>
<script type="text/javascript">
function showBusyIndicator() {
- $('#busy_indicator').show();
+ $('#busy-indicator').show();
}
function hideBusyIndicator() {
- $('#busy_indicator').hide();
+ $('#busy-indicator').hide();
}
</script>
</wicket:head>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html?rev=1780136&r1=1780135&r2=1780136&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
Wed Jan 25 04:32:55 2017
@@ -20,6 +20,7 @@
-->
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
+ <div id="busy-indicator"></div>
<div class="tabs" wicket:id="tabs"></div>
<wicket:fragment wicket:id="user-panel">
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css?rev=1780136&r1=1780135&r2=1780136&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
Wed Jan 25 04:32:55 2017
@@ -16,6 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
+.room.sidebar #busy-indicator {
+ margin: 8px;
+}
.room.container {
width: 100%;
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme-rtl.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme-rtl.css?rev=1780136&r1=1780135&r2=1780136&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme-rtl.css
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme-rtl.css
Wed Jan 25 04:32:55 2017
@@ -34,7 +34,7 @@
#topLinks span:last-child {
border-left: none;
}
-#busy_indicator {
+#busy-indicator {
right: initial !important;
left: 0 !important;
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css?rev=1780136&r1=1780135&r2=1780136&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
Wed Jan 25 04:32:55 2017
@@ -47,29 +47,18 @@ html, body {
#topLinks span:last-child {
border-right: none;
}
-#busy_indicator {
+#busy-indicator {
display: none;
z-index: 1000;
- width: 200px;
- font-weight: bold;
- text-align: center;
- font-size: 1em;
- color: #FF0000;
+ width: 30px;
height: 30px;
border: 0;
position: absolute;
right: 0;
margin: 2px;
-}
-#busy_indicator span {
- vertical-align: sub;
- padding-left: 25px;
- line-height: 22px;
background-image: url(../images/ajax-loader.gif);
background-repeat: no-repeat;
- background-size: 20px 20px;
- height: 20px;
- display: inline-block;
+ background-size: 28px 28px;
}
.clickable {
cursor: pointer;
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/images/ajax-loader.gif
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/images/ajax-loader.gif?rev=1780136&r1=1780135&r2=1780136&view=diff
==============================================================================
Binary files - no diff available.
