Fixed tooltip - still cleaning up /users

pull/24/head
unknown 2015-06-16 23:23:02 -05:00
parent cf8c8c4534
commit 20b1c80454
2 changed files with 30 additions and 51 deletions

View File

@ -1,6 +1,6 @@
// Save attempts to POST to /campaigns/ // Save attempts to POST to /campaigns/
function save(){ function save(){
var targets = {} var targets = [{}]
var group = { var group = {
name: $("#name").val(), name: $("#name").val(),
targets: targets targets: targets
@ -46,4 +46,5 @@ function load(){
$(document).ready(function(){ $(document).ready(function(){
load() load()
$("#fileUpload").hover(function(){$("#fileUpload").tooltip('toggle')})
}) })

View File

@ -27,7 +27,7 @@
</h1> </h1>
<div id="flashes" class="row"></div> <div id="flashes" class="row"></div>
<div class="row"> <div class="row">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#groupModal"><i class="fa fa-plus"></i> New Campaign</button> <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#groupModal"><i class="fa fa-plus"></i> New Group</button>
</div> </div>
&nbsp; &nbsp;
<div id="emptyMessage" class="row"> <div id="emptyMessage" class="row">
@ -85,40 +85,19 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="row" id="modal.flashes"></div> <div class="row" id="modal.flashes"></div>
<label class="control-label" for="name">Name:</label>
<div class="form-group"> <div class="form-group">
<label for="name">Name:</label> <input type="text" class="form-control" ng-model="group.name" placeholder="Group name" id="name" autofocus/>
<input type="text" class="form-control" id="name" placeholder="Campaign name" autofocus>
<br />
<label class="control-label" for="template">Template:</label>
<input type="text" class="form-control" placeholder="Template Name" id="template" typeahead="template.name for template in templates | filter:{name:$viewValue}" typeahead-editable="false" ng-model="campaign.template.name" />
<br />
<div class="panel panel-default">
<div class="panel-heading" role="tab">
<a role="button" class="collapsed" data-toggle="collapse" href="#smtpPanel" aria-expanded="false" aria-controls="#smtpPanel">
SMTP Options <i class="pull-right glyphicon"></i>
</a>
</div> </div>
<div class="panel-collapse collapse" id="smtpPanel" role="tabpanel"> <div class="form-group">
<div class="panel-body"> <span class="btn btn-danger btn-file" data-toggle="tooltip" data-placement="right" title="Supports CSV files" id="fileUpload"><i class="fa fa-plus"></i> Bulk Import Users
<label class="control-label" for="from">From:</label> <input type="file" ng-file-select="onFileSelect($files)">
<input type="text" class="form-control" placeholder="First Last <test@example.com>" value="" name="from"> </span>
<br />
<label class="control-label" for="smtp_server">Host:</label>
<input type="text" class="form-control" placeholder="smtp.example.com:25" value="" name="host">
<br />
<label class="control-label" for="smtp_server">Username:</label>
<input type="text" class="form-control" placeholder="Username" value="" name="username">
<br />
<label class="control-label" for="smtp_server">Password:</label>
<input type="password" class="form-control" placeholder="Password" value="" name="password">
<br />
</div> </div>
</div> <label class="control-label" for="users">Users:</label>
</div> <form ng:submit="addTarget()">
<label class="control-label" for="users">Groups:</label>
<form>
<div class="input-group"> <div class="input-group">
<input type="text" class="form-control" placeholder="Group Name" id="users" typeahead="group.name for group in groups | filter:{name:$viewValue}" typeahead-editable="false" ng-model="group.name" /> <input type="email" class="form-control" placeholder="test@example.com" id="users" ng-model="newTarget.email" />
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-primary"><i class="fa fa-plus"></i> Add</button> <button class="btn btn-primary"><i class="fa fa-plus"></i> Add</button>
</span> </span>
@ -127,16 +106,15 @@
<br /> <br />
<table ng-table="editGroupTableParams" class="table table-hover table-striped table-condensed"> <table ng-table="editGroupTableParams" class="table table-hover table-striped table-condensed">
<tbody> <tbody>
<tr ng-repeat="group in $data" class="editable-row"> <tr ng-repeat="target in $data" class="editable-row">
<td>group.name <td>target.email
<span ng-click="removeGroup(group)" class="remove-row"><i class="fa fa-trash-o"></i> <span ng-click="removeTarget(target)" class="remove-row"><i class="fa fa-trash-o"></i>
</span> </span>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button> <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary" onclick="save()">Save changes</button> <button type="button" class="btn btn-primary" onclick="save()">Save changes</button>