Author: [email protected]
Date: Mon Jan 9 15:49:02 2012
New Revision: 1897
Log:
[AMDATUOPENSOCIAL-177] Added loading icon and fixed margins
Added:
trunk/amdatu-opensocial/opensocial-shindig/src/main/resources/static/images/loading.gif
(contents, props changed)
Modified:
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/css/dashboard.css
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/css/dashboardui.css
trunk/amdatu-opensocial/opensocial-shindig/src/main/resources/features/shindig.container/shindig-container.js
Modified:
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/css/dashboard.css
==============================================================================
---
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/css/dashboard.css
(original)
+++
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/css/dashboard.css
Mon Jan 9 15:49:02 2012
@@ -1,78 +1,79 @@
#container
{
- width: 100%;
- margin: 10px auto;
- background-color: #fff;
- color: #333;
- border: 1px solid gray;
- line-height: 130%;
+ width: 100%;
+ margin: 10px auto;
+ background-color: #fff;
+ color: #333;
+ border: 1px solid gray;
+ line-height: 130%;
}
#top
{
- padding: .5em;
- background-color: #ddd;
- border-bottom: 1px solid gray;
+ padding: .5em;
+ background-color: #ddd;
+ border-bottom: 1px solid gray;
}
#top h1
{
- padding: 0;
- margin: 0;
+ padding: 0;
+ margin: 0;
}
#leftnav
{
- float: left;
- width: 225px;
- margin: 0;
- padding: 1em;
- border-right: 1px solid gray;
+ float: left;
+ width: 225px;
+ margin: 0;
+ padding: 1em;
+ border-right: 1px solid gray;
}
#content
{
- float: left;
- padding: 1em;
- max-width: 50em;
- height: 100%;
+ float: left;
+ padding: 1em;
+ max-width: 50em;
+ height: 100%;
}
#footer
{
- clear: both;
- margin: 0;
- padding: .5em;
- color: #333;
- background-color: #ddd;
- border-top: 1px solid gray;
+ clear: both;
+ margin: 0;
+ padding: .5em;
+ color: #333;
+ background-color: #ddd;
+ border-top: 1px solid gray;
}
#leftnav p { margin: 0 0 1em 0; }
#content h2 { margin: 0 0 .5em 0; }
body {
- font-size: 12px;
+ font-size: 12px;
+ height: 98%;
}
p {
- font-family: arial, sans-serif;
- font-size: 12px;
+ font-family: arial, sans-serif;
+ font-size: 12px;
}
table th {
- font-family: arial, sans-serif;
- font-size: 12px;
- font-style:bold;
- halign: left;
+ font-family: arial, sans-serif;
+ font-size: 12px;
+ font-style:bold;
+ halign: left;
}
table td {
- font-family: arial, sans-serif;
- font-size: 12px;
+ font-family: arial, sans-serif;
+ font-size: 12px;
}
ul li {
- font-family: arial, sans-serif;
- font-size: 13px;
+ font-family: arial, sans-serif;
+ font-size: 13px;
}
\ No newline at end of file
Modified:
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/css/dashboardui.css
==============================================================================
---
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/css/dashboardui.css
(original)
+++
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/css/dashboardui.css
Mon Jan 9 15:49:02 2012
@@ -36,13 +36,13 @@
float:right;
}
.widgetheader {
- padding:2px 2px 5px 5px;
+ padding:2px 2px 2px 2px;
}
.ui-icon {
float:left;
}
.widgetcontent {
- padding:2px 2px 5px 5px;
+ padding:2px 2px 2px 2px;
}
.widget {
margin-bottom:10px;
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/resources/features/shindig.container/shindig-container.js
==============================================================================
---
trunk/amdatu-opensocial/opensocial-shindig/src/main/resources/features/shindig.container/shindig-container.js
(original)
+++
trunk/amdatu-opensocial/opensocial-shindig/src/main/resources/features/shindig.container/shindig-container.js
Mon Jan 9 15:49:02 2012
@@ -814,13 +814,25 @@
var iframeId = this.getIframeId();
gadgets.rpc.setRelayUrl(iframeId, this.serverBase_ + this.rpcRelay);
gadgets.rpc.setAuthToken(iframeId, this.rpcToken);
+
+ // This onload function hides the 'loading' icon and displays the iframe,
when loaded
+ var onload = "var iframe=document.getElementById('" + iframeId + "');" +
+ "iframe.style.visibility='';" +
+ "iframe.style.display='';" +
+ "var loading=document.getElementById('loading');" +
+ "loading.style.visibility='hidden';" +
+ "loading.style.display='none';";
+
continuation('<div class="' + this.cssClassGadgetContent + '"><iframe
id="' +
iframeId + '" name="' + iframeId + '" class="' + this.cssClassGadget +
+ '" style="visibility:hidden;display:none"' +
'" src="about:blank' +
- '" frameborder="no" scrolling="no"' +
+ '" frameborder="no" scrolling="auto"' +
(this.height ? ' height="' + this.height + '"' : '') +
(this.width ? ' width="' + this.width + '"' : '') +
- '></iframe></div>');
+ ' onload="' + onload + '"></iframe>' +
+ '<div id="loading" width="100%" align="center" class="loading">' +
+ '<img
src="/gadgets/static/images/loading.gif"/><p>Loading...</p></div></div>');
},
finishRender: function(chrome) {
Added:
trunk/amdatu-opensocial/opensocial-shindig/src/main/resources/static/images/loading.gif
==============================================================================
Binary file. No diff available.
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
