slice/explore header (#996)

* move slice header to partial, show datasource in slice title area if no slice is saved * change partial name, and use same styling as slice title * use jinja style guide spacing rule * use [datasource] - untitled
apache · Aug 25, 2016 · 36a6714 · 36a6714
1 parent 30071ee
commit 36a6714
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 30 deletions.
diff --git a/caravel/templates/caravel/explore.html b/caravel/templates/caravel/explore.html
@@ -188,36 +188,7 @@
             <div class="panel-title">
               <div class="row">
                 <div class="col-md-6">
-                  {% if slice %}
-                    {% if slice.slice_name %}
-                      <h2>
-                        {{ slice.slice_name }}
-                        <small class="star-edit-icons">
-                          <span class="favstar" obj_id="{{ slice.id }}"></span>
-                          <span>
-                            <a
-                              href="/slicemodelview/edit/{{ slice.id }}"
-                              data-toggle="tooltip"
-                              title="Edit Description"
-                              class="edit-slice-description-icon"
-                            >
-                              {% if slice.description %}
-                                <i
-                                  class="fa fa-question-circle-o"
-                                  data-toggle="tooltip"
-                                  data-placement="bottom"
-                                  title="{{ slice.description }}">
-                                </i>
-                              {% endif %}
-                              <i class="fa fa-edit"></i>
-                            </a>
-                          </span>
-                        </small>
-                      </h2>
-                    {% else %}
-                      <h2>untitled</h2>
-                    {% endif %}
-                  {% endif %}
+                  {% include 'caravel/partials/_explore_title.html' %}
                 </div>
                 <div class="col-md-6">
                   <div class="slice-meta-controls pull-right">

diff --git a/caravel/templates/caravel/partials/_explore_title.html b/caravel/templates/caravel/partials/_explore_title.html
@@ -0,0 +1,30 @@
+{% if slice %}
+  {% if slice.slice_name %}
+    <h2>
+      {{ slice.slice_name }}
+      <small class="star-edit-icons">
+        <span class="favstar" obj_id="{{ slice.id }}"></span>
+        <span>
+          <a
+            href="/slicemodelview/edit/{{ slice.id }}"
+            data-toggle="tooltip"
+            title="Edit Description"
+            class="edit-slice-description-icon"
+          >
+            {% if slice.description %}
+              <i
+                class="fa fa-question-circle-o"
+                data-toggle="tooltip"
+                data-placement="bottom"
+                title="{{ slice.description }}">
+              </i>
+            {% endif %}
+            <i class="fa fa-edit"></i>
+          </a>
+        </span>
+      </small>
+    </h2>
+  {% endif %}
+{% else %}
+  <h2>[{{ viz.datasource.table_name }}] - untitled</h2>
+{% endif %}