Skip to content

Commit

Permalink
Mendix7 (mendix#146)
Browse files Browse the repository at this point in the history
* Mendix 7 preparation

* Mendix 7 documentation

* Updates for Mendix 7

* Squash old links

* Add all the docs

* Fix menus in spaces
  • Loading branch information
JelteMX authored Feb 21, 2017
1 parent 79957d5 commit b7d94c3
Show file tree
Hide file tree
Showing 2,196 changed files with 41,249 additions and 33 deletions.
4 changes: 2 additions & 2 deletions APM/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ In some cases, tools are run for a fixed period of time. However, running after

## License<a name="license"></a>

APM requires an application license that can be requested via email using the button in the configuration dialog. If the email client is not configured, you can use the **Manual license request** button and copy-paste the text in an email to [[email protected]](mailto:[email protected]).
APM requires an application license that can be requested via email using the button in the configuration dialog. If the email client is not configured, you can use the **Manual license request** button and copy-paste the text in an email to [[email protected]](mailto:[email protected]).

A license is required per app. Every license has an end date.

Expand Down Expand Up @@ -49,7 +49,7 @@ the **Clean data** tab:

![](attachments/Dashboard/Configuration_CleanData.png)

## More<a name="More"></a>
## More<a name="more"></a>
Some other settings are collected on the **More** tab:

![](attachments/Dashboard/Configuration_More.png)
Expand Down
14 changes: 12 additions & 2 deletions _assets/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
arr,
function (p) { return p.id.replace("modeler-","").split(".").map(function (n) { return parseInt(n, 10) }); },
function (n) { return (n[0] ? n[0] * 10000 : 0) + (n[1] ? n[1] * 100 : 0) + (n[2] || 0); }
);
).reverse();
}

function addNormalLink(title, url) {
Expand Down Expand Up @@ -84,10 +84,15 @@
pages.forEach(function (page) {
var $item = $('<li />');
var subpages = data.pages.filter(function (rootpage) { return rootpage.parent && rootpage.parent.toLowerCase() === page.id.toLowerCase(); });

if (subpages && subpages.length > 0) {
var pageId = 'cat-' + normalizeId(page.id),
$collapse = $('<div class="collapse" id="'+ pageId + '" />');

if (page && page.url.indexOf("/releasenotes/desktop-modeler/") === 0) {
subpages = sortModelerPages(subpages);
}

$item.append(addExpandLink(pageId, page.title, page.url));
$collapse.append(addPages(subpages, data));
$item.append($collapse);
Expand All @@ -108,7 +113,12 @@

var catUrl = catPage && catPage.length === 1 ? catPage[0].url : null;

if (catUrl === "/releasenotes/modeler/") {
if (catUrl && (
catUrl.indexOf("/releasenotes/desktop-modeler/") === 0 ||
catUrl.indexOf("/releasenotes/APM/") === 0 ||
catUrl.indexOf("/releasenotes/model-sdk/") === 0 ||
catUrl.indexOf("/releasenotes/model-sdk/")
)) {
getPages = sortModelerPages(getPages);
}

Expand Down
Loading

0 comments on commit b7d94c3

Please sign in to comment.