Commit ae694a02 authored by Guy Pyrzak's avatar Guy Pyrzak

Bug 101770 - Comment box on the edit attachment page is too small \n r=mkanat/lpSolit, a=lpsolit

parents d11fc3b5 91864ee4
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* Joel Peshkin <bugreport@peshkin.net> * Joel Peshkin <bugreport@peshkin.net>
* Erik Stambaugh <erik@dasbistro.com> * Erik Stambaugh <erik@dasbistro.com>
* Marc Schumann <wurblzap@gmail.com> * Marc Schumann <wurblzap@gmail.com>
* Guy Pyrzak <guy.pyrzak@gmail.com>
*/ */
function validateAttachmentForm(theform) { function validateAttachmentForm(theform) {
...@@ -307,7 +308,7 @@ function hideElementById(id) ...@@ -307,7 +308,7 @@ function hideElementById(id)
{ {
var elm = document.getElementById(id); var elm = document.getElementById(id);
if (elm) { if (elm) {
elm.style.display = 'none'; YAHOO.util.Dom.addClass(elm, 'bz_default_hidden');
} }
} }
...@@ -315,8 +316,7 @@ function showElementById(id, val) ...@@ -315,8 +316,7 @@ function showElementById(id, val)
{ {
var elm = document.getElementById(id); var elm = document.getElementById(id);
if (elm) { if (elm) {
if (!val) val = 'inline'; YAHOO.util.Dom.removeClass(elm, 'bz_default_hidden');
elm.style.display = val;
} }
} }
...@@ -327,12 +327,24 @@ function normalizeComments() ...@@ -327,12 +327,24 @@ function normalizeComments()
var small = document.getElementById('smallCommentFrame'); var small = document.getElementById('smallCommentFrame');
var big = document.getElementById('editFrame'); var big = document.getElementById('editFrame');
if ( (small) && (small.style.display == 'none') ) if ( (small) && YAHOO.util.Dom.hasClass(small, 'bz_default_hidden') )
{ {
small.parentNode.removeChild(small); small.parentNode.removeChild(small);
} }
if ( (big) && (big.style.display == 'none') ) if ( (big) && YAHOO.util.Dom.hasClass(big, 'bz_default_hidden') )
{ {
big.parentNode.removeChild(big); big.parentNode.removeChild(big);
} }
} }
function toggle_attachment_details_visibility ( )
{
// show hide classes
var container = document.getElementById('attachment_info');
if( YAHOO.util.Dom.hasClass(container, 'read') ){
YAHOO.util.Dom.replaceClass(container, 'read', 'edit');
}else{
YAHOO.util.Dom.replaceClass(container, 'edit', 'read');
}
}
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* Joel Peshkin <bugreport@peshkin.net> * Joel Peshkin <bugreport@peshkin.net>
* Erik Stambaugh <erik@dasbistro.com> * Erik Stambaugh <erik@dasbistro.com>
* Marc Schumann <wurblzap@gmail.com> * Marc Schumann <wurblzap@gmail.com>
* Guy Pyrzak <guy.pyrzak@gmail.com>
*/ */
table.attachment_entry th { table.attachment_entry th {
...@@ -121,10 +122,6 @@ table.attachment_info td { ...@@ -121,10 +122,6 @@ table.attachment_info td {
vertical-align: middle; vertical-align: middle;
} }
#attachment_attributes {
width: 25%;
}
#attachment_attributes div { #attachment_attributes div {
padding-bottom: 0.4em; padding-bottom: 0.4em;
} }
...@@ -140,6 +137,105 @@ table.attachment_info td { ...@@ -140,6 +137,105 @@ table.attachment_info td {
display: block; display: block;
} }
#attachment_attributes table#flags { #smallCommentFrame, #attachment_flags {
padding-top: 1em; float: left;
}
#smallCommentFrame {
margin-right: 1.5em;
}
#attachment_comments_and_flags, #attachment_actions {
clear: both;
margin-bottom: 1ex;
}
#attachment_information_read_only .title {
font-weight: bold;
font-size: 1.5em;
padding: 0;
margin: 0;
}
#attachment_information_read_only .title #bz_edit {
font-size: 0.7em;
}
#attachment_information_read_only .details {
font-family: monospace;
}
#attachment_info.read #attachment_information_edit {
display: none;
}
#attachment_info.edit #attachment_information_read_only {
display: none;
}
#attachment_info.edit #attachment_view_window {
float: left;
width: 80%;
}
#attachment_info.edit #attachment_information_edit {
width: 20%;
}
#attachment_info.edit #attachment_information_edit input.text,
#attachment_info.edit #attachment_information_edit textarea {
width: 90%;
}
#attachment_isobsolete {
padding-right: 1em;
}
#attachment_information_edit {
float: left;
}
#smallCommentFrame textarea {
display: block;
}
textarea.bz_private {
border: 1px solid #F8C8BA;
}
#update {
clear: both;
display: block;
}
textarea {
font-family: monospace;
}
div#update_container {
clear: both;
padding: 1.5em 0;
}
#attachment_flags {
margin-bottom: 1em;
}
#attachment_flags p {
padding-bottom: 0;
margin-bottom: 0;
}
#editFrame, #viewDiffFrame, #viewFrame {
height: 400px;
width: 100%;
}
.details span.bz_private{
border-left: 1px solid darkred;
padding-left: 0.5em;
}
.no_javascript .bz_hide, .no_javascript .bz_edit {
display: none;
} }
\ No newline at end of file
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
title = title title = title
header = header header = header
subheader = subheader subheader = subheader
style_urls = [ 'skins/standard/create_attachment.css' ] style_urls = [ 'skins/standard/attachment.css' ]
javascript_urls = [ "js/attachment.js", "js/util.js" ] javascript_urls = [ "js/attachment.js", "js/util.js" ]
doc_section = "attachments.html" doc_section = "attachments.html"
%] %]
......
...@@ -53,11 +53,11 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %] ...@@ -53,11 +53,11 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
[% END %] [% END %]
[% PROCESS global/header.html.tmpl doc_section = "attachments.html#patchviewer" [% PROCESS global/header.html.tmpl doc_section = "attachments.html#patchviewer"
javascript_urls = "js/attachment.js" javascript_urls = "js/attachment.js"
style_urls = ['skins/standard/create_attachment.css'] %] style_urls = ['skins/standard/attachment.css'] %]
[% ELSE %] [% ELSE %]
<html> <html>
<head> <head>
<link href="skins/standard/create_attachment.css" rel="stylesheet" type="text/css"> <link href="skins/standard/attachment.css" rel="stylesheet" type="text/css">
<script src="js/attachment.js" type="text/javascript"></script> <script src="js/attachment.js" type="text/javascript"></script>
</head> </head>
<body onload="[% onload FILTER html %]"> <body onload="[% onload FILTER html %]">
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
title = title title = title
header = header header = header
subheader = filtered_summary subheader = filtered_summary
style_urls = ['skins/standard/create_attachment.css'] style_urls = ['skins/standard/attachment.css']
%] %]
<br> <br>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
[% PROCESS global/header.html.tmpl [% PROCESS global/header.html.tmpl
title = title title = title
style_urls = [ 'skins/standard/yui/autocomplete.css', style_urls = [ 'skins/standard/yui/autocomplete.css',
'skins/standard/create_attachment.css', 'skins/standard/attachment.css',
'skins/standard/yui/calendar.css' ] 'skins/standard/yui/calendar.css' ]
javascript_urls = [ "js/yui/bz_autocomplete_bundle.js", javascript_urls = [ "js/yui/bz_autocomplete_bundle.js",
"js/attachment.js", "js/util.js", "js/yui/calendar.js", "js/attachment.js", "js/util.js", "js/yui/calendar.js",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment