Changeset 1620:542c321dc040 for admin/install

Timestamp:

08/30/13 10:37:08 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

1619:5d925866b5b3 (diff), 1593:0c884219a872 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2.5 into default

Files:

• admin/install/index.php (modified) (5 diffs)
• admin/install/index.php (modified) (3 diffs)

admin/install/index.php

@@ -190 +190 @@
           $core->auth->user_prefs->dashboard->put('doclinks',true,'boolean','',null,true);
           $core->auth->user_prefs->dashboard->put('dcnews',true,'boolean','',null,true);
-          $core->auth->user_prefs->dashboard->put('quickentry',false,'boolean','',null,true);
+          $core->auth->user_prefs->dashboard->put('quickentry',true,'boolean','',null,true);
 
           # Add accessibility options
@@ -307 +307 @@
 '<div id="main">';
 
+if (!is_writable(DC_TPL_CACHE)) {
+     echo '<div class="error"><p>'.sprintf(__('Cache directory %s is not writable.'),DC_TPL_CACHE).'</p></div>';
+}
+
 if ($can_install && !empty($err)) {
      echo '<div class="error"><p><strong>'.__('Errors:').'</strong></p>'.$err.'</div>';
@@ -312 +316 @@
 
 if (!empty($_GET['wiz'])) {
-     echo '<p class="message">'.__('Configuration file has been successfully created.').'</p>';
+     echo '<p class="success">'.__('Configuration file has been successfully created.').'</p>';
 }
 
@@ -324 +328 @@
      '<form action="index.php" method="post">'.
      '<fieldset><legend>'.__('User information').'</legend>'.
-     '<p><label for="u_firstname">'.__('First Name:').' '.
-     form::field('u_firstname',30,255,html::escapeHTML($u_firstname)).'</label></p>'.
-     '<p><label for="u_name">'.__('Last Name:').' '.
-     form::field('u_name',30,255,html::escapeHTML($u_name)).'</label></p>'.
-     '<p><label for="u_email">'.__('Email:').' '.
-     form::field('u_email',30,255,html::escapeHTML($u_email)).'</label></p>'.
+     '<p><label for="u_firstname">'.__('First Name:').'</label> '.
+     form::field('u_firstname',30,255,html::escapeHTML($u_firstname)).'</p>'.
+     '<p><label for="u_name">'.__('Last Name:').'</label> '.
+     form::field('u_name',30,255,html::escapeHTML($u_name)).'</p>'.
+     '<p><label for="u_email">'.__('Email:').'</label> '.
+     form::field('u_email',30,255,html::escapeHTML($u_email)).'</p>'.
      '</fieldset>'.
      
@@ -378 +382 @@
      $plugins_install_result.
      
-     '<p>'.__('Dotclear has been successfully installed. Here is some useful information you should keep.').'</p>'.
+     '<p class="success">'.__('Dotclear has been successfully installed. Here is some useful information you should keep.').'</p>'.
      
      '<h3>'.__('Your account').'</h3>'.

admin/install/index.php

@@ -267 +267 @@
 
   <script type="text/javascript" src="../js/jquery/jquery.js"></script>
+  <?php echo dcPage::jsLoad('../js/jquery/jquery.pwstrength.js'); ?>
   <script type="text/javascript">
   //<![CDATA[
@@ -278 +279 @@
       $(this).val(this.value.replace(login_re,''));
     });
+    
+     <?php echo "\$('#u_pwd').pwstrength({texts: ['".
+                    sprintf(__('Password strength: %s'),__('very weak'))."', '".
+                    sprintf(__('Password strength: %s'),__('weak'))."', '".
+                    sprintf(__('Password strength: %s'),__('mediocre'))."', '".
+                    sprintf(__('Password strength: %s'),__('strong'))."', '".
+                    sprintf(__('Password strength: %s'),__('very strong'))."']});\n"; ?>
     
     $('#u_login').parent().after($('<input type="hidden" name="u_date" value="' + Date().toLocaleString() + '" />'));
@@ -329 +337 @@
      
      '<fieldset><legend>'.__('Username and password').'</legend>'.
-     '<p><label for="u_login" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Username:').'</label> '.
-     form::field('u_login',30,32,html::escapeHTML($u_login)).'</p>'.
-     '<p><label for="u_pwd" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Password:').'</label> '.
-     form::password('u_pwd',30,255).'</p>'.
-     '<p><label for="u_pwd2" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Confirm password:').'</label> '.
-     form::password('u_pwd2',30,255).'</p>'.
+     '<p><label for="u_login" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Username:').' '.
+     form::field('u_login',30,32,html::escapeHTML($u_login)).'</label></p>'.
+     '<div class="pw-table">'.
+          '<p class="pw-cell">'.
+               '<label for="u_pwd" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('New password:').'</label>'.
+               form::password('u_pwd',30,255,'','','',false,' data-indicator="pwindicator" ').
+          '</p>'.
+          '<div id="pwindicator">'.
+          '    <div class="bar"></div>'.
+          '    <p class="label no-margin"></p>'.
+          '</div>'.
+     '</div>'.
+     '<p><label for="u_pwd2" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Confirm password:').' '.
+     form::password('u_pwd2',30,255).'</label></p>'.
      '</fieldset>'.