Changeset 11534

Timestamp:

02/09/2022 07:52:24 AM (4 years ago)

Author:

dd32

Message:

Trac: JS: Some old core ticket modifications have been broken for quite some time, clean them up.

This provides a better UI for non-gardeners.

Location:

sites/trunk/wordpress.org/public_html/style/trac

Files:

• wp-trac.css (modified) (1 diff)
• wp-trac.js (modified) (5 diffs)

sites/trunk/wordpress.org/public_html/style/trac/wp-trac.css

@@ -459 +459 @@
         vertical-align: top; /* align everything */
         padding: .3em; /* breathing room */
+}
+#properties table.trac-properties label > strike {
+        text-decoration: none;
 }
 #properties .col2 #field-cc[type="checkbox"] {

sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js

@@ -412 +412 @@
                         }
 
-                        // Add After the Deadline (only add it if it loaded).
-                        if ( $.isFunction( $.fn.addProofreader ) ) {
-                                $('textarea').addProofreader();
-                                $('.AtD_proofread_button').each(function() {
-                                        $(this).parent().appendTo( $(this).parents('fieldset').find('.wikitoolbar') ).attr( 'title', 'Check spelling and grammar' );
-                                });
-                        }
-
                         // Add custom buttons to the formatting toolbar.
                         // http://trac.edgewall.org/browser/tags/trac-1.0.9/trac/htdocs/js/wikitoolbar.js
@@ -652 +644 @@
                         }
 
-                        if ( $body.hasClass( 'core' ) && content.hasClass( 'search' ) ) {
+                        if ( content.hasClass( 'search' ) ) {
                                 // Remove 'Wiki' and 'Milestone' from search.
                                 $( '#fullsearch #milestone' ).next().remove().end().remove();
@@ -662 +654 @@
                 nonGardeners: function() {
                         var version,
-                                elements = {},
-                                remove = true;
-
-                        // If we're on /newticket (based on the field-owner check), declutter.
-                        if ( $('#field-owner').length && $body.hasClass( 'core' ) ) {
-                                $('#field-priority, #field-severity, #field-milestone, #field-cc, #field-keywords').parents('td').hide().prev().hide();
-                                if ( $('#field-focuses').length ) {
-                                        $('#field-focuses').closest('td').attr( 'colspan', 3 );
-                                        $('#field-component').parent().add( $('#field-component').parent().prev() ).wrapAll( '<tr />' ).insertBefore( $( '#field-focuses' ).parents( 'tr' ) );
-                                }
-                                $('label[for="field-focuses"]').html( 'Contributor<br/>Focuses:' );
-                                $('#field-version').after( '<br/><em>If you\'re filing a bug against trunk, choose <a href="#" class="set-trunk">\'trunk\'</a>. Otherwise, choose the earliest affected version you tested.</em>' );
-                                $('.set-trunk').on( 'click', function() {
-                                        $('#field-version').val('trunk');
-                                        return false;
-                                });
-                        }
+                                elements = {};
+
+                        // Hide disabled fields (new ticket & ticket modify)
+                        $('.trac-properties select[disabled]').parents( 'td' ).hide().prev().hide();
 
                         elements.type = $('#field-type');
                         elements.version = $('#field-version');
-                        version = elements.version.val();
+                        version = parseFloat( elements.version.val() );
 
                         // Remove task (blessed), or make a task ticket read only.
@@ -696 +675 @@
                         if ( version ) {
                                 elements.version.find('option').each( function() {
-                                        var value = $(this).val();
-
-                                        if ( version === value ) {
-                                                remove = false;
-                                        } else if ( remove && value ) {
+                                        var value = parseFloat( $(this).val() );
+
+                                        if ( ! value || value > version ) {
                                                 $(this).remove();
                                         }
@@ -1342 +1319 @@
                                 ul.appendTo( container );
                                 ul.wrap( '<fieldset id="fieldset-focuses" />' );
-                                ul.before( '<legend class="core-focuses-legend">Focuses:</legend>' );
+                                ul.before( '<legend class="core-focuses-legend">Contributor Focuses:</legend>' );
 
                                 container.on( 'click', '.core-focuses-button', addRemove );