Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="col-sm-4 col-md-3">
<select id="select-email-template" class="form-control input-sm"
data-ng-model="$parent.selectedEmailTemplate"
data-ng-options="email as email.record.name for email in emailTemplates"
data-ng-options="email as email.record.name for email in emailTemplates | orderBy:'record.name'"
data-ng-change="changeEmailTemplate($parent.selectedEmailTemplate)">
<option value="">-- Select Email Template --</option>
</select>
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ angular
})

// Set application version number
.constant('APP_VERSION', '4.10.1')
.constant('APP_VERSION', '4.11.0')

// Set global url for this application
.constant('INSTANCE_BASE_URL', '')
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div> <df-large-help data-options="dfLargeHelp.emailTemplates"></df-large-help> <div class="row"> <div class="col-sm-4 col-md-3"> <select id="select-email-template" class="form-control input-sm" data-ng-model="$parent.selectedEmailTemplate" data-ng-options="email as email.record.name for email in emailTemplates" data-ng-change="changeEmailTemplate($parent.selectedEmailTemplate)"> <option value="">-- Select Email Template --</option> </select> </div> <div class="btn-group btn-group-sm"> <button type="button" class="btn btn-default" data-ng-click="addEmailTemplate()"><i class="fa fa-fw fa-plus"></i></button> <button type="button" class="btn btn-default" data-ng-click="deleteEmailTemplate()" data-ng-disabled="!selectedEmailTemplate"><i class="fa fa-fw fa-trash"></i></button> </div> </div> <br> <div> <div class="form-group"> <label>Template Name</label> <input class="form-control" data-ng-model="selectedEmailTemplate.record.name" placeholder="Enter template name." data-ng-disabled="selectedEmailTemplate === null"> </div> <div class="form-group"> <label>Template Description</label> <input class="form-control" data-ng-model="selectedEmailTemplate.record.description" placeholder="Enter template description." data-ng-disabled="selectedEmailTemplate === null"> </div> <hr> <div class="form-group"> <label>Recipient</label> <df-simple-help data-options="helpText.recipient"></df-simple-help> <input class="form-control" data-ng-model="selectedEmailTemplate.record.to" placeholder="" data-ng-disabled="selectedEmailTemplate === null"> </div> <div class="form-group"> <label>Cc</label> <df-simple-help data-options="helpText.cc"></df-simple-help> <input class="form-control" data-ng-model="selectedEmailTemplate.record.cc" placeholder="" data-ng-disabled="selectedEmailTemplate === null"> </div> <div class="form-group"> <label>Bcc</label> <df-simple-help data-options="helpText.bcc"></df-simple-help> <input class="form-control" data-ng-model="selectedEmailTemplate.record.bcc" placeholder="" data-ng-disabled="selectedEmailTemplate === null"> </div> <hr> <div class="form-group"> <label>Subject</label> <input class="form-control" data-ng-model="selectedEmailTemplate.record.subject" placeholder="Enter email subject." data-ng-disabled="selectedEmailTemplate === null"> </div> <div class="form-group"> <label>Attachment</label> <df-simple-help data-options="helpText.attachment"></df-simple-help> <input class="form-control" data-ng-model="selectedEmailTemplate.record.attachment" placeholder="Enter email attachment." data-ng-disabled="selectedEmailTemplate === null"> </div> <div class="form-group"> <label>Body</label> <textarea class="form-control" rows="20" data-ng-model="selectedEmailTemplate.record.body_html" data-ng-disabled="selectedEmailTemplate === null"></textarea> </div> <hr> <div class="form-group"> <label>Sender Name</label> <input class="form-control" data-ng-model="selectedEmailTemplate.record.from_name" placeholder="Enter sender name." data-ng-disabled="selectedEmailTemplate === null"> </div> <div class="form-group"> <label>Sender Email</label> <input class="form-control" data-ng-model="selectedEmailTemplate.record.from_email" placeholder="Enter sender email." data-ng-disabled="selectedEmailTemplate === null"> </div> <div class="form-group"> <label>Reply to Name</label> <df-simple-help data-options="helpText.reply_to_name"></df-simple-help> <input class="form-control" data-ng-model="selectedEmailTemplate.record.reply_to_name" placeholder="" data-ng-disabled="selectedEmailTemplate === null"> </div> <div class="form-group"> <label>Reply to Email</label> <df-simple-help data-options="helpText.reply_to_email"></df-simple-help> <input class="form-control" data-ng-model="selectedEmailTemplate.record.reply_to_email" placeholder="" data-ng-disabled="selectedEmailTemplate === null"> </div> </div> </div> <div class="row"> <div class="col-xs-12 form-controls"> <button type="button" class="btn btn-primary" data-ng-click="saveEmailTemplate()"> <span data-ng-if="selectedEmailTemplate.__dfUI.newTemplate">Save</span> <span data-ng-if="!selectedEmailTemplate.__dfUI.newTemplate">Update</span> </button> </div> </div>
<div> <df-large-help data-options="dfLargeHelp.emailTemplates"></df-large-help> <div class="row"> <div class="col-sm-4 col-md-3"> <select id="select-email-template" class="form-control input-sm" data-ng-model="$parent.selectedEmailTemplate" data-ng-options="email as email.record.name for email in emailTemplates | orderBy:'record.name'" data-ng-change="changeEmailTemplate($parent.selectedEmailTemplate)"> <option value="">-- Select Email Template --</option> </select> </div> <div class="btn-group btn-group-sm"> <button type="button" class="btn btn-default" data-ng-click="addEmailTemplate()"><i class="fa fa-fw fa-plus"></i></button> <button type="button" class="btn btn-default" data-ng-click="deleteEmailTemplate()" data-ng-disabled="!selectedEmailTemplate"><i class="fa fa-fw fa-trash"></i></button> </div> </div> <br> <div> <div class="form-group"> <label>Template Name</label> <input class="form-control" data-ng-model="selectedEmailTemplate.record.name" placeholder="Enter template name." data-ng-disabled="selectedEmailTemplate === null"> </div> <div class="form-group"> <label>Template Description</label> <input class="form-control" data-ng-model="selectedEmailTemplate.record.description" placeholder="Enter template description." data-ng-disabled="selectedEmailTemplate === null"> </div> <hr> <div class="form-group"> <label>Recipient</label> <df-simple-help data-options="helpText.recipient"></df-simple-help> <input class="form-control" data-ng-model="selectedEmailTemplate.record.to" placeholder="" data-ng-disabled="selectedEmailTemplate === null"> </div> <div class="form-group"> <label>Cc</label> <df-simple-help data-options="helpText.cc"></df-simple-help> <input class="form-control" data-ng-model="selectedEmailTemplate.record.cc" placeholder="" data-ng-disabled="selectedEmailTemplate === null"> </div> <div class="form-group"> <label>Bcc</label> <df-simple-help data-options="helpText.bcc"></df-simple-help> <input class="form-control" data-ng-model="selectedEmailTemplate.record.bcc" placeholder="" data-ng-disabled="selectedEmailTemplate === null"> </div> <hr> <div class="form-group"> <label>Subject</label> <input class="form-control" data-ng-model="selectedEmailTemplate.record.subject" placeholder="Enter email subject." data-ng-disabled="selectedEmailTemplate === null"> </div> <div class="form-group"> <label>Attachment</label> <df-simple-help data-options="helpText.attachment"></df-simple-help> <input class="form-control" data-ng-model="selectedEmailTemplate.record.attachment" placeholder="Enter email attachment." data-ng-disabled="selectedEmailTemplate === null"> </div> <div class="form-group"> <label>Body</label> <textarea class="form-control" rows="20" data-ng-model="selectedEmailTemplate.record.body_html" data-ng-disabled="selectedEmailTemplate === null"></textarea> </div> <hr> <div class="form-group"> <label>Sender Name</label> <input class="form-control" data-ng-model="selectedEmailTemplate.record.from_name" placeholder="Enter sender name." data-ng-disabled="selectedEmailTemplate === null"> </div> <div class="form-group"> <label>Sender Email</label> <input class="form-control" data-ng-model="selectedEmailTemplate.record.from_email" placeholder="Enter sender email." data-ng-disabled="selectedEmailTemplate === null"> </div> <div class="form-group"> <label>Reply to Name</label> <df-simple-help data-options="helpText.reply_to_name"></df-simple-help> <input class="form-control" data-ng-model="selectedEmailTemplate.record.reply_to_name" placeholder="" data-ng-disabled="selectedEmailTemplate === null"> </div> <div class="form-group"> <label>Reply to Email</label> <df-simple-help data-options="helpText.reply_to_email"></df-simple-help> <input class="form-control" data-ng-model="selectedEmailTemplate.record.reply_to_email" placeholder="" data-ng-disabled="selectedEmailTemplate === null"> </div> </div> </div> <div class="row"> <div class="col-xs-12 form-controls"> <button type="button" class="btn btn-primary" data-ng-click="saveEmailTemplate()"> <span data-ng-if="selectedEmailTemplate.__dfUI.newTemplate">Save</span> <span data-ng-if="!selectedEmailTemplate.__dfUI.newTemplate">Update</span> </button> </div> </div>
2 changes: 1 addition & 1 deletion dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]--> <!-- Add your site or application content here --> <div id="dreamfactoryApp" data-ng-controller="MainCtrl" df-popup-login> <div id="popup-login-container"></div> <!-- Top level Nav --> <df-top-level-nav-std data-ng-if="showHeader" data-options="topLevelNavOptions"></df-top-level-nav-std> <df-license-expired-banner data-ng-if="showLicenseExpiredBanner"></df-license-expired-banner> <div data-ng-if="showAdminComponentNav" style="margin: 10px auto;" class="df-menu"> <!-- Component nav and title --> <div class="container-fluid"> <div class="row"> <div class="col-xs-12"> <div class="col-md-2 df-menu-container df-menu-icon"> <df-component-title></df-component-title> </div> <div class="col-md-10 df-menu-container second-nav-menu-items"> <df-component-nav data-options="componentNavOptions"></df-component-nav> </div> </div> </div> </div> </div> <!-- Rendering Context --> <div class="container-fluid"> <div class="row"> <div class="col-xs-12"> <div data-ng-view=""></div> </div> </div> </div> <!--<df-main-loading></df-main-loading>--> <div id="mask"></div> </div> <!--[if lt IE 9]>
<script src="scripts/oldieshim.d41d8cd9.js"></script>
<![endif]--> <script src="scripts/vendor.9e01592e.js"></script> <script src="scripts/app.186b557f.js"></script> <!-- other deps --> <script src="vendor/ace/ace.js"></script> <script src="vendor/ace/mode-javascript.js"></script> <script src="vendor/ace/mode-json.js"></script> <script src="vendor/ace/mode-yaml.js"></script> <script> setTimeout(function(){
<![endif]--> <script src="scripts/vendor.9e01592e.js"></script> <script src="scripts/app.833b7adc.js"></script> <!-- other deps --> <script src="vendor/ace/ace.js"></script> <script src="vendor/ace/mode-javascript.js"></script> <script src="vendor/ace/mode-json.js"></script> <script src="vendor/ace/mode-yaml.js"></script> <script> setTimeout(function(){

var _updateIntercom = function(userData) {
var host = $body.injector().get("$location").host();
Expand Down

Large diffs are not rendered by default.