templates/simple.tmpl - Issue 29329984: Issue 3257 - Create uninstallation page in adblockplus.org

Unified Diff: templates/simple.tmpl

Issue 29329984: Issue 3257 - Create uninstallation page in adblockplus.org (Closed)

Patch Set: Fix old jinja files compatibility with markdown and implement noscript Created Nov. 19, 2015, 4:40 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

Index: templates/simple.tmpl

===================================================================

new file mode 100644

--- /dev/null

+++ b/templates/simple.tmpl

@@ -0,0 +1,40 @@

+{#

+ # This file is part of the Adblock Plus website,

+ #

+ # Adblock Plus is free software: you can redistribute it and/or modify

+ # it under the terms of the GNU General Public License version 3 as

+ # published by the Free Software Foundation.

+ #

+ # Adblock Plus is distributed in the hope that it will be useful,

+ # but WITHOUT ANY WARRANTY; without even the implied warranty of

+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

+ # GNU General Public License for more details.

+ #

+ # You should have received a copy of the GNU General Public License

+ # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.

+ #}

+<!DOCTYPE html>

+<html lang="{{locale}}" dir="{{"rtl" if config.has_option("rtl", locale) else "ltr"}}">

+ <head>

+ <title>{{title|translate("title")}}</title>

+ <link rel="stylesheet" href="/css/simple.css" type="text/css" media="all" />

+ <link rel="apple-touch-icon" href="/img/favicon-large.png" />

+ {{head|safe}}

+ </head>

+ <body>

+ <header>

+ <img id="logo" src="/img/adblockplus_100.png" alt="{{"Adblock Plus logo"|translate("abp-logo", "Alternative text for Adblock Plus logo image")}}" />

+ <h1>{{title|translate("title")}}</h1>

+ </header>

+ <div id="content">

+ <section class="highlighted">

saroyanm 2015/11/19 17:00:17 I moved the section here, not sure if it's a good

kzar 2015/11/20 13:06:14 Well IMHO you should keep it out of the template i

saroyanm 2015/11/20 18:33:54 I agree with you, the only problem is that I can't

kzar 2015/11/21 19:01:24 I'm not sure that I understand to be honest, but I

saroyanm 2015/11/23 10:50:30 "Unlike block-level HTML tags, Markdown syntax is

kzar 2015/11/25 13:26:00 Thomas is probably better placed to suggest someth

On 2015/11/23 10:50:30, saroyanm wrote: > On 2015/11/21 19:01:24, kzar wrote: > > On 2015/11/20 18:33:54, saroyanm wrote: > > > On 2015/11/20 13:06:14, kzar wrote: > > > > On 2015/11/19 17:00:17, saroyanm wrote: > > > > > I moved the section here, not sure if it's a good idea would be nice to > > hear > > > > > second opinion regarding that, the problem is that in case we will have > > > > several > > > > > section layouts (eg. as in the firstRun page) we will need to change > this > > > > > implementation. > > > > > > > > Well IMHO you should keep it out of the template in that case, if a > template > > > > isn't reusable it's kinda pointless. > > > > > > I agree with you, the only problem is that I can't write markdown in block > > level > > > html element tag and only for that reason need to have separate file in > > includes > > > directory. So I'll end up with the additional 2 files, that why I was having > a > > > doubt, but seams like we do not have a choice. > > > > I'm not sure that I understand to be honest, but I really dislike how > > uninstall-abp.tmpl and uninstall-abp-submit.tmpl files have been added. Is > there > > truely no way to avoid that? Not only are we not actually using any Jinja2 > > functionality in those pages, but worse there are now two files for each page. > > "Unlike block-level HTML tags, Markdown syntax is processed within span-level > tags." > reference -> http://daringfireball.net/projects/markdown/syntax#html > while "section" is block level element I can't use have markdwon implementation > as ex. below: > <section> > #markdown > </section> > > But I can use ex.: "span" element for that purpose, which technically feasible, > but wrong by design: > <span> > #markdown > </span> > > So I can see only 2 solutions here: > 1. Move "section" element to simple.tmpl and find an extension that will allow > us have block level surrounding markdown elements. > 2. separate unistall-abp.tmpl and unistall-abp.md like we have done currently > > Hope I could describe better the issue, let me know if it still not clear.

Thomas is probably better placed to suggest something here but to me it seems crazy that we now have four files for those two pages, especially as two of them are Jinja2 templates needlessly. I mean surely using a span element wrongly is preferable to that? Or just having one .html file per page instead of a .md and a .tmpl?

+ {{body|safe}}

+ </section>

+ </div>

+ <footer>

+ {{"impressum"|linkify}}{{"Legal notice"|translate("legal-notice", "Legal notice in the footer")}}</a>

+ </footer>

+ </body>

+</html>

« pages/uninstall-abp.md ('K') | « static/img/background-dark.png ('k') | no next file » | no next file with comments »