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

Merge branch 'fontawesome' into soon

Browse Source
This commit is contained in:
yflory
2016-09-29 14:52:48 +02:00
parent 921ee128bc f03018f3bc
commit bc73fa2074
18 changed files with 72 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
customize.dist/DecorateToolbar.js
View File

@@ -9,21 +9,12 @@ define([
var $ = window.jQuery;
var main = function () {
var url = window.location.pathname;
var isHtml = /\.html/.test(url) || url === '/';
var isHtml = /\.html/.test(url) || url === '/' || url === '';
$.ajax({
url: isHtml ? '/customize/BottomBar.html' : '/customize/Header.html',
success: function (ret) {
$('iframe').height('96%');
if (isHtml) {
$('body').append(ret);
}
else {
$('body').prepend(ret);
}
$('head').append($('<link>', {
rel: 'stylesheet',
href: '/customize/main.css'
}));
$('body').append(ret);
LS.main();
Messages._applyTranslation();
}

9
customize.dist/Header.html
View File

@@ -8,15 +8,14 @@
<option value="fr">Français</option>
</select>
</span>
<p data-localization="bottom_france">
<p data-localization="header_france">
</p>
</div>
<!--
<div class="bottom-bar-center">
<p><a href="https://github.com/xwiki-labs/cryptpad">Fork me on GitHub</a></p>
</div> -->
<p><a id="cryptpad-logo" href="/" data-localization-title="header_logoTitle">CryptPad</a></p>
</div>
<div class="bottom-bar-right">
<p data-localization="bottom_support">
<p data-localization="header_support">
</p>
</div>
</div>

BIN
customize.dist/logo-xwiki.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 780 B

9
customize.dist/main.css
View File

@@ -230,7 +230,6 @@ tbody td:last-child {
font-family: Arial, Helvetica, Tahoma, Verdana, sans-serif;
font-size: 20px;
display: block;
float: right;
margin-left: 10px;
padding-top: 3px;
color: #fafafa;
@@ -253,15 +252,19 @@ tbody td:last-child {
float: left;
padding-left: 10px;
}
.bottom-bar-left p {
float: right;
}
.bottom-bar-right {
display: block;
float: right;
padding-right: 20px;
}
.bottom-bar-center {
margin-left: auto;
margin-right: auto;
width: 20%;
position: absolute;
left: 40%;
text-align: center;
}
.bottom-bar-heart {
top: 2px;

11
customize.dist/src/cryptpad.less
View File

@@ -267,7 +267,6 @@ tbody {
font-size: 20px;
display:block;
float:right;
margin-left: 10px;
padding-top:3px;
color: @fore;
@@ -291,15 +290,19 @@ tbody {
float:left;
padding-left:10px;
}
.bottom-bar-left p {
float: right;
}
.bottom-bar-right {
display:block;
float:right;
padding-right:20px
}
.bottom-bar-center {
margin-left: auto;
margin-right: auto;
width: 20%
width: 20%;
position: absolute;
left: 40%;
text-align: center;
}
.bottom-bar-heart {
top: 2px;

6
customize.dist/src/toolbar.less
View File

@@ -16,7 +16,7 @@
color: #666;
font-weight: bold;
height: 26px;
height: 30px;
margin-bottom: -3px;
display: inline-block;
width: 100%;
@@ -27,7 +27,7 @@
}
div {
padding: 0 10px;
padding: 0 3px;
height: 1.5em;
line-height: 25px;
height: 100%;
@@ -40,7 +40,7 @@
}
button {
height: 100%;
height: 26px;
background-color: inherit;
background-image: linear-gradient(to bottom,#fff,#e4e4e4);
border: 1px solid #A6A6A6;

6
customize.dist/toolbar.css
View File

@@ -16,7 +16,7 @@
user-select: none;
color: #666;
font-weight: bold;
height: 26px;
height: 30px;
margin-bottom: -3px;
display: inline-block;
width: 100%;
@@ -26,7 +26,7 @@
float: right;
}
.cryptpad-toolbar div {
padding: 0 10px;
padding: 0 3px;
height: 1.5em;
line-height: 25px;
height: 100%;
@@ -38,7 +38,7 @@
color: #000;
}
.cryptpad-toolbar button {
height: 100%;
height: 26px;
background-color: inherit;
background-image: linear-gradient(to bottom, #fff, #e4e4e4);
border: 1px solid #A6A6A6;

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

@@ -33,6 +33,10 @@ define(function () {
out.viewers = '{0} lecteurs';
out.anonymous = "Vous êtes actuellement anonyme";
out.greenLight = "Tout fonctionne bien";
out.orangeLight = "Votre connexion est lente, ce qui réduit la qualité de l'éditeur"
out.redLight = "Vous êtes déconnectés de la session";
out.importButton = 'IMPORTER';
out.importButtonTitle = 'Importer un document depuis un fichier local';
@@ -183,5 +187,11 @@ define(function () {
out.bottom_france = '<a href="http://www.xwiki.com/fr" target="_blank" rel="noopener noreferrer">Fait avec <img class="bottom-bar-heart" src="/customize/heart.png" /> en <img class="bottom-bar-fr" src="/customize/fr.png" /></a>';
out.bottom_support = '<a href="http://labs.xwiki.com/" title="XWiki Labs" target="_blank" rel="noopener noreferrer">Un projet <img src="/customize/logo-xwiki2.png" alt="XWiki SAS" class="bottom-bar-xwiki"/> Labs</a> avec le soutien de <a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
// Header.html
out.header_france = '<a href="http://www.xwiki.com/fr" target="_blank" rel="noopener noreferrer">Fait avec <img class="bottom-bar-heart" src="/customize/heart.png" /> en <img class="bottom-bar-fr" title="France" alt="France" src="/customize/fr.png" /> par <img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>';
out.header_support = '<a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
out.header_logoTitle = "Aller vers la page d'accueil";
return out;
});

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

@@ -33,6 +33,10 @@ define(function () {
out.viewers = '{0} viewers';
out.anonymous = "You are currently anonymous";
out.greenLight = "Everything is working fine";
out.orangeLight = "Your slow connection may impact your experience";
out.redLight = "You are disconnected from the session";
out.importButton = 'IMPORT';
out.importButtonTitle = 'Import a document from a local file';
@@ -183,5 +187,11 @@ define(function () {
out.bottom_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">Made with <img class="bottom-bar-heart" src="/customize/heart.png" /> in <img class="bottom-bar-fr" src="/customize/fr.png" /></a>';
out.bottom_support = '<a href="http://labs.xwiki.com/" title="XWiki Labs" target="_blank" rel="noopener noreferrer">An <img src="/customize/logo-xwiki2.png" alt="XWiki SAS" class="bottom-bar-xwiki"/> Labs Project </a> with the support of <a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
// Header.html
out.header_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">With <img class="bottom-bar-heart" src="/customize/heart.png" /> from <img class="bottom-bar-fr" src="/customize/fr.png" title="France" alt="France"/> by <img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>';
out.header_support = '<a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
out.header_logoTitle = 'Go to the main page';
return out;
});