diff options
Diffstat (limited to 'tmpl')
| -rw-r--r-- | tmpl/kanji-list.html | 3 | ||||
| -rw-r--r-- | tmpl/kanji.html | 20 | ||||
| -rw-r--r-- | tmpl/model.html | 2 | ||||
| -rw-r--r-- | tmpl/term-grouped-list.html | 4 | ||||
| -rw-r--r-- | tmpl/term-grouped.html | 26 | ||||
| -rw-r--r-- | tmpl/term-list.html | 4 | ||||
| -rw-r--r-- | tmpl/term.html | 20 | 
7 files changed, 42 insertions, 37 deletions
| diff --git a/tmpl/kanji-list.html b/tmpl/kanji-list.html index 0ee81463..1df22e68 100644 --- a/tmpl/kanji-list.html +++ b/tmpl/kanji-list.html @@ -1,6 +1,7 @@  {{#if definitions}}      {{#each definitions}} -    {{> kanji.html addable=../addable root=../root}} +        {{#unless @first}}<hr>{{/unless}} +        {{> kanji.html addable=../addable root=../root}}      {{/each}}  {{else}}      <p>No results found</p> diff --git a/tmpl/kanji.html b/tmpl/kanji.html index a14fff78..bb4ce61f 100644 --- a/tmpl/kanji.html +++ b/tmpl/kanji.html @@ -1,7 +1,7 @@  <div class="kanji-definition">      <div class="action-bar">          {{#if addable}} -        <a href="#" title="Add Kanji" class="action-add-note pending disabled" data-mode="kanji" data-index="{{@index}}"><img src="img/add_kanji.png"></a> +            <a href="#" title="Add Kanji" class="action-add-note pending disabled" data-mode="kanji" data-index="{{@index}}"><img src="img/add_kanji.png"></a>          {{/if}}      </div> @@ -13,7 +13,7 @@                  <th>Kunyomi:</th>                  <td>                      {{#each kunyomi}} -                    {{.}}{{#unless @last}}, {{/unless}} +                        {{.}}{{#unless @last}}, {{/unless}}                      {{/each}}                  </td>              </tr> @@ -21,7 +21,7 @@                  <th>Onyomi:</th>                  <td>                      {{#each onyomi}} -                    {{.}}{{#unless @last}}, {{/unless}} +                        {{.}}{{#unless @last}}, {{/unless}}                      {{/each}}                  </td>              </tr> @@ -30,19 +30,19 @@      <div class="kanji-tags">          {{#each tags}} -        <span class="tag tag-{{category}}" title="{{notes}}">{{name}}</span> +            <span class="tag tag-{{category}}" title="{{notes}}">{{name}}</span>          {{/each}}      </div>      <div class="kanji-glossary">          {{#if glossary.[1]}} -        <ol "kanji-glossary-group"> -            {{#each glossary}} -            <li><span class="kanji-glossary-item">{{.}}</span></li> -            {{/each}} -        </ol> +            <ol "kanji-glossary-group"> +                {{#each glossary}} +                    <li><span class="kanji-glossary-item">{{.}}</span></li> +                {{/each}} +            </ol>          {{else}} -        <div class="kanji-glossary-group kanji-glossary-item">{{glossary.[0]}}</div> +            <div class="kanji-glossary-group kanji-glossary-item">{{glossary.[0]}}</div>          {{/if}}      </div>  </div> diff --git a/tmpl/model.html b/tmpl/model.html index 94772316..acff44a0 100644 --- a/tmpl/model.html +++ b/tmpl/model.html @@ -9,7 +9,7 @@                  </button>                  <ul class="dropdown-menu dropdown-menu-right">                      {{#each markers}} -                    <li><a class="marker-link" href="#">{{.}}</a></li> +                        <li><a class="marker-link" href="#">{{.}}</a></li>                      {{/each}}                  </ul>              </div> diff --git a/tmpl/term-grouped-list.html b/tmpl/term-grouped-list.html index d927abc4..4bc9406c 100644 --- a/tmpl/term-grouped-list.html +++ b/tmpl/term-grouped-list.html @@ -1,7 +1,7 @@  {{#if definitions}}      {{#each definitions}} -    {{> term-grouped.html addable=../addable playback=../playback}} -    <br> +        {{#unless @first}}<hr>{{/unless}} +        {{> term-grouped.html addable=../addable playback=../playback}}      {{/each}}  {{else}}      <p>No results found</p> diff --git a/tmpl/term-grouped.html b/tmpl/term-grouped.html index 0de22bb9..93281ee9 100644 --- a/tmpl/term-grouped.html +++ b/tmpl/term-grouped.html @@ -1,33 +1,37 @@  <div class="term-definition">      <div class="action-bar">          {{#if addable}} -        <a href="#" title="Add term as expression" class="action-add-note pending disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="img/add_term_kanji.png"></a> -        <a href="#" title="Add term as reading" class="action-add-note pending disabled" data-mode="term_kana" data-index="{{@index}}"><img src="img/add_term_kana.png"></a> +            <a href="#" title="Add term as expression" class="action-add-note pending disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="img/add_term_kanji.png"></a> +            <a href="#" title="Add term as reading" class="action-add-note pending disabled" data-mode="term_kana" data-index="{{@index}}"><img src="img/add_term_kana.png"></a>          {{/if}}          {{#if playback}} -        <a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="img/play_audio.png"></a> +            <a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="img/play_audio.png"></a>          {{/if}}      </div>      {{#if reading}} -    <div class="term-expression"><ruby>{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}<rt>{{reading}}</rt></ruby></div> +        <div class="term-expression"><ruby>{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}<rt>{{reading}}</rt></ruby></div>      {{else}} -    <div class="term-expression">{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}</div> +        <div class="term-expression">{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}</div>      {{/if}}      {{#if reasons}} -    <div class="term-reasons"> -        {{#each reasons}} -        <span class="reasons">{{.}}</span> {{#unless @last}}«{{/unless}} -        {{/each}} -    </div> +        <div class="term-reasons"> +            {{#each reasons}} +                <span class="reasons">{{.}}</span> {{#unless @last}}«{{/unless}} +            {{/each}} +        </div>      {{/if}}      <div class="term-glossary"> +        {{#if definitions.[1]}}          <ol>              {{#each definitions}} -            <li>{{> term-definition.html}}</li> +                <li>{{> term-definition.html}}</li>              {{/each}}          </ol> +        {{else}} +            {{> term-definition.html definitions.[0]}} +        {{/if}}      </div>  </div> diff --git a/tmpl/term-list.html b/tmpl/term-list.html index ab03c7c2..1315d132 100644 --- a/tmpl/term-list.html +++ b/tmpl/term-list.html @@ -1,7 +1,7 @@  {{#if definitions}}      {{#each definitions}} -    {{> term.html addable=../addable playback=../playback}} -    <br> +        {{#unless @first}}<hr>{{/unless}} +        {{> term.html addable=../addable playback=../playback}}      {{/each}}  {{else}}      <p>No results found</p> diff --git a/tmpl/term.html b/tmpl/term.html index 59ac80df..0e19dbf4 100644 --- a/tmpl/term.html +++ b/tmpl/term.html @@ -1,26 +1,26 @@  <div class="term-definition">      <div class="action-bar">          {{#if addable}} -        <a href="#" title="Add term as expression" class="action-add-note pending disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="img/add_term_kanji.png"></a> -        <a href="#" title="Add term as reading" class="action-add-note pending disabled" data-mode="term_kana" data-index="{{@index}}"><img src="img/add_term_kana.png"></a> +            <a href="#" title="Add term as expression" class="action-add-note pending disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="img/add_term_kanji.png"></a> +            <a href="#" title="Add term as reading" class="action-add-note pending disabled" data-mode="term_kana" data-index="{{@index}}"><img src="img/add_term_kana.png"></a>          {{/if}}          {{#if playback}} -        <a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="img/play_audio.png"></a> +            <a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="img/play_audio.png"></a>          {{/if}}      </div>      {{#if reading}} -    <div class="term-expression"><ruby>{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}<rt>{{reading}}</rt></ruby></div> +        <div class="term-expression"><ruby>{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}<rt>{{reading}}</rt></ruby></div>      {{else}} -    <div class="term-expression">{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}</div> +        <div class="term-expression">{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}</div>      {{/if}}      {{#if reasons}} -    <div class="term-reasons"> -        {{#each reasons}} -        <span class="reasons">{{.}}</span> {{#unless @last}}«{{/unless}} -        {{/each}} -    </div> +        <div class="term-reasons"> +            {{#each reasons}} +                <span class="reasons">{{.}}</span> {{#unless @last}}«{{/unless}} +            {{/each}} +        </div>      {{/if}}      <div class="term-glossary"> |