diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-10-08 10:40:23 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-10-08 10:40:23 +0200 |
| commit | 567765166882f5d28031aec4e75b231d30553e35 (patch) | |
| tree | 1b4680a2ed42b84442532af2269b344650f3677e /addons/website/static/src/xml | |
| parent | b87ddc1bf47cf86e5fd9b4f594e80e7f73988b4a (diff) | |
| parent | e535a152e5195f82d7d3337b707f362477dea935 (diff) | |
[MERGE] Sync with website-al branch
bzr revid: tde@openerp.com-20131008084023-utmkc3cfhyzw5c0p
Diffstat (limited to 'addons/website/static/src/xml')
| -rw-r--r-- | addons/website/static/src/xml/website.tour.xml | 44 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.xml | 6 |
2 files changed, 50 insertions, 0 deletions
diff --git a/addons/website/static/src/xml/website.tour.xml b/addons/website/static/src/xml/website.tour.xml new file mode 100644 index 00000000000..6d2ef140610 --- /dev/null +++ b/addons/website/static/src/xml/website.tour.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<templates id="template" xml:space="preserve"> + <t t-name="website.tour_simple"> + <div class="popover tour"> + <div class="arrow"></div> + <h3 class="popover-title"></h3> + <div class="popover-content"></div> + </div> + </t> + <t t-name="website.tour_confirm"> + <div class="popover tour"> + <div class="arrow"></div> + <h3 class="popover-title"></h3> + <div class="popover-content"></div> + <nav class="popover-navigation"> + <button class="btn btn-sm btn-default" data-role="next"><t t-esc="next"/></button> + </nav> + </div> + </t> + <t t-name="website.tour_end"> + <div class="popover tour"> + <div class="arrow"></div> + <h3 class="popover-title"></h3> + <div class="popover-content"></div> + <nav class="popover-navigation"> + <button class="btn btn-sm btn-default" data-role="end"><t t-esc="end"/></button> + </nav> + </div> + </t> + <t t-name="website.tour_full"> + <div class="popover tour"> + <div class="arrow"></div> + <h3 class="popover-title"></h3> + <div class="popover-content"></div> + <nav class="popover-navigation"> + <button class="btn btn-sm btn-default" data-role="next"><t t-esc="next"/></button> + <button class="btn btn-sm btn-default" data-role="end"><t t-esc="end"/></button> + </nav> + </div> + </t> + <t t-name="website.tour_title"> + <t t-esc="title"/><button title="Close" type="button" class="close" data-role="end">×</button> + </t> +</templates>
\ No newline at end of file diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml index c2f7abe6ed2..b3e4cacd32a 100644 --- a/addons/website/static/src/xml/website.xml +++ b/addons/website/static/src/xml/website.xml @@ -28,6 +28,12 @@ <!-- filled in JS --> </ul> </li> + <li class="dropdown"> + <a id="help-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Help <span class="caret"></span></a> + <ul class="dropdown-menu" role="menu" id="help-menu"> + <!-- filled in JS --> + </ul> + </li> <li> <a href="/admin#action=website.action_module_website">Apps</a> </li> |