Changeset 1698:add60e1e9451
- Timestamp:
- 09/03/13 08:55:45 (11 years ago)
- Branch:
- default
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
admin/blog_pref.php
r1696 r1698 599 599 ' ('.html::escapeHTML(dcUtils::getUserCN( 600 600 $k, $v['name'], $v['firstname'], $v['displayname'] 601 )).')</h4>'. 601 )).')</h4>'; 602 603 if ($core->auth->isSuperAdmin()) { 604 echo 605 '<p>'.__('Email:').' '. 606 ($v['email'] != '' ? '<a href="mailto:'.$v['email'].'">'.$v['email'].'</a>' : __('(none)')). 607 '</p>'; 608 } 609 610 echo 611 '<h5>'.__('Publications on this blog:').'</h5>'. 612 '<ul>'; 613 foreach ($post_type as $type => $pt_info) { 614 $params = array( 615 'post_type' => $type, 616 'user_id' => $k 617 ); 618 echo '<li>'.sprintf(__('%1$s: %2$s'),__($pt_info['label']),$core->blog->getPosts($params,true)->f(0)).'</li>'; 619 } 620 echo 621 '</ul>'; 622 623 echo 602 624 '<h5>'.__('Permissions:').'</h5>'. 603 625 '<ul>'; 604 626 if ($v['super']) { 605 echo '<li >'.__('Super administrator').'</li>';627 echo '<li class="user_super">'.__('Super administrator').'</li>'; 606 628 } else { 607 629 foreach ($v['p'] as $p => $V) { 608 echo '<li >'.__($perm_types[$p]).'</li>';630 echo '<li '.($p == 'admin' ? 'class="user_admin"' : '').'>'.__($perm_types[$p]).'</li>'; 609 631 } 610 632 } … … 624 646 '</form>'; 625 647 } 626 echo627 '<h5>'.__('Publications on this blog:').'</h5>'.628 '<ul>';629 foreach ($post_type as $type => $pt_info) {630 $params = array(631 'post_type' => $type,632 'user_id' => $k633 );634 echo '<li>'.sprintf(__('%1$s: %2$s'),__($pt_info['label']),$core->blog->getPosts($params,true)->f(0)).'</li>';635 }636 echo637 '</ul>';638 648 echo '</div>'; 639 649 } -
admin/index.php
r1697 r1698 211 211 if ($updater->getNotify() && $new_v) { 212 212 echo 213 '<div class=" msgdc-update"><h3>'.sprintf(__('Dotclear %s is available!'),$new_v).'</h3> '.213 '<div class="dc-update"><h3>'.sprintf(__('Dotclear %s is available!'),$new_v).'</h3> '. 214 214 '<p><a class="button submit" href="update.php">'.sprintf(__('Upgrade now'),$new_v).'</a> '. 215 215 '<a href="update.php?hide_msg=1">'.__('Remind me later').'</a>'. -
admin/style/default.css
r1697 r1698 903 903 margin-left: 0; 904 904 } 905 /* in blog_pref */ 905 906 .user-perm { 906 margin -bottom: 2em;907 margin: 2em 0px; 907 908 background: transparent url(user.png) no-repeat left top; 909 width: 320px; 910 display: inline-block; 911 vertical-align: top; 908 912 } 909 913 .user-perm h4, .user-perm h5, .user-perm p, .user-perm ul, .user-perm li { 910 margin: 0;914 margin: .5em 0 .33em; 911 915 padding: 0; 912 916 } 913 917 .user-perm h4 { 914 padding-left: 2 4px;918 padding-left: 28px; 915 919 } 916 920 .user-perm ul { … … 921 925 padding-left: 0; 922 926 } 923 p.change-user-perm {924 margin: .33em 0;925 }926 927 .user-perm h5 { 927 margin: .66em 0 0 0; 928 margin: 1em 0 0 0; 929 } 930 li.user_super, li.user_admin { 931 margin-left: 0; 932 padding-left: 1em; 933 list-style: none; 934 background: transparent url(../images/superadmin.png) no-repeat -2px 2px; 935 } 936 li.user_admin { 937 background-image: url(../images/admin.png); 928 938 } 929 939 -
inc/core/class.dc.core.php
r1694 r1698 818 818 $strReq = 819 819 'SELECT U.user_id AS user_id, user_super, user_name, user_firstname, '. 820 'user_displayname, permissions '.820 'user_displayname, user_email, permissions '. 821 821 'FROM '.$this->prefix.'user U '. 822 822 'JOIN '.$this->prefix.'permissions P ON U.user_id = P.user_id '. … … 827 827 'UNION '. 828 828 'SELECT U.user_id AS user_id, user_super, user_name, user_firstname, '. 829 "user_displayname, NULL AS permissions ".829 "user_displayname, user_email, NULL AS permissions ". 830 830 'FROM '.$this->prefix.'user U '. 831 831 'WHERE user_super = 1 '; … … 842 842 'firstname' => $rs->user_firstname, 843 843 'displayname' => $rs->user_displayname, 844 'email' => $rs->user_email, 844 845 'super' => (boolean) $rs->user_super, 845 846 'p' => $this->auth->parsePermissions($rs->permissions)
Note: See TracChangeset
for help on using the changeset viewer.