Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
commit
85b49d5ec8
|
@ -73,14 +73,7 @@
|
|||
<div id="data">
|
||||
<p class="left" data-localization="main_p1"><!-- Zero Knowledge collaborative realtime editor. Protected from the NSA. --></p>
|
||||
|
||||
<div id="buttons" class="buttons">
|
||||
<!--<button class="btn btn-secondary knowmore">Know more</button>-->
|
||||
<!--<button class="btn btn-secondary tryit">Discover our tools</button>-->
|
||||
<!--<br>-->
|
||||
<button class="btn btn-secondary nologin" data-localization="login_nologin"></button>
|
||||
<!--<button class="btn btn-success nologin">Make a pad right now</button>-->
|
||||
<!--<p class="buttons"></p>-->
|
||||
</div>
|
||||
<div id="buttons" class="buttons"><button class="btn btn-secondary nologin" data-localization="login_nologin"></button></div>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
@ -836,7 +836,7 @@ html.cp,
|
|||
}
|
||||
.cp #main #userForm button.half,
|
||||
.cp #main_other #userForm button.half {
|
||||
width: calc(50% - 4px);
|
||||
width: calc(50% - 2px);
|
||||
}
|
||||
.cp #main #userForm button.half:not(.first),
|
||||
.cp #main_other #userForm button.half:not(.first) {
|
||||
|
@ -894,6 +894,10 @@ html.cp,
|
|||
cursor: pointer;
|
||||
margin-top: 10px;
|
||||
}
|
||||
.cp p.buttons .dropdown-bar,
|
||||
.cp div.buttons .dropdown-bar {
|
||||
margin-left: 4px;
|
||||
}
|
||||
.cp #fileManagerIframe {
|
||||
width: 100%;
|
||||
height: 500px;
|
||||
|
|
|
@ -6,14 +6,7 @@
|
|||
<div id="data">
|
||||
<p class="left" data-localization="main_p1"><!-- Zero Knowledge collaborative realtime editor. Protected from the NSA. --></p>
|
||||
|
||||
<div id="buttons" class="buttons">
|
||||
<!--<button class="btn btn-secondary knowmore">Know more</button>-->
|
||||
<!--<button class="btn btn-secondary tryit">Discover our tools</button>-->
|
||||
<!--<br>-->
|
||||
<button class="btn btn-secondary nologin" data-localization="login_nologin"></button>
|
||||
<!--<button class="btn btn-success nologin">Make a pad right now</button>-->
|
||||
<!--<p class="buttons"></p>-->
|
||||
</div>
|
||||
<div id="buttons" class="buttons"><button class="btn btn-secondary nologin" data-localization="login_nologin"></button></div>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
@ -402,7 +402,7 @@ body.html {
|
|||
margin: 2px 0px;
|
||||
cursor: pointer;
|
||||
&.half {
|
||||
width: ~"calc(50% - 4px)";
|
||||
width: ~"calc(50% - 2px)";
|
||||
&:not(.first) {
|
||||
float: right;
|
||||
}
|
||||
|
@ -451,6 +451,9 @@ p.buttons, div.buttons {
|
|||
cursor: pointer;
|
||||
margin-top: 10px;
|
||||
}
|
||||
.dropdown-bar {
|
||||
margin-left: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
#fileManagerIframe {
|
||||
|
|
|
@ -20,7 +20,7 @@ define(function () {
|
|||
'ou vous pouvez revoir votre travail en fermant cette boîte de dialogue.',
|
||||
].join('');
|
||||
|
||||
out.common_connectionLost = 'Connexion au serveur perdue';
|
||||
out.common_connectionLost = "<b>Connexion au serveur perdue</b><br>Vous êtes désormais en mode lecture seule jusqu'au retour de la connexion.";
|
||||
out.websocketError = 'Impossible de se connecter au serveur WebSocket...';
|
||||
|
||||
out.loading = "Chargement...";
|
||||
|
|
|
@ -3,6 +3,7 @@ define(function () {
|
|||
|
||||
// translations must set this key for their language to be available in
|
||||
// the language dropdowns that are shown throughout Cryptpad's interface
|
||||
// NOTE: translate that name in your language ("Français" and not "French")
|
||||
out._languageName = 'English';
|
||||
|
||||
out.main_title = "Cryptpad: Zero Knowledge, Collaborative Real Time Editing";
|
||||
|
@ -20,7 +21,11 @@ define(function () {
|
|||
'by clicking outside of this box.'
|
||||
].join('');
|
||||
|
||||
out.common_connectionLost = 'Server Connection Lost';
|
||||
// NOTE: We want to update the 'common_connectionLost' key.
|
||||
// Please do not add a new 'updated_common_connectionLostAndInfo' but change directly the value of 'common_connectionLost'
|
||||
out.updated_common_connectionLostAndInfo = "<b>Server Connection Lost</b><br>You're now in read-only mode until the connection is back.";
|
||||
out.common_connectionLost = out.updated_common_connectionLostAndInfo;
|
||||
|
||||
out.websocketError = 'Unable to connect to the websocket server...';
|
||||
|
||||
out.loading = "Loading...";
|
||||
|
|
|
@ -202,7 +202,7 @@ span.fa-folder-open {
|
|||
float: right;
|
||||
}
|
||||
#content li:not(.header) *:not(input) {
|
||||
pointer-events: none;
|
||||
/*pointer-events: none;*/
|
||||
}
|
||||
#content li:not(.header):hover .name {
|
||||
text-decoration: underline;
|
||||
|
|
|
@ -244,7 +244,7 @@ span {
|
|||
li {
|
||||
&:not(.header) {
|
||||
*:not(input) {
|
||||
pointer-events: none;
|
||||
/*pointer-events: none;*/
|
||||
}
|
||||
&:hover {
|
||||
.name {
|
||||
|
|
|
@ -300,10 +300,10 @@ define([
|
|||
});
|
||||
$input.on('keyup', function (e) {
|
||||
if (e.which === 13) {
|
||||
removeInput();
|
||||
filesOp.renameElement(path, $input.val(), function () {
|
||||
refresh();
|
||||
});
|
||||
removeInput();
|
||||
}
|
||||
});
|
||||
//$element.parent().append($input);
|
||||
|
|
Loading…
Reference in New Issue