Browse Source

[metastore] Move navigation bar from beeswax

Still missing breadcrumbs and code still in beeswax but this looks
much better
Romain Rigaux 12 years ago
parent
commit
b8be825

+ 1 - 3
apps/beeswax/src/beeswax/templates/choose_delimiter.mako

@@ -18,12 +18,10 @@ from desktop.views import commonheader, commonfooter
 from django.utils.translation import ugettext as _
 %>
 
-<%namespace name="layout" file="layout.mako" />
 <%namespace name="comps" file="beeswax_components.mako" />
 <%namespace name="util" file="util.mako" />
 
-${ commonheader(_('Create table from file'), app_name, user, '100px') | n,unicode }
-${layout.menubar(section='tables')}
+${ commonheader(_('Create table from file'), 'metastore', user) | n,unicode }
 
 <div class="container-fluid">
     <h1>${_('Create a new table from a file')}</h1>

+ 1 - 3
apps/beeswax/src/beeswax/templates/choose_file.mako

@@ -18,11 +18,9 @@ from desktop.views import commonheader, commonfooter
 from django.utils.translation import ugettext as _
 %>
 
-<%namespace name="layout" file="layout.mako" />
 <%namespace name="comps" file="beeswax_components.mako" />
 
-${ commonheader(_('Create table from file'), app_name, user, '100px') | n,unicode }
-${layout.menubar(section='tables')}
+${ commonheader(_('Create table from file'), 'metastore', user) | n,unicode }
 
 
 <div class="container-fluid">

+ 6 - 6
apps/beeswax/src/beeswax/templates/create_database.mako

@@ -14,17 +14,14 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 <%!
-    from desktop.views import commonheader, commonfooter
-    from django.utils.translation import ugettext as _
+from desktop.views import commonheader, commonfooter
+from django.utils.translation import ugettext as _
 %>
 
 <%namespace name="comps" file="beeswax_components.mako" />
-<%namespace name="layout" file="layout.mako" />
 
-${ commonheader(_("Create database"), app_name, user, '100px') | n,unicode }
-${layout.menubar(section='databases')}
+${ commonheader(_("Create database"), 'metastore', user) | n,unicode }
 
-<script src="/static/ext/js/routie-0.3.0.min.js" type="text/javascript" charset="utf-8"></script>
 
 <div class="container-fluid">
   <h1>${_('Create a new database')}</h1>
@@ -172,6 +169,9 @@ ${layout.menubar(section='databases')}
 
 </div>
 
+
+<script src="/static/ext/js/routie-0.3.0.min.js" type="text/javascript" charset="utf-8"></script>
+
 <script type="text/javascript" charset="utf-8">
 $(document).ready(function () {
   // Routing

+ 3 - 5
apps/beeswax/src/beeswax/templates/create_table_manually.mako

@@ -14,15 +14,13 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 <%!
-    from desktop.views import commonheader, commonfooter
-    from django.utils.translation import ugettext as _
+from desktop.views import commonheader, commonfooter
+from django.utils.translation import ugettext as _
 %>
 
 <%namespace name="comps" file="beeswax_components.mako" />
-<%namespace name="layout" file="layout.mako" />
 
-${ commonheader(_("Create table manually"), app_name, user, '100px') | n,unicode }
-${layout.menubar(section='tables')}
+${ commonheader(_("Create table manually"), 'metastore', user) | n,unicode }
 
 <div class="container-fluid">
 <h1>${_('Create a new table manually')}</h1>

+ 1 - 3
apps/beeswax/src/beeswax/templates/define_columns.mako

@@ -18,12 +18,10 @@ from desktop.views import commonheader, commonfooter
 from django.utils.translation import ugettext as _
 %>
 
-<%namespace name="layout" file="layout.mako" />
 <%namespace name="comps" file="beeswax_components.mako" />
 <%namespace name="util" file="util.mako" />
 
-${ commonheader(_('Create table from file'), app_name, user, '100px') | n,unicode }
-${layout.menubar(section='tables')}
+${ commonheader(_('Create table from file'), 'metastore', user) | n,unicode }
 
 <div class="container-fluid">
     <h1>${_('Create a new table from a file')}</h1>