import without cron

7 files changed, 36 insertions, 29 deletions

diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index a13af0c8..fc7890ec 100644..100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -105,37 +105,20 @@
             {% endif %}
 
             <h2>{% trans "Import" %}</h2>
-            <p>{% trans "Importing from other services can be quite long, and webservers default configuration often prevents long scripts execution time, so it must be done in multiple parts." %}</p>
-            <p>1. {% trans "First, select the export file on your computer and upload it." %}</p>
-            <form method="post" action="?uploadfile" name="uploadfile" enctype="multipart/form-data">
+            <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
+            <p>{% trans "Please select export file on your computer:" %}</p>
+            <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
                 <fieldset class="w500p">
                     <div class="row">
                         <label class="col w150p" for="file">{% trans "File:" %}</label>
                         <input class="col" type="file" id="file" name="file" tabindex="4">
                     </div>
                     <div class="row mts txtcenter">
-                        <button class="bouton" type="submit" tabindex="4">{% trans "Upload" %}</button>
+                        <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
                     </div>
                 </fieldset>
-                <input type="hidden" name="MAX_FILE_SIZE" value="1048576">
-                <input type="hidden" name="returnurl" value="{{ referer }}">
             </form>
-            <p>2. {% trans "Then, click on the right link below." %}</p>
-            <ul>
-                <li><a href="./?import&amp;from=pocket">{% trans "Import from Pocket" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('POCKET_FILE')) }}</li>
-                <li><a href="./?import&amp;from=readability">{% trans "Import from Readability" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('READABILITY_FILE')) }}</li>
-                <li><a href="./?import&amp;from=instapaper">{% trans "Import from Instapaper" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('INSTAPAPER_FILE')) }}</li>
-                <li><a href="./?import&amp;from=poche">{% trans "Import from wallabag" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('POCHE_FILE')) }}</li>
-            </ul>
-
-            {% if token == '' %}
-                <p>{% trans "3. Your feed token is currently empty and must first be generated to fetch content. Click <a href='?feed&amp;action=generate'>here to generate it</a>." %}</p>
-            {% else %}
-            <p>3. {% trans "Finally, you have to fetch content for imported items." %} <a href="cron.php?limit=10&amp;user-id={{ user_id }}&amp;token={{token}}" target="_blank">{% trans "Click here" %}</a> {% trans "to fetch content for 10 articles" %}.</p>
-            <p>{% trans "If you have console access to your server, you can also create a cron task:" %}</p>
-            <pre><code>0 */4 * * *  cd /path/to/wallabag && php cron.php --limit=10 --user-id={{user_id}} --token={{token}} >/dev/null 2>&1</code></pre>
-            {% endif %}
-
+            
             <h2>{% trans "Export your wallabag data" %}</h2>
             {% if constant('STORAGE') == 'sqlite' %}
             <p><a href="?download" target="_blank">{% trans "Click here" %}</a> {% trans "to download your database." %}</p>{% endif %}
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 6e328ba1..9a45544b 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -777,7 +777,7 @@ margin-top:1em;
   }
 
 .warning {
-  font-size: 3em;
+  /* font-size: 3em;
   color: #999;
   font-style: italic;
   position: absolute;
@@ -786,7 +786,10 @@ margin-top:1em;
   width: 100%;
   text-align: center;
   padding-right: 5%;
-  margin-top: -2em;
+  margin-top: -2em;*/
+  font-weight: bold;
+  display: block;
+  width: 100%;
 }
 
 /* ==========================================================================
diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index e34897fa..5dd91307 100755
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -25,9 +25,15 @@
                 {% block pager %}
                     {% if nb_results > 1 %}
                 <div class="results">
-                    <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
+                    <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if search_term is defined %}{% trans " found for « " %} {{ search_term }} »{% endif %}</div>
                         {{ page_links | raw }}
                 </div>
+                    {% elseif nb_results == 1 %}
+                        {% if search_term is defined %}
+                     <div class="results">
+                        <div class="nb-results">{% trans "Only one result found for " %} « {{ search_term }} »</div>
+                     </div>
+                        {% endif %}
                     {% endif %}
                 {% endblock %}
             <div id="list-entries" class="list-entries">
diff --git a/themes/baggy/layout.twig b/themes/baggy/layout.twig
index dfebc3ea..8de12749 100644..100755
--- a/themes/baggy/layout.twig
+++ b/themes/baggy/layout.twig
@@ -21,6 +21,9 @@
             {% block precontent %}{% endblock %}
             {% block messages %}
             {% include '_messages.twig' %}
+            {% if includeImport %}
+                                                                {% include '_import.twig' %}
+                                                {% endif %}
             {% endblock %}
             <div id="content" class="w600p center">
             {% block content %}{% endblock %}
diff --git a/themes/courgette/home.twig b/themes/courgette/home.twig
index 5b229ce9..6ba72d35 100755
--- a/themes/courgette/home.twig
+++ b/themes/courgette/home.twig
@@ -26,9 +26,15 @@
                 {% block pager %}
                     {% if nb_results > 1 %}
                 <div class="results">
-                    <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
+                    <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if search_term is defined %}{% trans " found for « " %} {{ search_term }} »{% endif %}</div>
                         {{ page_links | raw }}
                 </div>
+                    {% elseif nb_results == 1 %}
+                        {% if search_term is defined %}
+                     <div class="results">
+                        <div class="nb-results">{% trans "Only one result found for " %} « {{ search_term }} »</div>
+                     </div>
+                        {% endif %}
                     {% endif %}
                 {% endblock %}
                 {% for entry in entries %}
diff --git a/themes/default/_sorting.twig b/themes/default/_sorting.twig
index dfa5cfe4..ce3d38bc 100755
--- a/themes/default/_sorting.twig
+++ b/themes/default/_sorting.twig
@@ -1,6 +1,6 @@
 {% if entries|length > 1 %}
   <ul id="sort">
-      <li><a href="./?sort=ia&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
-      <li><a href="./?sort=ta&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
+      <li><a href="./?sort=ia&amp;view={{ view }}{% if search_term is defined %}&amp;search={{ search_term }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}{% if search_term is defined %}&amp;search={{ search_term }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
+      <li><a href="./?sort=ta&amp;view={{ view }}{% if search_term is defined %}&amp;search={{ search_term }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}{% if search_term is defined %}&amp;search={{ search_term }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
   </ul>
 {% endif %}
diff --git a/themes/default/home.twig b/themes/default/home.twig
index e06d65ab..d6cb98e8 100755
--- a/themes/default/home.twig
+++ b/themes/default/home.twig
@@ -31,9 +31,15 @@
                 {% block pager %}
                     {% if nb_results > 1 %}
                 <div class="results">
-                    <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
+                    <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if search_term is defined %}{% trans " found for « " %} {{ search_term }} »{% endif %}</div>
                         {{ page_links | raw }}
                 </div>
+                    {% elseif nb_results == 1 %}
+                        {% if search_term is defined %}
+                     <div class="results">
+                        <div class="nb-results">{% trans "Only one result found for " %} « {{ search_term }} »</div>
+                     </div>
+                        {% endif %}
                     {% endif %}
                 {% endblock %}
                 {% for entry in entries %}