extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-28 00:39:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge login Ui changes

Browse Source
This commit is contained in:
Hadi Nategh 2021-05-21 16:46:54 +02:00
parent 3037191ea8
commit e919523a51
8 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/Framework/Login.php
View File

@ -315,13 +315,13 @@ class Login
$counter = 1; $counter = 1;
if (is_array($data)) if (is_array($data))
{ {
foreach ($data['apps'] as $app) foreach ($data['apps'] as $id => $app)
{ {
$icon = strpos($app['icon'], "/") === 0 ? $GLOBALS['egw_info']['server']['webserver_url'].$app['icon'] : $app['icon']; $icon = strpos($app['icon'], "/") === 0 ? $GLOBALS['egw_info']['server']['webserver_url'].$app['icon'] : $app['icon'];
$icon2 = strpos($app['icon2'], "/") === 0 ? $GLOBALS['egw_info']['server']['webserver_url'].$app['icon2'] : $app['icon2']; $icon2 = strpos($app['icon2'], "/") === 0 ? $GLOBALS['egw_info']['server']['webserver_url'].$app['icon2'] : $app['icon2'];
$icon3 = strpos($app['icon3'], "/") === 0 ? $GLOBALS['egw_info']['server']['webserver_url'].$app['icon3'] : $app['icon3']; $icon3 = strpos($app['icon3'], "/") === 0 ? $GLOBALS['egw_info']['server']['webserver_url'].$app['icon3'] : $app['icon3'];
$title = lang($app['title']); $title = lang($app['title']);
$nodes .= '<div class="app" style="animation:login-apps '.$counter*0.1.'s ease-out">' $nodes .= '<div class="app" style="animation:login-apps '.$counter*0.1.'s ease-out" data-id="'.$id.'">'
.'<a href="'.htmlspecialchars($app['url']).'" title="'.htmlspecialchars($title).'" class="" target="blank">' .'<a href="'.htmlspecialchars($app['url']).'" title="'.htmlspecialchars($title).'" class="" target="blank">'
.'<img class="icon" src="'.htmlspecialchars($icon).'"/></a>' .'<img class="icon" src="'.htmlspecialchars($icon).'"/></a>'
.'<div class="tooltip">' .'<div class="tooltip">'

7
pixelegg/css/mobile.css
View File

@ -1979,6 +1979,8 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
min-width: 280px; min-width: 280px;
width: max-content; width: max-content;
margin: auto; margin: auto;
padding-top: 2px;
background-color: transparent;
} }
#loginMainDiv .egw_message_wrapper #egw_message { #loginMainDiv .egw_message_wrapper #egw_message {
white-space: normal; white-space: normal;
@ -2056,6 +2058,9 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
#loginMainDiv div#login_footer .apps .app span { #loginMainDiv div#login_footer .apps .app span {
display: none; display: none;
} }
#loginMainDiv div#login_footer .apps .app[data-id="guacamole"] .content img.icon2-bg {
right: 15px;
}
#loginMainDiv div#login_footer .apps .tooltip { #loginMainDiv div#login_footer .apps .tooltip {
display: inline-flex; display: inline-flex;
position: absolute; position: absolute;
@ -2135,6 +2140,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
z-index: 100; z-index: 100;
padding: 0; padding: 0;
width: 280px; width: 280px;
border-radius: 5px;
} }
#loginMainDiv div#centerBox .egw_logo { #loginMainDiv div#centerBox .egw_logo {
width: 24px; width: 24px;
@ -2155,6 +2161,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
background-color: white; background-color: white;
padding: 1em; padding: 1em;
border: 1px solid #cdcdce; border: 1px solid #cdcdce;
border-radius: 5px;
} }
#loginMainDiv div#centerBox form .hiddenCredential { #loginMainDiv div#centerBox form .hiddenCredential {
display: none; display: none;

7
pixelegg/css/monochrome.css
View File

@ -1959,6 +1959,8 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
min-width: 280px; min-width: 280px;
width: max-content; width: max-content;
margin: auto; margin: auto;
padding-top: 2px;
background-color: transparent;
} }
#loginMainDiv .egw_message_wrapper #egw_message { #loginMainDiv .egw_message_wrapper #egw_message {
white-space: normal; white-space: normal;
@ -2036,6 +2038,9 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
#loginMainDiv div#login_footer .apps .app span { #loginMainDiv div#login_footer .apps .app span {
display: none; display: none;
} }
#loginMainDiv div#login_footer .apps .app[data-id="guacamole"] .content img.icon2-bg {
right: 15px;
}
#loginMainDiv div#login_footer .apps .tooltip { #loginMainDiv div#login_footer .apps .tooltip {
display: inline-flex; display: inline-flex;
position: absolute; position: absolute;
@ -2115,6 +2120,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
z-index: 100; z-index: 100;
padding: 0; padding: 0;
width: 280px; width: 280px;
border-radius: 5px;
} }
#loginMainDiv div#centerBox .egw_logo { #loginMainDiv div#centerBox .egw_logo {
width: 24px; width: 24px;
@ -2135,6 +2141,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
background-color: white; background-color: white;
padding: 1em; padding: 1em;
border: 1px solid #cdcdce; border: 1px solid #cdcdce;
border-radius: 5px;
} }
#loginMainDiv div#centerBox form .hiddenCredential { #loginMainDiv div#centerBox form .hiddenCredential {
display: none; display: none;

7
pixelegg/css/pixelegg.css
View File

@ -1969,6 +1969,8 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
min-width: 280px; min-width: 280px;
width: max-content; width: max-content;
margin: auto; margin: auto;
padding-top: 2px;
background-color: transparent;
} }
#loginMainDiv .egw_message_wrapper #egw_message { #loginMainDiv .egw_message_wrapper #egw_message {
white-space: normal; white-space: normal;
@ -2046,6 +2048,9 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
#loginMainDiv div#login_footer .apps .app span { #loginMainDiv div#login_footer .apps .app span {
display: none; display: none;
} }
#loginMainDiv div#login_footer .apps .app[data-id="guacamole"] .content img.icon2-bg {
right: 15px;
}
#loginMainDiv div#login_footer .apps .tooltip { #loginMainDiv div#login_footer .apps .tooltip {
display: inline-flex; display: inline-flex;
position: absolute; position: absolute;
@ -2125,6 +2130,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
z-index: 100; z-index: 100;
padding: 0; padding: 0;
width: 280px; width: 280px;
border-radius: 5px;
} }
#loginMainDiv div#centerBox .egw_logo { #loginMainDiv div#centerBox .egw_logo {
width: 24px; width: 24px;
@ -2145,6 +2151,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
background-color: white; background-color: white;
padding: 1em; padding: 1em;
border: 1px solid #cdcdce; border: 1px solid #cdcdce;
border-radius: 5px;
} }
#loginMainDiv div#centerBox form .hiddenCredential { #loginMainDiv div#centerBox form .hiddenCredential {
display: none; display: none;

8
pixelegg/less/layout_loginPage.less
View File

@ -102,6 +102,8 @@ div#loginMainDiv.stockLoginBackground {
min-width: 280px; min-width: 280px;
width: max-content; width: max-content;
margin: auto; margin: auto;
padding-top: 2px;
background-color:transparent;
#egw_message{ #egw_message{
white-space: normal; white-space: normal;
background-image: none; background-image: none;
@ -177,6 +179,9 @@ div#loginMainDiv.stockLoginBackground {
} }
span {display:none;} span {display:none;}
} }
.app[data-id="guacamole"] {
.content img.icon2-bg {right:15px;}
}
.tooltip { .tooltip {
display: inline-flex; display: inline-flex;
position: absolute; position: absolute;
@ -257,7 +262,7 @@ div#loginMainDiv.stockLoginBackground {
z-index: 100; z-index: 100;
padding: 0; padding: 0;
width: 280px; width: 280px;
border-radius: 5px;
.egw_logo { .egw_logo {
width: 24px; width: 24px;
height: 24px; height: 24px;
@ -280,6 +285,7 @@ div#loginMainDiv.stockLoginBackground {
background-color: white; background-color: white;
padding:1em; padding:1em;
border: 1px solid #cdcdce; border: 1px solid #cdcdce;
border-radius: 5px;
.hiddenCredential {display: none;} .hiddenCredential {display: none;}
// Table // Table
table.divLoginbox { table.divLoginbox {

5
pixelegg/login/login.json
View File

File diff suppressed because one or more lines are too long

8
pixelegg/login_mobile.tpl
View File

@ -104,18 +104,14 @@
<!-- BEGIN registration --> <!-- BEGIN registration -->
<tr> <tr>
<td colspan="3" height="20" align="center" class="registration"> <td colspan="3" height="20" align="center" class="registration">
{lostpassword_link}{lostid_link}{register_link} {lostpassword_link}{lostid_link}
</td> </td>
</tr> </tr>
<!-- END registration --> <!-- END registration -->
<tr> <tr>
<td> <td>
<div id="socialBox"></div> <div id="socialBox"></div>
<div class="egw_logo"> {register_link}
<a href="https://www.egroupware.org" class="logo_footer" target="_blank">
<img src="api/templates/default/images/login_logo.png">
</a>
</div>
</td> </td>
</tr> </tr>
</table> </table>

7
pixelegg/mobile/fw_mobile.css
View File

@ -1990,6 +1990,8 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
min-width: 280px; min-width: 280px;
width: max-content; width: max-content;
margin: auto; margin: auto;
padding-top: 2px;
background-color: transparent;
} }
#loginMainDiv .egw_message_wrapper #egw_message { #loginMainDiv .egw_message_wrapper #egw_message {
white-space: normal; white-space: normal;
@ -2067,6 +2069,9 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
#loginMainDiv div#login_footer .apps .app span { #loginMainDiv div#login_footer .apps .app span {
display: none; display: none;
} }
#loginMainDiv div#login_footer .apps .app[data-id="guacamole"] .content img.icon2-bg {
right: 15px;
}
#loginMainDiv div#login_footer .apps .tooltip { #loginMainDiv div#login_footer .apps .tooltip {
display: inline-flex; display: inline-flex;
position: absolute; position: absolute;
@ -2146,6 +2151,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
z-index: 100; z-index: 100;
padding: 0; padding: 0;
width: 280px; width: 280px;
border-radius: 5px;
} }
#loginMainDiv div#centerBox .egw_logo { #loginMainDiv div#centerBox .egw_logo {
width: 24px; width: 24px;
@ -2166,6 +2172,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
background-color: white; background-color: white;
padding: 1em; padding: 1em;
border: 1px solid #cdcdce; border: 1px solid #cdcdce;
border-radius: 5px;
} }
#loginMainDiv div#centerBox form .hiddenCredential { #loginMainDiv div#centerBox form .hiddenCredential {
display: none; display: none;