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

PHRAS-2669 #comment Workzone basket : add border color for selected item #time 4h

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-04-20 11:13:39 +04:00
parent 53a5dd2bdb
commit 51aeb4bd5a
4 changed files with 24 additions and 31 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", "normalize-css": "^2.1.0",
"npm": "^6.0.0", "npm": "^6.0.0",
"npm-modernizr": "^2.8.3", "npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.174-d", "phraseanet-production-client": "0.34.175-d",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"tinymce": "^4.0.28", "tinymce": "^4.0.28",
"underscore": "^1.8.3", "underscore": "^1.8.3",

27
templates/web/prod/WorkZone/Macros.html.twig
View File

@@ -346,18 +346,6 @@
{% import 'common/thumbnail.html.twig' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
<div class="chim-content"> <div class="chim-content">
{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_title_display') == '1' %}
<div class="title">
{{ record.get_title()|truncate(20, "...") }}
</div>
{% endif %}
{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_status_display') == '1' %}
<div class="status" style="position:relative;height:20px;overflow-y:visible;z-index:15;">
{% for flag in record_flags(record) %}
<img src="{{ flag.path }}" title="{{ attribute(flag.labels, app.locale) }}" />
{% endfor %}
</div>
{% endif %}
<div class="CHIM diapo CHIM_{{record.get_serialize_key()}} open-preview-action" <div class="CHIM diapo CHIM_{{record.get_serialize_key()}} open-preview-action"
data-kind="{% if wz_scope == 'groupings' %}REG{% else %}BASK{% endif %}" data-kind="{% if wz_scope == 'groupings' %}REG{% else %}BASK{% endif %}"
data-position="{{ ord }}" data-position="{{ ord }}"
@@ -365,7 +353,20 @@
style="height:{{box_height}}px;" style="height:{{box_height}}px;"
id="CHIM_{% if wz_scope == 'groupings' %}{{record.get_serialize_key()}}{% else %}{{ contained.getId() }}{% endif %}"> id="CHIM_{% if wz_scope == 'groupings' %}{{record.get_serialize_key()}}{% else %}{{ contained.getId() }}{% endif %}">
<input type="hidden" name="id" value="{{ record.get_serialize_key() }}"/> <input type="hidden" name="id" value="{{ record.get_serialize_key() }}"/>
<div class="diapo_top">
{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_title_display') == '1' %}
<div class="title">
{{ record.get_title()|truncate(20, "...") }}
</div>
{% endif %}
{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_status_display') == '1' %}
<div class="status" style="position:relative;height:20px;overflow-y:visible;z-index:15;">
{% for flag in record_flags(record) %}
<img src="{{ flag.path }}" title="{{ attribute(flag.labels, app.locale) }}" />
{% endfor %}
</div>
{% endif %}
</div>
<div class="record-number"> <div class="record-number">
{{record.getNumber()}} {{record.getNumber()}}
</div> </div>

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

@@ -73,6 +73,11 @@
color: {{"#" ~ app['settings'].getUserSetting(app.getAuthenticatedUser(), 'fontcolor-selection', 'FFFFFF')}}; color: {{"#" ~ app['settings'].getUserSetting(app.getAuthenticatedUser(), 'fontcolor-selection', 'FFFFFF')}};
background-color: {{"#" ~ app['settings'].getUserSetting(app.getAuthenticatedUser(), 'background-selection', 'ab47bc')}}; background-color: {{"#" ~ app['settings'].getUserSetting(app.getAuthenticatedUser(), 'background-selection', 'ab47bc')}};
} }
#idFrameC .diapo.selected {
border: 3px solid {{"#" ~ app['settings'].getUserSetting(app.getAuthenticatedUser(), 'background-selection', 'ab47bc')}} !important;
background-color: transparent;
}
</style> </style>
{% endblock %} {% endblock %}
@@ -1001,17 +1006,4 @@
}); });
}); });
</script> </script>
<style type="text/css">
.chim-feedback-item {
padding: 10px;
}
.ui-accordion .content {
padding: 0 5px;
text-align: center;
}
.ui-accordion .content .basket-content {
padding-left: 0;
}
</style>
{% endblock %} {% endblock %}

8
yarn.lock
View File

@@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0" js-cookie "^2.1.0"
pym.js "^1.3.1" pym.js "^1.3.1"
phraseanet-production-client@0.34.174-d: phraseanet-production-client@0.34.175-d:
version "0.34.174-d" version "0.34.175-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.174-d.tgz#1896144e78602b04a748d3f5ec33e1d848510222" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.175-d.tgz#282c2cd039083aa99d85eb9cc573076eb0a06e06"
integrity sha512-xZ270lzhMEYtKkUmUq5yeBiKHClpVgybgDsMZ9/v9Rez6l860ZAV7Ry9HS11pwX7GfDgvnDYz3eVYCuw7VbRcw== integrity sha512-9I1F0STZTsuSgtJrI0rmjkjf3M4Eca+JuwCf+q1XpDX1DThpiyGlr/0DgRkhpAEQL7Vhg4W3vW0RTmTL/Eh9sA==
dependencies: dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2" "@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6" "@turf/turf" "^5.1.6"