Merge branch 'MaYor-dev'

3 files changed, 42 insertions, 0 deletions

diff --git a/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js b/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js
index f4b27b06..003422ac 100644
--- a/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js
+++ b/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js
@@ -1,3 +1,4 @@
+
 var debug = false;
 function _debug(str) {
     if (debug) console.log(str);
diff --git a/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml b/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml
index 59dab0ea..295f6eeb 100644
--- a/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml
+++ b/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml
@@ -33,6 +33,15 @@
 	echo '<tbody>'."\n";
     	    echo '<tr>'."\n";
         	echo '<td>'."\n";
+            	    echo _PWGEN;
+        	echo '</td>'."\n";
+        	echo '<td>'."\n";
+            	    echo '<input id="txtPwgen" type="text" value="" maxlength="32" />'."\n";
+		    echo '<div id="btnPwgen" class="icon-fork" style="cursor: pointer"></div>';
+        	echo '</td>'."\n";
+    	    echo '</tr>'."\n";
+    	    echo '<tr>'."\n";
+        	echo '<td>'."\n";
             	    echo _USERNAME;
         	echo '</td>'."\n";
         	echo '<td>'."\n";
diff --git a/mayor-orig/mayor-base/www/skin/classic/module-password/javascript/changePassword.jquery.min.js b/mayor-orig/mayor-base/www/skin/classic/module-password/javascript/changePassword.jquery.min.js
new file mode 100644
index 00000000..221c2f98
--- /dev/null
+++ b/mayor-orig/mayor-base/www/skin/classic/module-password/javascript/changePassword.jquery.min.js
@@ -0,0 +1,32 @@
+$(function() {
+
+    var str = randString($('#newpassword'));
+    $("#btnPwgen").click(function() {
+	$('#newPassword').val(str);
+	$('#verification').val(str);
+    });
+    $('#txtPwgen').val(str);
+
+});
+
+function randString(id){
+  var dataSet = 'a-z,A-Z,0-9'.split(',');  
+  var possible = '';
+  if($.inArray('a-z', dataSet) >= 0){
+    possible += 'abcdefghijklmnopqrstuvwxyz';
+  }
+  if($.inArray('A-Z', dataSet) >= 0){
+    possible += 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+  }
+  if($.inArray('0-9', dataSet) >= 0){
+    possible += '0123456789';
+  }
+  if($.inArray('#', dataSet) >= 0){
+    possible += '![]{}()%&*$#^<>~@|';
+  }
+  var text = '';
+  for(var i=0; i < 10; i++) {
+    text += possible.charAt(Math.floor(Math.random() * possible.length));
+  }
+  return text;
+}