Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
ansuz
2016-12-20 11:23:54 +01:00
10 changed files with 61 additions and 31 deletions

View File

@@ -150,6 +150,12 @@ p, pre, td, a, table, tr {
padding-bottom: 1em;
}
#fileManagerIframe {
width: 100%;
height: 500px;
margin-top: 15px;
}
/* buttons */
.create, .action {
@thick: 2px;

View File

@@ -25,9 +25,9 @@
<strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.
</p>
</noscript>
<h5 id="tryit" data-localization="tryIt"></h5>
<h5 id="tryit" data-localization="tryIt"></h5> (<a href="/file" target="_blank" data-localization="main_openFileManager">Open in a new tab</a>)
<table class="recent scroll" style="display:none">
<!--<table class="recent scroll" style="display:none">
<tbody>
<tr>
@@ -39,7 +39,8 @@
</tr>
</tbody>
</table>
</table>-->
<iframe src="/file/#iframe" id="fileManagerIframe" style="display: none;"></iframe>
<div id="buttons" class="buttons">
<a id="create-pad" class="button create" href="/pad/" data-localization="button_newpad"></a>