web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix UI issues in the loading screen with the loading bar

Browse Source
This commit is contained in:
yflory
2018-05-14 14:02:46 +02:00
parent 4d5606e757
commit 6fde15247b
6 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
customize.dist/loading.js
View File

@@ -69,8 +69,9 @@ define([], function () {
height: auto; height: auto;
margin-bottom: 2em; margin-bottom: 2em;
} }
@media screen and (max-height: 450px) { @media screen and (max-height: 500px) {
#cp-loading .cp-loading-cryptofist { #cp-loading .cp-loading-logo {
display: none;
} }
} }
#cp-loading-message { #cp-loading-message {
@@ -162,12 +163,12 @@ define([], function () {
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.cp-loading-progress-bar { .cp-loading-progress-bar {
height: 5px; height: 24px;
background: white; background: white;
} }
.cp-loading-progress-bar-value { .cp-loading-progress-bar-value {
height: 100%; height: 100%;
background: #00ff37; background: #5cb85c;
} }
*/}).toString().slice(14, -3); */}).toString().slice(14, -3);
var urlArgs = window.location.href.replace(/^.*\?([^\?]*)$/, function (all, x) { return x; }); var urlArgs = window.location.href.replace(/^.*\?([^\?]*)$/, function (all, x) { return x; });

2
customize.dist/src/less2/include/framework.less
View File

@@ -25,6 +25,7 @@
@warn-color: @warn-color, @warn-color: @warn-color,
@color: @color @color: @color
); );
font: @colortheme_app-font;
} }
.framework_min_main( .framework_min_main(
@@ -42,6 +43,7 @@
.tippy_main(); .tippy_main();
.checkmark_main(20px); .checkmark_main(20px);
.password_main(); .password_main();
font: @colortheme_app-font;
} }

6
customize.dist/translations/messages.fr.js
View File

@@ -1123,9 +1123,9 @@ define(function () {
// Loading info // Loading info
out.loading_pad_1 = "Initialisation du pad"; out.loading_pad_1 = "Initialisation du pad";
out.loading_pad_2 = "Chargement du contenu du pad"; out.loading_pad_2 = "Chargement du contenu du pad";
out.loading_drive_1 = "Préparation des données de l'utilisateur"; out.loading_drive_1 = "Chargement des données";
out.loading_drive_2 = "Mise à jour des données de l'utilisateur"; out.loading_drive_2 = "Mise à jour du format des données";
out.loading_drive_3 = "Vérification des données de l'utilisateur"; out.loading_drive_3 = "Vérification de l'intégrité des données";
return out; return out;
}); });

6
customize.dist/translations/messages.js
View File

@@ -1169,9 +1169,9 @@ define(function () {
// Loading info // Loading info
out.loading_pad_1 = "Initializing pad"; out.loading_pad_1 = "Initializing pad";
out.loading_pad_2 = "Loading pad content"; out.loading_pad_2 = "Loading pad content";
out.loading_drive_1 = "Preparing user data"; out.loading_drive_1 = "Loading data";
out.loading_drive_2 = "Upgrading user data to the latest version"; out.loading_drive_2 = "Updating data format";
out.loading_drive_3 = "Checking user data integrity"; out.loading_drive_3 = "Verifying data integrity";
return out; return out;
}); });

4
www/common/common-interface.js
View File

@@ -603,13 +603,13 @@ define([
$loading.css('display', ''); $loading.css('display', '');
$loading.removeClass('cp-loading-hidden'); $loading.removeClass('cp-loading-hidden');
$('.cp-loading-spinner-container').show(); $('.cp-loading-spinner-container').show();
if (config.progress && !$loading.find('.cp-loading-progress').length) { if (!config.noProgress && !$loading.find('.cp-loading-progress').length) {
var progress = h('div.cp-loading-progress', [ var progress = h('div.cp-loading-progress', [
h('p.cp-loading-progress-drive'), h('p.cp-loading-progress-drive'),
h('p.cp-loading-progress-pad') h('p.cp-loading-progress-pad')
]); ]);
$loading.find('.cp-loading-container').append(progress); $loading.find('.cp-loading-container').append(progress);
} else if (!config.progress) { } else if (config.noProgress) {
$loading.find('.cp-loading-progress').remove(); $loading.find('.cp-loading-progress').remove();
} }
if (loadingText) { if (loadingText) {

12
www/common/sframe-app-framework.js
View File

@@ -279,7 +279,7 @@ define([
var newContentStr = cpNfInner.chainpad.getUserDoc(); var newContentStr = cpNfInner.chainpad.getUserDoc();
if (state === STATE.DELETED) { return; } if (state === STATE.DELETED) { return; }
UI.updateLoadingProgress({ state: -1 }, false); //UI.updateLoadingProgress({ state: -1 }, false);
var newPad = false; var newPad = false;
if (newContentStr === '') { newPad = true; } if (newContentStr === '') { newPad = true; }
@@ -431,11 +431,11 @@ define([
}; };
nThen(function (waitFor) { nThen(function (waitFor) {
UI.addLoadingScreen({progress: true}); UI.addLoadingScreen();
SFCommon.create(waitFor(function (c) { common = c; })); SFCommon.create(waitFor(function (c) { common = c; }));
UI.updateLoadingProgress({ /*UI.updateLoadingProgress({
state: 1 state: 1
}, false); }, false);*/
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
common.getSframeChannel().onReady(waitFor()); common.getSframeChannel().onReady(waitFor());
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
@@ -462,9 +462,9 @@ define([
onRemote: onRemote, onRemote: onRemote,
onLocal: onLocal, onLocal: onLocal,
onInit: function () { onInit: function () {
UI.updateLoadingProgress({ /*UI.updateLoadingProgress({
state: 2 state: 2
}, false); }, false);*/
stateChange(STATE.INITIALIZING); stateChange(STATE.INITIALIZING);
}, },
onReady: function () { evStart.reg(onReady); }, onReady: function () { evStart.reg(onReady); },