Merge branch 'master' into PHRAS-2686_paging_new_design

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";

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;
+}
 

resources/www/report/styles/main.scss

@@ -356,3 +356,7 @@ $select-height: 26px;
     background-color: #212121;
   }
 }
+
+#mainMenu li .context-menu-item-inner a:hover {
+  color: #000;
+}

templates/web/common/menubar.html.twig

@@ -235,11 +235,10 @@
                 <a target="_blank" href="https://docs.phraseanet.com/4.0/">
             <span>
               {{ 'phraseanet:: aide' | trans }}
-                <span style="display:inline-block;cursor:pointer;padding:0;border:none;padding-right:4px;padding-left:4px;"
-                      id="help-trigger"> <i class="fa fa-caret-down" aria-hidden="true"></i></span>
             </span>
                 </a>
-                <table cellspacing="0" cellpadding="0" style="display:none;" class="contextMenu helpcontextmenu">
+                <span id="help-trigger" class="help-trigger"> <i class="fa fa-caret-down" aria-hidden="true"></i></span>
+                <table cellspacing="0" cellpadding="0" class="contextMenu helpcontextmenu context-menu-theme-vistamenu-bar">
                     <tbody>
                     <tr>
                         <td>
@@ -301,6 +300,10 @@
 
 <script type="text/javascript">
     $(document).ready(function () {
+        $('body').on('click', '#help-trigger', function (event) {
+            $('#mainMenu .helpcontextmenu').toggleClass('shown');
+            console.log('mety');
+        });
         // var key = 'help';
         var configurationSettingLinks = {{ configuration|json_encode|raw }};
         //seperate array based on location of link

templates/web/prod/actions/edit_default.html.twig

@@ -196,8 +196,10 @@
                             <div style="position:absolute; top:0px; left:0px; right:70px; height:17px;">
                                 <input type='text' style="font-size:15px; position:absolute; top:0px; left:0px; width:100%; height:100%;" id="EditTextMultiValued" value="" />
                             </div>
-                            <div style="position:absolute; top:6px; width:60px; right:0px; height:11px;">
+                            <div style="position:absolute; top:4px; width:60px; right:6px; height:24px;">
-                                <img id="EditButAddMultiValued add-multivalued-field-action" style="cursor:pointer" src="/assets/common/images/icons/plus16.png" />
+                                <button type="submit" class="submit-multivalued">
+                                    <img id="EditButAddMultiValued" style="cursor:pointer" src="/assets/common/images/icons/plus16.png" />
+                                </button>
                             </div>
                         </form>
                         <div id="ZTextMultiValued_values"></div>