bug/Makefile | 1 +
bug/bug.xhtml | 16 +++++++++++++---
bug/bug/bug.css | 12 +++++++++++-
bug/bug/bug.js | 21 ++++++++++++++++++---
bug/bug/select.css | 4 ++++
bug/bug/skin.js | 8 +++++++-
bug/op_sys.pl | 37 +++++++++++++++++++++++++++++++++++++
bug/op_sys.txt | 12 ++++++++++++
8 files changed, 103 insertions(+), 8 deletions(-)
New commits:
commit a9ce76f1d769f71defd659bded4f0a315a08314d
Author: C. Koppelt <ch.ko...@gmail.com>
Date: Sat Nov 24 14:10:11 2012 +0100
new patch for 41256
diff --git a/bug/Makefile b/bug/Makefile
index 358d33c..d294009 100644
--- a/bug/Makefile
+++ b/bug/Makefile
@@ -24,6 +24,7 @@ extract:
xsltproc --encoding UTF-8 --novalid subcomponents.xsl
build/BugReport_Details.xhtml > build/subcomponents.xhtml
xsltproc --encoding UTF-8 --novalid components.xsl
build/BugReport_Details.xhtml > build/components.xhtml
curl --silent
'https://bugs.freedesktop.org/query.cgi?product=LibreOffice&query_format=advanced'
> build/query.xhtml
+ perl op_sys.pl < op_sys.txt > build/op_sys.xhtml
perl query.pl < build/query.xhtml > build/versions.xhtml
perl sanity.pl build/query.xhtml build/components.xhtml
diff --git a/bug/bug.xhtml b/bug/bug.xhtml
index 1d30563..565668e 100644
--- a/bug/bug.xhtml
+++ b/bug/bug.xhtml
@@ -5,6 +5,7 @@
<!ENTITY components SYSTEM "build/components.xhtml">
<!ENTITY subcomponents SYSTEM "build/subcomponents.xhtml">
<!ENTITY versions SYSTEM "build/versions.xhtml">
+ <!ENTITY op_sys SYSTEM "build/op_sys.xhtml">
]
>
<html >
@@ -67,8 +68,9 @@
<div class="step step_component"><div class="count">2</div><div
class="label">Component</div></div>
<div class="step step_subcomponent"><div class="count">3</div><div
class="label">Subcomponent</div></div>
<div class="step step_version"><div class="count">4</div><div
class="label">Version</div></div>
- <div class="step step_description"><div class="count">5</div><div
class="label">Description</div></div>
- <div class="step step_submit"><div class="count">6</div><div
class="label">Submit</div></div>
+ <div class="step step_op_sys"><div class="count">5</div><div
class="label">Operating System</div></div>
+ <div class="step step_description"><div class="count">6</div><div
class="label">Description</div></div>
+ <div class="step step_submit"><div class="count">7</div><div
class="label">Submit</div></div>
</div>
<div class="legal">
All your contributions will be public in WWW! By clicking the
'Submit' button you irrevocably agree to release your contribution under the
CC-BY-SA 3.0 License and the GFDL. If you can't agree to these terms for
documents you planned to attach you can state in this report that such a
document exists. QA team will discuss with you further proceeding in the bug.
@@ -157,6 +159,15 @@
</div>
</div>
+ <div class="operating_system">
+ <div>
+ <div class="state state_op_sys">
+ <div class="input-label">Operating System</div>
+ &op_sys;
+ </div>
+ </div>
+ </div>
+
<div class="state state_description">
<div class="subject input-label">Subject:</div>
<div class="subject-input"><input type="text" class="short"
size="50"></input></div>
@@ -173,7 +184,6 @@ Current behavior:
Expected behavior:
-Platform (if different from the browser):
</textarea>
</div>
</div>
diff --git a/bug/bug/bug.css b/bug/bug/bug.css
index 41936e2..7fee712 100644
--- a/bug/bug/bug.css
+++ b/bug/bug/bug.css
@@ -123,7 +123,7 @@ body {
}
.left .label {
- padding-left: 40px;
+ padding-left: 20px;
display: inline-block;
color: #9d9d9d;
}
@@ -395,6 +395,16 @@ body {
display: none;
}
+/* state_subcomponent */
+.operating_system > div {
+ display: inline-block;
+}
+
+/* state_op_sys */
+.state_op_sys {
+ display: none;
+}
+
/* state_description */
.state_description {
display: none;
diff --git a/bug/bug/bug.js b/bug/bug/bug.js
index 55312ed..40114a9 100644
--- a/bug/bug/bug.js
+++ b/bug/bug/bug.js
@@ -176,17 +176,28 @@
element.show();
$('.select', element).select();
$(".select .choice", element).click(function() {
- $.bug.state_description();
+ $.bug.state_op_sys();
});
}
},
+ state_op_sys: function() {
+ var element = $('.state_op_sys');
+ if(!element.hasClass('initialized')) {
+ element.addClass('initialized');
+ $.bug.current_step('op_sys');
+ element.show();
+ $('.select', element).select();
+ $(".select .choice", element).click(function() {
+ $.bug.state_description();
+ });
+ }
+ },
+
state_description: function() {
var element = $('.state_description');
var template = $(".long", element).val();
if(!element.hasClass('initialized')) {
- template = template + '\nBrowser: ' +
window.navigator.userAgent;
- $(".long", element).val(template);
var validate = function() {
if($(".short", element).val().length > 3 &&
$(".long", element).val() != template) {
@@ -252,13 +263,17 @@
$(element).addClass('inprogress');
}
var version = $('.state_version .chosen').attr('data');
+ var op_sys = $('.state_op_sys .chosen').attr('data');
var component = $('.state_component
.chosen').attr('data').replace('_',' ');
var short_desc = $('.state_subcomponent
.active_subcomponent .chosen').attr('data') + ': ' + $('.state_description
.short').val();
+ //Add Operating System
var comment = $('.state_description .long').val();
+ comment = comment + "\nOperating System: " + $(".op_sys
.chosen").text();
$("body").css("cursor", "progress");
$('input[name="token"]', form).val($.bug.token);
$('input[name="component"]', form).val(component);
$('input[name="version"]', form).val(version);
+ $('input[name="op_sys"]', form).val(op_sys);
$('input[name="short_desc"]', form).val(short_desc);
$('input[name="comment"]', form).val(comment);
$.bug.token = '';
diff --git a/bug/bug/select.css b/bug/bug/select.css
index 540576f..509797f 100644
--- a/bug/bug/select.css
+++ b/bug/bug/select.css
@@ -18,6 +18,10 @@
/* select */
.select {
position: relative;
+ z-index: 2;
+}
+
+.select.op_sys {
z-index: 1;
}
diff --git a/bug/bug/skin.js b/bug/bug/skin.js
index a33de59..01766ff 100644
--- a/bug/bug/skin.js
+++ b/bug/bug/skin.js
@@ -35,9 +35,13 @@
};
$('.state_subcomponent .active_subcomponent .choice:nth(0)').click();
}
- function description() {
+ function op_sys(){
version();
$('.state_version .choice:nth(0)').click();
+ }
+ function description() {
+ op_sys();
+ $('.state_op_sys .choice:nth(0)').click();
$('.state_description .short').val('12');
}
function submit() {
@@ -56,6 +60,8 @@
subcomponent();
} else if(location.search.indexOf('skin=version') >= 0) {
version();
+ } else if(location.search.indexOf('skin=op_sys') >= 0) {
+ op_sys();
} else if(location.search.indexOf('skin=description') >= 0) {
description();
} else if(location.search.indexOf('skin=submit') >= 0) {
diff --git a/bug/op_sys.pl b/bug/op_sys.pl
new file mode 100644
index 0000000..dee774b
--- /dev/null
+++ b/bug/op_sys.pl
@@ -0,0 +1,37 @@
+print "<?xml version='1.0' encoding='ISO-8859-1'?>\n";
+
+print <<EOF;
+ <div class="op_sys select">
+ <div class="select-header">
+ <div class="chosen">(chose one)</div>
+ </div>
+ <div class="choices">
+ <div class="select-top">
+ <div class="select-left">
+ <div class="select-bottom">
+ <div class="select-right">
+ <div class="top-left"></div>
+ <div class="top-right"></div>
+ <div class="bottom-left"></div>
+ <div class="bottom-right"></div>
+ <div class="center">
+ <ul>
+EOF
+
+while(<STDIN>) {
+ $op_sys = $_;
+ $op_sys =~ s/\R//g;
+ my($display_value, $data) = split(/::/, $op_sys, 2);
+ print " <li class='choice' data='$data'>$display_value</li>\n";
+}
+
+ print <<EOF;
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+EOF
diff --git a/bug/op_sys.txt b/bug/op_sys.txt
new file mode 100644
index 0000000..75f858a
--- /dev/null
+++ b/bug/op_sys.txt
@@ -0,0 +1,12 @@
+All::All
+Ubuntu::Linux (All)
+Debian::Linux (All)
+Fedora::Linux (All)
+Linux (Other)::Linux (All)
+BSD::BSD (Others)
+Mac OS X::Mac OS X (All)
+Windows XP::Windows (All)
+Windows 7::Windows (All)
+Windows 8::Windows (All)
+Windows (other)::Windows (All)
+other::other
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
