hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 01:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3512 from alchemy-fr/PHRAS-3108_prod_user_pref_add_icon

Browse Source 
PHRAS-3108 #comment Prod - User pref - Add icon arround thumbnail size slider
This commit is contained in:
Nicolas Maillat
2020-05-29 20:33:16 +02:00
committed by GitHub
parent 557788b80d 65979354c9
commit 3d2524c53d
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0",
"npm": "^6.0.0",
"npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.212-d",
"phraseanet-production-client": "0.34.213-d",
"requirejs": "^2.3.5",
"tinymce": "^4.0.28",
"underscore": "^1.8.3",

4
templates/web/prod/index.html.twig
View File

@@ -812,7 +812,7 @@
<div class="box">
<div class="" style="float:left; width:49%;">
<h1>{{ 'reponses:: images par pages :' | trans }}</h1>
<div class="box">
<div class="box" style="margin-top: -1px">
<div id="nperpage_slider" class="ui-corner-all" style="width:100px; display:inline-block;"></div>
<input type="text" readonly style="width:35px;" value="{{app['settings'].getUserSetting(app.getAuthenticatedUser(), 'images_per_page')}}" id="nperpage_value"/>
</div>
@@ -820,8 +820,10 @@
<div style="float:right; width:49%;">
<h1>{{ 'reponses:: taille des images :' | trans }}</h1>
<div class="box">
<i class="fa fa-image setting-zoom-icon zoom-menu-left" aria-hidden="true"></i>
<div id="sizeAns_slider" class="ui-corner-all" style="width:100px;display:inline-block;"></div>
<input type="hidden" value="{{app['settings'].getUserSetting(app.getAuthenticatedUser(), 'images_size')}}" id="sizeAns_value"/>
<i class="fa fa-image setting-zoom-icon zoom-menu-right" aria-hidden="true"></i>
</div>
</div>
</div>

9
yarn.lock
View File

@@ -7578,10 +7578,11 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0"
pym.js "^1.3.1"
phraseanet-production-client@0.34.212-d:
version "0.34.212-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.212-d.tgz#c64386ace01ef51a82a9b6fb226b279f67798ee3"
integrity sha512-gndkYGqsK9y7lT1/79Cb1hEf308fD5rfptpJ0ShjpilhIvDvLFqPfKmEyqEKMUsSigw6+53JBke8VyzjWSpobw==
phraseanet-production-client@0.34.213-d:
version "0.34.213-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.213-d.tgz#def31d8656857128746d2973c20486d5c4145be2"
integrity sha512-M55UaCWnAXKKw4oZowXS2IoRH+1ZdCiU/neD3ieIpTQ2NuxS1FNg0CRvaMIjgSF9RpVTHrUu11bU2Kqk+Mnt2A==
dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6"