Permalink
Browse files

Merge branch 'release/6.7.x' into develop

  • Loading branch information...
2 parents a2c7305 + 7257a39 commit 84ff216bd7267821bccd3f3e480f0a1bd176e94a @winskie winskie committed Jan 3, 2017
@@ -2437,9 +2437,9 @@ function display_dragdrop_upload_button( $params = array() )
+ '<span class="fname">' + file_name + '</span>'
<?php echo ( $params['status_conflict_place'] == 'before_button' ) ? "+ ' - ".$status_conflict_message."'" : ''; ?>
+ ' - <a href="#" '
- + 'class="<?php echo button_class( 'text' ); ?> roundbutton_text_noicon qq-conflict-replace" '
- + 'old="' + responseJSON.success.oldpath + '" '
- + 'new="' + responseJSON.success.newpath + '">'
+ + 'class="<?php echo button_class( 'text_warning' ); ?> btn-sm roundbutton_text_noicon qq-conflict-replace" '
+ + 'old="' + responseJSON.success.oldname + '" '
+ + 'new="' + responseJSON.success.newname + '">'
+ '<div><?php echo TS_('Use this new file to replace the old file'); ?></div>'
+ '<div style="display:none"><?php echo TS_('Revert'); ?></div>'
+ '</a>'
@@ -679,6 +679,7 @@ function get_template( $name, $depth = 0, $die_on_unknown = false )
'text_primary' => 'btn btn-primary',
'text_success' => 'btn btn-success',
'text_danger' => 'btn btn-danger',
+ 'text_warning' => 'btn btn-warning',
'group' => 'btn-group',
);
@@ -33,7 +33,7 @@
echo '<li>'.
$moderation_Blog->get( 'shortname' ).
' ('.sprintf( T_( '%s posts waiting' ), $params['posts'][$blog_ID] ).') - '.
- get_link_tag( $admin_url.'?coll_settings&tab=&blog='.$blog_ID, T_('Click here to moderate').' &raquo;', '.a' ).
+ get_link_tag( $admin_url.'?ctrl=coll_settings&tab=dashboard&blog='.$blog_ID, T_('Click here to moderate').' &raquo;', '.a' ).
'</li>';
}
echo '</ul>';

0 comments on commit 84ff216

Please sign in to comment.