pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
dab34f0aebabae76ea7f73fb5e98c8babe646fcd
odoo_source/addons/theme_bootswatch/views/theme_bootswatch_templates.xml
T
qsm-odoo 52ec536cef [REF] *: make stronger bootstrap assets 
* portal, theme_bootswatch, web, web_editor, website

With less2sass and bs3tobs4 tasks, the assets structure was reviewed to
handle the specificities of both framework and to prepare for our next
odoo tasks. In particular, the assets_helpers and bootstrap overrides
were basically split into 4 parts: utils, primary variables, secondary
variables and bootstrap variables.
(see https://github.com/odoo/odoo/commit/6e4db7d13a926845bf82f5b035afede42d6d5a89)

Using the !default system for the bootstrap variables parts seems now
a good improvement. This is part of what this commit does: adding the
default flag for all bootstrap variables overrides and inverting the
order of the files in the _assets_backend_helpers and
_assets_frontend_helpers templates. This allows to avoid code like this:

portal:
```
$body-bg: white;
```

website:
```
@​if $var != null {
    $body-bg: $var;
}
```

This code makes the body white with portal or equal to $var with website
if $var has a value. The same behavior in the new file order is achieved
with:

website:
```
$body-bg: $var !default;
```

portal:
```
$body-bg: white !default;
```

This order is now also followed for the _assets_secondary_variables
templates (there are only a few).

This commit also make better assets hierarchy by making website inherit
from portal assets (instead of web) and portal inherit from web_editor
assets (instead of web) (thus relying on strong dependencies instead of
installation order which is not always right for migrated databases).

closes odoo/odoo#29757
2018-12-26 17:25:23 +00:00

136 lines
9.0 KiB
XML
Raw Blame History

<?xml version="1.0" encoding="utf-8"?>
<odoo>
<!-- Remove Odoo bootstrap overridde -->
<template id="_assets_frontend_helpers" inherit_id="website._assets_frontend_helpers">
<xpath expr="//link[@href='/web_editor/static/src/scss/bootstrap_overridden.scss']" position="replace"/>
<xpath expr="//link[@href='/website/static/src/scss/bootstrap_overridden.scss']" position="replace"/>
</template>
<template id="theme_customize" inherit_id="website.theme_customize">
<xpath expr="//div" position="replace">
<div>
<content data-string="Themes" data-title="Bootswatch Themes">
<opt data-xmlid="" data-icon="/theme_bootswatch/static/src/img/bootswatch_default_thumbnail.png"/>
<opt data-xmlid="theme_bootswatch.theme_cerulean_bs_variables,theme_bootswatch.theme_cerulean" data-icon="/theme_bootswatch/static/src/img/cerulean_thumbnail.png"/>
<opt data-xmlid="theme_bootswatch.theme_cosmo_bs_variables,theme_bootswatch.theme_cosmo" data-disable="ee" data-icon="/theme_bootswatch/static/src/img/cosmo_thumbnail.png"/>
<opt data-xmlid="theme_bootswatch.theme_cyborg_bs_variables,theme_bootswatch.theme_cyborg" data-icon="/theme_bootswatch/static/src/img/cyborg_thumbnail.png"/>
<opt data-xmlid="theme_bootswatch.theme_flatly_bs_variables,theme_bootswatch.theme_flatly" data-icon="/theme_bootswatch/static/src/img/flatly_thumbnail.png"/>
<opt data-xmlid="theme_bootswatch.theme_journal_bs_variables,theme_bootswatch.theme_journal" data-icon="/theme_bootswatch/static/src/img/journal_thumbnail.png"/>
<opt data-xmlid="theme_bootswatch.theme_simplex_bs_variables,theme_bootswatch.theme_simplex" data-icon="/theme_bootswatch/static/src/img/simplex_thumbnail.png"/>
<opt data-xmlid="theme_bootswatch.theme_slate_bs_variables,theme_bootswatch.theme_slate" data-icon="/theme_bootswatch/static/src/img/slate_thumbnail.png"/>
<opt data-xmlid="theme_bootswatch.theme_spacelab_bs_variables,theme_bootswatch.theme_spacelab" data-icon="/theme_bootswatch/static/src/img/spacelab_thumbnail.png"/>
<opt data-xmlid="theme_bootswatch.theme_united_bs_variables,theme_bootswatch.theme_united" data-icon="/theme_bootswatch/static/src/img/united_thumbnail.png"/>
</content>
</div>
</xpath>
</template>
<template id="theme_cerulean_bs_variables" name="Cerulean" inherit_id="website._assets_frontend_helpers" active="False">
<xpath expr="//link" position="before">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/cerulean/_variables.scss"/>
</xpath>
</template>
<template id="theme_cerulean" name="Cerulean" inherit_id="website.assets_frontend" active="False">
<xpath expr="//link[last()]" position="after">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/cerulean/_bootswatch.scss"/>
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/src/scss/cerulean_fix.scss"/>
</xpath>
</template>
<template id="theme_cosmo_bs_variables" name="Cosmo" inherit_id="website._assets_frontend_helpers" active="False">
<xpath expr="//link" position="before">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/cosmo/_variables.scss"/>
</xpath>
</template>
<template id="theme_cosmo" name="Cosmo" inherit_id="website.assets_frontend" active="False">
<xpath expr="//link[last()]" position="after">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/cosmo/_bootswatch.scss"/>
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/src/scss/cosmo_fix.scss"/>
</xpath>
</template>
<template id="theme_cyborg_bs_variables" name="Cyborg" inherit_id="website._assets_frontend_helpers" active="False">
<xpath expr="//link" position="before">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/cyborg/_variables.scss"/>
</xpath>
</template>
<template id="theme_cyborg" name="Cyborg" inherit_id="website.assets_frontend" active="False">
<xpath expr="//link[last()]" position="after">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/cyborg/_bootswatch.scss"/>
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/src/scss/cyborg_fix.scss"/>
</xpath>
</template>
<template id="theme_flatly_bs_variables" name="Flatly" inherit_id="website._assets_frontend_helpers" active="False">
<xpath expr="//link" position="before">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/flatly/_variables.scss"/>
</xpath>
</template>
<template id="theme_flatly" name="Flatly" inherit_id="website.assets_frontend" active="False">
<xpath expr="//link[last()]" position="after">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/flatly/_bootswatch.scss"/>
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/src/scss/flatly_fix.scss"/>
</xpath>
</template>
<template id="theme_journal_bs_variables" name="Journal" inherit_id="website._assets_frontend_helpers" active="False">
<xpath expr="//link" position="before">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/journal/_variables.scss"/>
</xpath>
</template>
<template id="theme_journal" name="Journal" inherit_id="website.assets_frontend" active="False">
<xpath expr="//link[last()]" position="after">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/journal/_bootswatch.scss"/>
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/src/scss/journal_fix.scss"/>
</xpath>
</template>
<template id="theme_simplex_bs_variables" name="Simplex" inherit_id="website._assets_frontend_helpers" active="False">
<xpath expr="//link" position="before">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/simplex/_variables.scss"/>
</xpath>
</template>
<template id="theme_simplex" name="Simplex" inherit_id="website.assets_frontend" active="False">
<xpath expr="//link[last()]" position="after">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/simplex/_bootswatch.scss"/>
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/src/scss/simplex_fix.scss"/>
</xpath>
</template>
<template id="theme_slate_bs_variables" name="Slate" inherit_id="website._assets_frontend_helpers" active="False">
<xpath expr="//link" position="before">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/slate/_variables.scss"/>
</xpath>
</template>
<template id="theme_slate" name="Slate" inherit_id="website.assets_frontend" active="False">
<xpath expr="//link[last()]" position="after">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/slate/_bootswatch.scss"/>
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/src/scss/slate_fix.scss"/>
</xpath>
</template>
<template id="theme_spacelab_bs_variables" name="Spacelab" inherit_id="website._assets_frontend_helpers" active="False">
<xpath expr="//link" position="before">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/spacelab/_variables.scss"/>
</xpath>
</template>
<template id="theme_spacelab" name="Spacelab" inherit_id="website.assets_frontend" active="False">
<xpath expr="//link[last()]" position="after">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/spacelab/_bootswatch.scss"/>
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/src/scss/spacelab_fix.scss"/>
</xpath>
</template>
<template id="theme_united_bs_variables" name="United" inherit_id="website._assets_frontend_helpers" active="False">
<xpath expr="//link" position="before">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/united/_variables.scss"/>
</xpath>
</template>
<template id="theme_united" name="United" inherit_id="website.assets_frontend" active="False">
<xpath expr="//link[last()]" position="after">
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/lib/bootswatch/united/_bootswatch.scss"/>
<link rel="stylesheet" type="text/scss" href="/theme_bootswatch/static/src/scss/united_fix.scss"/>
</xpath>
</template>
</odoo>
Reference in New Issue View Git Blame Copy Permalink