diff options
author | Thomas Citharel <tcit@tcit.fr> | 2014-12-07 23:36:35 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2014-12-07 23:36:35 +0100 |
commit | 311baf86befde0557faea614ca4d13bb2bd2cc66 (patch) | |
tree | dca9d7d429680db23cd4256a1c388ed3db4049ca | |
parent | 9c55ed0923273da886497cb62302a79622e34a74 (diff) | |
download | wallabag-311baf86befde0557faea614ca4d13bb2bd2cc66.tar.gz wallabag-311baf86befde0557faea614ca4d13bb2bd2cc66.tar.zst wallabag-311baf86befde0557faea614ca4d13bb2bd2cc66.zip |
implemented random button
-rwxr-xr-x | inc/poche/Poche.class.php | 3 | ||||
-rwxr-xr-x | themes/baggy/css/main.css | 3 | ||||
-rwxr-xr-x | themes/baggy/home.twig | 2 | ||||
-rwxr-xr-x | themes/default/css/style.css | 10 | ||||
-rwxr-xr-x | themes/default/home.twig | 3 | ||||
-rw-r--r-- | themes/default/img/default/dice.png | bin | 0 -> 243 bytes |
6 files changed, 18 insertions, 3 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 27d6f4a6..2a8037cc 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -445,6 +445,7 @@ class Poche | |||
445 | $tpl_vars['entries'] = $this->store->getEntriesByView($view, $this->user->getId(), $this->pagination->get_limit(), $id); | 445 | $tpl_vars['entries'] = $this->store->getEntriesByView($view, $this->user->getId(), $this->pagination->get_limit(), $id); |
446 | $tpl_vars['page_links'] = $page_links; | 446 | $tpl_vars['page_links'] = $page_links; |
447 | $tpl_vars['nb_results'] = $count; | 447 | $tpl_vars['nb_results'] = $count; |
448 | $tpl_vars['random'] = rand(1,$count); | ||
448 | } | 449 | } |
449 | Tools::logm('display ' . $view . ' view'); | 450 | Tools::logm('display ' . $view . ' view'); |
450 | break; | 451 | break; |
@@ -812,4 +813,4 @@ class Poche | |||
812 | } | 813 | } |
813 | 814 | ||
814 | 815 | ||
815 | } \ No newline at end of file | 816 | } |
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 1df82910..78d56612 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css | |||
@@ -736,6 +736,9 @@ a.add-to-wallabag-link-after:after { | |||
736 | .icon-print:before { | 736 | .icon-print:before { |
737 | content: "\e80d"; | 737 | content: "\e80d"; |
738 | } | 738 | } |
739 | .icon-random:before { | ||
740 | // RANDOM ICON TO ADD | ||
741 | } | ||
739 | 742 | ||
740 | 743 | ||
741 | /* .icon-image class, for image-based icons | 744 | /* .icon-image class, for image-based icons |
diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index dec848f2..eb554b11 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig | |||
@@ -25,7 +25,7 @@ | |||
25 | {% block pager %} | 25 | {% block pager %} |
26 | {% if nb_results > 1 %} | 26 | {% if nb_results > 1 %} |
27 | <div class="results"> | 27 | <div class="results"> |
28 | <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if search_term is defined %} {% trans %}found for « {{ search_term }} »{% endtrans %}{% endif %}</div> | 28 | <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if search_term is defined %} {% trans %}found for « {{ search_term }} »{% endtrans %}{% endif %} <span class="icon icon-random"><a href="?view=view&id={{ random }}"> {% trans "random" %}</span></div> |
29 | {{ page_links | raw }} | 29 | {{ page_links | raw }} |
30 | </div> | 30 | </div> |
31 | {% elseif nb_results == 1 %} | 31 | {% elseif nb_results == 1 %} |
diff --git a/themes/default/css/style.css b/themes/default/css/style.css index b25373d6..a122dc54 100755 --- a/themes/default/css/style.css +++ b/themes/default/css/style.css | |||
@@ -151,6 +151,16 @@ a:visited { | |||
151 | text-indent: -9999px; | 151 | text-indent: -9999px; |
152 | } | 152 | } |
153 | 153 | ||
154 | .random { | ||
155 | display: inline-block; | ||
156 | width: 16px; | ||
157 | height: 16px; | ||
158 | overflow: hidden; | ||
159 | text-align: left; | ||
160 | text-indent: -9999px; | ||
161 | background-image: url('../img/default/dice.png'); | ||
162 | } | ||
163 | |||
154 | /*** ***/ | 164 | /*** ***/ |
155 | 165 | ||
156 | /*** ARTICLE PAGE ***/ | 166 | /*** ARTICLE PAGE ***/ |
diff --git a/themes/default/home.twig b/themes/default/home.twig index 6bc549e6..aa332600 100755 --- a/themes/default/home.twig +++ b/themes/default/home.twig | |||
@@ -31,7 +31,8 @@ | |||
31 | {% block pager %} | 31 | {% block pager %} |
32 | {% if nb_results > 1 %} | 32 | {% if nb_results > 1 %} |
33 | <div class="results"> | 33 | <div class="results"> |
34 | <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %}</div> | 34 | <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %} |
35 | <a class="random" href="?view=view&id={{ random }}"><span>{% trans "random" %}</span></a></div> | ||
35 | {{ page_links | raw }} | 36 | {{ page_links | raw }} |
36 | </div> | 37 | </div> |
37 | {% elseif nb_results == 1 %} | 38 | {% elseif nb_results == 1 %} |
diff --git a/themes/default/img/default/dice.png b/themes/default/img/default/dice.png new file mode 100644 index 00000000..70af6d0b --- /dev/null +++ b/themes/default/img/default/dice.png | |||
Binary files differ | |||