aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes/baggy
diff options
context:
space:
mode:
Diffstat (limited to 'themes/baggy')
-rwxr-xr-x[-rw-r--r--]themes/baggy/config.twig27
-rwxr-xr-xthemes/baggy/css/main.css7
-rwxr-xr-xthemes/baggy/home.twig8
-rwxr-xr-x[-rw-r--r--]themes/baggy/layout.twig3
4 files changed, 20 insertions, 25 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 @@
105 {% endif %} 105 {% endif %}
106 106
107 <h2>{% trans "Import" %}</h2> 107 <h2>{% trans "Import" %}</h2>
108 <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> 108 <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
109 <p>1. {% trans "First, select the export file on your computer and upload it." %}</p> 109 <p>{% trans "Please select export file on your computer:" %}</p>
110 <form method="post" action="?uploadfile" name="uploadfile" enctype="multipart/form-data"> 110 <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
111 <fieldset class="w500p"> 111 <fieldset class="w500p">
112 <div class="row"> 112 <div class="row">
113 <label class="col w150p" for="file">{% trans "File:" %}</label> 113 <label class="col w150p" for="file">{% trans "File:" %}</label>
114 <input class="col" type="file" id="file" name="file" tabindex="4"> 114 <input class="col" type="file" id="file" name="file" tabindex="4">
115 </div> 115 </div>
116 <div class="row mts txtcenter"> 116 <div class="row mts txtcenter">
117 <button class="bouton" type="submit" tabindex="4">{% trans "Upload" %}</button> 117 <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
118 </div> 118 </div>
119 </fieldset> 119 </fieldset>
120 <input type="hidden" name="MAX_FILE_SIZE" value="1048576">
121 <input type="hidden" name="returnurl" value="{{ referer }}">
122 </form> 120 </form>
123 <p>2. {% trans "Then, click on the right link below." %}</p> 121
124 <ul>
125 <li><a href="./?import&amp;from=pocket">{% trans "Import from Pocket" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('POCKET_FILE')) }}</li>
126 <li><a href="./?import&amp;from=readability">{% trans "Import from Readability" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('READABILITY_FILE')) }}</li>
127 <li><a href="./?import&amp;from=instapaper">{% trans "Import from Instapaper" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('INSTAPAPER_FILE')) }}</li>
128 <li><a href="./?import&amp;from=poche">{% trans "Import from wallabag" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('POCHE_FILE')) }}</li>
129 </ul>
130
131 {% if token == '' %}
132 <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>
133 {% else %}
134 <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>
135 <p>{% trans "If you have console access to your server, you can also create a cron task:" %}</p>
136 <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>
137 {% endif %}
138
139 <h2>{% trans "Export your wallabag data" %}</h2> 122 <h2>{% trans "Export your wallabag data" %}</h2>
140 {% if constant('STORAGE') == 'sqlite' %} 123 {% if constant('STORAGE') == 'sqlite' %}
141 <p><a href="?download" target="_blank">{% trans "Click here" %}</a> {% trans "to download your database." %}</p>{% endif %} 124 <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;
777 } 777 }
778 778
779.warning { 779.warning {
780 font-size: 3em; 780 /* font-size: 3em;
781 color: #999; 781 color: #999;
782 font-style: italic; 782 font-style: italic;
783 position: absolute; 783 position: absolute;
@@ -786,7 +786,10 @@ margin-top:1em;
786 width: 100%; 786 width: 100%;
787 text-align: center; 787 text-align: center;
788 padding-right: 5%; 788 padding-right: 5%;
789 margin-top: -2em; 789 margin-top: -2em;*/
790 font-weight: bold;
791 display: block;
792 width: 100%;
790} 793}
791 794
792/* ========================================================================== 795/* ==========================================================================
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 @@
25 {% block pager %} 25 {% block pager %}
26 {% if nb_results > 1 %} 26 {% if nb_results > 1 %}
27 <div class="results"> 27 <div class="results">
28 <div class="nb-results">{{ nb_results }} {% trans "results" %}</div> 28 <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if search_term is defined %}{% trans " found for « " %} {{ search_term }} »{% endif %}</div>
29 {{ page_links | raw }} 29 {{ page_links | raw }}
30 </div> 30 </div>
31 {% elseif nb_results == 1 %}
32 {% if search_term is defined %}
33 <div class="results">
34 <div class="nb-results">{% trans "Only one result found for " %} « {{ search_term }} »</div>
35 </div>
36 {% endif %}
31 {% endif %} 37 {% endif %}
32 {% endblock %} 38 {% endblock %}
33 <div id="list-entries" class="list-entries"> 39 <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 @@
21 {% block precontent %}{% endblock %} 21 {% block precontent %}{% endblock %}
22 {% block messages %} 22 {% block messages %}
23 {% include '_messages.twig' %} 23 {% include '_messages.twig' %}
24 {% if includeImport %}
25 {% include '_import.twig' %}
26 {% endif %}
24 {% endblock %} 27 {% endblock %}
25 <div id="content" class="w600p center"> 28 <div id="content" class="w600p center">
26 {% block content %}{% endblock %} 29 {% block content %}{% endblock %}