From e1875f884cfd5cccd85da85ebaee779d21c2afdd Mon Sep 17 00:00:00 2001
From: Mark Maglana <mmaglana@gmail.com>
Date: Thu, 2 Sep 2010 00:44:40 +0800
Subject: [PATCH] Fix product_owner.feature

---
 features/product_owner.feature            |   7 +-
 features/step_definitions/_given_steps.rb |   5 +
 features/step_definitions/_when_steps.rb  |  15 +-
 lib/labels.yaml                           | 724 +++++++++++-----------
 4 files changed, 377 insertions(+), 374 deletions(-)

diff --git a/features/product_owner.feature b/features/product_owner.feature
index 208d76fc37..0438c3fd6c 100644
--- a/features/product_owner.feature
+++ b/features/product_owner.feature
@@ -37,14 +37,17 @@ Feature: Product Owner
       And I want to update the story with subject Story 3
       And I set the subject of the story to Relaxdiego was here
       And I set the tracker of the story to Bug
-     When I update the story  
+     When I update the story
      Then the story should have a subject of Relaxdiego was here
       And the story should have a tracker of Bug
       And the story should have a position of 3
 
   Scenario: Close a story
     Given I am viewing the master backlog
-     When I close Story 2
+      And I want to update the story with subject Story 4
+      And I set the status of the story to Closed
+     When I update the story
+     Then show me the page
      Then the status of the story should be set as closed
 
   Scenario: Move a story to the top
diff --git a/features/step_definitions/_given_steps.rb b/features/step_definitions/_given_steps.rb
index 73c3868c97..bf9b7dd5ea 100644
--- a/features/step_definitions/_given_steps.rb
+++ b/features/step_definitions/_given_steps.rb
@@ -1,6 +1,8 @@
 Given /^I am a product owner of the project$/ do
   role = Role.find(:first, :conditions => "name='Manager'")
   role.permissions << :view_master_backlog
+  role.permissions << :create_stories
+  role.permissions << :update_stories
   role.save!
   login_as_product_owner
 end
@@ -41,6 +43,9 @@ Given /^I set the (.+) of the story to (.+)$/ do |attribute, value|
   if attribute=="tracker"
     attribute="tracker_id"
     value = Tracker.find(:first, :conditions => "name='#{value}'").id
+  elsif attribute=="status"
+    attribute="status_id"
+    value = IssueStatus.find(:first, :conditions => "name='#{value}'").id
   end
   @story_params[attribute] = value
 end
diff --git a/features/step_definitions/_when_steps.rb b/features/step_definitions/_when_steps.rb
index ac52fccf41..150d8c04c5 100644
--- a/features/step_definitions/_when_steps.rb
+++ b/features/step_definitions/_when_steps.rb
@@ -1,12 +1,6 @@
-When /^I close (.+)$/ do |subject|
-  @story = Story.find(:first, :conditions => "subject='#{subject}'")
-  @story.should_not be_nil
-  @story.update_attributes :status_id => IssueStatus.find(:first, :conditions => "name='Closed'").id
-end
-
 When /^I create the story$/ do
   page.driver.process :post, 
-                      url_for(:controller => 'stories', :action => 'create'),
+                      url_for(:controller => :rb_stories, :action => :create),
                       @story_params
 end
 
@@ -52,8 +46,8 @@ When /^I move the (\d+)(?:st|nd|rd|th) story to the (\d+|last)(?:st|nd|rd|th)? p
          end
 
   page.driver.process :post, 
-                      url_for(:controller => 'stories', :action => 'update'),
-                      {:id => story.text, :prev => (prev.nil? ? '' : prev.text), :project_id => @project.id}
+                      url_for(:controller => :rb_stories, :action => :update, :id => story.text),
+                      {:prev => (prev.nil? ? '' : prev.text), :project_id => @project.id, "_method" => "put"}
 
   @story = Story.find(story.text.to_i)
 end
@@ -70,8 +64,9 @@ end
 
 When /^I update the story$/ do
   page.driver.process :post,
-                      url_for(:controller => 'stories', :action => 'update'),
+                      url_for(:controller => :rb_stories, :action => :update, :id => @story_params[:id]),
                       @story_params
+  page.driver.response.status.should == 200
 end
 
 When /^I download the calendar feed$/ do
diff --git a/lib/labels.yaml b/lib/labels.yaml
index 76ec848df3..3bb895ce7a 100755
--- a/lib/labels.yaml
+++ b/lib/labels.yaml
@@ -40,13 +40,13 @@ Avery J8666:
   inner_margin: "5"
   vertical_pitch: "264"
   down: 5
-  papersize: Letter
   top_margin: "53"
-  horizontal_pitch: "147"
+  papersize: Letter
   height: "147.4"
+  horizontal_pitch: "147"
   source: glabel
-  width: "198.4"
   left_margin: "66"
+  width: "198.4"
 Herma 4614: 
   across: 3
   inner_margin: "5"
@@ -148,13 +148,13 @@ Avery C32015:
   inner_margin: 5mm
   vertical_pitch: 91mm
   down: 4
-  papersize: LETTER
   top_margin: 31.5mm
-  horizontal_pitch: 60mm
+  papersize: LETTER
   height: 54mm
+  horizontal_pitch: 60mm
   source: glabel
-  width: 85mm
   left_margin: 17mm
+  width: 85mm
 DECAdry DLW-1731: 
   across: 3
   inner_margin: "5"
@@ -292,13 +292,13 @@ Avery J8160:
   inner_margin: "5"
   vertical_pitch: "187.2"
   down: 7
-  papersize: Letter
   top_margin: "43.9"
-  horizontal_pitch: "108.0"
+  papersize: Letter
   height: "108.0"
+  horizontal_pitch: "108.0"
   source: glabel
-  width: "181.4"
   left_margin: "21.2"
+  width: "181.4"
 Worldlabel WL-125: 
   across: 2
   inner_margin: 0.125in
@@ -328,13 +328,13 @@ Avery J8161:
   inner_margin: "5"
   vertical_pitch: "186.9"
   down: 6
-  papersize: Letter
   top_margin: "23"
-  horizontal_pitch: "132.5"
+  papersize: Letter
   height: "132.6"
+  horizontal_pitch: "132.5"
   source: glabel
-  width: "180.2"
   left_margin: "21"
+  width: "180.2"
 Biltema 23-756: 
   across: 3
   inner_margin: "5"
@@ -388,37 +388,37 @@ Avery J8435A:
   inner_margin: 2mm
   vertical_pitch: 155mm
   down: 1
-  papersize: Letter
   top_margin: 22mm
-  horizontal_pitch: 125mm
+  papersize: Letter
   height: 125mm
+  horizontal_pitch: 125mm
   source: glabel
-  width: 155mm
   left_margin: 27.5mm
+  width: 155mm
 Avery J8435B: 
   across: 1
   inner_margin: 2mm
   vertical_pitch: 155mm
   down: 1
-  papersize: Letter
   top_margin: 21mm
-  horizontal_pitch: 122mm
+  papersize: Letter
   height: 122mm
+  horizontal_pitch: 122mm
   source: glabel
-  width: 155mm
   left_margin: 27.5mm
+  width: 155mm
 Avery J8164: 
   across: 3
   inner_margin: "5"
   vertical_pitch: "187.08"
   down: 4
-  papersize: Letter
   top_margin: "10"
-  horizontal_pitch: "204.038"
+  papersize: Letter
   height: "204.038"
+  horizontal_pitch: "204.038"
   source: glabel
-  width: "180"
   left_margin: "20.84"
+  width: "180"
 Herma 5090: 
   across: 1
   inner_margin: "5"
@@ -484,13 +484,13 @@ Avery J8165:
   inner_margin: 5.66929pt
   vertical_pitch: 288.113pt
   down: 4
-  papersize: Letter
   top_margin: 36.9638pt
-  horizontal_pitch: 191.991pt
+  papersize: Letter
   height: 191.991pt
+  horizontal_pitch: 191.991pt
   source: glabel
-  width: 280.8pt
   left_margin: 13.2378pt
+  width: 280.8pt
 Herma 5091: 
   across: 1
   inner_margin: "5"
@@ -736,13 +736,13 @@ Avery J8651:
   inner_margin: "5"
   vertical_pitch: "115.09"
   down: 13
-  papersize: Letter
   top_margin: "30.90"
-  horizontal_pitch: "60.09"
+  papersize: Letter
   height: "60.09"
+  horizontal_pitch: "60.09"
   source: glabel
-  width: "108"
   left_margin: "13.32"
+  width: "108"
 Herma 5095: 
   across: 1
   inner_margin: "5"
@@ -940,13 +940,13 @@ Avery L8651:
   inner_margin: "5"
   vertical_pitch: "115.09"
   down: 13
-  papersize: Letter
   top_margin: "30.90"
-  horizontal_pitch: "60.09"
+  papersize: Letter
   height: "60.09"
+  horizontal_pitch: "60.09"
   source: glabel
-  width: "108"
   left_margin: "13.32"
+  width: "108"
 Avery 5395: 
   across: 2
   inner_margin: 0.0625in
@@ -1036,13 +1036,13 @@ Avery L7414:
   inner_margin: "5"
   vertical_pitch: "255.1"
   down: 5
-  papersize: Letter
   top_margin: "52.44"
-  horizontal_pitch: "147.4"
+  papersize: Letter
   height: "147.4"
+  horizontal_pitch: "147.4"
   source: glabel
-  width: "255.1"
   left_margin: "42.51"
+  width: "255.1"
 Avery 8414: 
   across: 2
   inner_margin: "5"
@@ -1252,13 +1252,13 @@ Avery L7551:
   inner_margin: "5"
   vertical_pitch: "115.09"
   down: 13
-  papersize: Letter
   top_margin: "30.90"
-  horizontal_pitch: "60.09"
+  papersize: Letter
   height: "60.09"
+  horizontal_pitch: "60.09"
   source: glabel
-  width: "108"
   left_margin: "13.32"
+  width: "108"
 Dymo 30258: 
   across: 1
   inner_margin: 0pt
@@ -1276,25 +1276,25 @@ Avery 32250A:
   inner_margin: 2mm
   vertical_pitch: 155mm
   down: 1
-  papersize: Letter
   top_margin: 22mm
-  horizontal_pitch: 125mm
+  papersize: Letter
   height: 125mm
+  horizontal_pitch: 125mm
   source: glabel
-  width: 155mm
   left_margin: 27.5mm
+  width: 155mm
 Avery 32250B: 
   across: 1
   inner_margin: 2mm
   vertical_pitch: 155mm
   down: 1
-  papersize: Letter
   top_margin: 21mm
-  horizontal_pitch: 122mm
+  papersize: Letter
   height: 122mm
+  horizontal_pitch: 122mm
   source: glabel
-  width: 155mm
   left_margin: 27.5mm
+  width: 155mm
 PEARL PE-8007, PE-8017: 
   across: 1
   inner_margin: 3.2mm
@@ -1347,12 +1347,12 @@ Buro1 129820:
   across: 2
   vertical_pitch: 54mm
   down: 5
-  papersize: A4
   top_margin: 14mm
-  height: 54mm
+  papersize: A4
   horizontal_pitch: 95mm
-  left_margin: 15mm
+  height: 54mm
   width: 85mm
+  left_margin: 15mm
 Herma 5051: 
   across: 4
   inner_margin: "5"
@@ -1538,13 +1538,13 @@ Avery L7664:
   inner_margin: "5"
   vertical_pitch: 104.5mm
   down: 4
-  papersize: Letter
   top_margin: 5mm
-  horizontal_pitch: 72mm
+  papersize: Letter
   height: 71.9mm
+  horizontal_pitch: 72mm
   source: glabel
-  width: 70mm
   left_margin: 17mm
+  width: 70mm
 Worldlabel WL-172: 
   across: 2
   inner_margin: 0.0625in
@@ -1838,13 +1838,13 @@ PEARL PE 8008, PE 8018:
   inner_margin: 3.2mm
   vertical_pitch: 48.4mm
   down: 10
-  papersize: Letter
   top_margin: 21.5mm
-  horizontal_pitch: 25.4mm
+  papersize: Letter
   height: 25.4mm
+  horizontal_pitch: 25.4mm
   source: glabel
-  width: 48.4mm
   left_margin: 8mm
+  width: 48.4mm
 Avery 6879: 
   across: 2
   inner_margin: 0.0625in
@@ -1970,13 +1970,13 @@ Avery L7160:
   inner_margin: "5"
   vertical_pitch: "187.2"
   down: 7
-  papersize: Letter
   top_margin: "43.9"
-  horizontal_pitch: "108.0"
+  papersize: Letter
   height: "108.0"
+  horizontal_pitch: "108.0"
   source: glabel
-  width: "181.4"
   left_margin: "21.2"
+  width: "181.4"
 Herma 4271: 
   across: 4
   inner_margin: "5"
@@ -2018,13 +2018,13 @@ Avery L7161:
   inner_margin: "5"
   vertical_pitch: "186.9"
   down: 6
-  papersize: Letter
   top_margin: "23"
-  horizontal_pitch: "132.5"
+  papersize: Letter
   height: "132.6"
+  horizontal_pitch: "132.5"
   source: glabel
-  width: "180.2"
   left_margin: "21"
+  width: "180.2"
 Herma 4272: 
   across: 4
   inner_margin: "5"
@@ -2078,13 +2078,13 @@ Avery L7162:
   inner_margin: "5"
   vertical_pitch: "290.5"
   down: 8
-  papersize: Letter
   top_margin: "36.8"
-  horizontal_pitch: "96.1"
+  papersize: Letter
   height: "96.1"
+  horizontal_pitch: "96.1"
   source: glabel
-  width: "280.9"
   left_margin: "11.3"
+  width: "280.9"
 Zweckform 4781: 
   across: 2
   inner_margin: "5"
@@ -2138,13 +2138,13 @@ Avery L7163:
   inner_margin: "5"
   vertical_pitch: "292"
   down: 7
-  papersize: Letter
   top_margin: "43"
-  horizontal_pitch: "108"
+  papersize: Letter
   height: "108"
+  horizontal_pitch: "108"
   source: glabel
-  width: "280.9"
   left_margin: "9.5"
+  width: "280.9"
 Zweckform J8435A: 
   across: 1
   inner_margin: 2mm
@@ -2246,13 +2246,13 @@ Avery L7164:
   inner_margin: "5"
   vertical_pitch: "187.08"
   down: 4
-  papersize: Letter
   top_margin: "10"
-  horizontal_pitch: "204.038"
+  papersize: Letter
   height: "204.038"
+  horizontal_pitch: "204.038"
   source: glabel
-  width: "180"
   left_margin: "20.84"
+  width: "180"
 Zweckform J8435B: 
   across: 1
   inner_margin: 2mm
@@ -2306,13 +2306,13 @@ Avery L7165:
   inner_margin: 5.66929pt
   vertical_pitch: 288.113pt
   down: 4
-  papersize: Letter
   top_margin: 36.9638pt
-  horizontal_pitch: 191.991pt
+  papersize: Letter
   height: 191.991pt
+  horizontal_pitch: 191.991pt
   source: glabel
-  width: 280.8pt
   left_margin: 13.2378pt
+  width: 280.8pt
 Avery 5931-Spine: 
   across: 2
   inner_margin: 1mm
@@ -2462,13 +2462,13 @@ Avery L7651:
   inner_margin: "5"
   vertical_pitch: "115.09"
   down: 13
-  papersize: Letter
   top_margin: "30.90"
-  horizontal_pitch: "60.09"
+  papersize: Letter
   height: "60.09"
+  horizontal_pitch: "60.09"
   source: glabel
-  width: "108"
   left_margin: "13.32"
+  width: "108"
 Sigel LP 801: 
   across: 2
   inner_margin: "5"
@@ -2606,13 +2606,13 @@ Avery L7169:
   inner_margin: "6"
   vertical_pitch: "287.7"
   down: 2
-  papersize: Letter
   top_margin: "20.0"
-  horizontal_pitch: "394.0"
+  papersize: Letter
   height: "394.0"
+  horizontal_pitch: "394.0"
   source: glabel
-  width: "280.9"
   left_margin: "14.2"
+  width: "280.9"
 Sattleford VM-5019, VM-5519: 
   across: 2
   inner_margin: 3.2mm
@@ -2661,30 +2661,30 @@ Avery 38931:
   source: glabel
   width: 70mm
   left_margin: 0mm
-PEARL VM-5217, VM-5517: 
+Ednet BC: 
   across: 2
-  inner_margin: 3.2mm
-  vertical_pitch: 107mm
-  down: 2
+  inner_margin: "5"
+  vertical_pitch: "253"
+  down: 5
   papersize: Letter
-  top_margin: 14mm
-  horizontal_pitch: 130mm
-  height: 130mm
+  top_margin: "59"
+  horizontal_pitch: "145"
+  height: "145"
   source: glabel
-  width: 100mm
-  left_margin: 4.5mm
-Sattleford VM-5040, VM-5540: 
-  across: 3
-  inner_margin: 3.2mm
-  vertical_pitch: 55mm
-  down: 4
+  width: "253"
+  left_margin: "40"
+Avery 5126: 
+  across: 1
+  inner_margin: 9pt
+  vertical_pitch: 0in
+  down: 2
   papersize: Letter
-  top_margin: 24.5mm
-  horizontal_pitch: 64.5mm
-  height: 54.5mm
+  top_margin: 0in
+  horizontal_pitch: 5.5in
+  height: 5.5in
   source: glabel
-  width: 45mm
-  left_margin: 28mm
+  width: 8.5in
+  left_margin: 0in
 Worldlabel WL-75: 
   across: 2
   inner_margin: 0.0625in
@@ -2697,78 +2697,54 @@ Worldlabel WL-75:
   source: glabel
   width: 4in
   left_margin: 0.15625in
-Avery 5126: 
-  across: 1
-  inner_margin: 9pt
-  vertical_pitch: 0in
-  down: 2
+Sattleford VM-5040, VM-5540: 
+  across: 3
+  inner_margin: 3.2mm
+  vertical_pitch: 55mm
+  down: 4
   papersize: Letter
-  top_margin: 0in
-  horizontal_pitch: 5.5in
-  height: 5.5in
+  top_margin: 24.5mm
+  horizontal_pitch: 64.5mm
+  height: 54.5mm
   source: glabel
-  width: 8.5in
-  left_margin: 0in
-Ednet BC: 
+  width: 45mm
+  left_margin: 28mm
+PEARL VM-5217, VM-5517: 
   across: 2
-  inner_margin: "5"
-  vertical_pitch: "253"
-  down: 5
+  inner_margin: 3.2mm
+  vertical_pitch: 107mm
+  down: 2
   papersize: Letter
-  top_margin: "59"
-  horizontal_pitch: "145"
-  height: "145"
+  top_margin: 14mm
+  horizontal_pitch: 130mm
+  height: 130mm
   source: glabel
-  width: "253"
-  left_margin: "40"
-Zweckform 32010: 
+  width: 100mm
+  left_margin: 4.5mm
+Avery LSK-8.5: 
   across: 2
   inner_margin: "5"
-  vertical_pitch: "269"
-  down: 5
-  papersize: Letter
-  top_margin: "40"
-  horizontal_pitch: "153"
-  height: "153.07"
-  source: glabel
-  width: "240.94"
-  left_margin: "40"
-PEARL VM-6097, VM-6597: 
-  across: 1
-  inner_margin: 3.2mm
-  vertical_pitch: 148mm
-  down: 1
+  vertical_pitch: 2.13in
+  down: 20
   papersize: Letter
-  top_margin: 0mm
-  horizontal_pitch: 210mm
-  height: 210mm
+  top_margin: 0.5in
+  horizontal_pitch: 0.5in
+  height: 0.5in
   source: glabel
-  width: 148mm
-  left_margin: 0mm
-Avery 7160: 
+  width: 1.13in
+  left_margin: 0.5in
+Avery 3274.1: 
   across: 3
-  inner_margin: "5"
-  vertical_pitch: "187.2"
-  down: 7
-  papersize: Letter
-  top_margin: "43.9"
-  horizontal_pitch: "108.0"
-  height: "108.0"
-  source: glabel
-  width: "181.4"
-  left_margin: "21.2"
-Avery J8414: 
-  across: 2
-  inner_margin: "5"
-  vertical_pitch: "264"
-  down: 5
+  inner_margin: 0.0625in
+  vertical_pitch: 2.6875in
+  down: 3
   papersize: Letter
-  top_margin: "57.890"
-  horizontal_pitch: "144"
-  height: "144"
+  top_margin: 1.25in
+  horizontal_pitch: 3in
+  height: 2.5in
   source: glabel
-  width: "246.6"
-  left_margin: "42"
+  width: 2.5in
+  left_margin: 0.3125in
 PEARL VM-6398: 
   across: 9
   inner_margin: 1.5mm
@@ -2781,54 +2757,54 @@ PEARL VM-6398:
   source: glabel
   width: 19.6mm
   left_margin: 4.5mm
-Avery 3274.1: 
-  across: 3
-  inner_margin: 0.0625in
-  vertical_pitch: 2.6875in
-  down: 3
+Avery J8414: 
+  across: 2
+  inner_margin: "5"
+  vertical_pitch: "264"
+  down: 5
+  top_margin: "57.890"
   papersize: Letter
-  top_margin: 1.25in
-  horizontal_pitch: 3in
-  height: 2.5in
+  height: "144"
+  horizontal_pitch: "144"
   source: glabel
-  width: 2.5in
-  left_margin: 0.3125in
-Avery LSK-8.5: 
-  across: 2
+  left_margin: "42"
+  width: "246.6"
+Avery 7160: 
+  across: 3
   inner_margin: "5"
-  vertical_pitch: 2.13in
-  down: 20
+  vertical_pitch: "187.2"
+  down: 7
   papersize: Letter
-  top_margin: 0.5in
-  horizontal_pitch: 0.5in
-  height: 0.5in
+  top_margin: "43.9"
+  horizontal_pitch: "108.0"
+  height: "108.0"
   source: glabel
-  width: 1.13in
-  left_margin: 0.5in
-DECAdry OCC-3342: 
+  width: "181.4"
+  left_margin: "21.2"
+PEARL VM-6097, VM-6597: 
+  across: 1
+  inner_margin: 3.2mm
+  vertical_pitch: 148mm
+  down: 1
+  papersize: Letter
+  top_margin: 0mm
+  horizontal_pitch: 210mm
+  height: 210mm
+  source: glabel
+  width: 148mm
+  left_margin: 0mm
+Zweckform 32010: 
   across: 2
   inner_margin: "5"
   vertical_pitch: "269"
   down: 5
-  top_margin: "40"
   papersize: Letter
-  height: "153.07"
+  top_margin: "40"
   horizontal_pitch: "153"
+  height: "153.07"
   source: glabel
-  left_margin: "40"
   width: "240.94"
-Avery 7161: 
-  across: 3
-  inner_margin: "5"
-  vertical_pitch: "186.9"
-  down: 6
-  papersize: Letter
-  top_margin: "23"
-  horizontal_pitch: "132.5"
-  height: "132.6"
-  source: glabel
-  width: "180.2"
-  left_margin: "21"
+  left_margin: "40"
 PEARL PE-8351, PE-894: 
   across: 1
   inner_margin: 3.2mm
@@ -2841,18 +2817,30 @@ PEARL PE-8351, PE-894:
   source: glabel
   width: 210mm
   left_margin: 0mm
-Avery 7162: 
+Avery 7161: 
+  across: 3
+  inner_margin: "5"
+  vertical_pitch: "186.9"
+  down: 6
+  papersize: Letter
+  top_margin: "23"
+  horizontal_pitch: "132.5"
+  height: "132.6"
+  source: glabel
+  width: "180.2"
+  left_margin: "21"
+DECAdry OCC-3342: 
   across: 2
   inner_margin: "5"
-  vertical_pitch: "290.5"
-  down: 8
+  vertical_pitch: "269"
+  down: 5
+  top_margin: "40"
   papersize: Letter
-  top_margin: "36.8"
-  horizontal_pitch: "96.1"
-  height: "96.1"
+  height: "153.07"
+  horizontal_pitch: "153"
   source: glabel
-  width: "280.9"
-  left_margin: "11.3"
+  left_margin: "40"
+  width: "240.94"
 PEARL PE-8008, PE-8018: 
   across: 4
   inner_margin: 3.2mm
@@ -2865,30 +2853,18 @@ PEARL PE-8008, PE-8018:
   source: glabel
   width: 48.4mm
   left_margin: 8mm
-Avery 8435A: 
-  across: 1
-  inner_margin: 2mm
-  vertical_pitch: 155mm
-  down: 1
-  papersize: Letter
-  top_margin: 22mm
-  horizontal_pitch: 125mm
-  height: 125mm
-  source: glabel
-  width: 155mm
-  left_margin: 27.5mm
-Avery J8551: 
-  across: 5
+Avery 7162: 
+  across: 2
   inner_margin: "5"
-  vertical_pitch: "115.09"
-  down: 13
+  vertical_pitch: "290.5"
+  down: 8
   papersize: Letter
-  top_margin: "30.90"
-  horizontal_pitch: "60.09"
-  height: "60.09"
+  top_margin: "36.8"
+  horizontal_pitch: "96.1"
+  height: "96.1"
   source: glabel
-  width: "108"
-  left_margin: "13.32"
+  width: "280.9"
+  left_margin: "11.3"
 Avery 8658: 
   across: 7
   inner_margin: 2mm
@@ -2901,42 +2877,30 @@ Avery 8658:
   source: glabel
   width: 25.4mm
   left_margin: 5mm
-Avery 7163: 
-  across: 2
+Avery J8551: 
+  across: 5
   inner_margin: "5"
-  vertical_pitch: "292"
-  down: 7
-  papersize: Letter
-  top_margin: "43"
-  horizontal_pitch: "108"
-  height: "108"
-  source: glabel
-  width: "280.9"
-  left_margin: "9.5"
-Avery 5371: 
-  across: 2
-  inner_margin: 0.0625in
-  vertical_pitch: 3.5in
-  down: 5
+  vertical_pitch: "115.09"
+  down: 13
+  top_margin: "30.90"
   papersize: Letter
-  top_margin: 0.5in
-  horizontal_pitch: 2in
-  height: 2in
+  height: "60.09"
+  horizontal_pitch: "60.09"
   source: glabel
-  width: 3.5in
-  left_margin: 0.75in
-APLI 1999: 
-  across: 2
-  inner_margin: "5"
-  vertical_pitch: "289"
-  down: 4
+  left_margin: "13.32"
+  width: "108"
+Avery 8435A: 
+  across: 1
+  inner_margin: 2mm
+  vertical_pitch: 155mm
+  down: 1
   papersize: Letter
-  top_margin: "21.890"
-  horizontal_pitch: "194"
-  height: "193"
+  top_margin: 22mm
+  horizontal_pitch: 125mm
+  height: 125mm
   source: glabel
-  width: "281"
-  left_margin: "13"
+  width: 155mm
+  left_margin: 27.5mm
 Avery 8435B: 
   across: 1
   inner_margin: 2mm
@@ -2949,42 +2913,54 @@ Avery 8435B:
   source: glabel
   width: 155mm
   left_margin: 27.5mm
-Zweckform 3474: 
-  across: 3
-  inner_margin: "0"
-  vertical_pitch: 70mm
-  down: 8
+APLI 1999: 
+  across: 2
+  inner_margin: "5"
+  vertical_pitch: "289"
+  down: 4
   papersize: Letter
-  top_margin: "0"
-  horizontal_pitch: 37mm
-  height: 37mm
+  top_margin: "21.890"
+  horizontal_pitch: "194"
+  height: "193"
   source: glabel
-  width: 70mm
-  left_margin: "0"
-Worldlabel WL-625: 
+  width: "281"
+  left_margin: "13"
+Avery 5371: 
   across: 2
   inner_margin: 0.0625in
-  vertical_pitch: 4.25in
+  vertical_pitch: 3.5in
   down: 5
   papersize: Letter
   top_margin: 0.5in
   horizontal_pitch: 2in
   height: 2in
   source: glabel
-  width: 4.25in
-  left_margin: 0in
-Avery 7164: 
-  across: 3
+  width: 3.5in
+  left_margin: 0.75in
+Avery 7163: 
+  across: 2
   inner_margin: "5"
-  vertical_pitch: "187.08"
+  vertical_pitch: "292"
+  down: 7
+  papersize: Letter
+  top_margin: "43"
+  horizontal_pitch: "108"
+  height: "108"
+  source: glabel
+  width: "280.9"
+  left_margin: "9.5"
+Zweckform 32015: 
+  across: 2
+  inner_margin: 5mm
+  vertical_pitch: 91mm
   down: 4
+  top_margin: 31.5mm
   papersize: Letter
-  top_margin: "10"
-  horizontal_pitch: "204.038"
-  height: "204.038"
+  height: 54mm
+  horizontal_pitch: 60mm
   source: glabel
-  width: "180"
-  left_margin: "20.84"
+  left_margin: 17mm
+  width: 85mm
 Encre.com BCV10: 
   across: 2
   inner_margin: "5"
@@ -2997,42 +2973,66 @@ Encre.com BCV10:
   source: glabel
   width: "243.78"
   left_margin: "48.19"
-Zweckform 32015: 
-  across: 2
-  inner_margin: 5mm
-  vertical_pitch: 91mm
+Avery 7164: 
+  across: 3
+  inner_margin: "5"
+  vertical_pitch: "187.08"
   down: 4
-  top_margin: 31.5mm
   papersize: Letter
-  height: 54mm
-  horizontal_pitch: 60mm
+  top_margin: "10"
+  horizontal_pitch: "204.038"
+  height: "204.038"
   source: glabel
-  left_margin: 17mm
-  width: 85mm
-Zweckform 3475: 
+  width: "180"
+  left_margin: "20.84"
+Worldlabel WL-625: 
+  across: 2
+  inner_margin: 0.0625in
+  vertical_pitch: 4.25in
+  down: 5
+  papersize: Letter
+  top_margin: 0.5in
+  horizontal_pitch: 2in
+  height: 2in
+  source: glabel
+  width: 4.25in
+  left_margin: 0in
+Zweckform 3474: 
   across: 3
   inner_margin: "0"
-  vertical_pitch: "198.570"
+  vertical_pitch: 70mm
   down: 8
   papersize: Letter
-  top_margin: "12.566"
-  horizontal_pitch: "102.121"
-  height: "102.121"
+  top_margin: "0"
+  horizontal_pitch: 37mm
+  height: 37mm
   source: glabel
-  width: "198.570"
+  width: 70mm
   left_margin: "0"
-Avery 7165: 
+Connect KF10647: 
+  across: 3
+  inner_margin: 9pt
+  vertical_pitch: 198.425pt
+  down: 8
+  papersize: Letter
+  top_margin: 11.3386pt
+  horizontal_pitch: 104.882pt
+  height: 104.882pt
+  source: glabel
+  width: 198.425pt
+  left_margin: 7.86772e-17pt
+Avery 5159: 
   across: 2
-  inner_margin: 5.66929pt
-  vertical_pitch: 288.113pt
-  down: 4
+  inner_margin: 0.0625in
+  vertical_pitch: 4.1875in
+  down: 7
   papersize: Letter
-  top_margin: 36.9638pt
-  horizontal_pitch: 191.991pt
-  height: 191.991pt
+  top_margin: 0.25in
+  horizontal_pitch: 1.5in
+  height: 1.5in
   source: glabel
-  width: 280.8pt
-  left_margin: 13.2378pt
+  width: 4in
+  left_margin: 0.15625in
 Avery 6141: 
   across: 1
   inner_margin: 4.5pt
@@ -3045,42 +3045,42 @@ Avery 6141:
   source: glabel
   width: 198pt
   left_margin: 4.5pt
-Avery 5159: 
+Avery 7165: 
   across: 2
-  inner_margin: 0.0625in
-  vertical_pitch: 4.1875in
-  down: 7
+  inner_margin: 5.66929pt
+  vertical_pitch: 288.113pt
+  down: 4
   papersize: Letter
-  top_margin: 0.25in
-  horizontal_pitch: 1.5in
-  height: 1.5in
+  top_margin: 36.9638pt
+  horizontal_pitch: 191.991pt
+  height: 191.991pt
   source: glabel
-  width: 4in
-  left_margin: 0.15625in
-Connect KF10647: 
+  width: 280.8pt
+  left_margin: 13.2378pt
+Zweckform 3475: 
   across: 3
-  inner_margin: 9pt
-  vertical_pitch: 198.425pt
+  inner_margin: "0"
+  vertical_pitch: "198.570"
   down: 8
   papersize: Letter
-  top_margin: 11.3386pt
-  horizontal_pitch: 104.882pt
-  height: 104.882pt
+  top_margin: "12.566"
+  horizontal_pitch: "102.121"
+  height: "102.121"
   source: glabel
-  width: 198.425pt
-  left_margin: 7.86772e-17pt
-Zweckform 3477: 
+  width: "198.570"
+  left_margin: "0"
+Avery C32010: 
   across: 2
-  inner_margin: 3.2mm
-  vertical_pitch: 105mm
-  down: 7
-  papersize: Letter
-  top_margin: 4.93mm
-  horizontal_pitch: 41mm
-  height: 41mm
+  inner_margin: 5mm
+  vertical_pitch: 54mm
+  down: 5
+  top_margin: 13mm
+  papersize: A4
+  height: 54mm
+  horizontal_pitch: 95mm
   source: glabel
-  width: 105mm
-  left_margin: 0mm
+  left_margin: 15mm
+  width: 85mm
 Zweckform 32250A: 
   across: 1
   inner_margin: 2mm
@@ -3093,30 +3093,30 @@ Zweckform 32250A:
   source: glabel
   left_margin: 27.5mm
   width: 155mm
-Avery C32010: 
+Zweckform 3477: 
   across: 2
-  inner_margin: 5mm
-  vertical_pitch: 54mm
-  down: 5
-  papersize: A4
-  top_margin: 13mm
-  horizontal_pitch: 95mm
-  height: 54mm
+  inner_margin: 3.2mm
+  vertical_pitch: 105mm
+  down: 7
+  papersize: Letter
+  top_margin: 4.93mm
+  horizontal_pitch: 41mm
+  height: 41mm
   source: glabel
-  width: 85mm
-  left_margin: 15mm
-Southworth BC: 
-  across: 2
+  width: 105mm
+  left_margin: 0mm
+Hema Etiketten: 
+  across: 3
   inner_margin: "5"
-  vertical_pitch: "288"
-  down: 5
+  vertical_pitch: "187"
+  down: 7
   papersize: Letter
-  top_margin: "36"
-  horizontal_pitch: "144"
-  height: "144"
+  top_margin: "49.890"
+  horizontal_pitch: "107"
+  height: "108"
   source: glabel
-  width: "252"
-  left_margin: "36"
+  width: "178"
+  left_margin: "20"
 Avery 5997-Face: 
   across: 2
   inner_margin: "5"
@@ -3129,30 +3129,18 @@ Avery 5997-Face:
   source: glabel
   width: "220"
   left_margin: "80"
-Hema Etiketten: 
-  across: 3
+Southworth BC: 
+  across: 2
   inner_margin: "5"
-  vertical_pitch: "187"
-  down: 7
-  papersize: Letter
-  top_margin: "49.890"
-  horizontal_pitch: "107"
-  height: "108"
-  source: glabel
-  width: "178"
-  left_margin: "20"
-Zweckform 32250B: 
-  across: 1
-  inner_margin: 2mm
-  vertical_pitch: 155mm
-  down: 1
-  top_margin: 21mm
+  vertical_pitch: "288"
+  down: 5
   papersize: Letter
-  height: 122mm
-  horizontal_pitch: 122mm
+  top_margin: "36"
+  horizontal_pitch: "144"
+  height: "144"
   source: glabel
-  left_margin: 27.5mm
-  width: 155mm
+  width: "252"
+  left_margin: "36"
 Avery 7169: 
   across: 2
   inner_margin: "6"
@@ -3165,3 +3153,15 @@ Avery 7169:
   source: glabel
   width: "280.9"
   left_margin: "14.2"
+Zweckform 32250B: 
+  across: 1
+  inner_margin: 2mm
+  vertical_pitch: 155mm
+  down: 1
+  top_margin: 21mm
+  papersize: Letter
+  height: 122mm
+  horizontal_pitch: 122mm
+  source: glabel
+  left_margin: 27.5mm
+  width: 155mm