pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] Edit menu button

Browse Source 
bzr revid: fme@openerp.com-20131104174720-4qhpu2t8v02227wa
This commit is contained in:
Fabien Meghazi
2013-11-04 18:47:20 +01:00
parent 678daaf169
commit 92e01169a0
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/js/website.js
+3
View File
@@ -129,6 +129,9 @@
dom_ready.then(function () {
/* ----- BOOTSTRAP STUFF ---- */
$('.js_tooltip').bstooltip();
/* ----- PUBLISHING STUFF ---- */
$('[data-publish]:has(.js_publish)').each(function () {
var $pub = $("[data-publish]", this);
addons/website/views/website_templates.xml
+8 -2
View File
@@ -81,6 +81,11 @@
<script type="text/javascript" src="/website/static/lib/bootstrap-tour/bootstrap-tour.js"></script>
<script t-if="not translatable" type="text/javascript" src="/website/static/lib/ace/ace.js"></script>
<script type="text/javascript" src="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
<script type="text/javascript">
// Bootstrap and jQuery UI conflicts
$.fn.bstooltip = $.fn.tooltip;
$.fn.bsbutton = $.fn.button;
</script>
<script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
<link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/>
<!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) -->
@@ -138,8 +143,9 @@
</ul>
</li>
</ul>
<button t-if="editable" type="button" class="js_edit_menu btn btn-primary mt8 pull-right">
<i class="icon-reorder"/> Edit Menu
<button t-if="editable" type="button" title="Edit menu" data-placement="left"
class="js_edit_menu js_tooltip oe_admin_action btn btn-warning mt8 pull-right">
<i class="icon-edit"/>
</button>
</div>
</div>