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

more cleanup

parent 937cd5c1
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 76 additions and 70 deletions
resources/frontend_client/app/admin/databases/partials/database_list.html
+ 5
− 5
View file @ 0ca0e3a0
......@@ -12,11 +12,11 @@
</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>
<h4><a class="link" cv-org-href="/admin/databases/{{database.id}}">{{database.name}}</a></h4>
<span>{{database.engine}}</span>
<li class="p2 clearfix" ng-repeat="database in databases">
<h4 class="inline-block">
<a class="link" cv-org-href="/admin/databases/{{database.id}}">{{database.name}}</a>
</h4>
<span class="inline-block">{{database.engine}}</span>
</li>
</ul>
</div>
......
resources/frontend_client/app/admin/emailreport/partials/emailreport_detail.html
+ 35
− 35
View file @ 0ca0e3a0
<section class="wrapper">
<form novalidate>
<div class="py2 border-bottom">
<h2>Email Report</h2>
<div class="py1 float-right">
<div>
<label class="block">Mode:</label>
<div class="Button-group">
<a class="Button" ng-repeat="mode in form_input.modes" ng-class="{ 'Button--selected' : report.mode == mode.id }" ng-model="report.mode" btn-radio="mode.id">{{mode.name}}</a>
<h2 class="py2">New Email Report</h2>
<form novalidate class="bg-white bordered rounded shadowed">
<div class="p4 border-bottom">
<div class="py1 float-right">
<div>
<label class="block">Mode:</label>
<div class="Button-group">
<a class="Button" ng-repeat="mode in form_input.modes" ng-class="{ 'Button--selected' : report.mode == mode.id }" ng-model="report.mode" btn-radio="mode.id">{{mode.name}}</a>
</div>
</div>
<div class="py2">
<label class="block">Permissions:</label>
<div class="Select block">
<select class="block" ng-model="report.public_perms" ng-options="perm.id as perm.name for perm in form_input.permissions">
</select>
</div>
</div>
</div>
</div>
<div class="py2">
<label class="block">Permissions:</label>
<div class="Select block">
<select class="block" ng-model="report.public_perms" ng-options="perm.id as perm.name for perm in form_input.permissions">
</select>
<div class="py1">
<label >Report Name:</label>
<input class="input block" size="80" maxlength="255" type="text" ng-model="report.name"/>
</div>
</div>
</div>
<div class="py1">
<label >Report Name:</label>
<input class="input block" size="80" maxlength="255" type="text" ng-model="report.name"/>
</div>
<div class="py1">
<label >Description:</label>
<input class="input block" size="80" maxlength="255" type="text" ng-model="report.description"/>
<div class="py1">
<label >Description:</label>
<input class="input block" size="80" maxlength="255" type="text" ng-model="report.description"/>
</div>
</div>
</div>
<div class="py2 border-bottom">
<h2>Recipients</h2>
<div class="p4 border-bottom">
<h3>Recipients</h3>
<div class="py1">
<label >Team Members:</label>
<table class="Table">
<table class="Table bordered bg-white">
<tr ng-repeat="user in form_input.users">
<td><input type="checkbox" ng-model="user.incl" /></td>
<td class="full">{{user.name}}</td>
......@@ -50,10 +50,10 @@
</div>
</div>
<div class="py2 border-bottom">
<h2>Data</h2>
<div class="p4 border-bottom">
<h3>Data</h3>
<div class="py1">
<div class="py1 inline-block mr3">
<label class="block">Database:</label>
<div class="Select block">
<select class="block" ng-model="report.dataset_query.database" ng-options="db.id as db.name for db in form_input.databases" ng-change="refreshTableList(report.dataset_query.database)">
......@@ -61,7 +61,7 @@
</div>
</div>
<div class="py1">
<div class="py1 inline-block">
<label class="block">Table:</label>
<div class="Select block">
<select class="block" ng-model="report.dataset_query.query.source_table" ng-options="tbl.id as tbl.name for tbl in tables">
......@@ -70,8 +70,8 @@
</div>
</div>
<div class="py1">
<h2>Schedule</h2>
<div class="p4">
<h3>Schedule</h3>
<div class="Button-group">
<label class="Button" ng-class="{ 'Button--selected' : report.schedule.days_of_week[day.id] }" ng-model="report.schedule.days_of_week[day.id]" ng-repeat="day in form_input.days_of_week" btn-checkbox>{{day.name}}</label>
......
resources/frontend_client/app/admin/people/partials/people.html
+ 1
− 1
View file @ 0ca0e3a0
......@@ -4,7 +4,7 @@
<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">
<div class="py2 clearfix">
<a class="Button Button--primary float-right" cv-admin-create-user organization="currentOrg" callback="createdUser">Add teammate</a>
<h2>People</h2>
</div>
......
resources/frontend_client/app/admin/people/partials/user_edit.html
+ 25
− 23
View file @ 0ca0e3a0
<section class="wrapper">
<div>
<h3 class="text-normal">Edit teammate</h3>
<div class="py2">
<h2 class="text-normal">Edit teammate</h2>
</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()">
<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>
<fielderrors for="first_name"></fielderrors>
<div class="bg-white bordered rounded shadowed">
<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>
<fielderrors for="first_name"></fielderrors>
</div>
<div class="Form-group" cv-error-flag="last_name">
<input class="input block full" ng-model="user.last_name" type="text" name="last_name" placeholder="Last Name">
<fielderrors for="last_name"></fielderrors>
</div>
<div class="Form-group" cv-error-flag="email">
<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" cv-error-flag="last_name">
<input class="input block full" ng-model="user.last_name" type="text" name="last_name" placeholder="Last Name">
<fielderrors for="last_name"></fielderrors>
<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>
<div class="Form-group" cv-error-flag="email">
<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>
</form>
</div>
</section>
resources/frontend_client/app/admin/query/partials/query_run.html
+ 4
− 3
View file @ 0ca0e3a0
<div class="wrapper">
<form id="query_form" novalidate>
<form novalidate>
<input type="hidden" name="q" value="{{queryResultData.uuid}}" ng-if="queryResultData"/>
<div class="py2">
<h2>Run Query</h2>
<div class="py1">
<cv-ace-sql-editor sql="query.sql" database="query.database" onload="onEditorLoaded"></cv-ace-sql-editor>
<div class="bordered bg-white">
<cv-ace-sql-editor sql="query.sql" database="query.database" onload="onEditorLoaded">
</cv-ace-sql-editor>
</div>
<div class="">
......
resources/frontend_client/app/css/admin.css
+ 4
− 0
View file @ 0ca0e3a0
#id_sql {
height: 200px;
}
.AdminNav .NavItem {
padding: 1.5em 1em;
}
resources/frontend_client/app/css/core/headings.css
+ 1
− 2
View file @ 0ca0e3a0
......@@ -16,7 +16,7 @@ h5,
h6,
.h6 {
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-webkit-font-smoothing: subpixel-antialiased;
margin-top: var(--default-header-margin);
margin-bottom: var(--default-header-margin);
color: var(--default-header-text-color);
......@@ -29,4 +29,3 @@ h6,
.h4 { font-size: 1.12em; }
.h5 { font-size: .83em; }
.h6 { font-size: .75em; }
resources/frontend_client/index.html
+ 1
− 1
View file @ 0ca0e3a0
......@@ -94,7 +94,7 @@
<a class="link" cv-org-href="/">Exit Admin</a>
</div>
</div>
<section class="mt2 wrapper">
<section class="mt1 wrapper">
<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>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment