Merge branch 'master' of
ssh://gitolite@asdynamics.com:50005/projects/fdn2.git Conflicts: private/lib/gui/GUIHandler.php
This commit is contained in:
@@ -172,7 +172,7 @@ class GUIHandler {
|
||||
echo UserLoginManager::getLogged()->nome." ".UserLoginManager::getLogged()->cognome.' | <a href="javascript:logout();">LOGOUT</a>';
|
||||
}
|
||||
else {
|
||||
echo '<a href="javascript:openLoginModal();">LOGIN</a> | <a id="regButton" href="javascript:openRegistrationModal();">REGISTRATI</a>';
|
||||
echo '<a id="loginLink" href="javascript:openLoginModal();">LOGIN</a> | <a id="regButton" href="javascript:openRegistrationModal();">REGISTRATI</a>';
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user