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

Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password

Browse source
This commit is contained in:
John McLear 2012-12-03 11:37:01 +00:00
commit bef25b40f8
9 changed files with 92 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/static/css/pad.css
View file

@ -585,15 +585,20 @@ table#otheruserstable {
#exportdokuwiki {
background-position: 0px -459px
}
#importstatusball {
display: none
/* hidden element */
#importstatusball,
#importarrow,
#importmessagesuccess,
#importmessageabiword {
display: none;
}
#importarrow {
display: none
}
#importmessagesuccess {
display: none
#importmessageabiword {
color: #900;
font-size: small;
}
#importsubmitinput {
height: 25px;
width: 85px;

11
src/static/js/pad_impexp.js
View file

@ -218,6 +218,9 @@ var padimpexp = (function()
$("#exporthtmla").attr("href", pad_root_path + "/export/html");
$("#exportplaina").attr("href", pad_root_path + "/export/txt");
$("#exportdokuwikia").attr("href", pad_root_path + "/export/dokuwiki");
// activate action to import in the form
$("#importform").attr('action', pad_root_url + "/import");
//hide stuff thats not avaible if abiword is disabled
if(clientVars.abiwordAvailable == "no")
@ -225,8 +228,8 @@ var padimpexp = (function()
$("#exportworda").remove();
$("#exportpdfa").remove();
$("#exportopena").remove();
$(".importformdiv").remove();
$("#import").html("Import is not available. To enable import please install abiword");
$("#importmessageabiword").show();
}
else if(clientVars.abiwordAvailable == "withoutPDF")
{
@ -237,16 +240,12 @@ var padimpexp = (function()
$("#importexport").css({"height":"142px"});
$("#importexportline").css({"height":"142px"});
$("#importform").attr('action', pad_root_url + "/import");
}
else
{
$("#exportworda").attr("href", pad_root_path + "/export/doc");
$("#exportpdfa").attr("href", pad_root_path + "/export/pdf");
$("#exportopena").attr("href", pad_root_path + "/export/odt");
$("#importform").attr('action', pad_root_path + "/import");
}
$("#impexp-close").click(function()