mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-05 06:37:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge b835952e15 into 9b4cffb696

Browse source
This commit is contained in:
GitHub Merge Button 2011-09-14 03:29:10 -07:00
commit f890133871
7 changed files with 376 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
static/css/pad.css
View file

@ -1066,6 +1066,10 @@ position: relative;
background-position: 2px -49px;
}
#exportdokuwiki{
background-position: 2px -144px;
}
#export a{
text-decoration: 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(translate("Import is not available"));
}
else if(clientVars.abiwordAvailable == "withoutPDF")

1
static/pad.html
View file

@ -209,6 +209,7 @@
<span id="exporttext" class="translate">Export current pad as:</span>
<a id="exporthtmla" target="_blank" class="exportlink"><div class="exporttype translate" id="exporthtml">HTML</div></a>
<a id="exportplaina" target="_blank" class="exportlink"><div class="exporttype translate" id="exportplain">Plain text</div></a>
<a id="exportdokuwikia" target="_blank" class="exportlink"><div class="exporttype translate" id="exportdokuwiki">DokuWiki text</div></a>
<a id="exportworda" target="_blank" class="exportlink"><div class="exporttype translate" id="exportword">Microsoft Word</div></a>
<a id="exportpdfa" target="_blank" class="exportlink"><div class="exporttype translate" id="exportpdf">PDF</div></a>
<a id="exportopena" target="_blank" class="exportlink"><div class="exporttype translate" id="exportopen">OpenDocument</div></a>