Feature: support any tag separator

[github/shaarli/Shaarli.git] / tpl / default / tag.cloud.html
diff --git a/tpl/default/tag.cloud.html b/tpl/default/tag.cloud.html

index 12701465e3b07704d9ab5a20c66ab24a9256ac5e..01b50b0217501ec38fa77d4f0facc57a9b4545a3 100644 (file)
--- a/tpl/default/tag.cloud.html
+++ b/tpl/default/tag.cloud.html
@@ -1,5 +1,5 @@
  <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
  <head>
    {include="includes"}
  </head>
@@ -15,7 +15,7 @@
      <h2 class="window-title">{'Tag cloud'|t} - {$countTags} {'tags'|t}</h2>
      {if="!empty($search_tags)"}
      <p class="center">
-      <a href="?searchtags={$search_tags|urlencode}" class="pure-button pure-button-shaarli">
+      <a href="{$base_path}/?searchtags={$search_tags_url}" class="pure-button pure-button-shaarli">
          {'List all links with those tags'|t}
        </a>
      </p>
@@ -26,14 +26,15 @@
        <div class="pure-u-1 pure-u-lg-1-2">
          <form method="GET">
            <input type="hidden" name="do" value="tagcloud">
-          <input type="text" name="searchtags" placeholder="{'Filter by tag'|t}"
+          <input type="text" name="searchtags" aria-label="{'Filter by tag'|t}" placeholder="{'Filter by tag'|t}"
                   {if="!empty($search_tags)"}
                      value="{$search_tags}"
                   {/if}
            autocomplete="off" data-multiple data-autofirst data-minChars="1"
            data-list="{loop="$tags"}{$key}, {/loop}"
+          class="autofocus"
            >
-          <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
+          <button type="submit" class="search-button" aria-label="{'Search'|t}"><i class="fa fa-search" aria-hidden="true"></i></button>
          </form>
        </div>
        <div class="pure-u-lg-1-4"></div>
@@ -45,10 +46,10 @@
        {/loop}
      </div>
  
-    <div id="cloudtag">
+    <div id="cloudtag" class="cloudtag-container">
        {loop="tags"}
-        <a href="?searchtags={$key|urlencode} {$search_tags|urlencode}" style="font-size:{$value.size}em;">{$key}</a
-        ><a href="?addtag={$key|urlencode}" title="{'Filter by tag'|t}" class="count">{$value.count}</a>
+        <a href="{$base_path}/?searchtags={$tags_url.$key1}{$tags_separator|urlencode}{$search_tags_url}" style="font-size:{$value.size}em;">{$key}</a
+        ><a href="{$base_path}/add-tag/{$tags_url.$key1}" title="{'Filter by tag'|t}" class="count">{$value.count}</a>
          {loop="$value.tag_plugin"}
            {$value}
          {/loop}