Merge pull request #4870 from FinalAngel/bugfix/foundation-clash

Foundation clash over data-tooltip

CHANGELOG.txt

@@ -4,6 +4,7 @@
 - Fixed an issue with sideframe urls not being remembered after reload
 - Added placeholder name to the edit tooltip
 - Fix breadcrumb in page revision list
+- Fix clash with Foundation that caused "Add plugin" button to be unusable
 
 
 === 3.2.0 (2015-11-24) ===

cms/static/cms/sass/components/_hovertooltip.scss

@@ -58,7 +58,7 @@
 
 /* Base styles for the tooltip's content area */
 .cms-hover-tooltip:after {
-    content: attr(data-tooltip);
+    content: attr(data-cms-tooltip);
     z-index: 1;
     color: $white !important;
     font-size: $font-size-normal - 2px;

cms/static/cms/sass/mixins/_buttons.scss

@@ -6,7 +6,7 @@
     @if($important == true) {
         @return !important;
     } @else {
-        @return;
+        @return unquote('');
     }
 }
 @mixin button-variant($color, $background, $border, $important: false) {

cms/templates/cms/toolbar/dragbar.html

@@ -3,7 +3,7 @@
 <div class="cms-dragbar cms-dragbar-{{ placeholder.pk|unlocalize }}">
     {% language request.toolbar.toolbar_language %}
     <div class="cms-submenu-btn cms-submenu-add cms-btn">
-        <span class="cms-hover-tooltip cms-hover-tooltip-left cms-hover-tooltip-delay" data-tooltip="{% trans "Add plugin" %}"></span>
+        <span class="cms-hover-tooltip cms-hover-tooltip-left cms-hover-tooltip-delay" data-cms-tooltip="{% trans "Add plugin" %}"></span>
     </div>
     <div class="cms-submenu-settings cms-submenu-btn cms-btn"></div>
     <div class="cms-submenu-dropdown cms-submenu-dropdown-settings" data-touch-action="pan-y">
@@ -25,7 +25,7 @@
 
     <div class="cms-dragbar-title">
         {{ placeholder.get_label }}
-        {% if placeholder.is_static %}<span class="cms-hover-tooltip cms-hover-tooltip-right" tabindex="-1" data-tooltip="{% trans 'This is a static placeholder' %}"><span class="cms-icon cms-icon-pin cms-dragarea-static-icon"></span></span>{% endif %}
+        {% if placeholder.is_static %}<span class="cms-hover-tooltip cms-hover-tooltip-right" tabindex="-1" data-cms-tooltip="{% trans 'This is a static placeholder' %}"><span class="cms-icon cms-icon-pin cms-dragarea-static-icon"></span></span>{% endif %}
         <span class="cms-dragbar-toggler">
             <a href="#" class="cms-dragbar-expand-all">{% trans "Expand all" %}</a>
             <a href="#" class="cms-dragbar-collapse-all">{% trans "Collapse all" %}</a>

cms/templates/cms/toolbar/dragitem.html

@@ -12,18 +12,18 @@
             <div class="cms-submenu-btn cms-submenu-add cms-btn
                 {% if not allow_children %} cms-btn-disabled{% endif %}">
                 {% if not allow_children %}
-                <span class="cms-hover-tooltip" data-tooltip="{% trans "You cannot add plugins to this plugin." %}"></span>
+                <span class="cms-hover-tooltip" data-cms-tooltip="{% trans "You cannot add plugins to this plugin." %}"></span>
                 {% else %}
-                <span class="cms-hover-tooltip cms-hover-tooltip-left cms-hover-tooltip-delay" data-tooltip="{% trans "Add plugin" %}"></span>
+                <span class="cms-hover-tooltip cms-hover-tooltip-left cms-hover-tooltip-delay" data-cms-tooltip="{% trans "Add plugin" %}"></span>
                 {% endif %}
             </div>
             <div class="cms-submenu-btn cms-submenu-edit cms-btn" data-rel="edit">
-                <span class="cms-hover-tooltip cms-hover-tooltip-left cms-hover-tooltip-delay" data-tooltip="{% trans "Edit" %}"></span>
+                <span class="cms-hover-tooltip cms-hover-tooltip-left cms-hover-tooltip-delay" data-cms-tooltip="{% trans "Edit" %}"></span>
             </div>
             <div class="cms-submenu cms-submenu-settings cms-submenu-btn cms-btn"></div>
         {% else %}
             <div class="cms-hover-tooltip cms-hover-tooltip-left cms-plugin-disabled" tabindex="-1"
-                data-tooltip="{% trans "This plugin cannot be moved or edited outside of its parent" %}">
+                data-cms-tooltip="{% trans "This plugin cannot be moved or edited outside of its parent" %}">
                 <span class="cms-icon cms-icon-lock"></span>
             </div>
         {% endif %}
@@ -33,9 +33,9 @@
                 <div class="cms-submenu-item"><a data-icon="copy" data-rel="copy" href="#">{% trans "Copy" %}</a></div>
                 <div class="cms-submenu-item">
                     <a data-icon="paste" data-rel="paste" href="#">{% trans "Paste" %}</a>
-                    <span class="cms-submenu-item-paste-tooltip cms-submenu-item-paste-tooltip-empty cms-hover-tooltip cms-hover-tooltip-left cms-hover-tooltip-delay" data-tooltip="{% trans "Clipboard is empty." %}"></span>
-                    <span class="cms-submenu-item-paste-tooltip cms-submenu-item-paste-tooltip-restricted cms-hover-tooltip cms-hover-tooltip-left cms-hover-tooltip-delay" data-tooltip="{% trans "This plugin does not allow plugins of this type as nested plugins." %}"></span>
-                    <span class="cms-submenu-item-paste-tooltip cms-submenu-item-paste-tooltip-disabled cms-hover-tooltip cms-hover-tooltip-left cms-hover-tooltip-delay" data-tooltip="{% trans "This plugin cannot have nested plugins." %}"></span>
+                    <span class="cms-submenu-item-paste-tooltip cms-submenu-item-paste-tooltip-empty cms-hover-tooltip cms-hover-tooltip-left cms-hover-tooltip-delay" data-cms-tooltip="{% trans "Clipboard is empty." %}"></span>
+                    <span class="cms-submenu-item-paste-tooltip cms-submenu-item-paste-tooltip-restricted cms-hover-tooltip cms-hover-tooltip-left cms-hover-tooltip-delay" data-cms-tooltip="{% trans "This plugin does not allow plugins of this type as nested plugins." %}"></span>
+                    <span class="cms-submenu-item-paste-tooltip cms-submenu-item-paste-tooltip-disabled cms-hover-tooltip cms-hover-tooltip-left cms-hover-tooltip-delay" data-cms-tooltip="{% trans "This plugin cannot have nested plugins." %}"></span>
                 </div>
                 <div class="cms-submenu-item"><a data-icon="bin" data-rel="delete" href="#">{% trans "Delete" %}</a></div>
                 {% extra_menu_items plugin %}