Merged [3245] from rjsparks@nostrum.com:

Removes the "Change State" button and makes changing state a link further up on the form.
This fixes bug 683, but creates a new one that we will need to address later - editing the state
of an RFC that is going through the iesg process again (for going to draft in place for example) will need followup once the changes to get an rfc into that state easily are made.
 - Legacy-Id: 3256
Note: SVN reference [3245] has been migrated to Git commit af7e3d6

Author: levkowetz

ietf/templates/idrfc/doc_tab_document.html

@@ -57,8 +57,6 @@
 {% endif %}
 {% else %}
 {% if doc.in_ietf_process %}
-<span id="doc_edit_state_button" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="{% url doc_change_state name=doc.draft_name %}">Change state</a></span></span>
-
 <span id="doc_edit_info_button" class="yui-button yui-link-button" style="margin-left:2px;">{% url doc_edit_info name=doc.draft_name as doc_edit_url %}{% if doc_edit_url %}<span class="first-child"><a href="{{doc_edit_url}}">Edit</a></span>{% endif %}</span>
 {% else %}
 <span id="doc_add_button" class="yui-button yui-link-button" style="margin-left:2px;">{% url doc_edit_info name=doc.draft_name as doc_edit_url %}{% if doc_edit_url %}<span class="first-child"><a href="{{doc_edit_url}}">Add</a></span>{% endif %}</span>

ietf/templates/idrfc/doc_tab_document_id.html

@@ -90,7 +90,12 @@
 <tr><td colspan='2'><hr size='1' noshade /></td></tr>
 
 
-<tr><td><a href="/idtracker/help/state/">IESG State</>:</td><td> {{ doc.friendly_state|safe }} 
+<tr><td><a href="/idtracker/help/state/">IESG State</>:</td><td>
+{% if user|in_group:"Area_Director,Secretariat" %}
+<a href="{% url doc_change_state name=doc.draft_name %}"> {{ doc.friendly_state|safe }} </a>
+{% else %}
+ {{ doc.friendly_state|safe }} 
+{% endif %}
 {% if doc.rfc_editor_state %}<br />RFC Editor State: <a href="http://www.rfc-editor.org/queue2.html#{{doc.draft_name}}">{{ doc.rfc_editor_state|escape }}</a>{% endif %}
 {% ifequal doc.draft_status "Expired" %}
 {% if doc.resurrect_requested_by %}(resurrect requested by {{ doc.resurrect_requested_by }}){% endif %}