fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop

This commit is contained in:
johnyma22 2012-05-19 13:58:48 +01:00
parent bd30045d44 fbc2cb32b3
commit 102540f51b
4 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/static/css/pad.css
View File

@ -1167,9 +1167,6 @@ ul#colorpickerswatches li:hover {
#exportopen { #exportopen {
background-position: 0px -347px background-position: 0px -347px
} }
#exportwordle {
background-position: 0px -323px
}
#exportdokuwiki { #exportdokuwiki {
background-position: 0px -459px background-position: 0px -459px
} }
@ -1505,4 +1502,4 @@ input[type=checkbox] {
#online_count { #online_count {
line-height: 24px line-height: 24px
} }
} }

12
src/static/js/pad_impexp.js
View File

@ -217,7 +217,6 @@ var padimpexp = (function()
// build the export links // build the export links
$("#exporthtmla").attr("href", pad_root_path + "/export/html"); $("#exporthtmla").attr("href", pad_root_path + "/export/html");
$("#exportplaina").attr("href", pad_root_path + "/export/txt"); $("#exportplaina").attr("href", pad_root_path + "/export/txt");
$("#exportwordlea").attr("href", pad_root_path + "/export/wordle");
$("#exportdokuwikia").attr("href", pad_root_path + "/export/dokuwiki"); $("#exportdokuwikia").attr("href", pad_root_path + "/export/dokuwiki");
//hide stuff thats not avaible if abiword is disabled //hide stuff thats not avaible if abiword is disabled
@ -280,17 +279,6 @@ var padimpexp = (function()
$("#impexp-disabled-clickcatcher").hide(); $("#impexp-disabled-clickcatcher").hide();
$("#import").css('opacity', 1); $("#import").css('opacity', 1);
$("#impexp-export").css('opacity', 1); $("#impexp-export").css('opacity', 1);
},
export2Wordle: function()
{
var padUrl = $('#exportwordlea').attr('href').replace(/\/wordle$/, '/txt')
$.get(padUrl, function(data)
{
$('.result').html(data);
$('#text').html(data);
$('#wordlepost').submit();
});
} }
}; };
return self; return self;

1
src/templates/pad.html
View File

@ -214,7 +214,6 @@
<a id="exportpdfa" target="_blank" class="exportlink"><div class="exporttype" id="exportpdf">PDF</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="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="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>
<% e.end_block(); %> <% e.end_block(); %>
</div> </div>
</div> </div>

4
src/templates/timeslider.html
View File

@ -116,10 +116,6 @@
<a id="exportpdfa" target="_blank" class="exportlink"><div class="exporttype" id="exportpdf">PDF</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="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="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>
</form>
</div> </div>
</div> </div>