[bugzilla-gnome-org-customizations/production] attachment status: Refactor status combobox

[Krzesimir Nowak <krnowak src gnome org>]

commit ae0d31560242b7b8b2234812e9daa44d394e6d8f
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Mon Feb 2 16:00:59 2015 +0100

    attachment status: Refactor status combobox
    
    This simply puts combobox code into separate template. We will reuse
    it in different place later.

 .../default/gnomeattachmentstatus/combo.html.tmpl  |   24 ++++++++++++++++++++
 .../edit-editable_hidden_content.html.tmpl         |   21 ++++-------------
 2 files changed, 29 insertions(+), 16 deletions(-)
---
diff --git a/extensions/GnomeAttachmentStatus/template/en/default/gnomeattachmentstatus/combo.html.tmpl 
b/extensions/GnomeAttachmentStatus/template/en/default/gnomeattachmentstatus/combo.html.tmpl
new file mode 100644
index 0000000..6c526e2
--- /dev/null
+++ b/extensions/GnomeAttachmentStatus/template/en/default/gnomeattachmentstatus/combo.html.tmpl
@@ -0,0 +1,24 @@
+[%
+# enabled - whether the combo is initially enabled
+# current_status - current attachment status
+# statuses - list of all statuses
+#
+# it expects that a "is patch" checkbox has an "ispatch" id
+%]
+
+[% gnome_attachment_js_url = 'extensions/GnomeAttachmentStatus/web/gnome_attachment_status.js' -%]
+<script type="text/javascript" src="[% gnome_attachment_js_url FILTER mtime FILTER html %]"></script>
+<div id="attachment_gnome_attachment_status_combo">
+  <input type="hidden" value="none" id="gnome_attachment_status_hidden" name="gnome_attachment_status" [% IF 
enabled %] disabled [% END %]/>
+  <b><label for="gnome_attachment_status">Status</label>:</b>
+  <select id="gnome_attachment_status_combo" name="gnome_attachment_status"
+            [% UNLESS enabled %] disabled [% END %]>
+    [%- FOREACH gnome_attachment_status = statuses %]
+    <option value="[% gnome_attachment_status.value FILTER html %]"
+      [%= IF current_status == gnome_attachment_status.value ~%]
+            selected
+      [%~ END ~%]
+    >[% display_value("attachments.gnome_attachment_status", gnome_attachment_status.value) %]</option>
+    [%- END %]
+  </select>
+</div>
diff --git 
a/extensions/GnomeAttachmentStatus/template/en/default/hook/attachment/edit-editable_hidden_content.html.tmpl 
b/extensions/GnomeAttachmentStatus/template/en/default/hook/attachment/edit-editable_hidden_content.html.tmpl
index e860263..7a268c0 100644
--- 
a/extensions/GnomeAttachmentStatus/template/en/default/hook/attachment/edit-editable_hidden_content.html.tmpl
+++ 
b/extensions/GnomeAttachmentStatus/template/en/default/hook/attachment/edit-editable_hidden_content.html.tmpl
@@ -1,16 +1,5 @@
-[% gnome_attachment_js_url = 'extensions/GnomeAttachmentStatus/web/gnome_attachment_status.js' -%]
-<script type="text/javascript" src="[% gnome_attachment_js_url FILTER mtime FILTER html %]"></script>
-<div id="attachment_gnome_attachment_status_combo">
-  <input type="hidden" value="none" id="gnome_attachment_status_hidden" name="gnome_attachment_status" [% IF 
attachment.ispatch %] disabled [% END %]/>
-  <b><label for="gnome_attachment_status">Status</label>:</b>
-  <select id="gnome_attachment_status_combo" name="gnome_attachment_status"
-            [% UNLESS attachment.ispatch %] disabled [% END %]>
-    [%- FOREACH gnome_attachment_status = all_gnome_attachment_status_values %]
-    <option value="[% gnome_attachment_status.value FILTER html %]"
-      [%= IF attachment.gnome_attachment_status == gnome_attachment_status.value ~%]
-            selected
-      [%~ END ~%]
-    >[% display_value("attachments.gnome_attachment_status", gnome_attachment_status.value) %]</option>
-    [%- END %]
-  </select>
-</div>
+[% INCLUDE gnomeattachmentstatus/combo.html.tmpl
+    enabled = attachment.ispatch
+    current_status = attachment.gnome_attachment_status
+    statuses = all_gnome_attachment_status_values
+%]