Bugzilla – Attachment 70339 Details for
Bug 41256
BUGZILLAASSISTANT: no operation system selection in bugassistant
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
Patch for 41256
0001-fix-for-Bug-41256.patch (text/plain), 8.92 KB, created by
C. Koppelt
on 2012-11-20 23:21:22 UTC
(
hide
)
Description:
Patch for 41256
Filename:
MIME Type:
Creator:
C. Koppelt
Created:
2012-11-20 23:21:22 UTC
Size:
8.92 KB
patch
obsolete
>From 29a74e313fc1864821766a1e27f9782f763d6aac Mon Sep 17 00:00:00 2001 >From: "C. Koppelt" <ch.ko123@gmail.com> >Date: Tue, 20 Nov 2012 22:55:19 +0100 >Subject: [PATCH] fix for Bug 41256 > >--- > bug/Makefile | 2 ++ > bug/bug.xhtml | 15 +++++++++++++-- > bug/bug/bug.css | 12 +++++++++++- > bug/bug/bug.js | 17 ++++++++++++++++- > bug/bug/select.css | 4 ++++ > bug/bug/skin.js | 8 +++++++- > bug/op_sys.pl | 36 ++++++++++++++++++++++++++++++++++++ > bug/op_sys.sh | 3 +++ > 8 files changed, 92 insertions(+), 5 deletions(-) > mode change 100644 => 100755 bug/bug/bug.css > mode change 100644 => 100755 bug/bug/bug.js > create mode 100644 bug/op_sys.pl > create mode 100755 bug/op_sys.sh > >diff --git a/bug/Makefile b/bug/Makefile >index 358d33c..99678d9 100644 >--- a/bug/Makefile >+++ b/bug/Makefile >@@ -24,6 +24,8 @@ 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 >+ ./op_sys.sh < build/query.xhtml > build/op_sys.txt >+ perl op_sys.pl < build/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 fe365be..428a435 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="copyright"> > <a target="_blank" href="http://wiki.documentfoundation.org/Bug_Submission_Assistant">Bug Submission Assistant</a> is copyright (C) 2011 Loic Dachary published under <a target="_blank" href="http://www.gnu.org/licenses/gpl.txt">GNU GPLv3+</a>. Download the sources with git clone <a target="_blank" href="http://cgit.freedesktop.org/libreoffice/website">http://cgit.freedesktop.org/libreoffice/website</a>. >@@ -147,6 +149,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> >diff --git a/bug/bug/bug.css b/bug/bug/bug.css >old mode 100644 >new mode 100755 >index f81aa9b..a7c3f81 >--- a/bug/bug/bug.css >+++ b/bug/bug/bug.css >@@ -122,7 +122,7 @@ body { > } > > .left .label { >- padding-left: 40px; >+ padding-left: 20px; > display: inline-block; > color: #9d9d9d; > } >@@ -388,6 +388,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 >old mode 100644 >new mode 100755 >index c6f5966..0065b68 >--- a/bug/bug/bug.js >+++ b/bug/bug/bug.js >@@ -176,11 +176,24 @@ > 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(); >@@ -249,6 +262,7 @@ > $(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(); > var comment = $('.state_description .long').val(); >@@ -256,6 +270,7 @@ > $('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); > return true; >diff --git a/bug/bug/select.css b/bug/bug/select.css >index 68718c1..c1a56c1 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 7858f67..d0345c3 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..2652a63 >--- /dev/null >+++ b/bug/op_sys.pl >@@ -0,0 +1,36 @@ >+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; >+ print " <li class='choice' data='$op_sys'>$op_sys</li>\n"; >+} >+ >+ print <<EOF; >+ </ul> >+ </div> >+ </div> >+ </div> >+ </div> >+ </div> >+ </div> >+ </div> >+EOF >diff --git a/bug/op_sys.sh b/bug/op_sys.sh >new file mode 100755 >index 0000000..a102b74 >--- /dev/null >+++ b/bug/op_sys.sh >@@ -0,0 +1,3 @@ >+awk '/<select name="op_sys"/,/select>/' | >+awk '/value="/,/">/' | >+awk '{gsub("[ ]*<option value=.*\">", "");print}' >-- >1.7.10.4 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=70339">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 41256
: 70339 |
70512