Просмотр исходного кода

Merge pull request #2173 from jloguercio/1.11.x

 Added new CSS3 FormValidator Loader
José Loguercio 7 лет назад
Родитель
Сommit
0121bc0678

+ 239 - 180
app/Resources/public/css/base.css

@@ -6857,213 +6857,272 @@ input.form-control[type="color"] {
 }
 
 /* CSS FormValidator loader */
-.cssload-loader-walk {
-    width: 97px;
-    height: 39px;
-    position: absolute;
-    left: 50%;
-    top: 100px;
-    transform: translate(-50%, -50%);
-    -o-transform: translate(-50%, -50%);
-    -ms-transform: translate(-50%, -50%);
-    -webkit-transform: translate(-50%, -50%);
-    -moz-transform: translate(-50%, -50%);
-}
-.cssload-loader-walk > div {
-    content: "";
-    width: 19px;
-    height: 19px;
-    background: rgb(51,121,183);
-    border-radius: 100%;
-    position: absolute;
-    animation: cssload-animate 2.3s linear infinite;
-    -o-animation: cssload-animate 2.3s linear infinite;
-    -ms-animation: cssload-animate 2.3s linear infinite;
-    -webkit-animation: cssload-animate 2.3s linear infinite;
-    -moz-animation: cssload-animate 2.3s linear infinite;
-}
-.cssload-loader-walk > div:nth-of-type(1) {
-    animation-delay: -0.46s;
-    -o-animation-delay: -0.46s;
-    -ms-animation-delay: -0.46s;
-    -webkit-animation-delay: -0.46s;
-    -moz-animation-delay: -0.46s;
-}
-.cssload-loader-walk > div:nth-of-type(2) {
-    animation-delay: -0.92s;
-    -o-animation-delay: -0.92s;
-    -ms-animation-delay: -0.92s;
-    -webkit-animation-delay: -0.92s;
-    -moz-animation-delay: -0.92s;
-}
-.cssload-loader-walk > div:nth-of-type(3) {
-    animation-delay: -1.38s;
-    -o-animation-delay: -1.38s;
-    -ms-animation-delay: -1.38s;
-    -webkit-animation-delay: -1.38s;
-    -moz-animation-delay: -1.38s;
-}
-.cssload-loader-walk > div:nth-of-type(4) {
-    animation-delay: -1.84s;
-    -o-animation-delay: -1.84s;
-    -ms-animation-delay: -1.84s;
-    -webkit-animation-delay: -1.84s;
-    -moz-animation-delay: -1.84s;
-}
-
-
-
-@keyframes cssload-animate {
+@-moz-keyframes wobblebar-loader {
     0% {
-        left: 97px;
-        top: 0;
+        left: 4px;
     }
-    80% {
-        left: 0;
-        top: 0;
+    3% {
+        left: 204px;
     }
-    85% {
-        left: 0;
-        top: -19px;
-        width: 19px;
-        height: 19px;
+    6% {
+        left: 4px;
     }
-    90% {
-        width: 39px;
-        height: 15px;
+    9% {
+        left: 204px;
     }
-    95% {
-        left: 97px;
-        top: -19px;
-        width: 19px;
-        height: 19px;
+    12% {
+        left: 4px;
     }
-    100% {
-        left: 97px;
-        top: 0;
+    15% {
+        left: 204px;
     }
-}
-
-@-o-keyframes cssload-animate {
-    0% {
-        left: 97px;
-        top: 0;
+    18% {
+        left: 32px;
+    }
+    27% {
+        left: 32px;
+    }
+    30% {
+        left: 204px;
+    }
+    33% {
+        left: 4px;
+    }
+    36% {
+        left: 204px;
     }
-    80% {
-        left: 0;
-        top: 0;
+    39% {
+        left: 4px;
+    }
+    42% {
+        left: 204px;
+    }
+    45% {
+        left: 4px;
+    }
+    48% {
+        left: 204px;
+    }
+    51% {
+        left: 152px;
+    }
+    63% {
+        left: 152px;
+    }
+    66% {
+        left: 4px;
+    }
+    69% {
+        left: 204px;
+    }
+    72% {
+        left: 4px;
+    }
+    75% {
+        left: 204px;
+    }
+    78% {
+        left: 4px;
     }
-    85% {
-        left: 0;
-        top: -19px;
-        width: 19px;
-        height: 19px;
+    81% {
+        left: 204px;
     }
-    90% {
-        width: 39px;
-        height: 15px;
+    84% {
+        left: 72px;
     }
-    95% {
-        left: 97px;
-        top: -19px;
-        width: 19px;
-        height: 19px;
+    94% {
+        left: 72px;
     }
-    100% {
-        left: 97px;
-        top: 0;
+    97% {
+        left: 204px;
     }
 }
-
-@-ms-keyframes cssload-animate {
+@-webkit-keyframes wobblebar-loader {
     0% {
-        left: 97px;
-        top: 0;
+        left: 4px;
+    }
+    3% {
+        left: 204px;
+    }
+    6% {
+        left: 4px;
+    }
+    9% {
+        left: 204px;
+    }
+    12% {
+        left: 4px;
+    }
+    15% {
+        left: 204px;
+    }
+    18% {
+        left: 32px;
+    }
+    27% {
+        left: 32px;
+    }
+    30% {
+        left: 204px;
+    }
+    33% {
+        left: 4px;
+    }
+    36% {
+        left: 204px;
+    }
+    39% {
+        left: 4px;
+    }
+    42% {
+        left: 204px;
+    }
+    45% {
+        left: 4px;
+    }
+    48% {
+        left: 204px;
+    }
+    51% {
+        left: 152px;
+    }
+    63% {
+        left: 152px;
+    }
+    66% {
+        left: 4px;
+    }
+    69% {
+        left: 204px;
     }
-    80% {
-        left: 0;
-        top: 0;
+    72% {
+        left: 4px;
     }
-    85% {
-        left: 0;
-        top: -19px;
-        width: 19px;
-        height: 19px;
+    75% {
+        left: 204px;
     }
-    90% {
-        width: 39px;
-        height: 15px;
+    78% {
+        left: 4px;
     }
-    95% {
-        left: 97px;
-        top: -19px;
-        width: 19px;
-        height: 19px;
+    81% {
+        left: 204px;
     }
-    100% {
-        left: 97px;
-        top: 0;
+    84% {
+        left: 72px;
+    }
+    94% {
+        left: 72px;
+    }
+    97% {
+        left: 204px;
     }
 }
-
-@-webkit-keyframes cssload-animate {
+@keyframes wobblebar-loader {
     0% {
-        left: 97px;
-        top: 0;
+        left: 4px;
+    }
+    3% {
+        left: 204px;
+    }
+    6% {
+        left: 4px;
+    }
+    9% {
+        left: 204px;
+    }
+    12% {
+        left: 4px;
+    }
+    15% {
+        left: 204px;
+    }
+    18% {
+        left: 32px;
+    }
+    27% {
+        left: 32px;
+    }
+    30% {
+        left: 204px;
+    }
+    33% {
+        left: 4px;
+    }
+    36% {
+        left: 204px;
+    }
+    39% {
+        left: 4px;
+    }
+    42% {
+        left: 204px;
+    }
+    45% {
+        left: 4px;
     }
-    80% {
-        left: 0;
-        top: 0;
+    48% {
+        left: 204px;
+    }
+    51% {
+        left: 152px;
+    }
+    63% {
+        left: 152px;
     }
-    85% {
-        left: 0;
-        top: -19px;
-        width: 19px;
-        height: 19px;
+    66% {
+        left: 4px;
     }
-    90% {
-        width: 39px;
-        height: 15px;
+    69% {
+        left: 204px;
     }
-    95% {
-        left: 97px;
-        top: -19px;
-        width: 19px;
-        height: 19px;
+    72% {
+        left: 4px;
     }
-    100% {
-        left: 97px;
-        top: 0;
+    75% {
+        left: 204px;
+    }
+    78% {
+        left: 4px;
+    }
+    81% {
+        left: 204px;
+    }
+    84% {
+        left: 72px;
+    }
+    94% {
+        left: 72px;
+    }
+    97% {
+        left: 204px;
     }
 }
-
-@-moz-keyframes cssload-animate {
-    0% {
-        left: 97px;
-        top: 0;
-    }
-    80% {
-        left: 0;
-        top: 0;
-    }
-    85% {
-        left: 0;
-        top: -19px;
-        width: 19px;
-        height: 19px;
-    }
-    90% {
-        width: 39px;
-        height: 15px;
-    }
-    95% {
-        left: 97px;
-        top: -19px;
-        width: 19px;
-        height: 19px;
-    }
-    100% {
-        left: 97px;
-        top: 0;
-    }
-}
+/* :not(:required) hides this rule from IE9 and below */
+.wobblebar-loader:not(:required) {
+    background: #2E6DA4;
+    -moz-border-radius: 10.66667px;
+    -webkit-border-radius: 10.66667px;
+    border-radius: 10.66667px;
+    display: inline-block;
+    overflow: hidden;
+    text-indent: -9999px;
+    width: 228px;
+    height: 21.33333px;
+    position: relative;
+}
+.wobblebar-loader:not(:required)::after {
+    -moz-animation: wobblebar-loader 15000ms infinite ease;
+    -webkit-animation: wobblebar-loader 15000ms infinite ease;
+    animation: wobblebar-loader 15000ms infinite ease;
+    background: white;
+    display: block;
+    -moz-border-radius: 7.11111px;
+    -webkit-border-radius: 7.11111px;
+    border-radius: 7.11111px;
+    content: '';
+    position: absolute;
+    top: 3.55556px;
+    left: 4px;
+    width: 21.33333px;
+    height: 14.22222px;
+}

+ 1 - 1
main/auth/resend_confirmation_mail.php

@@ -16,7 +16,7 @@ if ($form->validate()) {
     $thisUser = Database::getManager()->getRepository('ChamiloUserBundle:User')->findBy(['username' => $values['user']]);
 
     UserManager::sendUserConfirmationMail($thisUser);
-    Display::addFlash(Display::return_message(get_lang('EmailSend')));
+    Display::addFlash(Display::return_message(get_lang('EmailSent')));
     header('Location: '.api_get_path(WEB_PATH));
     exit;
 }

+ 1 - 3
main/inc/lib/formvalidator/FormValidator.class.php

@@ -1160,9 +1160,7 @@ EOT;
             $returnValue .= '<br />
 
             <div id="loading_div_'.$id.'" class="loading_div" style="display:none;margin-left:40%; margin-top:10px; height:50px;">
-                <div class="cssload-loader-walk">
-                    <div></div><div></div><div></div><div></div><div></div>
-                </div>
+                <div class="wobblebar-loader"></div>
             </div>
             ';
         }

+ 1 - 1
main/inc/lib/template.lib.php

@@ -1404,7 +1404,7 @@ class Template
 
                     if (api_get_setting('allow_registration') === 'confirmation') {
                         $message = sprintf(
-                            get_lang('YourAccountIsInactiveBecauseYouDoesntConfirmItCheckYourMailAndFollowTheInstructionsOrClickHereToReSendEmail'),
+                            get_lang('YourAccountIsInactiveBecauseYouDoesntConfirmItCheckYourEmailAndFollowTheInstructionsOrClickTheFollowingLinkXToReSendTheEmail'),
                             Display::url(get_lang('ReSendConfirmationMail'), api_get_path(WEB_PATH) . 'main/auth/resend_confirmation_mail.php'));
                     }
                     break;

+ 2 - 2
main/inc/lib/usermanager.lib.php

@@ -5728,9 +5728,9 @@ SQL;
         Database::getManager()->flush();
 
         $url = api_get_path(WEB_CODE_PATH).'auth/user_mail_confirmation.php?token='.$uniqueId;
-        $mailSubject = get_lang('InscriptionConfirmation');
+        $mailSubject = get_lang('RegistrationConfirmation');
         $mailBody = sprintf(
-            get_lang('ToCompleteYourPlatformInscriptionYouNeedToConfirmYourAccountClickingTheFollowingLink'),
+            get_lang('ToCompleteYourPlatformRegistrationYouNeedToConfirmYourAccountByClickingTheFollowingLinkX'),
             $url
         );