diff options
| author | Josse Colpaert <jco@odoo.com> | 2014-07-13 09:27:20 +0200 |
|---|---|---|
| committer | Josse Colpaert <jco@odoo.com> | 2014-07-13 09:27:20 +0200 |
| commit | 32dd003d60f4e28626bdd44880d95e393f0dab50 (patch) | |
| tree | 7d99894a8ac2cc4b8e27efd0fafcc9ec0193ff4d /addons/website/static/src/xml | |
| parent | beb12f71f17cfb2dea0e52cf2e4c863da4bfcc86 (diff) | |
| parent | 5f5e18f9bbe8c2a69adc72cf54d099b4bf04f609 (diff) | |
[MERGE] Resolve conflicts 8.0
Diffstat (limited to 'addons/website/static/src/xml')
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 82 |
1 files changed, 68 insertions, 14 deletions
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index d61b6ed2664..0e3873b1de6 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,21 +59,12 @@ </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> - </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"> @@ -81,8 +72,71 @@ Link text </label> <div class="col-sm-10"> - <input type="text" class="form-control" - id="link-text"/> + <input type="text" class="form-control" id="link-text"/> + </div> + </div> + </div> + <div class="form-horizontal link-style"> + <div class="form-group"> + <label class="col-sm-2 control-label"> + Style + </label> + <div class="col-sm-4"> + <div class="dropdown" style="line-height: 2em;"> + <a data-toggle="dropdown" class="btn btn-default" href="#">Color Style <span class="caret"></span></a> + <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel"> + <li> + <label class="btn btn-link">Link<input value="" class="link-style" type="radio" name="link-style-type" checked="checked"/></label> + </li> + <li> + <label class="btn btn-default">Basic<input value="btn-default" class="link-style" type="radio" name="link-style-type"/></label> + </li> + <li> + <label class="btn btn-success">Success<input value="btn-success" class="link-style" type="radio" name="link-style-type"/></label> + </li> + <li> + <label class="btn btn-primary">Primary<input value="btn-primary" class="link-style" type="radio" name="link-style-type"/></label> + </li> + <li> + <label class="btn btn-info">Info<input value="btn-info" class="link-style" type="radio" name="link-style-type"/></label> + </li> + <li> + <label class="btn btn-warning">Warning<input value="btn-warning" class="link-style" type="radio" name="link-style-type"/></label> + </li> + <li> + <label class="btn btn-danger">Danger<input value="btn-danger" class="link-style" type="radio" name="link-style-type"/></label> + </li> + </ul> + </div> + </div> + <div class="col-sm-4"> + <div class="dropdown" style="line-height: 2em;"> + <a data-toggle="dropdown" class="btn btn-default" href="#">Size <span class="caret"></span></a> + <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel"> + <li> + <label class="btn btn-default btn-xs">Extra Small<input value="btn-xs" class="link-style" type="radio" name="link-style-size"/></label> + </li> + <li> + <label class="btn btn-default btn-sm">Small<input value="btn-sm" class="link-style" type="radio" name="link-style-size"/></label> + </li> + <li> + <label class="btn btn-default">Default<input value="" class="link-style" type="radio" name="link-style-size" checked="checked"/></label> + </li> + <li> + <label class="btn btn-default btn-lg">Large<input value="btn-lg" class="link-style" type="radio" name="link-style-size"/></label> + </li> + </ul> + </div> + </div> + </div> + </div> + <div class="form-horizontal link-style"> + <div class="form-group"> + <label class="col-sm-2 control-label"> + Preview + </label> + <div class="col-sm-10" style="line-height: 2em;"> + <a id="link-preview" href="#"></a> </div> </div> </div> |