WordPress.org

Plugin Directory

Changeset 735518


Ignore:
Timestamp:
07/03/13 16:40:28 (10 months ago)
Author:
donncha
Message:

Updated settings page:

  • more WordPress.com, less Polldaddy.
  • added description of WPCC
  • improved layout of login form
File:
1 edited

Legend:

Unmodified
Added
Removed
  • polldaddy/trunk/polldaddy.php

    r735040 r735518  
    12791279                    $account_email = esc_attr( $account->email ); 
    12801280                if ( isset( $account_email ) && current_user_can( 'manage_options' ) ) { 
    1281                     echo "<p>" . sprintf( __( 'Linked to Polldaddy Account: <strong>%s</strong> (<a target="_blank" href="options-general.php?page=polls&action=options">Settings</a> / <a target="_blank" href="http://polldaddy.com/dashboard/">Polldaddy.com</a>)', 'polldaddy' ), $account_email ) . "</p>"; 
     1281                    echo "<p>" . sprintf( __( 'Linked to WordPress.com Account: <strong>%s</strong> (<a target="_blank" href="options-general.php?page=polls&action=options">Settings</a> / <a target="_blank" href="http://polldaddy.com/dashboard/">Polldaddy.com</a>)', 'polldaddy' ), $account_email ) . "</p>"; 
    12821282                } 
    12831283 
     
    47384738    function plugin_options() { 
    47394739        if ( isset( $_POST['polldaddy_email'] ) ) { 
    4740             $account_email = esc_attr( $_POST['polldaddy_email'] ); 
    4741         } 
    4742         else { 
     4740            $account_email = false; 
     4741        } else { 
    47434742            $polldaddy = $this->get_client( WP_POLLDADDY__PARTNERGUID, $this->user_code ); 
    47444743            $account = $polldaddy->get_account(); 
     
    48264825    <?php _e( 'Poll Settings', 'polldaddy' ); ?> 
    48274826  </h2> 
    4828     <?php if ( $this->is_admin || $this->multiple_accounts ) {?> 
    4829   <h3> 
    4830     <?php _e( 'Polldaddy Account Info', 'polldaddy' ); ?> 
    4831   </h3> 
    4832   <p><?php printf( __( 'This is the Polldaddy account you currently have linked with your WordPress blog: <strong>%s</strong>', 'polldaddy' ), $account_email ); ?></p> 
    4833   <p><?php _e( 'Your password is not saved. An API key is used to access your Polldaddy account.', 'polldaddy' ); ?></p> 
    4834   <h4><?php _e( 'Use A Different Account', 'polldaddy' ); ?></h4> 
    4835   <p><?php printf( __( 'Any polls or ratings created in your current account will still be available on Polldaddy.com when you login as %s.', 'polldaddy' ), $account_email ); ?></p> 
     4827    <?php  
     4828        if ( $this->is_admin || $this->multiple_accounts ) { 
     4829            if ( $account_email != false ) { 
     4830    ?> 
     4831    <h3> 
     4832        <?php _e( 'Polldaddy Account Info', 'polldaddy' ); ?> 
     4833    </h3> 
     4834    <p><?php _e( '<em>Polldaddy</em> and <em>WordPress.com</em> are now connected using <a href="http://en.support.wordpress.com/wpcc-faq/">WordPress.com Connect</a>. If you have a WordPress.com account you can use it to login to <a href="http://polldaddy.com/">Polldaddy.com</a>. Click on the Polldaddy "sign in" button, authorize the connection and create your new Polldaddy account. Use the same email and password to login on this page.', 'polldaddy' ); ?></p> 
     4835    <p><strong><?php _e( 'You must login at least once on <a href="http://polldaddy.com/">Polldaddy.com</a> before using this plugin.' ); ?></strong></p> 
     4836    <p><?php printf( __( 'Your account is currently link to this WordPress.com account: <strong>%s</strong>', 'polldaddy' ), $account_email ); ?></p> 
     4837    <br /> 
     4838    <h3><?php _e( 'Link to a different Polldaddy account', 'polldaddy' ); ?></h3> 
     4839        <?php } else { ?> 
     4840            <br /> 
     4841            <h3><?php _e( 'Link to your Polldaddy account', 'polldaddy' ); ?></h3> 
     4842        <?php } ?> 
    48364843  <form action="" method="post"> 
    48374844    <table class="form-table"> 
     
    48404847          <th valign="top" scope="row"> 
    48414848            <label for="polldaddy-email"> 
    4842               <?php _e( 'Polldaddy Email Address', 'polldaddy' ); ?> 
     4849              <?php _e( 'WordPress.com Email Address', 'polldaddy' ); ?> 
    48434850            </label> 
    48444851          </th> 
    48454852          <td> 
    4846             <input type="text" name="polldaddy_email" id="polldaddy-email" aria-required="true" size="40" value="" /> 
     4853          <input type="text" name="polldaddy_email" id="polldaddy-email" aria-required="true" size="40" value="<?php if ( isset( $_POST[ 'polldaddy_email' ] ) ) echo esc_attr( $_POST[ 'polldaddy_email' ] ); ?>" /> 
    48474854          </td> 
    48484855        </tr> 
     
    48504857          <th valign="top" scope="row"> 
    48514858            <label for="polldaddy-password"> 
    4852               <?php _e( 'Polldaddy Password', 'polldaddy' ); ?> 
     4859              <?php _e( 'WordPress.com Password', 'polldaddy' ); ?> 
    48534860            </label> 
    48544861          </th> 
    48554862          <td> 
    48564863            <input type="password" name="polldaddy_password" id="polldaddy-password" aria-required="true" size="40" /> 
     4864            <?php if ( $account_email ) { ?> 
     4865            <p><?php printf( __( 'Any polls or ratings created in your current account will still be available on Polldaddy.com when you login as %s.', 'polldaddy' ), $account_email ); ?></p> 
     4866            <?php } ?> 
    48574867          </td> 
    48584868        </tr> 
Note: See TracChangeset for help on using the changeset viewer.