PHRAS-68 Context menu is disable for menu bar in account template

This commit is contained in:
Nicolas Le Goff
2014-04-10 19:03:53 +02:00
parent 317372eb96
commit 445ac04b69
3 changed files with 37 additions and 4 deletions

View File

@@ -9,6 +9,12 @@
* changes. http://yourdomain/min/builder/ * changes. http://yourdomain/min/builder/
* */ * */
$groups = array( $groups = array(
'account' => array(
'//include/jslibs/jquery.contextmenu_scroll.js',
'//assets/jquery.cookie/jquery.cookie.js',
'//include/jquery.common.js',
'//skins/account/account.js'
),
'authentication_css' => array( 'authentication_css' => array(
'//assets/normalize-css/normalize.css', '//assets/normalize-css/normalize.css',
'//skins/build/login.css', '//skins/build/login.css',

View File

@@ -4,11 +4,39 @@
{% extends "common/index_bootstrap.html.twig" %} {% extends "common/index_bootstrap.html.twig" %}
{% block stylesheet %} {% block stylesheet %}
<link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'skins/build/account.css' }) }}"/> <link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'skins/build/account.css,include/jslibs/jquery.contextmenu.css' }) }}"/>
<style type="text/css">
.context-menu-theme-vista .context-menu-item .context-menu-item-inner {
padding: 4px 20px;
margin-left: 0;
color: #75ABFF;
}
.context-menu-theme-vista .context-menu-item-hover {
background-image: none;
background-color: #75ABFF;
border: none;
}
.context-menu-theme-vista .context-menu-item-hover .context-menu-item-inner {
color: #212121;
}
.context-menu-theme-vista {
background-image: none;
background-color: #212121;
-webkit-border-bottom-left-radius: 3px;
-webkit-border-bottom-right-radius: 3px;
-moz-border-radius-bottomleft: 3px;
-moz-border-radius-bottomright: 3px;
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
}
</style>
{% endblock %} {% endblock %}
{% block javascript %} {% block javascript %}
<script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : '/skins/account/account.js' }) }}"></script> <script type="text/javascript" src="{{ path('minifier', { 'g' : 'account' }) }}"></script>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
@@ -46,6 +74,7 @@
</div> </div>
</div> </div>
</div> </div>
<div id="DIALOG"></div>
{% block scripts %} {% block scripts %}
<script type="text/javascript"> <script type="text/javascript">
// close alerts // close alerts

View File

@@ -22,7 +22,6 @@ $(document).ready(function () {
$.datepicker.setDefaults($.datepicker.regional[jq_date]); $.datepicker.setDefaults($.datepicker.regional[jq_date]);
$('a.infoDialog,div.infoDialog').live('click', function (event) { $('a.infoDialog,div.infoDialog').live('click', function (event) {
console.log("click");
infoDialog($(this)); infoDialog($(this));
}); });
@@ -317,7 +316,6 @@ function setPref(name, value) {
function infoDialog(el) { function infoDialog(el) {
$("#DIALOG").attr('title', '') $("#DIALOG").attr('title', '')
.empty() .empty()
.append(el.attr('infos')) .append(el.attr('infos'))