Changeset 2984

Show
Ignore:
Timestamp:
08/26/08 21:22:36 (3 months ago)
Author:
bsmith
Message:

bugzid:81210 - display email as link for local or openid users

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/MT/CMS/Comment.pm

    r2783 r2984  
    9191                $param->{type_author} = 1 
    9292                  if MT::Author::AUTHOR() == $cmtr->type; 
     93                $param->{auth_icon_url} = $cmtr->auth_icon_url; 
     94                $param->{email} = $cmtr->email; 
     95                $param->{url} = $cmtr->url; 
    9396                $param->{commenter_url} = $app->uri( 
    9497                    mode => 'view', 
    …… 
    97100                  if ( MT::Author::AUTHOR() == $cmtr->type ) 
    98101                  && $app->user->is_superuser; 
    99             } 
    100             if ( $obj->email !~ m/@/ ) {    # no email for this commenter 
    101                 $param->{email_withheld} = 1; 
    102102            } 
    103103        } 

  • trunk/tmpl/cms/edit_comment.tmpl

    r2784 r2984  
    148148        show_hint="0"> 
    149149        <mt:if name="commenter_id"> 
     150            <mt:if name="auth_icon_url"><img style="background-image: none" src="<mt:var name="auth_icon_url">" height="9" width="9" alt="" border="0" /></mt:if> 
    150151            <mt:if name="commenter_approved"> 
    151152                <mt:if name="commenter_url"><a href="<mt:var name="commenter_url">"><mt:var name="author" escape="html"></a><mt:else><mt:var name="nickname" escape="html"><mt:var name="author" escape="html"></mt:if> 
    152                 <img src="<mt:var name="static_uri">images/status_icons/trusted.gif" alt="<__trans phrase="Trusted">" width="13" height="9" /> 
    153                 <span class="hint"><__trans phrase="(Trusted)"></span> 
    154                 <mt:if name="can_edit_commenters"><mt:unless name="is_mine"> 
     153                <mt:if name="can_edit_commenters"> 
     154                    <mt:unless name="is_mine"> 
     155            <span class="commenter-actions"> 
     156                <mt:unless name="type_author"><a href="<mt:var name="script_url">?__mode=save_commenter_perm&amp;action=untrust&amp;blog_id=<mt:var name="blog_id">&amp;commenter_id=<mt:var name="commenter_id">&amp;return_args=<mt:var name="return_args" escape="url">&amp;magic_token=<mt:var name="magic_token">" class="commenter-neutral"><__trans phrase="Untrust Commenter"></a></mt:unless> 
     157                <a href="<mt:var name="script_url">?__mode=save_commenter_perm&amp;action=ban&amp;blog_id=<mt:var name="blog_id">&amp;commenter_id=<mt:var name="commenter_id">&amp;return_args=<mt:var name="return_args" escape="url">&amp;magic_token=<mt:var name="magic_token">" class="commenter-ban"><__trans phrase="Ban Commenter"></a> 
     158            </span> 
     159                    </mt:unless> 
     160                    <a href="<mt:var name="script_url">?__mode=view&amp;_type=commenter&amp;blog_id=<mt:var name="blog_id">&amp;id=<mt:var name="commenter_id">" class="icon-right-wide icon-<mt:if name="commenter_approved">trusted<mt:else name="commenter_banned">banned<mt:else>authenticated</mt:if>" title="<__trans phrase="Edit this [_1] commenter" params="<$mt:var name="commenter_status" escape="html"$>">">foo</a> 
     161                <mt:else> 
     162                    <span class="icon-right-wide icon-<mt:if name="commenter_approved">trusted<mt:else><mt:if name="commenter_banned">banned<mt:else>authenticated</mt:if></mt:if>">foo</span> 
     163                </mt:if> 
     164            <mt:else name="commenter_banned"> 
     165                <mt:if name="commenter_url"><a href="<mt:var name="commenter_url">"><mt:var name="author" escape="html"></a><mt:else><mt:var name="nickname" escape="html"><mt:var name="author" escape="html"></mt:if> 
     166                <img src="<mt:var name="static_uri">images/status_icons/banned.gif" alt="<__trans phrase="Banned">" width="13" height="9" /> 
     167                <mt:if name="can_edit_commenters"> 
     168                    <mt:unless name="is_mine"> 
    155169                    <span class="commenter-actions"> 
     170                        <mt:unless name="type_author"><a href="<mt:var name="script_url">?__mode=save_commenter_perm&amp;action=trust&amp;blog_id=<mt:var name="blog_id">&amp;commenter_id=<mt:var name="commenter_id">&amp;return_args=<mt:var name="return_args" escape="url">&amp;magic_token=<mt:var name="magic_token">" class="commenter-trust"><__trans phrase="Trust Commenter"></a></mt:unless> 
     171                        <a href="<mt:var name="script_url">?__mode=save_commenter_perm&amp;action=unban&amp;blog_id=<mt:var name="blog_id">&amp;commenter_id=<mt:var name="commenter_id">&amp;return_args=<mt:var name="return_args" escape="url">&amp;magic_token=<mt:var name="magic_token">" class="commenter-neutral"><__trans phrase="Unban Commenter"></a> 
     172                    </span> 
     173                    </mt:unless> 
     174                </mt:if> 
     175            <mt:else> 
     176                <mt:if name="commenter_url"><a href="<mt:var name="commenter_url">"><mt:var name="author" escape="html"></a><mt:else><mt:var name="nickname" escape="html"><mt:var name="author" escape="html"></mt:if> 
     177                <img src="<mt:var name="static_uri">images/status_icons/authenticated.gif" alt="<__trans phrase="Pending">" width="7" height="9" /> 
     178                <mt:if name="can_edit_commenters"> 
     179                    <mt:unless name="is_mine"> 
     180                    <span class="commenter-actions"> 
     181                        <mt:unless name="type_author"><a href="<mt:var name="script_url">?__mode=save_commenter_perm&amp;action=trust&amp;blog_id=<mt:var name="blog_id">&amp;commenter_id=<mt:var name="commenter_id">&amp;return_args=<mt:var name="return_args" escape="url">&amp;magic_token=<mt:var name="magic_token">" class="commenter-trust"><__trans phrase="Trust Commenter"></a></mt:unless> 
    156182                        <a href="<mt:var name="script_url">?__mode=save_commenter_perm&amp;action=ban&amp;blog_id=<mt:var name="blog_id">&amp;commenter_id=<mt:var name="commenter_id">&amp;return_args=<mt:var name="return_args" escape="url">&amp;magic_token=<mt:var name="magic_token">" class="commenter-ban"><__trans phrase="Ban Commenter"></a> 
    157                         <mt:unless name="type_author"><a href="<mt:var name="script_url">?__mode=save_commenter_perm&amp;action=untrust&amp;blog_id=<mt:var name="blog_id">&amp;commenter_id=<mt:var name="commenter_id">&amp;return_args=<mt:var name="return_args" escape="url">&amp;magic_token=<mt:var name="magic_token">" class="commenter-neutral"><__trans phrase="Untrust Commenter"></a></mt:unless> 
    158183                    </span> 
    159             </mt:if></mt:unless> 
    160             <mt:else> 
    161                 <mt:if name="commenter_banned"> 
    162                     <mt:if name="commenter_url"><a href="<mt:var name="commenter_url">"><mt:var name="author" escape="html"></a><mt:else><mt:var name="nickname" escape="html"><mt:var name="author" escape="html"></mt:if> 
    163                     <img src="<mt:var name="static_uri">images/status_icons/banned.gif" alt="<__trans phrase="Banned">" width="13" height="9" /> 
    164                     <span class="hint"><__trans phrase="(Banned)"></span> 
    165                     <mt:if name="can_edit_commenters"><mt:unless name="is_mine"> 
    166                         <span class="commenter-actions"> 
    167                             <mt:unless name="type_author"><a href="<mt:var name="script_url">?__mode=save_commenter_perm&amp;action=trust&amp;blog_id=<mt:var name="blog_id">&amp;commenter_id=<mt:var name="commenter_id">&amp;return_args=<mt:var name="return_args" escape="url">&amp;magic_token=<mt:var name="magic_token">" class="commenter-trust"><__trans phrase="Trust Commenter"></a></mt:unless> 
    168                             <a href="<mt:var name="script_url">?__mode=save_commenter_perm&amp;action=unban&amp;blog_id=<mt:var name="blog_id">&amp;commenter_id=<mt:var name="commenter_id">&amp;return_args=<mt:var name="return_args" escape="url">&amp;magic_token=<mt:var name="magic_token">" class="commenter-neutral"><__trans phrase="Unban Commenter"></a> 
    169                         </span> 
    170                     </mt:if></mt:unless> 
    171                 <mt:else> 
    172                     <mt:if name="commenter_url"><a href="<mt:var name="commenter_url">"><mt:var name="author" escape="html"></a><mt:else><mt:var name="nickname" escape="html"><mt:var name="author" escape="html"></mt:if> 
    173                     <img src="<mt:var name="static_uri">images/status_icons/authenticated.gif" alt="<__trans phrase="Pending">" width="7" height="9" /> 
    174                     <mt:if name="can_edit_commenters"><mt:unless name="is_mine"> 
    175                         <span class="commenter-actions"> 
    176                             <a href="<mt:var name="script_url">?__mode=save_commenter_perm&amp;action=trust&amp;blog_id=<mt:var name="blog_id">&amp;commenter_id=<mt:var name="commenter_id">&amp;return_args=<mt:var name="return_args" escape="url">&amp;magic_token=<mt:var name="magic_token">" class="commenter-trust"><__trans phrase="Trust Commenter"></a> 
    177                             <a href="<mt:var name="script_url">?__mode=save_commenter_perm&amp;action=ban&amp;blog_id=<mt:var name="blog_id">&amp;commenter_id=<mt:var name="commenter_id">&amp;return_args=<mt:var name="return_args" escape="url">&amp;magic_token=<mt:var name="magic_token">" class="commenter-ban"><__trans phrase="Ban Commenter"></a> 
    178                         </span> 
    179                     </mt:if></mt:unless> 
    180                 </mt:if> 
    181             </mt:if> 
    182         <mt:else> 
    183             <input name="author" id="author" value="<mt:var name="author" escape="html">" /> 
     184                    </mt:unless> 
     185                </mt:if> 
     186            </mt:if> 
     187        <mt:else> 
     188            <input name="author" id="author" value="<mt:var name="author" escape="html">" class="width90" /> 
    184189        </mt:if> 
    185190        <mt:if name="commenter_id"> 
    …… 
    190195    </mtapp:setting> 
    191196 
    192     <mtapp:setting 
    193         id="email" 
    194         label="<__trans phrase="Email">" 
    195         hint="<__trans phrase="Email address of commenter">" 
    196         show_hint="0"> 
    197         <mt:if name="commenter_id"> 
    198             <mt:if name="email_withheld"> 
    199                 <__trans phrase="None given"> 
     197        <mt:if name="email"> 
     198            <$mt:setvar name="email_content_class" value="field-content-text"$> 
     199        <mt:else> 
     200            <mt:if name="commenter_id"> 
     201                <$mt:setvar name="email_content_class" value="field-content-text"$> 
     202            </mt:if> 
     203        </mt:if> 
     204        <mtapp:setting 
     205            id="email" 
     206            label="<__trans phrase="Email">" 
     207            hint="<__trans phrase="Email address of commenter">" 
     208            content_class="$email_content_class" 
     209            show_hint="0"> 
     210            <mt:if name="commenter_id"> 
     211                <mt:if name="email"> 
     212                    <a href="mailto:<mt:var name="email" escape="html">" title="<mt:var name="email" escape="html">"><mt:var name="email" escape="html"></a> 
     213                <mt:else> 
     214                    <em><__trans phrase="Unavailable for OpenID user"></em> 
     215                </mt:if> 
    200216            <mt:else> 
    201                 <mt:if name="email"> 
    202                     <input name="email" id="email" value="<mt:var name="email" escape="html">" disabled="disabled" class="width90" /> 
    203                     <a href="mailto:<mt:var name="email" escape="html">" title="<mt:var name="email" escape="html">"><img src="<mt:var name="static_uri">images/status_icons/email.gif" alt="<__trans phrase="Email">" width="16" height="9" /></a> 
    204                 <mt:else> 
    205                     <__trans phrase="None given"> 
    206                 </mt:if> 
    207             </mt:if> 
    208         <mt:else> 
    209             <input name="email" id="email" value="<mt:var name="email" escape="html">" class="width90" /> 
     217                <input name="email" id="email" value="<mt:var name="email" escape="html">" class="width90" /> 
     218            </mt:if> 
    210219            <mt:if name="email"> 
    211220                <a href="mailto:<mt:var name="email" escape="html">" title="<mt:var name="email" escape="html">"><img src="<mt:var name="static_uri">images/status_icons/email.gif" alt="<__trans phrase="Email">" width="16" height="9" /></a> 
    212             </mt:if> 
    213         </mt:if> 
    214         <mt:if name="email_withheld">&nbsp;<mt:else><mt:if name="email"><a title="<__trans phrase="View all comments with this email address">" href="<mt:var name="script_url">?__mode=search_replace&amp;_type=comment&amp;blog_id=<mt:var name="blog_id">&amp;search=<mt:var name="email" escape="url">&amp;do_search=1"><img alt="" src="<mt:var name="static_uri">images/filter.gif" width="8" height="8" border="0" /></a><mt:else>&nbsp;</mt:if></mt:if> 
    215     </mtapp:setting> 
    216  
    217     <mtapp:setting 
    218         id="url" 
    219         label="<__trans phrase="URL">" 
    220         hint="<__trans phrase="URL of commenter">" 
    221         show_hint="0"> 
    222         <input name="url" id="url" value="<mt:var name="url" escape="html">" class="width90" /> 
     221                <a title="<__trans phrase="View all comments with this email address">" href="<mt:var name="script_url">?__mode=search_replace&amp;_type=comment&amp;blog_id=<mt:var name="blog_id">&amp;search=<mt:var name="email" escape="url">&amp;do_search=1"><img alt="" src="<mt:var name="static_uri">images/filter.gif" width="8" height="8" border="0" /></a> 
     222            </mt:if> 
     223        </mtapp:setting> 
     224 
    223225        <mt:if name="url"> 
    224             <a href="<mt:var name="url" escape="html">" title="<mt:var name="url" escape="html">"><img src="<mt:var name="static_uri">images/status_icons/link.gif" alt="<__trans phrase="Link">" width="16" height="9" /></a> 
    225         </mt:if> 
    226         <a title="<__trans phrase="View all comments with this URL">" href="<mt:var name="script_url">?__mode=search_replace&amp;blog_id=<mt:var name="blog_id" escape="url">&amp;_type=comment&amp;search=<mt:var name="url" escape="url">&amp;do_search=1"><img alt="" src="<mt:var name="static_uri">images/filter.gif" width="8" height="8" border="0" /></a> 
    227     </mtapp:setting> 
    228      
     226            <$mt:setvar name="url_content_class" value="field-content-text"$> 
     227        </mt:if> 
     228        <mtapp:setting 
     229            id="url" 
     230            label="<__trans phrase="URL">" 
     231            hint="<__trans phrase="URL of commenter">" 
     232            content_class="$url_content_class" 
     233            show_hint="0"> 
     234            <mt:if name="commenter_id"> 
     235                <mt:if name="url"> 
     236                    <a href="<mt:var name="url" escape="html">"><$mt:Var name="url" escape="html"$></a> 
     237                <mt:else> 
     238                    <__trans phrase="No url in profile"> 
     239                </mt:if> 
     240            <mt:else> 
     241                <input name="url" id="url" value="<mt:var name="url" escape="html">" class="width90" /> 
     242            </mt:if> 
     243            <mt:if name="url"> 
     244                <a href="<mt:var name="url" escape="html">" title="<mt:var name="url" escape="html">"><img src="<mt:var name="static_uri">images/status_icons/link.gif" alt="<__trans phrase="Link">" width="16" height="9" /></a> 
     245                <a title="<__trans phrase="View all comments with this URL">" href="<mt:var name="script_url">?__mode=search_replace&amp;blog_id=<mt:var name="blog_id" escape="url">&amp;_type=comment&amp;search=<mt:var name="url" escape="url">&amp;do_search=1"><img alt="" src="<mt:var name="static_uri">images/filter.gif" width="8" height="8" border="0" /></a> 
     246            </mt:if> 
     247        </mtapp:setting> 
     248 
    229249    <mtapp:setting 
    230250        id="entry"