Skip to content

Commit ee6f269

Browse files
fazzdevfazzdev
authored
Merge pull request #96 from mendix/feature/atlas-ui
Release 5.0.0 using Atlas UI in Mendix 7.9
2 parents 67ae53f + a71e271 commit ee6f269

File tree

89 files changed

+13382
-1
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+13382
-1
lines changed

‎DIST/RestServices_mx7_5.0.0.mpk

763 KB
Binary file not shown.

‎RestServices.mpr

6.2 MB
Binary file not shown.

‎javasource/restservices/RestServices.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class RestServices {
2020
/**
2121
* Version of the RestServices module
2222
*/
23-
public static final String VERSION = "4.2.2";
23+
public static final String VERSION = "5.0.0";
2424

2525
/**
2626
* Amount of objects that are processed by the module at the same time.

‎theme/.DS_Store

6 KB
Binary file not shown.

‎theme/LICENSE

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2017 Mendix
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎theme/README.md

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Mendix Atlas UI
2+
Mendix Atlas UI is the foundation of making beautiful apps with Mendix. For more information about the framework go [here](https://atlas.mendix.com/).
3+
4+
### Theme folder structure
5+
The theme folder contains the default HTML pages, Sass, CSS and resources needed to style your application.
6+
7+
#### Workflow
8+
In the Sass folder you will notice two main folders, custom and lib. The lib folder houses the complete Mendix UI Framework. The custom folder is where we recommend doing *all customizations*. This will making updating to the new framework easier.
9+
10+
##### Structure
11+
Mendix is capable of creating beautiful and user-friendly UI. Our Atlas UI framework demonstrates some of its possibilities. Here you will find a basic overview of our framework.
12+
13+
```
14+
theme/
15+
├── styles/
16+
| ├── css/
17+
| │ ├── * all output files
18+
| └── sass/
19+
| ├── custom/
20+
| | ├── _custom-variable.scss
21+
| | ├── custom.scss
22+
| ├── lib/
23+
|           ├── base/
24+
|           ├── buildinblocks/
25+
| ├── components/
26+
| ├── customwidgets/
27+
|           ├── layouts/
28+
|          ├── _variable.scss
29+
| ├── lib.scss
30+
|
31+
├── * index files
32+
├── * assets
33+
```
34+
35+
###### Base
36+
The base folder contains the *architecture* for our framework. Here you will find our *mixins* and *resets*.
37+
38+
###### Components
39+
This directory contains the styling of all kinds of basic components like the datagrid, buttons, label, form, listview, and anything along those lines. They have distinct properties and can't be broken down further without losing their meaning.
40+
41+
###### Custom Widgets
42+
This directory contains any extra styling that might be needed for custom widgets downloaded from the Mendix App Store.
43+
44+
###### Building Blocks
45+
Building blocks are made up of components and widgets. For example *cards* or *headers* are building blocks. A building block could be an image, a title, and a button, assembled together into one UI block.
46+
47+
###### Layouts
48+
The layout directory contains some styles for the main sections of the layout (topbar, sidebar, footer and so on).
49+
50+
###### Variable.scss
51+
This file contains the style settings that are used across the project, allowing for consistent typography, color schemes, etc.
52+
53+
### License
54+
55+
MIT

‎theme/components.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"files":{"css":["lib/bootstrap/css/bootstrap.min.css","mxclientsystem/mxui/ui/mxui.css","styles/css/lib/lib.css","styles/css/custom/custom.css"],"js":["mxclientsystem/mxui/mxui.js"]},"cachebust":"635689412670032000"}

‎theme/config.rb

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# This file makes sure every theme has the same default output
2+
# More documentation: http://compass-style.org/help/documentation/configuration-reference/
3+
4+
# Can be :scss or :sass. Defaults to :scss
5+
preferred_syntax = :scss
6+
# The path to the project when running within the web server
7+
http_path = '/'
8+
# The directory where the css stylesheets are kept
9+
css_dir = 'styles/css'
10+
# The directory where the sass stylesheets are kept
11+
sass_dir = 'styles/sass'
12+
# Indicates whether the compass helper functions should generate relative urls from the generated css to assets, or absolute urls using the http path for that asset type
13+
relative_assets = true
14+
# Indicates whether line comments should be added to compiled css that says where the selectors were defined
15+
line_comments = false
16+
# Set this to true to enable sourcemap output
17+
sourcemap = false
18+
# The output style for the compiled css
19+
output_style = :expanded

‎theme/favicon.ico

4.19 KB
Binary file not shown.

‎theme/index-rtl.html

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6+
<title>Mendix</title>
7+
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
8+
<meta name="apple-mobile-web-app-capable" content="yes">
9+
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css?{{cachebust}}">
10+
<link rel="stylesheet" href="lib/bootstrap-rtl/css/bootstrap-rtl.min.css?{{cachebust}}">
11+
<link rel="stylesheet" href="mxclientsystem/mxui/ui/mxui.css?{{cachebust}}">
12+
13+
<link rel="stylesheet" href="styles/css/lib/lib.css?{{cachebust}}">
14+
<link rel="stylesheet" href="styles/css/custom/custom.css?{{cachebust}}">
15+
</head>
16+
<body dir="rtl">
17+
<div id="content"></div>
18+
<script>
19+
dojoConfig = {
20+
baseUrl: "mxclientsystem/dojo/",
21+
cacheBust: "{{cachebust}}",
22+
ltrRedirect: "index.html"
23+
};
24+
</script>
25+
<script src="mxclientsystem/mxui/mxui.js?{{cachebust}}"></script>
26+
</body>
27+
</html>

‎theme/index.html

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6+
<title>Mendix</title>
7+
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
8+
<meta name="apple-mobile-web-app-capable" content="yes">
9+
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css?{{cachebust}}">
10+
<link rel="stylesheet" href="mxclientsystem/mxui/ui/mxui.css?{{cachebust}}">
11+
12+
<link rel="stylesheet" href="styles/css/lib/lib.css?{{cachebust}}">
13+
<link rel="stylesheet" href="styles/css/custom/custom.css?{{cachebust}}">
14+
15+
<!-- ICONS EXAMPLE -->
16+
17+
<!-- iPhone retina icon (iOS < 7) -->
18+
<!-- <link href="resources/ios/icons/apple-touch-icon-precomposed-114x114.png" sizes="114x114" rel="apple-touch-icon-precomposed"> -->
19+
20+
<!-- STARTUP IMAGES -->
21+
<!-- <link href="resources/ios/startup/apple-touch-startup-image-1496x2048.png" media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)" rel="apple-touch-startup-image"> -->
22+
23+
</head>
24+
<body dir="ltr">
25+
<div id="content"></div>
26+
<script>
27+
dojoConfig = {
28+
baseUrl: "mxclientsystem/dojo/",
29+
cacheBust: "{{cachebust}}",
30+
rtlRedirect: "index-rtl.html"
31+
};
32+
</script>
33+
<script>
34+
if (!document.cookie || !document.cookie.match(/(^|;)originURI=/gi))
35+
document.cookie = "originURI=/login.html";
36+
</script>
37+
<script src="mxclientsystem/mxui/mxui.js?{{cachebust}}"></script>
38+
</body>
39+
</html>

‎theme/login-with-sso.html

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6+
<title>Login</title>
7+
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
8+
<meta name="apple-mobile-web-app-capable" content="yes">
9+
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css?{{cachebust}}">
10+
<link rel="stylesheet" href="styles/login.css?{{cachebust}}">
11+
</head>
12+
<body>
13+
<div class="login-container">
14+
<form id="loginForm" class="login-form">
15+
<div class="login-logo"></div>
16+
<a id="ssoButton" href="/openid/login" class="login-sso-button btn btn-primary">Sign in with your Mendix account</a>
17+
18+
<label class="login-or-label">&ndash; or &ndash; </label>
19+
20+
<div class="login-form-inputs well">
21+
<label class="login-local-label">Sign in with a local account</label>
22+
<div id="loginMessage" class="alert alert-danger login-message"></div>
23+
24+
<div class="form-group">
25+
<label id="usernameLabel" for="usernameInput">User name</label>
26+
<input id="usernameInput" class="form-control" type="text" placeholder="User name" autocorrect="off" autocapitalize="none">
27+
</div>
28+
<div class="form-group">
29+
<label id="passwordLabel" for="passwordInput">Password</label>
30+
<input id="passwordInput" class="form-control" type="password" placeholder="Password" autocorrect="off" autocapitalize="none">
31+
</div>
32+
<button id="loginButton" type="submit" class="btn btn-primary">Sign in</button>
33+
</div>
34+
</form>
35+
</div>
36+
37+
<script src="js/login_i18n.js?{{cachebust}}"></script>
38+
<script src="js/login.js?{{cachebust}}"></script>
39+
</body>
40+
</html>

‎theme/login.html

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6+
<title>Login</title>
7+
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
8+
<meta name="apple-mobile-web-app-capable" content="yes">
9+
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css?{{cachebust}}">
10+
<link rel="stylesheet" href="styles/login.css?{{cachebust}}">
11+
</head>
12+
<body>
13+
<div class="login-container">
14+
<form id="loginForm" class="login-form">
15+
<div class="login-logo"></div>
16+
17+
<div class="login-form-inputs well">
18+
<label class="login-local-label">Sign in with a local account</label>
19+
<div id="loginMessage" class="alert alert-danger login-message"></div>
20+
21+
<div class="form-group">
22+
<label id="usernameLabel" for="usernameInput">User name</label>
23+
<input id="usernameInput" class="form-control" type="text" placeholder="User name" autocorrect="off" autocapitalize="none">
24+
</div>
25+
<div class="form-group">
26+
<label id="passwordLabel" for="passwordInput">Password</label>
27+
<input id="passwordInput" class="form-control" type="password" placeholder="Password" autocorrect="off" autocapitalize="none">
28+
</div>
29+
<button id="loginButton" type="submit" class="btn btn-primary">Sign in</button>
30+
</div>
31+
</form>
32+
</div>
33+
34+
<script src="js/login_i18n.js?{{cachebust}}"></script>
35+
<script src="js/login.js?{{cachebust}}"></script>
36+
</body>
37+
</html>

‎theme/logo.png

5.14 KB
Loading

0 commit comments

Comments
 (0)