mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-24 09:26:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge branch 'dokuwiki-merge' of git://github.com/adrianlang/etherpad-lite into dokuwiki

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-12-11 18:09:51 +01:00
commit c72cd49ede
7 changed files with 378 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
static/css/pad.css
View file

@ -1068,6 +1068,10 @@ position: relative;
background-position: 2px -49px;
}
#exportdokuwiki{
background-position: 2px -144px;
}
#export a{
text-decoration: none;
}
@ -1246,4 +1250,4 @@ label[for=readonlyinput] {
#sidediv {
display:none;
}
}
}

BIN
static/img/fileicons.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before After
Before After

5
static/js/pad_impexp.js
View file

@ -234,6 +234,7 @@ var padimpexp = (function()
$("#exporthtmla").attr("href", document.location.pathname + "/export/html");
$("#exportplaina").attr("href", document.location.pathname + "/export/txt");
$("#exportwordlea").attr("href", document.location.pathname + "/export/wordle");
$("#exportdokuwikia").attr("href", document.location.pathname + "/export/dokuwiki");
//hide stuff thats not avaible if abiword is disabled
if(clientVars.abiwordAvailable == "no")
@ -241,8 +242,8 @@ var padimpexp = (function()
$("#exportworda").remove();
$("#exportpdfa").remove();
$("#exportopena").remove();
$("#importexport").css({"height":"95px"});
$("#importexportline").css({"height":"95px"});
$("#importexport").css({"height":"115px"});
$("#importexportline").css({"height":"115px"});
$("#import").html("Import is not available");
}
else if(clientVars.abiwordAvailable == "withoutPDF")

3
static/pad.html
View file

@ -204,6 +204,7 @@
<a id="exportworda" target="_blank" class="exportlink"><div class="exporttype" id="exportword">Microsoft Word</div></a>
<a id="exportpdfa" target="_blank" class="exportlink"><div class="exporttype" id="exportpdf">PDF</div></a>
<a id="exportopena" target="_blank" class="exportlink"><div class="exporttype" id="exportopen">OpenDocument</div></a>
<a id="exportdokuwikia" target="_blank" class="exportlink"><div class="exporttype" id="exportdokuwiki">DokuWiki text</div></a>
<a id="exportwordlea" target="_blank" onClick="padimpexp.export2Wordle();return false;" class="exportlink"><div class="exporttype" id="exportwordle">Wordle</div></a>
<form id="wordlepost" name="wall" action="http://wordle.net/advanced" method="POST" style="margin-left:0px;">
<div id="hidetext" style=""><textarea id="text" name="text" id="text" style="display:none;">Coming soon!</textarea></div>
@ -331,4 +332,4 @@
</form>
</body>
</html>
</html>