Skip to content
Code-Schnipsel Gruppen Projekte
Commit 194e2b95 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

Merge branch 'dev' into 'next' 

feat: new versioning

See merge request !40
Übergeordnete 08551167 06d3ede3
Keine zugehörigen Branchen gefunden
Tags 1.6.8
2 Merge Requests!41Next,!40feat: new versioning
Pipeline-Nr. 5692 bestanden
Phase: test
Leerzeichenänderungen ausblenden
Inline Nebeneinander
.gitlab-ci.yml 0 → 100644
+ 3
− 0
Zeige Datei @ 194e2b95
include:
- project: 'quiqqer/stabilization/semantic-release'
file: '/ci-templates/.gitlab-ci.yml'
LICENCE → LICENSE
+ 0
− 0
Zeige Datei @ 194e2b95
Datei verschoben
composer.json
+ 33
− 33
Zeige Datei @ 194e2b95
{
"name": "quiqqer\/qui",
"type": "component",
"description": "QUIQQER-UI is a modular user interface component framework written in JavaScript",
"license": "MIT",
"authors": [
{
"name": "Henning Leutz",
"email": "leutz@pcsg.de",
"homepage": "http:\/\/www.pcsg.de",
"role": "Developer"
"name": "quiqqer\/qui",
"type": "library",
"description": "QUIQQER-UI is a modular user interface component framework written in JavaScript",
"license": "MIT",
"authors": [
{
"name": "Henning Leutz",
"email": "leutz@pcsg.de",
"homepage": "http:\/\/www.pcsg.de",
"role": "Developer"
}
],
"support": {
"email": "support@pcsg.de",
"url": "http:\/\/www.pcsg.de"
},
"extra": {
"component": {
"files": [
"**"
],
"config": {
"paths": {
"qui": "qui\/build\/qui"
}
],
"support": {
"email": "support@pcsg.de",
"url": "http:\/\/www.pcsg.de"
},
"extra": {
"component": {
"files": [
"**"
],
"config": {
"paths": {
"qui": "qui\/build\/qui"
}
},
"paths": {
"qui": "qui\/build\/qui"
},
"map": {
"*": {
"css": "components\/qui\/build\/qui\/lib\/css.js"
}
}
},
"paths": {
"qui": "qui\/build\/qui"
},
"map": {
"*": {
"css": "components\/qui\/build\/qui\/lib\/css.js"
}
}
}
}
}
doc/index.php
+ 36
− 37
Zeige Datei @ 194e2b95
<!doctype html>
<html>
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="chrome=1" />
<meta name="viewport" content="width=device-width" />
<meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="chrome=1"/>
<meta name="viewport" content="width=device-width"/>
<title>QUI Documentation</title>
<title>QUI Documentation</title>
<!-- Flatdoc -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="legacy.js"></script>
<script src="flatdoc.js"></script>
<!-- Flatdoc -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="legacy.js"></script>
<script src="flatdoc.js"></script>
<!-- Flatdoc theme -->
<link href="theme-white/style.css" rel="stylesheet" />
<script src="theme-white/script.js"></script>
<!-- Flatdoc theme -->
<link href="theme-white/style.css" rel="stylesheet"/>
<script src="theme-white/script.js"></script>
<!-- Initializer -->
<script>
<?php
<!-- Initializer -->
<script>
<?php
$md_file = 'menu.php';
$md_file = 'menu.php';
if ( isset( $_GET['file'] ) && !empty( $_GET['file'] ) )
{
// read subdirs
$dir = dirname( __FILE__ );
$src = explode( '/', $dir );
array_pop( $src );
$src = implode( '/', $src ) .'/qui/';
if (isset($_GET['file']) && !empty($_GET['file'])) {
// read subdirs
$dir = dirname(__FILE__);
$src = explode('/', $dir);
array_pop($src);
$src = implode('/', $src) . '/qui/';
if ( file_exists( $src . $_GET['file'] .'.md' ) ) {
$md_file = '../qui/'.$_GET['file'] .'.md';
if (file_exists($src . $_GET['file'] . '.md')) {
$md_file = '../qui/' . $_GET['file'] . '.md';
}
}
}
?>
?>
Flatdoc.run({
fetcher: Flatdoc.file("<?php echo $md_file; ?>")
});
Flatdoc.run({
fetcher: Flatdoc.file("<?php echo $md_file; ?>")
});
</script>
</script>
</head>
<body role="flatdoc">
<div class="header">
<div class="header">
<div class="left">
<h1><a href="index.php">QUI Documentation</a></h1>
<h2 role="flatdoc-title"></h2>
<h1><a href="index.php">QUI Documentation</a></h1>
<h2 role="flatdoc-title"></h2>
</div>
</div>
</div>
<div role="flatdoc" class="content-root">
<div role="flatdoc" class="content-root">
<div class="menubar">
<div class="menu section" role="flatdoc-menu"></div>
<div class="menu section" role="flatdoc-menu"></div>
</div>
<div role="flatdoc-content" class="content"></div>
</div>
</div>
</body>
</html>
\ No newline at end of file
doc/menu.php
+ 32
− 34
Zeige Datei @ 194e2b95
......@@ -35,14 +35,14 @@
```javascript
{
"require" : {
"quiqqer/qui" : "dev-dev"
},
"repositories": [{
"type": "composer",
"url": "http://update.quiqqer.com/"
}]
"require" : {
"quiqqer/qui" : "dev-dev"
},
"repositories": [{
"type": "composer",
"url": "http://update.quiqqer.com/"
}]
}
```
......@@ -84,19 +84,17 @@
```html
<script>
// now we can use QUI
require(['qui/QUI'], function(QUI)
{
"use strict";
// now we can use QUI
require(['qui/QUI'], function(QUI) {
'use strict';
});
});
// ein button control
require(['qui/buttons/Button'], function(Button)
{
"use strict";
// ein button control
require(['qui/buttons/Button'], function(Button) {
'use strict';
});
});
</script>
```
......@@ -158,26 +156,26 @@
<?php
// read subdirs
$dir = dirname( __FILE__ );
$src = explode( '/', $dir );
array_pop( $src );
$src = implode( '/', $src ) .'/qui/';
// read subdirs
$dir = dirname(__FILE__);
$src = explode('/', $dir);
array_pop($src);
$src = implode('/', $src) . '/qui/';
chdir( $src );
exec('find -iname \'*.md\'', $result);
chdir($src);
exec('find -iname \'*.md\'', $result);
sort( $result );
sort($result);
// echo '## qui'."\n";
// echo '## qui'."\n";
foreach ( $result as $entry )
{
$entry = str_replace( array('./', '.md'), '', $entry );
foreach ($result as $entry) {
$entry = str_replace(['./', '.md'], '', $entry);
echo '### qui/' . $entry . "\n";
echo '[ qui/' . $entry . '](index.php?file=' . $entry . ')' . "\n";
}
echo '### qui/'. $entry ."\n";
echo '[ qui/'. $entry .'](index.php?file='. $entry .')'."\n";
}
?>
?>
\ No newline at end of file
examples/index.php
+ 89
− 86
Zeige Datei @ 194e2b95
<!doctype html>
<!--[if lt IE 7 ]><html class="ie ie6" lang="de"> <![endif]-->
<!--[if IE 7 ]><html class="ie ie7" lang="de"> <![endif]-->
<!--[if IE 8 ]><html class="ie ie8" lang="de"> <![endif]-->
<!--[if (gte IE 9)|!(IE)]><!--><html lang="de"> <!--<![endif]-->
<!--[if lt IE 7 ]>
<html class="ie ie6" lang="de"> <![endif]-->
<!--[if IE 7 ]>
<html class="ie ie7" lang="de"> <![endif]-->
<!--[if IE 8 ]>
<html class="ie ie8" lang="de"> <![endif]-->
<!--[if (gte IE 9)|!(IE)]><!-->
<html lang="de"> <!--<![endif]-->
<head>
<!-- HTML5
================================================== -->
<!--[if lt IE 9]>
<script src="html5.js"></script>
<script src="html5.js"></script>
<![endif]-->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>QUI - Examples</title>
<link href="../extend/classes.css" rel="stylesheet" />
<link href="../extend/animate.min.css" rel="stylesheet" />
<link href="../extend/buttons.css" rel="stylesheet" />
<link href="../extend/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
<link href="../extend/classes.css" rel="stylesheet"/>
<link href="../extend/animate.min.css" rel="stylesheet"/>
<link href="../extend/buttons.css" rel="stylesheet"/>
<link href="../extend/font-awesome/css/font-<awesome.min.css" rel="stylesheet"/>
<!-- <link href="../src/themes/pink.css" rel="stylesheet" /> -->
<!-- <link href="../src/themes/blue.css" rel="stylesheet" /> -->
<style type="text/css">
body {
background: #F3F6FB;
color: #505050;
font-family: Helvetica Neue,Open Sans,sans-serif;
font-size: 13px;
}
body {
background: #F3F6FB;
color: #505050;
font-family: Helvetica Neue, Open Sans, sans-serif;
font-size: 13px;
}
pre {
background: #FFFFFF;
margin: 0px;
}
pre {
background: #FFFFFF;
margin: 0px;
}
code {
float: left;
margin: 10px;
}
code {
float: left;
margin: 10px;
}
</style>
<!-- Prism highlighter -->
<link rel="stylesheet" href="prism.css" data-noprefix />
<link rel="stylesheet" href="prism.css" data-noprefix/>
<?php
$example_code = '';
$example_code = '';
if ( isset( $_GET['file'] ) && !empty( $_GET['file'] ) )
{
$dir = dirname( __FILE__ );
$file = $dir .'/'. $_GET['file'] .'.js';
$file = str_replace( array('../', '..') , '', $file );
if (isset($_GET['file']) && !empty($_GET['file'])) {
$dir = dirname(__FILE__);
$file = $dir . '/' . $_GET['file'] . '.js';
$file = str_replace(['../', '..'], '', $file);
if ( file_exists( $file ) ) {
$example_code = file_get_contents( $file );
}
if (file_exists($file)) {
$example_code = file_get_contents($file);
}
}
?>
</head>
<body>
<h1>QUI Examples</h1>
<p>This examples are extended examples. The examples shows, how QUI can work.</p>
<p>If you want a first introduction, please visit the <a href="../doc/index.php">QUI Documentation</a></p>
<h2 style="margin-top: 40px;">
Examples
</h2>
<div id="container"></div>
<div style="clear:both;"></div>
<h3 style="margin-top: 40px;">
The complete example code
</h3>
<pre style="height: 300px; overflow: auto; border: 1px solid #DDDDDD;"><code class="language-javascript"><?php echo $example_code; ?></code></pre>
<script src="//ajax.googleapis.com/ajax/libs/mootools/1.4.5/mootools-yui-compressed.js"></script>
<script src="../build/qui/lib/mootools-more.js"></script>
<script src="../build/qui/lib/moofx.js"></script>
<script src="../build/qui/lib/requirejs.js"></script>
<!-- QUI -->
<script>
var path;
path = window.location.pathname.split( '/' );
path.pop();
path.pop();
path = path.join('/') +'/';
// QUI settings
require.config({
baseUrl : path,
paths : {
"qui" : path +'qui'
},
map: {
'*': {
'css': path +'build/qui/lib/css.js'
}
<h1>QUI Examples</h1>
<p>This examples are extended examples. The examples shows, how QUI can work.</p>
<p>If you want a first introduction, please visit the <a href="../doc/index.php">QUI Documentation</a></p>
<h2 style="margin-top: 40px;">
Examples
</h2>
<div id="container"></div>
<div style="clear:both;"></div>
<h3 style="margin-top: 40px;">
The complete example code
</h3>
<pre style="height: 300px; overflow: auto; border: 1px solid #DDDDDD;"><code class="language-javascript"><?php
echo $example_code; ?></code></pre>
<script src="//ajax.googleapis.com/ajax/libs/mootools/1.4.5/mootools-yui-compressed.js"></script>
<script src="../build/qui/lib/mootools-more.js"></script>
<script src="../build/qui/lib/moofx.js"></script>
<script src="../build/qui/lib/requirejs.js"></script>
<!-- QUI -->
<script>
var path;
path = window.location.pathname.split('/');
path.pop();
path.pop();
path = path.join('/') + '/';
// QUI settings
require.config({
baseUrl: path,
paths: {
'qui': path + 'qui'
},
map: {
'*': {
'css': path + 'build/qui/lib/css.js'
}
});
require(['qui/QUI'], function(QUI)
{
"use strict";
}
});
QUI.addEvent('onError', function(err, file, no) {
console.log( err +' - '+ file +' - '+ no );
});
require(['qui/QUI'], function(QUI) {
'use strict';
<?php echo $example_code; ?>
QUI.addEvent('onError', function(err, file, no) {
console.log(err + ' - ' + file + ' - ' + no);
});
</script>
<script src="prism.js"></script>
<?php echo $example_code; ?>
});
</script>
<script src="prism.js"></script>
</body>
</html>
\ No newline at end of file
package.xml 0 → 100644
+ 6
− 0
Zeige Datei @ 194e2b95
<quiqqer>
<package>
<title>QUIQQER User Interface Framework</title>
<description>QUIQQER User Interface Framework</description>
</package>
</quiqqer>
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren

PCSG & QUIQQER support and DEV System - GitLab