dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #40395
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20477: PT intro spinner
------------------------------------------------------------
revno: 20477
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-10-02 17:16:28 +0300
message:
PT intro spinner
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/plugin.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html 2014-11-17 15:48:24 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html 2015-10-02 14:16:28 +0000
@@ -12,7 +12,10 @@
</head>
<body>
- <div id="init"></div>
+ <div id="init">
+ <div class="logotext"><span class="text-medium">DHIS2</span> PIVOT TABLES</div>
+ <div class="spinner"></div>
+ </div>
<script type="text/javascript" src="../dhis-web-commons/javascripts/ext/ext-all.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/ext-ux/layout/component/form/MultiSelect.js"></script>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/plugin.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/plugin.html 2015-09-15 22:59:55 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/plugin.html 2015-10-02 14:16:28 +0000
@@ -12,7 +12,7 @@
<script>
Ext.onReady(function() {
- var url = 'http://localhost:8080',
+ var url = 'https://apps.dhis2.org/demo',
//var url = 'https://apps.dhis2.org/demo',
username = 'admin',
password = 'district';
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-09-22 06:05:39 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-10-02 14:16:28 +0000
@@ -7967,7 +7967,6 @@
NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
if (keyUiLocale === defaultKeyUiLocale) {
- Ext.get('init').update(NS.i18n.initializing + '..');
fn();
}
else {
@@ -7980,7 +7979,6 @@
console.log('No translations found for system locale (' + keyUiLocale + ')');
},
callback: function() {
- Ext.get('init').update(NS.i18n.initializing + '..');
fn();
}
});
@@ -7991,7 +7989,6 @@
url: 'i18n/i18n_app_' + keyUiLocale + '.properties',
success: function(r) {
NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
- Ext.get('init').update(NS.i18n.initializing + '..');
},
failure: function() {
alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css 2015-08-09 19:59:57 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css 2015-10-02 14:16:28 +0000
@@ -61,8 +61,9 @@
#init {
display: table;
- margin: 200px auto;
- font-size: 15px;
+ margin: 300px auto;
+ font-size: 13px;
+ color: #444;
}
/* Scrollbar Webkit */
@@ -166,6 +167,10 @@
color: #303038;
}
+.text-medium {
+ font-weight: 600;
+}
+
.align-left {
text-align: left !important;
}
@@ -173,6 +178,44 @@
text-align: right !important;
}
+
+/*----------------------------------------------------------------------------
+ * Spinner
+ *--------------------------------------------------------------------------*/
+
+.spinner {
+ width: 20px;
+ height: 20px;
+ margin: 50px auto;
+ background-color: #aaa;
+
+ border-radius: 100%;
+ -webkit-animation: sk-scaleout 0.8s infinite ease-in-out;
+ animation: sk-scaleout 0.8s infinite ease-in-out;
+}
+
+@-webkit-keyframes sk-scaleout {
+ 0% {
+ -webkit-transform: scale(0)
+ }
+ 100% {
+ -webkit-transform: scale(1.0);
+ opacity: 0;
+ }
+}
+
+@keyframes sk-scaleout {
+ 0% {
+ -webkit-transform: scale(0);
+ transform: scale(0);
+ }
+ 100% {
+ -webkit-transform: scale(1.0);
+ transform: scale(1.0);
+ opacity: 0;
+ }
+}
+
/*----------------------------------------------------------------------------
* Pivot
*--------------------------------------------------------------------------*/
@@ -190,17 +233,17 @@
user-select: all;
}
-table.pivot.displaydensity-comfortable td {
+table.pivot.displaydensity-COMFORTABLE td {
padding: 7px;
}
-table.pivot.displaydensity-compact td {
+table.pivot.displaydensity-COMPACT td {
padding: 3px;
}
-table.pivot.fontsize-large td {
+table.pivot.fontsize-LARGE td {
font-size: 13px;
}
-table.pivot.fontsize-small td {
+table.pivot.fontsize-SMALL td {
font-size: 10px;
}
@@ -317,11 +360,11 @@
.ns-viewport-text * {
padding: 3px 10px;
- font-size: 11px;
- color: #515a62;
+ font-size: 13px;
+ color: #777;
}
.ns-viewport-text h3 {
- font-size: 14px;
+ font-size: 13px;
font-weight: 500;
color: #333;
padding: 0 0 8px 0;
