[Libreoffice-commits] .: 2 commits - bug/bug bug/bug.xhtml bug/Makefile bug/query.pl
Loic Dachary
loic at kemper.freedesktop.org
Thu Sep 22 02:37:14 PDT 2011
bug/Makefile | 16 +++++++++++
bug/bug.xhtml | 27 ++++++++++++--------
bug/bug/bug.css | 75 +++++++++++++++++++++++++++++++++++++-------------------
bug/bug/bug.js | 4 ++
bug/bug/test.js | 1
bug/query.pl | 2 -
6 files changed, 88 insertions(+), 37 deletions(-)
New commits:
commit 0922ad36515ad841cf734e9c366d2d8c83bd3e75
Author: Loic Dachary <loic at dachary.org>
Date: Thu Sep 22 11:37:06 2011 +0200
fix CSS integration details
diff --git a/bug/Makefile b/bug/Makefile
index 5878305..60359d8 100644
--- a/bug/Makefile
+++ b/bug/Makefile
@@ -1,3 +1,19 @@
+#
+# Copyright (C) 2011 Loic Dachary <loic at dachary.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http:www.gnu.org/licenses/>.
+#
all: extract compose
#jscoverage --no-instrument=jquery-validation-1.8.1 bug bug-cover
diff --git a/bug/bug.xhtml b/bug/bug.xhtml
index 35635b8..6e1489d 100644
--- a/bug/bug.xhtml
+++ b/bug/bug.xhtml
@@ -52,7 +52,11 @@
<a href="?skin=login">login</a> <a href="?skin=component">component</a> <a href="?skin=subcomponent">subcomponent</a> <a href="?skin=version">version</a> <a href="?skin=description">description</a> <a href="?skin=submit">submit</a> <a href="?skin=complete">complete</a>
</div>
<div class="header">
- <div class="title">Bug</div>
+ <div class="title">
+ <div>Bug</div>
+ <div>Submission</div>
+ <div>Assistant</div>
+ </div>
<div class="submission">
Thank you for using LibreOffice, we regret that you seem to have found a problem in our software, so that you decided to report a bug. This assistant will lead you step by step through the bug report process.
</div>
@@ -69,7 +73,7 @@
<div class="step step_attach"><div class="count">7</div><div class="label">Attach</div></div>
</div>
<div class="copyright">
- <a href="http://wiki.documentfoundation.org/Bug_Submission_Assistant">Bug Submission Assistant</a> is copyright (C) 2011 Loic Dachary published under <a href="http://www.gnu.org/licenses/gpl.txt">GNU GPLv3+</a> : download the <a href="bug.js">sources</a>.
+ <a href="http://wiki.documentfoundation.org/Bug_Submission_Assistant">Bug Submission Assistant</a> is copyright (C) 2011 Loic Dachary published under <a href="http://www.gnu.org/licenses/gpl.txt">GNU GPLv3+</a>. Download the sources with git clone <a href="http://cgit.freedesktop.org/libreoffice/website">http://cgit.freedesktop.org/libreoffice/website</a>.
</div>
</div>
<div class="right">
@@ -99,9 +103,9 @@
Please login using your <a href="/">bugzilla account</a>.
</div>
<div class="signin-container">
- <div>User:</div>
+ <div class="input-label">User:</div>
<div class="signin-input"><input class='user' type="text" name="user"></input></div>
- <div>Password:</div>
+ <div class="input-label">Password:</div>
<div class="signin-input"><input class='password' type="password" name="password"></input></div>
<div class="go">Sign in</div>
<div class="signin-create">
@@ -120,27 +124,29 @@
<div class="components_icons">
<div><img src="icons/Libreoffice.png" title="BASIC" data="BASIC" alt="BASIC" /><img src="icons/Chart.png" title="Chart" data="Chart" alt="Chart" /><img src="icons/Libreoffice.png" title="Contrib" data="contrib" alt="Contrib" /><img src="icons/Database.png" title="Database" data="Database" alt="Database" /><img src="icons/Documentation.png" title="Documentation" data="Documentation" alt="Documentation" /><img src="icons/Drawing.png" title="Drawing" data="Drawing" alt="Drawing" /></div><div><img src="icons/Extensions.png" title="Extensions" data="Extensions" alt="Extensions" /><img src="icons/Formula_editor.png" title="Formula" data="Formula_editor" alt="Formula" /><img src="icons/Installation.png" title="Installation" data="Installation" alt="Installation" /><img src="icons/Libreoffice.png" title="Libreoffice" data="Libreoffice" alt="Libreoffice" /><img src="icons/Libreoffice.png" title="Linguistic" data="Linguistic_component" alt="Linguistic" /><img src="ic
ons/Libreoffice.png" title="Localization" data="Localization" alt="Localization" /></div><div><img src="icons/PDF_export.png" title="PDF export" data="PDF_export" alt="PDF export" /><img src="icons/Presentation.png" title="Presentation" data="Presentation" alt="Presentation" /><img src="icons/Spreadsheet.png" title="Spreadsheet" data="Spreadsheet" alt="Spreadsheet" /><img src="icons/Libreoffice.png" title="UI" data="UI" alt="UI" /><img src="icons/WRITER.png" title="WRITER" data="WRITER" alt="WRITER" /><img src="icons/WWW.png" title="WWW" data="WWW" alt="WWW" /></div>
</div>
- <div>&component_comments;</div>
+ <div class="component_comments_container">&component_comments;</div>
</div>
</div>
<div class="version_and_subcomponent">
<div>
<div class="state state_subcomponent">
- Sub component <div class="active_subcomponent"></div>
+ <div class="input-label">Sub component</div>
+ <div class="active_subcomponent"></div>
</div>
</div>
<div>
<div class="state state_version">
- Version &versions;
+ <div class="input-label">Version</div>
+ &versions;
</div>
</div>
</div>
<div class="state state_description">
- <div class="subject">Subject:</div>
+ <div class="subject input-label">Subject:</div>
<div class="subject-input"><input type="text" class="short" size="50"></input></div>
- <div class="desciption">Long description:</div>
+ <div class="desciption input-label">Long description:</div>
<div class="description-input"><textarea rows="10" cols="60" class="long">
Problem description:
@@ -173,7 +179,8 @@ Expected behavior:
</div>
<div class="state_success">
- The bug report has been successfully submitted. You can edit it or add attachments using <a class="bug">the corresponding bugzilla page</a>.
+ <p>The bug report has been successfully submitted.</p>
+ <p>You can edit it or add attachments using <a class="bug">the corresponding bugzilla page</a>.</p>
</div>
<div class="state_attach">
diff --git a/bug/bug/bug.css b/bug/bug/bug.css
index f99f0b9..9ad2359 100644
--- a/bug/bug/bug.css
+++ b/bug/bug/bug.css
@@ -32,10 +32,15 @@
body {
margin: 0;
background-color: #fff;
+ color: #616161;
height: 1024px;
font-family: helvetica, arial;
}
+.input-label {
+ padding-left: 7px;
+}
+
.header {
background: url('images/top-header.png') no-repeat top left;
height: 102px;
@@ -45,11 +50,11 @@ body {
.header .title {
vertical-align: top;
font-weight: bold;
- font-size: 36px;
+ font-size: 22px;
display: inline-block;
color: #FFF;
- padding-top: 20px;
- padding-left: 40px;
+ padding-top: 5px;
+ padding-left: 30px;
}
.header .submission {
@@ -58,7 +63,7 @@ body {
width: 50%;
font-size: 15px;
padding-top: 10px;
- padding-left: 140px;
+ padding-left: 120px;
font-weight: bold;
}
@@ -75,7 +80,6 @@ body {
width: 255px;
height: 100%;
background: url('images/background-left.png') repeat-y;
- font-family: helvetica, arial;
font-size: 18px;
font-weight: bold;
}
@@ -107,30 +111,40 @@ body {
}
.left .count {
- padding-top: 20px;
+ padding-top: 19px;
padding-left: 30px;
display: inline-block;
color: #fff;
}
+.left .current .count {
+ padding-left: 29px;
+}
+
.left .label {
padding-left: 40px;
display: inline-block;
color: #9d9d9d;
}
+.left .current .label {
+ color: #444;
+}
+
+/* copyright */
+
.copyright {
- padding: 100px 30px 0px 20px;
+ padding: 100px 30px 10px 20px;
font-size: 8px;
- color: #29a1e0;
+ color: #1ca608;
}
.copyright a {
- color: #025587;
+ color: #7bd16e;
}
.copyright a:hover {
- color: #29a1e0;
+ color: #1ca608;
}
.right {
@@ -253,10 +267,10 @@ body {
.signin .signin-input input {
background: url('images/login-input.png') no-repeat;
- height: 42px;
- width: 263px;
+ height: 32px;
+ width: 243px;
border: 0;
- padding: 5px;
+ padding: 5px 10px;
}
.signin .go {
@@ -297,6 +311,7 @@ body {
.state_component > div > div {
display: inline-block;
+ vertical-align: middle;
}
.state_component .comments {
@@ -307,6 +322,10 @@ body {
font-size: 12px;
}
+.state_component .component_comments_container {
+ padding-left: 40px;
+}
+
.state_component .comments .comment-header {
color: #4fb33f;
font-weight: bold;
@@ -319,6 +338,10 @@ body {
overflow: auto;
}
+.state_component .comments .comment-read-more {
+ text-align: right;
+}
+
.state_component .comments .comment-read-more a {
text-decoration: none;
color: #cc1300;
@@ -368,17 +391,17 @@ body {
.state_description .subject-input input {
background: url('images/subject.png') no-repeat;
height: 28px;
- width: 548px;
+ width: 528px;
border: 0;
- padding: 5px;
+ padding: 5px 10px;
}
.state_description .description-input textarea {
background: url('images/description.png') no-repeat;
height: 240px;
- width: 548px;
+ width: 528px;
border: 0;
- padding: 5px;
+ padding: 5px 10px;
}
/* state_submit */
@@ -415,15 +438,17 @@ body {
}
.state_duplicates a {
- text-decoration: none;
- color: #1d97e0;
+ color: #025587;
+}
+
+.state_duplicates a:hover {
+ color: #29a1e0;
}
/* state_success */
.state_success {
display: none;
text-align: center;
- padding: 30px;
font-weight: bold;
}
@@ -499,15 +524,16 @@ body {
z-index: 2;
width: 400px;
height: 39px;
+ size: 150;
}
.state_attach .attach-file input[type='text'] {
margin-top: 6px;
- width: 242px;
+ width: 232px;
height: 27px;
background: url('images/upload-input.png') no-repeat;
border: 0;
- padding: 0;
+ padding: 0px 5px;
}
.state_attach .attach-browse {
@@ -534,14 +560,13 @@ body {
/* select */
.select .select-header {
background: url('images/select-header.png') no-repeat;
- padding: 5px;
+ padding: 5px 15px 5px 10px;
height: 33px;
line-height: 33px;
- width: 250px;
+ width: 225px;
}
.select .select-header, .select .choice {
- font-family: helvetica, arial;
font-size: 18px;
color: #b8af9e;
}
diff --git a/bug/bug/bug.js b/bug/bug/bug.js
index 5c5b2d1..684ccde 100644
--- a/bug/bug/bug.js
+++ b/bug/bug/bug.js
@@ -102,10 +102,12 @@
$.bug.current_step('component');
element.show();
$('.select', element).select();
- $('.select .choice', element).click(function() {
+ $('.select .choice, img', element).hover(function() {
var component = $(this).attr('data');
$('.comment', element).hide();
$('.comment.' + component, element).show();
+ });
+ $('.select .choice', element).click(function() {
$.bug.state_subcomponent();
});
$('img', element).click(function() {
diff --git a/bug/bug/test.js b/bug/bug/test.js
index 0fcea78..86dc7a9 100644
--- a/bug/bug/test.js
+++ b/bug/bug/test.js
@@ -131,6 +131,7 @@ test("state_component", function() {
equal($('.comment.BASIC', element).css('display'), 'none', 'BASIC hidden');
equal($('.comment.OTHER', element).css('display'), 'none', 'OTHER hidden');
$(".component .choice[data='BASIC']", element).click();
+ $(".component .choice[data='BASIC']", element).mouseenter();
equal($('.comment.BASIC', element).css('display'), 'block', 'BASIC is visible');
equal($('.comment.OTHER', element).css('display'), 'none', 'OTHER hidden');
commit a5cc2f2caf17e4ee8ad163e0e151ed7a4a76ce09
Author: Loic Dachary <loic at dachary.org>
Date: Thu Sep 22 10:15:28 2011 +0200
sort the list of versions lexicographicaly
diff --git a/bug/query.pl b/bug/query.pl
index 1673b1e..d9abde2 100644
--- a/bug/query.pl
+++ b/bug/query.pl
@@ -31,7 +31,7 @@ while(<STDIN>) {
print "<?xml version='1.0' encoding='ISO-8859-1'?>\n";
if($ARGV[0] eq 'versions') {
- @versions = @{$vers[$libreoffice]};
+ @versions = sort(@{$vers[$libreoffice]});
print <<EOF;
<div class="versions select">
<div class="select-header">
More information about the Libreoffice-commits
mailing list