diff options
| author | Xavier Morel <xmo@openerp.com> | 2013-10-14 10:54:59 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2013-10-14 10:54:59 +0200 |
| commit | 2e352ce187d2685df64ebd36f669a8abd88d5f65 (patch) | |
| tree | 529af9c967929ca13896e8464abdc8fe9d02710c /addons/website/static/src/xml | |
| parent | 3e349a2bf7c76f5136935b531c5b3fb65833e8be (diff) | |
| parent | 063a698313e522596a0f784206a9d17b9f31dafa (diff) | |
[MERGE] from trunk
bzr revid: xmo@openerp.com-20131014085459-dhbypq0hg3lzzf3j
Diffstat (limited to 'addons/website/static/src/xml')
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 2 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.tour.xml | 27 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.xml | 6 |
3 files changed, 34 insertions, 1 deletions
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index 157d19b56c0..685712d3411 100644 --- a/addons/website/static/src/xml/website.editor.xml +++ b/addons/website/static/src/xml/website.editor.xml @@ -56,7 +56,7 @@ </label> </h3> <input type="text" class="form-control pages url-source" - id="link-new" pattern="[\\w/-]+"/> + id="link-new" placeholder="Page Name"/> </li> <li class="list-group-item form-group clearfix"> <div class="pull-right"> 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..d2f562dec61 --- /dev/null +++ b/addons/website/static/src/xml/website.tour.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<templates id="template" xml:space="preserve"> + <t t-name="website.tour_popover"> + <div class="popover tour"> + <div class="arrow"></div> + <h3 class="popover-title"></h3> + <div class="popover-content"></div> + <t t-if="next or end"> + <nav class="popover-navigation"> + <t t-if="next"> + <button class="btn btn-sm btn-default" data-role="next"><t t-esc="next"/></button> + </t> + <small t-if="next && end"> + <span class="text-muted"> or </span> + <button class="btn-link" data-role="end" style="float: none; padding: 0"><t t-esc="end"/></button> + </small> + <t t-if="end && ! next"> + <button class="btn btn-sm btn-default" data-role="end"><t t-esc="end"/></button> + </t> + </nav> + </t> + </div> + </t> + <t t-name="website.tour_popover_title"> + <t t-esc="title"/><button title="Close Tutorial" type="button" class="close" data-role="end">×</button> + </t> +</templates> 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> |