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

email report cleanup

parent 0ca0e3a0
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
resources/frontend_client/app/admin/emailreport/partials/emailreport_detail.html
+ 34
− 31
View file @ ae986deb
<section class="wrapper">
<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>
<form novalidate class="bg-white bordered rounded shadowed">
<div class="p4 border-bottom">
<div class="py1">
<label >Report Name:</label>
<input class="input block" size="80" maxlength="255" type="text" ng-model="report.name"/>
......@@ -29,24 +12,40 @@
<label >Description:</label>
<input class="input block" size="80" maxlength="255" type="text" ng-model="report.description"/>
</div>
</div>
<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 class="p4 border-bottom">
<h3>Recipients</h3>
<div class="py1">
<label >Team Members:</label>
<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>
</tr>
</table>
<div class="Table-wrapper">
<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>
</tr>
</table>
</div>
</div>
<div class="py1">
<label >Email Aliases:</label>
<input class="input block full" size="80" maxlength="255" type="text" ng-model="report.email_addresses"/>
<input class="input block" size="80" maxlength="255" type="text" ng-model="report.email_addresses"/>
</div>
</div>
......@@ -96,11 +95,15 @@
</div>
<div class="my1 py2 border-top">
<div class="float-right">
<input class="Button" type="button" value="Send Now" ng-if="report.id" ng-click="executeReport(report.id)"/>
</div>
<div class="clearfix">
<div class="float-left">
<input class="Button" type="button" value="Send Now" ng-if="report.id" ng-click="executeReport(report.id)"/>
</div>
<input class="Button Button--primary" type="button" value="Save" ng-click="save(report)"/>
<div class="float-right">
<input class="Button Button--primary" type="button" value="Save" ng-click="save(report)"/>
</div>
</div>
<div class="inline-block" ng-cloak>
<span class="px2 text-success" ng-if="success_message" cv-delayed-call="clearStatus()">{{success_message}}</span>
......
resources/frontend_client/app/admin/emailreport/partials/emailreport_list.html
+ 11
− 12
View file @ ae986deb
<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/emailreport/create">Create Email Report</a>
</div>
<h2>Email Report List</h2>
<h2>Reports</h2>
</div>
<div>
<div class="List-filters List-section clearfix">
<div class="List-filterCategories float-left">
<span class="List-filterLabel float-left">filter:</span>
<div class="py4 rounded bordered bg-white shadowed">
<div class="clearfix">
<div class="float-left">
<span class="float-left">filter:</span>
<div class="Button-group">
<a class="Button" ng-class="{ 'Button--selected' : filterMode == 'all' }" ng-click="filter('all')">all</a>
<a class="Button" ng-class="{ 'Button--selected' : filterMode == 'mine' }" ng-click="filter('mine')">mine</a>
......@@ -31,11 +30,11 @@
</div>
</div>
<div ng-if="!reports">
<h3>Loading ...</h3>
</div>
<ul>
<div ng-if="!reports">
<h3>Loading ...</h3>
</div>
<li class="py2 border-bottom" ng-repeat="report in reports | filter:searchFilter">
<div class="my1 float-right">
<a class="Button mx1" ng-click="executeReport(report.id)">Send Now</a>
......@@ -50,4 +49,4 @@
</li>
</ul>
</div>
</div>
</section>
resources/frontend_client/app/css/admin.css
+ 11
− 1
View file @ ae986deb
......@@ -3,5 +3,15 @@
}
.AdminNav .NavItem {
padding: 1.5em 1em;
padding: 1.15em 0;
margin: 0 1em 0 0;
font-size: 1.12em;
}
.AdminExit-trigger {
color: #ddd;
}
.AdminTitle {
color: #222;
}
resources/frontend_client/index.html
+ 2
− 2
View file @ ae986deb
......@@ -87,11 +87,11 @@
<label class="Select" ng-if="user.is_multi_org">
<select ng-change="changeCurrOrg(currentOrgSlug)" ng-model="currentOrgSlug" ng-options="organization.slug as organization.name for organization in userAdminOf"></select>
</label>
<a class="link" cv-org-href="/admin/">
<a class="AdminTitle link" cv-org-href="/admin/">
<span ng-if="!user.is_multi_org">{{currentOrg.name}} - </span>Admin
</a>
<div class="mx1 float-right">
<a class="link" cv-org-href="/">Exit Admin</a>
<a class="AdminExit-trigger link" cv-org-href="/">Exit Admin</a>
</div>
</div>
<section class="mt1 wrapper">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment