TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes issue where twig passed null 

Minor update to dropdown docs
This commit is contained in:
Samuel Georges 2016-02-09 17:58:37 +11:00
parent 23da8330e7
commit 03e7c19a5d
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/cms/classes/Controller.php
View File

@ -1089,6 +1089,9 @@ class Controller
*/
if (is_bool($parameters)) {
$routePersistence = $parameters;
}
if (!is_array($parameters)) {
$parameters = [];
}

60
modules/system/assets/ui/docs/dropdown.md
View File

@ -1,35 +1,35 @@
Customized dropdown menu
# Example
### Small
<div class="dropdown">
<a href="#" data-toggle="dropdown" class="btn btn-primary oc-icon-plus">Add small</a>
<div class="btn-group">
<div class="dropdown">
<a href="#" data-toggle="dropdown" class="btn btn-primary oc-icon-plus">Add small</a>
<ul class="dropdown-menu" role="menu" data-dropdown-title="Add something small">
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-folder-close">Group</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-copy">Page</a></li>
</ul>
</div>
<div class="dropdown">
<a href="#" data-toggle="dropdown" class="btn btn-primary oc-icon-plus">Add large</a>
<ul class="dropdown-menu" role="menu" data-dropdown-title="Add something large">
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-folder-close">Group</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-copy">Page</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-briefcase">Briefcase</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-link">Link</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-tag">Tag</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-zoom-out">Zoom out</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-briefcase">Briefcase</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-link">Link</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-tag">Tag</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-zoom-out">Zoom out</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-briefcase">Briefcase</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-link">Link</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-tag">Tag</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-zoom-out">Zoom out</a></li>
</ul>
</div>
<ul class="dropdown-menu" role="menu" data-dropdown-title="Add something small">
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-folder">Group</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-copy">Page</a></li>
</ul>
</div>
### Large
<div class="dropdown">
<a href="#" data-toggle="dropdown" class="btn btn-primary oc-icon-plus">Add large</a>
<ul class="dropdown-menu" role="menu" data-dropdown-title="Add something large">
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-folder">Group</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-copy">Page</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-briefcase">Briefcase</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-link">Link</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-tag">Tag</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-search-minus">Zoom out</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-briefcase">Briefcase</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-link">Link</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-tag">Tag</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-search-minus">Zoom out</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-briefcase">Briefcase</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-link">Link</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-tag">Tag</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#" class="oc-icon-search-minus">Zoom out</a></li>
</ul>
</div>