diff options
| author | Christophe Matthieu <chm@odoo.com> | 2014-07-10 13:34:02 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@odoo.com> | 2014-07-10 13:34:02 +0200 |
| commit | c2c0fdc916560fe08897679c03794b16701c40cd (patch) | |
| tree | 63f3585bad5ad3114491a41712c5bc8f8eba75b5 /addons/website/static/src/xml/website.editor.xml | |
| parent | caa534e503b733bb4779a51ae5e12ccce095be2e (diff) | |
[IMP] website editor: remove button style from cke and insert into the link dialog box. Fix the dialog box label value when the user create a link.
Diffstat (limited to 'addons/website/static/src/xml/website.editor.xml')
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 49 |
1 files changed, 32 insertions, 17 deletions
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index d61b6ed2664..e895c08c3cd 100644 --- a/addons/website/static/src/xml/website.editor.xml +++ b/addons/website/static/src/xml/website.editor.xml @@ -51,7 +51,7 @@ id="link-page" type="hidden"/> </li> <li class="list-group-item form-group clearfix"> - <div class="pull-right"> + <div class="pull-right" style="display: none;"> <label> <input type="checkbox" class="window-new"/> Open in new window @@ -59,32 +59,47 @@ </div> <h4 class="list-group-item-heading"> <label for="link-external" class="control-label"> - URL + URL or Email Address </label> </h4> - <input type="text" class="form-control url url-source" + <input type="text" class="form-control url email-address url-source" id="link-external" placeholder="http://openerp.com"/> </li> <li class="list-group-item form-group"> <h4 class="list-group-item-heading"> - <label for="link-email" class="control-label"> - Email Address + <label for="link-text" class="control-label"> + Link text </label> </h4> - <input type="email" class="form-control email-address url-source" - id="link-email" placeholder="you@yourwebsite.com"/> - </li> - </ul> - <div class="form-horizontal"> - <div class="form-group"> - <label for="link-text" class="col-sm-2 control-label"> - Link text - </label> - <div class="col-sm-10"> <input type="text" class="form-control" id="link-text"/> - </div> - </div> + </li> + <li class="list-group-item form-group"> + <h4 class="list-group-item-heading"> + <label for="link-type" class="control-label"> + Style + </label> + </h4> + <select id="link-style-type" class="form-control link-style pull-left" style="display: inline-block; width: 49%;"> + <option value="" selected="selected">Link</option> + <option value="btn-default">Basic</option> + <option value="btn-primary">Primary</option> + <option value="btn-success">Success</option> + <option value="btn-info">Info</option> + <option value="btn-warning">Warning</option> + <option value="btn-danger">Danger</option> + </select> + <select id="link-style-size" class="form-control link-style pull-right" style="display: inline-block; width: 49%;"> + <option value="btn-xs">Extra Small</option> + <option value="btn-sm">Small</option> + <option value="" selected="selected">Default</option> + <option value="btn-lg">Large</option> + </select> + <div class="clearfix"/> + </li> + </ul> + <div class="text-center"> + <a id="link-preview" href="#" class="hidden">Preview</a> </div> </form> </t> |