diff --git a/apps/maarch_entreprise/css/styles.css b/apps/maarch_entreprise/css/styles.css index 9359b1d14c072f56a08b142f26b7b35fd395de81..ccb8ee7caad05cdd99d42dc34ee06cb91e8d189e 100755 --- a/apps/maarch_entreprise/css/styles.css +++ b/apps/maarch_entreprise/css/styles.css @@ -1582,14 +1582,14 @@ th.ref { width: 255px; } -#formlogin input { +/* #formlogin input { width: 120px; } #formlogin input.button { width: auto; margin: 0; -} +} */ #formlogin p.buttons, #post .forms .buttons { @@ -1597,9 +1597,9 @@ th.ref { margin: 0; } -#formlogin select { +/* #formlogin select { width: 140px; -} +} */ @@ -3546,6 +3546,9 @@ input.button { border-radius: 4px !important; font-size: 13px; font-weight: 500; + width: 100% !important; + height: 32px; + text-align: center !important; } .submitButton:active { @@ -3561,3 +3564,12 @@ input.button { .submitButton::-moz-focus-inner { border: 0; } + +.standardConnectInput { + width: 100% !important; + height: 32px; + padding: 6px 12px !important; + font-size: 14px; + border: 1px solid #cccccc !important; + border-radius: 4px; +} diff --git a/apps/maarch_entreprise/standard_connect.php b/apps/maarch_entreprise/standard_connect.php index 54703b13169fac397cdc2ce65a35ce3f369fbcbc..9d9f48e9022b01363170f92092a4b8dfe59f928f 100755 --- a/apps/maarch_entreprise/standard_connect.php +++ b/apps/maarch_entreprise/standard_connect.php @@ -9,7 +9,6 @@ function getHeaders() return $headers; } -$userId = ''; echo '<form id="formlogin" method="post" action="' . $_SESSION['config']['businessappurl'] . 'index.php?display=true&page=log'; @@ -22,24 +21,20 @@ echo '<form id="formlogin" method="post" action="' echo '<div>'; echo '<input type="hidden" name="display" id="display" value="true" />'; echo '<input type="hidden" name="page" id="page" value="log" />'; - echo '<p>'; - echo '<br/><label for="login">'._ID.'</label>'; - echo '<input name="login" id="login" value="'.functions::xssafe($userId) - .'" type="text" />'; + echo '<p style="margin-bottom: 3px">'; + echo '<br/>'; + echo '<input placeholder="'._ID.'" name="login" id="login" type="text" class="standardConnectInput" />'; echo '</p>'; echo '<p>'; - echo '<label for="pass">'._PASSWORD.'</label>'; - echo '<input name="pass" id="pass" value="" type="password" />'; + echo '<input placeholder="'._PASSWORD.'" name="pass" id="pass" type="password" class="standardConnectInput" />'; echo '</p>'; $loggingMethod = \SrcCore\models\CoreConfigModel::getLoggingMethod(); if ($loggingMethod['id'] == 'standard') { - echo '<p style="cursor: pointer;font-size: 11px;">'; - echo '<label> </label>'; + echo '<p style="cursor: pointer;font-size: 12px; text-align: right;">'; echo '<span onclick="triggerAngular(\'#/forgot-password\')">'._FORGOT_PASSWORD.'</span>'; echo '</p>'; } echo '<br><p>'; - echo '<label> </label>'; echo '<input type="submit" class="button submitButton" name="submit" value="'._CONNECT.'" />'; echo '</p>'; echo '<div class="error">'; diff --git a/src/frontend/app/about-us.component.html b/src/frontend/app/about-us.component.html index 5fa990426798111d0489aff1f63ae2804daf8981..d8c1e197be4c061ced01f5ae1179c4546b6474e8 100755 --- a/src/frontend/app/about-us.component.html +++ b/src/frontend/app/about-us.component.html @@ -21,7 +21,7 @@ <div class="col-sm-8"> <h3>Maarch Courrier {{applicationVersion}} </h3> <hr /> - <p><em>Copyright © 2008-2019 Maarch SAS {{lang.groupeCompany}}</em></p> + <p><em>Copyright © 2008-2020 Maarch SAS {{lang.groupeCompany}}</em></p> <p>{{lang.maarchLicence}} <a target="blank" href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">licence GNU GPLv3</a>.</p> <div>