Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
QUIQQER
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
164
Issues
164
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
QUIQQER
QUIQQER
Commits
3a3d7e69
Commit
3a3d7e69
authored
Jan 29, 2019
by
Patrick Müller
1
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
https://dev.quiqqer.com/quiqqer/quiqqer
into dev
parents
5887d015
e6f670cf
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
4025 additions
and
3048 deletions
+4025
-3048
admin/ajax/project/create.php
admin/ajax/project/create.php
+20
-0
admin/template/project/create.html
admin/template/project/create.html
+10
-0
bin/QUI/DownloadManager.js
bin/QUI/DownloadManager.js
+1
-4
bin/QUI/UploadManager.js
bin/QUI/UploadManager.js
+1
-2
bin/QUI/classes/projects/Manager.js
bin/QUI/classes/projects/Manager.js
+4
-2
bin/QUI/controls/lang/Popup.js
bin/QUI/controls/lang/Popup.js
+96
-66
bin/QUI/controls/projects/Manager.js
bin/QUI/controls/projects/Manager.js
+1
-0
bin/QUI/controls/projects/project/Panel.css
bin/QUI/controls/projects/project/Panel.css
+22
-0
bin/QUI/controls/projects/project/Panel.js
bin/QUI/controls/projects/project/Panel.js
+33
-27
bin/QUI/controls/users/Login.js
bin/QUI/controls/users/Login.js
+18
-7
bin/QUI/controls/users/LogoutWindow.js
bin/QUI/controls/users/LogoutWindow.js
+3
-4
composer.json
composer.json
+1
-0
lib/QUI/System/Console/Tools/Nginx.php
lib/QUI/System/Console/Tools/Nginx.php
+9
-13
lib/QUI/Utils/Project.php
lib/QUI/Utils/Project.php
+58
-32
lib/locale/de.languages.xml
lib/locale/de.languages.xml
+1856
-0
lib/locale/de.xml
lib/locale/de.xml
+9
-1447
lib/locale/en.languages.xml
lib/locale/en.languages.xml
+1871
-0
lib/locale/en.xml
lib/locale/en.xml
+8
-1444
locale.xml
locale.xml
+4
-0
No files found.
admin/ajax/project/create.php
View file @
3a3d7e69
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
* Create a new project
* Create a new project
*
*
* @param string $params - JSON Array
* @param string $params - JSON Array
*
* @return string - Name of the project
* @return string - Name of the project
*/
*/
QUI
::
$Ajax
->
registerFunction
(
QUI
::
$Ajax
->
registerFunction
(
...
@@ -16,6 +17,25 @@ QUI::$Ajax->registerFunction(
...
@@ -16,6 +17,25 @@ QUI::$Ajax->registerFunction(
$params
[
'lang'
]
$params
[
'lang'
]
);
);
if
(
isset
(
$params
[
'template'
])
&&
!
empty
(
$params
[
'template'
]))
{
$Config
=
QUI
::
getProjectManager
()
->
getConfig
();
$installedTemplates
=
QUI
::
getPackageManager
()
->
getInstalled
([
'type'
=>
'quiqqer-template'
]);
$template
=
$params
[
'template'
];
$template
=
\QUI\Utils\Security\Orthos
::
removeHTML
(
$template
);
$template
=
\QUI\Utils\Security\Orthos
::
clearPath
(
$template
);
$Config
->
set
(
$Project
->
getName
(),
'template'
,
$template
);
$Config
->
save
();
}
if
(
isset
(
$params
[
'demodata'
])
&&
$params
[
'demodata'
])
{
\QUI\Utils\Project
::
applyDemoDataToProject
(
$Project
,
$template
);
}
return
$Project
->
getName
();
return
$Project
->
getName
();
},
},
[
'params'
],
[
'params'
],
...
...
admin/template/project/create.html
View file @
3a3d7e69
...
@@ -58,6 +58,16 @@
...
@@ -58,6 +58,16 @@
</select>
</select>
</td>
</td>
</tr>
</tr>
<tr
class=
"even"
>
<td>
<label
for=
""
>
{t}quiqqer/system demodata.project.label.template{/t}
</label>
</td>
<td>
<input
type=
"checkbox"
name=
"demodata"
/>
</td>
</tr>
</tbody>
</tbody>
</table>
</table>
...
...
bin/QUI/DownloadManager.js
View file @
3a3d7e69
...
@@ -3,11 +3,8 @@
...
@@ -3,11 +3,8 @@
*
*
* @module DownloadManager
* @module DownloadManager
* @author www.pcsg.de (Henning Leutz)
* @author www.pcsg.de (Henning Leutz)
*
* @require classes/request/Downloads
*/
*/
define
(
'
DownloadManager
'
,
[
'
classes/request/Downloads
'
],
function
(
DownloadManager
)
{
define
([
'
classes/request/Downloads
'
],
function
(
DownloadManager
)
{
"
use strict
"
;
"
use strict
"
;
return
new
DownloadManager
();
return
new
DownloadManager
();
...
...
bin/QUI/UploadManager.js
View file @
3a3d7e69
...
@@ -3,9 +3,8 @@
...
@@ -3,9 +3,8 @@
*
*
* @module UploadManager
* @module UploadManager
* @author www.pcsg.de (Henning Leutz)
* @author www.pcsg.de (Henning Leutz)
* @require controls/upload/Manager
*/
*/
define
([
'
controls/upload/Manager
'
],
function
(
UploadManager
)
{
define
(
'
UploadManager
'
,
[
'
controls/upload/Manager
'
],
function
(
UploadManager
)
{
"
use strict
"
;
"
use strict
"
;
return
new
UploadManager
();
return
new
UploadManager
();
...
...
bin/QUI/classes/projects/Manager.js
View file @
3a3d7e69
...
@@ -155,9 +155,10 @@ define('classes/projects/Manager', [
...
@@ -155,9 +155,10 @@ define('classes/projects/Manager', [
* @param {String} project
* @param {String} project
* @param {String} lang
* @param {String} lang
* @param {String} template
* @param {String} template
* @param demodata
* @param {Function} [onfinish]
* @param {Function} [onfinish]
*/
*/
createNewProject
:
function
(
project
,
lang
,
template
,
onfinish
)
{
createNewProject
:
function
(
project
,
lang
,
template
,
demodata
,
onfinish
)
{
var
self
=
this
;
var
self
=
this
;
this
.
$getList
=
null
;
this
.
$getList
=
null
;
...
@@ -173,7 +174,8 @@ define('classes/projects/Manager', [
...
@@ -173,7 +174,8 @@ define('classes/projects/Manager', [
params
:
JSON
.
encode
({
params
:
JSON
.
encode
({
project
:
project
,
project
:
project
,
lang
:
lang
,
lang
:
lang
,
template
:
template
template
:
template
,
demodata
:
demodata
})
})
});
});
},
},
...
...
bin/QUI/controls/lang/Popup.js
View file @
3a3d7e69
...
@@ -29,30 +29,30 @@ define('controls/lang/Popup', [
...
@@ -29,30 +29,30 @@ define('controls/lang/Popup', [
*/
*/
return
new
Class
({
return
new
Class
({
Extends
:
QUIConfirm
,
Extends
:
QUIConfirm
,
Type
:
'
controls/lang/Popup
'
,
Type
:
'
controls/lang/Popup
'
,
Binds
:
[
Binds
:
[
'
submit
'
,
'
submit
'
,
'
$onCreate
'
,
'
$onCreate
'
,
'
$onSubmit
'
'
$onSubmit
'
],
],
options
:
{
options
:
{
title
:
Locale
.
get
(
'
quiqqer/system
'
,
'
lang.popup.title
'
),
title
:
Locale
.
get
(
'
quiqqer/system
'
,
'
lang.popup.title
'
),
maxHeight
:
600
,
maxHeight
:
600
,
maxWidth
:
500
,
maxWidth
:
500
,
autoclose
:
false
autoclose
:
false
},
},
initialize
:
function
(
options
)
{
initialize
:
function
(
options
)
{
this
.
$Active
=
null
;
this
.
$Active
=
null
;
this
.
parent
(
options
);
this
.
parent
(
options
);
this
.
addEvents
({
this
.
addEvents
({
onCreate
:
this
.
$onCreate
,
onCreate
:
this
.
$onCreate
,
onResize
:
this
.
$onResize
onResize
:
this
.
$onResize
});
});
},
},
...
@@ -60,7 +60,7 @@ define('controls/lang/Popup', [
...
@@ -60,7 +60,7 @@ define('controls/lang/Popup', [
* Submit the window, close the window if a language is selected
* Submit the window, close the window if a language is selected
* and trigger the onSubmit event
* and trigger the onSubmit event
*/
*/
submit
:
function
()
{
submit
:
function
()
{
if
(
!
this
.
$Grid
)
{
if
(
!
this
.
$Grid
)
{
return
;
return
;
}
}
...
@@ -74,7 +74,7 @@ define('controls/lang/Popup', [
...
@@ -74,7 +74,7 @@ define('controls/lang/Popup', [
var
result
=
[];
var
result
=
[];
for
(
var
i
=
0
,
len
=
selected
.
length
;
i
<
len
;
i
++
)
{
for
(
var
i
=
0
,
len
=
selected
.
length
;
i
<
len
;
i
++
)
{
result
.
push
(
selected
[
i
].
lang
);
result
.
push
(
selected
[
i
].
lang
);
}
}
this
.
fireEvent
(
'
submit
'
,
[
result
,
this
]);
this
.
fireEvent
(
'
submit
'
,
[
result
,
this
]);
...
@@ -84,58 +84,54 @@ define('controls/lang/Popup', [
...
@@ -84,58 +84,54 @@ define('controls/lang/Popup', [
/**
/**
* event : onCreate
* event : onCreate
*/
*/
$onCreate
:
function
()
{
$onCreate
:
function
()
{
var
Content
=
this
.
getContent
(),
var
Content
=
this
.
getContent
(),
langs
=
this
.
getLanguages
();
langs
=
this
.
getLanguages
();
this
.
getElm
().
set
(
'
data-qui
'
,
this
.
getType
());
var
GridContainer
=
new
Element
(
'
div
'
,
{
var
GridContainer
=
new
Element
(
'
div
'
,
{
styles
:
{
styles
:
{
width
:
'
100%
'
width
:
'
100%
'
}
}
}).
inject
(
Content
);
}).
inject
(
Content
);
this
.
$Grid
=
new
Grid
(
GridContainer
,
{
this
.
$Grid
=
new
Grid
(
GridContainer
,
{
columnModel
:
[{
columnModel
:
[{
header
:
''
,
header
:
Locale
.
get
(
'
quiqqer/system
'
,
'
language.code
'
),
dataIndex
:
'
image
'
,
dataIndex
:
'
lang
'
,
dataType
:
'
image
'
,
dataType
:
'
string
'
,
width
:
50
width
:
100
},
{
header
:
''
,
dataIndex
:
'
lang
'
,
dataType
:
'
string
'
,
width
:
50
},
{
},
{
header
:
Locale
.
get
(
'
quiqqer/system
'
,
'
language
'
),
header
:
Locale
.
get
(
'
quiqqer/system
'
,
'
language
'
),
dataIndex
:
'
text
'
,
dataIndex
:
'
text
'
,
dataType
:
'
string
'
,
dataType
:
'
string
'
,
width
:
250
width
:
250
}]
}]
});
});
this
.
$Grid
.
addEvents
({
this
.
$Grid
.
addEvents
({
dblClick
:
this
.
submit
dblClick
:
this
.
submit
});
});
var
data
=
[];
var
data
=
[];
for
(
var
i
=
0
,
len
=
langs
.
length
;
i
<
len
;
i
++
)
{
for
(
var
i
=
0
,
len
=
langs
.
length
;
i
<
len
;
i
++
)
{
data
.
push
({
data
.
push
({
image
:
URL_BIN_DIR
+
'
16x16/flags/
'
+
langs
[
i
]
+
'
.png
'
,
text
:
Locale
.
get
(
'
quiqqer/quiqqer
'
,
'
language.
'
+
langs
[
i
]),
text
:
Locale
.
get
(
'
quiqqer/system
'
,
'
lang.
'
+
langs
[
i
]),
lang
:
langs
[
i
]
lang
:
langs
[
i
]
});
});
}
}
this
.
$Grid
.
setData
({
this
.
$Grid
.
setData
({
data
:
data
data
:
data
});
});
},
},
/**
/**
* event : resize window
* event : resize window
*/
*/
$onResize
:
function
()
{
$onResize
:
function
()
{
var
Content
=
this
.
getContent
();
var
Content
=
this
.
getContent
();
if
(
Content
.
getElement
(
'
.submit-body
'
))
{
if
(
Content
.
getElement
(
'
.submit-body
'
))
{
...
@@ -152,36 +148,70 @@ define('controls/lang/Popup', [
...
@@ -152,36 +148,70 @@ define('controls/lang/Popup', [
*
*
* @return {Array}
* @return {Array}
*/
*/
getLanguages
:
function
()
{
getLanguages
:
function
()
{
return
[
var
languages
=
[
'
ad
'
,
'
bi
'
,
'
cn
'
,
'
gr
'
,
'
jo
'
,
'
lv
'
,
'
mz
'
,
'
pr
'
,
'
sm
'
,
'
aa
'
,
'
ab
'
,
'
ace
'
,
'
ach
'
,
'
ada
'
,
'
ady
'
,
'
ae
'
,
'
aeb
'
,
'
af
'
,
'
afh
'
,
'
agq
'
,
'
ain
'
,
'
tz
'
,
'
ae
'
,
'
bj
'
,
'
co
'
,
'
es
'
,
'
gs
'
,
'
jp
'
,
'
ly
'
,
'
na
'
,
'
ak
'
,
'
akk
'
,
'
akz
'
,
'
ale
'
,
'
aln
'
,
'
alt
'
,
'
am
'
,
'
an
'
,
'
ang
'
,
'
anp
'
,
'
ar
'
,
'
ar-001
'
,
'
ps
'
,
'
sn
'
,
'
ua
'
,
'
af
'
,
'
bm
'
,
'
cr
'
,
'
et
'
,
'
gt
'
,
'
ke
'
,
'
arc
'
,
'
arn
'
,
'
aro
'
,
'
arp
'
,
'
arq
'
,
'
arw
'
,
'
ary
'
,
'
arz
'
,
'
as
'
,
'
asa
'
,
'
ase
'
,
'
ast
'
,
'
ma
'
,
'
nc
'
,
'
pt
'
,
'
so
'
,
'
ug
'
,
'
ag
'
,
'
bn
'
,
'
cs
'
,
'
gu
'
,
'
av
'
,
'
avk
'
,
'
awa
'
,
'
ay
'
,
'
az
'
,
'
az-alt-short
'
,
'
ba
'
,
'
bal
'
,
'
ban
'
,
'
bar
'
,
'
bas
'
,
'
kg
'
,
'
mc
'
,
'
ne
'
,
'
pw
'
,
'
sr
'
,
'
uk
'
,
'
ai
'
,
'
bo
'
,
'
cu
'
,
'
bax
'
,
'
bbc
'
,
'
bbj
'
,
'
be
'
,
'
bej
'
,
'
bem
'
,
'
bew
'
,
'
bez
'
,
'
bfd
'
,
'
bfq
'
,
'
bg
'
,
'
bgn
'
,
'
gw
'
,
'
kh
'
,
'
md
'
,
'
nf
'
,
'
py
'
,
'
st
'
,
'
um
'
,
'
al
'
,
'
br
'
,
'
bho
'
,
'
bi
'
,
'
bik
'
,
'
bin
'
,
'
bjn
'
,
'
bkm
'
,
'
bla
'
,
'
bm
'
,
'
bn
'
,
'
bo
'
,
'
bpy
'
,
'
bqi
'
,
'
cv
'
,
'
fi
'
,
'
gy
'
,
'
ki
'
,
'
me
'
,
'
ng
'
,
'
qa
'
,
'
sv
'
,
'
us
'
,
'
br
'
,
'
bra
'
,
'
brh
'
,
'
brx
'
,
'
bs
'
,
'
bss
'
,
'
bua
'
,
'
bug
'
,
'
bum
'
,
'
byn
'
,
'
byv
'
,
'
ca
'
,
'
am
'
,
'
bs
'
,
'
cx
'
,
'
fj
'
,
'
hk
'
,
'
km
'
,
'
mg
'
,
'
ni
'
,
'
re
'
,
'
cad
'
,
'
car
'
,
'
cay
'
,
'
cch
'
,
'
ce
'
,
'
ceb
'
,
'
cgg
'
,
'
ch
'
,
'
chb
'
,
'
chg
'
,
'
chk
'
,
'
chm
'
,
'
sy
'
,
'
uy
'
,
'
an
'
,
'
bt
'
,
'
cy
'
,
'
fk
'
,
'
hm
'
,
'
kn
'
,
'
mh
'
,
'
chn
'
,
'
cho
'
,
'
chp
'
,
'
chr
'
,
'
chy
'
,
'
ckb
'
,
'
co
'
,
'
cop
'
,
'
cps
'
,
'
cr
'
,
'
crh
'
,
'
cs
'
,
'
nl
'
,
'
ro
'
,
'
sz
'
,
'
uz
'
,
'
ao
'
,
'
bv
'
,
'
cz
'
,
'
fm
'
,
'
hn
'
,
'
csb
'
,
'
cu
'
,
'
cv
'
,
'
cy
'
,
'
da
'
,
'
dak
'
,
'
dar
'
,
'
dav
'
,
'
de
'
,
'
de-AT
'
,
'
de-CH
'
,
'
del
'
,
'
kp
'
,
'
mk
'
,
'
no
'
,
'
rs
'
,
'
tc
'
,
'
va
'
,
'
ar
'
,
'
bw
'
,
'
fo
'
,
'
den
'
,
'
dgr
'
,
'
din
'
,
'
dje
'
,
'
doi
'
,
'
dsb
'
,
'
dtp
'
,
'
dua
'
,
'
dum
'
,
'
dv
'
,
'
dyo
'
,
'
dyu
'
,
'
hr
'
,
'
kr
'
,
'
ml
'
,
'
np
'
,
'
ru
'
,
'
td
'
,
'
vc
'
,
'
as
'
,
'
by
'
,
'
dz
'
,
'
dzg
'
,
'
ebu
'
,
'
ee
'
,
'
efi
'
,
'
egl
'
,
'
egy
'
,
'
eka
'
,
'
el
'
,
'
elx
'
,
'
en
'
,
'
en-AU
'
,
'
de
'
,
'
fr
'
,
'
ht
'
,
'
kw
'
,
'
mm
'
,
'
nr
'
,
'
rw
'
,
'
tf
'
,
'
ve
'
,
'
en-CA
'
,
'
en-GB
'
,
'
en-GB-alt-short
'
,
'
en-US
'
,
'
en-US-alt-short
'
,
'
enm
'
,
'
eo
'
,
'
es
'
,
'
at
'
,
'
bz
'
,
'
dj
'
,
'
ga
'
,
'
hu
'
,
'
ky
'
,
'
mn
'
,
'
nu
'
,
'
sa
'
,
'
es-419
'
,
'
es-ES
'
,
'
es-MX
'
,
'
esu
'
,
'
et
'
,
'
eu
'
,
'
ewo
'
,
'
ext
'
,
'
fa
'
,
'
fa-AF
'
,
'
fan
'
,
'
tg
'
,
'
vg
'
,
'
au
'
,
'
ca
'
,
'
dk
'
,
'
gb
'
,
'
id
'
,
'
kz
'
,
'
mo
'
,
'
fat
'
,
'
ff
'
,
'
fi
'
,
'
fil
'
,
'
fit
'
,
'
fj
'
,
'
fo
'
,
'
fon
'
,
'
fr
'
,
'
fr-CA
'
,
'
fr-CH
'
,
'
frc
'
,
'
nz
'
,
'
sb
'
,
'
th
'
,
'
vi
'
,
'
aw
'
,
'
dm
'
,
'
gd
'
,
'
ie
'
,
'
la
'
,
'
frm
'
,
'
fro
'
,
'
frp
'
,
'
frr
'
,
'
frs
'
,
'
fur
'
,
'
fy
'
,
'
ga
'
,
'
gaa
'
,
'
gag
'
,
'
gan
'
,
'
gay
'
,
'
mp
'
,
'
om
'
,
'
tj
'
,
'
vn
'
,
'
ax
'
,
'
cc
'
,
'
do
'
,
'
ge
'
,
'
il
'
,
'
gba
'
,
'
gbz
'
,
'
gd
'
,
'
gez
'
,
'
gil
'
,
'
gl
'
,
'
glk
'
,
'
gmh
'
,
'
gn
'
,
'
goh
'
,
'
gom
'
,
'
gon
'
,
'
mq
'
,
'
pa
'
,
'
sc
'
,
'
tk
'
,
'
vu
'
,
'
az
'
,
'
cd
'
,
'
dz
'
,
'
gf
'
,
'
gor
'
,
'
got
'
,
'
grb
'
,
'
grc
'
,
'
gsw
'
,
'
gu
'
,
'
guc
'
,
'
gur
'
,
'
guz
'
,
'
gv
'
,
'
gwi
'
,
'
ha
'
,
'
in
'
,
'
lb
'
,
'
mr
'
,
'
pe
'
,
'
sd
'
,
'
tl
'
,
'
ba
'
,
'
cf
'
,
'
ec
'
,
'
hai
'
,
'
hak
'
,
'
haw
'
,
'
he
'
,
'
hi
'
,
'
hif
'
,
'
hil
'
,
'
hit
'
,
'
hmn
'
,
'
ho
'
,
'
hr
'
,
'
hsb
'
,
'
gh
'
,
'
lc
'
,
'
ms
'
,
'
pf
'
,
'
se
'
,
'
tm
'
,
'
wf
'
,
'
bb
'
,
'
cg
'
,
'
hsn
'
,
'
ht
'
,
'
hu
'
,
'
hup
'
,
'
hy
'
,
'
hz
'
,
'
ia
'
,
'
iba
'
,
'
ibb
'
,
'
id
'
,
'
ie
'
,
'
ig
'
,
'
ii
'
,
'
ee
'
,
'
gi
'
,
'
io
'
,
'
li
'
,
'
mt
'
,
'
pg
'
,
'
sg
'
,
'
tn
'
,
'
ws
'
,
'
ik
'
,
'
ilo
'
,
'
inh
'
,
'
io
'
,
'
is
'
,
'
it
'
,
'
iu
'
,
'
izh
'
,
'
ja
'
,
'
jam
'
,
'
jbo
'
,
'
jgo
'
,
'
jmc
'
,
'
bd
'
,
'
ch
'
,
'
eg
'
,
'
gl
'
,
'
iq
'
,
'
lk
'
,
'
mu
'
,
'
ph
'
,
'
sh
'
,
'
jpr
'
,
'
jrb
'
,
'
jut
'
,
'
jv
'
,
'
ka
'
,
'
kaa
'
,
'
kab
'
,
'
kac
'
,
'
kaj
'
,
'
kam
'
,
'
kaw
'
,
'
kbd
'
,
'
to
'
,
'
ye
'
,
'
be
'
,
'
ci
'
,
'
eh
'
,
'
gm
'
,
'
ir
'
,
'
lr
'
,
'
mv
'
,
'
kbl
'
,
'
kcg
'
,
'
kde
'
,
'
kea
'
,
'
ken
'
,
'
kfo
'
,
'
kg
'
,
'
kgp
'
,
'
kha
'
,
'
kho
'
,
'
khq
'
,
'
khw
'
,
'
pk
'
,
'
si
'
,
'
tr
'
,
'
yt
'
,
'
bf
'
,
'
ck
'
,
'
gn
'
,
'
is
'
,
'
ls
'
,
'
ki
'
,
'
kiu
'
,
'
kj
'
,
'
kk
'
,
'
kkj
'
,
'
kl
'
,
'
kln
'
,
'
km
'
,
'
kmb
'
,
'
kn
'
,
'
ko
'
,
'
koi
'
,
'
kok
'
,
'
mw
'
,
'
pl
'
,
'
sj
'
,
'
tt
'
,
'
za
'
,
'
bg
'
,
'
cl
'
,
'
en
'
,
'
gp
'
,
'
kos
'
,
'
kpe
'
,
'
kr
'
,
'
krc
'
,
'
kri
'
,
'
krj
'
,
'
krl
'
,
'
kru
'
,
'
ks
'
,
'
ksb
'
,
'
ksf
'
,
'
ksh
'
,
'
it
'
,
'
lt
'
,
'
mx
'
,
'
pm
'
,
'
sk
'
,
'
tv
'
,
'
zm
'
,
'
bh
'
,
'
cm
'
,
'
ku
'
,
'
kum
'
,
'
kut
'
,
'
kv
'
,
'
kw
'
,
'
ky
'
,
'
ky-alt-variant
'
,
'
la
'
,
'
lad
'
,
'
lag
'
,
'
lah
'
,
'
er
'
,
'
gq
'
,
'
jm
'
,
'
lu
'
,
'
my
'
,
'
pn
'
,
'
sl
'
,
'
tw
'
,
'
zw
'
'
lam
'
,
'
lb
'
,
'
lez
'
,
'
lfn
'
,
'
lg
'
,
'
li
'
,
'
lij
'
,
'
liv
'
,
'
lkt
'
,
'
lmo
'
,
'
ln
'
,
'
lo
'
,
'
lol
'
,
].
sort
();
'
loz
'
,
'
lrc
'
,
'
lt
'
,
'
ltg
'
,
'
lu
'
,
'
lua
'
,
'
lui
'
,
'
lun
'
,
'
luo
'
,
'
lus
'
,
'
luy
'
,
'
lv
'
,
'
lzh
'
,
'
lzz
'
,
'
mad
'
,
'
maf
'
,
'
mag
'
,
'
mai
'
,
'
mak
'
,
'
man
'
,
'
mas
'
,
'
mde
'
,
'
mdf
'
,
'
mdh
'
,
'
mdr
'
,
'
men
'
,
'
mer
'
,
'
mfe
'
,
'
mg
'
,
'
mga
'
,
'
mgh
'
,
'
mgo
'
,
'
mh
'
,
'
mi
'
,
'
mic
'
,
'
min
'
,
'
mis
'
,
'
mk
'
,
'
ml
'
,
'
mn
'
,
'
mnc
'
,
'
mni
'
,
'
moh
'
,
'
mos
'
,
'
mr
'
,
'
mrj
'
,
'
ms
'
,
'
mt
'
,
'
mua
'
,
'
mul
'
,
'
mus
'
,
'
mwl
'
,
'
mwr
'
,
'
mwv
'
,
'
my
'
,
'
my-alt-variant
'
,
'
mye
'
,
'
myv
'
,
'
mzn
'
,
'
na
'
,
'
nan
'
,
'
nap
'
,
'
naq
'
,
'
nb
'
,
'
nd
'
,
'
nds
'
,
'
nds-NL
'
,
'
ne
'
,
'
new
'
,
'
ng
'
,
'
nia
'
,
'
niu
'
,
'
njo
'
,
'
nl
'
,
'
nl-BE
'
,
'
nmg
'
,
'
nn
'
,
'
nnh
'
,
'
no
'
,
'
nog
'
,
'
non
'
,
'
nov
'
,
'
nqo
'
,
'
nr
'
,
'
nso
'
,
'
nus
'
,
'
nv
'
,
'
nwc
'
,
'
ny
'
,
'
nym
'
,
'
nyn
'
,
'
nyo
'
,
'
nzi
'
,
'
oc
'
,
'
oj
'
,
'
om
'
,
'
or
'
,
'
os
'
,
'
osa
'
,
'
ota
'
,
'
pa
'
,
'
pag
'
,
'
pal
'
,
'
pam
'
,
'
pap
'
,
'
pau
'
,
'
pcd
'
,
'
pdc
'
,
'
pdt
'
,
'
peo
'
,
'
pfl
'
,
'
phn
'
,
'
pi
'
,
'
pl
'
,
'
pms
'
,
'
pnt
'
,
'
pon
'
,
'
prg
'
,
'
pro
'
,
'
ps
'
,
'
ps-alt-variant
'
,
'
pt
'
,
'
pt-BR
'
,
'
pt-PT
'
,
'
qu
'
,
'
quc
'
,
'
qug
'
,
'
raj
'
,
'
rap
'
,
'
rar
'
,
'
rgn
'
,
'
rif
'
,
'
rm
'
,
'
rn
'
,
'
ro
'
,
'
ro-MD
'
,
'
rof
'
,
'
rom
'
,
'
root
'
,
'
rtm
'
,
'
ru
'
,
'
rue
'
,
'
rug
'
,
'
rup
'
,
'
rw
'
,
'
rwk
'
,
'
sa
'
,
'
sad
'
,
'
sah
'
,
'
sam
'
,
'
saq
'
,
'
sas
'
,
'
sat
'
,
'
saz
'
,
'
sba
'
,
'
sbp
'
,
'
sc
'
,
'
scn
'
,
'
sco
'
,
'
sd
'
,
'
sdc
'
,
'
sdh
'
,
'
se
'
,
'
see
'
,
'
seh
'
,
'
sei
'
,
'
sel
'
,
'
ses
'
,
'
sg
'
,
'
sga
'
,
'
sgs
'
,
'
sh
'
,
'
shi
'
,
'
shn
'
,
'
shu
'
,
'
si
'
,
'
sid
'
,
'
sk
'
,
'
sl
'
,
'
sli
'
,
'
sly
'
,
'
sm
'
,
'
sma
'
,
'
smj
'
,
'
smn
'
,
'
sms
'
,
'
sn
'
,
'
snk
'
,
'
so
'
,
'
sog
'
,
'
sq
'
,
'
sr
'
,
'
srn
'
,
'
srr
'
,
'
ss
'
,
'
ssy
'
,
'
st
'
,
'
stq
'
,
'
su
'
,
'
suk
'
,
'
sus
'
,
'
sux
'
,
'
sv
'
,
'
sw
'
,
'
sw-CD
'
,
'
swb
'
,
'
syc
'
,
'
syr
'
,
'
szl
'
,
'
ta
'
,
'
tcy
'
,
'
te
'
,
'
tem
'
,
'
teo
'
,
'
ter
'
,
'
tet
'
,
'
tg
'
,
'
th
'
,
'
ti
'
,
'
tig
'
,
'
tiv
'
,
'
tk
'
,
'
tkl
'
,
'
tkr
'
,
'
tl
'
,
'
tlh
'
,
'
tli
'
,
'
tly
'
,
'
tmh
'
,
'
tn
'
,
'
to
'
,
'
tog
'
,
'
tpi
'
,
'
tr
'
,
'
tru
'
,
'
trv
'
,
'
ts
'
,
'
tsd
'
,
'
tsi
'
,
'
tt
'
,
'
ttt
'
,
'
tum
'
,
'
tvl
'
,
'
tw
'
,
'
twq
'
,
'
ty
'
,
'
tyv
'
,
'
tzm
'
,
'
udm
'
,
'
ug
'
,
'
ug-alt-variant
'
,
'
uga
'
,
'
uk
'
,
'
umb
'
,
'
und
'
,
'
ur
'
,
'
uz
'
,
'
vai
'
,
'
ve
'
,
'
vec
'
,
'
vep
'
,
'
vi
'
,
'
vls
'
,
'
vmf
'
,
'
vo
'
,
'
vot
'
,
'
vro
'
,
'
vun
'
,
'
wa
'
,
'
wae
'
,
'
wal
'
,
'
war
'
,
'
was
'
,
'
wbp
'
,
'
wo
'
,
'
wuu
'
,
'
xal
'
,
'
xh
'
,
'
xmf
'
,
'
xog
'
,
'
yao
'
,
'
yap
'
,
'
yav
'
,
'
ybb
'
,
'
yi
'
,
'
yo
'
,
'
yrl
'
,
'
yue
'
,
'
za
'
,
'
zap
'
,
'
zbl
'
,
'
zea
'
,
'
zen
'
,
'
zgh
'
,
'
zh
'
,
'
zh-Hans
'
,
'
zh-Hant
'
,
'
zu
'
,
'
zun
'
,
'
zxx
'
,
'
zza
'
];
languages
=
languages
.
filter
(
function
(
language
)
{
return
language
.
length
===
2
;
});
languages
=
languages
.
sort
();
return
languages
;
}
}
});
});
...
...
bin/QUI/controls/projects/Manager.js
View file @
3a3d7e69
...
@@ -270,6 +270,7 @@ define('controls/projects/Manager', [
...
@@ -270,6 +270,7 @@ define('controls/projects/Manager', [
Form
.
elements
.
project
.
value
,
Form
.
elements
.
project
.
value
,
Form
.
elements
.
lang
.
value
,
Form
.
elements
.
lang
.
value
,
Form
.
elements
.
template
.
value
,
Form
.
elements
.
template
.
value
,
Form
.
elements
.
demodata
.
value
,
function
(
result
)
{
function
(
result
)
{
self
.
Loader
.
hide
();
self
.
Loader
.
hide
();
...
...
bin/QUI/controls/projects/project/Panel.css
View file @
3a3d7e69
...
@@ -64,4 +64,26 @@
...
@@ -64,4 +64,26 @@
line-height
:
36px
!important
;
line-height
:
36px
!important
;
margin
:
0
!important
;
margin
:
0
!important
;
width
:
40px
!important
;
width
:
40px
!important
;
}
.quiqqer-project-panel
.qui-panel-icon
{
display
:
none
;
}
.quiqqer-project-panel
h2
.qui-panel-title
{
padding-left
:
10px
;
}
.quiqqer-project-panel-button-home
{
width
:
40px
;
}
.quiqqer-project-panel-button-home
.image-container
{
float
:
left
;
text-align
:
center
;
width
:
100%
;
}
.quiqqer-project-panel-button-home
.image-container
span
{
float
:
none
;
}
}
\ No newline at end of file
bin/QUI/controls/projects/project/Panel.js
View file @
3a3d7e69
...
@@ -68,7 +68,7 @@ define('controls/projects/project/Panel', [
...
@@ -68,7 +68,7 @@ define('controls/projects/project/Panel', [
name
:
'
projects-panel
'
,
name
:
'
projects-panel
'
,
project
:
false
,
project
:
false
,
lang
:
false
,
lang
:
false
,
icon
:
'
fa fa-home
'
icon
:
false
});
});
this
.
parent
(
options
);
this
.
parent
(
options
);
...
@@ -79,18 +79,18 @@ define('controls/projects/project/Panel', [
...
@@ -79,18 +79,18 @@ define('controls/projects/project/Panel', [
title
:
Locale
.
get
(
'
quiqqer/system
'
,
'
projects.project.panel.title
'
)
title
:
Locale
.
get
(
'
quiqqer/system
'
,
'
projects.project.panel.title
'
)
});
});
this
.
$Map
=
null
;
this
.
$Map
=
null
;
this
.
$projectmaps
=
{};
this
.
$projectmaps
=
{};
this
.
$Filter
=
null
;
this
.
$Filter
=
null
;
this
.
$Button
=
null
;
this
.
$Button
=
null
;
this
.
$ProjectList
=
null
;
this
.
$ProjectList
=
null
;
this
.
$ProjectContainer
=
null
;
this
.
$ProjectContainer
=
null
;
this
.
$ProjectSearch
=
null
;
this
.
$ProjectSearch
=
null
;
this
.
$ProjectContent
=
null
;
this
.
$ProjectContent
=
null
;
this
.
$LanguageSelect
=
null
;
this
.
$LanguageSelect
=
null
;
this
.
$MediaButton
=
null
;
this
.
$MediaButton
=
null
;
this
.
$__fx_run
=
false
;
this
.
$__fx_run
=
false
;
...
@@ -150,6 +150,8 @@ define('controls/projects/project/Panel', [
...
@@ -150,6 +150,8 @@ define('controls/projects/project/Panel', [
var
self
=
this
,
var
self
=
this
,
Content
=
this
.
getContent
();
Content
=
this
.
getContent
();
this
.
getElm
().
addClass
(
'
quiqqer-project-panel
'
);
Content
.
set
(
Content
.
set
(
'
html
'
,
'
html
'
,
...
@@ -163,9 +165,9 @@ define('controls/projects/project/Panel', [
...
@@ -163,9 +165,9 @@ define('controls/projects/project/Panel', [
Content
.
setStyle
(
'
opacity
'
,
0
);
Content
.
setStyle
(
'
opacity
'
,
0
);
this
.
$ProjectContainer
=
Content
.
getElement
(
'
.project-container
'
);
this
.
$ProjectContainer
=
Content
.
getElement
(
'
.project-container
'
);
this
.
$ProjectList
=
Content
.
getElement
(
'
.project-list
'
);
this
.
$ProjectList
=
Content
.
getElement
(
'
.project-list
'
);
this
.
$ProjectSearch
=
Content
.
getElement
(
'
.project-search
'
);
this
.
$ProjectSearch
=
Content
.
getElement
(
'
.project-search
'
);
this
.
$ProjectContent
=
Content
.
getElement
(
'
.project-content
'
);
this
.
$ProjectContent
=
Content
.
getElement
(
'
.project-content
'
);
this
.
$ProjectContainer
.
setStyles
({
this
.
$ProjectContainer
.
setStyles
({
height
:
'
calc(100% - 40px)
'
height
:
'
calc(100% - 40px)
'
...
@@ -305,7 +307,7 @@ define('controls/projects/project/Panel', [
...
@@ -305,7 +307,7 @@ define('controls/projects/project/Panel', [
// title button
// title button
this
.
$Button
=
new
QUIButton
({
this
.
$Button
=
new
QUIButton
({
name
:
'
projects
'
,
name
:
'
projects
'
,
i
mage
:
'
fa fa-arrow-circle-left
'
,
i
con
:
'
fa fa-home
'
,
title
:
Locale
.
get
(
'
quiqqer/system
'
,
'
projects.project.panel.projectSelect
'
),
title
:
Locale
.
get
(
'
quiqqer/system
'
,
'
projects.project.panel.projectSelect
'
),
events
:
{
events
:
{
onClick
:
function
(
Btn
,
event
)
{
onClick
:
function
(
Btn
,
event
)
{
...
@@ -332,6 +334,7 @@ define('controls/projects/project/Panel', [
...
@@ -332,6 +334,7 @@ define('controls/projects/project/Panel', [
}
}
self
.
createList
();
self
.
createList
();
self
.
open
();
}
}
}
}
}).
inject
(
this
.
getHeader
(),
'
top
'
);
}).
inject
(
this
.
getHeader
(),
'
top
'
);
...
@@ -339,6 +342,7 @@ define('controls/projects/project/Panel', [
...
@@ -339,6 +342,7 @@ define('controls/projects/project/Panel', [
this
.
$Button
.
getElm
().
removeClass
(
'
qui-button
'
);
this
.
$Button
.
getElm
().
removeClass
(
'
qui-button
'
);
this
.
$Button
.
getElm
().
addClass
(
'
button
'
);
this
.
$Button
.
getElm
().
addClass
(
'
button
'
);
this
.
$Button
.
getElm
().
addClass
(
'
btn-blue
'
);
this
.
$Button
.
getElm
().
addClass
(
'
btn-blue
'
);
this
.
$Button
.
getElm
().
addClass
(
'
quiqqer-project-panel-button-home
'
);
},
},
/**
/**
...
@@ -366,24 +370,26 @@ define('controls/projects/project/Panel', [
...
@@ -366,24 +370,26 @@ define('controls/projects/project/Panel', [
self
.
openProject
();
self
.
openProject
();
self
.
Loader
.
hide
();
self
.
Loader
.
hide
();
return
;
return
;
}
else
if
(
Object
.
getLength
(
result
))
{
}
else
{
for
(
key
in
result
)
{
if
(
Object
.
getLength
(
result
))
{
if
(
!
result
.
hasOwnProperty
(
key
))
{
for
(
key
in
result
)
{
continue
;
if
(
!
result
.
hasOwnProperty
(
key
))
{
}
continue
;
}
if
(
result
[
key
].
standard
!==
"
1
"
)
{
continue
;
}
if
(
result
[
key
].
standard
!==
"
1
"
)
{
self
.
setAttribute
(
'
project
'
,
key
);
continue
;
self
.
setAttribute
(
'
lang
'
,
result
[
key
].
default_lang
);
break
;
}
}
self
.
setAttribute
(
'
project
'
,
key
);
self
.
openProject
(
);
self
.
setAttribute
(
'
lang
'
,
result
[
key
].
default_lang
);
self
.
Loader
.
hide
(
);
break
;
return
;
}
}
self
.
openProject
();
self
.
Loader
.
hide
();
return
;
}
}
// no projects exists
// no projects exists
...
@@ -676,7 +682,7 @@ define('controls/projects/project/Panel', [
...
@@ -676,7 +682,7 @@ define('controls/projects/project/Panel', [
onChildClick
:
this
.
$openSitePanel
,
onChildClick
:
this
.
$openSitePanel
,
onChildContextMenu
:
function
(
Item
,
MapItem
,
event
)
{
onChildContextMenu
:
function
(
Item
,
MapItem
,
event
)
{
var
title
=
MapItem
.
getAttribute
(
'
text
'
)
+
'
-
'
+
var
title
=
MapItem
.
getAttribute
(
'
text
'
)
+
'
-
'
+
MapItem
.
getAttribute
(
'
value
'
);
MapItem
.
getAttribute
(
'
value
'
);
MapItem
.
getContextMenu
().
setTitle
(
title
).
setPosition
(
MapItem
.
getContextMenu
().
setTitle
(
title
).
setPosition
(
event
.
page
.
x
,
event
.
page
.
x
,
...
...
bin/QUI/controls/users/Login.js
View file @
3a3d7e69
/**
/**
* @module controls/users/Login
* @module controls/users/Login
*
*
* @event onLoad
* @event onLoad [self]
* @event onAuthBegin
* @event onAuthBegin [self]
* @event onAuthNext
* @event onAuthNext [self]
* @event onSuccess
* @event onSuccess [self]
* @event onAuthNext
* @event onUserLoginError [error, self]
* @event onUserLoginError [error, this]
*
* @event onQuiqqerUserAuthLoginLoad [self]
* @event onQuiqqerUserAuthLoginUserLoginError [error, self]
* @event onQuiqqerUserAuthLoginAuthBegin [self]
* @event onQuiqqerUserAuthLoginSuccess [self]
* @event onQuiqqerUserAuthNext [self]
*/
*/
define
(
'
controls/users/Login
'
,
[
define
(
'
controls/users/Login
'
,
[
...
@@ -91,6 +96,7 @@ define('controls/users/Login', [
...
@@ -91,6 +96,7 @@ define('controls/users/Login', [
QUIAjax
.
get
(
'
ajax_users_loginControl
'
,
function
(
result
)
{