Merge branch 'MDL-60527_33-action-menu-links-missing-spaces-attribute…

…s' of https://github.com/lucaboesch/moodle into MOODLE_33_STABLE
moodle · Oct 23, 2017 · 2ea0d1ffde77e6f6460be8d4ab04d9065a892065 · 2ea0d1f
2 parents 1938195 + 92be41b
commit 2ea0d1ffde77e6f6460be8d4ab04d9065a892065
Unified Split

Showing with 62 additions and 3 deletions.

+1 −1 lib/templates/action_menu_link.mustache

+1 −1 theme/boost/templates/core/action_menu_link.mustache

+60 −1 theme/boost/templates/core/action_menu_trigger.mustache
diff --git a/lib/templates/action_menu_link.mustache b/lib/templates/action_menu_link.mustache
@@ -29,7 +29,7 @@
    }
 }}
 {{^disabled}}
-    <a href="{{url}}" class="{{classes}}" {{#attributes}}{{name}}={{#quote}}{{value}}{{/quote}}{{/attributes}} {{#showtext}}aria-labelledby="actionmenuaction-{{instance}}"{{/showtext}}>{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{#showtext}}<span class="menu-action-text" id="actionmenuaction-{{instance}}">{{{text}}}</span>{{/showtext}}</a>
+    <a href="{{url}}" class="{{classes}}" {{#attributes}}{{name}}={{#quote}}{{value}}{{/quote}} {{/attributes}}{{#showtext}}aria-labelledby="actionmenuaction-{{instance}}"{{/showtext}}>{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{#showtext}}<span class="menu-action-text" id="actionmenuaction-{{instance}}">{{{text}}}</span>{{/showtext}}</a>
 {{/disabled}}
 {{#disabled}}
    <span class="currentlink" role="menuitem">{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{{text}}}</span>
diff --git a/theme/boost/templates/core/action_menu_link.mustache b/theme/boost/templates/core/action_menu_link.mustache
@@ -27,7 +27,7 @@
    }
 }}
 {{^disabled}}
-    <a href="{{url}}" class="{{classes}}" {{#attributes}}{{name}}={{#quote}}{{value}}{{/quote}}{{/attributes}} {{#showtext}}aria-labelledby="actionmenuaction-{{instance}}"{{/showtext}}>{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{#showtext}}<span class="menu-action-text" id="actionmenuaction-{{instance}}">{{{text}}}</span>{{/showtext}}</a>
+    <a href="{{url}}" class="{{classes}}" {{#attributes}}{{name}}={{#quote}}{{value}}{{/quote}} {{/attributes}}{{#showtext}}aria-labelledby="actionmenuaction-{{instance}}"{{/showtext}}>{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{#showtext}}<span class="menu-action-text" id="actionmenuaction-{{instance}}">{{{text}}}</span>{{/showtext}}</a>
 {{/disabled}}
 {{#disabled}}
    <span class="currentlink" role="menuitem">{{#icon}}{{#pix}}{{key}},{{component}},{{title}}{{/pix}}{{/icon}}{{{text}}}</span>
diff --git a/theme/boost/templates/core/action_menu_trigger.mustache b/theme/boost/templates/core/action_menu_trigger.mustache
@@ -15,14 +15,73 @@
    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
+    @template core/action_menu_trigger
+
    Action menu trigger.
+
+    Example context (json):
+    {
+        "text": "Example link text",
+        "title": "Example link title",
+        "url": "http://example.com/link",
+        "classes": "icon menu-action",
+        "instance": "1",
+        "attributes": [
+            {"name": "role", "value": "menuitem" },
+            {"name": "data-title", "value": "mymoodle,admin" }
+        ],
+        "secondary": {
+            "classes": "menu  align-tr-br",
+            "attributes": [
+                {"name": "id", "value": "action-menu-0-menu"},
+                {"name": "data-rel", "value": "menu-content"},
+                {"name": "role", "value": "menu"},
+                {"name": "data-align", "value": "tr-br"}
+            ],
+            "items": [
+                {"actionmenulink":
+                    {
+                    "id": "action_link59ecf8394a68078",
+                    "disabled": false,
+                    "text": "Dashboard",
+                    "url": "http://example.com/link",
+                    "icon": {
+                        "key": "i/dashboard",
+                        "component": null,
+                        "title": "Dashboard"
+                        },
+                    "classes": "icon menu-action",
+                    "attributes": [
+                        {"name": "role", "value": "menuitem"},
+                        {"name": "data-title", "value": "mymoodle,admin"}
+                        ],
+                    "instance": 1,
+                    "showtext": true
+                    }
+                },
+                {"actionmenufiller":
+                    {
+                    "id": "action_link59ecf8394a68079",
+                    "disabled": false,
+                    "text": "",
+                    "url": "",
+                    "icon": null,
+                    "classes": "",
+                    "attributes": [
+                        {"name": "role", "value": "menuitem"}
+                        ]
+                    }
+                }
+            ]
+        }
+    }
 }}
 <div class="dropdown d-inline">
    <a href="#" class="dropdown-toggle" id="dropdown-{{instance}}" title="{{title}}" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{{actiontext}}}{{{menutrigger}}}{{#icon}}{{#pix}}{{key}},{{component}},{{title}}{{/pix}}{{/icon}}{{#rawicon}}{{{.}}}{{/rawicon}}{{#menutrigger}}<b class="caret"></b>{{/menutrigger}}</a>
    {{#secondary}}
        <div class="dropdown-menu dropdown-menu-right {{classes}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
            {{#items}}{{!
-                }}{{#actionmenulink}}<a href="{{url}}" class="dropdown-item {{classes}}" {{#attributes}}{{name}}={{#quote}}{{value}}{{/quote}}{{/attributes}} {{#showtext}}aria-labelledby="actionmenuaction-{{instance}}"{{/showtext}}>{{#icon}}{{#pix}}{{key}},{{component}},{{title}}{{/pix}}{{/icon}}{{#showtext}}<span class="menu-action-text" id="actionmenuaction-{{instance}}">{{{text}}}</span>{{/showtext}}</a>{{/actionmenulink}}{{!
+                }}{{#actionmenulink}}<a href="{{url}}" class="dropdown-item {{classes}}" {{#attributes}}{{name}}={{#quote}}{{value}}{{/quote}} {{/attributes}}{{#showtext}}aria-labelledby="actionmenuaction-{{instance}}"{{/showtext}}>{{#icon}}{{#pix}}{{key}},{{component}},{{title}}{{/pix}}{{/icon}}{{#showtext}}<span class="menu-action-text" id="actionmenuaction-{{instance}}">{{{text}}}</span>{{/showtext}}</a>{{/actionmenulink}}{{!
                }}{{#actionmenufiller}}<div class="dropdown-divider"></div>{{/actionmenufiller}}{{!
                }}{{^actionmenulink}}{{^actionmenufiller}}<div class="dropdown-item">{{> core/action_menu_item }}</div>{{/actionmenufiller}}{{/actionmenulink}}{{!
            }}{{/items}}