Skip to content
Snippets Groups Projects
Commit 69a70326 authored by Allen Gilliland's avatar Allen Gilliland
Browse files

few fixes to database admin after latest updates from master.

parent cb7c6b75
No related branches found
No related tags found
No related merge requests found
......@@ -5,23 +5,23 @@ var AdminDatabases = angular.module('corvusadmin.databases', [
]);
AdminDatabases.config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/:orgSlug/admin/databases', {
$routeProvider.when('/admin/databases', {
templateUrl: '/app/admin/databases/partials/database_list.html',
controller: 'DatabaseList'
});
$routeProvider.when('/:orgSlug/admin/databases/create', {
$routeProvider.when('/admin/databases/create', {
templateUrl: '/app/admin/databases/partials/database_edit.html',
controller: 'DatabaseEdit'
});
$routeProvider.when('/:orgSlug/admin/databases/:databaseId', {
redirectTo: '/:orgSlug/admin/databases/:databaseId/tables'
$routeProvider.when('/admin/databases/:databaseId', {
redirectTo: '/admin/databases/:databaseId/tables'
});
$routeProvider.when('/:orgSlug/admin/databases/:databaseId/:mode', {
$routeProvider.when('/admin/databases/:databaseId/:mode', {
templateUrl: '/app/admin/databases/partials/database_master_detail.html',
controller: 'DatabaseMasterDetail'
});
$routeProvider.when('/:orgSlug/admin/databases/:databaseId/:mode/:tableId', {
$routeProvider.when('/admin/databases/:databaseId/:mode/:tableId', {
templateUrl: '/app/admin/databases/partials/database_master_detail.html',
controller: 'DatabaseMasterDetail'
});
......
<div class="wrapper">
<section class="PageHeader clearfix">
<a class="Button Button--primary float-right" cv-org-href="/admin/databases/create">Add database</a>
<a class="Button Button--primary float-right" href="/admin/databases/create">Add database</a>
<h2 class="PageTitle">Databases</h2>
</section>
......@@ -22,7 +22,7 @@
</tr>
<tr ng-repeat="database in databases">
<td>
<a class="text-bold link" cv-org-href="/admin/databases/{{database.id}}/tables">{{database.name}}</a>
<a class="text-bold link" href="/admin/databases/{{database.id}}/tables">{{database.name}}</a>
</td>
<td>
{{database.engine}}
......
......@@ -2,8 +2,8 @@
<section class="my3 clearfix">
<div class="py2 float-right">
<div class="Button-group Button-group--blue text-uppercase text-bold">
<a class="Button AdminHoverItem" ng-class="{ 'Button--active': pane == 'tables' }" cv-org-href="/admin/databases/{{database.id}}/tables/{{table.id}}">Data</a>
<a class="Button AdminHoverItem" ng-class="{ 'Button--active': pane == 'settings' }" cv-org-href="/admin/databases/{{database.id}}/settings">Connection Details</a>
<a class="Button AdminHoverItem" ng-class="{ 'Button--active': pane == 'tables' }" href="/admin/databases/{{database.id}}/tables/{{table.id}}">Data</a>
<a class="Button AdminHoverItem" ng-class="{ 'Button--active': pane == 'settings' }" href="/admin/databases/{{database.id}}/settings">Connection Details</a>
</div>
</div>
<h3 class="py2">{{database.name}}</h2>
......
......@@ -9,7 +9,7 @@
<h3>Loading ...</h3>
</li>
<li class="DatabaseListItem AdminHoverItem rounded py1 px2 text-grey-4" ng-class="{ 'DatabaseListItem--active': t.id == table.id }" ng-repeat="t in tables | filter:tableSearchText">
<a class="link link--nohover text-current" cv-org-href="/admin/databases/{{database.id}}/tables/{{t.id}}">
<a class="link link--nohover text-current" href="/admin/databases/{{database.id}}/tables/{{t.id}}">
<h4>{{t.name}}</h4>
</a>
</li>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment