diff options
| author | Alex Yatskov <alex@foosoft.net> | 2017-02-26 11:05:41 -0800 |
|---|---|---|
| committer | Alex Yatskov <alex@foosoft.net> | 2017-02-26 11:05:41 -0800 |
| commit | 32f95e59a9c5612d2b5658ea8a70b55ec17cca18 (patch) | |
| tree | a75e426d9350f266402ff0e8a9d040a985a37629 /tmpl | |
| parent | b7faaf0b51363b8366adae3ba7511d5232d6cd30 (diff) | |
| parent | 8966dc1213d4af15c956dbd8976b80a1287c9fe0 (diff) | |
Merge branch 'dev' into firefox
Diffstat (limited to 'tmpl')
| -rw-r--r-- | tmpl/dictionary.html | 20 | ||||
| -rw-r--r-- | tmpl/fields.html | 21 |
2 files changed, 17 insertions, 24 deletions
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html index c70bc187..f2f7f687 100644 --- a/tmpl/dictionary.html +++ b/tmpl/dictionary.html @@ -1,26 +1,10 @@ <div class="dict-group well well-sm" data-title="{{title}}"> <h4><span class="text-muted glyphicon glyphicon-book"></span> {{title}} <small>rev.{{revision}}</small></h4> - <!-- <div class="row"> --> - <!-- <div class="col-xs-8"> --> - <!-- <h4><span class="text-muted glyphicon glyphicon-book"></span> {{title}} <small>v.{{version}}</small></h4> --> - <!-- </div> --> - <!-- <div class="col-xs-4 text-right disabled"> --> - <!-- <button type="button" class="dict-group-controls dict-delete btn btn-danger">Delete</button> --> - <!-- </div> --> - <!-- </div> --> - - <div class="dict-delete-progress"> - Dictionary data is being deleted, please be patient... - <div class="progress"> - <div class="progress-bar progress-bar-striped progress-bar-danger" style="width: 0%"></div> - </div> - </div> - - <div class="checkbox dict-group-controls"> + <div class="checkbox"> <label><input type="checkbox" class="dict-enabled" {{#if enabled}}checked{{/if}}> Enable search</label> </div> - <div class="form-group dict-group-controls options-advanced"> + <div class="form-group options-advanced"> <label for="dict-{{title}}">Result priority</label> <input type="number" value="{{priority}}" id="dict-{{title}}" class="form-control dict-priority"> </div> diff --git a/tmpl/fields.html b/tmpl/fields.html index ba03349c..33fbff44 100644 --- a/tmpl/fields.html +++ b/tmpl/fields.html @@ -48,15 +48,24 @@ {{#*inline "glossary"}} {{~#if html}}<div style="text-align: left;">{{/if~}} - {{~#if group~}} - {{~#if definition.definitions.[1]~}} - {{~#if html}}<ol>{{#each definition.definitions}}<li>{{> glossary-single html=../html}}</li>{{/each}}</ol> - {{~else}}{{#each definition.definitions}} * {{> glossary-single html=../html}}{{/each}}{{/if~}} + {{~#if modeKanji~}} + {{~#if definition.glossary.[1]~}} + {{~#if html}}<ol>{{#each definition.glossary}}<li>{{.}}</li>{{/each}}</ol> + {{~else}}{{#each definition.glossary}}{{.}}{{#unless @last}}, {{/unless}}{{/each}}{{/if~}} {{~else~}} - {{~> glossary-single definition.definitions.[0] html=html~}} + {{definition.glossary.[0]}} {{~/if~}} {{~else~}} - {{~> glossary-single definition html=html~}} + {{~#if group~}} + {{~#if definition.definitions.[1]~}} + {{~#if html}}<ol>{{#each definition.definitions}}<li>{{> glossary-single html=../html}}</li>{{/each}}</ol> + {{~else}}{{#each definition.definitions}} * {{> glossary-single html=../html}}{{/each}}{{/if~}} + {{~else~}} + {{~> glossary-single definition.definitions.[0] html=html~}} + {{~/if~}} + {{~else~}} + {{~> glossary-single definition html=html~}} + {{~/if~}} {{~/if~}} {{~#if html}}</div>{{/if~}} {{/inline}} |