Skip to content
Snippets Groups Projects
Commit 937cd5c1 authored by Kyle Doherty's avatar Kyle Doherty
Browse files

cleanup

parent 074f3cf3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 64 additions and 63 deletions
resources/frontend_client/app/admin/databases/partials/database_list.html
+ 12
− 16
View file @ 937cd5c1
<div class="wrapper">
<div class="py2 border-bottom">
<section class="wrapper">
<div class="py2">
<div class="float-right">
<a class="Button Button--primary" cv-org-href="/admin/databases/create">Add Database</a>
</div>
......@@ -7,21 +7,17 @@
</div>
<div>
<div ng-if="!databases">
<h3 class="text-normal text-centered">Loading ...</h3>
</div>
<div ng-if="!databases">
<h3 class="text-normal text-centered">Loading ...</h3>
</div>
<ul>
<li class="py2 border-bottom" ng-repeat="database in databases">
<div class="my1 float-right">
<a class="Button" ng-click="delete(database.id)" delete-confirm>Delete</a>
</div>
<ul class="bordered rounded bg-white shadowed">
<li class="py2 clearfix" ng-repeat="database in databases">
<a class="Button my1 float-right" ng-click="delete(database.id)" delete-confirm>Delete</a>
<div>
<h4><a class="link" cv-org-href="/admin/databases/{{database.id}}">{{database.name}}</a></h4>
<span>{{database.engine}}</span>
</div>
<h4><a class="link" cv-org-href="/admin/databases/{{database.id}}">{{database.name}}</a></h4>
<span>{{database.engine}}</span>
</li>
</ul>
</ul>
</div>
</div>
</section>
resources/frontend_client/app/admin/datasets/partials/dataset_list.html
+ 10
− 9
View file @ 937cd5c1
<div class="wrapper">
<section class="wrapper">
<div ng-repeat="db in databases">
<div class="py2 border-bottom">
<div class="py2 clearfix">
<div class="float-right">
<a class="Button Button--primary" ng-click="syncDatabase(db.id)">Re-Sync Database</a>
</div>
<h2>{{db.name}}</h2>
</div>
<ul>
<li class="py2 border-bottom" ng-repeat="table in db.tables">
<h4><a class="EntityListItem" ng-class="{ EditedEntity: table.entity_name, EditedEntityMarker: table.entity_name }" cv-org-href="/admin/datasets/{{table.id}}">
<span class="ModifiedEntity">{{table.entity_name}}</span>
<span ng-if="!table.entity_name">{{table.name}}</span>
</a>
<ul class="bg-white bordered rounded shadowed">
<li class="p2 border-bottom" ng-repeat="table in db.tables">
<h4>
<a class="EntityListItem link" ng-class="{ EditedEntity: table.entity_name, EditedEntityMarker: table.entity_name }" cv-org-href="/admin/datasets/{{table.id}}">
<span class="ModifiedEntity">{{table.entity_name}}</span>
<span ng-if="!table.entity_name">{{table.name}}</span>
</a>
</h4>
</li>
</ul>
</div>
</div>
</section>
resources/frontend_client/app/admin/emailreport/partials/emailreport_detail.html
+ 3
− 4
View file @ 937cd5c1
<div class="wrapper">
<form class="Form" novalidate>
<section class="wrapper">
<form novalidate>
<div class="py2 border-bottom">
<h2>Email Report</h2>
......@@ -111,4 +110,4 @@
</div>
</div>
</form>
</div>
</section>
resources/frontend_client/app/admin/people/partials/people.html
+ 7
− 12
View file @ 937cd5c1
<div class="wrapper">
<div ng-cloak>
<alert class="alert" ng-repeat="alert in alerts" type="{{alert.type}}" close="closeAlert($index)" ng-animate=" 'animate' " cv-delayed-call="closeAlert($index)">{{alert.msg}}</alert>
</div>
<div class="clearfix">
<a class="Button float-right" cv-admin-create-user organization="currentOrg" callback="createdUser">Add teammate</a>
<a class="Button Button--primary float-right" cv-admin-create-user organization="currentOrg" callback="createdUser">Add teammate</a>
<h2>People</h2>
</div>
<ul class="List">
<ul class="bordered bg-white shadowed rounded">
<li class="List-item List-section clearfix" ng-repeat="perm in people">
<div class="float-right">
<a class="Button" ng-if="perm.admin" ng-click="revokeAdmin($index)">Revoke Admin</a>
<a class="Button" ng-if="!perm.admin" ng-click="grantAdmin($index)">Grant Admin</a>
<a class="Button" cv-org-href="/admin/people/{{perm.user.id}}/modify" >Edit</a>
<a class="Button" cv-org-href="/admin/people/{{perm.user.id}}/change_password" >Change password</a>
<a class="Button" ng-click="removeMember(perm.user.id)" delete-confirm>x</a>
</div>
<h4>{{perm.user.common_name}} ({{perm.user.email}})</h4>
<span ng-if="perm.admin">Administrator</span>
<span ng-if="!perm.admin">Member</span>
<h4 class="inline-block">
<a class="link" cv-org-href="/admin/people/{{perm.user.id}}/modify">{{perm.user.common_name}}</a>
</h4>
<span class="User-perms inline-block" ng-if="perm.admin">Admin</span>
</li>
</ul>
</div>
resources/frontend_client/app/admin/people/partials/user_edit.html
+ 8
− 4
View file @ 937cd5c1
<div>
<div class="Form-group border-bottom clearfix">
<section class="wrapper">
<div>
<h3 class="text-normal">Edit teammate</h3>
</div>
<div ng-cloak>
<alert class="alert" ng-repeat="alert in alerts" type="{{alert.type}}" close="closeAlert($index)" ng-animate=" 'animate' " cv-delayed-call="closeAlert($index)">{{alert.msg}}</alert>
</div>
<form name="editUserAdmin" novalidate ng-submit="submit()" cv-form="user">
<form name="editUserAdmin" novalidate ng-submit="submit()">
<div class="clearfix">
<div class="Form-group" cv-error-flag="first_name">
<input class="input block full" ng-model="user.first_name" type="text" name="first_name" placeholder="First Name" autofocus>
......@@ -20,9 +20,13 @@
<input class="input block full" ng-model="user.email" type="email" name="email" placeholder="Email address" required>
<fielderrors for="email"></fielderrors>
</div>
<a class="Button" ng-if="perm.admin" ng-click="revokeAdmin($index)">Revoke Admin</a>
<a class="Button" ng-if="!perm.admin" ng-click="grantAdmin($index)">Grant Admin</a>
<a class="Button" cv-org-href="/admin/people/{{perm.user.id}}/change_password" >Change password</a>
<a class="Button" ng-click="removeMember(perm.user.id)" delete-confirm>x</a>
</div>
<div class="Form-group border-top clearfix">
<button class="Button Button--primary float-right" type="submit" ng-disabled="!form.$dirty || form.$invalid">Save changes</button>
</div>
</form>
</div>
</section>
resources/frontend_client/app/admin/query/partials/query_run.html
+ 0
− 1
View file @ 937cd5c1
......@@ -6,7 +6,6 @@
<h2>Run Query</h2>
<div class="py1">
<label for="id_sql">SQL:</label>
<cv-ace-sql-editor sql="query.sql" database="query.database" onload="onEditorLoaded"></cv-ace-sql-editor>
</div>
......
resources/frontend_client/app/controllers.js
+ 14
− 7
View file @ 937cd5c1
......@@ -124,16 +124,23 @@ CorvusControllers.controller('Unauthorized', ['$scope', '$location', function($s
CorvusControllers.controller('Nav', ['$scope', '$routeParams', '$location', function($scope, $routeParams, $location) {
$scope.nav = 'main'
$scope.nav = 'main';
$scope.activeClass = 'is--selected';
$scope.isActive = function (location) {
var active = ($location.path().indexOf(location) > 0);
return active;
}
$scope.$on('$routeChangeSuccess', function () {
if($routeParams.orgSlug && $location.path().indexOf('admin') > 0) {
$scope.nav = 'admin'
} else if ($location.path().indexOf('setup') >0 ) {
$scope.nav = 'setup'
} else if ($location.path().indexOf('superadmin') >0 ) {
$scope.nav = 'superadmin'
$scope.nav = 'admin';
} else if ($location.path().indexOf('setup') > 0) {
$scope.nav = 'setup';
} else if ($location.path().indexOf('superadmin') > 0) {
$scope.nav = 'superadmin';
} else {
$scope.nav = 'main'
$scope.nav = 'main';
}
});
}]);
resources/frontend_client/app/css/core/base.css
+ 1
− 0
View file @ 937cd5c1
......@@ -11,6 +11,7 @@ body {
font-family: var(--default-font-family), "Helvetica Neue", Helvetica, sans-serif;
font-size: var(--default-font-size);
margin: 0;
box-sizing: border-box;
}
/*
......
resources/frontend_client/app/explore/partials/database_list.html
+ 1
− 2
View file @ 937cd5c1
<div class="wrapper">
<div class="col col-sm-12">
<div class="row">
<div ng-repeat="(dbId, database) in databases">
<div class="mt2 py2 col col-sm-12 clearfix">
......@@ -10,7 +9,7 @@
other tables</a>
<h2>Explore {{database.name}}</h2>
</div>
<ul class="border-top col col-sm-12 clearfix">
<ul class="bordered rounded bg-white clearfix">
<li class="border-bottom py2" ng-repeat="table in database.entities">
<span class="float-right text-grey-3 mt2">{{table.rows}} rows</span>
<h3 class="text-normal text-brand mt2 mb0">
......
resources/frontend_client/index.html
+ 8
− 8
View file @ 937cd5c1
......@@ -95,14 +95,14 @@
</div>
</div>
<section class="mt2 wrapper">
<a class="NavItem" cv-org-href="/admin/people/">People</a>
<a class="NavItem" cv-org-href="/admin/databases">Databases</a>
<a class="NavItem" cv-org-href="/admin/datasets">Datasets</a>
<a class="NavItem" cv-org-href="/admin/emailreport/">Email Reports</a>
<a class="NavItem" cv-org-href="/admin/query/run">Run Query</a>
<a class="NavItem" cv-org-href="/admin/query/">Saved Queries</a>
<a class="NavItem" cv-org-href="/admin/search">Search</a>
<a class="NavItem" cv-org-href="/admin/settings">Settings</a>
<a class="NavItem" ng-class="{ 'is--selected' : isActive('/admin/people')}" cv-org-href="/admin/people/">People</a>
<a class="NavItem" ng-class="{ 'is--selected' : isActive('/admin/databases')}" cv-org-href="/admin/databases">Databases</a>
<a class="NavItem" ng-class="{ 'is--selected' : isActive('/admin/datasets')}" cv-org-href="/admin/datasets">Datasets</a>
<a class="NavItem" ng-class="{ 'is--selected' : isActive('/admin/emailreport')}" cv-org-href="/admin/emailreport/">Email Reports</a>
<a class="NavItem" ng-class="{ 'is--selected' : isActive('/admin/query/run')}"cv-org-href="/admin/query/run">Run Query</a>
<a class="NavItem" ng-class="{ 'is--selected' : isActive('/admin/query')}" cv-org-href="/admin/query/">Saved Queries</a>
<a class="NavItem" ng-class="{ 'is--selected' : isActive('/admin/search')}" cv-org-href="/admin/search">Search</a>
<a class="NavItem" ng-class="{ 'is--selected' : isActive('/admin/settings')}" cv-org-href="/admin">Settings</a>
</section>
</div>
</nav>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment