Skip to content

Commit

Permalink
Merge pull request #96 from mendix/feature/atlas-ui
Browse files Browse the repository at this point in the history
Release 5.0.0 using Atlas UI in Mendix 7.9
  • Loading branch information
fazzdev authored Jan 26, 2018
2 parents 67ae53f + a71e271 commit ee6f269
Show file tree
Hide file tree
Showing 89 changed files with 13,382 additions and 1 deletion.
Binary file added DIST/RestServices_mx7_5.0.0.mpk
Binary file not shown.
Binary file modified RestServices.mpr
Binary file not shown.
2 changes: 1 addition & 1 deletion javasource/restservices/RestServices.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class RestServices {
/**
* Version of the RestServices module
*/
public static final String VERSION = "4.2.2";
public static final String VERSION = "5.0.0";

/**
* Amount of objects that are processed by the module at the same time.
Expand Down
Binary file added theme/.DS_Store
Binary file not shown.
21 changes: 21 additions & 0 deletions theme/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2017 Mendix

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
55 changes: 55 additions & 0 deletions theme/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Mendix Atlas UI
Mendix Atlas UI is the foundation of making beautiful apps with Mendix. For more information about the framework go [here](https://atlas.mendix.com/).

### Theme folder structure
The theme folder contains the default HTML pages, Sass, CSS and resources needed to style your application.

#### Workflow
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.

##### Structure
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.

```
theme/
├── styles/
| ├── css/
| │ ├── * all output files
| └── sass/
| ├── custom/
| | ├── _custom-variable.scss
| | ├── custom.scss
| ├── lib/
|           ├── base/
|           ├── buildinblocks/
| ├── components/
| ├── customwidgets/
|           ├── layouts/
|          ├── _variable.scss
| ├── lib.scss
|
├── * index files
├── * assets
```

###### Base
The base folder contains the *architecture* for our framework. Here you will find our *mixins* and *resets*.

###### Components
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.

###### Custom Widgets
This directory contains any extra styling that might be needed for custom widgets downloaded from the Mendix App Store.

###### Building Blocks
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.

###### Layouts
The layout directory contains some styles for the main sections of the layout (topbar, sidebar, footer and so on).

###### Variable.scss
This file contains the style settings that are used across the project, allowing for consistent typography, color schemes, etc.

### License

MIT
1 change: 1 addition & 0 deletions theme/components.json
Original file line number Diff line number Diff line change
@@ -0,0 +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"}
19 changes: 19 additions & 0 deletions theme/config.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# This file makes sure every theme has the same default output
# More documentation: http://compass-style.org/help/documentation/configuration-reference/

# Can be :scss or :sass. Defaults to :scss
preferred_syntax = :scss
# The path to the project when running within the web server
http_path = '/'
# The directory where the css stylesheets are kept
css_dir = 'styles/css'
# The directory where the sass stylesheets are kept
sass_dir = 'styles/sass'
# 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
relative_assets = true
# Indicates whether line comments should be added to compiled css that says where the selectors were defined
line_comments = false
# Set this to true to enable sourcemap output
sourcemap = false
# The output style for the compiled css
output_style = :expanded
Binary file added theme/favicon.ico
Binary file not shown.
27 changes: 27 additions & 0 deletions theme/index-rtl.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Mendix</title>
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
<meta name="apple-mobile-web-app-capable" content="yes">
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css?{{cachebust}}">
<link rel="stylesheet" href="lib/bootstrap-rtl/css/bootstrap-rtl.min.css?{{cachebust}}">
<link rel="stylesheet" href="mxclientsystem/mxui/ui/mxui.css?{{cachebust}}">

<link rel="stylesheet" href="styles/css/lib/lib.css?{{cachebust}}">
<link rel="stylesheet" href="styles/css/custom/custom.css?{{cachebust}}">
</head>
<body dir="rtl">
<div id="content"></div>
<script>
dojoConfig = {
baseUrl: "mxclientsystem/dojo/",
cacheBust: "{{cachebust}}",
ltrRedirect: "index.html"
};
</script>
<script src="mxclientsystem/mxui/mxui.js?{{cachebust}}"></script>
</body>
</html>
39 changes: 39 additions & 0 deletions theme/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Mendix</title>
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
<meta name="apple-mobile-web-app-capable" content="yes">
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css?{{cachebust}}">
<link rel="stylesheet" href="mxclientsystem/mxui/ui/mxui.css?{{cachebust}}">

<link rel="stylesheet" href="styles/css/lib/lib.css?{{cachebust}}">
<link rel="stylesheet" href="styles/css/custom/custom.css?{{cachebust}}">

<!-- ICONS EXAMPLE -->

<!-- iPhone retina icon (iOS < 7) -->
<!-- <link href="resources/ios/icons/apple-touch-icon-precomposed-114x114.png" sizes="114x114" rel="apple-touch-icon-precomposed"> -->

<!-- STARTUP IMAGES -->
<!-- <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"> -->

</head>
<body dir="ltr">
<div id="content"></div>
<script>
dojoConfig = {
baseUrl: "mxclientsystem/dojo/",
cacheBust: "{{cachebust}}",
rtlRedirect: "index-rtl.html"
};
</script>
<script>
if (!document.cookie || !document.cookie.match(/(^|;)originURI=/gi))
document.cookie = "originURI=/login.html";
</script>
<script src="mxclientsystem/mxui/mxui.js?{{cachebust}}"></script>
</body>
</html>
40 changes: 40 additions & 0 deletions theme/login-with-sso.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Login</title>
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
<meta name="apple-mobile-web-app-capable" content="yes">
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css?{{cachebust}}">
<link rel="stylesheet" href="styles/login.css?{{cachebust}}">
</head>
<body>
<div class="login-container">
<form id="loginForm" class="login-form">
<div class="login-logo"></div>
<a id="ssoButton" href="/openid/login" class="login-sso-button btn btn-primary">Sign in with your Mendix account</a>

<label class="login-or-label">&ndash; or &ndash; </label>

<div class="login-form-inputs well">
<label class="login-local-label">Sign in with a local account</label>
<div id="loginMessage" class="alert alert-danger login-message"></div>

<div class="form-group">
<label id="usernameLabel" for="usernameInput">User name</label>
<input id="usernameInput" class="form-control" type="text" placeholder="User name" autocorrect="off" autocapitalize="none">
</div>
<div class="form-group">
<label id="passwordLabel" for="passwordInput">Password</label>
<input id="passwordInput" class="form-control" type="password" placeholder="Password" autocorrect="off" autocapitalize="none">
</div>
<button id="loginButton" type="submit" class="btn btn-primary">Sign in</button>
</div>
</form>
</div>

<script src="js/login_i18n.js?{{cachebust}}"></script>
<script src="js/login.js?{{cachebust}}"></script>
</body>
</html>
37 changes: 37 additions & 0 deletions theme/login.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Login</title>
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
<meta name="apple-mobile-web-app-capable" content="yes">
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css?{{cachebust}}">
<link rel="stylesheet" href="styles/login.css?{{cachebust}}">
</head>
<body>
<div class="login-container">
<form id="loginForm" class="login-form">
<div class="login-logo"></div>

<div class="login-form-inputs well">
<label class="login-local-label">Sign in with a local account</label>
<div id="loginMessage" class="alert alert-danger login-message"></div>

<div class="form-group">
<label id="usernameLabel" for="usernameInput">User name</label>
<input id="usernameInput" class="form-control" type="text" placeholder="User name" autocorrect="off" autocapitalize="none">
</div>
<div class="form-group">
<label id="passwordLabel" for="passwordInput">Password</label>
<input id="passwordInput" class="form-control" type="password" placeholder="Password" autocorrect="off" autocapitalize="none">
</div>
<button id="loginButton" type="submit" class="btn btn-primary">Sign in</button>
</div>
</form>
</div>

<script src="js/login_i18n.js?{{cachebust}}"></script>
<script src="js/login.js?{{cachebust}}"></script>
</body>
</html>
Binary file added theme/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ee6f269

Please sign in to comment.