Hide logical date and run id in trigger UI form

airflow/www/templates/airflow/trigger.html

@@ -158,23 +158,11 @@ <h2>
     Trigger DAG: <a href="{{ url_for('Airflow.'+ dag.get_default_view(), dag_id=dag.dag_id) }}">{{ dag.dag_id }}</a>
     <small class="text-muted">{{ dag.description[0:150] + '…' if dag.description and dag.description|length > 150 else dag.description|default('', true) }}</small>
   </h2>
-  {{ dag_docs(doc_md) }}
+  {{ dag_docs(doc_md, False) }}
   <form method="POST" id="trigger_form">
     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
     <input type="hidden" name="dag_id" value="{{ dag_id }}">
     <input type="hidden" name="origin" value="{{ origin }}">
-    <div class="form-group">
-      <label for="execution_date">Logical date</label>
-      <div class="input-group">
-        {{ form.execution_date(class_="form-control", disabled=False) }}
-      </div>
-    </div>
-    <div class="form-group row">
-      <div class="col-md-2">
-        <label for="run_id">Run id (Optional)</label>
-        <input type="text" class="form-control" placeholder="Run ID" name="run_id">
-      </div>
-    </div>
     {% if recent_confs|length > 0 %}
     <div class="form-group row">
       <div class="col-md-2">
@@ -243,19 +231,55 @@ <h4 class="panel-title">
           <div class="panel panel-default">
             <div class="panel-heading">
               <h4 class="panel-title">
-                <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion_json_conf" href="#accordion_json_conf_href" data-original-title="" title="" id="generated_json_toggle">Generated Configuration JSON<span class="caret"></span></a>
+                <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion_json_conf" href="#accordion_json_conf_href" data-original-title="" title="" id="generated_json_toggle">Generated Configuration JSON and Dagrun Options<span class="caret"></span></a>
               </h4>
             </div>
             <div id="accordion_json_conf_href" class="panel-collapse collapse">
               <div class="panel-body">
-                <textarea name="conf" id="json">{{ conf }}</textarea>
+                <table class="table table-hover table-bordered">
+                  <tbody>
+                    <tr>
+                      <td class="col-lg-2">
+                        <label for="execution_date" control-label="">Logical date:</label>
+                      </td>
+                      <td>
+                        {{ form.execution_date(class_="form-control", disabled=False) }}
+                      </td>
+                    </tr>
+                    <tr>
+                      <td class="col-lg-2">
+                        <label for="run_id" control-label="">Run id:</label>
+                      </td>
+                      <td>
+                        <input type="text" class="form-control" placeholder="Run id, optional - will be generated if not provided" name="run_id" id="run_id">
+                      </td>
+                    </tr>
+                    <tr>
+                      <td colspan="2">
+                        <textarea name="conf" id="json">{{ conf }}</textarea>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
               </div>
             </div>
           </div>
         </div>
       </div>
     </div>
     {%- else %}
+    <div class="form-group">
+      <label for="execution_date">Logical date</label>
+      <div class="input-group">
+        {{ form.execution_date(class_="form-control", disabled=False) }}
+      </div>
+    </div>
+    <div class="form-group row">
+      <div class="col-md-2">
+        <label for="run_id">Run id (Optional)</label>
+        <input type="text" class="form-control" placeholder="Run ID" name="run_id">
+      </div>
+    </div>
     <label for="conf">Configuration JSON (Optional, must be a dict object)</label>
     <textarea class="form-control" name="conf" id="json">{{ conf }}</textarea>
     {%- endif %}

airflow/www/templates/appbuilder/dag_docs.html

@@ -17,20 +17,20 @@
  under the License.
 #}
 
-{% macro dag_docs(doc_md) %}
+{% macro dag_docs(doc_md, folded=True) %}
   {% if doc_md is defined and doc_md is not none %}
     <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true" style="margin-top: 16px;">
-      <div class="panel panel-default">
+      <div class="panel panel-primary">
         <div class="panel-heading" role="tab" id="headingOne">
           <h4 class="panel-title">
-            <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne" class="accordion-toggle collapsed">
-              <span class="material-icons" aria-hidden="true">info_outline</span>
+            <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne"{% if folded %}  class="accordion-togglecollapsed{% endif %}">
+              {% if folded %}<span class="material-icons" aria-hidden="true">info_outline</span>{% endif %}
               DAG Docs
-              <span class="material-icons pull-right toggle-direction" aria-hidden="true">expand_less</span>
+              {% if folded %}<span class="material-icons pull-right toggle-direction" aria-hidden="true">expand_less</span>{% endif %}
             </a>
           </h4>
         </div>
-        <div id="collapseOne" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+        <div id="collapseOne" class="panel-collapse{% if folded %} collapse{% endif %}" role="tabpanel" aria-labelledby="headingOne">
           <div class="panel-body">
             {{ doc_md }}
           </div>