Added message translatable about features importing without abiword

settings.json.template

@@ -65,7 +65,7 @@
   "maxAge" : 21600, // 60 * 60 * 6 = 6 hours
   
   /* This is the path to the Abiword executable. Setting it to null, disables abiword.
-     Abiword is needed to enable the import/export of pads*/  
+     Abiword is needed to advanced import/export features of pads*/  
   "abiword" : null,
  
   /* This setting is used if you require authentication of all users.

src/locales/en.ini

@@ -41,6 +41,7 @@ pad.importExport.exportword = Microsoft Word
 pad.importExport.exportpdf = PDF
 pad.importExport.exportopen = ODF (Open Document Format)
 pad.importExport.exportdokuwiki = DokuWiki
+pad.importExport.abiword.innerHTML = You only can import from plain text or html formats. For more advanced import features please <a href="https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord">install abiword</a>.
 pad.modals.connected = Connected.
 pad.modals.reconnecting = Reconnecting to your pad..
 pad.modals.forcereconnect = Force reconnect
@@ -74,4 +75,4 @@ timeslider.pageTitle = {{appTitle}} Timeslider
 timeslider.toolbar.returnbutton = Return to pad
 timeslider.toolbar.authors = Authors:
 timeslider.toolbar.authorsList = No Authors
-timeslider.exportCurrent = Export current version as:
+timeslider.exportCurrent = Export current version as:

src/locales/es.ini

@@ -44,6 +44,7 @@ pad.importExport.exportword = Microsoft Word
 pad.importExport.exportpdf = PDF
 pad.importExport.exportopen = ODF (Open Document Format)
 pad.importExport.exportdokuwiki = DokuWiki
+pad.importExport.abiword.innerHTML = Sólo puede importar formatos de texto plano o html. Para funciones más avanzadas instale <a href="https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord">abiword</a>.
 pad.modals.connected = Conectado.
 pad.modals.reconnecting = Reconectando a tu pad..
 pad.modals.forcereconnect = Reconexión forzosa

src/static/css/pad.css

@@ -571,15 +571,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;

src/static/js/pad_impexp.js

@@ -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")
@@ -226,7 +229,7 @@ var padimpexp = (function()
         $("#exportpdfa").remove();
         $("#exportopena").remove();
 
-        $("#importform").attr('action', pad_root_url + "/import");
+        $("#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()

src/templates/pad.html

@@ -246,7 +246,8 @@
             <h1 data-l10n-id="pad.importExport.import_export"></h1>
             <div class="column acl-write">
                 <% e.begin_block("importColumn"); %>
-                <h2 data-l10n-id="pad.importExport.import"></h2><br>
+                <h2 data-l10n-id="pad.importExport.import"></h2>
+                <div class="importmessage" id="importmessageabiword" data-l10n-id="pad.importExport.abiword"></div><br>
                 <form id="importform" method="post" action="" target="importiframe" enctype="multipart/form-data">
                     <div class="importformdiv" id="importformfilediv">
                         <input type="file" name="file" size="15" id="importfileinput">