Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
co2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jibe b
co2
Commits
27bac8eb
Commit
27bac8eb
authored
Apr 26, 2019
by
Raph El
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://gitlab.adullact.net/pixelhumain/co2
parents
d91268b1
ecc5e72d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
assets/js/default/directory.js
assets/js/default/directory.js
+2
-2
views/app/page.php
views/app/page.php
+1
-1
views/element/banner.php
views/element/banner.php
+3
-0
No files found.
assets/js/default/directory.js
View file @
27bac8eb
...
...
@@ -3265,7 +3265,7 @@ var directory = {
footerStr
+=
'
<div class="pageTable col-md-12 col-sm-12 col-xs-12 text-center"></div>
'
;
if
(
userId
!=
""
){
if
(
typeof
searchObject
.
ranges
==
"
undefined
"
){
console
.
log
(
searchObject
,
"
quepassoaqui
"
);
/*
console.log(searchObject, "quepassoaqui");
addType=searchObject.types[0];
typeForm = addType;
if(addType=="persons"){
...
...
@@ -3304,7 +3304,7 @@ var directory = {
footerStr +='<div class="col-md-12 col-sm-12 col-xs-12 padding-5">'+
btn;
'</div>';
}
}
*/
}
/*else{
btn='<button class="btn btn-default btn-circle-1 btn-create-page bg-green-k text-white tooltips" '+
'data-target="#dash-create-modal" data-toggle="modal" '+
...
...
views/app/page.php
View file @
27bac8eb
...
...
@@ -228,7 +228,7 @@ function initPageInterface(){
});
$
(
".tooltips"
)
.
tooltip
();
affixPageMenu
=
$
(
"#header-banner"
)
.
outerHeight
()
+
$
(
"#mainNav"
)
.
outerHeight
()
+
$
(
"#contentBanner"
)
.
outerHeight
();
affixPageMenu
=
$
(
"#header-banner"
)
.
outerHeight
()
+
$
(
"#mainNav"
)
.
outerHeight
()
+
$
(
"#contentBanner"
)
.
outerHeight
()
-
$
(
'.sub-menu-social'
)
.
outerHeight
()
;
$
(
'.sub-menu-social'
)
.
affix
({
offset
:
{
top
:
affixPageMenu
...
...
views/element/banner.php
View file @
27bac8eb
...
...
@@ -58,6 +58,9 @@
.badgePH
{
padding
:
5px
10px
;
}
#contentBanner
{
min-height
:
280px
;
}
</style>
<?php
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment