Merge branch 'master' of

ssh://gitolite@asdynamics.com:50005/projects/fdn2.git

Conflicts:
	private/lib/gui/GUIHandler.php
This commit is contained in:
Riccardo Di Dato
2016-03-17 11:03:03 +01:00
11 changed files with 216 additions and 50 deletions
+1 -1
View File
@@ -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>