Merge pull request #1415 from Marc-pi/develop

upgrade third part libs : FA, jQuery, CKEditor, apply delimiter fix for apostrophes on account page

usr/module/user/template/front/account-index.phtml

@@ -17,7 +17,7 @@ $this->headMeta('noindex', 'robots');
     <div class="modal-dialog">
         <div class="modal-content form-horizontal">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                 <h4 class="modal-title"><?php _e('Verify identity'); ?></h4>
             </div>
             <div class="modal-body">
@@ -104,22 +104,22 @@ $this->headMeta('noindex', 'robots');
 
                             if (result.email_error === 0) {
                                 this.emailInitVal = result.email_value;
-                                this.$email.after('<span class="help-block">' + result.email_message + '</span>');
+                                this.$email.after("<span class='help-block'>" + result.email_message + "</span>");
                             }
 
                             if (result.email_error === 1) {
                                 this.emailReset();
-                                this.$email.after('<span class="help-block">' + result.email_message + '</span>').closest('.control-group').addClass('error');
+                                this.$email.after("<span class='help-block'>" + result.email_message + "</span>").closest('.control-group').addClass('error');
                             }
 
                             if (result.name_error === 0) {
                                 this.nameInitVal = result.name_value;
-                                this.$name.after('<span class="help-block">' + result.name_message + '</span>');
+                                this.$name.after("<span class='help-block'>" + result.name_message + "</span>");
                             }
 
                             if (result.name_error === 1) {
                                 this.nameReset();
-                                this.$name.after('<span class="help-block">' + result.name_message + '</span>').closest('.control-group').addClass('error');
+                                this.$name.after("<span class='help-block'>" + result.name_message + "</span>").closest('.control-group').addClass('error');
                             }
 
                             this.$confirm.modal('hide');
@@ -128,7 +128,7 @@ $this->headMeta('noindex', 'robots');
                     } else {
                         this.confirmReset();
                         this.$confirmPassword.next().remove();
-                        this.$confirmPassword.after('<span class="help-inline">' + result.message + '</span>').closest('.control-group').addClass('error');
+                        this.$confirmPassword.after("<span class='help-block'>" + result.message + "</span>").closest('.control-group').addClass('error');
                     }
                 }, this));
             },
@@ -169,14 +169,14 @@ $this->headMeta('noindex', 'robots');
 
                     case emailVal == '':
                         this.$email.next().remove();
-                        this.$email.after('<span class="help-inline"><?php _e('Email is required.'); ?></span>');
+                        this.$email.after("<span class='help-inline'><?php _e('Email is required.'); ?></span>");
                         this.isEmailValid = false;
                         this.isValid();
                         break;
 
                     case emailVal == this.emailInitVal:
                         this.$email.next().remove();
-                        this.$email.after('<span class="help-inline">' + this.options.THAT_IS_YOU + '</span>');
+                        this.$email.after("<span class='help-inline'>" + this.options.THAT_IS_YOU + "</span>");
                         this.isEmailValid = false;
                         this.isValid();
                         break;
@@ -189,7 +189,7 @@ $this->headMeta('noindex', 'robots');
                             $.getJSON(this.options.validateUrl, { 'key': 'email', 'value': emailVal }, $.proxy(function(result) {
                                 if (!result.status) {
                                     this.$email.next().remove();
-                                    this.$email.after('<span class="help-inline">' + result.message + '</span>');
+                                    this.$email.after("<span class='help-inline'>" + result.message + "</span>");
                                     this.isEmailValid = false;
                                     this.isValid();
                                 } else {
@@ -209,14 +209,14 @@ $this->headMeta('noindex', 'robots');
 
                     case nameVal == '':
                         this.$name.next().remove();
-                        this.$name.after('<span class="help-inline"><?php _e('Display name is required.'); ?></span>');
+                        this.$name.after("<span class='help-inline'><?php _e('Display name is required.'); ?></span>");
                         this.isNameValid = false;
                         this.isValid();
                         break;
 
                     case nameVal == this.nameInitVal:
                         this.$name.next().remove();
-                        this.$name.after('<span class="help-inline">' + this.options.THAT_IS_YOU + '</span>');
+                        this.$name.after("<span class='help-inline'>" + this.options.THAT_IS_YOU + "</span>");
                         this.isNameValid = false;
                         this.isValid();
                         break;
@@ -229,7 +229,7 @@ $this->headMeta('noindex', 'robots');
                             $.getJSON(this.options.validateUrl, { 'key': 'name', 'value': nameVal }, $.proxy(function(result) {
                                 if (!result.status) {
                                     this.$name.next().remove();
-                                    this.$name.after('<span class="help-inline">' + result.message + '</span>');
+                                    this.$name.after("<span class='help-inline'>" + result.message + "</span>");
                                     this.isNameValid = false;
                                     this.isValid();
                                 } else {
@@ -260,6 +260,6 @@ $this->headMeta('noindex', 'robots');
         validateUrl: '<?php echo $this->url('', array('controller' => 'account', 'action' => 'validate')); ?>',
         //checkExistUrl: '<?php echo $this->url('', array('controller' => 'account', 'action' => 'check.exist')); ?>',
         confirmUrl: '<?php echo $this->url('', array('controller' => 'account', 'action' => 'verify.credential')); ?>',
-        THAT_IS_YOU: '<?php _e('No change!'); ?>'
+        THAT_IS_YOU: "<?php _e('No change!'); ?>"
     });
 </script>

www/public/vendor/bootstrap/changelog.txt

@@ -1,5 +1,9 @@
 Changelog
 
+June 22th, 2016 marc
+=====================
+1. Upgrade to Font-Awesome 4.6.3
+
 November 29th, 2015 Marc
 ========================
 1. Upgrade to Bootstrap to v3.3.6 (keep Glyphicons to prevent from 404)

www/public/vendor/bootstrap/font-awesome/css/font-awesome.css

@@ -1,13 +1,13 @@
 /*!
- *  Font Awesome 4.5.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.6.3 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 /* FONT PATH
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../fonts/fontawesome-webfont.eot?v=4.5.0');
-  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.5.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.5.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.5.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.5.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular') format('svg');
+  src: url('../fonts/fontawesome-webfont.eot?v=4.6.3');
+  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.6.3') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.6.3') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.6.3') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.6.3') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.6.3#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -118,31 +118,31 @@
   }
 }
 .fa-rotate-90 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
   -webkit-transform: rotate(90deg);
   -ms-transform: rotate(90deg);
   transform: rotate(90deg);
 }
 .fa-rotate-180 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
   -webkit-transform: rotate(180deg);
   -ms-transform: rotate(180deg);
   transform: rotate(180deg);
 }
 .fa-rotate-270 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
   -webkit-transform: rotate(270deg);
   -ms-transform: rotate(270deg);
   transform: rotate(270deg);
 }
 .fa-flip-horizontal {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
   -webkit-transform: scale(-1, 1);
   -ms-transform: scale(-1, 1);
   transform: scale(-1, 1);
 }
 .fa-flip-vertical {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
   -webkit-transform: scale(1, -1);
   -ms-transform: scale(1, -1);
   transform: scale(1, -1);
@@ -1383,7 +1383,7 @@
 .fa-digg:before {
   content: "\f1a6";
 }
-.fa-pied-piper:before {
+.fa-pied-piper-pp:before {
   content: "\f1a7";
 }
 .fa-pied-piper-alt:before {
@@ -1509,6 +1509,7 @@
   content: "\f1ce";
 }
 .fa-ra:before,
+.fa-resistance:before,
 .fa-rebel:before {
   content: "\f1d0";
 }
@@ -2084,3 +2085,115 @@
 .fa-percent:before {
   content: "\f295";
 }
+.fa-gitlab:before {
+  content: "\f296";
+}
+.fa-wpbeginner:before {
+  content: "\f297";
+}
+.fa-wpforms:before {
+  content: "\f298";
+}
+.fa-envira:before {
+  content: "\f299";
+}
+.fa-universal-access:before {
+  content: "\f29a";
+}
+.fa-wheelchair-alt:before {
+  content: "\f29b";
+}
+.fa-question-circle-o:before {
+  content: "\f29c";
+}
+.fa-blind:before {
+  content: "\f29d";
+}
+.fa-audio-description:before {
+  content: "\f29e";
+}
+.fa-volume-control-phone:before {
+  content: "\f2a0";
+}
+.fa-braille:before {
+  content: "\f2a1";
+}
+.fa-assistive-listening-systems:before {
+  content: "\f2a2";
+}
+.fa-asl-interpreting:before,
+.fa-american-sign-language-interpreting:before {
+  content: "\f2a3";
+}
+.fa-deafness:before,
+.fa-hard-of-hearing:before,
+.fa-deaf:before {
+  content: "\f2a4";
+}
+.fa-glide:before {
+  content: "\f2a5";
+}
+.fa-glide-g:before {
+  content: "\f2a6";
+}
+.fa-signing:before,
+.fa-sign-language:before {
+  content: "\f2a7";
+}
+.fa-low-vision:before {
+  content: "\f2a8";
+}
+.fa-viadeo:before {
+  content: "\f2a9";
+}
+.fa-viadeo-square:before {
+  content: "\f2aa";
+}
+.fa-snapchat:before {
+  content: "\f2ab";
+}
+.fa-snapchat-ghost:before {
+  content: "\f2ac";
+}
+.fa-snapchat-square:before {
+  content: "\f2ad";
+}
+.fa-pied-piper:before {
+  content: "\f2ae";
+}
+.fa-first-order:before {
+  content: "\f2b0";
+}
+.fa-yoast:before {
+  content: "\f2b1";
+}
+.fa-themeisle:before {
+  content: "\f2b2";
+}
+.fa-google-plus-circle:before,
+.fa-google-plus-official:before {
+  content: "\f2b3";
+}
+.fa-fa:before,
+.fa-font-awesome:before {
+  content: "\f2b4";
+}
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
+}
+.sr-only-focusable:active,
+.sr-only-focusable:focus {
+  position: static;
+  width: auto;
+  height: auto;
+  margin: 0;
+  overflow: visible;
+  clip: auto;
+}