Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 850135 - hide the textarea custom fields by default with an (edit) link

Browse Source 
r=glob,a=LpSolit


git-svn-id: svn://10.0.0.236/trunk@264846 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkanat%bugzilla.org 2013-05-10 15:01:10 +00:00
parent cfc0f23124
commit c924686adf
4 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
8621 8622

14
mozilla/webtools/bugzilla/js/field.js
View File

@ -214,14 +214,14 @@ function setupEditLink(id) {
} }
/* Hide input/select fields and show the text with (edit) next to it */ /* Hide input/select fields and show the text with (edit) next to it */
function hideEditableField( container, input, action, field_id, original_value, new_value ) { function hideEditableField( container, input, action, field_id, original_value, new_value, hide_input ) {
YAHOO.util.Dom.removeClass(container, 'bz_default_hidden'); YAHOO.util.Dom.removeClass(container, 'bz_default_hidden');
YAHOO.util.Dom.addClass(input, 'bz_default_hidden'); YAHOO.util.Dom.addClass(input, 'bz_default_hidden');
YAHOO.util.Event.addListener(action, 'click', showEditableField, YAHOO.util.Event.addListener(action, 'click', showEditableField,
new Array(container, input, field_id, new_value)); new Array(container, input, field_id, new_value));
if(field_id != ""){ if(field_id != ""){
YAHOO.util.Event.addListener(window, 'load', checkForChangedFieldValues, YAHOO.util.Event.addListener(window, 'load', checkForChangedFieldValues,
new Array(container, input, field_id, original_value)); new Array(container, input, field_id, original_value, hide_input ));
} }
} }
@ -269,7 +269,7 @@ function showEditableField (e, ContainerInputArray) {
} }
// focus on the first field, this makes it easier to edit // focus on the first field, this makes it easier to edit
inputs[0].focus(); inputs[0].focus();
if ( type == "input" ) { if ( type == "input" || type == "textarea" ) {
inputs[0].select(); inputs[0].select();
} }
} }
@ -293,8 +293,10 @@ function checkForChangedFieldValues(e, ContainerInputArray ) {
var el = document.getElementById(ContainerInputArray[2]); var el = document.getElementById(ContainerInputArray[2]);
var unhide = false; var unhide = false;
if ( el ) { if ( el ) {
if ( el.value != ContainerInputArray[3] || if ( !ContainerInputArray[4]
( el.value == "" && el.id != "alias" && el.id != 'qa_contact') ) { && (el.value != ContainerInputArray[3]
|| (el.value == "" && el.id != "alias" && el.id != "qa_contact")) )
{
unhide = true; unhide = true;
} }
else { else {
@ -303,7 +305,7 @@ function checkForChangedFieldValues(e, ContainerInputArray ) {
if ( set_default ) { if ( set_default ) {
if(set_default.checked){ if(set_default.checked){
unhide = true; unhide = true;
} }
} }
} }
} }

17
mozilla/webtools/bugzilla/skins/standard/global.css
View File

@ -520,8 +520,23 @@ input.required, select.required, span.required_explanation {
list-style-type: none; list-style-type: none;
} }
.field_textarea_readonly {
margin: 2px;
padding: 4px;
overflow: auto;
float: left;
max-width: 30em;
max-height: 7em;
border: 1px solid #CCC;
}
.field_textarea_readonly pre {
font-family: monospace;
white-space: pre-wrap;
}
/* custom styles for inline instances of autocomplete input fields */ /* custom styles for inline instances of autocomplete input fields */
.yui-skin-sam .yui-ac-input { position:static !important; .yui-skin-sam .yui-ac-input { position:static !important;
vertical-align:middle !important; } vertical-align:middle !important; }
.yui-skin-sam .yui-ac-container { left:0px !important; } .yui-skin-sam .yui-ac-container { left:0px !important; }
.yui-skin-sam .yui-ac { display: inline-block; } .yui-skin-sam .yui-ac { display: inline-block; }

27
mozilla/webtools/bugzilla/template/en/default/bug/field.html.tmpl
View File

@ -142,9 +142,30 @@
</script> </script>
[% CASE constants.FIELD_TYPE_TEXTAREA %] [% CASE constants.FIELD_TYPE_TEXTAREA %]
[% INCLUDE global/textarea.html.tmpl <div id="[% field.name FILTER html %]_edit_container" class="bz_default_hidden">
id = field.name name = field.name minrows = 4 maxrows = 8 <div>
cols = 60 defaultcontent = value mandatory = field.is_mandatory %] (<a href="#" id="[% field.name FILTER html %]_edit_action">edit</a>)
</div>
[% IF value %]
<div class="field_textarea_readonly">
<pre>[% value FILTER html %]</pre>
</div>
[% END %]
</div>
<div id="[% field.name FILTER html %]_input">
[% INCLUDE global/textarea.html.tmpl
id = field.name name = field.name minrows = 4 maxrows = 8
cols = 60 defaultcontent = value mandatory = field.is_mandatory %]
</div>
<script type="text/javascript">
hideEditableField('[% field.name FILTER js %]_edit_container',
'[% field.name FILTER js %]_input',
'[% field.name FILTER js %]_edit_action',
'[% field.name FILTER js %]',
'[% value FILTER js %]',
'',
true);
</script>
[% CASE constants.FIELD_TYPE_BUG_URLS %] [% CASE constants.FIELD_TYPE_BUG_URLS %]
[% '<ul class="bug_urls">' IF value.size %] [% '<ul class="bug_urls">' IF value.size %]
[% FOREACH bug_url = value %] [% FOREACH bug_url = value %]