rebuilding frontend and fixed duplicated IDs in monitoring page

This commit is contained in:
Kasra Bigdeli
2017-12-30 12:05:32 -08:00
parent ca67d7f042
commit a3acc028cc
5 changed files with 63 additions and 71 deletions
+3 -4
View File
@@ -3,7 +3,7 @@
<div ng-show="!loadingState.enabled">
<div class="row" ng-show="!editContent.appsToEdit.length">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-6 col-md-offset-3">
<rd-widget>
<rd-widget-header icon="fa-plus" title="Create A New App">
@@ -30,7 +30,6 @@
</div>
<hr>
<br>
<div class="text-center">Or Select From</div>
<br>
@@ -47,7 +46,7 @@
</div>
<div class="row" ng-show="!editContent.appsToEdit.length && allApps && !!allApps.length">
<div class="col-md-8 col-md-offset-2">
<div class="col-md-10 col-md-offset-1">
<br>
<br>
@@ -457,4 +456,4 @@
</rd-widget>
</div>
</div>
</div>
</div>
+26 -26
View File
@@ -142,15 +142,15 @@
<div class="col-sm-1"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputFirstName">Recipient Email Address</label>
<input type="text" class="form-control" id="inputFirstName" placeholder="alerts.receiver@example.com" ng-model="netDataInfo.data.smtp.to">
<label for="recEmail">Recipient Email Address</label>
<input type="text" class="form-control" id="recEmail" placeholder="alerts.receiver@example.com" ng-model="netDataInfo.data.smtp.to">
</div>
</div>
<div class="col-sm-2"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputLastName">Server Name in Email</label>
<input type="text" class="form-control" id="inputFirstName" placeholder="my-aws-server-01-anything" ng-model="netDataInfo.data.smtp.hostname">
<label for="serverName">Server Name in Email</label>
<input type="text" class="form-control" id="serverName" placeholder="my-aws-server-01-anything" ng-model="netDataInfo.data.smtp.hostname">
</div>
</div>
</div>
@@ -158,22 +158,22 @@
<div class="col-sm-1"></div>
<div class="col-sm-6">
<div class="form-group">
<label for="inputFirstName">SMTP Server Address</label>
<input type="text" class="form-control" ng-model="netDataInfo.data.smtp.server" id="captainIpAddress" placeholder="smtp.gmail.com">
<label for="serverAddress">SMTP Server Address</label>
<input type="text" class="form-control" ng-model="netDataInfo.data.smtp.server" id="serverAddress" placeholder="smtp.gmail.com">
</div>
</div>
<div class="col-sm-2">
<div class="form-group">
<label for="inputWebsite">SMTP Port</label>
<input type="text" class="form-control" ng-model="netDataInfo.data.smtp.port" id="inputWebsite" placeholder="587">
<label for="smtpPort">SMTP Port</label>
<input type="text" class="form-control" ng-model="netDataInfo.data.smtp.port" id="smtpPort" placeholder="587">
</div>
</div>
<div class="col-sm-2">
<div class="form-group">
<label for="inputWebsite">Unsecure</label>
<label for="nonTls">Unsecure</label>
<div class="checkbox">
<label>
<input id="inputWebsite" type="checkbox" ng-model="netDataInfo.data.smtp.allowNonTls">
<input id="nonTls" type="checkbox" ng-model="netDataInfo.data.smtp.allowNonTls">
allow non-TLS
</label>
</div>
@@ -184,15 +184,15 @@
<div class="col-sm-1"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputFirstName">SMTP Username</label>
<input type="text" class="form-control" id="inputFirstName" placeholder="alerts.receiver@example.com" ng-model="netDataInfo.data.smtp.username">
<label for="smtpUser">SMTP Username</label>
<input type="text" class="form-control" id="smtpUser" placeholder="alerts.receiver@example.com" ng-model="netDataInfo.data.smtp.username">
</div>
</div>
<div class="col-sm-2"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputLastName">SMTP password</label>
<input type="password" class="form-control" id="inputFirstName" placeholder="your password" ng-model="netDataInfo.data.smtp.password">
<label for="smtpPass">SMTP password</label>
<input type="password" class="form-control" id="smtpPass" placeholder="your password" ng-model="netDataInfo.data.smtp.password">
</div>
</div>
</div>
@@ -210,15 +210,15 @@
<div class="col-sm-1"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputFirstName">Slack Webhook</label>
<input type="text" class="form-control" id="inputFirstName" placeholder="https://hooks.slack.com/services/XXXX" ng-model="netDataInfo.data.slack.hook">
<label for="slackWebhook">Slack Webhook</label>
<input type="text" class="form-control" id="slackWebhook" placeholder="https://hooks.slack.com/services/XXXX" ng-model="netDataInfo.data.slack.hook">
</div>
</div>
<div class="col-sm-2"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputLastName">Slack Channel</label>
<input type="text" class="form-control" id="inputFirstName" placeholder="alertschannel" ng-model="netDataInfo.data.slack.channel">
<label for="slackChannel">Slack Channel</label>
<input type="text" class="form-control" id="slackChannel" placeholder="alertschannel" ng-model="netDataInfo.data.slack.channel">
</div>
</div>
</div>
@@ -235,15 +235,15 @@
<div class="col-sm-1"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputFirstName">Bot Token</label>
<input type="text" class="form-control" id="inputFirstName" placeholder="TELEGRAM_BOT_TOKEN" ng-model="netDataInfo.data.telegram.botToken">
<label for="telegramBotToken">Bot Token</label>
<input type="text" class="form-control" id="telegramBotToken" placeholder="TELEGRAM_BOT_TOKEN" ng-model="netDataInfo.data.telegram.botToken">
</div>
</div>
<div class="col-sm-2"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputLastName">Chat ID</label>
<input type="text" class="form-control" id="inputFirstName" placeholder="Telegram Chat ID" ng-model="netDataInfo.data.telegram.chatId">
<label for="chatIdTelegram">Chat ID</label>
<input type="text" class="form-control" id="chatIdTelegram" placeholder="Telegram Chat ID" ng-model="netDataInfo.data.telegram.chatId">
</div>
</div>
</div>
@@ -260,15 +260,15 @@
<div class="col-sm-1"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputFirstName">Push Bullet API token</label>
<input type="text" class="form-control" id="inputFirstName" placeholder="PUSH_BULLET_API_TOKEN" ng-model="netDataInfo.data.pushBullet.apiToken">
<label for="pushBulletToken">Push Bullet API token</label>
<input type="text" class="form-control" id="pushBulletToken" placeholder="PUSH_BULLET_API_TOKEN" ng-model="netDataInfo.data.pushBullet.apiToken">
</div>
</div>
<div class="col-sm-2"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputLastName">Default Email (fallback receiver)</label>
<input type="text" class="form-control" id="inputFirstName" placeholder="alerts.receiver@example.com" ng-model="netDataInfo.data.pushBullet.fallbackEmail">
<label for="emailPushBullet">Default Email (fallback receiver)</label>
<input type="text" class="form-control" id="emailPushBullet" placeholder="alerts.receiver@example.com" ng-model="netDataInfo.data.pushBullet.fallbackEmail">
</div>
</div>
</div>
+5 -7
View File
@@ -11,13 +11,13 @@
<rd-widget-body>
<div class="row">
<div class="col-sm-4 col-sm-offset-1">
<div class="col-sm-6">
<div class="form-group">
<label for="inputFirstName">Remote IP Address (as seen by Captain)</label>
<input type="text" class="form-control" id="inputFirstName" placeholder="Remote IP Address" ng-model="nodeToAdd.remoteNodeIpAddress">
</div>
</div>
<div class="col-sm-4 col-sm-offset-2">
<div class="col-sm-5 col-sm-offset-1">
<div class="form-group">
<label for="inputLastName">Remote Username</label>
<input type="text" class="form-control" id="inputLastName" ng-model="nodeToAdd.remoteUserName">
@@ -25,21 +25,19 @@
</div>
</div>
<div class="row">
<div class="col-sm-4 col-sm-offset-1">
<div class="col-sm-6">
<div class="form-group">
<label for="inputFirstName">Captain IP Address (as seen by remote)</label>
<input type="text" class="form-control" ng-model="nodeToAdd.captainIpAddress" id="captainIpAddress" placeholder="Captain IP Address">
</div>
</div>
<div class="col-sm-4 col-sm-offset-2">
<div class="col-sm-5 col-sm-offset-1">
<div class="form-group">
<label for="inputWebsite">Node Type</label>
<input type="text" class="form-control" ng-model="nodeToAdd.nodeType" id="inputWebsite" placeholder="worker/manager">
</div>
</div>
</div>
<div class="row">
<div class="col-sm-10 col-sm-offset-1">
<div class="col-sm-12">
<div class="form-group">
<label for="textarea01">SSH Private Key</label>
<textarea style="font-family: monospace" ng-model="nodeToAdd.privateKey" placeholder="-----BEGIN RSA PRIVATE KEY-----&#10;MIICWwIBAAKBgQDArfs81aizq8ckg16e+ewFgJg7J..." class="form-control" id="textarea01"></textarea>
+3 -8
View File
@@ -1,5 +1,5 @@
<div class="row">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-6">
<rd-widget>
<rd-widget-header icon="fa-key" title="Change Password">
@@ -40,12 +40,7 @@
</rd-widget>
</div>
</div>
<hr>
<div class="row">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-6">
<rd-widget>
@@ -159,4 +154,4 @@
</rd-widget-body>
</rd-widget>
</div>
</div>
</div>
+26 -26
View File
@@ -144,15 +144,15 @@
<div class="col-sm-1"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputFirstName">Recipient Email Address</label>
<input type="text" class="form-control" id="inputFirstName" placeholder="alerts.receiver@example.com" ng-model="netDataInfo.data.smtp.to">
<label for="recEmail">Recipient Email Address</label>
<input type="text" class="form-control" id="recEmail" placeholder="alerts.receiver@example.com" ng-model="netDataInfo.data.smtp.to">
</div>
</div>
<div class="col-sm-2"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputLastName">Server Name in Email</label>
<input type="text" class="form-control" id="inputFirstName" placeholder="my-aws-server-01-anything" ng-model="netDataInfo.data.smtp.hostname">
<label for="serverName">Server Name in Email</label>
<input type="text" class="form-control" id="serverName" placeholder="my-aws-server-01-anything" ng-model="netDataInfo.data.smtp.hostname">
</div>
</div>
</div>
@@ -160,22 +160,22 @@
<div class="col-sm-1"></div>
<div class="col-sm-6">
<div class="form-group">
<label for="inputFirstName">SMTP Server Address</label>
<input type="text" class="form-control" ng-model="netDataInfo.data.smtp.server" id="captainIpAddress" placeholder="smtp.gmail.com">
<label for="serverAddress">SMTP Server Address</label>
<input type="text" class="form-control" ng-model="netDataInfo.data.smtp.server" id="serverAddress" placeholder="smtp.gmail.com">
</div>
</div>
<div class="col-sm-2">
<div class="form-group">
<label for="inputWebsite">SMTP Port</label>
<input type="text" class="form-control" ng-model="netDataInfo.data.smtp.port" id="inputWebsite" placeholder="587">
<label for="smtpPort">SMTP Port</label>
<input type="text" class="form-control" ng-model="netDataInfo.data.smtp.port" id="smtpPort" placeholder="587">
</div>
</div>
<div class="col-sm-2">
<div class="form-group">
<label for="inputWebsite">Unsecure</label>
<label for="nonTls">Unsecure</label>
<div class="checkbox">
<label>
<input id="inputWebsite" type="checkbox" ng-model="netDataInfo.data.smtp.allowNonTls">
<input id="nonTls" type="checkbox" ng-model="netDataInfo.data.smtp.allowNonTls">
allow non-TLS
</label>
</div>
@@ -186,16 +186,16 @@
<div class="col-sm-1"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputFirstName">SMTP Username</label>
<input type="text" class="form-control" id="inputFirstName"
<label for="smtpUser">SMTP Username</label>
<input type="text" class="form-control" id="smtpUser"
placeholder="alerts.receiver@example.com" ng-model="netDataInfo.data.smtp.username">
</div>
</div>
<div class="col-sm-2"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputLastName">SMTP password</label>
<input type="password" class="form-control" id="inputFirstName"
<label for="smtpPass">SMTP password</label>
<input type="password" class="form-control" id="smtpPass"
placeholder="your password" ng-model="netDataInfo.data.smtp.password">
</div>
</div>
@@ -214,8 +214,8 @@
<div class="col-sm-1"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputFirstName">Slack Webhook</label>
<input type="text" class="form-control" id="inputFirstName"
<label for="slackWebhook">Slack Webhook</label>
<input type="text" class="form-control" id="slackWebhook"
placeholder="https://hooks.slack.com/services/XXXX"
ng-model="netDataInfo.data.slack.hook">
</div>
@@ -223,8 +223,8 @@
<div class="col-sm-2"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputLastName">Slack Channel</label>
<input type="text" class="form-control" id="inputFirstName" placeholder="alertschannel" ng-model="netDataInfo.data.slack.channel">
<label for="slackChannel">Slack Channel</label>
<input type="text" class="form-control" id="slackChannel" placeholder="alertschannel" ng-model="netDataInfo.data.slack.channel">
</div>
</div>
</div>
@@ -241,16 +241,16 @@
<div class="col-sm-1"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputFirstName">Bot Token</label>
<input type="text" class="form-control" id="inputFirstName"
<label for="telegramBotToken">Bot Token</label>
<input type="text" class="form-control" id="telegramBotToken"
placeholder="TELEGRAM_BOT_TOKEN" ng-model="netDataInfo.data.telegram.botToken">
</div>
</div>
<div class="col-sm-2"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputLastName">Chat ID</label>
<input type="text" class="form-control" id="inputFirstName"
<label for="chatIdTelegram">Chat ID</label>
<input type="text" class="form-control" id="chatIdTelegram"
placeholder="Telegram Chat ID" ng-model="netDataInfo.data.telegram.chatId">
</div>
</div>
@@ -268,16 +268,16 @@
<div class="col-sm-1"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputFirstName">Push Bullet API token</label>
<input type="text" class="form-control" id="inputFirstName"
<label for="pushBulletToken">Push Bullet API token</label>
<input type="text" class="form-control" id="pushBulletToken"
placeholder="PUSH_BULLET_API_TOKEN" ng-model="netDataInfo.data.pushBullet.apiToken">
</div>
</div>
<div class="col-sm-2"></div>
<div class="col-sm-4">
<div class="form-group">
<label for="inputLastName">Default Email (fallback receiver)</label>
<input type="text" class="form-control" id="inputFirstName"
<label for="emailPushBullet">Default Email (fallback receiver)</label>
<input type="text" class="form-control" id="emailPushBullet"
placeholder="alerts.receiver@example.com" ng-model="netDataInfo.data.pushBullet.fallbackEmail">
</div>
</div>