diff --git a/resources/www/common/js/components/common.js b/resources/www/common/js/components/common.js index d19965e696..39c6ddf3c8 100644 --- a/resources/www/common/js/components/common.js +++ b/resources/www/common/js/components/common.js @@ -31,17 +31,13 @@ var commonModule = (function ($, p4) { $(this).removeClass('context-menu-item-hover'); }); - // $('#help-trigger').contextMenu('#mainMenu .helpcontextmenu', {openEvt: 'click', dropDown: true, theme: 'vista', dropDown: true, - // showTransition: 'slideDown', - // hideTransition: 'hide', - // shadow: false - // }); $('body').on('click', '.infoDialog', function (event) { infoDialog($(this)); }); }); + function showOverlay(n, appendto, callback, zIndex) { var div = "OVERLAY"; diff --git a/resources/www/common/styles/main.scss b/resources/www/common/styles/main.scss index 6a99013e9b..805e018608 100644 --- a/resources/www/common/styles/main.scss +++ b/resources/www/common/styles/main.scss @@ -88,4 +88,20 @@ $mainMenuLinkBackgroundHoverColor: transparent; box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.39); } } +/*Help menu*/ +.contextMenu.helpcontextmenu { + display: none; + &.shown { + display: block; + position: absolute; + z-index: 101; + } +} +.help-trigger { + display:inline-block; + cursor:pointer; + padding: 0 4px; + border:none; + margin-left: -12px; +} diff --git a/resources/www/prod/images/Basket/Browser/archive.png b/resources/www/prod/images/Basket/Browser/archive.png index f7373f9614..ab89643a35 100644 Binary files a/resources/www/prod/images/Basket/Browser/archive.png and b/resources/www/prod/images/Basket/Browser/archive.png differ diff --git a/resources/www/prod/images/Basket/Browser/archived.png b/resources/www/prod/images/Basket/Browser/archived.png index 3e34e45736..6015eafc48 100644 Binary files a/resources/www/prod/images/Basket/Browser/archived.png and b/resources/www/prod/images/Basket/Browser/archived.png differ diff --git a/resources/www/report/styles/main.scss b/resources/www/report/styles/main.scss index 75030126a9..218fce1f28 100644 --- a/resources/www/report/styles/main.scss +++ b/resources/www/report/styles/main.scss @@ -110,7 +110,7 @@ $select-height: 26px; } .input-prepend { margin: 0; - + .dmin, .dmax { border: 0 none; height: 16px; @@ -203,7 +203,7 @@ $select-height: 26px; height: $select-height; } .select-styled { - position: absolute; + position: absolute; top: 0; right: 0; bottom: 0; @@ -232,9 +232,9 @@ $select-height: 26px; background-color: darken($select-background, 5); } } - + .select-options { - display: none; + display: none; position: absolute; top: 12px; right: -12px; @@ -292,7 +292,7 @@ $select-height: 26px; -webkit-transform: translate(-50%, -50%); -ms-transform: translate(-50%, -50%); transform: translate(-50%, -50%); - + &:hover { background-color: #2c2c2c; } @@ -355,4 +355,8 @@ $select-height: 26px; &.ui-widget-content{ background-color: #212121; } -} \ No newline at end of file +} + +#mainMenu li .context-menu-item-inner a:hover { + color: #000; +} diff --git a/templates/web/common/menubar.html.twig b/templates/web/common/menubar.html.twig index 84ab930e7d..3821f42e79 100644 --- a/templates/web/common/menubar.html.twig +++ b/templates/web/common/menubar.html.twig @@ -25,103 +25,103 @@ @@ -235,11 +235,10 @@ {{ 'phraseanet:: aide' | trans }} - - + +
@@ -301,6 +300,10 @@ diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig index c6f43ee5a8..50455d69f1 100644 --- a/templates/web/prod/WorkZone/Browser/Results.html.twig +++ b/templates/web/prod/WorkZone/Browser/Results.html.twig @@ -14,35 +14,30 @@
{% for Basket in Baskets %} -
- × +
+  
- - - - - + - -
+
+ +
{% set BasketElement = Basket.getElements().first() %} {% if BasketElement %} {{thumbnail.format(BasketElement.getRecord(app).get_thumbnail(), 150, 106, '', true, false)}} {% endif %} -
  + +

{% if Basket.getValidation() is empty or Basket.getValidation().isInitiator(app.getAuthenticatedUser()) %} - - - +   - - - +   {% endif %} - {{ Basket.getName() }} + {{ Basket.getName() }}
{{ Basket.getElements().count() }} {{ ' records' }} @@ -74,12 +69,11 @@

{% endif %} -

+
{% endfor %} @@ -99,37 +93,16 @@
{% if Page - 1 > 0 %} - - < - +   {% endif %} Page {{ Page }} / {{ MaxPage }} {% if Page + 1 <= MaxPage %} - - > - +   {% endif %}
- +