Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
e90996b2
Commit
e90996b2
authored
10 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
Merge pull request #2121 from frederic34/patch-10
Fix missing </div>
parents
8f20de60
f1fa7e72
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/core/tpl/login.tpl.php
+6
-17
6 additions, 17 deletions
htdocs/core/tpl/login.tpl.php
with
6 additions
and
17 deletions
htdocs/core/tpl/login.tpl.php
+
6
−
17
View file @
e90996b2
...
@@ -49,7 +49,6 @@ $(document).ready(function () {
...
@@ -49,7 +49,6 @@ $(document).ready(function () {
<div
align=
"center"
>
<div
align=
"center"
>
<div
class=
"login_vertical_align"
>
<div
class=
"login_vertical_align"
>
<form
id=
"login"
name=
"login"
method=
"post"
action=
"
<?php
echo
$php_self
;
?>
"
>
<form
id=
"login"
name=
"login"
method=
"post"
action=
"
<?php
echo
$php_self
;
?>
"
>
<input
type=
"hidden"
name=
"token"
value=
"
<?php
echo
$_SESSION
[
'newtoken'
];
?>
"
/>
<input
type=
"hidden"
name=
"token"
value=
"
<?php
echo
$_SESSION
[
'newtoken'
];
?>
"
/>
<input
type=
"hidden"
name=
"loginfunction"
value=
"loginfunction"
/>
<input
type=
"hidden"
name=
"loginfunction"
value=
"loginfunction"
/>
...
@@ -191,18 +190,14 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
...
@@ -191,18 +190,14 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
echo
'</div>'
;
echo
'</div>'
;
}
}
?>
?>
</div>
</div>
</div>
</div>
</div>
</form>
</form>
<?php
if
(
!
empty
(
$_SESSION
[
'dol_loginmesg'
]))
<?php
if
(
!
empty
(
$_SESSION
[
'dol_loginmesg'
]))
{
{
?>
?>
...
@@ -216,21 +211,17 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
...
@@ -216,21 +211,17 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
<?php
if
(
$main_home
)
<?php
if
(
$main_home
)
{
{
?>
?>
<div
class=
"login_main_home center"
style=
"max-width: 80%"
>
<!-- main_home message --
>
<?php
echo
$main_home
;
?>
<div
class=
"login_main_home center"
style=
"max-width: 80%"
>
<?php
echo
$main_home
;
?>
</div>
</div>
<br>
<br>
<?php
<?php
}
}
?>
?>
<!-- authentication mode =
<?php
echo
$main_authentication
?>
-->
<!-- authentication mode =
<?php
echo
$main_authentication
?>
-->
<!-- cookie name used for this session =
<?php
echo
$session_name
?>
-->
<!-- cookie name used for this session =
<?php
echo
$session_name
?>
-->
<!-- urlfrom in this session =
<?php
echo
isset
(
$_SESSION
[
"urlfrom"
])
?
$_SESSION
[
"urlfrom"
]
:
''
;
?>
-->
<!-- urlfrom in this session =
<?php
echo
isset
(
$_SESSION
[
"urlfrom"
])
?
$_SESSION
[
"urlfrom"
]
:
''
;
?>
-->
<!-- Common footer is not used for login page, this is same than footer but inside login tpl -->
<!-- Common footer is not used for login page, this is same than footer but inside login tpl -->
<?php
if
(
!
empty
(
$conf
->
global
->
MAIN_HTML_FOOTER
))
print
$conf
->
global
->
MAIN_HTML_FOOTER
;
?>
<?php
if
(
!
empty
(
$conf
->
global
->
MAIN_HTML_FOOTER
))
print
$conf
->
global
->
MAIN_HTML_FOOTER
;
?>
<?php
<?php
// Google Analytics (need Google module)
// Google Analytics (need Google module)
if
(
!
empty
(
$conf
->
google
->
enabled
)
&&
!
empty
(
$conf
->
global
->
MAIN_GOOGLE_AN_ID
))
if
(
!
empty
(
$conf
->
google
->
enabled
)
&&
!
empty
(
$conf
->
global
->
MAIN_GOOGLE_AN_ID
))
...
@@ -276,10 +267,8 @@ if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AD_CLI
...
@@ -276,10 +267,8 @@ if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AD_CLI
}
}
}
}
?>
?>
</div>
</div>
</div>
</body>
</body>
</html>
</html>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment