oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-07-17 17:08:37 +00:00
Code Wiki Activity

Merge pull request #1835 from wallabag/v2-prepare-v2

Browse source 
🚀 Prepare v2.0.0 🎂
This commit is contained in:
Thomas Citharel 2016-04-03 22:11:17 +02:00
commit a119acd15d
10 changed files with 23 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css
View file

@ -54,20 +54,6 @@ body.login main {
padding: 0;
}
#warning_message {
position: fixed;
background-color: #ff6347;
z-index: 1000;
bottom: 0;
left: 0;
width: 100%;
color: #000;
}
#warning_message a {
color: #555;
}
.border-bottom {
border-bottom: 1px solid #DDD;
}

4
src/Wallabag/CoreBundle/Resources/views/base.html.twig
View file

@ -70,10 +70,6 @@
{% block footer %}{% endblock %}
<div id="warning_message">
You're trying wallabag v2, which is in beta version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new one if necessary</a>.
</div>
{% if craue_setting('piwik_enabled') %}
{{ piwik(craue_setting('piwik_host'), craue_setting('piwik_site_id')) }}
{% endif %}

7
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
View file

@ -7,7 +7,7 @@
<dl>
<dt>{{ 'about.who_behind_wallabag.developped_by'|trans }}</dt>
<dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
<dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://www.loeuillet.org">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
<dd>Thomas Citharel — <a href="https://tcit.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
<dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
@ -25,9 +25,8 @@
<dl>
<dt>{{ 'about.getting_help.documentation'|trans }}</dt>
<dd><a href="https://doc.wallabag.org/en">english</a></dd>
<dd><a href="https://doc.wallabag.org/fr">français</a></dd>
<dd><a href="https://doc.wallabag.org/de">deutsch</a></dd>
<dd><a href="http://doc.wallabag.org/en/v2/">english</a></dd>
<dd><a href="http://doc.wallabag.org/fr/v2/">français</a></dd>
<dt>{{ 'about.getting_help.bug_reports'|trans }}</dt>
<dd>{{ 'about.getting_help.support'|trans|raw }}</dd>

2
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
View file

@ -11,7 +11,7 @@
</ul>
<h3>{{ 'howto.top_menu.browser_addons'|trans }}</h3>
<ul>
<li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
<li><a href="https://addons.mozilla.org/firefox/addon/wallabag-v2/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
<li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li>
</ul>
<h3>{{ 'howto.top_menu.mobile_apps'|trans }}</h3>

7
src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
View file

@ -21,7 +21,7 @@
<div id="set1" class="col s12">
<dt>{{ 'about.who_behind_wallabag.developped_by'|trans }}</dt>
<dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
<dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://www.loeuillet.org">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
<dd>Thomas Citharel — <a href="https://tcit.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
<dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
<dt>{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}</dt>
@ -34,9 +34,8 @@
<div id="set2" class="col s12">
<dl>
<dt>{{ 'about.getting_help.documentation'|trans }}</dt>
<dd><a href="https://doc.wallabag.org/en">english</a></dd>
<dd><a href="https://doc.wallabag.org/fr">français</a></dd>
<dd><a href="https://doc.wallabag.org/de">deutsch</a></dd>
<dd><a href="http://doc.wallabag.org/en/v2/">english</a></dd>
<dd><a href="http://doc.wallabag.org/fr/v2/">français</a></dd>
<dt>{{ 'about.getting_help.bug_reports'|trans }}</dt>
<dd>{{ 'about.getting_help.support'|trans|raw }}</dd>

2
src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
View file

@ -18,7 +18,7 @@
<div class="col s12">
<h5>{{ 'howto.top_menu.browser_addons'|trans }}</h5>
<ul>
<li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
<li><a href="https://addons.mozilla.org/firefox/addon/wallabag-v2/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
<li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li>
</ul>
</div>