Changeset 6323f280 in cboos.git
- Timestamp:
- Jul 18, 2012, 8:03:55 PM (12 years ago)
- Branches:
- ticket10012/final-on-r11128
- Parents:
- cbde5705
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trac/htdocs/css/report.css
rcbde5705 r6323f280 46 46 } 47 47 48 .report form . trac-quickbutton{ float: right }49 .uisymbols .report form . trac-quickbutton{ margin-top: -.6em }48 .report form .inlinebuttons { float: right } 49 .uisymbols .report form .inlinebuttons { margin-top: -.6em } 50 50 51 51 .report span.foldable { display: none } -
trac/htdocs/css/ticket.css
rcbde5705 r6323f280 96 96 font-size: 90%; 97 97 } 98 #ticket .inlinebuttons , #ticket .trac-quickbutton{98 #ticket .inlinebuttons { 99 99 float: right; 100 100 position: relative; … … 160 160 display: none; 161 161 } 162 .threading, #changelog .inlinebuttons , #changelog .trac-quickbutton{162 .threading, #changelog .inlinebuttons { 163 163 float: right; 164 164 } -
trac/htdocs/css/trac.css
rcbde5705 r6323f280 139 139 .buttons form, .buttons form div { display: inline } 140 140 .buttons input { margin: 1em .5em .1em 0 } 141 /* legacy 0.10 style quickbuttons */ 141 142 142 .inlinebuttons input { 143 font-size: 70%;144 border: 1px dotted #ccc;145 box-shadow: none;146 margin: 0 .1em;147 padding: 0.1em;148 background: none;149 }150 /* quickbutton: rounded buttons ("quick action") */151 input[type="button"].trac-quickbutton,152 input[type="submit"].trac-quickbutton {153 143 border: 1px solid #ddd; 154 144 border-radius: 1em; 155 145 height: 1.6em; 156 146 padding: 0 .4em .1em; 157 /* take the rest from .inlinebuttons */158 147 font-size: 70%; 159 148 box-shadow: none; … … 162 151 color: #808080; 163 152 } 164 .uisymbols input[type="button"].trac-quickbutton,165 .uisymbols input[type="submit"].trac-quickbutton{153 .uisymbols .inlinebuttons input[type=button], 154 .uisymbols .inlinebuttons input[type=submit] { 166 155 font-size: 100%; 167 156 } 168 169 input[type=button].trac-quickbutton:hover, 170 input[type=submit].trac-quickbutton:hover { 157 .inlinebuttons input[type=button]:hover, 158 .inlinebuttons input[type=submit]:hover { 171 159 background: #f6f6f6; 172 160 color: #333; … … 174 162 box-shadow: .1em .1em .6em 0 #999; 175 163 } 176 input[type=button].trac-quickbutton:active,177 input[type=submit].trac-quickbutton:active {164 .inlinebuttons input[type=button]:active, 165 .inlinebuttons input[type=submit]:active { 178 166 margin: .1em 0 0 .2em; 179 167 } … … 728 716 729 717 div.system-message .trac-close-msg { 718 display: none; /* hidden when no Javascript available */ 730 719 float: right; 731 720 font-size: 80%; 732 /* taken from quickbutton*/721 /* taken from .inlinebuttons */ 733 722 border: 1px solid #ddd; 734 723 border-radius: 1em; 735 724 height: 1.6em; 736 725 padding: 0 .4em .1em; 737 /* take the rest from .inlinebuttons */738 726 box-shadow: none; 739 727 margin: 0 .1em .1em 0; … … 746 734 } 747 735 div.system-message .trac-close-msg:hover { 748 /* taken from quickbutton*/736 /* taken from .inlinebuttons */ 749 737 background: #f6f6f6; 750 738 color: #333; -
trac/htdocs/js/query.js
rcbde5705 r6323f280 116 116 var propertyName = this.name.substring(10, idx); 117 117 $(this).replaceWith( 118 $($.htmlFormat('<input type="button" value="$1"' + 119 ' class="trac-quickbutton">', this.value)) 118 $($.htmlFormat('<input type="button" value="$1">', this.value)) 120 119 .click(function() { 121 120 removeRow(this, propertyName); … … 147 146 // Add the remove button 148 147 tr.append($('<td>') 149 .append($('< input type="button" value="–"' +150 ' class="trac-quickbutton">')151 .click(function() { removeRow(this, propertyName); })));148 .append($('<div class="inlinebuttons">') 149 .append($('<input type="button" value="–">') 150 .click(function() { removeRow(this, propertyName); })))); 152 151 153 152 // Add the row header … … 245 244 // Enable the Or... button if it's been disabled 246 245 $("#add_clause").attr("disabled", false); 247 }).next(" input.trac-quickbutton").remove();246 }).next("div.inlinebuttons").remove(); 248 247 249 248 // Add a new empty clause at the end by cloning the current last clause … … 274 273 $("#add_clause").closest("tr").find("select[name^=add_filter_]") 275 274 .val(field).change(); 276 }).next(" input.trac-quickbutton").remove();275 }).next("div.inlinebuttons").remove(); 277 276 if (!add_clause.closest("tbody").siblings().length) { 278 277 // That is, if there are no filters added to this clause … … 458 457 // Add the remove button 459 458 tr.append($('<td>') 460 .append($('<input type="button" value="–"' + 461 ' class="trac-quickbutton">') 462 .click(function() { 463 $('#batchmod_' + propertyName).remove(); 464 $($.htmlFormat("#add_batchmod_field option[value='$1']", 465 propertyName)).enable(); 466 }) 459 .append($('<div class="inlinebuttons">') 460 .append($('<input type="button" value="–">') 461 .click(function() { 462 $('#batchmod_' + propertyName).remove(); 463 $($.htmlFormat("#add_batchmod_field option[value='$1']", 464 propertyName)).enable(); 465 }) 466 ) 467 467 ) 468 468 ); -
trac/templates/error.html
rcbde5705 r6323f280 62 62 <textarea name="description" rows="3" cols="10"> 63 63 ${description_en if url else description}</textarea> 64 <input type="submit" name="create" value="${_('Create')}" class="trac-quickbutton" /> 64 <span class="inlinebuttons"> 65 <input type="submit" name="create" value="${_('Create')}" /> 66 </span> 65 67 </py:def> 66 68 -
trac/templates/layout.html
rcbde5705 r6323f280 24 24 <py:if test="not defined('trac_error_rendering') and 'SEARCH_VIEW' in perm" id="search"> 25 25 <link type="application/opensearchdescription+xml" rel="search" 26 href="${href.search('opensearch')}" 26 href="${href.search('opensearch')}" 27 27 title="${_('Search %(project)s', project=project.name)}"/> 28 28 </py:if> … … 37 37 <script py:if="chrome.warnings or chrome.notices" type="text/javascript"> 38 38 jQuery(document).ready(function($) { 39 $(".trac-close-msg"). click(function () {39 $(".trac-close-msg").show().click(function () { 40 40 $(this).closest(".system-message").hide(); 41 41 return false; -
trac/ticket/templates/query.html
rcbde5705 r6323f280 62 62 class="${field_name}" py:if="multiline or constraint_idx == 0"> 63 63 <td> 64 <input type="submit" name="rm_filter_${n_field_name}_${constraint_idx}" value="–" class="trac-quickbutton" /> 64 <div class="inlinebuttons"> 65 <input type="submit" name="rm_filter_${n_field_name}_${constraint_idx}" value="–" /> 66 </div> 65 67 </td> 66 68 <py:choose test="constraint_idx"> … … 119 121 <input type="text" name="${n_field_name}" value="$constraint_value" size="42" /> 120 122 </py:when> 121 123 122 124 <py:when test="field.type == 'time'" 123 125 py:with="(start, end) = '..' in constraint_value and constraint_value.split('..', 1) … … 146 148 len(constraints[field_name])) or None}">${field.label}</option> 147 149 </select> 148 <input type="submit" name="add_${clause_num}" value="+" class="trac-quickbutton" /> 150 <div class="inlinebuttons"> 151 <input type="submit" name="add_${clause_num}" value="+" /> 152 </div> 149 153 </td> 150 154 <td py:if="last_clause" class="or" colspan="2"> … … 154 158 <option py:for="field_name in field_names" value="$field_name">${fields[field_name].label}</option> 155 159 </select> 156 <input type="submit" name="add_${clause_num + 1}" value="+" class="trac-quickbutton" /> 160 <div class="inlinebuttons"> 161 <input type="submit" name="add_${clause_num + 1}" value="+" /> 162 </div> 157 163 </td> 158 164 </tr> … … 227 233 <div> 228 234 <input type="hidden" name="action" value="edit" /> 229 <input type="submit" 235 <input type="submit" 230 236 title="${_('Edit report {%(id)s} corresponding to this query', id=report_resource.id)}" 231 237 value="${_('Edit query')}" /> -
trac/ticket/templates/report_list.html
rcbde5705 r6323f280 40 40 <div py:if="saved_query_href"> 41 41 <form method="get" action="${href.report()}"> 42 <div >42 <div class="inlinebuttons"> 43 43 44 44 <input type="hidden" name="action" value="clear" /> 45 <input type="submit" value="${captioned_button('x', _('Clear'))}" title="Forget last query" class="trac- quickbutton trac-delete" />45 <input type="submit" value="${captioned_button('x', _('Clear'))}" title="Forget last query" class="trac-delete" /> 46 46 </div> 47 47 </form> … … 78 78 <div py:for="id, title, description, can_edit, can_delete in reports"> 79 79 <form py:if="can_delete" method="get" action="${href.report(id)}"> 80 <div >80 <div class="inlinebuttons"> 81 81 <input type="hidden" name="action" value="delete" /> 82 82 <input type="submit" value="${captioned_button('–', _('Delete'))}" 83 title="Delete report" class="trac- quickbutton trac-delete" />83 title="Delete report" class="trac-delete" /> 84 84 </div> 85 85 </form> 86 86 <form py:if="can_edit" method="get" action="${href.report(id)}"> 87 <div >87 <div class="inlinebuttons"> 88 88 <input type="hidden" name="action" value="edit" /> 89 89 <input type="submit" value="${captioned_button('✎', _('Edit'))}" 90 title="Edit report" class="trac-quickbutton"/>90 title="Edit report" /> 91 91 </div> 92 92 </form> -
trac/ticket/templates/ticket_box.html
rcbde5705 r6323f280 97 97 <form py:if="ticket.exists and ticket.description and can_append" 98 98 id="addreply" method="get" action="#comment"> 99 <div >99 <div class="inlinebuttons"> 100 100 <input type="hidden" name="replyto" value="description" /> 101 <input type="submit" name="reply" value="${captioned_button('↳', _('Reply'))}" title="Reply, quoting this description" class="trac-quickbutton"/>101 <input type="submit" name="reply" value="${captioned_button('↳', _('Reply'))}" title="Reply, quoting this description" /> 102 102 </div> 103 103 </form> -
trac/ticket/templates/ticket_change.html
rcbde5705 r6323f280 61 61 <div py:if="show_buttons" class="trac-ticket-buttons"> 62 62 <form py:if="'cnum' in change and can_edit_comment" method="get" action="#comment:${cnum}"> 63 <div >63 <div class="inlinebuttons"> 64 64 <input type="hidden" name="cnum_edit" value="${cnum}"/> 65 <input type="submit" value="${captioned_button('✎', _('Edit'))}" title="${_('Edit comment %(cnum)s', cnum=cnum)}" class="trac-quickbutton"/>65 <input type="submit" value="${captioned_button('✎', _('Edit'))}" title="${_('Edit comment %(cnum)s', cnum=cnum)}" /> 66 66 </div> 67 67 </form> 68 68 <form py:if="'cnum' in change and can_append" id="reply-to-comment-${cnum}" 69 69 method="get" action="#comment"> 70 <div >70 <div class="inlinebuttons"> 71 71 <input type="hidden" name="replyto" value="${cnum}"/> 72 <input type="submit" value="${captioned_button('↳', _('Reply'))}" title="${_('Reply to comment %(cnum)s', cnum=cnum)}" class="trac-quickbutton"/>72 <input type="submit" value="${captioned_button('↳', _('Reply'))}" title="${_('Reply to comment %(cnum)s', cnum=cnum)}" /> 73 73 </div> 74 74 </form> -
tracopt/ticket/clone.py
rcbde5705 r6323f280 59 59 tag.input(type="submit", name="clone", 60 60 value=captioned_button(req, '+#', _("Clone")), 61 title=_("Create a copy of this ticket"), 62 class_="trac-quickbutton"), 61 title=_("Create a copy of this ticket")), 63 62 [tag.input(type="hidden", name='field_' + n, value=v) 64 63 for n, v in fields.iteritems()], 65 tag.input(type="hidden", name='preview', value='')), 64 tag.input(type="hidden", name='preview', value=''), 65 class_="inlinebuttons"), 66 66 method="post", action=req.href.newticket()) -
tracopt/ticket/deleter.py
rcbde5705 r6323f280 73 73 _("Delete")), 74 74 title=_('Delete ticket'), 75 class_="trac-quickbutton trac-delete")), 75 class_="trac-delete"), 76 class_="inlinebuttons"), 76 77 action='#', method='get') 77 78 … … 89 90 _("Delete")), 90 91 title=_('Delete comment %(num)s', num=cnum), 91 class_="trac-quickbutton trac-delete")), 92 class_="trac-delete"), 93 class_="inlinebuttons"), 92 94 action='#', method='get') 93 95
Note:
See TracChangeset
for help on using the changeset viewer.